----------------------------------------------------------------------------- MANIFEST | 249 Makefile | 13 README | 7 aclocal.m4 | 369 conf-tin | 1 config.guess | 777 config.sub | 2528 +- configure |30792 +++++++++++++++++++-------------- configure.in | 67 doc/CHANGES | 62 doc/CHANGES.old | 58 doc/CREDITS | 14 doc/INSTALL | 11 doc/TODO | 89 doc/WHATSNEW | 8 doc/filtering | 24 doc/l10n/de.po | 3564 +-- doc/l10n/de/tin.1 | 209 doc/l10n/de/tin.5 | 114 doc/l10n/en_GB.po | 3530 +-- doc/l10n/en_GB/tin.1 | 81 doc/l10n/en_GB/tin.5 | 44 doc/l10n/es.po |12442 +++++++++++++ doc/l10n/es/tin.1 | 3674 +++ doc/l10n/es/tin.5 | 2514 ++ doc/l10n/tin-man.pot | 3365 +-- doc/mmdf.5 | 4 doc/opt-case.1 | 2 doc/plp_snprintf.3 | 2 doc/tin.1 | 63 doc/tin.5 | 33 doc/tinews.1 | 21 include/autoconf.hin | 32 include/bool.h | 2 include/bugrep.h | 2 include/debug.h | 2 include/extern.h | 34 include/keymap.h | 2 include/newsrc.h | 2 include/nntplib.h | 10 include/policy.h | 8 include/proto.h | 6 include/rfc2046.h | 2 include/stpwatch.h | 2 include/tcurses.h | 2 include/tin.h | 89 include/tinrc.h | 4 include/tnntp.h | 2 include/trace.h | 2 include/version.h | 10 libcanlock/COPYING | 2 libcanlock/ChangeLog | 2 libcanlock/ChangeLog_V3 | 2 libcanlock/LICENSE | 2 libcanlock/Makefile.in | 19 libcanlock/README | 4 libcanlock/include/canlock-private.h | 45 libcanlock/include/canlock.h | 12 libcanlock/include/config.h | 9 libcanlock/src/hmac.c | 20 libcanlock/src/secret.c | 30 libcanlock/src/sha1.c | 5 libcanlock/src/sha224-256.c | 9 libcanlock/src/sha384-512.c | 13 pcre/pcre_compile.c | 4 pcre/pcre_study.c | 2 po/POTFILES.in | 22 po/da.po | 1708 - po/de.po | 1697 - po/en_GB.po | 1685 - po/es.po | 8148 ++++++++ po/et.po | 1695 - po/fr.po | 1722 - po/ru.po | 1702 - po/sv.po | 1687 - po/tin.pot | 1685 - po/tr.po | 1710 - po/zh_CN.po | 1707 - po/zh_TW.po | 1707 - po4a.conf | 3 src/Makefile.in | 13 src/active.c | 54 src/art.c | 543 src/attrib.c | 18 src/auth.c | 55 src/charset.c | 2 src/color.c | 2 src/config.c | 44 src/cook.c | 10 src/debug.c | 10 src/envarg.c | 2 src/feed.c | 26 src/filter.c | 89 src/getline.c | 15 src/global.c | 4 src/group.c | 8 src/hashstr.c | 2 src/header.c | 6 src/heapsort.c | 4 src/help.c | 7 src/inews.c | 12 src/init.c | 10 src/joinpath.c | 2 src/keymap.c | 16 src/lang.c | 50 src/list.c | 6 src/lock.c | 2 src/mail.c | 20 src/main.c | 33 src/makecfg.c | 2 src/memory.c | 24 src/mimetypes.c | 2 src/misc.c | 206 src/my_tmpfile.c | 4 src/newsrc.c | 36 src/nntplib.c | 135 src/nrctbl.c | 4 src/options_menu.c | 6 src/page.c | 97 src/pgp.c | 2 src/post.c | 100 src/prompt.c | 2 src/read.c | 4 src/refs.c | 2 src/regex.c | 4 src/rfc1524.c | 44 src/rfc2045.c | 10 src/rfc2046.c | 72 src/rfc2047.c | 34 src/save.c | 12 src/screen.c | 49 src/search.c | 8 src/select.c | 20 src/sigfile.c | 6 src/signal.c | 6 src/strftime.c | 9 src/string.c | 89 src/tags.c | 2 src/tcurses.c | 18 src/thread.c | 2 src/tincfg.tbl | 2 src/trace.c | 2 src/version.c | 2 src/xface.c | 4 src/xref.c | 32 tin-2.4.3/po/da.gmo |binary tin-2.4.3/po/de.gmo |binary tin-2.4.3/po/en_GB.gmo |binary tin-2.4.3/po/es.gmo |binary tin-2.4.3/po/et.gmo |binary tin-2.4.3/po/fr.gmo |binary tin-2.4.3/po/ru.gmo |binary tin-2.4.3/po/sv.gmo |binary tin-2.4.3/po/tr.gmo |binary tin-2.4.3/po/zh_CN.gmo |binary tin-2.4.3/po/zh_TW.gmo |binary tin.spec | 2 tools/metamutt | 2 tools/opt-case.pl | 2 tools/tinews.pl | 31 tools/w2r.pl | 2 161 files changed, 64341 insertions(+), 29818 deletions(-) ----------------------------------------------------------------------------- diff -Nurp '--exclude=.bzr*' tin-2.4.2/MANIFEST tin-2.4.3/MANIFEST --- tin-2.4.2/MANIFEST 2017-12-24 12:52:06.000000000 +0100 +++ tin-2.4.3/MANIFEST 2018-12-24 10:28:06.168103015 +0100 @@ -1,32 +1,32 @@ -MANIFEST for tin-2.4.2 (Sun Dec 24 12:52:06 CET 2017) +MANIFEST for tin-2.4.3 (Mon Dec 24 10:28:05 CET 2018) ---------------------------------------------------- - 14881 ./Makefile - 8553 ./MANIFEST - 1383 ./README + 15053 ./Makefile + 8765 ./MANIFEST + 1546 ./README 745 ./README.MAC 976 ./README.WIN - 189691 ./aclocal.m4 - 1081 ./conf-tin - 44611 ./config.guess - 36696 ./config.sub - 700297 ./configure - 36613 ./configure.in + 194403 ./aclocal.m4 + 1096 ./conf-tin + 44510 ./config.guess + 31461 ./config.sub + 897578 ./configure + 37185 ./configure.in 7123 ./install-sh - 318 ./po4a.conf + 355 ./po4a.conf 1502 ./tin.spec 18847 ./doc/ABOUT-NLS - 3696 ./doc/CHANGES - 301408 ./doc/CHANGES.old - 5098 ./doc/CREDITS + 6693 ./doc/CHANGES + 301428 ./doc/CHANGES.old + 5125 ./doc/CREDITS 1305 ./doc/DEBUG_REFS - 31079 ./doc/INSTALL - 47186 ./doc/TODO - 1317 ./doc/WHATSNEW + 31139 ./doc/INSTALL + 47473 ./doc/TODO + 1426 ./doc/WHATSNEW 2618 ./doc/art_handling.txt 1701 ./doc/article.txt 4373 ./doc/auth.txt 3828 ./doc/config-anomalies - 11269 ./doc/filtering + 12168 ./doc/filtering 35305 ./doc/good-netkeeping-seal 3803 ./doc/internals.txt 23621 ./doc/iso2asc.txt @@ -34,120 +34,120 @@ MANIFEST for tin-2.4.2 (Sun Dec 24 12:52 633 ./doc/mailcap.sample 5922 ./doc/mbox.5 3365 ./doc/mime.types - 4221 ./doc/mmdf.5 + 4223 ./doc/mmdf.5 2128 ./doc/newsoverview.5 1541 ./doc/nov_tests - 5155 ./doc/opt-case.1 - 6964 ./doc/plp_snprintf.3 + 5156 ./doc/opt-case.1 + 6966 ./doc/plp_snprintf.3 3964 ./doc/pgp.txt 2990 ./doc/rcvars.txt 1525 ./doc/reading-mail.txt 4947 ./doc/umlaute.txt 4246 ./doc/umlauts.txt 7172 ./doc/url_handler.1 - 138355 ./doc/tin.1 - 81446 ./doc/tin.5 + 138894 ./doc/tin.1 + 81672 ./doc/tin.5 5065 ./doc/tin.defaults - 17673 ./doc/tinews.1 + 18163 ./doc/tinews.1 2418 ./doc/tools.txt 4345 ./doc/w2r.1 2196 ./doc/wildmat.3 344 ./tools/expiretover - 3815 ./tools/metamutt - 2789 ./tools/opt-case.pl + 3816 ./tools/metamutt + 2790 ./tools/opt-case.pl 1413 ./tools/tinlock - 42043 ./tools/tinews.pl + 42613 ./tools/tinews.pl 3792 ./tools/url_handler.pl 1657 ./tools/url_handler.sh - 3347 ./tools/w2r.pl + 3348 ./tools/w2r.pl 1661 ./tools/expand_aliases.tgz 2595 ./include/bool.h 1947 ./include/bugrep.h 2248 ./include/debug.h - 68597 ./include/extern.h + 68535 ./include/extern.h 14068 ./include/keymap.h 6333 ./include/newsrc.h - 8740 ./include/nntplib.h + 8932 ./include/nntplib.h 664 ./include/plp_snprintf.h - 15516 ./include/policy.h - 33189 ./include/proto.h + 15535 ./include/policy.h + 33277 ./include/proto.h 5599 ./include/rfc2046.h 3377 ./include/stpwatch.h 5960 ./include/tcurses.h - 70544 ./include/tin.h - 17449 ./include/tinrc.h + 72105 ./include/tin.h + 17447 ./include/tinrc.h 4346 ./include/tnntp.h 2264 ./include/trace.h - 2351 ./include/version.h - 35442 ./src/active.c - 76555 ./src/art.c - 78278 ./src/attrib.c - 16332 ./src/auth.c + 2352 ./include/version.h + 35494 ./src/active.c + 89022 ./src/art.c + 78541 ./src/attrib.c + 16934 ./src/auth.c 12717 ./src/charset.c 8680 ./src/color.c - 67537 ./src/config.c - 28292 ./src/cook.c + 67466 ./src/config.c + 28294 ./src/cook.c 27349 ./src/curses.c - 11375 ./src/debug.c + 11389 ./src/debug.c 3408 ./src/envarg.c - 30716 ./src/feed.c - 57746 ./src/filter.c - 18193 ./src/getline.c + 30888 ./src/feed.c + 59517 ./src/filter.c + 18348 ./src/getline.c 9070 ./src/global.c - 44921 ./src/group.c + 44914 ./src/group.c 3900 ./src/hashstr.c 8228 ./src/header.c 6253 ./src/heapsort.c - 43893 ./src/help.c - 13957 ./src/inews.c - 38353 ./src/init.c + 43871 ./src/help.c + 13942 ./src/inews.c + 38410 ./src/init.c 2435 ./src/joinpath.c - 101755 ./src/keymap.c - 138915 ./src/lang.c + 101849 ./src/keymap.c + 139189 ./src/lang.c 4486 ./src/langinfo.c - 7728 ./src/list.c + 7724 ./src/list.c 6663 ./src/lock.c - 16898 ./src/mail.c - 26427 ./src/main.c + 17071 ./src/mail.c + 26720 ./src/main.c 10950 ./src/makecfg.c - 13786 ./src/memory.c + 14014 ./src/memory.c 5273 ./src/mimetypes.c - 95628 ./src/misc.c - 39392 ./src/newsrc.c - 54277 ./src/nntplib.c - 7758 ./src/nrctbl.c - 105742 ./src/options_menu.c - 66233 ./src/page.c + 95767 ./src/misc.c + 39473 ./src/newsrc.c + 55068 ./src/nntplib.c + 7757 ./src/nrctbl.c + 105743 ./src/options_menu.c + 66860 ./src/page.c 24137 ./src/parsdate.y 17057 ./src/plp_snprintf.c 13203 ./src/pgp.c - 153029 ./src/post.c + 153041 ./src/post.c 18895 ./src/prompt.c - 10510 ./src/read.c + 10513 ./src/read.c 27481 ./src/refs.c 5485 ./src/regex.c - 14526 ./src/rfc1524.c - 15193 ./src/rfc2045.c - 38929 ./src/rfc2046.c - 36759 ./src/rfc2047.c - 59233 ./src/save.c - 13242 ./src/screen.c - 18276 ./src/search.c - 40876 ./src/select.c - 8356 ./src/sigfile.c - 14332 ./src/signal.c - 7215 ./src/strftime.c - 38656 ./src/string.c + 14458 ./src/rfc1524.c + 15199 ./src/rfc2045.c + 39240 ./src/rfc2046.c + 37027 ./src/rfc2047.c + 59258 ./src/save.c + 13598 ./src/screen.c + 18310 ./src/search.c + 40935 ./src/select.c + 8352 ./src/sigfile.c + 14349 ./src/signal.c + 7223 ./src/strftime.c + 39815 ./src/string.c 13345 ./src/tags.c - 17571 ./src/tcurses.c + 17579 ./src/tcurses.c 3070 ./src/tmpfile.c - 3558 ./src/my_tmpfile.c + 3560 ./src/my_tmpfile.c 41924 ./src/thread.c 2472 ./src/trace.c 4430 ./src/version.c 5498 ./src/wildmat.c - 7647 ./src/xface.c - 12946 ./src/xref.c + 7648 ./src/xface.c + 13148 ./src/xref.c 422 ./pcre/AUTHORS 2515 ./pcre/COPYING 118928 ./pcre/ChangeLog @@ -165,7 +165,7 @@ MANIFEST for tin-2.4.2 (Sun Dec 24 12:52 6369 ./pcre/dftables.c 1171 ./pcre/pcre-config.in 12396 ./pcre/pcre.h - 172486 ./pcre/pcre_compile.c + 172488 ./pcre/pcre_compile.c 3504 ./pcre/pcre_config.c 80853 ./pcre/pcre_dfa_exec.c 126511 ./pcre/pcre_exec.c @@ -179,7 +179,7 @@ MANIFEST for tin-2.4.2 (Sun Dec 24 12:52 2973 ./pcre/pcre_ord2utf8.c 13710 ./pcre/pcre_printint.src 3315 ./pcre/pcre_refcount.c - 17616 ./pcre/pcre_study.c + 17615 ./pcre/pcre_study.c 9041 ./pcre/pcre_tables.c 5354 ./pcre/pcre_try_flipped.c 6054 ./pcre/pcre_ucp_searchfuncs.c @@ -215,8 +215,8 @@ MANIFEST for tin-2.4.2 (Sun Dec 24 12:52 108966 ./pcre/testdata/testoutput7 53056 ./pcre/testdata/testoutput8 28769 ./pcre/testdata/testoutput9 - 21279 ./include/autoconf.hin - 22360 ./src/Makefile.in + 21699 ./include/autoconf.hin + 22391 ./src/Makefile.in 10242 ./src/tincfg.tbl 1397 ./libcanlock/COPYING 608 ./libcanlock/ChangeLog @@ -226,18 +226,20 @@ MANIFEST for tin-2.4.2 (Sun Dec 24 12:52 608 ./libcanlock/ChangeLog_V3 15752 ./libcanlock/INSTALL 1397 ./libcanlock/LICENSE - 1407 ./libcanlock/Makefile.in - 2517 ./libcanlock/README + 1620 ./libcanlock/Makefile.in + 2638 ./libcanlock/README 4015 ./libcanlock/src/base64.c 11501 ./libcanlock/src/canlock.c - 7031 ./libcanlock/src/hmac.c - 4207 ./libcanlock/src/secret.c - 12539 ./libcanlock/src/sha1.c - 18165 ./libcanlock/src/sha224-256.c - 37471 ./libcanlock/src/sha384-512.c + 7518 ./libcanlock/src/hmac.c + 4161 ./libcanlock/src/secret.c + 12652 ./libcanlock/src/sha1.c + 18257 ./libcanlock/src/sha224-256.c + 37638 ./libcanlock/src/sha384-512.c 7136 ./libcanlock/src/usha.c 1905 ./libcanlock/include/base64.h - 4064 ./libcanlock/include/canlock.h + 4214 ./libcanlock/include/canlock.h + 1809 ./libcanlock/include/canlock-private.h + 265 ./libcanlock/include/config.h 1088 ./libcanlock/include/sha-private.h 14049 ./libcanlock/include/sha.h 8949 ./libcanlock/test/canlocktest.c @@ -277,34 +279,39 @@ MANIFEST for tin-2.4.2 (Sun Dec 24 12:52 4481 ./intl/textdomain.c 41 ./intl/VERSION 5096 ./po/Makefile.inn - 847 ./po/POTFILES.in - 145734 ./po/tin.pot - 176640 ./po/da.gmo - 228516 ./po/da.po - 199633 ./po/de.gmo - 238915 ./po/de.po - 8584 ./po/en_GB.gmo - 149397 ./po/en_GB.po - 187510 ./po/et.gmo - 227280 ./po/et.po - 195769 ./po/fr.gmo - 236189 ./po/fr.po - 121367 ./po/ru.gmo - 208734 ./po/ru.po - 22543 ./po/sv.gmo - 156363 ./po/sv.po - 199229 ./po/tr.gmo - 240716 ./po/tr.po - 226155 ./po/zh_CN.po - 182329 ./po/zh_CN.gmo - 225524 ./po/zh_TW.po - 182460 ./po/zh_TW.gmo - 148423 ./doc/l10n/de/tin.1 - 86829 ./doc/l10n/de/tin.5 + 544 ./po/POTFILES.in + 145841 ./po/tin.pot + 172350 ./po/da.gmo + 229007 ./po/da.po + 199807 ./po/de.gmo + 239055 ./po/de.po + 8616 ./po/en_GB.gmo + 149515 ./po/en_GB.po + 1594 ./po/es.gmo + 174548 ./po/es.po + 184162 ./po/et.gmo + 227294 ./po/et.po + 194376 ./po/fr.gmo + 236504 ./po/fr.po + 120933 ./po/ru.gmo + 209125 ./po/ru.po + 22469 ./po/sv.gmo + 156470 ./po/sv.po + 194850 ./po/tr.gmo + 241216 ./po/tr.po + 226635 ./po/zh_CN.po + 178174 ./po/zh_CN.gmo + 226004 ./po/zh_TW.po + 178302 ./po/zh_TW.gmo + 149042 ./doc/l10n/de/tin.1 + 87301 ./doc/l10n/de/tin.5 130 ./doc/l10n/de.add - 375226 ./doc/l10n/de.po - 142131 ./doc/l10n/en_GB/tin.1 - 84013 ./doc/l10n/en_GB/tin.5 - 467528 ./doc/l10n/en_GB.po - 294595 ./doc/l10n/tin-man.pot -12026223 total + 378677 ./doc/l10n/de.po + 142678 ./doc/l10n/en_GB/tin.1 + 84238 ./doc/l10n/en_GB/tin.5 + 467871 ./doc/l10n/en_GB.po + 142761 ./doc/l10n/es/tin.1 + 84229 ./doc/l10n/es/tin.5 + 308069 ./doc/l10n/es.po + 294874 ./doc/l10n/tin-man.pot +12954390 total diff -Nurp '--exclude=.bzr*' tin-2.4.2/Makefile tin-2.4.3/Makefile --- tin-2.4.2/Makefile 2017-12-24 12:52:06.000000000 +0100 +++ tin-2.4.3/Makefile 2018-12-24 10:28:03.532000231 +0100 @@ -1,7 +1,7 @@ # Top level Makefile for tin # - for configuration options read the doc/INSTALL file. # -# Updated: 2017-08-09 +# Updated: 2018-12-04 # SHELL = @SHELL@ @@ -9,9 +9,9 @@ SHELL = @SHELL@ PROJECT = tin LVER = 2 PVER = 4 -SVER = 2 +SVER = 3 VER = $(LVER).$(PVER).$(SVER) -DVER = 20171224 +DVER = 20181224 EXE = tin # directory structure @@ -275,6 +275,8 @@ CAN = \ $(CANDIR)/src/usha.c \ $(CANDIR)/include/base64.h \ $(CANDIR)/include/canlock.h \ + $(CANDIR)/include/canlock-private.h \ + $(CANDIR)/include/config.h \ $(CANDIR)/include/sha-private.h \ $(CANDIR)/include/sha.h \ $(CANDIR)/test/canlocktest.c \ @@ -331,6 +333,8 @@ POFILES = \ $(PODIR)/de.po \ $(PODIR)/en_GB.gmo \ $(PODIR)/en_GB.po \ + $(PODIR)/es.gmo \ + $(PODIR)/es.po \ $(PODIR)/et.gmo \ $(PODIR)/et.po \ $(PODIR)/fr.gmo \ @@ -354,6 +358,9 @@ L10NFILES = \ $(L10NDIR)/en_GB/tin.1 \ $(L10NDIR)/en_GB/tin.5 \ $(L10NDIR)/en_GB.po \ + $(L10NDIR)/es/tin.1 \ + $(L10NDIR)/es/tin.5 \ + $(L10NDIR)/es.po \ $(L10NDIR)/tin-man.pot ALL_FILES = $(TOP) $(DOC) $(TOL) $(HFILES) $(CFILES) $(PCRE) $(MISC) $(CAN) $(INTLFILES) $(POFILES) $(L10NFILES) diff -Nurp '--exclude=.bzr*' tin-2.4.2/README tin-2.4.3/README --- tin-2.4.2/README 2017-05-03 19:47:33.000000000 +0200 +++ tin-2.4.3/README 2018-12-05 09:55:20.729768320 +0100 @@ -7,12 +7,12 @@ check your local setup in: include/autoconf.h compile with: - make build (or cd src; make) + make build (or cd src && make) install with: make install -Install at your own risk. +Install and use at your own risk. For a more detailed description of all the configure options read doc/INSTALL. @@ -23,6 +23,9 @@ GO AND GET ONE AND CONFIGURE YOUR HOST - with other software, too.) Otherwise users may get "Invalid Sender" error messages and won't be able to post using the internal inews. +As the included pcre library is slightly outdated linking against a newer +version is recommended (configure --with-pcre ; see doc/INSTALL for details). + Before mailing a bug-report to tin-bugs@tin.org please check if you are using the latest (stable) release, and if not, please upgrade first! Have a look at the doc/TODO file for known bugs. If you still think you've found a diff -Nurp '--exclude=.bzr*' tin-2.4.2/aclocal.m4 tin-2.4.3/aclocal.m4 --- tin-2.4.2/aclocal.m4 2017-12-08 08:53:14.000000000 +0100 +++ tin-2.4.3/aclocal.m4 2018-12-05 00:36:36.561435853 +0100 @@ -2,10 +2,10 @@ dnl Project : tin - a Usenet reader dnl Module : aclocal.m4 dnl Author : Thomas E. Dickey dnl Created : 1995-08-24 -dnl Updated : 2017-09-23 +dnl Updated : 2018-12-03 dnl Notes : dnl -dnl Copyright (c) 1995-2018 Thomas E. Dickey +dnl Copyright (c) 1995-2019 Thomas E. Dickey dnl All rights reserved. dnl dnl Redistribution and use in source and binary forms, with or without @@ -425,7 +425,7 @@ fi AC_SUBST($1)dnl ])dnl dnl --------------------------------------------------------------------------- -dnl AM_WITH_NLS version: 27 updated: 2017/07/10 20:13:33 +dnl AM_WITH_NLS version: 29 updated: 2018/02/21 21:26:03 dnl ----------- dnl Inserted as requested by gettext 0.10.40 dnl File from /usr/share/aclocal @@ -586,7 +586,7 @@ AC_DEFUN([AM_WITH_NLS], CATOBJEXT=.gmo fi - else + elif test -z "$MSGFMT" || test -z "$XGETTEXT" ; then AC_MSG_WARN(disabling NLS feature) sed -e /ENABLE_NLS/d confdefs.h >confdefs.tmp mv confdefs.tmp confdefs.h @@ -646,12 +646,12 @@ AC_DEFUN([AM_WITH_NLS], if test "$XGETTEXT" != ":"; then AC_OUTPUT_COMMANDS( [for ac_file in $CONFIG_FILES; do - + # Support "outfile[:infile[:infile...]]" case "$ac_file" in (*:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; esac - + # PO directories have a Makefile.in generated from Makefile.inn. case "$ac_file" in (*/[Mm]akefile.in) @@ -663,13 +663,13 @@ AC_DEFUN([AM_WITH_NLS], # In autoconf-2.13 it is called $ac_given_srcdir. # In autoconf-2.50 it is called $srcdir. test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - + case "$ac_given_srcdir" in (.) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; (/*) top_srcdir="$ac_given_srcdir" ;; (*) top_srcdir="$ac_dots$ac_given_srcdir" ;; esac - + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then rm -f "$ac_dir/POTFILES" test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" @@ -680,13 +680,13 @@ AC_DEFUN([AM_WITH_NLS], ;; esac done]) - + dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL dnl to 'yes' because some of the testsuite requires it. if test "$PACKAGE" = gettext; then BUILD_INCLUDED_LIBINTL=yes fi - + dnl intl/plural.c is generated from intl/plural.y. It requires bison, dnl because plural.y uses bison specific features. It requires at least dnl bison-1.26 because earlier versions generate a plural.c that doesn't @@ -719,7 +719,7 @@ changequote([,])dnl 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 dnl in configure.in. @@ -871,7 +871,7 @@ AC_SUBST(EXTRA_CPPFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_INCDIR version: 14 updated: 2015/05/25 20:53:04 +dnl CF_ADD_INCDIR version: 15 updated: 2018/06/20 20:23:13 dnl ------------- dnl Add an include-directory to $CPPFLAGS. Don't add /usr/include, since it's dnl redundant. We don't normally need to add -I/usr/local/include for gcc, @@ -902,7 +902,7 @@ if test -n "$1" ; then if test "$GCC" = yes then cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + CF_APPEND_TEXT(CPPFLAGS,-I$cf_add_incdir) AC_TRY_COMPILE([#include ], [printf("Hello")], [], @@ -1282,7 +1282,7 @@ fi AC_SUBST(ARFLAGS) ]) dnl --------------------------------------------------------------------------- -dnl CF_BUILD_CC version: 7 updated: 2012/10/06 15:31:55 +dnl CF_BUILD_CC version: 8 updated: 2018/01/04 20:31:04 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 @@ -1307,7 +1307,7 @@ if test "$cross_compiling" = yes ; then AC_ARG_WITH(build-cc, [ --with-build-cc=XXX the build C compiler ($BUILD_CC)], [BUILD_CC="$withval"], - [AC_CHECK_PROGS(BUILD_CC, gcc cc cl)]) + [AC_CHECK_PROGS(BUILD_CC, [gcc clang c99 c89 cc cl],none)]) AC_MSG_CHECKING(for native build C compiler) AC_MSG_RESULT($BUILD_CC) @@ -1374,7 +1374,7 @@ AC_SUBST(BUILD_EXEEXT) AC_SUBST(BUILD_OBJEXT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_BUNDLED_INTL version: 18 updated: 2015/05/10 19:52:14 +dnl CF_BUNDLED_INTL version: 19 updated: 2018/06/20 20:23:13 dnl --------------- dnl Top-level macro for configuring an application with a bundled copy of dnl the intl and po directories for gettext. @@ -1470,7 +1470,7 @@ else fi if test -z "$INTLDIR_MAKE" ; then - CPPFLAGS="$CPPFLAGS -I../intl" + CF_APPEND_TEXT(CPPFLAGS,-I../intl) fi dnl FIXME: we use this in lynx (the alternative is a spurious dependency upon @@ -1541,7 +1541,7 @@ AC_SUBST(PCREDIR_LIBS) AC_SUBST(PCREDIR_CPPFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CC_ENV_FLAGS version: 8 updated: 2017/09/23 08:50:24 +dnl CF_CC_ENV_FLAGS version: 9 updated: 2018/07/29 18:03:26 dnl --------------- dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content dnl into CC. This will not help with broken scripts that wrap the compiler @@ -1558,11 +1558,28 @@ AC_DEFUN([CF_CC_ENV_FLAGS], # This should have been defined by AC_PROG_CC : ${CC:=cc} +AC_MSG_CHECKING(\$CFLAGS variable) +case "x$CFLAGS" in +(*-[[IUD]]*) + AC_MSG_RESULT(broken) + AC_MSG_WARN(your environment uses the CFLAGS variable to hold CPPFLAGS options) + cf_flags="$CFLAGS" + CFLAGS= + for cf_arg in $cf_flags + do + CF_ADD_CFLAGS($cf_arg) + done + ;; +(*) + AC_MSG_RESULT(ok) + ;; +esac + AC_MSG_CHECKING(\$CC variable) case "$CC" in (*[[\ \ ]]-*) AC_MSG_RESULT(broken) - AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options) + AC_MSG_WARN(your environment uses the CC variable to hold CFLAGS/CPPFLAGS options) # humor him... cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[[ ]]* / /g' -e 's/[[ ]]*[[ ]]-[[^ ]].*//'` cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", [substr]([$]0,1+length(prog))); }'` @@ -2004,7 +2021,7 @@ CF_NCURSES_VERSION CF_CURSES_LIBS ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_CPPFLAGS version: 12 updated: 2015/04/15 19:08:48 +dnl CF_CURSES_CPPFLAGS version: 13 updated: 2018/06/20 20:23:13 dnl ------------------ dnl Look for the curses headers. AC_DEFUN([CF_CURSES_CPPFLAGS],[ @@ -2029,7 +2046,10 @@ case $host_os in ;; esac ]) -test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir" +if test "$cf_cv_curses_incdir" != no +then + CF_APPEND_TEXT(CPPFLAGS,$cf_cv_curses_incdir) +fi CF_CURSES_HEADER CF_TERM_HEADER @@ -2062,7 +2082,7 @@ fi AC_CHECK_HEADERS($cf_cv_ncurses_header) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_LIBS version: 40 updated: 2017/09/07 17:06:24 +dnl CF_CURSES_LIBS version: 42 updated: 2018/06/20 20:23:13 dnl -------------- dnl Look for the curses libraries. Older curses implementations may require dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first. @@ -2095,7 +2115,7 @@ case $host_os in AC_CHECK_LIB(Hcurses,initscr,[ # HP's header uses __HP_CURSES, but user claims _HP_CURSES. CF_ADD_LIBS(-lHcurses) - CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES" + CF_APPEND_TEXT(CPPFLAGS,-D__HP_CURSES -D_HP_CURSES) ac_cv_func_initscr=yes ])]) fi @@ -2144,7 +2164,10 @@ if test ".$ac_cv_func_initscr" != .yes ; AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[ for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown do - AC_CHECK_LIB($cf_term_lib,tgoto,[break]) + AC_CHECK_LIB($cf_term_lib,tgoto,[ + : ${cf_nculib_root:=$cf_term_lib} + break + ]) done ]) fi @@ -2699,7 +2722,7 @@ fi ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FIND_LINKAGE version: 20 updated: 2015/04/18 08:56:57 +dnl CF_FIND_LINKAGE version: 21 updated: 2018/06/20 20:23:13 dnl --------------- dnl Find a library (specifically the linkage used in the code fragment), dnl searching for it if it is not already in the library path. @@ -2758,7 +2781,8 @@ AC_TRY_LINK([$1],[$2],[ do if test -d $cf_cv_header_path_$3 ; then CF_VERBOSE(... testing $cf_cv_header_path_$3) - CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_$3" + CPPFLAGS="$cf_save_CPPFLAGS" + CF_APPEND_TEXT(CPPFLAGS,-I$cf_cv_header_path_$3) AC_TRY_COMPILE([$1],[$2],[ CF_VERBOSE(... found $3 headers in $cf_cv_header_path_$3) cf_cv_find_linkage_$3=maybe @@ -3074,7 +3098,7 @@ if test "$GCC" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_WARNINGS version: 32 updated: 2015/04/12 15:39:00 +dnl CF_GCC_WARNINGS version: 33 updated: 2018/06/20 20:23:13 dnl --------------- dnl Check if the compiler supports useful warning options. There's a few that dnl we don't use, simply because they're too noisy: @@ -3168,7 +3192,7 @@ then test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt) case $cf_opt in (Wcast-qual) - CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES" + CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES) ;; (Winline) case $GCC_VERSION in @@ -3195,7 +3219,7 @@ rm -rf conftest* AC_SUBST(EXTRA_CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GNU_SOURCE version: 7 updated: 2016/08/05 05:15:37 +dnl CF_GNU_SOURCE version: 9 updated: 2018/06/20 20:23:13 dnl ------------- dnl Check if we must define _GNU_SOURCE to get a reasonable value for dnl _XOPEN_SOURCE, upon which many POSIX definitions depend. This is a defect @@ -3203,38 +3227,101 @@ dnl (or misfeature) of glibc2, which bre dnl since it is interwoven with GNU extensions. dnl dnl Well, yes we could work around it... +dnl +dnl Parameters: +dnl $1 is the nominal value for _XOPEN_SOURCE AC_DEFUN([CF_GNU_SOURCE], [ -AC_CACHE_CHECK(if we must define _GNU_SOURCE,cf_cv_gnu_source,[ +cf_gnu_xopen_source=ifelse($1,,500,$1) + +AC_CACHE_CHECK(if this is the GNU C library,cf_cv_gnu_library,[ AC_TRY_COMPILE([#include ],[ -#ifndef _XOPEN_SOURCE -make an error -#endif], - [cf_cv_gnu_source=no], - [cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - AC_TRY_COMPILE([#include ],[ -#ifdef _XOPEN_SOURCE -make an error -#endif], - [cf_cv_gnu_source=no], - [cf_cv_gnu_source=yes]) - CPPFLAGS="$cf_save" - ]) + #if __GLIBC__ > 0 && __GLIBC_MINOR__ >= 0 + return 0; + #else + # error not GNU C library + #endif], + [cf_cv_gnu_library=yes], + [cf_cv_gnu_library=no]) ]) -if test "$cf_cv_gnu_source" = yes -then -AC_CACHE_CHECK(if we should also define _DEFAULT_SOURCE,cf_cv_default_source,[ -CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - AC_TRY_COMPILE([#include ],[ -#ifdef _DEFAULT_SOURCE -make an error -#endif], - [cf_cv_default_source=no], - [cf_cv_default_source=yes]) +if test x$cf_cv_gnu_library = xyes; then + + # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE + # was changed to help a little... + AC_CACHE_CHECK(if _DEFAULT_SOURCE can be used as a basis,cf_cv_gnu_library_219,[ + cf_save="$CPPFLAGS" + CF_APPEND_TEXT(CPPFLAGS,-D_DEFAULT_SOURCE) + AC_TRY_COMPILE([#include ],[ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 19) || (__GLIBC__ > 2) + return 0; + #else + # error GNU C library __GLIBC__.__GLIBC_MINOR__ is too old + #endif], + [cf_cv_gnu_library_219=yes], + [cf_cv_gnu_library_219=no]) + CPPFLAGS="$cf_save" ]) -test "$cf_cv_default_source" = yes && CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE" + + if test "x$cf_cv_gnu_library_219" = xyes; then + cf_save="$CPPFLAGS" + AC_CACHE_CHECK(if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE,cf_cv_gnu_dftsrc_219,[ + CF_ADD_CFLAGS(-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=$cf_gnu_xopen_source) + AC_TRY_COMPILE([ + #include + #include + ],[ + #if (_XOPEN_SOURCE >= $cf_gnu_xopen_source) && (MB_LEN_MAX > 1) + return 0; + #else + # error GNU C library is too old + #endif], + [cf_cv_gnu_dftsrc_219=yes], + [cf_cv_gnu_dftsrc_219=no]) + ]) + test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save" + else + cf_cv_gnu_dftsrc_219=maybe + fi + + if test "x$cf_cv_gnu_dftsrc_219" != xyes; then + + AC_CACHE_CHECK(if we must define _GNU_SOURCE,cf_cv_gnu_source,[ + AC_TRY_COMPILE([#include ],[ + #ifndef _XOPEN_SOURCE + #error expected _XOPEN_SOURCE to be defined + #endif], + [cf_cv_gnu_source=no], + [cf_save="$CPPFLAGS" + CF_ADD_CFLAGS(-D_GNU_SOURCE) + AC_TRY_COMPILE([#include ],[ + #ifdef _XOPEN_SOURCE + #error expected _XOPEN_SOURCE to be undefined + #endif], + [cf_cv_gnu_source=no], + [cf_cv_gnu_source=yes]) + CPPFLAGS="$cf_save" + ]) + ]) + + if test "$cf_cv_gnu_source" = yes + then + AC_CACHE_CHECK(if we should also define _DEFAULT_SOURCE,cf_cv_default_source,[ + CF_APPEND_TEXT(CPPFLAGS,-D_GNU_SOURCE) + AC_TRY_COMPILE([#include ],[ + #ifdef _DEFAULT_SOURCE + #error expected _DEFAULT_SOURCE to be undefined + #endif], + [cf_cv_default_source=no], + [cf_cv_default_source=yes]) + ]) + if test "$cf_cv_default_source" = yes + then + CF_APPEND_TEXT(CPPFLAGS,-D_DEFAULT_SOURCE) + fi + fi + fi + fi ])dnl dnl --------------------------------------------------------------------------- @@ -3457,7 +3544,7 @@ done ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MAKEFLAGS version: 17 updated: 2015/08/05 20:44:28 +dnl CF_MAKEFLAGS version: 18 updated: 2018/02/21 21:26:03 dnl ------------ dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make' dnl options to lower-levels. It's very useful for "make -n" -- if we have it. @@ -3486,8 +3573,10 @@ CF_EOF esac break ;; - (.-) ;; - (*) echo "given option \"$cf_option\", no match \"$cf_result\"" + (.-) + ;; + (*) + CF_MSG_LOG(given option \"$cf_option\", no match \"$cf_result\") ;; esac done @@ -3567,7 +3656,7 @@ printf("old\n"); ,[$1=no]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CONFIG version: 18 updated: 2017/07/23 18:30:00 +dnl CF_NCURSES_CONFIG version: 21 updated: 2018/06/20 20:23:13 dnl ----------------- dnl Tie together the configure-script macros for ncurses, preferring these in dnl order: @@ -3592,7 +3681,7 @@ if test "x${PKG_CONFIG:=none}" != xnone; cf_save_CPPFLAGS="$CPPFLAGS" cf_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags $cf_ncuconfig_root`" + CF_ADD_CFLAGS(`$PKG_CONFIG --cflags $cf_ncuconfig_root`) CF_ADD_LIBS(`$PKG_CONFIG --libs $cf_ncuconfig_root`) AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], @@ -3614,8 +3703,8 @@ if test "x${PKG_CONFIG:=none}" != xnone; else AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries]) NCURSES_CONFIG_PKG=$cf_ncuconfig_root + CF_TERM_HEADER fi - CF_TERM_HEADER else AC_MSG_RESULT(no) @@ -3626,15 +3715,15 @@ else fi if test "x$cf_have_ncuconfig" = "xno"; then - echo "Looking for ${cf_ncuconfig_root}-config" + cf_ncurses_config="${cf_ncuconfig_root}${NCURSES_CONFIG_SUFFIX}-config"; echo "Looking for ${cf_ncurses_config}" CF_ACVERSION_CHECK(2.52, - [AC_CHECK_TOOLS(NCURSES_CONFIG, ${cf_ncuconfig_root}-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)], - [AC_PATH_PROGS(NCURSES_CONFIG, ${cf_ncuconfig_root}-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)]) + [AC_CHECK_TOOLS(NCURSES_CONFIG, ${cf_ncurses_config} ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)], + [AC_PATH_PROGS(NCURSES_CONFIG, ${cf_ncurses_config} ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)]) if test "$NCURSES_CONFIG" != none ; then - CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" + CF_ADD_CFLAGS(`$NCURSES_CONFIG --cflags`) CF_ADD_LIBS(`$NCURSES_CONFIG --libs`) # even with config script, some packages use no-override for curses.h @@ -4202,7 +4291,7 @@ case ".[$]$1" in esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PDCURSES_X11 version: 13 updated: 2012/10/06 16:39:58 +dnl CF_PDCURSES_X11 version: 14 updated: 2018/06/20 20:23:13 dnl --------------- dnl Configure for PDCurses' X11 library AC_DEFUN([CF_PDCURSES_X11],[ @@ -4214,7 +4303,7 @@ CF_ACVERSION_CHECK(2.52, if test "$XCURSES_CONFIG" != none ; then -CPPFLAGS="$CPPFLAGS `$XCURSES_CONFIG --cflags`" +CF_ADD_CFLAGS(`$XCURSES_CONFIG --cflags`) CF_ADD_LIBS(`$XCURSES_CONFIG --libs`) cf_cv_lib_XCurses=yes @@ -4283,7 +4372,7 @@ fi AC_SUBST(PKG_CONFIG) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_POSIX_C_SOURCE version: 9 updated: 2015/04/12 15:39:00 +dnl CF_POSIX_C_SOURCE version: 10 updated: 2018/06/20 20:23:13 dnl ----------------- dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed. dnl @@ -4336,7 +4425,8 @@ make an error fi CF_MSG_LOG(ifdef from value $cf_POSIX_C_SOURCE) CFLAGS="$cf_trim_CFLAGS" - CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" + CPPFLAGS="$cf_trim_CPPFLAGS" + CF_APPEND_TEXT(CPPFLAGS,$cf_cv_posix_c_source) CF_MSG_LOG(if the second compile does not leave our definition intact error) AC_TRY_COMPILE([#include ],[ #ifndef _POSIX_C_SOURCE @@ -4417,7 +4507,7 @@ CF_ACVERSION_CHECK(2.52, CF_CC_ENV_FLAGS ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_EXT version: 13 updated: 2015/04/18 09:03:58 +dnl CF_PROG_EXT version: 14 updated: 2018/06/20 20:23:13 dnl ----------- dnl Compute $PROG_EXT, used for non-Unix ports, such as OS/2 EMX. AC_DEFUN([CF_PROG_EXT], @@ -4426,7 +4516,7 @@ AC_REQUIRE([CF_CHECK_CACHE]) case $cf_cv_system_name in (os2*) CFLAGS="$CFLAGS -Zmt" - CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__" + CF_APPEND_TEXT(CPPFLAGS,-D__ST_MT_ERRNO__) CXXFLAGS="$CXXFLAGS -Zmt" # autoconf's macro sets -Zexe and suffix both, which conflict:w LDFLAGS="$LDFLAGS -Zmt -Zcrtdll" @@ -4708,10 +4798,11 @@ AC_MSG_RESULT($cf_cv_sig_const) test "$cf_cv_sig_const" = yes && AC_DEFINE(DECL_SIG_CONST) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SIZECHANGE version: 11 updated: 2015/04/18 08:56:57 +dnl CF_SIZECHANGE version: 14 updated: 2018/06/20 20:23:13 dnl ------------- dnl Check for definitions & structures needed for window size-changing -dnl FIXME: check that this works with "snake" (HP-UX 10.x) +dnl +dnl https://stackoverflow.com/questions/18878141/difference-between-structures-ttysize-and-winsize/50769952#50769952 AC_DEFUN([CF_SIZECHANGE], [ AC_REQUIRE([CF_STRUCT_TERMIOS]) @@ -4723,7 +4814,10 @@ for cf_opts in "" "NEED_PTEM_H" do CPPFLAGS="$cf_save_CPPFLAGS" - test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" + if test -n "$cf_opts" + then + CF_APPEND_TEXT(CPPFLAGS,-D$cf_opts) + fi AC_TRY_COMPILE([#include #ifdef HAVE_TERMIOS_H #include @@ -4732,24 +4826,26 @@ do #include #endif #endif + #ifdef NEED_PTEM_H /* This is a workaround for SCO: they neglected to define struct winsize in * termios.h -- it's only in termio.h and ptem.h */ -#include -#include +#include +#include #endif -#if !defined(sun) || !defined(HAVE_TERMIOS_H) + +#ifdef HAVE_SYS_IOCTL_H #include #endif ],[ #ifdef TIOCGSIZE - struct ttysize win; /* FIXME: what system is this? */ + struct ttysize win; /* SunOS 3.0... */ int y = win.ts_lines; int x = win.ts_cols; #else #ifdef TIOCGWINSZ - struct winsize win; + struct winsize win; /* everything else */ int y = win.ws_row; int x = win.ws_col; #else @@ -4769,7 +4865,7 @@ do done ]) if test "$cf_cv_sizechange" != no ; then - AC_DEFINE(HAVE_SIZECHANGE,1,[Define to 1 if sizechar declarations are provided]) + AC_DEFINE(HAVE_SIZECHANGE,1,[Define to 1 if sizechange declarations are provided]) case $cf_cv_sizechange in (NEED*) AC_DEFINE_UNQUOTED($cf_cv_sizechange ) @@ -4868,7 +4964,7 @@ AC_DEFUN([CF_STRERROR],[ AC_CHECK_FUNCS(strerror, AC_DEFINE(HAVE_STRERROR),[CF_SYS_ERRLIST]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_STRUCT_TERMIOS version: 8 updated: 2015/04/15 19:08:48 +dnl CF_STRUCT_TERMIOS version: 9 updated: 2018/06/08 21:57:23 dnl ----------------- dnl Some machines require _POSIX_SOURCE to completely define struct termios. AC_DEFUN([CF_STRUCT_TERMIOS],[ @@ -4878,11 +4974,10 @@ AC_CHECK_HEADERS( \ termio.h \ termios.h \ unistd.h \ +sys/ioctl.h \ +sys/termio.h \ ) -if test "$ISC" = yes ; then - AC_CHECK_HEADERS( sys/termio.h ) -fi if test "$ac_cv_header_termios_h" = yes ; then case "$CFLAGS $CPPFLAGS" in (*-D_POSIX_SOURCE*) @@ -5241,7 +5336,7 @@ else fi ]) dnl --------------------------------------------------------------------------- -dnl CF_TRY_XOPEN_SOURCE version: 1 updated: 2011/10/30 17:09:50 +dnl CF_TRY_XOPEN_SOURCE version: 2 updated: 2018/06/20 20:23:13 dnl ------------------- dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we dnl can define it successfully. @@ -5257,7 +5352,7 @@ make an error #endif], [cf_cv_xopen_source=no], [cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + CF_APPEND_TEXT(CPPFLAGS,-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE) AC_TRY_COMPILE([ #include #include @@ -5428,6 +5523,91 @@ AC_DEFUN([CF_UPPER], $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` ])dnl dnl --------------------------------------------------------------------------- +dnl CF_VA_COPY version: 5 updated: 2018/12/03 20:07:13 +dnl ---------- +dnl check for va_copy, part of stdarg.h starting with ISO C 1999. +dnl Also, workaround for glibc's __va_copy, by checking for both. +dnl Finally, try to accommodate pre-ISO C 1999 headers. +AC_DEFUN([CF_VA_COPY],[ +AC_CACHE_CHECK(for va_copy, cf_cv_have_va_copy,[ +AC_TRY_LINK([ +#include +],[ + static va_list dst; + static va_list src; + va_copy(dst, src)], + cf_cv_have_va_copy=yes, + cf_cv_have_va_copy=no)]) + +if test "$cf_cv_have_va_copy" = yes; +then + AC_DEFINE(HAVE_VA_COPY,1,[Define to 1 if we have va_copy]) +else # !cf_cv_have_va_copy + +AC_CACHE_CHECK(for __va_copy, cf_cv_have___va_copy,[ +AC_TRY_LINK([ +#include +],[ + static va_list dst; + static va_list src; + __va_copy(dst, src)], + cf_cv_have___va_copy=yes, + cf_cv_have___va_copy=no)]) + +if test "$cf_cv_have___va_copy" = yes +then + AC_DEFINE(HAVE___VA_COPY,1,[Define to 1 if we have __va_copy]) +else # !cf_cv_have___va_copy + +AC_CACHE_CHECK(for __builtin_va_copy, cf_cv_have___builtin_va_copy,[ +AC_TRY_LINK([ +#include +],[ + static va_list dst; + static va_list src; + __builtin_va_copy(dst, src)], + cf_cv_have___builtin_va_copy=yes, + cf_cv_have___builtin_va_copy=no)]) + +test "$cf_cv_have___builtin_va_copy" = yes && + AC_DEFINE(HAVE___BUILTIN_VA_COPY,1,[Define to 1 if we have __builtin_va_copy]) + +fi # cf_cv_have___va_copy + +fi # cf_cv_have_va_copy + +case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy}" in +(*yes*) + ;; + +(*) + AC_CACHE_CHECK(if we can simply copy va_list, cf_cv_pointer_va_list,[ +AC_TRY_LINK([ +#include +],[ + va_list dst; + va_list src; + dst = src], + cf_cv_pointer_va_list=yes, + cf_cv_pointer_va_list=no)]) + + if test "$cf_cv_pointer_va_list" = no + then + AC_CACHE_CHECK(if we can copy va_list indirectly, cf_cv_array_va_list,[ +AC_TRY_LINK([ +#include +],[ + va_list dst; + va_list src; + *dst = *src], + cf_cv_array_va_list=yes, + cf_cv_array_va_list=no)]) + test "$cf_cv_array_va_list" = yes && AC_DEFINE(ARRAY_VA_LIST,1,[Define to 1 if we can copy va_list indirectly]) + fi + ;; +esac +]) +dnl --------------------------------------------------------------------------- dnl CF_VERBOSE version: 3 updated: 2007/07/29 09:55:12 dnl ---------- dnl Use AC_VERBOSE w/o the warnings @@ -5613,7 +5793,7 @@ AC_DEFUN([CF_WITH_VALUE], AC_DEFINE_UNQUOTED($3,"$withval")dnl ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_CURSES version: 13 updated: 2015/12/12 20:59:52 +dnl CF_XOPEN_CURSES version: 14 updated: 2018/06/20 20:23:13 dnl --------------- dnl Test if we should define X/Open source for curses, needed on Digital Unix dnl 4.x, to see the extended functions, but breaks on IRIX 6.x. @@ -5662,13 +5842,13 @@ AC_TRY_LINK([ case $cf_cv_need_xopen_extension in (*_*) - CPPFLAGS="$CPPFLAGS -D$cf_cv_need_xopen_extension" + CF_APPEND_TEXT(CPPFLAGS,-D$cf_cv_need_xopen_extension) ;; esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 52 updated: 2016/08/27 12:21:42 +dnl CF_XOPEN_SOURCE version: 54 updated: 2018/11/07 07:43:44 dnl --------------- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, dnl or adapt to the vendor's definitions to get equivalent functionality, @@ -5698,7 +5878,7 @@ case $host_os in cf_xopen_source="-D_DARWIN_C_SOURCE" cf_XOPEN_SOURCE= ;; -(freebsd*|dragonfly*) +(freebsd*|dragonfly*|midnightbsd*) # 5.x headers associate # _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L # _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L @@ -5717,7 +5897,7 @@ case $host_os in cf_XOPEN_SOURCE= ;; (linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin) - CF_GNU_SOURCE + CF_GNU_SOURCE($cf_XOPEN_SOURCE) ;; (minix*) cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this... @@ -5907,7 +6087,7 @@ if test -z "$cf_x_athena_lib" ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_X_ATHENA_CPPFLAGS version: 5 updated: 2010/05/26 17:35:30 +dnl CF_X_ATHENA_CPPFLAGS version: 6 updated: 2018/06/20 20:23:13 dnl -------------------- dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw. @@ -5926,7 +6106,8 @@ do cf_save="$CPPFLAGS" cf_test=X11/$cf_x_athena_root/SimpleMenu.h if test $cf_path != default ; then - CPPFLAGS="$cf_save -I$cf_path/include" + CPPFLAGS="$cf_save" + CF_APPEND_TEXT(CPPFLAGS,-I$cf_path/include) AC_MSG_CHECKING(for $cf_test in $cf_path) else AC_MSG_CHECKING(for $cf_test) @@ -5950,7 +6131,7 @@ if test -z "$cf_x_athena_inc" ; then AC_MSG_WARN( [Unable to successfully find Athena header files with test program]) elif test "$cf_x_athena_inc" != default ; then - CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc" + CF_APPEND_TEXT(CPPFLAGS,-I$cf_x_athena_inc) fi ]) dnl --------------------------------------------------------------------------- diff -Nurp '--exclude=.bzr*' tin-2.4.2/conf-tin tin-2.4.3/conf-tin --- tin-2.4.2/conf-tin 2017-05-03 19:47:33.000000000 +0200 +++ tin-2.4.3/conf-tin 2018-12-05 08:24:03.355467684 +0100 @@ -54,6 +54,7 @@ $SHELL ./configure --verbose \ --disable-echo \ --enable-prototypes \ --enable-nntp-only \ + --with-pcre \ --with-domain-name=/etc/NNTP_INEWS_DOMAIN \ --with-coffee \ $OPTS $* 2>&1 |tee -a $OUT diff -Nurp '--exclude=.bzr*' tin-2.4.2/config.guess tin-2.4.3/config.guess --- tin-2.4.2/config.guess 2017-12-17 15:17:04.000000000 +0100 +++ tin-2.4.3/config.guess 2018-12-21 09:09:55.426866132 +0100 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2017 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2017-12-17' +timestamp='2018-12-07' # 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 @@ -31,6 +31,7 @@ timestamp='2017-12-17' # # Please send patches to . + me=`echo "$0" | sed -e 's,.*/,,'` usage="\ @@ -49,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2017 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -83,8 +84,6 @@ if test $# != 0; then exit 1 fi -trap 'exit 1' 1 2 15 - # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires # temporary files to be created and, as you can see below, it is a @@ -95,34 +94,38 @@ trap 'exit 1' 1 2 15 # Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +tmp= +# shellcheck disable=SC2172 +trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 + +set_cc_for_build() { + : "${TMPDIR=/tmp}" + # shellcheck disable=SC2039 + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } + dummy=$tmp/dummy + case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in + ,,) echo "int x;" > "$dummy.c" + for driver in cc gcc c89 c99 ; do + if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then + CC_FOR_BUILD="$driver" + break + fi + done + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; + esac +} # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then +if test -f /.attbin/uname ; then PATH=$PATH:/.attbin ; export PATH fi @@ -131,30 +134,37 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in - Linux|GNU|GNU/*) +case "$UNAME_SYSTEM" in +Linux|GNU|GNU/*) # If the system lacks a compiler, then just pick glibc. # We could probably try harder. LIBC=gnu - eval $set_cc_for_build - cat <<-EOF > $dummy.c -#include -#if defined(__UCLIBC__) -LIBC=uclibc -#elif defined(__dietlibc__) -LIBC=dietlibc -#else -LIBC=gnu -#endif + set_cc_for_build + cat <<-EOF > "$dummy.c" + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + + # If ldd exists, use it to detect musl libc. + if command -v ldd >/dev/null && \ + ldd --version 2>&1 | grep -q ^musl + then + LIBC=musl + fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -168,30 +178,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - /sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || \ + "/sbin/$sysctl" 2>/dev/null || \ + "/usr/sbin/$sysctl" 2>/dev/null || \ echo unknown)` - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; earmv*) - arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` - endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` - machine=${arch}${endian}-unknown + arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` + machine="${arch}${endian}"-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + *) machine="$UNAME_MACHINE_ARCH"-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in earm*) - os=netbsdelf - ;; + os=netbsdelf + ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build + set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -207,10 +217,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ ;; esac # Determine ABI tags. - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` ;; esac # The OS release @@ -218,61 +228,61 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in + case "$UNAME_VERSION" in Debian*) release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` + release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}${abi}" + echo "$machine-${os}${release}${abi-}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" exit ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" exit ;; *:MidnightBSD:*:*) - echo ${UNAME_MACHINE}-unknown-midnightbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" exit ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" exit ;; *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:Sortix:*:*) - echo ${UNAME_MACHINE}-unknown-sortix + echo "$UNAME_MACHINE"-unknown-sortix exit ;; *:Redox:*:*) - echo ${UNAME_MACHINE}-unknown-redox + echo "$UNAME_MACHINE"-unknown-redox exit ;; mips:OSF1:*.*) - echo mips-dec-osf1 - exit ;; + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in - *4.0) + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; - *5.*) + *5.*) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac @@ -283,42 +293,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + 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/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 @@ -327,10 +337,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ echo m68k-unknown-sysv4 exit ;; *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos + echo "$UNAME_MACHINE"-unknown-amigaos exit ;; *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos + echo "$UNAME_MACHINE"-unknown-morphos exit ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -342,7 +352,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} + echo arm-acorn-riscix"$UNAME_RELEASE" exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos @@ -369,38 +379,38 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} + echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" + set_cc_for_build + SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH="x86_64" + SUN_ARCH=x86_64 fi fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in @@ -409,25 +419,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" exit ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" ;; sun4) - echo sparc-sun-sunos${UNAME_RELEASE} + echo sparc-sun-sunos"$UNAME_RELEASE" ;; esac exit ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} + echo sparc-auspex-sunos"$UNAME_RELEASE" exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not @@ -438,44 +448,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} + echo m68k-milan-mint"$UNAME_RELEASE" exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} + echo m68k-hades-mint"$UNAME_RELEASE" exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} + echo m68k-unknown-mint"$UNAME_RELEASE" exit ;; m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} + echo m68k-apple-machten"$UNAME_RELEASE" exit ;; powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} + echo powerpc-apple-machten"$UNAME_RELEASE" exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} + echo mips-dec-ultrix"$UNAME_RELEASE" exit ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} + echo vax-dec-ultrix"$UNAME_RELEASE" exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} + echo clipper-intergraph-clix"$UNAME_RELEASE" exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ int main (int argc, char *argv[]) { @@ -496,11 +506,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && + dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} + echo mips-mips-riscos"$UNAME_RELEASE" exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax @@ -526,17 +536,17 @@ EOF AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] + if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ + [ "$TARGET_BINARY_INTERFACE"x = x ] then - echo m88k-dg-dgux${UNAME_RELEASE} + echo m88k-dg-dgux"$UNAME_RELEASE" else - echo m88k-dg-dguxbcs${UNAME_RELEASE} + echo m88k-dg-dguxbcs"$UNAME_RELEASE" fi else - echo i586-dg-dgux${UNAME_RELEASE} + echo i586-dg-dgux"$UNAME_RELEASE" fi exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) @@ -553,7 +563,7 @@ EOF echo m68k-tektronix-bsd exit ;; *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id @@ -565,14 +575,14 @@ EOF if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #include main() @@ -583,7 +593,7 @@ EOF exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then echo "$SYSTEM_NAME" else @@ -597,18 +607,18 @@ EOF exit ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc fi if [ -x /usr/bin/lslpp ] ; then IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | - awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} + echo "$IBM_ARCH"-ibm-aix"$IBM_REV" exit ;; *:AIX:*:*) echo rs6000-ibm-aix @@ -617,7 +627,7 @@ EOF echo romp-ibm-bsd4.4 exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx @@ -632,67 +642,67 @@ EOF echo m68k-hp-bsd4.4 exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + case "$UNAME_MACHINE" in 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + case "$sc_cpu_version" in + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "$sc_kernel_bits" in + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 + esac ;; + esac fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + if [ "$HP_ARCH" = "" ]; then + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF - (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if [ "$HP_ARCH" = hppa2.0w ] then - eval $set_cc_for_build + set_cc_for_build # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -706,20 +716,20 @@ EOF if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} + echo "$HP_ARCH"-hp-hpux"$HPUX_REV" exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #include int main () @@ -744,7 +754,7 @@ EOF exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; @@ -765,9 +775,9 @@ EOF exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk + echo "$UNAME_MACHINE"-unknown-osf1mk else - echo ${UNAME_MACHINE}-unknown-osf1 + echo "$UNAME_MACHINE"-unknown-osf1 fi exit ;; parisc*:Lites*:*:*) @@ -792,179 +802,190 @@ EOF echo c4-convex-bsd exit ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" exit ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} + echo sparc-unknown-bsdi"$UNAME_RELEASE" exit ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" + exit ;; + arm:FreeBSD:*:*) + UNAME_PROCESSOR=`uname -p` + set_cc_for_build + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi + else + echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf + fi exit ;; *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in + UNAME_PROCESSOR=`/usr/bin/uname -p` + case "$UNAME_PROCESSOR" in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin + echo "$UNAME_MACHINE"-pc-cygwin exit ;; *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 + echo "$UNAME_MACHINE"-pc-mingw64 exit ;; *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 + echo "$UNAME_MACHINE"-pc-mingw32 exit ;; *:MSYS*:*) - echo ${UNAME_MACHINE}-pc-msys + echo "$UNAME_MACHINE"-pc-msys exit ;; i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 + echo "$UNAME_MACHINE"-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case "$UNAME_MACHINE" in x86) - echo i586-pc-interix${UNAME_RELEASE} + echo i586-pc-interix"$UNAME_RELEASE" exit ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} + echo x86_64-unknown-interix"$UNAME_RELEASE" exit ;; IA64) - echo ia64-unknown-interix${UNAME_RELEASE} + echo ia64-unknown-interix"$UNAME_RELEASE" exit ;; esac ;; i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin + echo "$UNAME_MACHINE"-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin + echo x86_64-pc-cygwin exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix + *:Minix:*:*) + echo "$UNAME_MACHINE"-unknown-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; arm*:Linux:*:*) - eval $set_cc_for_build + set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; e2k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; k1om:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #undef CPU #undef ${UNAME_MACHINE} #undef ${UNAME_MACHINE}el @@ -978,70 +999,70 @@ EOF #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" + test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } ;; mips64el:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} + echo or1k-unknown-linux-"$LIBC" exit ;; or32:Linux:*:* | or1k*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} + echo sparc-unknown-linux-"$LIBC" exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-unknown-linux-"$LIBC" exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; + PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; + *) echo hppa-unknown-linux-"$LIBC" ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-unknown-linux-"$LIBC" exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} + echo powerpc-unknown-linux-"$LIBC" exit ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} + echo powerpc64le-unknown-linux-"$LIBC" exit ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} + echo powerpcle-unknown-linux-"$LIBC" exit ;; riscv32:Linux:*:* | riscv64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1055,34 +1076,34 @@ EOF # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx + echo "$UNAME_MACHINE"-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop + echo "$UNAME_MACHINE"-unknown-stop exit ;; i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos + echo "$UNAME_MACHINE"-unknown-atheos exit ;; i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable + echo "$UNAME_MACHINE"-pc-syllable exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} + echo i386-unknown-lynxos"$UNAME_RELEASE" exit ;; i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp + echo "$UNAME_MACHINE"-pc-msdosdjgpp exit ;; i*86:*:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" fi exit ;; i*86:*:5:[678]*) @@ -1092,24 +1113,24 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv32 + echo "$UNAME_MACHINE"-pc-sysv32 fi exit ;; pc:*:*:*) @@ -1129,9 +1150,9 @@ EOF exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 fi exit ;; mini*:CTIX:SYS*5:*) @@ -1151,39 +1172,39 @@ EOF test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} + echo m68k-unknown-lynxos"$UNAME_RELEASE" exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} + echo sparc-unknown-lynxos"$UNAME_RELEASE" exit ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} + echo rs6000-unknown-lynxos"$UNAME_RELEASE" exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} + echo powerpc-unknown-lynxos"$UNAME_RELEASE" exit ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} + echo mips-dde-sysv"$UNAME_RELEASE" exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 @@ -1193,14 +1214,14 @@ EOF exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo "$UNAME_MACHINE"-sni-sysv4 else - echo ns32k-sni-sysv + echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says echo i586-unisys-sysv4 exit ;; *:UNIX_System_V:4*:FTX*) @@ -1214,23 +1235,23 @@ EOF exit ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos + echo "$UNAME_MACHINE"-stratus-vos exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos exit ;; mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} + echo m68k-apple-aux"$UNAME_RELEASE" exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv"$UNAME_RELEASE" else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv"$UNAME_RELEASE" fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. @@ -1249,43 +1270,43 @@ EOF echo x86_64-unknown-haiku exit ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} + echo sx4-nec-superux"$UNAME_RELEASE" exit ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} + echo sx5-nec-superux"$UNAME_RELEASE" exit ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} + echo sx6-nec-superux"$UNAME_RELEASE" exit ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} + echo sx7-nec-superux"$UNAME_RELEASE" exit ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} + echo sx8-nec-superux"$UNAME_RELEASE" exit ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} + echo sx8r-nec-superux"$UNAME_RELEASE" exit ;; SX-ACE:SUPER-UX:*:*) - echo sxace-nec-superux${UNAME_RELEASE} + echo sxace-nec-superux"$UNAME_RELEASE" exit ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} + echo powerpc-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build + set_cc_for_build if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in i386) UNAME_PROCESSOR=x86_64 ;; @@ -1294,8 +1315,8 @@ EOF fi # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_PPC >/dev/null + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null then UNAME_PROCESSOR=powerpc fi @@ -1309,30 +1330,33 @@ EOF # that Apple uses in portable devices. UNAME_PROCESSOR=x86_64 fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc + if test "$UNAME_PROCESSOR" = x86; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" exit ;; *:QNX:*:4*) echo i386-pc-qnx exit ;; NEO-*:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} + echo neo-tandem-nsk"$UNAME_RELEASE" exit ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} + echo nse-tandem-nsk"$UNAME_RELEASE" exit ;; NSR-*:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} + echo nsr-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSV-*:NONSTOP_KERNEL:*:*) + echo nsv-tandem-nsk"$UNAME_RELEASE" exit ;; NSX-*:NONSTOP_KERNEL:*:*) - echo nsx-tandem-nsk${UNAME_RELEASE} + echo nsx-tandem-nsk"$UNAME_RELEASE" exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux @@ -1341,18 +1365,19 @@ EOF echo bs2000-siemens-sysv exit ;; DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + # shellcheck disable=SC2154 + if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" fi - echo ${UNAME_MACHINE}-unknown-plan9 + echo "$UNAME_MACHINE"-unknown-plan9 exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 @@ -1373,14 +1398,14 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux"$UNAME_RELEASE" exit ;; *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in + case "$UNAME_MACHINE" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; V*) echo vax-dec-vms ; exit ;; @@ -1389,25 +1414,28 @@ EOF echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` + echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" exit ;; i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos + echo "$UNAME_MACHINE"-pc-rdos exit ;; i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros + echo "$UNAME_MACHINE"-pc-aros exit ;; x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx + echo "$UNAME_MACHINE"-unknown-esx exit ;; amd64:Isilon\ OneFS:*:*) echo x86_64-unknown-onefs exit ;; + *:Unleashed:*:*) + echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE" + exit ;; esac echo "$0: unable to guess system type" >&2 -case "${UNAME_MACHINE}:${UNAME_SYSTEM}" in +case "$UNAME_MACHINE:$UNAME_SYSTEM" in mips:Linux | mips64:Linux) # If we got here on MIPS GNU/Linux, output extra information. cat >&2 <&2 </ /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} +UNAME_MACHINE = "$UNAME_MACHINE" +UNAME_RELEASE = "$UNAME_RELEASE" +UNAME_SYSTEM = "$UNAME_SYSTEM" +UNAME_VERSION = "$UNAME_VERSION" EOF exit 1 # Local variables: -# eval: (add-hook 'write-file-functions 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nurp '--exclude=.bzr*' tin-2.4.2/config.sub tin-2.4.3/config.sub --- tin-2.4.2/config.sub 2017-11-28 00:36:10.000000000 +0100 +++ tin-2.4.3/config.sub 2018-12-16 17:21:12.074451571 +0100 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2017 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2017-11-23' +timestamp='2018-12-16' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -67,7 +67,7 @@ Report bugs and patches to &2 exit 1 ;; *local*) # First pass through any local machine types. - echo $1 + echo "$1" exit ;; * ) @@ -110,1252 +110,1160 @@ case $# in exit 1;; esac -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | cloudabi*-eabi* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* | \ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; - -bluegene*) - os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*178) - os=-lynxos178 - ;; - -lynx*5) - os=-lynxos5 +# Split fields of configuration type +IFS="-" read field1 field2 field3 field4 <&2 + exit 1 ;; - -lynx*) - os=-lynxos + *-*-*-*) + basic_machine=$field1-$field2 + os=$field3-$field4 ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + *-*-*) + # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two + # parts + maybe_os=$field2-$field3 + case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \ + | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \ + | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ + | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ + | storm-chaos* | os2-emx* | rtmk-nova*) + basic_machine=$field1 + os=$maybe_os + ;; + android-linux) + basic_machine=$field1-unknown + os=linux-android + ;; + *) + basic_machine=$field1-$field2 + os=$field3 + ;; + esac ;; - -psos*) - os=-psos + *-*) + # A lone config we happen to match not fitting any pattern + case $field1-$field2 in + decstation-3100) + basic_machine=mips-dec + os= + ;; + *-*) + # Second component is usually, but not always the OS + case $field2 in + # Prevent following clause from handling this valid os + sun*os*) + basic_machine=$field1 + os=$field2 + ;; + # Manufacturers + dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ + | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ + | unicom* | ibm* | next | hp | isi* | apollo | altos* \ + | convergent* | ncr* | news | 32* | 3600* | 3100* \ + | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ + | ultra | tti* | harris | dolphin | highlevel | gould \ + | cbm | ns | masscomp | apple | axis | knuth | cray \ + | microblaze* | sim | cisco \ + | oki | wec | wrs | winbond) + basic_machine=$field1-$field2 + os= + ;; + *) + basic_machine=$field1 + os=$field2 + ;; + esac + ;; + esac ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint + *) + # Convert single-component short-hands not valid as part of + # multi-component configurations. + case $field1 in + 386bsd) + basic_machine=i386-pc + os=bsd + ;; + a29khif) + basic_machine=a29k-amd + os=udi + ;; + adobe68k) + basic_machine=m68010-adobe + os=scout + ;; + alliant) + basic_machine=fx80-alliant + os= + ;; + altos | altos3068) + basic_machine=m68k-altos + os= + ;; + am29k) + basic_machine=a29k-none + os=bsd + ;; + amdahl) + basic_machine=580-amdahl + os=sysv + ;; + amiga) + basic_machine=m68k-unknown + os= + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=bsd + ;; + aros) + basic_machine=i386-pc + os=aros + ;; + aux) + basic_machine=m68k-apple + os=aux + ;; + balance) + basic_machine=ns32k-sequent + os=dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=linux + ;; + cegcc) + basic_machine=arm-unknown + os=cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=bsd + ;; + convex-c2) + basic_machine=c2-convex + os=bsd + ;; + convex-c32) + basic_machine=c32-convex + os=bsd + ;; + convex-c34) + basic_machine=c34-convex + os=bsd + ;; + convex-c38) + basic_machine=c38-convex + os=bsd + ;; + cray) + basic_machine=j90-cray + os=unicos + ;; + crds | unos) + basic_machine=m68k-crds + os= + ;; + da30) + basic_machine=m68k-da30 + os= + ;; + decstation | pmax | pmin | dec3100 | decstatn) + basic_machine=mips-dec + os= + ;; + delta88) + basic_machine=m88k-motorola + os=sysv3 + ;; + dicos) + basic_machine=i686-pc + os=dicos + ;; + djgpp) + basic_machine=i586-pc + os=msdosdjgpp + ;; + ebmon29k) + basic_machine=a29k-amd + os=ebmon + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=ose + ;; + gmicro) + basic_machine=tron-gmicro + os=sysv + ;; + go32) + basic_machine=i386-pc + os=go32 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=hms + ;; + harris) + basic_machine=m88k-harris + os=sysv3 + ;; + hp300) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=hpux + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=proelf + ;; + i386mach) + basic_machine=i386-mach + os=mach + ;; + vsta) + basic_machine=i386-pc + os=vsta + ;; + isi68 | isi) + basic_machine=m68k-isi + os=sysv + ;; + m68knommu) + basic_machine=m68k-unknown + os=linux + ;; + magnum | m3230) + basic_machine=mips-mips + os=sysv + ;; + merlin) + basic_machine=ns32k-utek + os=sysv + ;; + mingw64) + basic_machine=x86_64-pc + os=mingw64 + ;; + mingw32) + basic_machine=i686-pc + os=mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=mingw32ce + ;; + monitor) + basic_machine=m68k-rom68k + os=coff + ;; + morphos) + basic_machine=powerpc-unknown + os=morphos + ;; + moxiebox) + basic_machine=moxie-unknown + os=moxiebox + ;; + msdos) + basic_machine=i386-pc + os=msdos + ;; + msys) + basic_machine=i686-pc + os=msys + ;; + mvs) + basic_machine=i370-ibm + os=mvs + ;; + nacl) + basic_machine=le32-unknown + os=nacl + ;; + ncr3000) + basic_machine=i486-ncr + os=sysv4 + ;; + netbsd386) + basic_machine=i386-pc + os=netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=newsos + ;; + news1000) + basic_machine=m68030-sony + os=newsos + ;; + necv70) + basic_machine=v70-nec + os=sysv + ;; + nh3000) + basic_machine=m68k-harris + os=cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=cxux + ;; + nindy960) + basic_machine=i960-intel + os=nindy + ;; + mon960) + basic_machine=i960-intel + os=mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=nonstopux + ;; + os400) + basic_machine=powerpc-ibm + os=os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=ose + ;; + os68k) + basic_machine=m68k-none + os=os68k + ;; + paragon) + basic_machine=i860-intel + os=osf + ;; + parisc) + basic_machine=hppa-unknown + os=linux + ;; + pw32) + basic_machine=i586-unknown + os=pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + os=rdos + ;; + rdos32) + basic_machine=i386-pc + os=rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=coff + ;; + sa29200) + basic_machine=a29k-amd + os=udi + ;; + sei) + basic_machine=mips-sei + os=seiux + ;; + sequent) + basic_machine=i386-sequent + os= + ;; + sps7) + basic_machine=m68k-bull + os=sysv2 + ;; + st2000) + basic_machine=m68k-tandem + os= + ;; + stratus) + basic_machine=i860-stratus + os=sysv4 + ;; + sun2) + basic_machine=m68000-sun + os= + ;; + sun2os3) + basic_machine=m68000-sun + os=sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=sunos4 + ;; + sun3) + basic_machine=m68k-sun + os= + ;; + sun3os3) + basic_machine=m68k-sun + os=sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=sunos4 + ;; + sun4) + basic_machine=sparc-sun + os= + ;; + sun4os3) + basic_machine=sparc-sun + os=sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=solaris2 + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + os= + ;; + sv1) + basic_machine=sv1-cray + os=unicos + ;; + symmetry) + basic_machine=i386-sequent + os=dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=unicos + ;; + t90) + basic_machine=t90-cray + os=unicos + ;; + toad1) + basic_machine=pdp10-xkl + os=tops20 + ;; + tpf) + basic_machine=s390x-ibm + os=tpf + ;; + udi29k) + basic_machine=a29k-amd + os=udi + ;; + ultra3) + basic_machine=a29k-nyu + os=sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=none + ;; + vaxv) + basic_machine=vax-dec + os=sysv + ;; + vms) + basic_machine=vax-dec + os=vms + ;; + vxworks960) + basic_machine=i960-wrs + os=vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=vxworks + ;; + xbox) + basic_machine=i686-pc + os=mingw32 + ;; + ymp) + basic_machine=ymp-cray + os=unicos + ;; + *) + basic_machine=$1 + os= + ;; + esac ;; esac -# Decode aliases for certain CPU-COMPANY combinations. +# Decode 1-component or ad-hoc basic machines case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | avr | avr32 \ - | ba \ - | be32 | be64 \ - | bfin \ - | c4x | c8051 | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | e2k | epiphany \ - | fido | fr30 | frv | ft32 \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | hexagon \ - | i370 | i860 | i960 | ia16 | ia64 \ - | ip2k | iq2000 \ - | k1om \ - | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa32r6 | mipsisa32r6el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64r6 | mipsisa64r6el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nds32 | nds32le | nds32be \ - | nios | nios2 | nios2eb | nios2el \ - | ns16k | ns32k \ - | open8 | or1k | or1knd | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pru \ - | pyramid \ - | riscv32 | riscv64 \ - | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu \ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | visium \ - | wasm32 \ - | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - c54x) - basic_machine=tic54x-unknown - ;; - c55x) - basic_machine=tic55x-unknown - ;; - c6x) - basic_machine=tic6x-unknown - ;; - leon|leon[3-9]) - basic_machine=sparc-$basic_machine - ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-unknown - ;; - strongarm | thumb | xscale) - basic_machine=arm-unknown + # Here we handle the default manufacturer of certain CPU types. It is in + # some cases the only manufacturer, in others, it is the most popular. + w89k) + cpu=hppa1.1 + vendor=winbond ;; - xgate) - basic_machine=$basic_machine-unknown - os=-none + op50n) + cpu=hppa1.1 + vendor=oki ;; - xscaleeb) - basic_machine=armeb-unknown + op60c) + cpu=hppa1.1 + vendor=oki ;; - xscaleel) - basic_machine=armel-unknown + ibm*) + cpu=i370 + vendor=ibm ;; - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc + orion105) + cpu=clipper + vendor=highlevel ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 + mac | mpw | mac-mpw) + cpu=m68k + vendor=apple ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | ba-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | e2k-* | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ - | ip2k-* | iq2000-* \ - | k1om-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa32r6-* | mipsisa32r6el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64r6-* | mipsisa64r6el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | or1k*-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pru-* \ - | pyramid-* \ - | riscv32-* | riscv64-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ - | visium-* \ - | wasm32-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown + pmac | pmac-mpw) + cpu=powerpc + vendor=apple ;; + # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att + cpu=m68000 + vendor=att ;; 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - asmjs) - basic_machine=asmjs-unknown - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux + cpu=we32k + vendor=att ;; bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec + cpu=powerpc + vendor=ibm + os=cnk ;; decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 + cpu=pdp10 + vendor=dec + os=tops10 ;; decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 + cpu=pdp10 + vendor=dec + os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx + cpu=m68k + vendor=motorola ;; dpx2*) - basic_machine=m68k-bull - os=-sysv3 - ;; - e500v[12]) - basic_machine=powerpc-unknown - os=$os"spe" - ;; - e500v[12]-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - os=$os"spe" - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd + cpu=m68k + vendor=bull + os=sysv3 ;; encore | umax | mmax) - basic_machine=ns32k-encore + cpu=ns32k + vendor=encore ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose + elxsi) + cpu=elxsi + vendor=elxsi + os=${os:-bsd} ;; fx2800) - basic_machine=i860-alliant + cpu=i860 + vendor=alliant ;; genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 + cpu=ns32k + vendor=ns ;; h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux + cpu=hppa1.1 + vendor=hitachi + os=hiuxwe2 ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp + cpu=m68000 + vendor=hp ;; hp9k3[2-9][0-9]) - basic_machine=m68k-hp + cpu=m68k + vendor=hp ;; hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k78[0-9] | hp78[0-9]) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm + cpu=hppa1.0 + vendor=hp ;; i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + os=sysv32 ;; i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + os=sysv4 ;; i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + os=sysv ;; i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + os=solaris2 + ;; + j90 | j90-cray) + cpu=j90 + vendor=cray + os=${os:-unicos} ;; iris | iris4d) - basic_machine=mips-sgi + cpu=mips + vendor=sgi case $os in - -irix*) + irix*) ;; *) - os=-irix4 + os=irix4 ;; esac ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - leon-*|leon[3-9]-*) - basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze*) - basic_machine=microblaze-xilinx - ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; - mingw32) - basic_machine=i686-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - moxiebox) - basic_machine=moxie-unknown - os=-moxiebox - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + cpu=m68000 + vendor=convergent ;; - msys) - basic_machine=i686-pc - os=-msys - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - nacl) - basic_machine=le32-unknown - os=-nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos + *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) + cpu=m68k + vendor=atari + os=mint ;; news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv + cpu=mips + vendor=sony + os=newsos ;; next | m*-next) - basic_machine=m68k-next + cpu=m68k + vendor=next case $os in - -nextstep*) + nextstep* ) ;; - -ns2*) - os=-nextstep2 + ns2*) + os=nextstep2 ;; *) - os=-nextstep3 + os=nextstep3 ;; esac ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; np1) - basic_machine=np1-gould - ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - nsx-tandem) - basic_machine=nsx-tandem + cpu=np1 + vendor=gould ;; op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k + cpu=hppa1.1 + vendor=oki + os=proelf ;; pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux + cpu=hppa1.1 + vendor=hitachi + os=hiuxwe2 ;; pbd) - basic_machine=sparc-tti + cpu=sparc + vendor=tti ;; pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + cpu=m68k + vendor=tti ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + pc532) + cpu=ns32k + vendor=pc532 ;; pn) - basic_machine=pn-gould + cpu=pn + vendor=gould ;; power) - basic_machine=power-ibm - ;; - ppc | ppcbe) - basic_machine=powerpc-unknown - ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle) - basic_machine=powerpcle-unknown + cpu=power + vendor=ibm ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) - basic_machine=powerpc64-unknown - ;; - ppc64-*) - basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ps2) + cpu=i386 + vendor=ibm ;; - ppc64le | powerpc64little) - basic_machine=powerpc64le-unknown + rm[46]00) + cpu=mips + vendor=siemens ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + rtpc | rtpc-*) + cpu=romp + vendor=ibm ;; - ps2) - basic_machine=i386-ibm + sde) + cpu=mipsisa32 + vendor=sde + os=${os:-elf} + ;; + simso-wrs) + cpu=sparclite + vendor=wrs + os=vxworks ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=-rdos - ;; - rdos32) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff + tower | tower-32) + cpu=m68k + vendor=ncr ;; - rm[46]00) - basic_machine=mips-siemens + vpp*|vx|vx-*) + cpu=f301 + vendor=fujitsu ;; - rtpc | rtpc-*) - basic_machine=romp-ibm + w65) + cpu=w65 + vendor=wdc ;; - s390 | s390-*) - basic_machine=s390-ibm + w89k-*) + cpu=hppa1.1 + vendor=winbond + os=proelf ;; - s390x | s390x-*) - basic_machine=s390x-ibm + none) + cpu=none + vendor=none ;; - sa29200) - basic_machine=a29k-amd - os=-udi + leon|leon[3-9]) + cpu=sparc + vendor=$basic_machine ;; - sb1) - basic_machine=mipsisa64sb1-unknown + leon-*|leon[3-9]-*) + cpu=sparc + vendor=`echo "$basic_machine" | sed 's/-.*//'` ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown + + *-*) + IFS="-" read cpu vendor <&2 - exit 1 + # Recognize the canonical CPU types that are allowed with any + # company name. + case $cpu in + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | abacus \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ + | alphapca5[67] | alpha64pca5[67] \ + | am33_2.0 \ + | amdgcn \ + | arc | arceb \ + | arm | arm[lb]e | arme[lb] | armv* \ + | avr | avr32 \ + | asmjs \ + | ba \ + | be32 | be64 \ + | bfin | bs2000 \ + | c[123]* | c30 | [cjt]90 | c4x \ + | c8051 | clipper | craynv | csky | cydra \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | elxsi | epiphany \ + | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ + | h8300 | h8500 \ + | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i*86 | i860 | i960 | ia16 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle \ + | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k | v70 | w65 \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \ + | m88110 | m88k | maxq | mb | mcore | mep | metag \ + | microblaze | microblazeel \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mmix \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nfp \ + | nios | nios2 | nios2eb | nios2el \ + | none | np1 | ns16k | ns32k \ + | open8 \ + | or1k* \ + | or32 \ + | orion \ + | pdp10 | pdp11 | pj | pjl | pn | power \ + | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ + | pru \ + | pyramid \ + | riscv | riscv32 | riscv64 \ + | rl78 | romp | rs6000 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ + | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \ + | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ + | spu \ + | tahoe \ + | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ + | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ + | vax \ + | visium \ + | wasm32 \ + | we32k \ + | x86 | x86_64 | xc16x | xgate | xps100 \ + | xstormy16 | xtensa* \ + | ymp \ + | z8k | z80) + ;; + + *) + echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 + exit 1 + ;; + esac ;; esac # Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` +case $vendor in + digital*) + vendor=dec ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + commodore*) + vendor=cbm ;; *) ;; @@ -1363,213 +1271,246 @@ esac # Decode manufacturer-specific aliases for certain operating systems. -if [ x"$os" != x"" ] +if [ x$os != x ] then case $os in # First match some system type aliases that might get confused # with valid system types. - # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + # solaris* is a basic system type, with this one exception. + auroraux) + os=auroraux ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` + bluegene*) + os=cnk ;; - -solaris) - os=-solaris2 + solaris1 | solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; - -svr4*) - os=-sysv4 + solaris) + os=solaris2 ;; - -unixware*) - os=-sysv4.2uw + unixware*) + os=sysv4.2uw ;; - -gnu/linux*) + gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; + # es1800 is here to avoid being matched by es* (a different OS) + es1800*) + os=ose + ;; + # Some version numbers need modification + chorusos*) + os=chorusos + ;; + isc) + os=isc2.2 + ;; + sco6) + os=sco5v6 + ;; + sco5) + os=sco3.2v5 + ;; + sco4) + os=sco3.2v4 + ;; + sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + ;; + sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + scout) + # Don't match below + ;; + sco*) + os=sco3.2v2 + ;; + psos*) + os=psos + ;; # Now accept the basic system types. # The portable systems comes first. # Each alternative MUST end in a * to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]* \ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* | -cloudabi* | -sortix* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) + # sysv* is not here because it comes later, after sysvr4. + gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | kopensolaris* | plan9* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | knetbsd* | mirbsd* | netbsd* \ + | bitrig* | openbsd* | solidbsd* | libertybsd* \ + | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* \ + | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \ + | linux-newlib* | linux-musl* | linux-uclibc* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* \ + | morphos* | superux* | rtmk* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd* | amdhsa* | unleashed*) # Remember, each alternative MUST END IN *, to match a version number. ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) + qnx*) + case $cpu in + x86 | i*86) ;; *) - os=-nto$os + os=nto-$os ;; esac ;; - -nto-qnx*) + hiux*) + os=hiuxwe2 ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` + nto-qnx*) ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` + sim | xray | os68k* | v88r* \ + | windows* | osx | abug | netware* | os9* \ + | macos* | mpw* | magic* | mmixware* | mon960* | lnews*) ;; - -linux-dietlibc) - os=-linux-dietlibc + linux-dietlibc) + os=linux-dietlibc ;; - -linux*) + linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` + lynx*178) + os=lynxos178 ;; - -opened*) - os=-openedition + lynx*5) + os=lynxos5 ;; - -os400*) - os=-os400 + lynx*) + os=lynxos ;; - -wince*) - os=-wince + mac*) + os=`echo "$os" | sed -e 's|mac|macos|'` ;; - -osfrose*) - os=-osfrose + opened*) + os=openedition ;; - -osf*) - os=-osf + os400*) + os=os400 ;; - -utek*) - os=-bsd + sunos5*) + os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; - -dynix*) - os=-bsd + sunos6*) + os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; - -acis*) - os=-aos + wince*) + os=wince ;; - -atheos*) - os=-atheos + utek*) + os=bsd ;; - -syllable*) - os=-syllable + dynix*) + os=bsd ;; - -386bsd) - os=-bsd + acis*) + os=aos ;; - -ctix* | -uts*) - os=-sysv + atheos*) + os=atheos ;; - -nova*) - os=-rtmk-nova + syllable*) + os=syllable ;; - -ns2) - os=-nextstep2 + 386bsd) + os=bsd ;; - -nsk*) - os=-nsk + ctix* | uts*) + os=sysv ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` + nova*) + os=rtmk-nova ;; - -sinix*) - os=-sysv4 + ns2) + os=nextstep2 ;; - -tpf*) - os=-tpf + nsk*) + os=nsk ;; - -triton*) - os=-sysv3 + # Preserve the version number of sinix5. + sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` ;; - -oss*) - os=-sysv3 + sinix*) + os=sysv4 ;; - -svr4) - os=-sysv4 + tpf*) + os=tpf ;; - -svr3) - os=-sysv3 + triton*) + os=sysv3 ;; - -sysvr4) - os=-sysv4 + oss*) + os=sysv3 ;; - # This must come after -sysvr4. - -sysv*) + svr4*) + os=sysv4 ;; - -ose*) - os=-ose + svr3) + os=sysv3 ;; - -es1800*) - os=-ose + sysvr4) + os=sysv4 ;; - -xenix) - os=-xenix + # This must come after sysvr4. + sysv*) ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint + ose*) + os=ose ;; - -aros*) - os=-aros + *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + os=mint ;; - -zvmoe) - os=-zvmoe + zvmoe) + os=zvmoe ;; - -dicos*) - os=-dicos + dicos*) + os=dicos ;; - -pikeos*) + pikeos*) # Until real need of OS specific support for # particular features comes up, bare metal # configurations are quite functional. - case $basic_machine in + case $cpu in arm*) - os=-eabi + os=eabi ;; *) - os=-elf + os=elf ;; esac ;; - -nacl*) + nacl*) ;; - -ios) + ios) + ;; + none) ;; - -none) + *-eabi) ;; *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; esac @@ -1585,264 +1526,265 @@ else # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. -case $basic_machine in +case $cpu-$vendor in score-*) - os=-elf + os=elf ;; spu-*) - os=-elf + os=elf ;; *-acorn) - os=-riscix1.2 + os=riscix1.2 ;; arm*-rebel) - os=-linux + os=linux ;; arm*-semi) - os=-aout + os=aout ;; c4x-* | tic4x-*) - os=-coff + os=coff ;; c8051-*) - os=-elf + os=elf + ;; + clipper-intergraph) + os=clix ;; hexagon-*) - os=-elf + os=elf ;; tic54x-*) - os=-coff + os=coff ;; tic55x-*) - os=-coff + os=coff ;; tic6x-*) - os=-coff + os=coff ;; # This must come before the *-dec entry. pdp10-*) - os=-tops20 + os=tops20 ;; pdp11-*) - os=-none + os=none ;; *-dec | vax-*) - os=-ultrix4.2 + os=ultrix4.2 ;; m68*-apollo) - os=-domain + os=domain ;; i386-sun) - os=-sunos4.0.2 + os=sunos4.0.2 ;; m68000-sun) - os=-sunos3 + os=sunos3 ;; m68*-cisco) - os=-aout + os=aout ;; mep-*) - os=-elf + os=elf ;; mips*-cisco) - os=-elf + os=elf ;; mips*-*) - os=-elf + os=elf ;; or32-*) - os=-coff + os=coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 + os=sysv3 ;; sparc-* | *-sun) - os=-sunos4.1.1 + os=sunos4.1.1 ;; pru-*) - os=-elf + os=elf ;; *-be) - os=-beos - ;; - *-haiku) - os=-haiku + os=beos ;; *-ibm) - os=-aix + os=aix ;; *-knuth) - os=-mmixware + os=mmixware ;; *-wec) - os=-proelf + os=proelf ;; *-winbond) - os=-proelf + os=proelf ;; *-oki) - os=-proelf + os=proelf ;; *-hp) - os=-hpux + os=hpux ;; *-hitachi) - os=-hiux + os=hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv + os=sysv ;; *-cbm) - os=-amigaos + os=amigaos ;; *-dg) - os=-dgux + os=dgux ;; *-dolphin) - os=-sysv3 + os=sysv3 ;; m68k-ccur) - os=-rtu + os=rtu ;; m88k-omron*) - os=-luna + os=luna ;; *-next) - os=-nextstep + os=nextstep ;; *-sequent) - os=-ptx + os=ptx ;; *-crds) - os=-unos + os=unos ;; *-ns) - os=-genix + os=genix ;; i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 + os=mvs ;; *-gould) - os=-sysv + os=sysv ;; *-highlevel) - os=-bsd + os=bsd ;; *-encore) - os=-bsd + os=bsd ;; *-sgi) - os=-irix + os=irix ;; *-siemens) - os=-sysv4 + os=sysv4 ;; *-masscomp) - os=-rtu + os=rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=-uxpv + os=uxpv ;; *-rom68k) - os=-coff + os=coff ;; *-*bug) - os=-coff + os=coff ;; *-apple) - os=-macos + os=macos ;; *-atari*) - os=-mint + os=mint + ;; + *-wrs) + os=vxworks ;; *) - os=-none + os=none ;; esac fi # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) +case $vendor in + unknown) case $os in - -riscix*) + riscix*) vendor=acorn ;; - -sunos*) + sunos*) vendor=sun ;; - -cnk*|-aix*) + cnk*|-aix*) vendor=ibm ;; - -beos*) + beos*) vendor=be ;; - -hpux*) + hpux*) vendor=hp ;; - -mpeix*) + mpeix*) vendor=hp ;; - -hiux*) + hiux*) vendor=hitachi ;; - -unos*) + unos*) vendor=crds ;; - -dgux*) + dgux*) vendor=dg ;; - -luna*) + luna*) vendor=omron ;; - -genix*) + genix*) vendor=ns ;; - -mvs* | -opened*) + clix*) + vendor=intergraph + ;; + mvs* | opened*) vendor=ibm ;; - -os400*) + os400*) vendor=ibm ;; - -ptx*) + ptx*) vendor=sequent ;; - -tpf*) + tpf*) vendor=ibm ;; - -vxsim* | -vxworks* | -windiss*) + vxsim* | vxworks* | windiss*) vendor=wrs ;; - -aux*) + aux*) vendor=apple ;; - -hms*) + hms*) vendor=hitachi ;; - -mpw* | -macos*) + mpw* | macos*) vendor=apple ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) vendor=atari ;; - -vos*) + vos*) vendor=stratus ;; esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; esac -echo $basic_machine$os +echo "$cpu-$vendor-$os" exit # Local variables: -# eval: (add-hook 'write-file-functions 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nurp '--exclude=.bzr*' tin-2.4.2/configure tin-2.4.3/configure --- tin-2.4.2/configure 2017-12-24 12:52:06.000000000 +0100 +++ tin-2.4.3/configure 2018-12-24 10:28:05.800088665 +0100 @@ -1,27 +1,156 @@ #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13.20110430 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. +# Generated by Autoconf 2.52.20181006. # +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -# Defaults: -ac_help= +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" + +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi + +# Name of the executable. +as_me=`echo "$0" |sed 's,.*[\\/],,'` + +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links + as_ln_s='cp -p' + else + as_ln_s='ln -s' + fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.file + +as_executable_p="test -f" + +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + +# NLS nuisances. +$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } +$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } +$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } +$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } +$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } +$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } +$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } +$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } + +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' +' +IFS=" $as_nl" + +# CDPATH. +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } + +# Name of the host. +# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +exec 6>&1 + +# +# Initializations. +# ac_default_prefix=/usr/local -# Any additions from configure.in: +cross_compiling=no +subdirs= +MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} + +# Maximum number of lines to put in a shell here document. +# This variable seems obsolete. It should probably be removed, and +# only ac_max_sed_lines should be used. +: ${ac_max_here_lines=38} + +ac_unique_file="include/tin.h" ac_default_prefix=/usr/local +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#if HAVE_SYS_TYPES_H +# include +#endif +#if HAVE_SYS_STAT_H +# include +#endif +#if STDC_HEADERS +# include +# include +#else +# if HAVE_STDLIB_H +# include +# endif +#endif +#if HAVE_STRING_H +# if !STDC_HEADERS && HAVE_MEMORY_H +# include +# endif +# include +#endif +#if HAVE_STRINGS_H +# include +#endif +#if HAVE_INTTYPES_H +# include +#else +# if HAVE_STDINT_H +# include +# endif +#endif +#if HAVE_UNISTD_H +# include +#endif" # Initialize some variables set by options. +ac_init_help= +ac_init_version=false # The variables have the same names as the options, with # dashes changed to underlines. -build=NONE -cache_file=./config.cache +cache_file=/dev/null exec_prefix=NONE -host=NONE no_create= -nonopt=NONE no_recursion= prefix=NONE program_prefix=NONE @@ -30,34 +159,40 @@ program_transform_name=s,x,x, silent= site= srcdir= -target=NONE verbose= x_includes=NONE x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' +datarootdir='${prefix}/share' +datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' +infodir='${datarootdir}/info' +mandir='${datarootdir}/man' -# Initialize some other variables. -subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -ac_max_here_lines=12 +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= ac_prev= for ac_option do - # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then eval "$ac_prev=\$ac_option" @@ -65,59 +200,66 @@ do continue fi - case "$ac_option" in - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) ac_optarg= ;; - esac + ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` # Accept the important Cygnus configure options, so we can diagnose typos. - case "$ac_option" in + case $ac_option in -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir="$ac_optarg" ;; + bindir=$ac_optarg ;; -build | --build | --buil | --bui | --bu) - ac_prev=build ;; + ac_prev=build_alias ;; -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build="$ac_optarg" ;; + build_alias=$ac_optarg ;; -cache-file | --cache-file | --cache-fil | --cache-fi \ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) ac_prev=cache_file ;; -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file="$ac_optarg" ;; + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; -datadir | --datadir | --datadi | --datad | --data | --dat | --da) ac_prev=datadir ;; -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ | --da=*) - datadir="$ac_optarg" ;; + datadir=$ac_optarg ;; + + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; -disable-* | --disable-*) - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - eval "enable_${ac_feature}=no" ;; + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/-/_/g'` + eval "enable_$ac_feature=no" ;; -enable-* | --enable-*) - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/-/_/g'` + case $ac_option in + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; *) ac_optarg=yes ;; esac - eval "enable_${ac_feature}='$ac_optarg'" ;; + eval "enable_$ac_feature='$ac_optarg'" ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -126,205 +268,47 @@ do -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ | --exec=* | --exe=* | --ex=*) - exec_prefix="$ac_optarg" ;; + exec_prefix=$ac_optarg ;; -gas | --gas | --ga | --g) # Obsolete; use --with-gas. with_gas=yes ;; - -help | --help | --hel | --he) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat << EOF -Usage: configure [options] [host] -Options: [defaults in brackets after descriptions] -Configuration: - --cache-file=FILE cache test results in FILE - --help print this message - --no-create do not create output files - --quiet, --silent do not print \`checking...' messages - --version print the version of autoconf that created configure -Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [same as prefix] - --bindir=DIR user executables in DIR [EPREFIX/bin] - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] - --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR - [PREFIX/share] - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR - [PREFIX/com] - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] - --libdir=DIR object code libraries in DIR [EPREFIX/lib] - --includedir=DIR C header files in DIR [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] - --infodir=DIR info documentation in DIR [PREFIX/info] - --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR find the sources in DIR [configure dir or ..] - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names -EOF - cat << EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] -Features and packages: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF -cat <<\EOF ---enable and --with options recognized: - --with-install-prefix prefixes actual install location (default: /) - --with-build-cc=XXX the build C compiler ($BUILD_CC) - --with-build-cpp=XXX the build C preprocessor ($BUILD_CPP) - --with-build-cflags=XXX the build C compiler-flags ($BUILD_CFLAGS) - --with-build-cppflags=XXX the build C preprocessor-flags ($BUILD_CPPFLAGS) - --with-build-ldflags=XXX the build linker-flags ($BUILD_LDFLAGS) - --with-build-libs=XXX the build libraries (${BUILD_LIBS}) - --disable-heapsort disable heapsort() as alternative to qsort - --with-ispell (default: from system path) - --with-metamail (default: from system path) - --with-sum (default: from system path) - --with-editor=PROG specify editor (default: vi) - --with-mailer=PROG specify default mailer-program (default: mailx) -EOF -cat <<\EOF - --with-mailbox=DIR directory for incoming mailboxes (default: empty) - --disable-pgp-gpg disable PGP/GPG Support - --with-pgp (default: from system path) - --with-pgpk (default: from system path) - --with-gpg (default: from system path) - --with-slrnface (default: from system path) - --with-shell=PROG default $SHELL program (default: sh) - --disable-nntp disable reading via NNTP - --enable-nntp-only enable reading via NNTP only - --enable-debug turn on debug support - --disable-echo do not display "compiling" commands - --enable-prototypes check for optional prototypes -EOF -cat <<\EOF - --enable-warnings turn on GCC compiler warnings - --with-libdir=PATH news-library (default: /usr/lib/news) - --with-spooldir=PATH news spool-directory (default: /var/spool/news) - --with-nov-dir=PATH news overview-directory (default: $SPOOLDIR) - --with-nov-fname specify names of overview files (default: .overview) - --with-inews-dir=PATH directory containing "inews" (default: $INEWSPATH) - --with-socks[=path] link with socks library if available - --with-socks5[=path] link with socks5 library if available - --disable-fcntl disable fcntl() locking - --enable-lockf enable lockf() locking - --enable-flock enable flock() locking - --with-screen=xxx specify screen type, which must be one of: - termcap, terminfo, curses, ncurses, ncursesw, or - pdcurses (replaces options --enable-curses and - --with-ncurses) -EOF -cat <<\EOF - --with-curses-dir=DIR directory in which (n)curses is installed - --with-ncurses link with ncurses if available (deprecated) - --enable-curses use curses interface (deprecated) - --with-pkg-config{=path} enable/disable use of pkg-config - --with-pcre=PATH use installed pcre versus bundled - --with-dbmalloc test: use Conor Cahill's dbmalloc library - --with-dmalloc test: use Gray Watson's dmalloc library - --with-trace use debugging/traces for screen output - --with-domain-name sets $DOMAIN_NAME (default: empty) - --with-nntp-default-server - (sets NNTP_DEFAULT_SERVER) - (default: news.$DOMAIN_NAME) - --enable-mh-mail-handling - use MH style mail handling for mailgroups - --enable-cancel-locks enable creation of Cancel-Locks -EOF -cat <<\EOF - --disable-gsasl don't use GNU SASL - --disable-8bit-keys disable 8-bit keycode support - --disable-color disable ANSI-color support - --disable-etiquette disable printing of posting-etiquette - --disable-break-long-lines - don't break long mime-encoded lines - --disable-mime-strict-charset - force MM_CHARSET obeyance - --with-mime-default-charset=CHARSET - fallback for $MM_CHARSET (default: US-ASCII) - --with-iso-to-ascii ISO -> ASCII conversion (default: -1) - --disable-locale disable locale support - --disable-posting disable posting - --disable-shell-escape disable shell escape - --enable-fascist-newsadmin - have fascist newsadmin -EOF -cat <<\EOF - --disable-inverse-video disable inverse video and highlighting - --disable-piping disable piping support - --disable-printing disable printer support - --disable-append-pid disable appending .pid to tmp-files - --disable-xhdr-xref disable XHDR XREF fallback - --enable-broken-listgroup-fix - send extra GROUP command before LISTGROUP - --enable-broken-system-fix - ignore system()s return value - --with-defaults-dir=PATH - directory containing tin.defaults file - (default: /etc/tin) - --disable-ipv6 disable IPv6 support (default: enabled) - --enable-long-article-numbers - enable long article numbers (default: disabled) - --with-coffee coffee support - --with-libiconv-prefix=DIR - search for libiconv in DIR/include and DIR/lib -EOF -cat <<\EOF - --disable-nls do not use Native Language Support - --with-included-gettext use the GNU gettext library included here - --with-textdomain=PKG NLS text-domain (default is package name) - --disable-included-msgs use included messages, for i18n support - --with-Xaw3d link with Xaw 3d library - --with-Xaw3dxft link with Xaw 3d xft library - --with-neXtaw link with neXT Athena library - --with-XawPlus link with Athena-Plus library - --with-x use the X Window System -EOF - exit 0 ;; + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; -host | --host | --hos | --ho) - ac_prev=host ;; + ac_prev=host_alias ;; -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; + host_alias=$ac_optarg ;; -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir="$ac_optarg" ;; + includedir=$ac_optarg ;; -infodir | --infodir | --infodi | --infod | --info | --inf) ac_prev=infodir ;; -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir="$ac_optarg" ;; + infodir=$ac_optarg ;; -libdir | --libdir | --libdi | --libd) ac_prev=libdir ;; -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir="$ac_optarg" ;; + libdir=$ac_optarg ;; -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ | --libexe | --libex | --libe) ac_prev=libexecdir ;; -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ | --libexe=* | --libex=* | --libe=*) - libexecdir="$ac_optarg" ;; + libexecdir=$ac_optarg ;; -localstatedir | --localstatedir | --localstatedi | --localstated \ | --localstate | --localstat | --localsta | --localst \ @@ -333,12 +317,21 @@ EOF -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ | --localstate=* | --localstat=* | --localsta=* | --localst=* \ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir="$ac_optarg" ;; + localstatedir=$ac_optarg ;; + + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst \ + | --runs | --run | --ru) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* \ + | --runs=* | --run=* | --ru=*) + runstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) ac_prev=mandir ;; -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir="$ac_optarg" ;; + mandir=$ac_optarg ;; -nfp | --nfp | --nf) # Obsolete; use --without-fp. @@ -359,26 +352,26 @@ EOF -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir="$ac_optarg" ;; + oldincludedir=$ac_optarg ;; -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ac_prev=prefix ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; + prefix=$ac_optarg ;; -program-prefix | --program-prefix | --program-prefi | --program-pref \ | --program-pre | --program-pr | --program-p) ac_prev=program_prefix ;; -program-prefix=* | --program-prefix=* | --program-prefi=* \ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix="$ac_optarg" ;; + program_prefix=$ac_optarg ;; -program-suffix | --program-suffix | --program-suffi | --program-suff \ | --program-suf | --program-su | --program-s) ac_prev=program_suffix ;; -program-suffix=* | --program-suffix=* | --program-suffi=* \ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix="$ac_optarg" ;; + program_suffix=$ac_optarg ;; -program-transform-name | --program-transform-name \ | --program-transform-nam | --program-transform-na \ @@ -395,7 +388,7 @@ EOF | --program-transfo=* | --program-transf=* \ | --program-trans=* | --program-tran=* \ | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name="$ac_optarg" ;; + program_transform_name=$ac_optarg ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) @@ -405,7 +398,7 @@ EOF ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ | --sbi=* | --sb=*) - sbindir="$ac_optarg" ;; + sbindir=$ac_optarg ;; -sharedstatedir | --sharedstatedir | --sharedstatedi \ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ @@ -416,58 +409,57 @@ EOF | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ | --sha=* | --sh=*) - sharedstatedir="$ac_optarg" ;; + sharedstatedir=$ac_optarg ;; -site | --site | --sit) ac_prev=site ;; -site=* | --site=* | --sit=*) - site="$ac_optarg" ;; + site=$ac_optarg ;; -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir="$ac_optarg" ;; + srcdir=$ac_optarg ;; -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ | --syscon | --sysco | --sysc | --sys | --sy) ac_prev=sysconfdir ;; -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir="$ac_optarg" ;; + sysconfdir=$ac_optarg ;; -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target ;; + ac_prev=target_alias ;; -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target="$ac_optarg" ;; + target_alias=$ac_optarg ;; -v | -verbose | --verbose | --verbos | --verbo | --verb) verbose=yes ;; - -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13.20110430" - exit 0 ;; + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; -with-* | --with-*) - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } ac_package=`echo $ac_package| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; + case $ac_option in + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; *) ac_optarg=yes ;; esac - eval "with_${ac_package}='$ac_optarg'" ;; + eval "with_$ac_package='$ac_optarg'" ;; -without-* | --without-*) - ac_package=`echo $ac_option|sed -e 's/-*without-//'` + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - eval "with_${ac_package}=no" ;; + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } + ac_package=`echo $ac_package | sed 's/-/_/g'` + eval "with_$ac_package=no" ;; --x) # Obsolete; use --with-x. @@ -478,98 +470,98 @@ EOF ac_prev=x_includes ;; -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes="$ac_optarg" ;; + x_includes=$ac_optarg ;; -x-libraries | --x-libraries | --x-librarie | --x-librari \ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) ac_prev=x_libraries ;; -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries="$ac_optarg" ;; + x_libraries=$ac_optarg ;; - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } + -*) { echo "$as_me: error: unrecognized option: $ac_option +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } + ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` + eval "$ac_envvar='$ac_optarg'" + export $ac_envvar ;; + *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } - fi - nonopt="$ac_option" + # FIXME: should be removed in autoconf 3.0. + echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; esac done if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } -fi - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 6 checking for... messages and results -# 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + { echo "$as_me: error: missing argument to $ac_option" >&2 + { (exit 1); exit 1; }; } fi -exec 5>./config.log -echo "\ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -" 1>&5 +# Be sure to have absolute paths. +for ac_var in exec_prefix prefix +do + eval ac_val=$`echo $ac_var` + case $ac_val in + [\\/$]* | ?:[\\/]* | NONE | '' ) ;; + *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; };; + esac +done -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell metacharacters. -ac_configure_args= -for ac_arg -do - case "$ac_arg" in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) - ac_configure_args="$ac_configure_args '$ac_arg'" ;; - *) ac_configure_args="$ac_configure_args $ac_arg" ;; +# Be sure to have absolute paths. +for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \ + localstatedir libdir includedir oldincludedir infodir mandir +do + eval ac_val=$`echo $ac_var` + case $ac_val in + [\\/$]* | ?:[\\/]* ) ;; + *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; };; esac done -# NLS nuisances. -# Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -# Non-C LC_CTYPE values break the ctype check. -if test "${LANG+set}" = set; then LANG=C; export LANG; fi -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: should be removed in autoconf 3.0. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +fi -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- -# A filename unique to this package, relative to the directory that -# configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=include/tin.h +test "$silent" = yes && exec 6>/dev/null # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. ac_prog=$0 - ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` + ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then @@ -580,171 +572,669 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } - else - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } - fi -fi -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` - -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 + { (exit 1); exit 1; }; } else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi -fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - echo "loading site script $ac_site_file" - . "$ac_site_file" + { echo "$as_me: error: cannot find sources in $srcdir" >&2 + { (exit 1); exit 1; }; } fi -done - -if test -r "$cache_file"; then - echo "loading cache $cache_file" - . $cache_file -else - echo "creating cache $cache_file" - > $cache_file fi +srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` +ac_env_build_alias_set=${build_alias+set} +ac_env_build_alias_value=$build_alias +ac_cv_env_build_alias_set=${build_alias+set} +ac_cv_env_build_alias_value=$build_alias +ac_env_host_alias_set=${host_alias+set} +ac_env_host_alias_value=$host_alias +ac_cv_env_host_alias_set=${host_alias+set} +ac_cv_env_host_alias_value=$host_alias +ac_env_target_alias_set=${target_alias+set} +ac_env_target_alias_value=$target_alias +ac_cv_env_target_alias_set=${target_alias+set} +ac_cv_env_target_alias_value=$target_alias +ac_env_CC_set=${CC+set} +ac_env_CC_value=$CC +ac_cv_env_CC_set=${CC+set} +ac_cv_env_CC_value=$CC +ac_env_CFLAGS_set=${CFLAGS+set} +ac_env_CFLAGS_value=$CFLAGS +ac_cv_env_CFLAGS_set=${CFLAGS+set} +ac_cv_env_CFLAGS_value=$CFLAGS +ac_env_LDFLAGS_set=${LDFLAGS+set} +ac_env_LDFLAGS_value=$LDFLAGS +ac_cv_env_LDFLAGS_set=${LDFLAGS+set} +ac_cv_env_LDFLAGS_value=$LDFLAGS +ac_env_CPPFLAGS_set=${CPPFLAGS+set} +ac_env_CPPFLAGS_value=$CPPFLAGS +ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} +ac_cv_env_CPPFLAGS_value=$CPPFLAGS +ac_env_CPP_set=${CPP+set} +ac_env_CPP_value=$CPP +ac_cv_env_CPP_set=${CPP+set} +ac_cv_env_CPP_value=$CPP -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -ac_exeext= -ac_objext=o -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi -else - ac_n= ac_c='\c' ac_t= -fi +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <> confdefs.h <> confdefs.h <&2; exit 1; } -fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names +X features: + --x-includes=DIR X include files are in DIR + --x-libraries=DIR X library files are in DIR -if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then - -# Make sure we can run config.sub. -if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST build programs to run on HOST [BUILD] +EOF fi -echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:682: checking host system type" >&5 +if test -n "$ac_init_help"; then -host_alias=$host -case "$host_alias" in -NONE) - case $nonopt in - NONE) - if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; -esac - -host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$host" 1>&6 + cat <<\EOF - system_name="$host_os" -else - system_name="`(uname -s -r) 2>/dev/null`" - if test -z "$system_name" ; then - system_name="`(hostname) 2>/dev/null`" - fi -fi -test -n "$system_name" && cat >> confdefs.h <&6 -else - cf_cv_system_name="$system_name" -fi +Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --with-install-prefix prefixes actual install location (default: /) + --with-build-cc=XXX the build C compiler ($BUILD_CC) + --with-build-cpp=XXX the build C preprocessor ($BUILD_CPP) + --with-build-cflags=XXX the build C compiler-flags ($BUILD_CFLAGS) + --with-build-cppflags=XXX the build C preprocessor-flags ($BUILD_CPPFLAGS) + --with-build-ldflags=XXX the build linker-flags ($BUILD_LDFLAGS) + --with-build-libs=XXX the build libraries (${BUILD_LIBS}) + --disable-heapsort disable heapsort() as alternative to qsort + --with-ispell (default: from system path) + --with-metamail (default: from system path) + --with-sum (default: from system path) + --with-editor=PROG specify editor (default: vi) + --with-mailer=PROG specify default mailer-program (default: mailx) + --with-mailbox=DIR directory for incoming mailboxes (default: empty) + --disable-pgp-gpg disable PGP/GPG Support + --with-pgp (default: from system path) + --with-pgpk (default: from system path) + --with-gpg (default: from system path) + --with-slrnface (default: from system path) + --with-shell=PROG default $SHELL program (default: sh) + --disable-nntp disable reading via NNTP + --enable-nntp-only enable reading via NNTP only + --enable-debug turn on debug support + --disable-echo do not display "compiling" commands + --enable-prototypes check for optional prototypes + --enable-warnings turn on GCC compiler warnings + --with-libdir=PATH news-library (default: /usr/lib/news) + --with-spooldir=PATH news spool-directory (default: /var/spool/news) + --with-nov-dir=PATH news overview-directory (default: $SPOOLDIR) + --with-nov-fname specify names of overview files (default: .overview) + --with-inews-dir=PATH directory containing "inews" (default: $INEWSPATH) + --with-socks=path link with socks library if available + --with-socks5=path link with socks5 library if available + --disable-fcntl disable fcntl() locking + --enable-lockf enable lockf() locking + --enable-flock enable flock() locking + --with-screen=xxx specify screen type, which must be one of: + termcap, terminfo, curses, ncurses, ncursesw, or + pdcurses (replaces options --enable-curses and + --with-ncurses) + --with-curses-dir=DIR directory in which (n)curses is installed + --with-ncurses link with ncurses if available (deprecated) + --enable-curses use curses interface (deprecated) + --with-pkg-config{=path} enable/disable use of pkg-config + --with-pcre=PATH use installed pcre versus bundled + --with-dbmalloc test: use Conor Cahill's dbmalloc library + --with-dmalloc test: use Gray Watson's dmalloc library + --with-trace use debugging/traces for screen output + --with-domain-name sets $DOMAIN_NAME (default: empty) + --with-nntp-default-server + (sets NNTP_DEFAULT_SERVER) + (default: news.$DOMAIN_NAME) + --enable-mh-mail-handling + use MH style mail handling for mailgroups + --enable-cancel-locks enable creation of Cancel-Locks + --disable-gsasl don't use GNU SASL + --disable-8bit-keys disable 8-bit keycode support + --disable-color disable ANSI-color support + --disable-etiquette disable printing of posting-etiquette + --disable-break-long-lines + don't break long mime-encoded lines + --disable-mime-strict-charset + force MM_CHARSET obeyance + --with-mime-default-charset=CHARSET + fallback for $MM_CHARSET (default: US-ASCII) + --with-iso-to-ascii ISO -> ASCII conversion (default: -1) + --disable-locale disable locale support + --disable-posting disable posting + --disable-shell-escape disable shell escape + --enable-fascist-newsadmin + have fascist newsadmin + --disable-inverse-video disable inverse video and highlighting + --disable-piping disable piping support + --disable-printing disable printer support + --disable-append-pid disable appending .pid to tmp-files + --disable-xhdr-xref disable XHDR XREF fallback + --enable-broken-listgroup-fix + send extra GROUP command before LISTGROUP + --enable-broken-system-fix + ignore system()s return value + --with-defaults-dir=PATH + directory containing tin.defaults file + (default: /etc/tin) + --disable-ipv6 disable IPv6 support (default: enabled) + --enable-long-article-numbers + enable long article numbers (default: disabled) + --with-coffee coffee support + --with-libiconv-prefix=DIR + search for libiconv in DIR/include and DIR/lib + --disable-nls do not use Native Language Support + --with-included-gettext use the GNU gettext library included here + --with-textdomain=PKG NLS text-domain (default is package name) + --disable-included-msgs use included messages, for i18n support + --with-Xaw3d link with Xaw 3d library + --with-Xaw3dxft link with Xaw 3d xft library + --with-neXtaw link with neXT Athena library + --with-XawPlus link with Athena-Plus library + --with-x use the X Window System -test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$ac_t""Configuring for $cf_cv_system_name" 1>&6 +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have + headers in a nonstandard directory + CPP C preprocessor + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. -if test ".$system_name" != ".$cf_cv_system_name" ; then - echo "$ac_t""Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" 1>&6 - { echo "configure: error: "Please remove config.cache and try again."" 1>&2; exit 1; } +EOF +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + ac_popdir=`pwd` + for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue + cd $ac_subdir + # A "../" for each directory in /$ac_subdir. + ac_dots=`echo $ac_subdir | + sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'` + + case $srcdir in + .) # No --srcdir option. We are building in place. + ac_sub_srcdir=$srcdir ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_sub_srcdir=$srcdir/$ac_subdir ;; + *) # Relative path. + ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;; + esac + + # Check for guested configure; otherwise get Cygnus style configure. + if test -f $ac_sub_srcdir/configure.gnu; then + echo + $SHELL $ac_sub_srcdir/configure.gnu --help=recursive + elif test -f $ac_sub_srcdir/configure; then + echo + $SHELL $ac_sub_srcdir/configure --help=recursive + elif test -f $ac_sub_srcdir/configure.ac || + test -f $ac_sub_srcdir/configure.in; then + echo + $ac_configure --help + else + echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2 + fi + cd $ac_popdir + done +fi + +test -n "$ac_init_help" && exit 0 +if $ac_init_version; then + cat <<\EOF + +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +EOF + exit 0 +fi +exec 5>config.log +cat >&5 </dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +PATH = $PATH + +_ASUNAME +} >&5 + +cat >&5 <\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + ac_sep=" " ;; + *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" + ac_sep=" " ;; + esac + # Get rid of the leading space. +done + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + echo >&5 + echo "## ----------------- ##" >&5 + echo "## Cache variables. ##" >&5 + echo "## ----------------- ##" >&5 + echo >&5 + # The following way of writing the cache mishandles newlines in values, +{ + (set) 2>&1 | + case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in + *ac_space=\ *) + sed -n \ + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" + ;; + *) + sed -n \ + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + ;; + esac; +} >&5 + sed "/^$/d" confdefs.h >conftest.log + if test -s conftest.log; then + echo >&5 + echo "## ------------ ##" >&5 + echo "## confdefs.h. ##" >&5 + echo "## ------------ ##" >&5 + echo >&5 + cat conftest.log >&5 + fi + (echo; echo) >&5 + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" >&5 + echo "$as_me: exit $exit_status" >&5 + rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && + exit $exit_status + ' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -rf conftest* confdefs.h +# AIX cpp loses on an empty file, so make sure it contains at least a newline. +echo >confdefs.h + +# Let the site file select an alternate cache file if it wants to. +# Prefer explicitly selected file to automatically selected ones. +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi +fi +for ac_site_file in $CONFIG_SITE; do + if test -r "$ac_site_file"; then + { echo "$as_me:996: loading site script $ac_site_file" >&5 +echo "$as_me: loading site script $ac_site_file" >&6;} + cat "$ac_site_file" >&5 + . "$ac_site_file" + fi +done + +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then + { echo "$as_me:1007: loading cache $cache_file" >&5 +echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . $cache_file;; + *) . ./$cache_file;; + esac + fi +else + { echo "$as_me:1015: creating cache $cache_file" >&5 +echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in `(set) 2>&1 | + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val="\$ac_cv_env_${ac_var}_value" + eval ac_new_val="\$ac_env_${ac_var}_value" + case $ac_old_set,$ac_new_set in + set,) + { echo "$as_me:1031: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { echo "$as_me:1035: error: \`$ac_var' was not set in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + { echo "$as_me:1041: error: \`$ac_var' has changed since the previous run:" >&5 +echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { echo "$as_me:1043: former value: $ac_old_val" >&5 +echo "$as_me: former value: $ac_old_val" >&2;} + { echo "$as_me:1045: current value: $ac_new_val" >&5 +echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: + fi;; + esac + # Pass precious variables to config.status. It doesn't matter if + # we pass some twice (in addition to the command line arguments). + if test "$ac_new_set" = set; then + case $ac_new_val in + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` + ac_configure_args="$ac_configure_args '$ac_arg'" + ;; + *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" + ;; + esac + fi +done +if $ac_cache_corrupted; then + { echo "$as_me:1064: error: changes in the environment can compromise the build" >&5 +echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { echo "$as_me:1066: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { (exit 1); exit 1; }; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_main_return=return + +case `echo "testing\c" 2>/dev/null; echo 1,2,3`,`echo -n testing 2>/dev/null; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C= # newlines do not sed ;-) only broken shells would use this case anyway + ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac +echo "#! $SHELL" >conftest.sh +echo "exit 0" >>conftest.sh +chmod +x conftest.sh +if { (echo "$as_me:1087: PATH=\".;.\"; conftest.sh") >&5 + (PATH=".;."; conftest.sh) 2>&5 + ac_status=$? + echo "$as_me:1090: \$? = $ac_status" >&5 + (exit $ac_status); }; then + ac_path_separator=';' +else + ac_path_separator=: +fi +PATH_SEPARATOR="$ac_path_separator" +rm -f conftest.sh + +ac_config_headers="$ac_config_headers include/autoconf.h:include/autoconf.hin" + +PACKAGE=tin +VERSION=2.4.3 +cat >>confdefs.h <>confdefs.h <&5 +echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} + { (exit 1); exit 1; }; } +fi +ac_config_guess="$SHELL $ac_aux_dir/config.guess" +ac_config_sub="$SHELL $ac_aux_dir/config.sub" +ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + +# Make sure we can run config.sub. +$ac_config_sub sun4 >/dev/null 2>&1 || + { { echo "$as_me:1140: error: cannot run $ac_config_sub" >&5 +echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +echo "$as_me:1144: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6 +if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_build_alias=$build_alias +test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` +test -z "$ac_cv_build_alias" && + { { echo "$as_me:1153: error: cannot guess build type; you must specify one" >&5 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || + { { echo "$as_me:1157: error: $ac_config_sub $ac_cv_build_alias failed." >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:1162: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6 +build=$ac_cv_build +build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + +if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then + echo "$as_me:1170: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6 +if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_host_alias=$host_alias +test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias +ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || + { { echo "$as_me:1179: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:1184: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6 +host=$ac_cv_host +host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + system_name="$host_os" +else + system_name="`(uname -s -r) 2>/dev/null`" + if test -z "$system_name" ; then + system_name="`(hostname) 2>/dev/null`" + fi +fi +test -n "$system_name" && +cat >>confdefs.h <&6 +else + cf_cv_system_name="$system_name" fi +test -z "$system_name" && system_name="$cf_cv_system_name" +test -n "$cf_cv_system_name" && echo "$as_me:1210: result: Configuring for $cf_cv_system_name" >&5 +echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 +if test ".$system_name" != ".$cf_cv_system_name" ; then + echo "$as_me:1214: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 +echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 + { { echo "$as_me:1216: error: \"Please remove config.cache and try again.\"" >&5 +echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} + { (exit 1); exit 1; }; } +fi - echo $ac_n "checking for PATH separator""... $ac_c" 1>&6 -echo "configure:731: checking for PATH separator" >&5 + echo "$as_me:1221: checking for PATH separator" >&5 +echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 case $cf_cv_system_name in (os2*) PATH_SEPARATOR=';' ;; (*) ${PATH_SEPARATOR:=':'} ;; esac - - echo "$ac_t""$PATH_SEPARATOR" 1>&6 - + echo "$as_me:1228: result: $PATH_SEPARATOR" >&5 +echo "${ECHO_T}$PATH_SEPARATOR" >&6 # Check whether --with-install-prefix or --without-install-prefix was given. if test "${with_install_prefix+set}" = set; then withval="$with_install_prefix" - : + else withval="${DESTDIR:-/}" -fi -if true ; then +fi; if true ; then if test "x$prefix" != xNONE; then cf_path_syntax="$prefix" @@ -771,7 +1261,9 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } + { { echo "$as_me:1264: error: expected a pathname, not \"$withval\"" >&5 +echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } ;; esac @@ -786,25 +1278,18 @@ case ".$DESTDIR" in # (vi ;; esac -if test "$program_transform_name" = s,x,x,; then - program_transform_name= -else - # Double any \ or $. echo might interpret backslashes. - cat <<\EOF_SED > conftestsed -s,\\,\\\\,g; s,\$,$$,g -EOF_SED - program_transform_name="`echo $program_transform_name|sed -f conftestsed`" - rm -f conftestsed -fi test "$program_prefix" != NONE && - program_transform_name="s,^,${program_prefix},; $program_transform_name" + program_transform_name="s,^,$program_prefix,;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && - program_transform_name="s,\$\$,${program_suffix},; $program_transform_name" - -# sed with no file args requires a program. -test "$program_transform_name" = "" && program_transform_name="s,x,x," - + program_transform_name="s,\$,$program_suffix,;$program_transform_name" +# Double any \ or $. echo might interpret backslashes. +# By default was `s,x,x', remove it if useless. +cat <<\_ACEOF >conftest.sed +s/[\\$]/&&/g;s/;s,x,x,$// +_ACEOF +program_transform_name=`echo $program_transform_name | sed -f conftest.sed` +rm conftest.sed ### Compiler/options that autoconf doesn't get right case "$host_os" in @@ -812,37 +1297,39 @@ case "$host_os" in if test "$CC" = ""; then # 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:817: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_XLC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:1300: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_XLC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$XLC" in - /*) + case $XLC in + [\\/]* | ?:[\\/]*) ac_cv_path_XLC="$XLC" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_XLC="$XLC" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_XLC="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_XLC="$ac_dir/$ac_word" + echo "$as_me:1317: found $ac_dir/$ac_word" >&5 + break +fi +done + ;; esac fi -XLC="$ac_cv_path_XLC" +XLC=$ac_cv_path_XLC + if test -n "$XLC"; then - echo "$ac_t""$XLC" 1>&6 + echo "$as_me:1328: result: $XLC" >&5 +echo "${ECHO_T}$XLC" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:1331: result: no" >&5 +echo "${ECHO_T}no" >&6 fi if test "$ac_cv_path_XLC" != ""; then @@ -856,30 +1343,826 @@ fi esac ### Native Language Support -ALL_LINGUAS="da de en_GB et fr ru sv tr zh_CN zh_TW" +ALL_LINGUAS="da de en_GB es et fr ru sv tr zh_CN zh_TW" ### Checks for programs save_CFLAGS="$CFLAGS" +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_main_return=return +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +echo "$as_me:1360: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_CC="${ac_tool_prefix}gcc" +echo "$as_me:1375: found $ac_dir/$ac_word" >&5 +break +done -# This should have been defined by AC_PROG_CC -: ${CC:=cc} - -echo $ac_n "checking \$CC variable""... $ac_c" 1>&6 -echo "configure:870: checking \$CC variable" >&5 -case "$CC" in -(*[\ \ ]-*) - echo "$ac_t""broken" 1>&6 - echo "configure: warning: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" 1>&2 - # humor him... - cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` - cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'` - CC="$cf_prog" +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + echo "$as_me:1383: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 +else + echo "$as_me:1386: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +echo "$as_me:1395: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_CC="gcc" +echo "$as_me:1410: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:1418: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:1421: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + CC=$ac_ct_CC +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +echo "$as_me:1434: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_CC="${ac_tool_prefix}cc" +echo "$as_me:1449: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + echo "$as_me:1457: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 +else + echo "$as_me:1460: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +echo "$as_me:1469: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_CC="cc" +echo "$as_me:1484: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:1492: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:1495: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + CC=$ac_ct_CC +else + CC="$ac_cv_prog_CC" +fi + +fi +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 "$as_me:1508: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue +fi +ac_cv_prog_CC="cc" +echo "$as_me:1528: found $ac_dir/$ac_word" >&5 +break +done + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + set dummy "$ac_dir/$ac_word" ${1+"$@"} + shift + ac_cv_prog_CC="$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + echo "$as_me:1550: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 +else + echo "$as_me:1553: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +echo "$as_me:1564: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +echo "$as_me:1579: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + echo "$as_me:1587: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 +else + echo "$as_me:1590: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl +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 "$as_me:1603: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_CC="$ac_prog" +echo "$as_me:1618: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:1626: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:1629: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$ac_ct_CC" && break +done + + CC=$ac_ct_CC +fi + +fi + +test -z "$CC" && { { echo "$as_me:1641: error: no acceptable cc found in \$PATH" >&5 +echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + { (exit 1); exit 1; }; } + +# Provide some information about the compiler. +echo "$as_me:1646:" \ + "checking for C compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:1649: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 + ac_status=$? + echo "$as_me:1652: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:1654: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? + echo "$as_me:1657: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:1659: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? + echo "$as_me:1662: \$? = $ac_status" >&5 + (exit $ac_status); } + +cat >conftest.$ac_ext <<_ACEOF +#line 1666 "configure" +#include "confdefs.h" + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.exe" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +echo "$as_me:1682: checking for C compiler default output" >&5 +echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 +ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +if { (eval echo "$as_me:1685: \"$ac_link_default\"") >&5 + (eval $ac_link_default) 2>&5 + ac_status=$? + echo "$as_me:1688: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Find the output, starting from the most likely. This scheme is +# not robust to junk in `.', hence go to wildcards (a.*) only as a last +# resort. +for ac_file in `ls a.exe conftest.exe 2>/dev/null; + ls a.out conftest 2>/dev/null; + ls a.* conftest.* 2>/dev/null`; do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + a.out ) # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool --akim. + export ac_cv_exeext + break;; + * ) break;; + esac +done +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +{ { echo "$as_me:1711: error: C compiler cannot create executables" >&5 +echo "$as_me: error: C compiler cannot create executables" >&2;} + { (exit 77); exit 77; }; } +fi + +ac_exeext=$ac_cv_exeext +echo "$as_me:1717: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6 + +# Check the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +echo "$as_me:1722: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 +# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +# If not cross compiling, check that we can run a simple program. +if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' + { (eval echo "$as_me:1728: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:1731: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { echo "$as_me:1738: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'." >&5 +echo "$as_me: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'." >&2;} + { (exit 1); exit 1; }; } + fi + fi +fi +echo "$as_me:1746: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +rm -f a.out a.exe conftest$ac_cv_exeext +ac_clean_files=$ac_clean_files_save +# Check the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +echo "$as_me:1753: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +echo "$as_me:1755: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6 + +echo "$as_me:1758: checking for executable suffix" >&5 +echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 +if { (eval echo "$as_me:1760: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:1763: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + export ac_cv_exeext + break;; + * ) break;; + esac +done +else + { { echo "$as_me:1779: error: cannot compute EXEEXT: cannot compile and link" >&5 +echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { (exit 1); exit 1; }; } +fi + +rm -f conftest$ac_cv_exeext +echo "$as_me:1785: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6 + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +echo "$as_me:1791: checking for object suffix" >&5 +echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 +if test "${ac_cv_objext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 1797 "configure" +#include "confdefs.h" + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { (eval echo "$as_me:1809: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:1812: \$? = $ac_status" >&5 + (exit $ac_status); }; then + for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.map | *.inf ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +{ { echo "$as_me:1824: error: cannot compute OBJEXT: cannot compile" >&5 +echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} + { (exit 1); exit 1; }; } +fi + +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +echo "$as_me:1831: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6 +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +echo "$as_me:1835: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +if test "${ac_cv_c_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 1841 "configure" +#include "confdefs.h" + +int +main (void) +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:1856: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:1859: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:1862: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:1865: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_compiler_gnu=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_compiler_gnu=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +echo "$as_me:1877: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +GCC=`test $ac_compiler_gnu = yes && echo yes` +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +CFLAGS="-g" +echo "$as_me:1883: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 1889 "configure" +#include "confdefs.h" + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:1901: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:1904: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:1907: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:1910: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_g=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_prog_cc_g=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:1920: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +# Some people use a C++ compiler to compile C. Since we use `exit', +# in C++ we need to declare it. In case someone uses the same compiler +# for both compiling C and C++ we need to have the C++ compiler decide +# the declaration of exit, since it's the most demanding environment. +cat >conftest.$ac_ext <<_ACEOF +#ifndef __cplusplus + choke me +#endif +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:1947: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:1950: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:1953: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:1956: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ + ''\ + '#include ' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat >conftest.$ac_ext <<_ACEOF +#line 1968 "configure" +#include "confdefs.h" +#include +$ac_declaration +int +main (void) +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:1981: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:1984: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:1987: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:1990: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +continue +fi +rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +#line 2000 "configure" +#include "confdefs.h" +$ac_declaration +int +main (void) +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2012: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2015: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2018: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2021: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +rm -rf conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h +fi + +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_main_return=return + +GCC_VERSION=none +if test "$GCC" = yes ; then + echo "$as_me:2051: checking version of $CC" >&5 +echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + test -z "$GCC_VERSION" && GCC_VERSION=unknown + echo "$as_me:2055: result: $GCC_VERSION" >&5 +echo "${ECHO_T}$GCC_VERSION" >&6 +fi + +echo "$as_me:2059: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +#line 2067 "configure" +#include "confdefs.h" +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main (void) +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:2116: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2119: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2122: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2125: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC + +fi + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:2142: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:2145: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac + +# This should have been defined by AC_PROG_CC +: ${CC:=cc} + +echo "$as_me:2153: checking \$CFLAGS variable" >&5 +echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 +case "x$CFLAGS" in +(*-[IUD]*) + echo "$as_me:2157: result: broken" >&5 +echo "${ECHO_T}broken" >&6 + { echo "$as_me:2159: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 +echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} + cf_flags="$CFLAGS" + CFLAGS= for cf_arg in $cf_flags do - case "x$cf_arg" in - (x-[IUDfgOW]*) - + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -900,13 +2183,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -921,14 +2204,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -936,7 +2219,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -944,11 +2227,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -959,85 +2241,51 @@ esac done if test -n "$cf_new_cflags" ; then - - + test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - - + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then - - + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - - ;; - (*) - CC="$CC $cf_arg" - ;; - esac done - test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 - -echo "${as_me:-configure}:997: testing resulting CC: '$CC' ..." 1>&5 - - - test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 - -echo "${as_me:-configure}:1002: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 - - - test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 - -echo "${as_me:-configure}:1007: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 - - ;; (*) - echo "$ac_t""ok" 1>&6 + echo "$as_me:2267: result: ok" >&5 +echo "${ECHO_T}ok" >&6 ;; esac +echo "$as_me:2272: checking \$CC variable" >&5 +echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 +case "$CC" in +(*[\ \ ]-*) + echo "$as_me:2276: result: broken" >&5 +echo "${ECHO_T}broken" >&6 + { echo "$as_me:2278: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 +echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} + # humor him... + cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` + cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'` + CC="$cf_prog" + for cf_arg in $cf_flags + do + case "x$cf_arg" in + (x-[IUDfgOW]*) -echo $ac_n "checking for ${CC:-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1018: 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 - -cf_cv_ansi_cc=no -cf_save_CFLAGS="$CFLAGS" -cf_save_CPPFLAGS="$CPPFLAGS" -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX -Aa -D_HPUX_SOURCE -# SVR4 -Xc -# UnixWare 1.2 (cannot use -Xc, since ANSI/POSIX clashes) -for cf_arg in "-DCC_HAS_PROTOS" \ - "" \ - -qlanglvl=ansi \ - -std1 \ - -Ae \ - "-Aa -D_HPUX_SOURCE" \ - -Xc -do - cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -1058,13 +2306,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -1079,14 +2327,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -1094,7 +2342,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -1102,11 +2350,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -1117,728 +2364,322 @@ esac done if test -n "$cf_new_cflags" ; then - - + test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - - + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then - - + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cf_cv_ansi_cc="$cf_arg"; break -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* -done -CFLAGS="$cf_save_CFLAGS" -CPPFLAGS="$cf_save_CPPFLAGS" - -fi - -echo "$ac_t""$cf_cv_ansi_cc" 1>&6 - -if test "$cf_cv_ansi_cc" != "no"; then -if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then - -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= - -for cf_add_cflags in $cf_cv_ansi_cc -do -case $cf_fix_cppflags in -(no) - case $cf_add_cflags in - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in - (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes - - if test $cf_fix_cppflags = yes ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - continue - elif test "${cf_tst_cflags}" = "\"'" ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - continue - fi - ;; - esac - case "$CPPFLAGS" in - (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in - (-D*) - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - -CPPFLAGS=`echo "$CPPFLAGS" | \ - sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` - - ;; - esac - - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" - + CC="$CC $cf_arg" ;; esac - ;; - (*) - - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + done + test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 - ;; - esac - ;; -(yes) - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +echo "${as_me:-configure}:2395: testing resulting CC: '$CC' ..." 1>&5 + + test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 +echo "${as_me:-configure}:2399: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no +echo "${as_me:-configure}:2403: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 + + ;; +(*) + echo "$as_me:2407: result: ok" >&5 +echo "${ECHO_T}ok" >&6 ;; esac -done - -if test -n "$cf_new_cflags" ; then - - - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_new_cflags" +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_main_return=return +echo "$as_me:2418: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= fi - -if test -n "$cf_new_cppflags" ; then - - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" - +if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +#line 2439 "configure" +#include "confdefs.h" +#include + Syntax error +_ACEOF +if { (eval echo "$as_me:2444: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:2450: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes fi - -if test -n "$cf_new_extra_cppflags" ; then - - - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" - +if test -z "$ac_cpp_err"; then + : +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + # Broken: fails on valid input. +continue fi +rm -f conftest.err conftest.$ac_ext - - - + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +#line 2473 "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:2477: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:2483: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - cat >> confdefs.h <<\EOF -#define CC_HAS_PROTOS 1 -EOF - + ac_cpp_err=yes fi +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + # Passes both tests. +ac_preproc_ok=: +break fi +rm -f conftest.err conftest.$ac_ext - -# 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:1300: 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 - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="gcc" - break - fi - done - IFS="$ac_save_ifs" +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break fi + + done + ac_cv_prog_CPP=$CPP + fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 + CPP=$ac_cv_prog_CPP else - echo "$ac_t""no" 1>&6 + ac_cv_prog_CPP=$CPP fi - -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:1330: 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 - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_prog_rejected=no - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - break - fi - done - IFS="$ac_save_ifs" -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# -gt 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - set dummy "$ac_dir/$ac_word" "$@" - shift - ac_cv_prog_CC="$@" +echo "$as_me:2520: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6 +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +#line 2530 "configure" +#include "confdefs.h" +#include + Syntax error +_ACEOF +if { (eval echo "$as_me:2535: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:2541: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= fi +else + ac_cpp_err=yes fi -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 +if test -z "$ac_cpp_err"; then + : else - echo "$ac_t""no" 1>&6 + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + # Broken: fails on valid input. +continue fi +rm -f conftest.err conftest.$ac_ext - if test -z "$CC"; then - case "`uname -s`" in - *win32* | *WIN32*) - # 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:1381: 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 - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +#line 2564 "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:2568: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:2574: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="cl" - break - fi - done - IFS="$ac_save_ifs" + ac_cpp_err=yes fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue else - echo "$ac_t""no" 1>&6 -fi - ;; - esac - fi - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + # Passes both tests. +ac_preproc_ok=: +break fi +rm -f conftest.err conftest.$ac_ext -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1413: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { echo "$as_me:2602: error: C preprocessor \"$CPP\" fails sanity check" >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } +fi ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -cat > conftest.$ac_ext << EOF - -#line 1424 "configure" -#include "confdefs.h" - -main(){return(0);} -EOF -if { (eval echo configure:1429: \"$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 - ac_cv_prog_cc_cross=no - else - ac_cv_prog_cc_cross=yes - fi -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_prog_cc_works=no -fi -rm -fr conftest* -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -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:1455: 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:1460: 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 - cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes -else - ac_cv_prog_gcc=no -fi -fi - -echo "$ac_t""$ac_cv_prog_gcc" 1>&6 - -if test $ac_cv_prog_gcc = yes; then - GCC=yes -else - GCC= -fi - -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:1488: 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 - echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_cc_g=yes -else - ac_cv_prog_cc_g=no -fi -rm -f conftest* - -fi - -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 -if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi - - - -GCC_VERSION=none -if test "$GCC" = yes ; then - echo $ac_n "checking version of $CC""... $ac_c" 1>&6 -echo "configure:1524: checking version of $CC" >&5 - GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" - test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$ac_t""$GCC_VERSION" 1>&6 -fi - - - -if test "$cf_cv_ansi_cc" = "no"; then - { echo "configure: error: Your compiler does not appear to recognize prototypes. -You have the following choices: - a. adjust your compiler options - b. get an up-to-date compiler - c. use a wrapper such as unproto" 1>&2; exit 1; } -fi - - -# This should have been defined by AC_PROG_CC -: ${CC:=cc} - -echo $ac_n "checking \$CC variable""... $ac_c" 1>&6 -echo "configure:1545: checking \$CC variable" >&5 -case "$CC" in -(*[\ \ ]-*) - echo "$ac_t""broken" 1>&6 - echo "configure: warning: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" 1>&2 - # humor him... - cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` - cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'` - CC="$cf_prog" - for cf_arg in $cf_flags - do - case "x$cf_arg" in - (x-[IUDfgOW]*) - -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= - -for cf_add_cflags in $cf_arg -do -case $cf_fix_cppflags in -(no) - case $cf_add_cflags in - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in - (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes - - if test $cf_fix_cppflags = yes ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - continue - elif test "${cf_tst_cflags}" = "\"'" ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - continue - fi - ;; - esac - case "$CPPFLAGS" in - (*$cf_add_cflags) - ;; - (*) - case $cf_add_cflags in - (-D*) - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - -CPPFLAGS=`echo "$CPPFLAGS" | \ - sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` - - ;; - esac - - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" - - ;; - esac - ;; - (*) - - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" - - ;; - esac - ;; -(yes) - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no - ;; -esac -done - -if test -n "$cf_new_cflags" ; then - - - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_new_cflags" - -fi - -if test -n "$cf_new_cppflags" ; then - - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" - -fi - -if test -n "$cf_new_extra_cppflags" ; then - - - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" - -fi - - - - - ;; - (*) - CC="$CC $cf_arg" - ;; - esac - done - test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 - -echo "${as_me:-configure}:1672: testing resulting CC: '$CC' ..." 1>&5 - - - test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 - -echo "${as_me:-configure}:1677: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 - - - test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 - -echo "${as_me:-configure}:1682: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 - - - ;; -(*) - echo "$ac_t""ok" 1>&6 - ;; -esac - - -echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1693: checking how to run the C preprocessor" >&5 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" - # 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:1714: \"$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 - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - 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:1731: \"$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 - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - 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:1748: \"$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 - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp -fi -rm -f conftest* -fi -rm -f conftest* -fi -rm -f conftest* - ac_cv_prog_CPP="$CPP" -fi - CPP="$ac_cv_prog_CPP" -else - ac_cv_prog_CPP="$CPP" -fi -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:1774: 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 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_main_return=return + +if test $ac_cv_c_compiler_gnu = yes; then + echo "$as_me:2615: checking whether $CC needs -traditional" >&5 +echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 +if test "${ac_cv_prog_gcc_traditional+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_pattern="Autoconf.*'x'" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 2622 "configure" #include "confdefs.h" #include -Autoconf TIOCGETP -EOF +int Autoconf = TIOCGETP; +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "$ac_pattern" >/dev/null 2>&1; then - rm -rf conftest* ac_cv_prog_gcc_traditional=yes else - rm -rf conftest* ac_cv_prog_gcc_traditional=no fi -rm -f conftest* - +rm -rf conftest* if test $ac_cv_prog_gcc_traditional = no; then - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 2637 "configure" #include "confdefs.h" #include -Autoconf TCGETA -EOF +int Autoconf = TCGETA; +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "$ac_pattern" >/dev/null 2>&1; then - rm -rf conftest* ac_cv_prog_gcc_traditional=yes fi -rm -f conftest* +rm -rf conftest* fi fi - -echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 +echo "$as_me:2650: result: $ac_cv_prog_gcc_traditional" >&5 +echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" fi fi -echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1820: 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 +echo "$as_me:2657: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftestmake <<\EOF + cat >conftest.make <<\EOF all: @echo 'ac_maketemp="${MAKE}"' EOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` +eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` if test -n "$ac_maketemp"; then eval ac_cv_prog_make_${ac_make}_set=yes else eval ac_cv_prog_make_${ac_make}_set=no fi -rm -f conftestmake +rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$ac_t""yes" 1>&6 + echo "$as_me:2677: result: yes" >&5 +echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$ac_t""no" 1>&6 + echo "$as_me:2681: result: no" >&5 +echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -1849,31 +2690,39 @@ fi # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # 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:1858: checking for a BSD compatible install" >&5 +echo "$as_me:2698: checking for a BSD compatible install" >&5 +echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if test "${ac_cv_path_install+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + ac_save_IFS=$IFS; IFS=$ac_path_separator for ac_dir in $PATH; do + IFS=$ac_save_IFS # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + case $ac_dir/ in + / | ./ | .// | /cC/* \ + | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ + | /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root # by default. for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then + if $as_executable_p "$ac_dir/$ac_prog"; then if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then + grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : + elif test $ac_prog = install && + grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : else ac_cv_path_install="$ac_dir/$ac_prog -c" break 2 @@ -1883,35 +2732,33 @@ else ;; esac done - IFS="$ac_save_IFS" fi if test "${ac_cv_path_install+set}" = set; then - INSTALL="$ac_cv_path_install" + INSTALL=$ac_cv_path_install else # As a last resort, use the slow shell script. We don't cache a # path for INSTALL within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the path is relative. - INSTALL="$ac_install_sh" + INSTALL=$ac_install_sh fi fi -echo "$ac_t""$INSTALL" 1>&6 +echo "$as_me:2747: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - -if eval "test \"`echo '$''{'cf_cv_prog_YACC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if test "${cf_cv_prog_YACC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + if test -n "$YACC" ; then cf_cv_prog_YACC="$YACC" # Let the user override the test. else @@ -1930,22 +2777,31 @@ EOF for cf_prog in 'bison -y' byacc yacc do rm -f y.tab.ch - echo $ac_n "checking for $cf_prog""... $ac_c" 1>&6 -echo "configure:1935: checking for $cf_prog" >&5 + echo "$as_me:2780: checking for $cf_prog" >&5 +echo $ECHO_N "checking for $cf_prog... $ECHO_C" >&6 cf_command="$cf_prog conftest.y" cf_result=no - if { (eval echo configure:1938: \"$cf_command\") 1>&5; (eval $cf_command) 2>&5; } && test -s y.tab.c ; then + if { (eval echo "$as_me:2784: \"$cf_command\"") >&5 + (eval $cf_command) 2>&5 + ac_status=$? + echo "$as_me:2787: \$? = $ac_status" >&5 + (exit $ac_status); } && 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:1942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest ; then + if { (eval echo "$as_me:2792: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:2795: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest ; then cf_result=yes fi else cf_result=yes fi fi - echo "$ac_t""$cf_result" 1>&6 + echo "$as_me:2803: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then cf_cv_prog_YACC="$cf_prog" break @@ -1959,171 +2815,581 @@ YACC="$cf_cv_prog_YACC" for ac_prog in lint alint lclint tdlint splint do -# Extract the first word of "$ac_prog", so it can be a program name with args. + # 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:1966: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LINT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:2820: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_LINT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$LINT"; then ac_cv_prog_LINT="$LINT" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_LINT="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_LINT="$ac_prog" +echo "$as_me:2835: found $ac_dir/$ac_word" >&5 +break +done + fi fi -LINT="$ac_cv_prog_LINT" +LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$ac_t""$LINT" 1>&6 + echo "$as_me:2843: result: $LINT" >&5 +echo "${ECHO_T}$LINT" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:2846: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$LINT" && break +done +test -n "$LINT" || LINT=":" + +cf_XOPEN_SOURCE=500 +cf_POSIX_C_SOURCE=199506L +cf_xopen_source= + +case $host_os in +(aix[4-7]*) + cf_xopen_source="-D_ALL_SOURCE" + ;; +(msys) + cf_XOPEN_SOURCE=600 + ;; +(darwin[0-8].*) + cf_xopen_source="-D_APPLE_C_SOURCE" + ;; +(darwin*) + cf_xopen_source="-D_DARWIN_C_SOURCE" + cf_XOPEN_SOURCE= + ;; +(freebsd*|dragonfly*|midnightbsd*) + # 5.x headers associate + # _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L + # _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L + cf_POSIX_C_SOURCE=200112L + cf_XOPEN_SOURCE=600 + cf_xopen_source="-D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + ;; +(hpux11*) + cf_xopen_source="-D_HPUX_SOURCE -D_XOPEN_SOURCE=500" + ;; +(hpux*) + cf_xopen_source="-D_HPUX_SOURCE" + ;; +(irix[56].*) + cf_xopen_source="-D_SGI_SOURCE" + cf_XOPEN_SOURCE= + ;; +(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin) + +cf_gnu_xopen_source=$cf_XOPEN_SOURCE + +echo "$as_me:2894: checking if this is the GNU C library" >&5 +echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6 +if test "${cf_cv_gnu_library+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cat >conftest.$ac_ext <<_ACEOF +#line 2901 "configure" +#include "confdefs.h" +#include +int +main (void) +{ + + #if __GLIBC__ > 0 && __GLIBC_MINOR__ >= 0 + return 0; + #else + # error not GNU C library + #endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2918: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2921: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2924: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2927: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_library=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_gnu_library=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:2938: result: $cf_cv_gnu_library" >&5 +echo "${ECHO_T}$cf_cv_gnu_library" >&6 + +if test x$cf_cv_gnu_library = xyes; then + + # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE + # was changed to help a little... + echo "$as_me:2945: checking if _DEFAULT_SOURCE can be used as a basis" >&5 +echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6 +if test "${cf_cv_gnu_library_219+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cf_save="$CPPFLAGS" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" + + cat >conftest.$ac_ext <<_ACEOF +#line 2957 "configure" +#include "confdefs.h" +#include +int +main (void) +{ + + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 19) || (__GLIBC__ > 2) + return 0; + #else + # error GNU C library __GLIBC__.__GLIBC_MINOR__ is too old + #endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2974: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2977: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2980: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2983: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_library_219=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_gnu_library_219=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS="$cf_save" + +fi +echo "$as_me:2995: result: $cf_cv_gnu_library_219" >&5 +echo "${ECHO_T}$cf_cv_gnu_library_219" >&6 + + if test "x$cf_cv_gnu_library_219" = xyes; then + cf_save="$CPPFLAGS" + echo "$as_me:3000: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 +echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6 +if test "${cf_cv_gnu_dftsrc_219+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=$cf_gnu_xopen_source +do +case $cf_fix_cppflags in +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case $cf_add_cflags in + (-D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case $cf_add_cflags in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi + + cat >conftest.$ac_ext <<_ACEOF +#line 3105 "configure" +#include "confdefs.h" + + #include + #include + +int +main (void) +{ + + #if (_XOPEN_SOURCE >= $cf_gnu_xopen_source) && (MB_LEN_MAX > 1) + return 0; + #else + # error GNU C library is too old + #endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3125: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3128: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3131: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3134: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_dftsrc_219=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_gnu_dftsrc_219=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:3145: result: $cf_cv_gnu_dftsrc_219" >&5 +echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 + test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save" + else + cf_cv_gnu_dftsrc_219=maybe + fi + + if test "x$cf_cv_gnu_dftsrc_219" != xyes; then + + echo "$as_me:3154: checking if we must define _GNU_SOURCE" >&5 +echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 +if test "${cf_cv_gnu_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +#line 3161 "configure" +#include "confdefs.h" +#include +int +main (void) +{ + + #ifndef _XOPEN_SOURCE + #error expected _XOPEN_SOURCE to be defined + #endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3176: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3179: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3182: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3185: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_source=no +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_save="$CPPFLAGS" + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in -D_GNU_SOURCE +do +case $cf_fix_cppflags in +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case $cf_add_cflags in + (-D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case $cf_add_cflags in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + fi -test -n "$LINT" && break -done -test -n "$LINT" || LINT=":" +if test -n "$cf_new_cppflags" ; then + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +fi +if test -n "$cf_new_extra_cppflags" ; then -cf_XOPEN_SOURCE=500 -cf_POSIX_C_SOURCE=199506L -cf_xopen_source= + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" -case $host_os in -(aix[4-7]*) - cf_xopen_source="-D_ALL_SOURCE" - ;; -(msys) - cf_XOPEN_SOURCE=600 - ;; -(darwin[0-8].*) - cf_xopen_source="-D_APPLE_C_SOURCE" - ;; -(darwin*) - cf_xopen_source="-D_DARWIN_C_SOURCE" - cf_XOPEN_SOURCE= - ;; -(freebsd*|dragonfly*) - # 5.x headers associate - # _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L - # _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L - cf_POSIX_C_SOURCE=200112L - cf_XOPEN_SOURCE=600 - cf_xopen_source="-D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - ;; -(hpux11*) - cf_xopen_source="-D_HPUX_SOURCE -D_XOPEN_SOURCE=500" - ;; -(hpux*) - cf_xopen_source="-D_HPUX_SOURCE" - ;; -(irix[56].*) - cf_xopen_source="-D_SGI_SOURCE" - cf_XOPEN_SOURCE= - ;; -(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin) - -echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6 -echo "configure:2038: 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() { +fi -#ifndef _XOPEN_SOURCE -make an error -#endif -; return 0; } -EOF -if { (eval echo configure:2054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cf_cv_gnu_source=no -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3292 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ -#ifdef _XOPEN_SOURCE -make an error -#endif -; return 0; } -EOF -if { (eval echo configure:2074: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + #ifdef _XOPEN_SOURCE + #error expected _XOPEN_SOURCE to be undefined + #endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3307: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3310: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3313: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3316: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_gnu_source=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_gnu_source=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_gnu_source=yes fi -rm -f conftest* - CPPFLAGS="$cf_save" - -fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS="$cf_save" fi +rm -f conftest.$ac_objext conftest.$ac_ext -echo "$ac_t""$cf_cv_gnu_source" 1>&6 +fi +echo "$as_me:3331: result: $cf_cv_gnu_source" >&5 +echo "${ECHO_T}$cf_cv_gnu_source" >&6 -if test "$cf_cv_gnu_source" = yes -then -echo $ac_n "checking if we should also define _DEFAULT_SOURCE""... $ac_c" 1>&6 -echo "configure:2096: checking if we should also define _DEFAULT_SOURCE" >&5 -if eval "test \"`echo '$''{'cf_cv_default_source'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + if test "$cf_cv_gnu_source" = yes + then + echo "$as_me:3336: checking if we should also define _DEFAULT_SOURCE" >&5 +echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6 +if test "${cf_cv_default_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - -CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3346 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ -#ifdef _DEFAULT_SOURCE -make an error -#endif -; return 0; } -EOF -if { (eval echo configure:2113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + #ifdef _DEFAULT_SOURCE + #error expected _DEFAULT_SOURCE to be undefined + #endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3361: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3364: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3367: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3370: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_default_source=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_default_source=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_default_source=yes fi -rm -f conftest* - +rm -f conftest.$ac_objext conftest.$ac_ext + fi +echo "$as_me:3381: result: $cf_cv_default_source" >&5 +echo "${ECHO_T}$cf_cv_default_source" >&6 + if test "$cf_cv_default_source" = yes + then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" + + fi + fi + fi -echo "$ac_t""$cf_cv_default_source" 1>&6 -test "$cf_cv_default_source" = yes && CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE" fi ;; @@ -2133,51 +3399,60 @@ fi (mirbsd*) # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks and other headers which use u_int / u_short types cf_XOPEN_SOURCE= - + cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE cf_save_CFLAGS="$CFLAGS" cf_save_CPPFLAGS="$CPPFLAGS" - cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` - cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` +echo "$as_me:3416: checking if we should define _POSIX_C_SOURCE" >&5 +echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 +if test "${cf_cv_posix_c_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else -echo $ac_n "checking if we should define _POSIX_C_SOURCE""... $ac_c" 1>&6 -echo "configure:2155: checking if we should define _POSIX_C_SOURCE" >&5 -if eval "test \"`echo '$''{'cf_cv_posix_c_source'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - -echo "${as_me:-configure}:2161: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:3422: testing if the symbol is already defined go no further ..." 1>&5 - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3425 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ #ifndef _POSIX_C_SOURCE make an error #endif -; return 0; } -EOF -if { (eval echo configure:2174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3440: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3443: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3446: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3449: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_posix_c_source=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_want_posix_source=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_want_posix_source=no case .$cf_POSIX_C_SOURCE in (.[12]??*) cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" @@ -2191,69 +3466,100 @@ else ;; esac if test "$cf_want_posix_source" = yes ; then - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3470 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ #ifdef _POSIX_SOURCE make an error #endif -; return 0; } -EOF -if { (eval echo configure:2206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3485: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3488: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3491: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3494: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "${as_me:-configure}:2217: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + +echo "${as_me:-configure}:3505: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" - CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" - -echo "${as_me:-configure}:2222: testing if the second compile does not leave our definition intact error ..." 1>&5 + CPPFLAGS="$cf_trim_CPPFLAGS" - cat > conftest.$ac_ext <&5 + + cat >conftest.$ac_ext <<_ACEOF +#line 3516 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ #ifndef _POSIX_C_SOURCE make an error #endif -; return 0; } -EOF -if { (eval echo configure:2235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3531: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3534: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3537: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3540: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_posix_c_source=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_posix_c_source=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" CPPFLAGS="$cf_save_CPPFLAGS" - -fi -rm -f conftest* fi +rm -f conftest.$ac_objext conftest.$ac_ext -echo "$ac_t""$cf_cv_posix_c_source" 1>&6 +fi +echo "$as_me:3556: result: $cf_cv_posix_c_source" >&5 +echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" - + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -2274,13 +3580,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -2295,14 +3601,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -2310,7 +3616,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -2318,11 +3624,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -2333,35 +3638,28 @@ esac done if test -n "$cf_new_cflags" ; then - - + test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - - + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then - - + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - fi - ;; (netbsd*) cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw @@ -2392,84 +3690,112 @@ fi cf_POSIX_C_SOURCE= ;; (*) - -echo $ac_n "checking if we should define _XOPEN_SOURCE""... $ac_c" 1>&6 -echo "configure:2398: checking if we should define _XOPEN_SOURCE" >&5 -if eval "test \"`echo '$''{'cf_cv_xopen_source'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +echo "$as_me:3694: checking if we should define _XOPEN_SOURCE" >&5 +echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 +if test "${cf_cv_xopen_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3701 "configure" #include "confdefs.h" #include #include #include -int main() { +int +main (void) +{ #ifndef _XOPEN_SOURCE make an error #endif -; return 0; } -EOF -if { (eval echo configure:2418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3720: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3723: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3726: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3729: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_xopen_source=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - cat > conftest.$ac_ext <&5 +cat conftest.$ac_ext >&5 +cf_save="$CPPFLAGS" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >conftest.$ac_ext <<_ACEOF +#line 3741 "configure" #include "confdefs.h" #include #include #include -int main() { +int +main (void) +{ #ifdef _XOPEN_SOURCE make an error #endif -; return 0; } -EOF -if { (eval echo configure:2442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3760: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3763: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3766: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3769: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_xopen_source=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_xopen_source=$cf_XOPEN_SOURCE + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_xopen_source=$cf_XOPEN_SOURCE fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$cf_save" - -fi -rm -f conftest* fi +rm -f conftest.$ac_objext conftest.$ac_ext -echo "$ac_t""$cf_cv_xopen_source" 1>&6 +fi +echo "$as_me:3784: result: $cf_cv_xopen_source" >&5 +echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then - + CFLAGS=`echo "$CFLAGS" | \ sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` - CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" - + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -2490,13 +3816,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -2511,14 +3837,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -2526,7 +3852,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -2534,11 +3860,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -2549,79 +3874,81 @@ esac done if test -n "$cf_new_cflags" ; then - - + test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - - + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then - - + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - fi - cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE cf_save_CFLAGS="$CFLAGS" cf_save_CPPFLAGS="$CPPFLAGS" - cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` - cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` +echo "$as_me:3912: checking if we should define _POSIX_C_SOURCE" >&5 +echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 +if test "${cf_cv_posix_c_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else -echo $ac_n "checking if we should define _POSIX_C_SOURCE""... $ac_c" 1>&6 -echo "configure:2599: checking if we should define _POSIX_C_SOURCE" >&5 -if eval "test \"`echo '$''{'cf_cv_posix_c_source'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - -echo "${as_me:-configure}:2605: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:3918: testing if the symbol is already defined go no further ..." 1>&5 - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3921 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ #ifndef _POSIX_C_SOURCE make an error #endif -; return 0; } -EOF -if { (eval echo configure:2618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3936: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3939: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3942: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3945: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_posix_c_source=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_want_posix_source=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_want_posix_source=no case .$cf_POSIX_C_SOURCE in (.[12]??*) cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" @@ -2635,69 +3962,100 @@ else ;; esac if test "$cf_want_posix_source" = yes ; then - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3966 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ #ifdef _POSIX_SOURCE make an error #endif -; return 0; } -EOF -if { (eval echo configure:2650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3981: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3984: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3987: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3990: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "${as_me:-configure}:2661: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + +echo "${as_me:-configure}:4001: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" - CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" - -echo "${as_me:-configure}:2666: testing if the second compile does not leave our definition intact error ..." 1>&5 + CPPFLAGS="$cf_trim_CPPFLAGS" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +echo "${as_me:-configure}:4009: testing if the second compile does not leave our definition intact error ..." 1>&5 - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4012 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ #ifndef _POSIX_C_SOURCE make an error #endif -; return 0; } -EOF -if { (eval echo configure:2679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:4027: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4030: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:4033: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4036: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_posix_c_source=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_posix_c_source=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" CPPFLAGS="$cf_save_CPPFLAGS" - -fi -rm -f conftest* fi +rm -f conftest.$ac_objext conftest.$ac_ext -echo "$ac_t""$cf_cv_posix_c_source" 1>&6 +fi +echo "$as_me:4052: result: $cf_cv_posix_c_source" >&5 +echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" - + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -2718,13 +4076,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -2739,14 +4097,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -2754,7 +4112,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -2762,11 +4120,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -2777,40 +4134,33 @@ esac done if test -n "$cf_new_cflags" ; then - - + test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - - + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then - - + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - fi - ;; esac if test -n "$cf_xopen_source" ; then - + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -2831,13 +4181,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -2852,14 +4202,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -2867,7 +4217,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -2875,11 +4225,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -2892,10 +4241,8 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:2896: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:4244: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 - - test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -2904,10 +4251,8 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:2908: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 - +echo "${as_me:-configure}:4254: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -2916,151 +4261,202 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:2920: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:4264: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 - - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo $ac_n "checking if _XOPEN_SOURCE really is set""... $ac_c" 1>&6 -echo "configure:2936: checking if _XOPEN_SOURCE really is set" >&5 - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 4277 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ #ifndef _XOPEN_SOURCE make an error #endif -; return 0; } -EOF -if { (eval echo configure:2948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:4292: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4295: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:4298: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4301: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_XOPEN_SOURCE_set=no -fi -rm -f conftest* - echo "$ac_t""$cf_XOPEN_SOURCE_set" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_XOPEN_SOURCE_set=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + echo "$as_me:4310: result: $cf_XOPEN_SOURCE_set" >&5 +echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 if test $cf_XOPEN_SOURCE_set = yes then - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4315 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ #if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE make an error #endif -; return 0; } -EOF -if { (eval echo configure:2972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:4330: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4333: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:4336: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4339: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set_ok=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_XOPEN_SOURCE_set_ok=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_XOPEN_SOURCE_set_ok=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext if test $cf_XOPEN_SOURCE_set_ok = no then - echo "configure: warning: _XOPEN_SOURCE is lower than requested" 1>&2 + { echo "$as_me:4350: WARNING: _XOPEN_SOURCE is lower than requested" >&5 +echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else - -echo $ac_n "checking if we should define _XOPEN_SOURCE""... $ac_c" 1>&6 -echo "configure:2989: checking if we should define _XOPEN_SOURCE" >&5 -if eval "test \"`echo '$''{'cf_cv_xopen_source'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +echo "$as_me:4355: checking if we should define _XOPEN_SOURCE" >&5 +echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 +if test "${cf_cv_xopen_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4362 "configure" #include "confdefs.h" #include #include #include -int main() { +int +main (void) +{ #ifndef _XOPEN_SOURCE make an error #endif -; return 0; } -EOF -if { (eval echo configure:3009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:4381: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4384: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:4387: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4390: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_xopen_source=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - cat > conftest.$ac_ext <&5 +cat conftest.$ac_ext >&5 +cf_save="$CPPFLAGS" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >conftest.$ac_ext <<_ACEOF +#line 4402 "configure" #include "confdefs.h" #include #include #include -int main() { +int +main (void) +{ #ifdef _XOPEN_SOURCE make an error #endif -; return 0; } -EOF -if { (eval echo configure:3033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:4421: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4424: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:4427: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4430: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_xopen_source=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_xopen_source=$cf_XOPEN_SOURCE + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_xopen_source=$cf_XOPEN_SOURCE fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$cf_save" - -fi -rm -f conftest* fi +rm -f conftest.$ac_objext conftest.$ac_ext -echo "$ac_t""$cf_cv_xopen_source" 1>&6 +fi +echo "$as_me:4445: result: $cf_cv_xopen_source" >&5 +echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then - + CFLAGS=`echo "$CFLAGS" | \ sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` - CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" - + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -3081,13 +4477,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -3102,14 +4498,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -3117,7 +4513,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -3125,11 +4521,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -3140,64 +4535,70 @@ esac done if test -n "$cf_new_cflags" ; then - - + test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - - + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then - - + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - fi fi fi - -echo $ac_n "checking if SIGWINCH is defined""... $ac_c" 1>&6 -echo "configure:3177: checking if SIGWINCH is defined" >&5 -if eval "test \"`echo '$''{'cf_cv_define_sigwinch'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:4563: checking if SIGWINCH is defined" >&5 +echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 +if test "${cf_cv_define_sigwinch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4570 "configure" #include "confdefs.h" #include #include -int main() { +int +main (void) +{ int x = SIGWINCH -; return 0; } -EOF -if { (eval echo configure:3193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:4585: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4588: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:4591: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4594: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_define_sigwinch=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cat > conftest.$ac_ext <&5 +cat conftest.$ac_ext >&5 +cat >conftest.$ac_ext <<_ACEOF +#line 4601 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -3206,41 +4607,54 @@ else #include #include -int main() { +int +main (void) +{ int x = SIGWINCH -; return 0; } -EOF -if { (eval echo configure:3214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:4619: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4622: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:4625: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4628: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_define_sigwinch=maybe else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_define_sigwinch=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_define_sigwinch=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_define_sigwinch" 1>&6 +echo "$as_me:4642: result: $cf_cv_define_sigwinch" >&5 +echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 if test "$cf_cv_define_sigwinch" = maybe ; then -echo $ac_n "checking for actual SIGWINCH definition""... $ac_c" 1>&6 -echo "configure:3234: checking for actual SIGWINCH definition" >&5 -if eval "test \"`echo '$''{'cf_cv_fixup_sigwinch'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:4646: checking for actual SIGWINCH definition" >&5 +echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 +if test "${cf_cv_fixup_sigwinch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_cv_fixup_sigwinch=unknown cf_sigwinch=32 while test $cf_sigwinch != 1 do - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4657 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -3249,104 +4663,57 @@ do #include #include -int main() { +int +main (void) +{ #if SIGWINCH != $cf_sigwinch make an error #endif int x = SIGWINCH -; return 0; } -EOF -if { (eval echo configure:3261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:4679: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4682: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:4685: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4688: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_fixup_sigwinch=$cf_sigwinch break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext cf_sigwinch=`expr $cf_sigwinch - 1` done fi - -echo "$ac_t""$cf_cv_fixup_sigwinch" 1>&6 +echo "$as_me:4702: result: $cf_cv_fixup_sigwinch" >&5 +echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 if test "$cf_cv_fixup_sigwinch" != unknown ; then CPPFLAGS="$CPPFLAGS -DSIGWINCH=$cf_cv_fixup_sigwinch" fi fi -echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:3284: checking for Cygwin environment" >&5 -if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cygwin=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_cygwin=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_cygwin" 1>&6 -CYGWIN= -test "$ac_cv_cygwin" = yes && CYGWIN=yes -echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:3317: checking for mingw32 environment" >&5 -if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_mingw32=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_mingw32=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_mingw32" 1>&6 -MINGW32= -test "$ac_cv_mingw32" = yes && MINGW32=yes - - case $cf_cv_system_name in (os2*) CFLAGS="$CFLAGS -Zmt" - CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D__ST_MT_ERRNO__" + CXXFLAGS="$CXXFLAGS -Zmt" # autoconf's macro sets -Zexe and suffix both, which conflict:w LDFLAGS="$LDFLAGS -Zmt -Zcrtdll" @@ -3354,78 +4721,13 @@ case $cf_cv_system_name in ;; esac - - -echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:3361: checking for executable suffix" >&5 -if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$CYGWIN" = yes || test "$MINGW32" = yes; then - ac_cv_exeext=.exe -else - rm -f conftest* - echo 'int main () { return 0; }' > conftest.$ac_ext - ac_cv_exeext= - if { (eval echo configure:3371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - for file in conftest.*; do - if test -f $file ; then - case $file in - *.c | *.o | *.obj) ;; - *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; - esac - fi - done - else - { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } - fi - rm -rf conftest.dSYM - rm -f conftest* - test x"${ac_cv_exeext}" = x && ac_cv_exeext=no -fi -fi - -EXEEXT="" -test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} -echo "$ac_t""${ac_cv_exeext}" 1>&6 -ac_exeext=$EXEEXT - -echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:3395: 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:3401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - for ac_file in conftest.*; do - if test -f $ac_file ; then - case $ac_file in - *.c) ;; - *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;; - esac - fi - done -else - { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; } -fi -rm -rf conftest.dSYM -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_objext" 1>&6 -OBJEXT=$ac_cv_objext -ac_objext=$ac_cv_objext - - PROG_EXT="$EXEEXT" -test -n "$PROG_EXT" && cat >> confdefs.h <>confdefs.h <&6 -echo "configure:3445: checking whether ln -s works" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - rm -f conftestdata -if ln -s X conftestdata 2>/dev/null -then - rm -f conftestdata - ac_cv_prog_LN_S="ln -s" -else - ac_cv_prog_LN_S=ln -fi -fi -LN_S="$ac_cv_prog_LN_S" -if test "$ac_cv_prog_LN_S" = "ln -s"; then - echo "$ac_t""yes" 1>&6 +echo "$as_me:4744: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + echo "$as_me:4748: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:4751: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6 fi - - - - if test "$cross_compiling" = yes ; then # defaults that we might want to override @@ -3475,108 +4762,111 @@ if test "$cross_compiling" = yes ; then : ${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 withval="$with_build_cc" BUILD_CC="$withval" else - for ac_prog in gcc cc cl + for ac_prog in gcc clang c99 c89 cc cl do -# Extract the first word of "$ac_prog", so it can be a program name with args. + # 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:3490: 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 +echo "$as_me:4774: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_BUILD_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$BUILD_CC"; then ac_cv_prog_BUILD_CC="$BUILD_CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_BUILD_CC="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_BUILD_CC="$ac_prog" +echo "$as_me:4789: found $ac_dir/$ac_word" >&5 +break +done + fi fi -BUILD_CC="$ac_cv_prog_BUILD_CC" +BUILD_CC=$ac_cv_prog_BUILD_CC if test -n "$BUILD_CC"; then - echo "$ac_t""$BUILD_CC" 1>&6 + echo "$as_me:4797: result: $BUILD_CC" >&5 +echo "${ECHO_T}$BUILD_CC" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:4800: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -test -n "$BUILD_CC" && break + test -n "$BUILD_CC" && break done +test -n "$BUILD_CC" || BUILD_CC="none" -fi +fi; + echo "$as_me:4809: checking for native build C compiler" >&5 +echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 + echo "$as_me:4811: result: $BUILD_CC" >&5 +echo "${ECHO_T}$BUILD_CC" >&6 - echo $ac_n "checking for native build C compiler""... $ac_c" 1>&6 -echo "configure:3522: checking for native build C compiler" >&5 - echo "$ac_t""$BUILD_CC" 1>&6 + echo "$as_me:4814: checking for native build C preprocessor" >&5 +echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 - echo $ac_n "checking for native build C preprocessor""... $ac_c" 1>&6 -echo "configure:3526: checking for native build C preprocessor" >&5 - # 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='${BUILD_CC} -E' -fi +fi; + echo "$as_me:4824: result: $BUILD_CPP" >&5 +echo "${ECHO_T}$BUILD_CPP" >&6 - echo "$ac_t""$BUILD_CPP" 1>&6 + echo "$as_me:4827: checking for native build C flags" >&5 +echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 - echo $ac_n "checking for native build C flags""... $ac_c" 1>&6 -echo "configure:3539: checking for native build C flags" >&5 - # Check whether --with-build-cflags or --without-build-cflags was given. if test "${with_build_cflags+set}" = set; then withval="$with_build_cflags" BUILD_CFLAGS="$withval" -fi +fi; + echo "$as_me:4835: result: $BUILD_CFLAGS" >&5 +echo "${ECHO_T}$BUILD_CFLAGS" >&6 - echo "$ac_t""$BUILD_CFLAGS" 1>&6 + echo "$as_me:4838: checking for native build C preprocessor-flags" >&5 +echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 - echo $ac_n "checking for native build C preprocessor-flags""... $ac_c" 1>&6 -echo "configure:3550: checking for native build C preprocessor-flags" >&5 - # Check whether --with-build-cppflags or --without-build-cppflags was given. if test "${with_build_cppflags+set}" = set; then withval="$with_build_cppflags" BUILD_CPPFLAGS="$withval" -fi +fi; + echo "$as_me:4846: result: $BUILD_CPPFLAGS" >&5 +echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 - echo "$ac_t""$BUILD_CPPFLAGS" 1>&6 + echo "$as_me:4849: checking for native build linker-flags" >&5 +echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 - echo $ac_n "checking for native build linker-flags""... $ac_c" 1>&6 -echo "configure:3561: checking for native build linker-flags" >&5 - # Check whether --with-build-ldflags or --without-build-ldflags was given. if test "${with_build_ldflags+set}" = set; then withval="$with_build_ldflags" BUILD_LDFLAGS="$withval" -fi +fi; + echo "$as_me:4857: result: $BUILD_LDFLAGS" >&5 +echo "${ECHO_T}$BUILD_LDFLAGS" >&6 - echo "$ac_t""$BUILD_LDFLAGS" 1>&6 + echo "$as_me:4860: checking for native build linker-libraries" >&5 +echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 - echo $ac_n "checking for native build linker-libraries""... $ac_c" 1>&6 -echo "configure:3572: checking for native build linker-libraries" >&5 - # Check whether --with-build-libs or --without-build-libs was given. if test "${with_build_libs+set}" = set; then withval="$with_build_libs" BUILD_LIBS="$withval" -fi - - echo "$ac_t""$BUILD_LIBS" 1>&6 +fi; + echo "$as_me:4868: result: $BUILD_LIBS" >&5 +echo "${ECHO_T}$BUILD_LIBS" >&6 # this assumes we're on Unix. BUILD_EXEEXT= @@ -3585,8 +4875,11 @@ fi : ${BUILD_CC:='${CC}'} if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then - { echo "configure: error: Cross-build requires two compilers. -Use --with-build-cc to specify the native compiler." 1>&2; exit 1; } + { { echo "$as_me:4878: error: Cross-build requires two compilers. +Use --with-build-cc to specify the native compiler." >&5 +echo "$as_me: error: Cross-build requires two compilers. +Use --with-build-cc to specify the native compiler." >&2;} + { (exit 1); exit 1; }; } fi else @@ -3600,252 +4893,234 @@ else : ${BUILD_OBJEXT:='o'} fi - - - - - - - - - - -echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:3615: checking build system type" >&5 - -build_alias=$build -case "$build_alias" in -NONE) - case $nonopt in - NONE) build_alias=$host_alias ;; - *) build_alias=$nonopt ;; - esac ;; -esac - -build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` -build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$build" 1>&6 - -if test $host != $build; then - ac_tool_prefix=${host_alias}- -else - ac_tool_prefix= -fi - -# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +if test -n "$ac_tool_prefix"; then + # 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:3641: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:4899: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +echo "$as_me:4914: found $ac_dir/$ac_word" >&5 +break +done + fi fi -RANLIB="$ac_cv_prog_RANLIB" +RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 + echo "$as_me:4922: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:4925: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - +fi if test -z "$ac_cv_prog_RANLIB"; then -if test -n "$ac_tool_prefix"; then + ac_ct_RANLIB=$RANLIB # 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:3673: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:4934: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="ranlib" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB="':'" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_RANLIB="ranlib" +echo "$as_me:4949: found $ac_dir/$ac_word" >&5 +break +done + + test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB="':'" fi fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + echo "$as_me:4958: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:4961: result: no" >&5 +echo "${ECHO_T}no" >&6 fi + RANLIB=$ac_ct_RANLIB else - RANLIB="':'" -fi + RANLIB="$ac_cv_prog_RANLIB" fi -# Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. +if test -n "$ac_tool_prefix"; then + # 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:3708: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:4973: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$LD"; then ac_cv_prog_LD="$LD" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_LD="${ac_tool_prefix}ld" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_LD="${ac_tool_prefix}ld" +echo "$as_me:4988: found $ac_dir/$ac_word" >&5 +break +done + fi fi -LD="$ac_cv_prog_LD" +LD=$ac_cv_prog_LD if test -n "$LD"; then - echo "$ac_t""$LD" 1>&6 + echo "$as_me:4996: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:4999: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - +fi if test -z "$ac_cv_prog_LD"; then -if test -n "$ac_tool_prefix"; then + ac_ct_LD=$LD # 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:3740: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:5008: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$LD"; then - ac_cv_prog_LD="$LD" # Let the user override the test. + if test -n "$ac_ct_LD"; then + ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_LD="ld" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_LD" && ac_cv_prog_LD="ld" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_LD="ld" +echo "$as_me:5023: found $ac_dir/$ac_word" >&5 +break +done + + test -z "$ac_cv_prog_ac_ct_LD" && ac_cv_prog_ac_ct_LD="ld" fi fi -LD="$ac_cv_prog_LD" -if test -n "$LD"; then - echo "$ac_t""$LD" 1>&6 +ac_ct_LD=$ac_cv_prog_ac_ct_LD +if test -n "$ac_ct_LD"; then + echo "$as_me:5032: result: $ac_ct_LD" >&5 +echo "${ECHO_T}$ac_ct_LD" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:5035: result: no" >&5 +echo "${ECHO_T}no" >&6 fi + LD=$ac_ct_LD else - LD="ld" + LD="$ac_cv_prog_LD" fi -fi - -# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +if test -n "$ac_tool_prefix"; then + # 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:3776: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:5047: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AR="${ac_tool_prefix}ar" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_AR="${ac_tool_prefix}ar" +echo "$as_me:5062: found $ac_dir/$ac_word" >&5 +break +done + fi fi -AR="$ac_cv_prog_AR" +AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$ac_t""$AR" 1>&6 + echo "$as_me:5070: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:5073: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - +fi if test -z "$ac_cv_prog_AR"; then -if test -n "$ac_tool_prefix"; then + ac_ct_AR=$AR # 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:3808: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:5082: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AR="ar" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_AR="ar" +echo "$as_me:5097: found $ac_dir/$ac_word" >&5 +break +done + + test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="ar" fi fi -AR="$ac_cv_prog_AR" -if test -n "$AR"; then - echo "$ac_t""$AR" 1>&6 +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + echo "$as_me:5106: result: $ac_ct_AR" >&5 +echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:5109: result: no" >&5 +echo "${ECHO_T}no" >&6 fi + AR=$ac_ct_AR else - AR="ar" -fi + AR="$ac_cv_prog_AR" fi - - - - -echo $ac_n "checking for options to update archives""... $ac_c" 1>&6 -echo "configure:3845: checking for options to update archives" >&5 -if eval "test \"`echo '$''{'cf_cv_ar_flags'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:5118: checking for options to update archives" >&5 +echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 +if test "${cf_cv_ar_flags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_cv_ar_flags=unknown for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv do @@ -3863,10 +5138,14 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; } ; then + if { (eval echo "$as_me:5144: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:5147: \$? = $ac_status" >&5 + (exit $ac_status); } ; then echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null if test -f conftest.a ; then @@ -3876,8 +5155,7 @@ EOF else test -n "$verbose" && echo " cannot compile test-program" 1>&6 -echo "${as_me:-configure}:3880: testing cannot compile test-program ..." 1>&5 - +echo "${as_me:-configure}:5158: testing cannot compile test-program ..." 1>&5 break fi @@ -3885,8 +5163,8 @@ echo "${as_me:-configure}:3880: testing rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext fi - -echo "$ac_t""$cf_cv_ar_flags" 1>&6 +echo "$as_me:5166: result: $cf_cv_ar_flags" >&5 +echo "${ECHO_T}$cf_cv_ar_flags" >&6 if test -n "$ARFLAGS" ; then if test -n "$cf_cv_ar_flags" ; then @@ -3896,14 +5174,7 @@ else ARFLAGS=$cf_cv_ar_flags fi - - - case "$host_cpu:$host_vendor:$host_os" in - # check for MacOS X, exclude Darwin on ix86 -# powerpc:apple:darwin*) #(vi -# AC_DEFINE(MAC_OS_X) -# ;; # check for cygwin environment # -DSTATIC is needed for pcre *:*:*cygwin*) #(vi @@ -3911,364 +5182,407 @@ case "$host_cpu:$host_vendor:$host_os" i ;; # SEIUX doesn't have any useful preprocessor symbol mips:sei:seiux*) #(vi - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define SEIUX 1 EOF ;; esac -echo $ac_n "checking if you would like to use heapsort""... $ac_c" 1>&6 -echo "configure:3923: checking if you would like to use heapsort" >&5 +echo "$as_me:5192: checking if you would like to use heapsort" >&5 +echo $ECHO_N "checking if you would like to use heapsort... $ECHO_C" >&6 # Check whether --enable-heapsort or --disable-heapsort was given. if test "${enable_heapsort+set}" = set; then enableval="$enable_heapsort" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - cf_use_heapsort=no + cf_use_heapsort=no else cf_use_heapsort=yes fi else - enableval=yes + enableval=yes cf_use_heapsort=yes -fi - -echo "$ac_t""$cf_use_heapsort" 1>&6 +fi; +echo "$as_me:5209: result: $cf_use_heapsort" >&5 +echo "${ECHO_T}$cf_use_heapsort" >&6 if test "x$cf_use_heapsort" = xyes; then - for ac_func in heapsort + +for ac_func in heapsort do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3945: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:5216: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 5222 "configure" +#include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + builtin and then its argument prototype would still apply. */ +char $ac_func (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); +#error found stub for $ac_func #endif -; return 0; } + return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:5253: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:5256: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:5259: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5262: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:5272: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "ac_cv_func_$ac_func=no" -fi -rm -rf conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done if test x"$ac_cv_func_heapsort" = xyes; then - echo $ac_n "checking if its prototype is compatible with qsort""... $ac_c" 1>&6 -echo "configure:3999: checking if its prototype is compatible with qsort" >&5 - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking if its prototype is compatible with qsort... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 5286 "configure" #include "confdefs.h" #include #include extern int my_compare(const void *, const void *); -int main() { +int +main (void) +{ char *base = 0; heapsort((void *)0, 1, 2, my_compare); -; return 0; } -EOF -if { (eval echo configure:4015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:5305: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:5308: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:5311: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5314: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_use_heapsort=no -fi -rm -f conftest*; - echo "$ac_t""$cf_use_heapsort" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_use_heapsort=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext; + echo "$as_me:5323: result: $cf_use_heapsort" >&5 +echo "${ECHO_T}$cf_use_heapsort" >&6 else test -n "$verbose" && echo " will use our own heapsort function" 1>&6 -echo "${as_me:-configure}:4028: testing will use our own heapsort function ..." 1>&5 - +echo "${as_me:-configure}:5328: testing will use our own heapsort function ..." 1>&5 EXTRAO_DEP='' EXTRAOBJS="$EXTRAOBJS \$(OBJDIR)/heapsort.o" fi fi if test "x$cf_use_heapsort" = xyes; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define USE_HEAPSORT 1 EOF fi - # Check whether --with-ispell or --without-ispell was given. if test "${with_ispell+set}" = set; then withval="$with_ispell" case "$withval" in #(vi yes) - { echo "configure: error: expected a value for --with-ispell" 1>&2; exit 1; } + { { echo "$as_me:5346: error: expected a value for --with-ispell" >&5 +echo "$as_me: error: expected a value for --with-ispell" >&2;} + { (exit 1); exit 1; }; } ;; #(vi no) ;; #(vi *) # user supplied option-value for "--with-ispell=path" - echo $ac_n "checking for ispell""... $ac_c" 1>&6 -echo "configure:4055: checking for ispell" >&5 + echo "$as_me:5354: checking for ispell" >&5 +echo $ECHO_N "checking for ispell... $ECHO_C" >&6 ac_cv_path_PATH_ISPELL="$withval" - cat >> confdefs.h <>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_ISPELL 1 EOF - echo "$ac_t""$withval" 1>&6 + echo "$as_me:5363: result: $withval" >&5 +echo "${ECHO_T}$withval" >&6 ;; esac else - + # user did not specify "--with-ispell"; do automatic check # Extract the first word of "ispell", so it can be a program name with args. set dummy ispell; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4072: 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 +echo "$as_me:5372: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PATH_ISPELL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$PATH_ISPELL" in - /*) + case $PATH_ISPELL in + [\\/]* | ?:[\\/]*) ac_cv_path_PATH_ISPELL="$PATH_ISPELL" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_PATH_ISPELL="$PATH_ISPELL" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PATH_ISPELL="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PATH_ISPELL="$ac_dir/$ac_word" + echo "$as_me:5389: found $ac_dir/$ac_word" >&5 + break +fi +done + ;; esac fi -PATH_ISPELL="$ac_cv_path_PATH_ISPELL" +PATH_ISPELL=$ac_cv_path_PATH_ISPELL + if test -n "$PATH_ISPELL"; then - echo "$ac_t""$PATH_ISPELL" 1>&6 + echo "$as_me:5400: result: $PATH_ISPELL" >&5 +echo "${ECHO_T}$PATH_ISPELL" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:5403: result: no" >&5 +echo "${ECHO_T}no" >&6 fi if test -n "$PATH_ISPELL"; then - cat >> confdefs.h <>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_ISPELL 1 EOF fi -fi - - +fi; # Check whether --with-metamail or --without-metamail was given. if test "${with_metamail+set}" = set; then withval="$with_metamail" case "$withval" in #(vi yes) - { echo "configure: error: expected a value for --with-metamail" 1>&2; exit 1; } + { { echo "$as_me:5423: error: expected a value for --with-metamail" >&5 +echo "$as_me: error: expected a value for --with-metamail" >&2;} + { (exit 1); exit 1; }; } ;; #(vi no) ;; #(vi *) # user supplied option-value for "--with-metamail=path" - echo $ac_n "checking for metamail""... $ac_c" 1>&6 -echo "configure:4129: checking for metamail" >&5 + echo "$as_me:5431: checking for metamail" >&5 +echo $ECHO_N "checking for metamail... $ECHO_C" >&6 ac_cv_path_PATH_METAMAIL="$withval" - cat >> confdefs.h <>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_METAMAIL 1 EOF - echo "$ac_t""$withval" 1>&6 + echo "$as_me:5440: result: $withval" >&5 +echo "${ECHO_T}$withval" >&6 ;; esac else - + # user did not specify "--with-metamail"; do automatic check # Extract the first word of "metamail", so it can be a program name with args. set dummy metamail; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4146: 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 +echo "$as_me:5449: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PATH_METAMAIL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$PATH_METAMAIL" in - /*) + case $PATH_METAMAIL in + [\\/]* | ?:[\\/]*) ac_cv_path_PATH_METAMAIL="$PATH_METAMAIL" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_PATH_METAMAIL="$PATH_METAMAIL" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PATH_METAMAIL="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PATH_METAMAIL="$ac_dir/$ac_word" + echo "$as_me:5466: found $ac_dir/$ac_word" >&5 + break +fi +done + ;; esac fi -PATH_METAMAIL="$ac_cv_path_PATH_METAMAIL" +PATH_METAMAIL=$ac_cv_path_PATH_METAMAIL + if test -n "$PATH_METAMAIL"; then - echo "$ac_t""$PATH_METAMAIL" 1>&6 + echo "$as_me:5477: result: $PATH_METAMAIL" >&5 +echo "${ECHO_T}$PATH_METAMAIL" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:5480: result: no" >&5 +echo "${ECHO_T}no" >&6 fi if test -n "$PATH_METAMAIL"; then - cat >> confdefs.h <>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_METAMAIL 1 EOF fi -fi - - +fi; # Check whether --with-sum or --without-sum was given. if test "${with_sum+set}" = set; then withval="$with_sum" case "$withval" in #(vi yes) - { echo "configure: error: expected a value for --with-sum" 1>&2; exit 1; } + { { echo "$as_me:5500: error: expected a value for --with-sum" >&5 +echo "$as_me: error: expected a value for --with-sum" >&2;} + { (exit 1); exit 1; }; } ;; #(vi no) ;; #(vi *) # user supplied option-value for "--with-sum=path" - echo $ac_n "checking for sum""... $ac_c" 1>&6 -echo "configure:4203: checking for sum" >&5 + echo "$as_me:5508: checking for sum" >&5 +echo $ECHO_N "checking for sum... $ECHO_C" >&6 ac_cv_path_PATH_SUM="$withval" - cat >> confdefs.h <>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_SUM 1 EOF - echo "$ac_t""$withval" 1>&6 + echo "$as_me:5517: result: $withval" >&5 +echo "${ECHO_T}$withval" >&6 ;; esac else - + # user did not specify "--with-sum"; do automatic check # Extract the first word of "sum", so it can be a program name with args. set dummy sum; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4220: 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 +echo "$as_me:5526: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PATH_SUM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$PATH_SUM" in - /*) + case $PATH_SUM in + [\\/]* | ?:[\\/]*) ac_cv_path_PATH_SUM="$PATH_SUM" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_PATH_SUM="$PATH_SUM" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PATH_SUM="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PATH_SUM="$ac_dir/$ac_word" + echo "$as_me:5543: found $ac_dir/$ac_word" >&5 + break +fi +done + ;; esac fi -PATH_SUM="$ac_cv_path_PATH_SUM" +PATH_SUM=$ac_cv_path_PATH_SUM + if test -n "$PATH_SUM"; then - echo "$ac_t""$PATH_SUM" 1>&6 + echo "$as_me:5554: result: $PATH_SUM" >&5 +echo "${ECHO_T}$PATH_SUM" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:5557: result: no" >&5 +echo "${ECHO_T}no" >&6 fi if test -n "$PATH_SUM"; then - cat >> confdefs.h <>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_SUM 1 EOF fi -fi - +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:4267: 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 +echo "$as_me:5574: checking if $ac_cv_path_PATH_SUM takes -r" >&5 +echo $ECHO_N "checking if $ac_cv_path_PATH_SUM takes -r... $ECHO_C" >&6 +if test "${ac_cv_prog_sum_r+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - -if { ac_try='$ac_cv_path_PATH_SUM -r config.log 1>&5'; { (eval echo configure:4272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + +if { ac_try='$ac_cv_path_PATH_SUM -r config.log 1>&5' + { (eval echo "$as_me:5581: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5584: \$? = $ac_status" >&5 + (exit $ac_status); }; } then ac_cv_prog_sum_r=yes else @@ -4278,39 +5592,39 @@ fi fi if test $ac_cv_prog_sum_r = yes; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define SUM_TAKES_DASH_R 1 EOF - cat >> confdefs.h <>confdefs.h <> confdefs.h <>confdefs.h <&6 +echo "$as_me:5609: result: $ac_cv_prog_sum_r" >&5 +echo "${ECHO_T}$ac_cv_prog_sum_r" >&6 fi - - -echo $ac_n "checking for default editor""... $ac_c" 1>&6 -echo "configure:4302: checking for default editor" >&5 +echo "$as_me:5613: checking for default editor" >&5 +echo $ECHO_N "checking for default editor... $ECHO_C" >&6 # Check whether --with-editor or --without-editor was given. if test "${with_editor+set}" = set; then withval="$with_editor" - : + else withval="${DEFAULT_EDITOR}" -fi -test -n "$withval" && \ +fi; test -n "$withval" && \ case "$withval" in #(vi yes) - { echo "configure: error: expected a value for --with-editor" 1>&2; exit 1; } + { { echo "$as_me:5625: error: expected a value for --with-editor" >&5 +echo "$as_me: error: expected a value for --with-editor" >&2;} + { (exit 1); exit 1; }; } ;; #(vi no) withval="" ;; @@ -4325,96 +5639,99 @@ if test -z "$DEFAULT_EDITOR" ; then else # 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:4330: 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 +echo "$as_me:5642: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_DEFAULT_EDITOR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$DEFAULT_EDITOR" in - /*) + case $DEFAULT_EDITOR in + [\\/]* | ?:[\\/]*) ac_cv_path_DEFAULT_EDITOR="$DEFAULT_EDITOR" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_DEFAULT_EDITOR="$DEFAULT_EDITOR" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH:/usr/bin:/usr/ucb" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_DEFAULT_EDITOR="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH:/usr/bin:/usr/ucb" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_DEFAULT_EDITOR="$ac_dir/$ac_word" + echo "$as_me:5659: found $ac_dir/$ac_word" >&5 + break +fi +done + test -z "$ac_cv_path_DEFAULT_EDITOR" && ac_cv_path_DEFAULT_EDITOR="vi" ;; esac fi -DEFAULT_EDITOR="$ac_cv_path_DEFAULT_EDITOR" +DEFAULT_EDITOR=$ac_cv_path_DEFAULT_EDITOR + if test -n "$DEFAULT_EDITOR"; then - echo "$ac_t""$DEFAULT_EDITOR" 1>&6 + echo "$as_me:5671: result: $DEFAULT_EDITOR" >&5 +echo "${ECHO_T}$DEFAULT_EDITOR" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:5674: result: no" >&5 +echo "${ECHO_T}no" >&6 fi fi fi -echo "$ac_t""$DEFAULT_EDITOR" 1>&6 -cat >> confdefs.h <&5 +echo "${ECHO_T}$DEFAULT_EDITOR" >&6 +cat >>confdefs.h <&6 -echo "configure:4375: 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 +echo "$as_me:5688: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_DEFAULT_MAILER+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$DEFAULT_MAILER" in - /*) + case $DEFAULT_MAILER in + [\\/]* | ?:[\\/]*) ac_cv_path_DEFAULT_MAILER="$DEFAULT_MAILER" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_DEFAULT_MAILER="$DEFAULT_MAILER" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH:/usr/sbin:/usr/lib" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_DEFAULT_MAILER="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH:/usr/sbin:/usr/lib" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_DEFAULT_MAILER="$ac_dir/$ac_word" + echo "$as_me:5705: found $ac_dir/$ac_word" >&5 + break +fi +done + ;; esac fi -DEFAULT_MAILER="$ac_cv_path_DEFAULT_MAILER" +DEFAULT_MAILER=$ac_cv_path_DEFAULT_MAILER + if test -n "$DEFAULT_MAILER"; then - echo "$ac_t""$DEFAULT_MAILER" 1>&6 + echo "$as_me:5716: result: $DEFAULT_MAILER" >&5 +echo "${ECHO_T}$DEFAULT_MAILER" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:5719: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - # Check whether --with-mailer or --without-mailer was given. if test "${with_mailer+set}" = set; then withval="$with_mailer" - : + else withval="${DEFAULT_MAILER}" -fi -test -n "$withval" && \ +fi; test -n "$withval" && \ case "$withval" in #(vi yes) - { echo "configure: error: expected a value for --with-mailer" 1>&2; exit 1; } + { { echo "$as_me:5732: error: expected a value for --with-mailer" >&5 +echo "$as_me: error: expected a value for --with-mailer" >&2;} + { (exit 1); exit 1; }; } ;; #(vi no) withval="" ;; @@ -4424,118 +5741,122 @@ DEFAULT_MAILER="$withval" 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:4429: 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 +echo "$as_me:5744: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_DEFAULT_MAILER+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$DEFAULT_MAILER" in - /*) + case $DEFAULT_MAILER in + [\\/]* | ?:[\\/]*) ac_cv_path_DEFAULT_MAILER="$DEFAULT_MAILER" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_DEFAULT_MAILER="$DEFAULT_MAILER" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH:/usr/bin" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_DEFAULT_MAILER="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH:/usr/bin" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_DEFAULT_MAILER="$ac_dir/$ac_word" + echo "$as_me:5761: found $ac_dir/$ac_word" >&5 + break +fi +done + ;; esac fi -DEFAULT_MAILER="$ac_cv_path_DEFAULT_MAILER" +DEFAULT_MAILER=$ac_cv_path_DEFAULT_MAILER + if test -n "$DEFAULT_MAILER"; then - echo "$ac_t""$DEFAULT_MAILER" 1>&6 + echo "$as_me:5772: result: $DEFAULT_MAILER" >&5 +echo "${ECHO_T}$DEFAULT_MAILER" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:5775: result: no" >&5 +echo "${ECHO_T}no" >&6 fi fi 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:4466: 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 +echo "$as_me:5783: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_DEFAULT_MAILER+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$DEFAULT_MAILER" in - /*) + case $DEFAULT_MAILER in + [\\/]* | ?:[\\/]*) ac_cv_path_DEFAULT_MAILER="$DEFAULT_MAILER" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_DEFAULT_MAILER="$DEFAULT_MAILER" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH:/usr/bin" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_DEFAULT_MAILER="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH:/usr/bin" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_DEFAULT_MAILER="$ac_dir/$ac_word" + echo "$as_me:5800: found $ac_dir/$ac_word" >&5 + break +fi +done + ;; esac fi -DEFAULT_MAILER="$ac_cv_path_DEFAULT_MAILER" +DEFAULT_MAILER=$ac_cv_path_DEFAULT_MAILER + if test -n "$DEFAULT_MAILER"; then - echo "$ac_t""$DEFAULT_MAILER" 1>&6 + echo "$as_me:5811: result: $DEFAULT_MAILER" >&5 +echo "${ECHO_T}$DEFAULT_MAILER" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:5814: result: no" >&5 +echo "${ECHO_T}no" >&6 fi fi -echo $ac_n "checking for default mailer""... $ac_c" 1>&6 -echo "configure:4500: checking for default mailer" >&5 +echo "$as_me:5819: checking for default mailer" >&5 +echo $ECHO_N "checking for default mailer... $ECHO_C" >&6 if test -n "$DEFAULT_MAILER" ; then - + case $cf_cv_system_name in #(vi os2*|cygwin*) ac_cv_path_DEFAULT_MAILER=`echo "$ac_cv_path_DEFAULT_MAILER" | sed -e 's%\\\\%/%g'` ;; esac - case $cf_cv_system_name in #(vi os2*|cygwin*) DEFAULT_MAILER=`echo "$DEFAULT_MAILER" | sed -e 's%\\\\%/%g'` ;; esac - cat >> confdefs.h <>confdefs.h <&6 - +echo "$as_me:5842: result: $DEFAULT_MAILER" >&5 +echo "${ECHO_T}$DEFAULT_MAILER" >&6 -echo $ac_n "checking for incoming-mail directory""... $ac_c" 1>&6 -echo "configure:4527: checking for incoming-mail directory" >&5 +echo "$as_me:5845: checking for incoming-mail directory" >&5 +echo $ECHO_N "checking for incoming-mail directory... $ECHO_C" >&6 # Check whether --with-mailbox or --without-mailbox was given. if test "${with_mailbox+set}" = set; then withval="$with_mailbox" - : + else withval="${DEFAULT_MAILBOX}" -fi -test -n "$withval" && \ +fi; test -n "$withval" && \ case "$withval" in #(vi yes) - { echo "configure: error: expected a value for --with-mailbox" 1>&2; exit 1; } + { { echo "$as_me:5857: error: expected a value for --with-mailbox" >&5 +echo "$as_me: error: expected a value for --with-mailbox" >&2;} + { (exit 1); exit 1; }; } ;; #(vi no) withval="" ;; @@ -4557,260 +5878,270 @@ for cf_dir in \ done fi if test -n "$DEFAULT_MAILBOX" ; then - cat >> confdefs.h <>confdefs.h <&6 - +echo "$as_me:5888: result: $DEFAULT_MAILBOX" >&5 +echo "${ECHO_T}$DEFAULT_MAILBOX" >&6 ## PGP Support -echo $ac_n "checking if you want PGP/GPG-Support""... $ac_c" 1>&6 -echo "configure:4573: checking if you want PGP/GPG-Support" >&5 +echo "$as_me:5892: checking if you want PGP/GPG-Support" >&5 +echo $ECHO_N "checking if you want PGP/GPG-Support... $ECHO_C" >&6 # Check whether --enable-pgp-gpg or --disable-pgp-gpg was given. if test "${enable_pgp_gpg+set}" = set; then enableval="$enable_pgp_gpg" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - USE_PGP_GPG=no + USE_PGP_GPG=no else USE_PGP_GPG=yes fi else - enableval=yes + enableval=yes USE_PGP_GPG=yes -fi - -echo "$ac_t""$enableval" 1>&6 +fi; +echo "$as_me:5909: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 if test "$USE_PGP_GPG" = "yes" ; then - + # Check whether --with-pgp or --without-pgp was given. if test "${with_pgp+set}" = set; then withval="$with_pgp" case "$withval" in #(vi yes) - { echo "configure: error: expected a value for --with-pgp" 1>&2; exit 1; } + { { echo "$as_me:5918: error: expected a value for --with-pgp" >&5 +echo "$as_me: error: expected a value for --with-pgp" >&2;} + { (exit 1); exit 1; }; } ;; #(vi no) ;; #(vi *) # user supplied option-value for "--with-pgp=path" - echo $ac_n "checking for pgp""... $ac_c" 1>&6 -echo "configure:4605: checking for pgp" >&5 + echo "$as_me:5926: checking for pgp" >&5 +echo $ECHO_N "checking for pgp... $ECHO_C" >&6 ac_cv_path_PATH_PGP="$withval" - cat >> confdefs.h <>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_PGP 1 EOF - echo "$ac_t""$withval" 1>&6 + echo "$as_me:5935: result: $withval" >&5 +echo "${ECHO_T}$withval" >&6 ;; esac else - + # user did not specify "--with-pgp"; do automatic check # Extract the first word of "pgp", so it can be a program name with args. set dummy pgp; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4622: 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 +echo "$as_me:5944: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PATH_PGP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$PATH_PGP" in - /*) + case $PATH_PGP in + [\\/]* | ?:[\\/]*) ac_cv_path_PATH_PGP="$PATH_PGP" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_PATH_PGP="$PATH_PGP" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PATH_PGP="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PATH_PGP="$ac_dir/$ac_word" + echo "$as_me:5961: found $ac_dir/$ac_word" >&5 + break +fi +done + ;; esac fi -PATH_PGP="$ac_cv_path_PATH_PGP" +PATH_PGP=$ac_cv_path_PATH_PGP + if test -n "$PATH_PGP"; then - echo "$ac_t""$PATH_PGP" 1>&6 + echo "$as_me:5972: result: $PATH_PGP" >&5 +echo "${ECHO_T}$PATH_PGP" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:5975: result: no" >&5 +echo "${ECHO_T}no" >&6 fi if test -n "$PATH_PGP"; then - cat >> confdefs.h <>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_PGP 1 EOF fi -fi - +fi; # FIXME: check if pgp is pgp2 or pgp6 - # Check whether --with-pgpk or --without-pgpk was given. if test "${with_pgpk+set}" = set; then withval="$with_pgpk" case "$withval" in #(vi yes) - { echo "configure: error: expected a value for --with-pgpk" 1>&2; exit 1; } + { { echo "$as_me:5996: error: expected a value for --with-pgpk" >&5 +echo "$as_me: error: expected a value for --with-pgpk" >&2;} + { (exit 1); exit 1; }; } ;; #(vi no) ;; #(vi *) # user supplied option-value for "--with-pgpk=path" - echo $ac_n "checking for pgpk""... $ac_c" 1>&6 -echo "configure:4680: checking for pgpk" >&5 + echo "$as_me:6004: checking for pgpk" >&5 +echo $ECHO_N "checking for pgpk... $ECHO_C" >&6 ac_cv_path_PATH_PGPK="$withval" - cat >> confdefs.h <>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_PGPK 1 EOF - echo "$ac_t""$withval" 1>&6 + echo "$as_me:6013: result: $withval" >&5 +echo "${ECHO_T}$withval" >&6 ;; esac else - + # user did not specify "--with-pgpk"; do automatic check # Extract the first word of "pgpk", so it can be a program name with args. set dummy pgpk; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4697: 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 +echo "$as_me:6022: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PATH_PGPK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$PATH_PGPK" in - /*) + case $PATH_PGPK in + [\\/]* | ?:[\\/]*) ac_cv_path_PATH_PGPK="$PATH_PGPK" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_PATH_PGPK="$PATH_PGPK" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PATH_PGPK="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PATH_PGPK="$ac_dir/$ac_word" + echo "$as_me:6039: found $ac_dir/$ac_word" >&5 + break +fi +done + ;; esac fi -PATH_PGPK="$ac_cv_path_PATH_PGPK" +PATH_PGPK=$ac_cv_path_PATH_PGPK + if test -n "$PATH_PGPK"; then - echo "$ac_t""$PATH_PGPK" 1>&6 + echo "$as_me:6050: result: $PATH_PGPK" >&5 +echo "${ECHO_T}$PATH_PGPK" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:6053: result: no" >&5 +echo "${ECHO_T}no" >&6 fi if test -n "$PATH_PGPK"; then - cat >> confdefs.h <>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_PGPK 1 EOF fi -fi - +fi; # FIXME: remove tailing k - # Check whether --with-gpg or --without-gpg was given. if test "${with_gpg+set}" = set; then withval="$with_gpg" case "$withval" in #(vi yes) - { echo "configure: error: expected a value for --with-gpg" 1>&2; exit 1; } + { { echo "$as_me:6074: error: expected a value for --with-gpg" >&5 +echo "$as_me: error: expected a value for --with-gpg" >&2;} + { (exit 1); exit 1; }; } ;; #(vi no) ;; #(vi *) # user supplied option-value for "--with-gpg=path" - echo $ac_n "checking for gpg""... $ac_c" 1>&6 -echo "configure:4755: checking for gpg" >&5 + echo "$as_me:6082: checking for gpg" >&5 +echo $ECHO_N "checking for gpg... $ECHO_C" >&6 ac_cv_path_PATH_GPG="$withval" - cat >> confdefs.h <>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_GPG 1 EOF - echo "$ac_t""$withval" 1>&6 + echo "$as_me:6091: result: $withval" >&5 +echo "${ECHO_T}$withval" >&6 ;; esac else - + # user did not specify "--with-gpg"; do automatic check # Extract the first word of "gpg", so it can be a program name with args. set dummy gpg; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4772: 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 +echo "$as_me:6100: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PATH_GPG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$PATH_GPG" in - /*) + case $PATH_GPG in + [\\/]* | ?:[\\/]*) ac_cv_path_PATH_GPG="$PATH_GPG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_PATH_GPG="$PATH_GPG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PATH_GPG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PATH_GPG="$ac_dir/$ac_word" + echo "$as_me:6117: found $ac_dir/$ac_word" >&5 + break +fi +done + ;; esac fi -PATH_GPG="$ac_cv_path_PATH_GPG" +PATH_GPG=$ac_cv_path_PATH_GPG + if test -n "$PATH_GPG"; then - echo "$ac_t""$PATH_GPG" 1>&6 + echo "$as_me:6128: result: $PATH_GPG" >&5 +echo "${ECHO_T}$PATH_GPG" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:6131: result: no" >&5 +echo "${ECHO_T}no" >&6 fi if test -n "$PATH_GPG"; then - cat >> confdefs.h <>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_GPG 1 EOF fi -fi - +fi; fi ## slrnface @@ -4820,73 +6151,77 @@ if test "${with_slrnface+set}" = set; th withval="$with_slrnface" case "$withval" in #(vi yes) - { echo "configure: error: expected a value for --with-slrnface" 1>&2; exit 1; } + { { echo "$as_me:6154: error: expected a value for --with-slrnface" >&5 +echo "$as_me: error: expected a value for --with-slrnface" >&2;} + { (exit 1); exit 1; }; } ;; #(vi no) ;; #(vi *) # user supplied option-value for "--with-slrnface=path" - echo $ac_n "checking for slrnface""... $ac_c" 1>&6 -echo "configure:4831: checking for slrnface" >&5 + echo "$as_me:6162: checking for slrnface" >&5 +echo $ECHO_N "checking for slrnface... $ECHO_C" >&6 ac_cv_path_PATH_SLRNFACE="$withval" - cat >> confdefs.h <>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_SLRNFACE 1 EOF - echo "$ac_t""$withval" 1>&6 + echo "$as_me:6171: result: $withval" >&5 +echo "${ECHO_T}$withval" >&6 ;; esac else - + # user did not specify "--with-slrnface"; do automatic check # Extract the first word of "slrnface", so it can be a program name with args. set dummy slrnface; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4848: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_PATH_SLRNFACE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:6180: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PATH_SLRNFACE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$PATH_SLRNFACE" in - /*) + case $PATH_SLRNFACE in + [\\/]* | ?:[\\/]*) ac_cv_path_PATH_SLRNFACE="$PATH_SLRNFACE" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_PATH_SLRNFACE="$PATH_SLRNFACE" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PATH_SLRNFACE="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PATH_SLRNFACE="$ac_dir/$ac_word" + echo "$as_me:6197: found $ac_dir/$ac_word" >&5 + break +fi +done + ;; esac fi -PATH_SLRNFACE="$ac_cv_path_PATH_SLRNFACE" +PATH_SLRNFACE=$ac_cv_path_PATH_SLRNFACE + if test -n "$PATH_SLRNFACE"; then - echo "$ac_t""$PATH_SLRNFACE" 1>&6 + echo "$as_me:6208: result: $PATH_SLRNFACE" >&5 +echo "${ECHO_T}$PATH_SLRNFACE" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:6211: result: no" >&5 +echo "${ECHO_T}no" >&6 fi if test -n "$PATH_SLRNFACE"; then - cat >> confdefs.h <>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_SLRNFACE 1 EOF fi -fi - +fi; if test -n "$ac_cv_path_PATH_SLRNFACE"; then EXTRAO_DEP="" EXTRAOBJS="$EXTRAOBJS \$(OBJDIR)/xface.o" @@ -4900,44 +6235,57 @@ if test "${with_shell+set}" = set; then cf_cv_default_shell=$withval else cf_cv_default_shell= -fi +fi; - -echo $ac_n "checking for the default shell program""... $ac_c" 1>&6 -echo "configure:4908: checking for the default shell program" >&5 +echo "$as_me:6240: checking for the default shell program" >&5 +echo $ECHO_N "checking for the default shell program... $ECHO_C" >&6 cf_shell_progs="$cf_cv_default_shell" if test -z "$cf_shell_progs" ; then cf_shell_progs="sh ksh bash zsh pdksh mksh jsh keysh ash dash" # TIN preferred default shell for BSD systems is csh. Others are sh. - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6247 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ #if (defined(BSD) && (BSD >= 199103)) #else make an error #endif -; return 0; } -EOF -if { (eval echo configure:4927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6265: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:6268: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6271: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6274: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then $cf_shell_progs="csh tcsh $cf_shell_progs" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:4937: testing paths of shell programs: $cf_shell_progs ..." 1>&5 +echo "${as_me:-configure}:6284: 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 "${as_me:-configure}:4941: testing /etc/shells ..." 1>&5 + +echo "${as_me:-configure}:6288: testing /etc/shells ..." 1>&5 for cf_prog in $cf_shell_progs do @@ -4946,7 +6294,9 @@ echo "${as_me:-configure}:4941: testing cf_pattern="^"$cf_prog"$" ;; */*) - { echo "configure: error: Program name must be absolute or filename: $cf_prog" 1>&2; exit 1; } + { { echo "$as_me:6297: error: Program name must be absolute or filename: $cf_prog" >&5 +echo "$as_me: error: Program name must be absolute or filename: $cf_prog" >&2;} + { (exit 1); exit 1; }; } ;; *) cf_pattern="/"$cf_prog"$" @@ -4969,124 +6319,128 @@ echo "${as_me:-configure}:4941: testing break fi done - echo "$ac_t""$DEFAULT_SHELL" 1>&6 + echo "$as_me:6322: result: $DEFAULT_SHELL" >&5 +echo "${ECHO_T}$DEFAULT_SHELL" >&6 else - -echo "${as_me:-configure}:4976: testing $PATH ..." 1>&5 + +echo "${as_me:-configure}:6326: 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. + # 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:4983: 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 +echo "$as_me:6332: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_DEFAULT_SHELL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$DEFAULT_SHELL" in - /*) + case $DEFAULT_SHELL in + [\\/]* | ?:[\\/]*) ac_cv_path_DEFAULT_SHELL="$DEFAULT_SHELL" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_DEFAULT_SHELL="$DEFAULT_SHELL" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH:/bin:/usr/bin:/usr/xpg4/bin:/bin/posix:/usr/bin/posix:/usr/old/bin:/usr/local/bin" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_DEFAULT_SHELL="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH:/bin:/usr/bin:/usr/xpg4/bin:/bin/posix:/usr/bin/posix:/usr/old/bin:/usr/local/bin" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_DEFAULT_SHELL="$ac_dir/$ac_word" + echo "$as_me:6349: found $ac_dir/$ac_word" >&5 + break +fi +done + ;; esac fi -DEFAULT_SHELL="$ac_cv_path_DEFAULT_SHELL" +DEFAULT_SHELL=$ac_cv_path_DEFAULT_SHELL + if test -n "$DEFAULT_SHELL"; then - echo "$ac_t""$DEFAULT_SHELL" 1>&6 + echo "$as_me:6360: result: $DEFAULT_SHELL" >&5 +echo "${ECHO_T}$DEFAULT_SHELL" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:6363: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -test -n "$DEFAULT_SHELL" && break + test -n "$DEFAULT_SHELL" && break done fi if test -z "$DEFAULT_SHELL" ; then - echo "configure: warning: Cannot find the default shell you specified: $cf_shell_progs" 1>&2 + { echo "$as_me:6372: WARNING: Cannot find the default shell you specified: $cf_shell_progs" >&5 +echo "$as_me: WARNING: Cannot find the default shell you specified: $cf_shell_progs" >&2;} if test -f /bin/false ; then - echo "configure: warning: Using /bin/false instead" 1>&2 + { echo "$as_me:6375: WARNING: Using /bin/false instead" >&5 +echo "$as_me: WARNING: Using /bin/false instead" >&2;} DEFAULT_SHELL=/bin/false else - { echo "configure: error: Cannot use /bin/false because it does not exist" 1>&2; exit 1; } + { { echo "$as_me:6379: error: Cannot use /bin/false because it does not exist" >&5 +echo "$as_me: error: Cannot use /bin/false because it does not exist" >&2;} + { (exit 1); exit 1; }; } fi fi -cat >> confdefs.h <>confdefs.h <&6 -echo "configure:5036: checking if NNTP-support will be used" >&5 +echo "$as_me:6389: checking if NNTP-support will be used" >&5 +echo $ECHO_N "checking if NNTP-support will be used... $ECHO_C" >&6 # Check whether --enable-nntp or --disable-nntp was given. if test "${enable_nntp+set}" = set; then enableval="$enable_nntp" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - USE_NNTP=no + USE_NNTP=no else USE_NNTP=yes fi else - enableval=yes + enableval=yes USE_NNTP=yes -fi - -echo "$ac_t""$enableval" 1>&6 +fi; +echo "$as_me:6406: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&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:5058: checking whether to be NNTP_ONLY" >&5 +echo "$as_me:6411: checking whether to be NNTP_ONLY" >&5 +echo $ECHO_N "checking whether to be NNTP_ONLY... $ECHO_C" >&6 # Check whether --enable-nntp-only or --disable-nntp-only was given. if test "${enable_nntp_only+set}" = set; then enableval="$enable_nntp_only" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define NNTP_ONLY 1 EOF - USE_SPOOLDIR=no + USE_SPOOLDIR=no else - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define NNTP_ABLE 1 EOF fi else - enableval=no - cat >> confdefs.h <<\EOF + enableval=no + cat >>confdefs.h <<\EOF #define NNTP_ABLE 1 EOF - -fi - -echo "$ac_t""$enableval" 1>&6 +fi; +echo "$as_me:6437: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 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:5090: checking if you want to compile-in debug support" >&5 +echo "$as_me:6442: checking if you want to compile-in debug support" >&5 +echo $ECHO_N "checking if you want to compile-in debug support... $ECHO_C" >&6 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -5095,40 +6449,39 @@ if test "${enable_debug+set}" = set; the if test "$enableval" != "no" ; then ENABLE_DEBUG='' CFLAGS="-g $CFLAGS" - LDFLAGS="-g $LDFLAGS" + LDFLAGS="-g $LDFLAGS" else ENABLE_DEBUG='#' test -z "$save_CFLAGS" && CFLAGS=`echo $CFLAGS|sed -e 's/-g //' -e 's/-g$//'` fi else - enableval=no + enableval=no ENABLE_DEBUG='#' test -z "$save_CFLAGS" && CFLAGS=`echo $CFLAGS|sed -e 's/-g //' -e 's/-g$//'` -fi - -echo "$ac_t""$enableval" 1>&6 - +fi; +echo "$as_me:6463: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&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:5117: checking if you want to see long compiling messages" >&5 +echo "$as_me:6468: checking if you want to see long compiling messages" >&5 +echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. if test "${enable_echo+set}" = set; then enableval="$enable_echo" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - + ECHO_LT='--silent' ECHO_LD='@echo linking $@;' RULE_CC='@echo compiling $<' SHOW_CC='@echo compiling $@' ECHO_CC='@' - + else - + ECHO_LT='' ECHO_LD='' RULE_CC='' @@ -5137,152 +6490,170 @@ if test "${enable_echo+set}" = set; then fi else - enableval=yes - + enableval=yes + ECHO_LT='' ECHO_LD='' RULE_CC='' SHOW_CC='' ECHO_CC='' - -fi - -echo "$ac_t""$enableval" 1>&6 - - - - - - +fi; +echo "$as_me:6502: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&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:5162: checking if you want to compile with fallback prototypes" >&5 +echo "$as_me:6506: checking if you want to compile with fallback prototypes" >&5 +echo $ECHO_N "checking if you want to compile with fallback prototypes... $ECHO_C" >&6 # Check whether --enable-prototypes or --disable-prototypes was given. if test "${enable_prototypes+set}" = set; then enableval="$enable_prototypes" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - with_decl_check=yes + with_decl_check=yes else with_decl_check=no fi else - enableval=no + enableval=no with_decl_check=no -fi - -echo "$ac_t""$enableval" 1>&6 +fi; +echo "$as_me:6523: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 ### use option --enable-warnings to turn on all gcc warnings 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:5186: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:6530: checking if you want to turn on gcc warnings" >&5 +echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. if test "${enable_warnings+set}" = set; then enableval="$enable_warnings" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - with_warnings=yes + with_warnings=yes else with_warnings=no fi else - enableval=no + enableval=no with_warnings=no -fi - -echo "$ac_t""$with_warnings" 1>&6 +fi; +echo "$as_me:6547: result: $with_warnings" >&5 +echo "${ECHO_T}$with_warnings" >&6 if test "$with_warnings" = "yes" then with_ext_const=yes - - - INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in (linux*|gnu*) - echo $ac_n "checking if this is really Intel C compiler""... $ac_c" 1>&6 -echo "configure:5217: checking if this is really Intel C compiler" >&5 + echo "$as_me:6558: checking if this is really Intel C compiler" >&5 +echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6563 "configure" #include "confdefs.h" -int main() { +int +main (void) +{ #ifdef __INTEL_COMPILER #else make an error #endif -; return 0; } -EOF -if { (eval echo configure:5233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6580: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:6583: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6586: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6589: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$ac_t""$INTEL_COMPILER" 1>&6 + echo "$as_me:6600: result: $INTEL_COMPILER" >&5 +echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac fi - CLANG_COMPILER=no if test "$GCC" = yes ; then - echo $ac_n "checking if this is really Clang C compiler""... $ac_c" 1>&6 -echo "configure:5254: checking if this is really Clang C compiler" >&5 + echo "$as_me:6609: checking if this is really Clang C compiler" >&5 +echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Qunused-arguments" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6614 "configure" #include "confdefs.h" -int main() { +int +main (void) +{ #ifdef __clang__ #else make an error #endif -; return 0; } -EOF -if { (eval echo configure:5270: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6631: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:6634: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6637: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6640: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then CLANG_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$ac_t""$CLANG_COMPILER" 1>&6 + echo "$as_me:6651: result: $CLANG_COMPILER" >&5 +echo "${ECHO_T}$CLANG_COMPILER" >&6 fi - cat > conftest.$ac_ext <&6 -echo "configure:5304: checking for $CC warning options" >&5 + { echo "$as_me:6673: checking for $CC warning options..." >&5 +echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" for cf_opt in \ @@ -5315,8 +6686,13 @@ echo "configure:5304: checking for $CC w wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:5319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 + if { (eval echo "$as_me:6689: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:6692: \$? = $ac_status" >&5 + (exit $ac_status); }; then + test -n "$verbose" && echo "$as_me:6694: result: ... -$cf_opt" >&5 +echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi done @@ -5324,8 +6700,8 @@ echo "configure:5304: checking for $CC w elif test "$GCC" = yes then - echo "checking for $CC warning options" 1>&6 -echo "configure:5329: checking for $CC warning options" >&5 + { echo "$as_me:6703: checking for $CC warning options..." >&5 +echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS= cf_warn_CONST="" @@ -5345,22 +6721,29 @@ echo "configure:5329: checking for $CC w Wpointer-arith \ Wshadow \ Wstrict-prototypes \ - Wundef $cf_gcc_warnings $cf_warn_CONST + Wundef $cf_gcc_warnings $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:5352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 + if { (eval echo "$as_me:6727: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:6730: \$? = $ac_status" >&5 + (exit $ac_status); }; then + test -n "$verbose" && echo "$as_me:6732: result: ... -$cf_opt" >&5 +echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in (Wcast-qual) - CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-DXTSTRINGDEFINES" + ;; (Winline) case $GCC_VERSION in ([34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:5363: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 - +echo "${as_me:-configure}:6746: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -5370,8 +6753,7 @@ echo "${as_me:-configure}:5363: testing ([12].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:5374: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 - +echo "${as_me:-configure}:6756: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -5384,25 +6766,22 @@ echo "${as_me:-configure}:5374: testing fi rm -rf conftest* - - fi fi ## !NNTP_ONLY if test "$USE_SPOOLDIR" = "yes"; then ## options for directories - echo $ac_n "checking for news-library path""... $ac_c" 1>&6 -echo "configure:5397: checking for news-library path" >&5 - + echo "$as_me:6775: checking for news-library path" >&5 +echo $ECHO_N "checking for news-library path... $ECHO_C" >&6 + # Check whether --with-libdir or --without-libdir was given. if test "${with_libdir+set}" = set; then withval="$with_libdir" - : + else withval="${NEWSLIBDIR:-/usr/lib/news}" -fi -if true ; then +fi; if true ; then if test "x$prefix" != xNONE; then cf_path_syntax="$prefix" @@ -5429,26 +6808,28 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } + { { echo "$as_me:6811: error: expected a pathname, not \"$withval\"" >&5 +echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } ;; esac fi eval NEWSLIBDIR="$withval" - echo "$ac_t""$NEWSLIBDIR" 1>&6 + echo "$as_me:6820: result: $NEWSLIBDIR" >&5 +echo "${ECHO_T}$NEWSLIBDIR" >&6 + + echo "$as_me:6823: checking for news spool-directory path" >&5 +echo $ECHO_N "checking for news spool-directory path... $ECHO_C" >&6 - echo $ac_n "checking for news spool-directory path""... $ac_c" 1>&6 -echo "configure:5443: checking for news spool-directory path" >&5 - # Check whether --with-spooldir or --without-spooldir was given. if test "${with_spooldir+set}" = set; then withval="$with_spooldir" - : + else withval="${SPOOLDIR:-/var/spool/news}" -fi -if true ; then +fi; if true ; then if test "x$prefix" != xNONE; then cf_path_syntax="$prefix" @@ -5475,26 +6856,28 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } + { { echo "$as_me:6859: error: expected a pathname, not \"$withval\"" >&5 +echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } ;; esac fi eval SPOOLDIR="$withval" - echo "$ac_t""$SPOOLDIR" 1>&6 + echo "$as_me:6868: result: $SPOOLDIR" >&5 +echo "${ECHO_T}$SPOOLDIR" >&6 + + echo "$as_me:6871: checking for news overview-directory path" >&5 +echo $ECHO_N "checking for news overview-directory path... $ECHO_C" >&6 - echo $ac_n "checking for news overview-directory path""... $ac_c" 1>&6 -echo "configure:5489: 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 withval="$with_nov_dir" - : + else withval="${NOVROOTDIR:-$SPOOLDIR}" -fi -if true ; then +fi; if true ; then if test "x$prefix" != xNONE; then cf_path_syntax="$prefix" @@ -5521,40 +6904,45 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } + { { echo "$as_me:6907: error: expected a pathname, not \"$withval\"" >&5 +echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } ;; esac fi eval NOVROOTDIR="$withval" - echo "$ac_t""$NOVROOTDIR" 1>&6 + echo "$as_me:6916: result: $NOVROOTDIR" >&5 +echo "${ECHO_T}$NOVROOTDIR" >&6 + + echo "$as_me:6919: checking for overview filename" >&5 +echo $ECHO_N "checking for overview filename... $ECHO_C" >&6 - echo $ac_n "checking for overview filename""... $ac_c" 1>&6 -echo "configure:5535: checking for overview filename" >&5 - # Check whether --with-nov-fname or --without-nov-fname was given. if test "${with_nov_fname+set}" = set; then withval="$with_nov_fname" - : + else withval="${OVERVIEW_FILE-.overview}" -fi -test -z "$withval" && withval=no +fi; test -z "$withval" && withval=no case "$withval" in #(vi yes) - { echo "configure: error: expected a value for --with-nov-fname" 1>&2; exit 1; } + { { echo "$as_me:6931: error: expected a value for --with-nov-fname" >&5 +echo "$as_me: error: expected a value for --with-nov-fname" >&2;} + { (exit 1); exit 1; }; } ;; #(vi no) withval="" ;; esac OVERVIEW_FILE="$withval" - cat >> confdefs.h <>confdefs.h <&6 + echo "$as_me:6944: result: $OVERVIEW_FILE" >&5 +echo "${ECHO_T}$OVERVIEW_FILE" >&6 INEWSPATH="$NEWSLIBDIR" else @@ -5566,17 +6954,16 @@ 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:5571: checking for directory containing \"inews\"" >&5 +echo "$as_me:6957: checking for directory containing \"inews\"" >&5 +echo $ECHO_N "checking for directory containing \"inews\"... $ECHO_C" >&6 # Check whether --with-inews-dir or --without-inews-dir was given. if test "${with_inews_dir+set}" = set; then withval="$with_inews_dir" - : + else withval="${INEWSDIR:-$INEWSPATH}" -fi -if true ; then +fi; if true ; then if test "x$prefix" != xNONE; then cf_path_syntax="$prefix" @@ -5603,7 +6990,9 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } + { { echo "$as_me:6993: error: expected a pathname, not \"$withval\"" >&5 +echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } ;; esac @@ -5611,72 +7000,72 @@ fi eval INEWSDIR="$withval" INEWSDIR=`echo $INEWSDIR |sed -e 's,/$,,'` -echo "$ac_t""$INEWSDIR" 1>&6 +echo "$as_me:7003: result: $INEWSDIR" >&5 +echo "${ECHO_T}$INEWSDIR" >&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:5620: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_INEWS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:7008: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_INEWS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$INEWS" in - /*) + case $INEWS in + [\\/]* | ?:[\\/]*) ac_cv_path_INEWS="$INEWS" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_INEWS="$INEWS" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$INEWSDIR:/news/bin:/usr/lib/news/bin:$INEWSPATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_INEWS="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$INEWSDIR:/news/bin:/usr/lib/news/bin:$INEWSPATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_INEWS="$ac_dir/$ac_word" + echo "$as_me:7025: found $ac_dir/$ac_word" >&5 + break +fi +done + test -z "$ac_cv_path_INEWS" && ac_cv_path_INEWS="--internal" ;; esac fi -INEWS="$ac_cv_path_INEWS" +INEWS=$ac_cv_path_INEWS + if test -n "$INEWS"; then - echo "$ac_t""$INEWS" 1>&6 + echo "$as_me:7037: result: $INEWS" >&5 +echo "${ECHO_T}$INEWS" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:7040: result: no" >&5 +echo "${ECHO_T}no" >&6 fi if test "$ac_cv_path_INEWS" != ""; then if test "$ac_cv_path_INEWS" = "--internal"; then - + cf_define=`echo "$INEWS"|sed -e 's/\\\\/\\\\134/g' -e 's/^[ ]\\+//' -e 's/[ ]\\+$//' -e 's/"/\\\\042/g'` -cat >> confdefs.h <>confdefs.h <> confdefs.h <>confdefs.h <&6 -echo "configure:5676: 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 +echo "$as_me:7064: checking if you want socks library" >&5 +echo $ECHO_N "checking if you want socks library... $ECHO_C" >&6 +if test "${cf_cv_use_libsocks+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - # Check whether --with-socks or --without-socks was given. if test "${with_socks+set}" = set; then @@ -5684,19 +7073,17 @@ if test "${with_socks+set}" = set; then cf_cv_use_libsocks=$withval else cf_cv_use_libsocks=no -fi - +fi; fi +echo "$as_me:7079: result: $cf_cv_use_libsocks" >&5 +echo "${ECHO_T}$cf_cv_use_libsocks" >&6 -echo "$ac_t""$cf_cv_use_libsocks" 1>&6 - -echo $ac_n "checking if you want socks5 library""... $ac_c" 1>&6 -echo "configure:5696: 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 +echo "$as_me:7082: checking if you want socks5 library" >&5 +echo $ECHO_N "checking if you want socks5 library... $ECHO_C" >&6 +if test "${cf_cv_use_libsocks5+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - # Check whether --with-socks5 or --without-socks5 was given. if test "${with_socks5+set}" = set; then @@ -5704,27 +7091,24 @@ if test "${with_socks5+set}" = set; then cf_cv_use_libsocks5=$withval else cf_cv_use_libsocks5=no -fi - +fi; fi - -echo "$ac_t""$cf_cv_use_libsocks5" 1>&6 +echo "$as_me:7097: result: $cf_cv_use_libsocks5" >&5 +echo "${ECHO_T}$cf_cv_use_libsocks5" >&6 if test "x$cf_cv_use_libsocks" != xno ; then - - + case "$cf_cv_use_libsocks" in (no) ;; (yes) ;; (*) - for cf_searchpath in `echo "$cf_cv_use_libsocks" | tr $PATH_SEPARATOR ' '`; do if test -d $cf_searchpath/include; then - + if test -n "$cf_searchpath/include" ; then for cf_add_incdir in $cf_searchpath/include do @@ -5747,24 +7131,41 @@ if test -n "$cf_searchpath/include" ; th if test "$GCC" = yes then cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7139 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ printf("Hello") -; return 0; } -EOF -if { (eval echo configure:5760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:7151: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:7154: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:7157: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7160: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_have_incdir=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -5773,8 +7174,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:5777: testing adding $cf_add_incdir to include-path ..." 1>&5 - +echo "${as_me:-configure}:7177: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5792,7 +7192,7 @@ echo "${as_me:-configure}:5777: testing fi elif test -d $cf_searchpath/../include ; then - + if test -n "$cf_searchpath/../include" ; then for cf_add_incdir in $cf_searchpath/../include do @@ -5815,24 +7215,41 @@ if test -n "$cf_searchpath/../include" ; if test "$GCC" = yes then cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7223 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ printf("Hello") -; return 0; } -EOF -if { (eval echo configure:5828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:7235: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:7238: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:7241: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7244: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_have_incdir=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -5841,8 +7258,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:5845: testing adding $cf_add_incdir to include-path ..." 1>&5 - +echo "${as_me:-configure}:7261: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5860,10 +7276,12 @@ echo "${as_me:-configure}:5845: testing fi else -{ echo "configure: error: cannot find socks library under $cf_cv_use_libsocks" 1>&2; exit 1; } +{ { echo "$as_me:7279: error: cannot find socks library under $cf_cv_use_libsocks" >&5 +echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;} + { (exit 1); exit 1; }; } fi if test -d $cf_searchpath/lib; then - + if test -n "$cf_searchpath/lib" ; then for cf_add_libdir in $cf_searchpath/lib do @@ -5883,8 +7301,7 @@ if test -n "$cf_searchpath/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:5887: testing adding $cf_add_libdir to library-path ..." 1>&5 - +echo "${as_me:-configure}:7304: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -5893,7 +7310,7 @@ echo "${as_me:-configure}:5887: testing fi elif test -d $cf_searchpath ; then - + if test -n "$cf_searchpath" ; then for cf_add_libdir in $cf_searchpath do @@ -5913,8 +7330,7 @@ if test -n "$cf_searchpath" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:5917: testing adding $cf_add_libdir to library-path ..." 1>&5 - +echo "${as_me:-configure}:7333: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -5923,94 +7339,113 @@ echo "${as_me:-configure}:5917: testing fi else -{ echo "configure: error: cannot find socks library under $cf_cv_use_libsocks" 1>&2; exit 1; } +{ { echo "$as_me:7342: error: cannot find socks library under $cf_cv_use_libsocks" >&5 +echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;} + { (exit 1); exit 1; }; } fi done ;; esac - - # If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these # will be set on completion of the AC_TRY_LINK below. cf_cv_header_path_socks= cf_cv_library_path_socks= - -echo "${as_me:-configure}:5942: testing Starting FIND_LINKAGE(socks,) ..." 1>&5 - +echo "${as_me:-configure}:7356: testing Starting FIND_LINKAGE(socks,) ..." 1>&5 cf_save_LIBS="$LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7361 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ Raccept((char *)0) -; return 0; } -EOF -if { (eval echo configure:5959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7377: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7380: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7383: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7386: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_find_linkage_socks=yes cf_cv_header_path_socks=/usr/include cf_cv_library_path_socks=/usr/lib else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 LIBS="-lsocks $cf_save_LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7400 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ Raccept((char *)0) -; return 0; } -EOF -if { (eval echo configure:5986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7416: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7419: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7422: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7425: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_find_linkage_socks=yes cf_cv_header_path_socks=/usr/include cf_cv_library_path_socks=/usr/lib cf_cv_library_file_socks="-lsocks" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 - cf_cv_find_linkage_socks=no LIBS="$cf_save_LIBS" test -n "$verbose" && echo " find linkage for socks library" 1>&6 -echo "${as_me:-configure}:6004: testing find linkage for socks library ..." 1>&5 - - - -echo "${as_me:-configure}:6008: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5 +echo "${as_me:-configure}:7442: testing find linkage for socks library ..." 1>&5 +echo "${as_me:-configure}:7444: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" - cf_search= # collect the current set of include-directories from compiler flags @@ -6021,7 +7456,7 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then case $cf_header_path in (-I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` - + test "x$cf_header_path" != "xNONE" && \ test -d "$cf_header_path" && \ { @@ -6043,7 +7478,6 @@ fi cf_search= - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -6055,7 +7489,6 @@ test -d "$prefix" && \ test -d $prefix/socks/include/socks && cf_search="$cf_search $prefix/socks/include/socks" } - for cf_subdir_prefix in \ /usr \ /usr/local \ @@ -6064,7 +7497,7 @@ for cf_subdir_prefix in \ /opt/local \ $HOME do - + test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ (test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { @@ -6078,7 +7511,6 @@ test -d "$cf_subdir_prefix" && \ done - test "$includedir" != NONE && \ test "$includedir" != "/usr/include" && \ test -d "$includedir" && { @@ -6100,58 +7532,69 @@ cf_search="$cf_search $cf_header_path_li if test -d $cf_cv_header_path_socks ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_socks" 1>&6 -echo "${as_me:-configure}:6104: testing ... testing $cf_cv_header_path_socks ..." 1>&5 +echo "${as_me:-configure}:7535: testing ... testing $cf_cv_header_path_socks ..." 1>&5 + + CPPFLAGS="$cf_save_CPPFLAGS" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_socks" - CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_socks" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7543 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ Raccept((char *)0) -; return 0; } -EOF -if { (eval echo configure:6120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - test -n "$verbose" && echo " ... found socks headers in $cf_cv_header_path_socks" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:7559: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:7562: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:7565: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7568: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then -echo "${as_me:-configure}:6125: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5 + test -n "$verbose" && echo " ... found socks headers in $cf_cv_header_path_socks" 1>&6 +echo "${as_me:-configure}:7573: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5 cf_cv_find_linkage_socks=maybe cf_test_CPPFLAGS="$CPPFLAGS" break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + CPPFLAGS="$cf_save_CPPFLAGS" - + fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi done if test "$cf_cv_find_linkage_socks" = maybe ; then - -echo "${as_me:-configure}:6146: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5 - +echo "${as_me:-configure}:7591: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" - - if test "$cf_cv_find_linkage_socks" != yes ; then - + cf_search= cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then @@ -6160,7 +7603,7 @@ if test -n "${LDFLAGS}${LIBS}" ; then case $cf_library_path in (-L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` - + test "x$cf_library_path" != "xNONE" && \ test -d "$cf_library_path" && \ { @@ -6178,10 +7621,8 @@ test -d "$cf_library_path" && \ done fi - cf_search= - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -6193,7 +7634,6 @@ test -d "$prefix" && \ test -d $prefix/socks/lib/socks && cf_search="$cf_search $prefix/socks/lib/socks" } - for cf_subdir_prefix in \ /usr \ /usr/local \ @@ -6202,7 +7642,7 @@ for cf_subdir_prefix in \ /opt/local \ $HOME do - + test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ (test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { @@ -6216,7 +7656,6 @@ test -d "$cf_subdir_prefix" && \ done - cf_search="$cf_library_path_list $cf_search" for cf_cv_library_path_socks in $cf_search @@ -6224,46 +7663,57 @@ cf_search="$cf_library_path_list $cf_sea if test -d $cf_cv_library_path_socks ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_socks" 1>&6 -echo "${as_me:-configure}:6228: testing ... testing $cf_cv_library_path_socks ..." 1>&5 - +echo "${as_me:-configure}:7666: testing ... testing $cf_cv_library_path_socks ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lsocks $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_socks" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7672 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ Raccept((char *)0) -; return 0; } -EOF -if { (eval echo configure:6246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - - test -n "$verbose" && echo " ... found socks library in $cf_cv_library_path_socks" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7688: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7691: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7694: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7697: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then -echo "${as_me:-configure}:6251: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5 + test -n "$verbose" && echo " ... found socks library in $cf_cv_library_path_socks" 1>&6 +echo "${as_me:-configure}:7702: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5 cf_cv_find_linkage_socks=yes cf_cv_library_file_socks="-lsocks" break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 - CPPFLAGS="$cf_save_CPPFLAGS" LIBS="$cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS" - + fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi done CPPFLAGS="$cf_save_CPPFLAGS" @@ -6273,18 +7723,17 @@ rm -rf conftest* else cf_cv_find_linkage_socks=no fi - + fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" if test "$cf_cv_find_linkage_socks" = yes ; then - if test -n "$cf_cv_header_path_socks" ; then for cf_add_incdir in $cf_cv_header_path_socks do @@ -6307,24 +7756,41 @@ if test -n "$cf_cv_header_path_socks" ; if test "$GCC" = yes then cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7764 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ printf("Hello") -; return 0; } -EOF -if { (eval echo configure:6320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:7776: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:7779: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:7782: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7785: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_have_incdir=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -6333,8 +7799,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:6337: testing adding $cf_add_incdir to include-path ..." 1>&5 - +echo "${as_me:-configure}:7802: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6351,7 +7816,6 @@ echo "${as_me:-configure}:6337: testing done fi - if test -n "$cf_cv_library_path_socks" ; then for cf_add_libdir in $cf_cv_library_path_socks do @@ -6371,8 +7835,7 @@ if test -n "$cf_cv_library_path_socks" ; if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:6375: testing adding $cf_add_libdir to library-path ..." 1>&5 - +echo "${as_me:-configure}:7838: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -6380,7 +7843,6 @@ echo "${as_me:-configure}:6375: testing done fi - cf_add_libs="-lsocks" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -6397,113 +7859,123 @@ do done LIBS="$cf_add_libs" - else -echo "configure: warning: Cannot find socks library" 1>&2 +{ echo "$as_me:7863: WARNING: Cannot find socks library" >&5 +echo "$as_me: WARNING: Cannot find socks library" >&2;} fi - if test "x$cf_cv_find_linkage_socks" = "xyes" ; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define SOCKS 1 EOF - - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define accept Raccept EOF - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define bind Rbind EOF - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define connect Rconnect EOF - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define getpeername Rgetpeername EOF - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define getsockname Rgetsockname EOF - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define listen Rlisten EOF - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define recvfrom Rrecvfrom EOF - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define select Rselect EOF else - { echo "configure: error: cannot link with socks library" 1>&2; exit 1; } + { { echo "$as_me:7906: error: cannot link with socks library" >&5 +echo "$as_me: error: cannot link with socks library" >&2;} + { (exit 1); exit 1; }; } fi else - + cf_test_netlibs=no -echo $ac_n "checking for network libraries""... $ac_c" 1>&6 -echo "configure:6454: checking for network libraries" >&5 +echo "$as_me:7915: checking for network libraries" >&5 +echo $ECHO_N "checking for network libraries... $ECHO_C" >&6 -if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if test "${cf_cv_netlibs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - -echo "$ac_t""working..." 1>&6 + +echo "$as_me:7922: result: working..." >&5 +echo "${ECHO_T}working..." >&6 cf_cv_netlibs="" cf_test_netlibs=yes case $host_os in (mingw*) - for ac_hdr in windows.h winsock.h winsock2.h + +for ac_header in windows.h winsock.h winsock2.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6471: 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 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:7934: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 7940 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:7944: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:7950: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6481: \"$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" + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done - if test "$ac_cv_header_winsock2_h" = "yes" ; then cf_winsock_lib="-lws2_32" elif test "$ac_cv_header_winsock_h" = "yes" ; then @@ -6511,7 +7983,7 @@ done fi cf_save_LIBS="$LIBS" - + cf_add_libs="$cf_winsock_lib" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -6528,9 +8000,8 @@ do done LIBS="$cf_add_libs" - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8004 "configure" #include "confdefs.h" #ifdef HAVE_WINDOWS_H @@ -6546,836 +8017,1042 @@ LIBS="$cf_add_libs" #endif #endif -int main() { +int +main (void) +{ char buffer[1024]; gethostname(buffer, sizeof(buffer)); -; return 0; } -EOF -if { (eval echo configure:6556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8031: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8034: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8037: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8040: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_netlibs="$cf_winsock_lib $cf_cv_netlibs" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - { echo "configure: error: Cannot link against winsock library" 1>&2; exit 1; } + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +{ { echo "$as_me:8046: error: Cannot link against winsock library" >&5 +echo "$as_me: error: Cannot link against winsock library" >&2;} + { (exit 1); exit 1; }; } fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" ;; (*) - for ac_func in gethostname + +for ac_func in gethostname do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6573: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:8059: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 8065 "configure" +#include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + builtin and then its argument prototype would still apply. */ +char $ac_func (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); +#error found stub for $ac_func #endif -; return 0; } + return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8096: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8099: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8102: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8105: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:8115: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "ac_cv_func_$ac_func=no" -fi -rm -rf conftest* -fi +else -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 - -echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:6624: 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 +echo "$as_me:8124: checking for gethostname in -lnsl" >&5 +echo $ECHO_N "checking for gethostname in -lnsl... $ECHO_C" >&6 +if test "${ac_cv_lib_nsl_gethostname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $cf_cv_netlibs $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8132 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostname(); - -int main() { -gethostname() -; return 0; } -EOF -if { (eval echo configure:6643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char gethostname (); +int +main (void) +{ +gethostname (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8151: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8154: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8157: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8160: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_nsl_gethostname=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_nsl_gethostname=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:8171: result: $ac_cv_lib_nsl_gethostname" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostname" >&6 +if test $ac_cv_lib_nsl_gethostname = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cf_tr_func=`echo "gethostname" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6 ac_cv_func_gethostname=unknown unset ac_cv_func_gethostname 2>/dev/null - - -echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 -echo "configure:6676: 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 + +echo "$as_me:8188: checking for gethostname in -lsocket" >&5 +echo $ECHO_N "checking for gethostname in -lsocket... $ECHO_C" >&6 +if test "${ac_cv_lib_socket_gethostname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $cf_cv_netlibs $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8196 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostname(); - -int main() { -gethostname() -; return 0; } -EOF -if { (eval echo configure:6695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char gethostname (); +int +main (void) +{ +gethostname (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8215: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8218: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8221: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8224: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_socket_gethostname=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_socket_gethostname=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:8235: result: $ac_cv_lib_socket_gethostname" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_gethostname" >&6 +if test $ac_cv_lib_socket_gethostname = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cf_tr_func=`echo "gethostname" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6 ac_cv_func_gethostname=unknown unset ac_cv_func_gethostname 2>/dev/null - -fi - fi +fi fi done - - echo $ac_n "checking for main in -linet""... $ac_c" 1>&6 -echo "configure:6737: 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 + echo "$as_me:8259: checking for main in -linet" >&5 +echo $ECHO_N "checking for main in -linet... $ECHO_C" >&6 +if test "${ac_cv_lib_inet_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-linet $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8267 "configure" #include "confdefs.h" -int main() { -main() -; return 0; } -EOF -if { (eval echo configure:6752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +int +main (void) +{ +main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8279: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8282: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8285: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8288: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_inet_main=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_inet_main=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:8299: result: $ac_cv_lib_inet_main" >&5 +echo "${ECHO_T}$ac_cv_lib_inet_main" >&6 +if test $ac_cv_lib_inet_main = yes; then cf_cv_netlibs="-linet $cf_cv_netlibs" -else - echo "$ac_t""no" 1>&6 fi - if test "$ac_cv_func_lsocket" != no ; then - for ac_func in socket + +for ac_func in socket do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6777: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:8310: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 8316 "configure" +#include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + builtin and then its argument prototype would still apply. */ +char $ac_func (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); +#error found stub for $ac_func #endif -; return 0; } + return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8347: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8350: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8353: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8356: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:8366: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "ac_cv_func_$ac_func=no" -fi -rm -rf conftest* -fi +else -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 - -echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:6828: 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 +echo "$as_me:8375: checking for socket in -lsocket" >&5 +echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6 +if test "${ac_cv_lib_socket_socket+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $cf_cv_netlibs $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8383 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char socket(); - -int main() { -socket() -; return 0; } -EOF -if { (eval echo configure:6847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char socket (); +int +main (void) +{ +socket (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8402: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8405: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8408: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8411: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_socket_socket=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_socket_socket=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:8422: result: $ac_cv_lib_socket_socket" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6 +if test $ac_cv_lib_socket_socket = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cf_tr_func=`echo "socket" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6 ac_cv_func_socket=unknown unset ac_cv_func_socket 2>/dev/null - - -echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6 -echo "configure:6880: 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 + +echo "$as_me:8439: checking for socket in -lbsd" >&5 +echo $ECHO_N "checking for socket in -lbsd... $ECHO_C" >&6 +if test "${ac_cv_lib_bsd_socket+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $cf_cv_netlibs $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8447 "configure" #include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char socket(); - -int main() { -socket() -; return 0; } -EOF -if { (eval echo configure:6899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char socket (); +int +main (void) +{ +socket (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8466: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8469: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8472: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8475: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_bsd_socket=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_bsd_socket=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:8486: result: $ac_cv_lib_bsd_socket" >&5 +echo "${ECHO_T}$ac_cv_lib_bsd_socket" >&6 +if test $ac_cv_lib_bsd_socket = yes; then + cf_tr_func=`echo "socket" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6 ac_cv_func_socket=unknown unset ac_cv_func_socket 2>/dev/null - -fi - fi +fi fi done fi - for ac_func in gethostbyname +for ac_func in gethostbyname do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6944: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:8515: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 8521 "configure" +#include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + builtin and then its argument prototype would still apply. */ +char $ac_func (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); +#error found stub for $ac_func #endif -; return 0; } + return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8552: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8555: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8558: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8561: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:8571: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "ac_cv_func_$ac_func=no" -fi -rm -rf conftest* -fi +else -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 - -echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:6995: 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 +echo "$as_me:8580: checking for gethostbyname in -lnsl" >&5 +echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $cf_cv_netlibs $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8588 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname(); - -int main() { -gethostbyname() -; return 0; } -EOF -if { (eval echo configure:7014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char gethostbyname (); +int +main (void) +{ +gethostbyname (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8607: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8610: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8613: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8616: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_nsl_gethostbyname=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_nsl_gethostbyname=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:8627: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 +if test $ac_cv_lib_nsl_gethostbyname = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cf_tr_func=`echo "gethostbyname" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6 ac_cv_func_gethostbyname=unknown unset ac_cv_func_gethostbyname 2>/dev/null - -fi +fi fi done - - for ac_func in inet_ntoa +for ac_func in inet_ntoa do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7055: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:8652: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 8658 "configure" +#include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + builtin and then its argument prototype would still apply. */ +char $ac_func (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); +#error found stub for $ac_func #endif -; return 0; } + return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8689: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8692: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8695: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8698: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:8708: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "ac_cv_func_$ac_func=no" -fi -rm -rf conftest* -fi +else -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 - -echo $ac_n "checking for inet_ntoa in -lnsl""... $ac_c" 1>&6 -echo "configure:7106: checking for inet_ntoa in -lnsl" >&5 -ac_lib_var=`echo nsl'_'inet_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 +echo "$as_me:8717: checking for inet_ntoa in -lnsl" >&5 +echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6 +if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $cf_cv_netlibs $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8725 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char inet_ntoa(); - -int main() { -inet_ntoa() -; return 0; } -EOF -if { (eval echo configure:7125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char inet_ntoa (); +int +main (void) +{ +inet_ntoa (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8744: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8747: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8750: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8753: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_nsl_inet_ntoa=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_nsl_inet_ntoa=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:8764: result: $ac_cv_lib_nsl_inet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6 +if test $ac_cv_lib_nsl_inet_ntoa = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cf_tr_func=`echo "inet_ntoa" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6 ac_cv_func_inet_ntoa=unknown unset ac_cv_func_inet_ntoa 2>/dev/null - -fi +fi fi done - - for ac_func in gethostbyname +for ac_func in gethostbyname do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7166: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:8789: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 8795 "configure" +#include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + builtin and then its argument prototype would still apply. */ +char $ac_func (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); +#error found stub for $ac_func #endif -; return 0; } + return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8826: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8829: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8832: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8835: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:8845: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "ac_cv_func_$ac_func=no" -fi -rm -rf conftest* -fi +else -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 - -echo $ac_n "checking for gethostbyname in -lnetwork""... $ac_c" 1>&6 -echo "configure:7217: checking for gethostbyname in -lnetwork" >&5 -ac_lib_var=`echo network'_'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 +echo "$as_me:8854: checking for gethostbyname in -lnetwork" >&5 +echo $ECHO_N "checking for gethostbyname in -lnetwork... $ECHO_C" >&6 +if test "${ac_cv_lib_network_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lnetwork $cf_cv_netlibs $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8862 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname(); - -int main() { -gethostbyname() -; return 0; } -EOF -if { (eval echo configure:7236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char gethostbyname (); +int +main (void) +{ +gethostbyname (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8881: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8884: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8887: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8890: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_network_gethostbyname=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_network_gethostbyname=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:8901: result: $ac_cv_lib_network_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_network_gethostbyname" >&6 +if test $ac_cv_lib_network_gethostbyname = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cf_tr_func=`echo "gethostbyname" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6 ac_cv_func_gethostbyname=unknown unset ac_cv_func_gethostbyname 2>/dev/null - -fi +fi fi done - - for ac_func in strcasecmp +for ac_func in strcasecmp do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7277: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:8926: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 8932 "configure" +#include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + builtin and then its argument prototype would still apply. */ +char $ac_func (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); +#error found stub for $ac_func #endif -; return 0; } + return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8963: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8966: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8969: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8972: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:8982: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "ac_cv_func_$ac_func=no" -fi -rm -rf conftest* -fi +else -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 - -echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6 -echo "configure:7328: 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 +echo "$as_me:8991: checking for strcasecmp in -lresolv" >&5 +echo $ECHO_N "checking for strcasecmp in -lresolv... $ECHO_C" >&6 +if test "${ac_cv_lib_resolv_strcasecmp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $cf_cv_netlibs $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8999 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char strcasecmp(); - -int main() { -strcasecmp() -; return 0; } -EOF -if { (eval echo configure:7347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char strcasecmp (); +int +main (void) +{ +strcasecmp (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9018: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9021: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9024: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9027: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_resolv_strcasecmp=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_resolv_strcasecmp=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:9038: result: $ac_cv_lib_resolv_strcasecmp" >&5 +echo "${ECHO_T}$ac_cv_lib_resolv_strcasecmp" >&6 +if test $ac_cv_lib_resolv_strcasecmp = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cf_tr_func=`echo "strcasecmp" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6 ac_cv_func_strcasecmp=unknown unset ac_cv_func_strcasecmp 2>/dev/null - -fi +fi fi done @@ -7385,17 +9062,16 @@ esac fi - case $cf_cv_netlibs in (*ws2_32*) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define USE_WINSOCK2_H 1 EOF ;; esac - cf_add_libs="$cf_cv_netlibs" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -7415,19 +9091,17 @@ LIBS="$cf_add_libs" test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6 if test "x$cf_cv_use_libsocks5" != xno ; then - - + case "$cf_cv_use_libsocks5" in (no) ;; (yes) ;; (*) - for cf_searchpath in `echo "$cf_cv_use_libsocks5" | tr $PATH_SEPARATOR ' '`; do if test -d $cf_searchpath/include; then - + if test -n "$cf_searchpath/include" ; then for cf_add_incdir in $cf_searchpath/include do @@ -7450,24 +9124,41 @@ if test -n "$cf_searchpath/include" ; th if test "$GCC" = yes then cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 9132 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ printf("Hello") -; return 0; } -EOF -if { (eval echo configure:7463: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9144: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9147: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9150: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9153: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_have_incdir=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -7476,8 +9167,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:7480: testing adding $cf_add_incdir to include-path ..." 1>&5 - +echo "${as_me:-configure}:9170: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7495,7 +9185,7 @@ echo "${as_me:-configure}:7480: testing fi elif test -d $cf_searchpath/../include ; then - + if test -n "$cf_searchpath/../include" ; then for cf_add_incdir in $cf_searchpath/../include do @@ -7518,24 +9208,41 @@ if test -n "$cf_searchpath/../include" ; if test "$GCC" = yes then cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 9216 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ printf("Hello") -; return 0; } -EOF -if { (eval echo configure:7531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9228: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9231: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9234: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9237: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_have_incdir=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -7544,8 +9251,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:7548: testing adding $cf_add_incdir to include-path ..." 1>&5 - +echo "${as_me:-configure}:9254: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7563,10 +9269,12 @@ echo "${as_me:-configure}:7548: testing fi else -{ echo "configure: error: cannot find socks5 library under $cf_cv_use_libsocks5" 1>&2; exit 1; } +{ { echo "$as_me:9272: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5 +echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;} + { (exit 1); exit 1; }; } fi if test -d $cf_searchpath/lib; then - + if test -n "$cf_searchpath/lib" ; then for cf_add_libdir in $cf_searchpath/lib do @@ -7586,8 +9294,7 @@ if test -n "$cf_searchpath/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7590: testing adding $cf_add_libdir to library-path ..." 1>&5 - +echo "${as_me:-configure}:9297: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7596,7 +9303,7 @@ echo "${as_me:-configure}:7590: testing fi elif test -d $cf_searchpath ; then - + if test -n "$cf_searchpath" ; then for cf_add_libdir in $cf_searchpath do @@ -7616,8 +9323,7 @@ if test -n "$cf_searchpath" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7620: testing adding $cf_add_libdir to library-path ..." 1>&5 - +echo "${as_me:-configure}:9326: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7626,15 +9332,15 @@ echo "${as_me:-configure}:7620: testing fi else -{ echo "configure: error: cannot find socks5 library under $cf_cv_use_libsocks5" 1>&2; exit 1; } +{ { echo "$as_me:9335: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5 +echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;} + { (exit 1); exit 1; }; } fi done ;; esac - - cf_add_libs="-lsocks5" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -7651,349 +9357,431 @@ do done LIBS="$cf_add_libs" - -cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define USE_SOCKS5 1 EOF -cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define SOCKS 1 EOF - -echo $ac_n "checking if the socks library uses socks4 prefix""... $ac_c" 1>&6 -echo "configure:7666: checking if the socks library uses socks4 prefix" >&5 +echo "$as_me:9368: checking if the socks library uses socks4 prefix" >&5 +echo $ECHO_N "checking if the socks library uses socks4 prefix... $ECHO_C" >&6 cf_use_socks4=error -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 9372 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ Rinit((char *)0) -; return 0; } -EOF -if { (eval echo configure:7678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - cat >> confdefs.h <<\EOF + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9386: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9389: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9392: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9395: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + +cat >>confdefs.h <<\EOF #define USE_SOCKS4_PREFIX 1 EOF cf_use_socks4=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - cat > conftest.$ac_ext <&5 +cat conftest.$ac_ext >&5 +cat >conftest.$ac_ext <<_ACEOF +#line 9407 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ SOCKSinit((char *)0) -; return 0; } -EOF -if { (eval echo configure:7697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9419: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9422: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9425: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9428: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_use_socks4=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - { echo "configure: error: Cannot link with socks5 library" 1>&2; exit 1; } -fi -rm -rf conftest* -fi -rm -rf conftest* -echo "$ac_t""$cf_use_socks4" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +{ { echo "$as_me:9434: error: Cannot link with socks5 library" >&5 +echo "$as_me: error: Cannot link with socks5 library" >&2;} + { (exit 1); exit 1; }; } +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +echo "$as_me:9441: result: $cf_use_socks4" >&5 +echo "${ECHO_T}$cf_use_socks4" >&6 if test "$cf_use_socks4" = "yes" ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define accept Raccept EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define bind Rbind EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define connect Rconnect EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define getpeername Rgetpeername EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define getsockname Rgetsockname EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define listen Rlisten EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define recvfrom Rrecvfrom EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define select Rselect EOF else - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define accept SOCKSaccept EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define getpeername SOCKSgetpeername EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define getsockname SOCKSgetsockname EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define recvfrom SOCKSrecvfrom EOF fi -echo $ac_n "checking if socks5p.h is available""... $ac_c" 1>&6 -echo "configure:7764: checking if socks5p.h is available" >&5 -cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking if socks5p.h is available... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line 9499 "configure" #include "confdefs.h" #define INCLUDE_PROTOTYPES #include -int main() { +int +main (void) +{ init((char *)0) -; return 0; } -EOF -if { (eval echo configure:7776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9514: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9517: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9520: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9523: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_use_socks5p_h=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_use_socks5p_h=no -fi -rm -f conftest* -echo "$ac_t""$cf_use_socks5p_h" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_use_socks5p_h=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:9532: result: $cf_use_socks5p_h" >&5 +echo "${ECHO_T}$cf_use_socks5p_h" >&6 -test "$cf_use_socks5p_h" = yes && cat >> confdefs.h <<\EOF +test "$cf_use_socks5p_h" = yes && +cat >>confdefs.h <<\EOF #define INCLUDE_PROTOTYPES 1 EOF - fi fi ### which locking method should be used for mailbox locking ### first look for all available locking methods -for ac_hdr in unistd.h fcntl.h sys/file.h +for ac_header in unistd.h fcntl.h sys/file.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7803: 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 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:9549: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 9555 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:9559: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:9565: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7813: \"$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" + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done -echo $ac_n "checking for fcntl""... $ac_c" 1>&6 -echo "configure:7840: checking for fcntl" >&5 -if eval "test \"`echo '$''{'ac_cv_func_fcntl'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:9594: checking for fcntl" >&5 +echo $ECHO_N "checking for fcntl... $ECHO_C" >&6 +if test "${ac_cv_func_fcntl+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 9600 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char fcntl(); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ +#define fcntl autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef fcntl + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char fcntl(); + builtin and then its argument prototype would still apply. */ +char fcntl (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_fcntl) || defined (__stub___fcntl) -choke me -#else -fcntl(); +#error found stub for fcntl #endif -; return 0; } -EOF -if { (eval echo configure:7868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_fcntl=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_fcntl=no" -fi -rm -rf conftest* -fi + return fcntl (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9631: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9634: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9637: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9640: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_fcntl=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_fcntl=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:9650: result: $ac_cv_func_fcntl" >&5 +echo "${ECHO_T}$ac_cv_func_fcntl" >&6 + +echo "$as_me:9653: checking for lockf" >&5 +echo $ECHO_N "checking for lockf... $ECHO_C" >&6 +if test "${ac_cv_func_lockf+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 9659 "configure" +#include "confdefs.h" +#define lockf autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef lockf -if eval "test \"`echo '$ac_cv_func_'fcntl`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 -fi +#ifdef __cplusplus +extern "C" +#endif -echo $ac_n "checking for lockf""... $ac_c" 1>&6 -echo "configure:7888: 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 < -/* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char lockf(); + builtin and then its argument prototype would still apply. */ +char lockf (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_lockf) || defined (__stub___lockf) -choke me -#else -lockf(); +#error found stub for lockf #endif -; return 0; } -EOF -if { (eval echo configure:7916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_lockf=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_lockf=no" -fi -rm -rf conftest* -fi + return lockf (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9690: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9693: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9696: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9699: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_lockf=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_lockf=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:9709: result: $ac_cv_func_lockf" >&5 +echo "${ECHO_T}$ac_cv_func_lockf" >&6 + +echo "$as_me:9712: checking for flock" >&5 +echo $ECHO_N "checking for flock... $ECHO_C" >&6 +if test "${ac_cv_func_flock+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 9718 "configure" +#include "confdefs.h" +#define flock autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef flock -if eval "test \"`echo '$ac_cv_func_'lockf`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 -fi +#ifdef __cplusplus +extern "C" +#endif -echo $ac_n "checking for flock""... $ac_c" 1>&6 -echo "configure:7936: 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 < -/* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char flock(); + builtin and then its argument prototype would still apply. */ +char flock (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_flock) || defined (__stub___flock) -choke me -#else -flock(); +#error found stub for flock #endif -; return 0; } -EOF -if { (eval echo configure:7964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_flock=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_flock=no" -fi -rm -rf conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'flock`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : + return flock (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9749: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9752: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9755: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9758: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_flock=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_flock=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:9768: result: $ac_cv_func_flock" >&5 +echo "${ECHO_T}$ac_cv_func_flock" >&6 + +echo "$as_me:9771: checking for file-locking functions" >&5 +echo $ECHO_N "checking for file-locking functions... $ECHO_C" >&6 +if test "${cf_cv_lockfile+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$ac_t""no" 1>&6 -fi - -echo $ac_n "checking for file-locking functions""... $ac_c" 1>&6 -echo "configure:7985: 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 - cf_cv_lockfile= for cf_lock in fcntl lockf flock do if eval 'test ${ac_cv_func_'$cf_lock'+set} = set'; then case $cf_lock in #(vi fcntl) #(vi - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 9784 "configure" #include "confdefs.h" #include @@ -8004,7 +9792,9 @@ if eval 'test ${ac_cv_func_'$cf_lock'+se #include #endif -int main() { +int +main (void) +{ struct flock flk; int block = 1; @@ -8018,22 +9808,34 @@ int main() { rc = fcntl(fd, block ? F_SETLKW : F_SETLK, &flk) && fcntl(fd, F_GETLK, &flk) && fcntl(fd, F_SETLK, &flk); - -; return 0; } -EOF -if { (eval echo configure:8025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9817: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9820: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9823: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9826: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - continue + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +continue fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext ;; lockf) #(vi - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 9838 "configure" #include "confdefs.h" #include @@ -8044,28 +9846,42 @@ rm -f conftest* #include #endif -int main() { +int +main (void) +{ int block = 1, fd = 0; int ret = lockf(fd, block ? F_LOCK : F_TLOCK, 0L) && lockf(fd, F_TEST, 0L) && lockf(fd, F_ULOCK, 0L); - -; return 0; } -EOF -if { (eval echo configure:8057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9863: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9866: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9869: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9872: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - continue + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +continue fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext ;; flock) - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 9884 "configure" #include "confdefs.h" #include @@ -8079,24 +9895,38 @@ rm -f conftest* #include #endif -int main() { +int +main (void) +{ int block = 1, fd = 0; int ret = flock(fd, (LOCK_EX|LOCK_NB)) && flock(fd, LOCK_UN) && flock(fd, block ? LOCK_EX : (LOCK_EX | LOCK_NB)); - -; return 0; } -EOF -if { (eval echo configure:8092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9912: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9915: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9918: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9921: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - continue + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +continue fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext ;; esac cf_cv_lockfile="$cf_cv_lockfile $cf_lock" @@ -8104,12 +9934,11 @@ fi done fi +echo "$as_me:9937: result: $cf_cv_lockfile" >&5 +echo "${ECHO_T}$cf_cv_lockfile" >&6 -echo "$ac_t""$cf_cv_lockfile" 1>&6 - - -echo $ac_n "checking which locking method will be used""... $ac_c" 1>&6 -echo "configure:8113: checking which locking method will be used" >&5 +echo "$as_me:9940: checking which locking method will be used" >&5 +echo $ECHO_N "checking which locking method will be used... $ECHO_C" >&6 ### fcntl() is preferred, if the user just disables fcntl() ### without specifying an alternative lockf() is preferred @@ -8118,40 +9947,37 @@ if test "${enable_fcntl+set}" = set; the enableval="$enable_fcntl" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - requested_lock="lockf" + requested_lock="lockf" else requested_lock="fcntl" fi else - enableval=yes + enableval=yes requested_lock="fcntl" -fi - +fi; # Check whether --enable-lockf or --disable-lockf was given. if test "${enable_lockf+set}" = set; then enableval="$enable_lockf" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - requested_lock="lockf" + requested_lock="lockf" fi else - enableval=no -fi - + enableval=no +fi; # Check whether --enable-flock or --disable-flock was given. if test "${enable_flock+set}" = set; then enableval="$enable_flock" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - requested_lock="flock" + requested_lock="flock" fi else - enableval=no -fi - + enableval=no +fi; ### now check the users wishes against available locking methods if test -n "$cf_cv_lockfile"; then for lock in $cf_cv_lockfile; do @@ -8164,21 +9990,24 @@ if test -n "$cf_cv_lockfile"; then if test "x$used_locking" = "x"; then used_locking=`echo $cf_cv_lockfile|sed -e 's/^\([^ ]\+\).*/\1/g'` fi - echo "$ac_t""$used_locking" 1>&6 - + echo "$as_me:9993: result: $used_locking" >&5 +echo "${ECHO_T}$used_locking" >&6 + used_locking=`echo "$used_locking" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6; - echo "configure: warning: None of fcntl(), lockf(), flock() available" 1>&2 + echo "$as_me:10003: result: none" >&5 +echo "${ECHO_T}none" >&6; + { echo "$as_me:10005: WARNING: None of fcntl(), lockf(), flock() available" >&5 +echo "$as_me: WARNING: None of fcntl(), lockf(), flock() available" >&2;} fi -echo $ac_n "checking for screen type""... $ac_c" 1>&6 -echo "configure:8182: checking for screen type" >&5 +echo "$as_me:10009: checking for screen type" >&5 +echo $ECHO_N "checking for screen type... $ECHO_C" >&6 # Check whether --with-screen or --without-screen was given. if test "${with_screen+set}" = set; then @@ -8186,17 +10015,15 @@ if test "${with_screen+set}" = set; then cf_with_screen=$withval else cf_with_screen=none -fi - -echo "$ac_t""$cf_with_screen" 1>&6 +fi; +echo "$as_me:10019: result: $cf_with_screen" >&5 +echo "${ECHO_T}$cf_with_screen" >&6 use_curses=no use_ncurses=no - - -echo $ac_n "checking for specific curses-directory""... $ac_c" 1>&6 -echo "configure:8200: checking for specific curses-directory" >&5 +echo "$as_me:10025: checking for specific curses-directory" >&5 +echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6 # Check whether --with-curses-dir or --without-curses-dir was given. if test "${with_curses_dir+set}" = set; then @@ -8204,13 +10031,13 @@ if test "${with_curses_dir+set}" = set; cf_cv_curses_dir=$withval else cf_cv_curses_dir=no -fi - -echo "$ac_t""$cf_cv_curses_dir" 1>&6 +fi; +echo "$as_me:10035: result: $cf_cv_curses_dir" >&5 +echo "${ECHO_T}$cf_cv_curses_dir" >&6 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) then - + if test "x$prefix" != xNONE; then cf_path_syntax="$prefix" else @@ -8236,13 +10063,15 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } + { { echo "$as_me:10066: error: expected a pathname, not \"$withval\"" >&5 +echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } ;; esac if test -d "$cf_cv_curses_dir" then - + if test -n "$cf_cv_curses_dir/include" ; then for cf_add_incdir in $cf_cv_curses_dir/include do @@ -8265,24 +10094,41 @@ if test -n "$cf_cv_curses_dir/include" ; if test "$GCC" = yes then cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 10102 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ printf("Hello") -; return 0; } -EOF -if { (eval echo configure:8278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10114: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10117: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10120: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10123: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_have_incdir=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -8291,8 +10137,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:8295: testing adding $cf_add_incdir to include-path ..." 1>&5 - +echo "${as_me:-configure}:10140: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8309,7 +10154,6 @@ echo "${as_me:-configure}:8295: testing done fi - if test -n "$cf_cv_curses_dir/lib" ; then for cf_add_libdir in $cf_cv_curses_dir/lib do @@ -8329,8 +10173,7 @@ if test -n "$cf_cv_curses_dir/lib" ; the if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:8333: testing adding $cf_add_libdir to library-path ..." 1>&5 - +echo "${as_me:-configure}:10176: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -8341,7 +10184,6 @@ fi fi fi - case $cf_with_screen in #(vi termcap|terminfo) #(we will determine which it really is ;; @@ -8360,51 +10202,51 @@ pdcurses) #(vi use_curses=yes ;; none) - echo $ac_n "checking if you want to use ncurses library""... $ac_c" 1>&6 -echo "configure:8365: checking if you want to use ncurses library" >&5 - + echo "$as_me:10205: checking if you want to use ncurses library" >&5 +echo $ECHO_N "checking if you want to use ncurses library... $ECHO_C" >&6 + # Check whether --with-ncurses or --without-ncurses was given. if test "${with_ncurses+set}" = set; then withval="$with_ncurses" use_ncurses=$withval else use_ncurses=no -fi +fi; + echo "$as_me:10215: result: $use_ncurses" >&5 +echo "${ECHO_T}$use_ncurses" >&6 - echo "$ac_t""$use_ncurses" 1>&6 + echo "$as_me:10218: checking if you want curses rather than termcap interface" >&5 +echo $ECHO_N "checking if you want curses rather than termcap interface... $ECHO_C" >&6 - echo $ac_n "checking if you want curses rather than termcap interface""... $ac_c" 1>&6 -echo "configure:8378: 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 enableval="$enable_curses" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - cf_with_screen=curses; use_curses=$withval + cf_with_screen=curses; use_curses=$withval else cf_with_screen=termcap; use_curses=no fi else - enableval=no + enableval=no cf_with_screen=termcap; use_curses=no -fi - - echo "$ac_t""$enableval" 1>&6 +fi; + echo "$as_me:10235: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 ;; esac if test $use_curses != no ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define USE_CURSES 1 EOF case $cf_with_screen in #(vi ncurses) #(vi - -echo $ac_n "checking if you want to use pkg-config""... $ac_c" 1>&6 -echo "configure:8408: checking if you want to use pkg-config" >&5 + +echo "$as_me:10248: checking if you want to use pkg-config" >&5 +echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 # Check whether --with-pkg-config or --without-pkg-config was given. if test "${with_pkg_config+set}" = set; then @@ -8412,50 +10254,98 @@ if test "${with_pkg_config+set}" = set; cf_pkg_config=$withval else cf_pkg_config=yes -fi - -echo "$ac_t""$cf_pkg_config" 1>&6 +fi; +echo "$as_me:10258: result: $cf_pkg_config" >&5 +echo "${ECHO_T}$cf_pkg_config" >&6 case $cf_pkg_config in (no) PKG_CONFIG=none ;; (yes) - -# Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8429: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +echo "$as_me:10270: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$PKG_CONFIG" in - /*) + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="none" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" + echo "$as_me:10287: found $ac_dir/$ac_word" >&5 + break +fi +done + ;; esac fi -PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - echo "$ac_t""$PKG_CONFIG" 1>&6 + echo "$as_me:10298: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 +else + echo "$as_me:10301: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo "$as_me:10310: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" + echo "$as_me:10327: found $ac_dir/$ac_word" >&5 + break +fi +done + + test -z "$ac_cv_path_ac_pt_PKG_CONFIG" && ac_cv_path_ac_pt_PKG_CONFIG="none" + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + +if test -n "$ac_pt_PKG_CONFIG"; then + echo "$as_me:10339: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 +else + echo "$as_me:10342: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + PKG_CONFIG=$ac_pt_PKG_CONFIG else - echo "$ac_t""no" 1>&6 + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" fi ;; @@ -8466,7 +10356,7 @@ esac test -z "$PKG_CONFIG" && PKG_CONFIG=none if test "$PKG_CONFIG" != none ; then - + if test "x$prefix" != xNONE; then cf_path_syntax="$prefix" else @@ -8492,36 +10382,132 @@ case ".$PKG_CONFIG" in PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { echo "configure: error: expected a pathname, not \"$PKG_CONFIG\"" 1>&2; exit 1; } + { { echo "$as_me:10385: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 +echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} + { (exit 1); exit 1; }; } ;; esac elif test "x$cf_pkg_config" != xno ; then - echo "configure: warning: pkg-config is not installed" 1>&2 + { echo "$as_me:10392: WARNING: pkg-config is not installed" >&5 +echo "$as_me: WARNING: pkg-config is not installed" >&2;} fi - - - - cf_ncuconfig_root=ncurses cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo $ac_n "checking pkg-config for $cf_ncuconfig_root""... $ac_c" 1>&6 -echo "configure:8513: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:10400: checking pkg-config for $cf_ncuconfig_root" >&5 +echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$ac_t""yes" 1>&6 + echo "$as_me:10403: result: yes" >&5 +echo "${ECHO_T}yes" >&6 - echo $ac_n "checking if the $cf_ncuconfig_root package files work""... $ac_c" 1>&6 -echo "configure:8518: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:10406: checking if the $cf_ncuconfig_root package files work" >&5 +echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 cf_have_ncuconfig=unknown cf_save_CPPFLAGS="$CPPFLAGS" cf_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags $cf_ncuconfig_root`" - +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in `$PKG_CONFIG --cflags $cf_ncuconfig_root` +do +case $cf_fix_cppflags in +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case $cf_add_cflags in + (-D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case $cf_add_cflags in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi + cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -8538,47 +10524,68 @@ do done LIBS="$cf_add_libs" - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 10528 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> -int main() { +int +main (void) +{ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); -; return 0; } -EOF -if { (eval echo configure:8551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:10540: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10543: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:10546: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10549: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 10555 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { char *xx = curses_version(); return (xx == 0); } -EOF -if { (eval echo configure:8563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:10562: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10565: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:10567: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10570: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_have_ncuconfig=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - cf_have_ncuconfig=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_ncuconfig=no fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - cf_have_ncuconfig=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_ncuconfig=no fi -rm -rf conftest* - echo "$ac_t""$cf_have_ncuconfig" 1>&6 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + echo "$as_me:10587: result: $cf_have_ncuconfig" >&5 +echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" then @@ -8586,19 +10593,19 @@ rm -rf conftest* LIBS="$cf_save_LIBS" NCURSES_CONFIG_PKG=none else - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define NCURSES 1 EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root - fi - -echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 -echo "configure:8598: checking for terminfo header" >&5 -if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +echo "$as_me:10603: checking for terminfo header" >&5 +echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 +if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + case ${cf_cv_ncurses_header} in (*/ncurses.h|*/ncursesw.h) cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` @@ -8610,42 +10617,56 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 10621 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> #include <$cf_test> -int main() { +int +main (void) +{ int x = auto_left_margin -; return 0; } -EOF -if { (eval echo configure:8625: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10636: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10639: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10642: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10645: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_term_header="$cf_test" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + cf_cv_term_header=unknown - + fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext test "$cf_cv_term_header" != unknown && break done fi - -echo "$ac_t""$cf_cv_term_header" 1>&6 +echo "$as_me:10661: result: $cf_cv_term_header" >&5 +echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories case $cf_cv_term_header in (*term.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_TERM_H 1 EOF @@ -8654,22 +10675,26 @@ esac case $cf_cv_term_header in (ncurses/term.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_NCURSES_TERM_H 1 EOF ;; (ncursesw/term.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_NCURSESW_TERM_H 1 EOF ;; esac + fi else - echo "$ac_t""no" 1>&6 + echo "$as_me:10696: result: no" >&5 +echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi else @@ -8677,55 +10702,189 @@ else fi if test "x$cf_have_ncuconfig" = "xno"; then - echo "Looking for ${cf_ncuconfig_root}-config" + cf_ncurses_config="${cf_ncuconfig_root}${NCURSES_CONFIG_SUFFIX}-config"; echo "Looking for ${cf_ncurses_config}" + +if test -n "$ac_tool_prefix"; then + for ac_prog in ${cf_ncurses_config} ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +echo "$as_me:10712: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$NCURSES_CONFIG"; then + ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" +echo "$as_me:10727: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG +if test -n "$NCURSES_CONFIG"; then + echo "$as_me:10735: result: $NCURSES_CONFIG" >&5 +echo "${ECHO_T}$NCURSES_CONFIG" >&6 +else + echo "$as_me:10738: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi - -for ac_prog in ${cf_ncuconfig_root}-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + test -n "$NCURSES_CONFIG" && break + done +fi +if test -z "$NCURSES_CONFIG"; then + ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG + for ac_prog in ${cf_ncurses_config} ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config do -# Extract the first word of "$ac_prog", so it can be a program name with args. + # 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:8689: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_NCURSES_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$NCURSES_CONFIG" in - /*) - ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac +echo "$as_me:10751: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_NCURSES_CONFIG"; then + ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" +echo "$as_me:10766: found $ac_dir/$ac_word" >&5 +break +done + fi -NCURSES_CONFIG="$ac_cv_path_NCURSES_CONFIG" -if test -n "$NCURSES_CONFIG"; then - echo "$ac_t""$NCURSES_CONFIG" 1>&6 +fi +ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG +if test -n "$ac_ct_NCURSES_CONFIG"; then + echo "$as_me:10774: result: $ac_ct_NCURSES_CONFIG" >&5 +echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:10777: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -test -n "$NCURSES_CONFIG" && break + test -n "$ac_ct_NCURSES_CONFIG" && break done -test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none" +test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" + NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG +fi if test "$NCURSES_CONFIG" != none ; then - CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" - +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in `$NCURSES_CONFIG --cflags` +do +case $cf_fix_cppflags in +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case $cf_add_cflags in + (-D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case $cf_add_cflags in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi + cf_add_libs="`$NCURSES_CONFIG --libs`" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -8742,113 +10901,130 @@ do done LIBS="$cf_add_libs" - # even with config script, some packages use no-override for curses.h - -echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6 -echo "configure:8750: 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 + +echo "$as_me:10906: checking if we have identified curses headers" >&5 +echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 +if test "${cf_cv_ncurses_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_cv_ncurses_header=none for cf_header in \ ncurses.h ncurses/ncurses.h \ - curses.h ncurses/curses.h + curses.h ncurses/curses.h do -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 10918 "configure" #include "confdefs.h" #include <${cf_header}> -int main() { +int +main (void) +{ initscr(); tgoto("?", 0,0) -; return 0; } -EOF -if { (eval echo configure:8768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10930: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10933: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10936: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10939: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext done fi - -echo "$ac_t""$cf_cv_ncurses_header" 1>&6 +echo "$as_me:10950: result: $cf_cv_ncurses_header" >&5 +echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { echo "configure: error: No curses header-files found" 1>&2; exit 1; } + { { echo "$as_me:10954: error: No curses header-files found" >&5 +echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } fi # cheat, to get the right #define's for HAVE_NCURSES_H, etc. -for ac_hdr in $cf_cv_ncurses_header + +for ac_header 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:8791: 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 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:10964: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 10970 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:10974: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:10980: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8801: \"$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" + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done - - - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define NCURSES 1 EOF - - cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h < conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 11055 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ printf("Hello") -; return 0; } -EOF -if { (eval echo configure:8884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11067: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11070: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11073: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11076: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_have_incdir=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -8897,8 +11090,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:8901: testing adding $cf_add_incdir to include-path ..." 1>&5 - +echo "${as_me:-configure}:11093: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8917,24 +11109,25 @@ fi } -echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 -echo "configure:8922: 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 +echo "$as_me:11112: checking for $cf_ncuhdr_root header in include-path" >&5 +echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 +if test "${cf_cv_ncurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h" ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h" for cf_header in $cf_header_list do - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 11124 "configure" +#include "confdefs.h" #include <$cf_header> -int main() { +int +main (void) +{ #ifdef NCURSES_VERSION @@ -8946,43 +11139,51 @@ printf("old\n"); make an error #endif #endif - - -; return 0; } -EOF -if { (eval echo configure:8954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11148: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11151: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11154: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11157: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_ncurses_h=$cf_header - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_ncurses_h=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_ncurses_h=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext test "$cf_cv_ncurses_h" != no && break done fi - -echo "$ac_t""$cf_cv_ncurses_h" 1>&6 - - +echo "$as_me:11172: result: $cf_cv_ncurses_h" >&5 +echo "${ECHO_T}$cf_cv_ncurses_h" >&6 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:8980: 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 +echo "$as_me:11179: checking for $cf_ncuhdr_root include-path" >&5 +echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 +if test "${cf_cv_ncurses_h2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + test -n "$verbose" && echo - + cf_search= # collect the current set of include-directories from compiler flags @@ -8993,7 +11194,7 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then case $cf_header_path in (-I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` - + test "x$cf_header_path" != "xNONE" && \ test -d "$cf_header_path" && \ { @@ -9015,7 +11216,6 @@ fi cf_search= - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -9027,7 +11227,6 @@ test -d "$prefix" && \ test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" } - for cf_subdir_prefix in \ /usr \ /usr/local \ @@ -9036,7 +11235,7 @@ for cf_subdir_prefix in \ /opt/local \ $HOME do - + test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ (test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { @@ -9050,7 +11249,6 @@ test -d "$cf_subdir_prefix" && \ done - test "$includedir" != NONE && \ test "$includedir" != "/usr/include" && \ test -d "$includedir" && { @@ -9071,7 +11269,7 @@ cf_search="$cf_search $cf_header_path_li cf_save2_CPPFLAGS="$CPPFLAGS" for cf_incdir in $cf_search do - + if test -n "$cf_incdir" ; then for cf_add_incdir in $cf_incdir do @@ -9094,24 +11292,41 @@ if test -n "$cf_incdir" ; then if test "$GCC" = yes then cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 11300 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ printf("Hello") -; return 0; } -EOF -if { (eval echo configure:9107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11312: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11315: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11318: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11321: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_have_incdir=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -9120,8 +11335,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:9124: testing adding $cf_add_incdir to include-path ..." 1>&5 - +echo "${as_me:-configure}:11338: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9142,14 +11356,15 @@ fi ncurses.h \ curses.h do - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 11361 "configure" +#include "confdefs.h" #include <$cf_header> -int main() { +int +main (void) +{ #ifdef NCURSES_VERSION @@ -9161,21 +11376,31 @@ printf("old\n"); make an error #endif #endif - - -; return 0; } -EOF -if { (eval echo configure:9169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11385: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11388: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11391: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11394: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_ncurses_h2=$cf_header - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_ncurses_h2=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_ncurses_h2=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_cv_ncurses_h2" != no ; then cf_cv_ncurses_h2=$cf_incdir/$cf_header @@ -9187,18 +11412,20 @@ rm -f conftest* CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { echo "configure: error: not found" 1>&2; exit 1; } - -fi + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11415: error: not found" >&5 +echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } -echo "$ac_t""$cf_cv_ncurses_h2" 1>&6 +fi +echo "$as_me:11420: result: $cf_cv_ncurses_h2" >&5 +echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2` if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header fi - + if test -n "$cf_1st_incdir" ; then for cf_add_incdir in $cf_1st_incdir do @@ -9221,24 +11448,41 @@ if test -n "$cf_1st_incdir" ; then if test "$GCC" = yes then cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 11456 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ printf("Hello") -; return 0; } -EOF -if { (eval echo configure:9234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11468: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11471: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11474: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11477: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_have_incdir=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -9247,8 +11491,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:9251: testing adding $cf_add_incdir to include-path ..." 1>&5 - +echo "${as_me:-configure}:11494: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9265,14 +11508,14 @@ echo "${as_me:-configure}:9251: testing done fi - fi # Set definitions to allow ifdef'ing for ncurses.h case $cf_cv_ncurses_header in (*ncurses.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_NCURSES_H 1 EOF @@ -9281,27 +11524,27 @@ esac case $cf_cv_ncurses_header in (ncurses/curses.h|ncurses/ncurses.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_NCURSES_NCURSES_H 1 EOF ;; (ncursesw/curses.h|ncursesw/ncurses.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_NCURSESW_NCURSES_H 1 EOF ;; esac - - -echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 -echo "configure:9301: checking for terminfo header" >&5 -if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:11542: checking for terminfo header" >&5 +echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 +if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + case ${cf_cv_ncurses_header} in (*/ncurses.h|*/ncursesw.h) cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` @@ -9313,42 +11556,56 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 11560 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> #include <$cf_test> -int main() { +int +main (void) +{ int x = auto_left_margin -; return 0; } -EOF -if { (eval echo configure:9328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11575: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11578: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11581: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11584: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_term_header="$cf_test" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + cf_cv_term_header=unknown - + fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext test "$cf_cv_term_header" != unknown && break done fi - -echo "$ac_t""$cf_cv_term_header" 1>&6 +echo "$as_me:11600: result: $cf_cv_term_header" >&5 +echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories case $cf_cv_term_header in (*term.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_TERM_H 1 EOF @@ -9357,38 +11614,37 @@ esac case $cf_cv_term_header in (ncurses/term.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_NCURSES_TERM_H 1 EOF ;; (ncursesw/term.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_NCURSESW_TERM_H 1 EOF ;; esac - # some applications need this, but should check for NCURSES_VERSION -cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define NCURSES 1 EOF - - -echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:9383: checking for ncurses version" >&5 -if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:11638: checking for ncurses version" >&5 +echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 +if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_cv_ncurses_version=no cf_tempfile=out$$ rm -f $cf_tempfile if test "$cross_compiling" = yes; then - # This will not work if the preprocessor splits the line after the # Autoconf token. The 'unproto' program does that. @@ -9405,7 +11661,11 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:9409: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo "$as_me:11664: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? + echo "$as_me:11667: \$? = $ac_status" >&5 + (exit $ac_status); } 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" @@ -9413,8 +11673,8 @@ EOF fi else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 11677 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -9437,168 +11697,212 @@ int main(void) #endif ${cf_cv_main_return:-return}(0); } -EOF -if { (eval echo configure:9442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:11702: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:11705: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:11707: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11710: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_version=`cat $cf_tempfile` else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - rm -f $cf_tempfile fi - -echo "$ac_t""$cf_cv_ncurses_version" 1>&6 -test "$cf_cv_ncurses_version" = no || cat >> confdefs.h <<\EOF +echo "$as_me:11724: result: $cf_cv_ncurses_version" >&5 +echo "${ECHO_T}$cf_cv_ncurses_version" >&6 +test "$cf_cv_ncurses_version" = no || +cat >>confdefs.h <<\EOF #define NCURSES 1 EOF - - - - cf_nculib_root=ncurses # This works, except for the special case where we find gpm, but # ncurses is in a nonstandard location via $LIBS, and we really want # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:9473: 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 +echo "$as_me:11737: checking for Gpm_Open in -lgpm" >&5 +echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 +if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 11745 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char Gpm_Open(); - -int main() { -Gpm_Open() -; return 0; } -EOF -if { (eval echo configure:9492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -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:9508: 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 + builtin and then its argument prototype would still apply. */ +char Gpm_Open (); +int +main (void) +{ +Gpm_Open (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:11764: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:11767: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:11770: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11773: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_gpm_Gpm_Open=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:11784: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 +if test $ac_cv_lib_gpm_Gpm_Open = yes; then + echo "$as_me:11787: checking for initscr in -lgpm" >&5 +echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 +if test "${ac_cv_lib_gpm_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 11795 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char initscr(); - -int main() { -initscr() -; return 0; } -EOF -if { (eval echo configure:9527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char initscr (); +int +main (void) +{ +initscr (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:11814: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:11817: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:11820: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11823: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_initscr=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_gpm_initscr=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:11834: result: $ac_cv_lib_gpm_initscr" >&5 +echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 +if test $ac_cv_lib_gpm_initscr = yes; then LIBS="$cf_ncurses_SAVE" else - echo "$ac_t""no" 1>&6 -cf_ncurses_LIBS="-lgpm" + cf_ncurses_LIBS="-lgpm" fi -else - echo "$ac_t""no" 1>&6 fi - case $host_os in (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). if test "$cf_nculib_root" = ncurses ; then - echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:9559: 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 + echo "$as_me:11849: checking for tgoto in -lmytinfo" >&5 +echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 +if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 11857 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char tgoto(); - -int main() { -tgoto() -; return 0; } -EOF -if { (eval echo configure:9578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char tgoto (); +int +main (void) +{ +tgoto (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:11876: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:11879: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:11882: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11885: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mytinfo_tgoto=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_mytinfo_tgoto=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:11896: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 +if test $ac_cv_lib_mytinfo_tgoto = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" -else - echo "$ac_t""no" 1>&6 fi fi ;; esac - cf_add_libs="$cf_ncurses_LIBS" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -9615,10 +11919,9 @@ do done LIBS="$cf_add_libs" - if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) then - + cf_add_libs="-l$cf_nculib_root" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -9636,79 +11939,109 @@ done LIBS="$cf_add_libs" else - + eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" - echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:9644: 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 < -/* Override any gcc2 internal prototype to avoid an error. */ + echo "$as_me:11945: checking for initscr" >&5 +echo $ECHO_N "checking for initscr... $ECHO_C" >&6 +if test "${ac_cv_func_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 11951 "configure" +#include "confdefs.h" +#define initscr autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef initscr + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char initscr(); + builtin and then its argument prototype would still apply. */ +char initscr (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_initscr) || defined (__stub___initscr) -choke me -#else -initscr(); +#error found stub for initscr #endif -; return 0; } -EOF -if { (eval echo configure:9672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_initscr=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_initscr=no" -fi -rm -rf conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'initscr`\" = yes"; then - echo "$ac_t""yes" 1>&6 + return initscr (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:11982: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:11985: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:11988: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11991: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_initscr=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_initscr=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:12001: result: $ac_cv_func_initscr" >&5 +echo "${ECHO_T}$ac_cv_func_initscr" >&6 +if test $ac_cv_func_initscr = yes; then eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else - echo "$ac_t""no" 1>&6 cf_save_LIBS="$LIBS" - echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:9692: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:12008: checking for initscr in -l$cf_nculib_root" >&5 +echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 12012 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> -int main() { +int +main (void) +{ initscr() -; return 0; } -EOF -if { (eval echo configure:9702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:12024: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:12027: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:12030: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12033: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:12035: result: yes" >&5 +echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +echo "$as_me:12042: result: no" >&5 +echo "${ECHO_T}no" >&6 - echo "$ac_t""no" 1>&6 - cf_search= cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then @@ -9717,7 +12050,7 @@ if test -n "${LDFLAGS}${LIBS}" ; then case $cf_library_path in (-L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` - + test "x$cf_library_path" != "xNONE" && \ test -d "$cf_library_path" && \ { @@ -9735,10 +12068,8 @@ test -d "$cf_library_path" && \ done fi - cf_search= - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -9750,7 +12081,6 @@ test -d "$prefix" && \ test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root" } - for cf_subdir_prefix in \ /usr \ /usr/local \ @@ -9759,7 +12089,7 @@ for cf_subdir_prefix in \ /opt/local \ $HOME do - + test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ (test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { @@ -9773,54 +12103,69 @@ test -d "$cf_subdir_prefix" && \ done - cf_search="$cf_library_path_list $cf_search" 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:9783: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:12110: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 12114 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> -int main() { +int +main (void) +{ initscr() -; return 0; } -EOF -if { (eval echo configure:9793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:12126: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:12129: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:12132: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12135: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:12137: result: yes" >&5 +echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - echo "$ac_t""no" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +echo "$as_me:12144: result: no" >&5 +echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done - + fi -rm -rf conftest* - +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root if test $cf_found_library = no ; then - { echo "configure: error: Cannot link $cf_nculib_root library" 1>&2; exit 1; } + { { echo "$as_me:12159: error: Cannot link $cf_nculib_root library" >&5 +echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } fi - 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:9824: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:12167: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` @@ -9828,36 +12173,48 @@ echo "configure:9824: checking if we can LIBS="$q" fi done - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 12177 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> -int main() { +int +main (void) +{ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); -; return 0; } -EOF -if { (eval echo configure:9840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - echo "$ac_t""yes" 1>&6 -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - echo "$ac_t""no" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:12189: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:12192: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:12195: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12198: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:12200: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +echo "$as_me:12205: result: no" >&5 +echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -cat >> confdefs.h <>confdefs.h <&6 -echo "configure:9873: checking for $cf_hdr" >&5 - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for $cf_hdr... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 12231 "configure" #include "confdefs.h" #include #include <$cf_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9883: \"$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* +_ACEOF +if { (eval echo "$as_me:12238: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:12244: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then cf_found=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* cf_found=no fi -rm -f conftest* -echo "$ac_t""$cf_found" 1>&6 +rm -f conftest.err conftest.$ac_ext +echo "$as_me:12262: result: $cf_found" >&5 +echo "${ECHO_T}$cf_found" >&6 if test $cf_found = yes ; then - + cf_tr_hdr=`echo "$cf_hdr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6 -echo "configure:9910: 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 + echo "$as_me:12275: checking for wide char and multibyte support" >&5 +echo $ECHO_N "checking for wide char and multibyte support... $ECHO_C" >&6 +if test "${am_cv_multibyte_able+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 12281 "configure" #include "confdefs.h" #include #ifdef HAVE_STDLIB_H @@ -9924,7 +12291,9 @@ else # include #endif /* HAVE_WCTYPE_H */ -int main() { +int +main (void) +{ const char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0x00}; char ocb[5]; wchar_t wcb[5]; @@ -9963,22 +12332,35 @@ const char icb[5] = {0xa4, 0xa4, 0xa4, 0 mbstowcs(format, "%s", 2); swprintf(wcb, 5, format, "test"); wcsncat(wcb2, wcb, 5); -; return 0; } -EOF -if { (eval echo configure:9969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:12340: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:12343: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:12346: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12349: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then am_cv_multibyte_able=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - cf_save_LIBS="$LIBS" + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_save_LIBS="$LIBS" LIBS="-lutf8 $LIBS" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 12358 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ const char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0x00}; char ocb[5]; wchar_t wcb[5]; @@ -10017,60 +12399,167 @@ const char icb[5] = {0xa4, 0xa4, 0xa4, 0 mbstowcs(format, "%s", 2); swprintf(wcb, 5, format, "test"); wcsncat(wcb2, wcb, 5); -; return 0; } -EOF -if { (eval echo configure:10023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:12407: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:12410: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:12413: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12416: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then am_cv_multibyte_able=libutf8 else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - am_cv_multibyte_able=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +am_cv_multibyte_able=no fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - + fi -rm -rf conftest* - +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +echo "$as_me:12431: result: $am_cv_multibyte_able" >&5 +echo "${ECHO_T}$am_cv_multibyte_able" >&6 + if test "$am_cv_multibyte_able" != no; then + if test "$am_cv_multibyte_able" = libutf8; then + cat >>confdefs.h <<\EOF +#define HAVE_LIBUTF8_H 1 +EOF + + LIBS="-lutf8 $LIBS" + fi + +cat >>confdefs.h <<\EOF +#define MULTIBYTE_ABLE 1 +EOF + + fi + +cf_ncuconfig_root=ncursesw +cf_have_ncuconfig=no + +if test "x${PKG_CONFIG:=none}" != xnone; then + echo "$as_me:12452: checking pkg-config for $cf_ncuconfig_root" >&5 +echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 + if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then + echo "$as_me:12455: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + + echo "$as_me:12458: checking if the $cf_ncuconfig_root package files work" >&5 +echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 + cf_have_ncuconfig=unknown + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_save_LIBS="$LIBS" + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in `$PKG_CONFIG --cflags $cf_ncuconfig_root` +do +case $cf_fix_cppflags in +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case $cf_add_cflags in + (-D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case $cf_add_cflags in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done -echo "$ac_t""$am_cv_multibyte_able" 1>&6 - if test "$am_cv_multibyte_able" != no; then - if test "$am_cv_multibyte_able" = libutf8; then - cat >> confdefs.h <<\EOF -#define HAVE_LIBUTF8_H 1 -EOF +if test -n "$cf_new_cflags" ; then - LIBS="-lutf8 $LIBS" - fi - cat >> confdefs.h <<\EOF -#define MULTIBYTE_ABLE 1 -EOF + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" - fi +fi - +if test -n "$cf_new_cppflags" ; then -cf_ncuconfig_root=ncursesw -cf_have_ncuconfig=no + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" -if test "x${PKG_CONFIG:=none}" != xnone; then - echo $ac_n "checking pkg-config for $cf_ncuconfig_root""... $ac_c" 1>&6 -echo "configure:10062: checking pkg-config for $cf_ncuconfig_root" >&5 - if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$ac_t""yes" 1>&6 +fi - echo $ac_n "checking if the $cf_ncuconfig_root package files work""... $ac_c" 1>&6 -echo "configure:10067: checking if the $cf_ncuconfig_root package files work" >&5 - cf_have_ncuconfig=unknown +if test -n "$cf_new_extra_cppflags" ; then - cf_save_CPPFLAGS="$CPPFLAGS" - cf_save_LIBS="$LIBS" + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi - CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags $cf_ncuconfig_root`" - cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -10087,47 +12576,68 @@ do done LIBS="$cf_add_libs" - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 12580 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> -int main() { +int +main (void) +{ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); -; return 0; } -EOF -if { (eval echo configure:10100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:12592: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:12595: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:12598: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12601: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 12607 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { char *xx = curses_version(); return (xx == 0); } -EOF -if { (eval echo configure:10112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:12614: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:12617: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:12619: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12622: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_have_ncuconfig=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - cf_have_ncuconfig=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_ncuconfig=no fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - cf_have_ncuconfig=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_ncuconfig=no fi -rm -rf conftest* - echo "$ac_t""$cf_have_ncuconfig" 1>&6 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + echo "$as_me:12639: result: $cf_have_ncuconfig" >&5 +echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" then @@ -10135,19 +12645,19 @@ rm -rf conftest* LIBS="$cf_save_LIBS" NCURSES_CONFIG_PKG=none else - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define NCURSES 1 EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root - fi - -echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 -echo "configure:10147: checking for terminfo header" >&5 -if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +echo "$as_me:12655: checking for terminfo header" >&5 +echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 +if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + case ${cf_cv_ncurses_header} in (*/ncurses.h|*/ncursesw.h) cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` @@ -10159,42 +12669,56 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 12673 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> #include <$cf_test> -int main() { +int +main (void) +{ int x = auto_left_margin -; return 0; } -EOF -if { (eval echo configure:10174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:12688: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:12691: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:12694: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12697: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_term_header="$cf_test" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + cf_cv_term_header=unknown - + fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext test "$cf_cv_term_header" != unknown && break done fi - -echo "$ac_t""$cf_cv_term_header" 1>&6 +echo "$as_me:12713: result: $cf_cv_term_header" >&5 +echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories case $cf_cv_term_header in (*term.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_TERM_H 1 EOF @@ -10203,22 +12727,26 @@ esac case $cf_cv_term_header in (ncurses/term.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_NCURSES_TERM_H 1 EOF ;; (ncursesw/term.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_NCURSESW_TERM_H 1 EOF ;; esac + fi else - echo "$ac_t""no" 1>&6 + echo "$as_me:12748: result: no" >&5 +echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi else @@ -10226,55 +12754,189 @@ else fi if test "x$cf_have_ncuconfig" = "xno"; then - echo "Looking for ${cf_ncuconfig_root}-config" + cf_ncurses_config="${cf_ncuconfig_root}${NCURSES_CONFIG_SUFFIX}-config"; echo "Looking for ${cf_ncurses_config}" + +if test -n "$ac_tool_prefix"; then + for ac_prog in ${cf_ncurses_config} ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +echo "$as_me:12764: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$NCURSES_CONFIG"; then + ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" +echo "$as_me:12779: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG +if test -n "$NCURSES_CONFIG"; then + echo "$as_me:12787: result: $NCURSES_CONFIG" >&5 +echo "${ECHO_T}$NCURSES_CONFIG" >&6 +else + echo "$as_me:12790: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi - -for ac_prog in ${cf_ncuconfig_root}-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + test -n "$NCURSES_CONFIG" && break + done +fi +if test -z "$NCURSES_CONFIG"; then + ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG + for ac_prog in ${cf_ncurses_config} ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config do -# Extract the first word of "$ac_prog", so it can be a program name with args. + # 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:10238: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_NCURSES_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$NCURSES_CONFIG" in - /*) - ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac +echo "$as_me:12803: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_NCURSES_CONFIG"; then + ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" +echo "$as_me:12818: found $ac_dir/$ac_word" >&5 +break +done + fi -NCURSES_CONFIG="$ac_cv_path_NCURSES_CONFIG" -if test -n "$NCURSES_CONFIG"; then - echo "$ac_t""$NCURSES_CONFIG" 1>&6 +fi +ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG +if test -n "$ac_ct_NCURSES_CONFIG"; then + echo "$as_me:12826: result: $ac_ct_NCURSES_CONFIG" >&5 +echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:12829: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -test -n "$NCURSES_CONFIG" && break + test -n "$ac_ct_NCURSES_CONFIG" && break done -test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none" +test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" + NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG +fi if test "$NCURSES_CONFIG" != none ; then - CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" - +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in `$NCURSES_CONFIG --cflags` +do +case $cf_fix_cppflags in +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case $cf_add_cflags in + (-D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case $cf_add_cflags in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi + cf_add_libs="`$NCURSES_CONFIG --libs`" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -10291,113 +12953,130 @@ do done LIBS="$cf_add_libs" - # even with config script, some packages use no-override for curses.h - -echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6 -echo "configure:10299: 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 + +echo "$as_me:12958: checking if we have identified curses headers" >&5 +echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 +if test "${cf_cv_ncurses_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_cv_ncurses_header=none for cf_header in \ ncurses.h ncursesw/ncurses.h \ - curses.h ncursesw/curses.h + curses.h ncursesw/curses.h do -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 12970 "configure" #include "confdefs.h" #include <${cf_header}> -int main() { +int +main (void) +{ initscr(); tgoto("?", 0,0) -; return 0; } -EOF -if { (eval echo configure:10317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:12982: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:12985: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:12988: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12991: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext done fi - -echo "$ac_t""$cf_cv_ncurses_header" 1>&6 +echo "$as_me:13002: result: $cf_cv_ncurses_header" >&5 +echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { echo "configure: error: No curses header-files found" 1>&2; exit 1; } + { { echo "$as_me:13006: error: No curses header-files found" >&5 +echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } fi # cheat, to get the right #define's for HAVE_NCURSES_H, etc. -for ac_hdr in $cf_cv_ncurses_header + +for ac_header 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:10340: 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 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:13016: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 13022 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:13026: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:13032: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10350: \"$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" + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done - - - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define NCURSES 1 EOF - - cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h < conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 13107 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ printf("Hello") -; return 0; } -EOF -if { (eval echo configure:10433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:13119: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:13122: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:13125: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13128: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_have_incdir=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -10446,8 +13142,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:10450: testing adding $cf_add_incdir to include-path ..." 1>&5 - +echo "${as_me:-configure}:13145: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10466,28 +13161,29 @@ fi } -echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 -echo "configure:10471: 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 +echo "$as_me:13164: checking for $cf_ncuhdr_root header in include-path" >&5 +echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 +if test "${cf_cv_ncurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h" ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h" for cf_header in $cf_header_list do - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 13176 "configure" +#include "confdefs.h" #define _XOPEN_SOURCE_EXTENDED #undef HAVE_LIBUTF8_H /* in case we used CF_UTF8_LIB */ #define HAVE_LIBUTF8_H /* to force ncurses' header file to use cchar_t */ #include <$cf_header> -int main() { +int +main (void) +{ #ifdef NCURSES_VERSION @@ -10503,43 +13199,51 @@ printf("old\n"); make an error #endif #endif - - -; return 0; } -EOF -if { (eval echo configure:10511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:13208: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:13211: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:13214: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13217: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_ncurses_h=$cf_header - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_ncurses_h=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_ncurses_h=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext test "$cf_cv_ncurses_h" != no && break done fi - -echo "$ac_t""$cf_cv_ncurses_h" 1>&6 - - +echo "$as_me:13232: result: $cf_cv_ncurses_h" >&5 +echo "${ECHO_T}$cf_cv_ncurses_h" >&6 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:10537: 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 +echo "$as_me:13239: checking for $cf_ncuhdr_root include-path" >&5 +echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 +if test "${cf_cv_ncurses_h2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + test -n "$verbose" && echo - + cf_search= # collect the current set of include-directories from compiler flags @@ -10550,7 +13254,7 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then case $cf_header_path in (-I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` - + test "x$cf_header_path" != "xNONE" && \ test -d "$cf_header_path" && \ { @@ -10572,7 +13276,6 @@ fi cf_search= - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -10584,7 +13287,6 @@ test -d "$prefix" && \ test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" } - for cf_subdir_prefix in \ /usr \ /usr/local \ @@ -10593,7 +13295,7 @@ for cf_subdir_prefix in \ /opt/local \ $HOME do - + test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ (test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { @@ -10607,7 +13309,6 @@ test -d "$cf_subdir_prefix" && \ done - test "$includedir" != NONE && \ test "$includedir" != "/usr/include" && \ test -d "$includedir" && { @@ -10628,7 +13329,7 @@ cf_search="$cf_search $cf_header_path_li cf_save2_CPPFLAGS="$CPPFLAGS" for cf_incdir in $cf_search do - + if test -n "$cf_incdir" ; then for cf_add_incdir in $cf_incdir do @@ -10651,24 +13352,41 @@ if test -n "$cf_incdir" ; then if test "$GCC" = yes then cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 13360 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ printf("Hello") -; return 0; } -EOF -if { (eval echo configure:10664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:13372: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:13375: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:13378: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13381: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_have_incdir=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -10677,8 +13395,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:10681: testing adding $cf_add_incdir to include-path ..." 1>&5 - +echo "${as_me:-configure}:13398: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10699,14 +13416,15 @@ fi ncurses.h \ curses.h do - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 13421 "configure" +#include "confdefs.h" #include <$cf_header> -int main() { +int +main (void) +{ #ifdef NCURSES_VERSION @@ -10718,21 +13436,31 @@ printf("old\n"); make an error #endif #endif - - -; return 0; } -EOF -if { (eval echo configure:10726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:13445: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:13448: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:13451: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13454: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_ncurses_h2=$cf_header - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_ncurses_h2=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_ncurses_h2=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_cv_ncurses_h2" != no ; then cf_cv_ncurses_h2=$cf_incdir/$cf_header @@ -10744,18 +13472,20 @@ rm -f conftest* CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { echo "configure: error: not found" 1>&2; exit 1; } - -fi + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:13475: error: not found" >&5 +echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } -echo "$ac_t""$cf_cv_ncurses_h2" 1>&6 +fi +echo "$as_me:13480: result: $cf_cv_ncurses_h2" >&5 +echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2` if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header fi - + if test -n "$cf_1st_incdir" ; then for cf_add_incdir in $cf_1st_incdir do @@ -10778,24 +13508,41 @@ if test -n "$cf_1st_incdir" ; then if test "$GCC" = yes then cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 13516 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ printf("Hello") -; return 0; } -EOF -if { (eval echo configure:10791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:13528: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:13531: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:13534: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13537: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_have_incdir=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -10804,8 +13551,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:10808: testing adding $cf_add_incdir to include-path ..." 1>&5 - +echo "${as_me:-configure}:13554: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10822,14 +13568,14 @@ echo "${as_me:-configure}:10808: testing done fi - fi # Set definitions to allow ifdef'ing for ncurses.h case $cf_cv_ncurses_header in (*ncurses.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_NCURSES_H 1 EOF @@ -10838,27 +13584,27 @@ esac case $cf_cv_ncurses_header in (ncurses/curses.h|ncurses/ncurses.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_NCURSES_NCURSES_H 1 EOF ;; (ncursesw/curses.h|ncursesw/ncurses.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_NCURSESW_NCURSES_H 1 EOF ;; esac - - -echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 -echo "configure:10858: checking for terminfo header" >&5 -if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:13602: checking for terminfo header" >&5 +echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 +if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + case ${cf_cv_ncurses_header} in (*/ncurses.h|*/ncursesw.h) cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` @@ -10870,42 +13616,56 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 13620 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> #include <$cf_test> -int main() { +int +main (void) +{ int x = auto_left_margin -; return 0; } -EOF -if { (eval echo configure:10885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:13635: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:13638: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:13641: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13644: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_term_header="$cf_test" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + cf_cv_term_header=unknown - + fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext test "$cf_cv_term_header" != unknown && break done fi - -echo "$ac_t""$cf_cv_term_header" 1>&6 +echo "$as_me:13660: result: $cf_cv_term_header" >&5 +echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories case $cf_cv_term_header in (*term.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_TERM_H 1 EOF @@ -10914,38 +13674,37 @@ esac case $cf_cv_term_header in (ncurses/term.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_NCURSES_TERM_H 1 EOF ;; (ncursesw/term.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_NCURSESW_TERM_H 1 EOF ;; esac - # some applications need this, but should check for NCURSES_VERSION -cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define NCURSES 1 EOF - - -echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:10940: checking for ncurses version" >&5 -if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:13698: checking for ncurses version" >&5 +echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 +if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_cv_ncurses_version=no cf_tempfile=out$$ rm -f $cf_tempfile if test "$cross_compiling" = yes; then - # This will not work if the preprocessor splits the line after the # Autoconf token. The 'unproto' program does that. @@ -10962,7 +13721,11 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:10966: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo "$as_me:13724: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? + echo "$as_me:13727: \$? = $ac_status" >&5 + (exit $ac_status); } 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" @@ -10970,8 +13733,8 @@ EOF fi else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 13737 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -10994,168 +13757,212 @@ int main(void) #endif ${cf_cv_main_return:-return}(0); } -EOF -if { (eval echo configure:10999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:13762: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:13765: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:13767: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13770: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_version=`cat $cf_tempfile` else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - rm -f $cf_tempfile fi - -echo "$ac_t""$cf_cv_ncurses_version" 1>&6 -test "$cf_cv_ncurses_version" = no || cat >> confdefs.h <<\EOF +echo "$as_me:13784: result: $cf_cv_ncurses_version" >&5 +echo "${ECHO_T}$cf_cv_ncurses_version" >&6 +test "$cf_cv_ncurses_version" = no || +cat >>confdefs.h <<\EOF #define NCURSES 1 EOF - - - - cf_nculib_root=ncursesw # This works, except for the special case where we find gpm, but # ncurses is in a nonstandard location via $LIBS, and we really want # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:11030: 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 +echo "$as_me:13797: checking for Gpm_Open in -lgpm" >&5 +echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 +if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 13805 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char Gpm_Open(); - -int main() { -Gpm_Open() -; return 0; } -EOF -if { (eval echo configure:11049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -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:11065: 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 + builtin and then its argument prototype would still apply. */ +char Gpm_Open (); +int +main (void) +{ +Gpm_Open (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:13824: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:13827: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:13830: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13833: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_gpm_Gpm_Open=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:13844: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 +if test $ac_cv_lib_gpm_Gpm_Open = yes; then + echo "$as_me:13847: checking for initscr in -lgpm" >&5 +echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 +if test "${ac_cv_lib_gpm_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 13855 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char initscr(); - -int main() { -initscr() -; return 0; } -EOF -if { (eval echo configure:11084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char initscr (); +int +main (void) +{ +initscr (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:13874: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:13877: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:13880: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13883: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_initscr=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_gpm_initscr=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:13894: result: $ac_cv_lib_gpm_initscr" >&5 +echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 +if test $ac_cv_lib_gpm_initscr = yes; then LIBS="$cf_ncurses_SAVE" else - echo "$ac_t""no" 1>&6 -cf_ncurses_LIBS="-lgpm" + cf_ncurses_LIBS="-lgpm" fi -else - echo "$ac_t""no" 1>&6 fi - case $host_os in (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). if test "$cf_nculib_root" = ncurses ; then - echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:11116: 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 + echo "$as_me:13909: checking for tgoto in -lmytinfo" >&5 +echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 +if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 13917 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char tgoto(); - -int main() { -tgoto() -; return 0; } -EOF -if { (eval echo configure:11135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char tgoto (); +int +main (void) +{ +tgoto (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:13936: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:13939: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:13942: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13945: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mytinfo_tgoto=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_mytinfo_tgoto=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:13956: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 +if test $ac_cv_lib_mytinfo_tgoto = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" -else - echo "$ac_t""no" 1>&6 fi fi ;; esac - cf_add_libs="$cf_ncurses_LIBS" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -11172,10 +13979,9 @@ do done LIBS="$cf_add_libs" - if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) then - + cf_add_libs="-l$cf_nculib_root" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -11193,79 +13999,109 @@ done LIBS="$cf_add_libs" else - + eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" - echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:11201: 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 < -/* Override any gcc2 internal prototype to avoid an error. */ + echo "$as_me:14005: checking for initscr" >&5 +echo $ECHO_N "checking for initscr... $ECHO_C" >&6 +if test "${ac_cv_func_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 14011 "configure" +#include "confdefs.h" +#define initscr autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef initscr + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char initscr(); + builtin and then its argument prototype would still apply. */ +char initscr (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_initscr) || defined (__stub___initscr) -choke me -#else -initscr(); +#error found stub for initscr #endif -; return 0; } -EOF -if { (eval echo configure:11229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_initscr=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_initscr=no" -fi -rm -rf conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'initscr`\" = yes"; then - echo "$ac_t""yes" 1>&6 + return initscr (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:14042: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:14045: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:14048: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14051: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_initscr=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_initscr=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:14061: result: $ac_cv_func_initscr" >&5 +echo "${ECHO_T}$ac_cv_func_initscr" >&6 +if test $ac_cv_func_initscr = yes; then eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else - echo "$ac_t""no" 1>&6 cf_save_LIBS="$LIBS" - echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:11249: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:14068: checking for initscr in -l$cf_nculib_root" >&5 +echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 14072 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> -int main() { +int +main (void) +{ initscr() -; return 0; } -EOF -if { (eval echo configure:11259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:14084: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:14087: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:14090: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14093: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:14095: result: yes" >&5 +echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +echo "$as_me:14102: result: no" >&5 +echo "${ECHO_T}no" >&6 - echo "$ac_t""no" 1>&6 - cf_search= cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then @@ -11274,7 +14110,7 @@ if test -n "${LDFLAGS}${LIBS}" ; then case $cf_library_path in (-L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` - + test "x$cf_library_path" != "xNONE" && \ test -d "$cf_library_path" && \ { @@ -11292,10 +14128,8 @@ test -d "$cf_library_path" && \ done fi - cf_search= - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -11307,7 +14141,6 @@ test -d "$prefix" && \ test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root" } - for cf_subdir_prefix in \ /usr \ /usr/local \ @@ -11316,7 +14149,7 @@ for cf_subdir_prefix in \ /opt/local \ $HOME do - + test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ (test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { @@ -11330,54 +14163,69 @@ test -d "$cf_subdir_prefix" && \ done - cf_search="$cf_library_path_list $cf_search" 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:11340: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:14170: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 14174 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> -int main() { +int +main (void) +{ initscr() -; return 0; } -EOF -if { (eval echo configure:11350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:14186: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:14189: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:14192: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14195: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:14197: result: yes" >&5 +echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - echo "$ac_t""no" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +echo "$as_me:14204: result: no" >&5 +echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done - + fi -rm -rf conftest* - +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root if test $cf_found_library = no ; then - { echo "configure: error: Cannot link $cf_nculib_root library" 1>&2; exit 1; } + { { echo "$as_me:14219: error: Cannot link $cf_nculib_root library" >&5 +echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } fi - 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:11381: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:14227: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` @@ -11385,56 +14233,69 @@ echo "configure:11381: checking if we ca LIBS="$q" fi done - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 14237 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> -int main() { +int +main (void) +{ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); -; return 0; } -EOF -if { (eval echo configure:11397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - echo "$ac_t""yes" 1>&6 -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - echo "$ac_t""no" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:14249: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:14252: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:14255: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14258: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:14260: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +echo "$as_me:14265: result: no" >&5 +echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -cat >> confdefs.h <>confdefs.h <&6 -echo "configure:11426: checking definition to turn on extended curses functions" >&5 -if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:14283: checking definition to turn on extended curses functions" >&5 +echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6 +if test "${cf_cv_need_xopen_extension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_cv_need_xopen_extension=unknown -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 14291 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> -int main() { +int +main (void) +{ #if defined(NCURSES_VERSION_PATCH) #if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403) @@ -11448,26 +14309,39 @@ int main() { long x = winnstr(stdscr, "", 0); int x1, y1; getbegyx(stdscr, y1, x1) -; return 0; } -EOF -if { (eval echo configure:11454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:14317: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:14320: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:14323: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14326: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_need_xopen_extension=none else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 - for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR do - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 14336 "configure" #include "confdefs.h" #define $cf_try_xopen_extension 1 #include #include <${cf_cv_ncurses_header:-curses.h}> -int main() { +int +main (void) +{ #ifdef NCURSES_VERSION cchar_t check; @@ -11476,44 +14350,58 @@ int main() { long x = winnstr(stdscr, "", 0); int x1, y1; getbegyx(stdscr, y1, x1) -; return 0; } -EOF -if { (eval echo configure:11482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:14358: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:14361: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:14364: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14367: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_need_xopen_extension=$cf_try_xopen_extension; break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done - -fi -rm -rf conftest* fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$ac_t""$cf_cv_need_xopen_extension" 1>&6 +fi +echo "$as_me:14381: result: $cf_cv_need_xopen_extension" >&5 +echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 case $cf_cv_need_xopen_extension in (*_*) - CPPFLAGS="$CPPFLAGS -D$cf_cv_need_xopen_extension" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D$cf_cv_need_xopen_extension" + ;; esac - - test "$cf_cv_need_xopen_extension" = unknown && { echo "configure: error: X/Open curses not found" 1>&2; exit 1; } + test "$cf_cv_need_xopen_extension" = unknown && { { echo "$as_me:14393: error: X/Open curses not found" >&5 +echo "$as_me: error: X/Open curses not found" >&2;} + { (exit 1); exit 1; }; } ;; curses) #(vi - - -echo $ac_n "checking for extra include directories""... $ac_c" 1>&6 -echo "configure:11513: 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 +echo "$as_me:14399: checking for extra include directories" >&5 +echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6 +if test "${cf_cv_curses_incdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_cv_curses_incdir=no case $host_os in (hpux10.*) @@ -11534,97 +14422,125 @@ case $host_os in esac fi +echo "$as_me:14425: result: $cf_cv_curses_incdir" >&5 +echo "${ECHO_T}$cf_cv_curses_incdir" >&6 +if test "$cf_cv_curses_incdir" != no +then -echo "$ac_t""$cf_cv_curses_incdir" 1>&6 -test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_curses_incdir" +fi -echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6 -echo "configure:11544: 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 +echo "$as_me:14435: checking if we have identified curses headers" >&5 +echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 +if test "${cf_cv_ncurses_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_cv_ncurses_header=none for cf_header in \ ncurses.h \ curses.h ncurses/ncurses.h ncurses/curses.h do -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 14447 "configure" #include "confdefs.h" #include <${cf_header}> -int main() { +int +main (void) +{ initscr(); tgoto("?", 0,0) -; return 0; } -EOF -if { (eval echo configure:11562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:14459: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:14462: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:14465: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14468: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext done fi - -echo "$ac_t""$cf_cv_ncurses_header" 1>&6 +echo "$as_me:14479: result: $cf_cv_ncurses_header" >&5 +echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { echo "configure: error: No curses header-files found" 1>&2; exit 1; } + { { echo "$as_me:14483: error: No curses header-files found" >&5 +echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } fi # cheat, to get the right #define's for HAVE_NCURSES_H, etc. -for ac_hdr in $cf_cv_ncurses_header + +for ac_header 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:11585: 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 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:14493: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 14499 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:14503: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:14509: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11595: \"$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" + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done - - -echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 -echo "configure:11624: checking for terminfo header" >&5 -if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:14538: checking for terminfo header" >&5 +echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 +if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + case ${cf_cv_ncurses_header} in (*/ncurses.h|*/ncursesw.h) cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` @@ -11636,42 +14552,56 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 14556 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> #include <$cf_test> -int main() { +int +main (void) +{ int x = auto_left_margin -; return 0; } -EOF -if { (eval echo configure:11651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:14571: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:14574: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:14577: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14580: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_term_header="$cf_test" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + cf_cv_term_header=unknown - + fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext test "$cf_cv_term_header" != unknown && break done fi - -echo "$ac_t""$cf_cv_term_header" 1>&6 +echo "$as_me:14596: result: $cf_cv_term_header" >&5 +echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories case $cf_cv_term_header in (*term.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_TERM_H 1 EOF @@ -11680,32 +14610,31 @@ esac case $cf_cv_term_header in (ncurses/term.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_NCURSES_TERM_H 1 EOF ;; (ncursesw/term.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_NCURSESW_TERM_H 1 EOF ;; esac - - -echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:11700: checking for ncurses version" >&5 -if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:14628: checking for ncurses version" >&5 +echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 +if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_cv_ncurses_version=no cf_tempfile=out$$ rm -f $cf_tempfile if test "$cross_compiling" = yes; then - # This will not work if the preprocessor splits the line after the # Autoconf token. The 'unproto' program does that. @@ -11722,7 +14651,11 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:11726: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo "$as_me:14654: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? + echo "$as_me:14657: \$? = $ac_status" >&5 + (exit $ac_status); } 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" @@ -11730,8 +14663,8 @@ EOF fi else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 14667 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -11754,91 +14687,127 @@ int main(void) #endif ${cf_cv_main_return:-return}(0); } -EOF -if { (eval echo configure:11759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:14692: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:14695: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:14697: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14700: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_version=`cat $cf_tempfile` else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - rm -f $cf_tempfile fi - -echo "$ac_t""$cf_cv_ncurses_version" 1>&6 -test "$cf_cv_ncurses_version" = no || cat >> confdefs.h <<\EOF +echo "$as_me:14714: result: $cf_cv_ncurses_version" >&5 +echo "${ECHO_T}$cf_cv_ncurses_version" >&6 +test "$cf_cv_ncurses_version" = no || +cat >>confdefs.h <<\EOF #define NCURSES 1 EOF - - - -echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6 -echo "configure:11783: checking if we have identified curses libraries" >&5 -cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line 14724 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> -int main() { +int +main (void) +{ initscr(); tgoto("?", 0,0) -; return 0; } -EOF -if { (eval echo configure:11792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:14736: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:14739: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:14742: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14745: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_result=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - cf_result=no -fi -rm -rf conftest* -echo "$ac_t""$cf_result" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_result=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +echo "$as_me:14754: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then case $host_os in (freebsd*) - echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:11808: 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 + echo "$as_me:14760: checking for tgoto in -lmytinfo" >&5 +echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 +if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 14768 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char tgoto(); - -int main() { -tgoto() -; return 0; } -EOF -if { (eval echo configure:11827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char tgoto (); +int +main (void) +{ +tgoto (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:14787: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:14790: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:14793: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14796: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mytinfo_tgoto=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_mytinfo_tgoto=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:14807: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 +if test $ac_cv_lib_mytinfo_tgoto = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cf_add_libs="-lmytinfo" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -11855,8 +14824,6 @@ do done LIBS="$cf_add_libs" -else - echo "$ac_t""no" 1>&6 fi ;; @@ -11867,43 +14834,57 @@ fi # term.h) for cur_colr if test "x$cf_cv_screen" = "xcurses_colr" then - echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 -echo "configure:11872: 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 + echo "$as_me:14837: checking for initscr in -lcur_colr" >&5 +echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6 +if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lcur_colr $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 14845 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char initscr(); - -int main() { -initscr() -; return 0; } -EOF -if { (eval echo configure:11891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char initscr (); +int +main (void) +{ +initscr (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:14864: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:14867: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:14870: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14873: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_cur_colr_initscr=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_cur_colr_initscr=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:14884: result: $ac_cv_lib_cur_colr_initscr" >&5 +echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6 +if test $ac_cv_lib_cur_colr_initscr = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cf_add_libs="-lcur_colr" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -11921,48 +14902,62 @@ done LIBS="$cf_add_libs" ac_cv_func_initscr=yes - + else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 -echo "configure:11930: 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 + echo "$as_me:14908: checking for initscr in -lHcurses" >&5 +echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6 +if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lHcurses $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 14916 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char initscr(); - -int main() { -initscr() -; return 0; } -EOF -if { (eval echo configure:11949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char initscr (); +int +main (void) +{ +initscr (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:14935: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:14938: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:14941: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14944: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Hcurses_initscr=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_Hcurses_initscr=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:14955: result: $ac_cv_lib_Hcurses_initscr" >&5 +echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6 +if test $ac_cv_lib_Hcurses_initscr = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - # HP's header uses __HP_CURSES, but user claims _HP_CURSES. - + cf_add_libs="-lHcurses" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -11979,11 +14974,11 @@ do done LIBS="$cf_add_libs" - CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D__HP_CURSES -D_HP_CURSES" + ac_cv_func_initscr=yes - -else - echo "$ac_t""no" 1>&6 + fi fi @@ -11995,7 +14990,7 @@ fi (x86_64) if test -d /lib64 then - + if test -n "/lib64" ; then for cf_add_libdir in /lib64 do @@ -12015,8 +15010,7 @@ if test -n "/lib64" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:12019: testing adding $cf_add_libdir to library-path ..." 1>&5 - +echo "${as_me:-configure}:15013: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -12025,7 +15019,7 @@ echo "${as_me:-configure}:12019: testing fi else - + if test -n "/lib" ; then for cf_add_libdir in /lib do @@ -12045,8 +15039,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:12049: testing adding $cf_add_libdir to library-path ..." 1>&5 - +echo "${as_me:-configure}:15042: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -12057,7 +15050,7 @@ fi fi ;; (*) - + if test -n "/lib" ; then for cf_add_libdir in /lib do @@ -12077,8 +15070,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:12081: testing adding $cf_add_libdir to library-path ..." 1>&5 - +echo "${as_me:-configure}:15073: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -12093,7 +15085,7 @@ fi if test "x$cf_cv_screen" = "xcurses_5lib" then if test -d /usr/5lib ; then - + if test -n "/usr/5lib" ; then for cf_add_libdir in /usr/5lib do @@ -12113,8 +15105,7 @@ if test -n "/usr/5lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:12117: testing adding $cf_add_libdir to library-path ..." 1>&5 - +echo "${as_me:-configure}:15108: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -12122,7 +15113,6 @@ echo "${as_me:-configure}:12117: testing done fi - cf_add_libs="-lcurses -ltermcap" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -12159,97 +15149,129 @@ if test ".$ac_cv_func_initscr" != .yes ; # because it may be needed to link the test-case for initscr. if test "x$cf_term_lib" = x then - echo $ac_n "checking for tgoto""... $ac_c" 1>&6 -echo "configure:12164: 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 < -/* Override any gcc2 internal prototype to avoid an error. */ + echo "$as_me:15152: checking for tgoto" >&5 +echo $ECHO_N "checking for tgoto... $ECHO_C" >&6 +if test "${ac_cv_func_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 15158 "configure" +#include "confdefs.h" +#define tgoto autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef tgoto + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char tgoto(); + builtin and then its argument prototype would still apply. */ +char tgoto (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_tgoto) || defined (__stub___tgoto) -choke me -#else -tgoto(); +#error found stub for tgoto #endif -; return 0; } -EOF -if { (eval echo configure:12192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_tgoto=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_tgoto=no" -fi -rm -rf conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'tgoto`\" = yes"; then - echo "$ac_t""yes" 1>&6 + return tgoto (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:15189: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:15192: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:15195: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:15198: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_tgoto=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_tgoto=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:15208: result: $ac_cv_func_tgoto" >&5 +echo "${ECHO_T}$ac_cv_func_tgoto" >&6 +if test $ac_cv_func_tgoto = yes; then cf_term_lib=predefined else - echo "$ac_t""no" 1>&6 for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown do - echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6 -echo "configure:12213: 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 + as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` +echo "$as_me:15217: checking for tgoto in -l$cf_term_lib" >&5 +echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_term_lib $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 15225 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char tgoto(); - -int main() { -tgoto() -; return 0; } -EOF -if { (eval echo configure:12232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + builtin and then its argument prototype would still apply. */ +char tgoto (); +int +main (void) +{ +tgoto (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:15244: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:15247: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:15250: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:15253: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_Lib=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:15264: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 +if test `eval echo '${'$as_ac_Lib'}'` = yes; then - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" + : ${cf_nculib_root:=$cf_term_lib} + break fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - break -else - echo "$ac_t""no" 1>&6 -fi done - + fi fi @@ -12262,97 +15284,139 @@ fi do LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then - echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6 -echo "configure:12267: checking if we can link with $cf_curs_lib library" >&5 - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 15290 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> -int main() { +int +main (void) +{ initscr() -; return 0; } -EOF -if { (eval echo configure:12276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:15302: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:15305: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:15308: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:15311: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_result=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - cf_result=no -fi -rm -rf conftest* - echo "$ac_t""$cf_result" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_result=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + echo "$as_me:15320: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 test $cf_result = yes && break elif test "$cf_curs_lib" = "$cf_term_lib" ; then cf_result=no 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:12292: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 15329 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> -int main() { +int +main (void) +{ initscr(); tgoto((char *)0, 0, 0); -; return 0; } -EOF -if { (eval echo configure:12301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:15341: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:15344: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:15347: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:15350: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_result=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 - LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 15359 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> -int main() { +int +main (void) +{ initscr() -; return 0; } -EOF -if { (eval echo configure:12318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:15371: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:15374: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:15377: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:15380: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_result=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - cf_result=error + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_result=error fi -rm -rf conftest* - +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi -rm -rf conftest* - echo "$ac_t""$cf_result" 1>&6 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + echo "$as_me:15392: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 test $cf_result != error && break fi done fi - test $cf_curs_lib = unknown && { echo "configure: error: no curses library found" 1>&2; exit 1; } + test $cf_curs_lib = unknown && { { echo "$as_me:15398: error: no curses library found" >&5 +echo "$as_me: error: no curses library found" >&2;} + { (exit 1); exit 1; }; } fi fi - - - -echo $ac_n "checking definition to turn on extended curses functions""... $ac_c" 1>&6 -echo "configure:12344: checking definition to turn on extended curses functions" >&5 -if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:15404: checking definition to turn on extended curses functions" >&5 +echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6 +if test "${cf_cv_need_xopen_extension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_cv_need_xopen_extension=unknown -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 15412 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> -int main() { +int +main (void) +{ #if defined(NCURSES_VERSION_PATCH) #if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403) @@ -12366,26 +15430,39 @@ int main() { long x = winnstr(stdscr, "", 0); int x1, y1; getbegyx(stdscr, y1, x1) -; return 0; } -EOF -if { (eval echo configure:12372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:15438: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:15441: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:15444: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:15447: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_need_xopen_extension=none else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 - for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR do - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 15457 "configure" #include "confdefs.h" #define $cf_try_xopen_extension 1 #include #include <${cf_cv_ncurses_header:-curses.h}> -int main() { +int +main (void) +{ #ifdef NCURSES_VERSION cchar_t check; @@ -12394,39 +15471,53 @@ int main() { long x = winnstr(stdscr, "", 0); int x1, y1; getbegyx(stdscr, y1, x1) -; return 0; } -EOF -if { (eval echo configure:12400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:15479: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:15482: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:15485: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:15488: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_need_xopen_extension=$cf_try_xopen_extension; break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done - -fi -rm -rf conftest* fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$ac_t""$cf_cv_need_xopen_extension" 1>&6 +fi +echo "$as_me:15502: result: $cf_cv_need_xopen_extension" >&5 +echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 case $cf_cv_need_xopen_extension in (*_*) - CPPFLAGS="$CPPFLAGS -D$cf_cv_need_xopen_extension" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D$cf_cv_need_xopen_extension" + ;; esac - ;; esac 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:12430: checking if you want to use installed version of pcre" >&5 +echo "$as_me:15519: checking if you want to use installed version of pcre" >&5 +echo $ECHO_N "checking if you want to use installed version of pcre... $ECHO_C" >&6 # Check whether --with-pcre or --without-pcre was given. if test "${with_pcre+set}" = set; then @@ -12434,9 +15525,9 @@ if test "${with_pcre+set}" = set; then PCRE_HOME=$withval else PCRE_HOME=no -fi - -echo "$ac_t""$PCRE_HOME" 1>&6 +fi; +echo "$as_me:15529: result: $PCRE_HOME" >&5 +echo "${ECHO_T}$PCRE_HOME" >&6 cf_pcre_home=$PCRE_HOME PCREDIR_MAKE= @@ -12446,17 +15537,14 @@ case .$cf_pcre_home in #(vi .no) #(vi # setup to compile the bundled PCRE: # . $srcdir/pcre/version.sh - - - - + ;; .yes) #(vi PCREDIR_MAKE='#' PCREDIR_LIBS="-lpcre" ;; .*) - + if test "x$prefix" != xNONE; then cf_path_syntax="$prefix" else @@ -12482,7 +15570,9 @@ case ".$cf_pcre_home" in cf_pcre_home=`echo $cf_pcre_home | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { echo "configure: error: expected a pathname, not \"$cf_pcre_home\"" 1>&2; exit 1; } + { { echo "$as_me:15573: error: expected a pathname, not \"$cf_pcre_home\"" >&5 +echo "$as_me: error: expected a pathname, not \"$cf_pcre_home\"" >&2;} + { (exit 1); exit 1; }; } ;; esac @@ -12492,41 +15582,38 @@ esac ;; esac - - - - PCRE_MAKEFILE= if test "$PCRE_HOME" = "no" ; then LINK_SIZE="-DLINK_SIZE=2" - + + UTF8="-DSUPPORT_UTF8" + UCP="-DSUPPORT_UCP" + PCRE_MAKEFILE="$PCRE_MAKEFILE pcre/Makefile pcre/RunTest" fi ## debugging libraries (do this after other libraries) debug_malloc=none - -echo $ac_n "checking if you want to use dbmalloc for testing""... $ac_c" 1>&6 -echo "configure:12512: checking if you want to use dbmalloc for testing" >&5 +echo "$as_me:15598: checking if you want to use dbmalloc for testing" >&5 +echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 # Check whether --with-dbmalloc or --without-dbmalloc was given. if test "${with_dbmalloc+set}" = set; then withval="$with_dbmalloc" - cat >> confdefs.h <>confdefs.h <&6 +fi; +echo "$as_me:15615: result: ${with_dbmalloc:-no}" >&5 +echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case .$with_cflags in (.*-g*) @@ -12534,7 +15621,7 @@ case .$with_cflags in (.*-g*) ;; (*) - + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -12555,13 +15642,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -12576,14 +15663,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -12591,7 +15678,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -12599,11 +15686,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -12614,135 +15700,146 @@ esac done if test -n "$cf_new_cflags" ; then - - + test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - - + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then - - + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - ;; esac ;; esac - 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:12653: 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 + echo "$as_me:15729: checking for dbmalloc.h" >&5 +echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 +if test "${ac_cv_header_dbmalloc_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 15735 "configure" #include "confdefs.h" #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12663: \"$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" +_ACEOF +if { (eval echo "$as_me:15739: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:15745: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_dbmalloc_h=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_header_dbmalloc_h=no fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext 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:12680: 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 +echo "$as_me:15764: result: $ac_cv_header_dbmalloc_h" >&5 +echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 +if test $ac_cv_header_dbmalloc_h = yes; then + echo "$as_me:15767: checking for debug_malloc in -ldbmalloc" >&5 +echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 +if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 15775 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char debug_malloc(); - -int main() { -debug_malloc() -; return 0; } -EOF -if { (eval echo configure:12699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char debug_malloc (); +int +main (void) +{ +debug_malloc (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:15794: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:15797: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:15800: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:15803: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dbmalloc_debug_malloc=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_dbmalloc_debug_malloc=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:15814: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 +if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then debug_malloc=DBMALLOC -else - echo "$ac_t""no" 1>&6 fi -else - echo "$ac_t""no" 1>&6 fi fi - - -echo $ac_n "checking if you want to use dmalloc for testing""... $ac_c" 1>&6 -echo "configure:12728: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:15824: checking if you want to use dmalloc for testing" >&5 +echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then withval="$with_dmalloc" - cat >> confdefs.h <>confdefs.h <&6 +fi; +echo "$as_me:15841: result: ${with_dmalloc:-no}" >&5 +echo "${ECHO_T}${with_dmalloc:-no}" >&6 case .$with_cflags in (.*-g*) @@ -12750,7 +15847,7 @@ case .$with_cflags in (.*-g*) ;; (*) - + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -12771,13 +15868,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -12792,14 +15889,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -12807,7 +15904,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -12815,11 +15912,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -12830,248 +15926,288 @@ esac done if test -n "$cf_new_cflags" ; then - - + test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - - + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then - - + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - ;; esac ;; esac - 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:12869: 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 + echo "$as_me:15955: checking for dmalloc.h" >&5 +echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 +if test "${ac_cv_header_dmalloc_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 15961 "configure" #include "confdefs.h" #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12879: \"$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" +_ACEOF +if { (eval echo "$as_me:15965: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:15971: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_dmalloc_h=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_header_dmalloc_h=no fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext 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:12896: 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 +echo "$as_me:15990: result: $ac_cv_header_dmalloc_h" >&5 +echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 +if test $ac_cv_header_dmalloc_h = yes; then + echo "$as_me:15993: checking for dmalloc_debug in -ldmalloc" >&5 +echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 +if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 16001 "configure" #include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dmalloc_debug(); - -int main() { -dmalloc_debug() -; return 0; } -EOF -if { (eval echo configure:12915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dmalloc_debug (); +int +main (void) +{ +dmalloc_debug (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:16020: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:16023: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:16026: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16029: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dmalloc_dmalloc_debug=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_dmalloc_dmalloc_debug=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:16040: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 +if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then debug_malloc=DMALLOC -else - echo "$ac_t""no" 1>&6 fi -else - echo "$ac_t""no" 1>&6 fi fi - - # Check whether --with-trace or --without-trace was given. if test "${with_trace+set}" = set; then withval="$with_trace" - - echo $ac_n "checking for _tracef""... $ac_c" 1>&6 -echo "configure:12948: 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 < -/* Override any gcc2 internal prototype to avoid an error. */ + + echo "$as_me:16054: checking for _tracef" >&5 +echo $ECHO_N "checking for _tracef... $ECHO_C" >&6 +if test "${ac_cv_func__tracef+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 16060 "configure" +#include "confdefs.h" +#define _tracef autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef _tracef + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char _tracef(); + builtin and then its argument prototype would still apply. */ +char _tracef (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub__tracef) || defined (__stub____tracef) -choke me -#else -_tracef(); +#error found stub for _tracef #endif -; return 0; } -EOF -if { (eval echo configure:12976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func__tracef=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func__tracef=no" -fi -rm -rf conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'_tracef`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + return _tracef (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:16091: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:16094: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:16097: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16100: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func__tracef=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func__tracef=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:16110: result: $ac_cv_func__tracef" >&5 +echo "${ECHO_T}$ac_cv_func__tracef" >&6 +if test $ac_cv_func__tracef = yes; then + cat >>confdefs.h <<\EOF #define HAVE__TRACEF 1 EOF 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:12998: 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 + as_ac_Lib=`echo "ac_cv_lib_${cf_with_screen}_g''__tracef" | $as_tr_sh` +echo "$as_me:16120: checking for _tracef in -l${cf_with_screen}_g" >&5 +echo $ECHO_N "checking for _tracef in -l${cf_with_screen}_g... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l${cf_with_screen}_g $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 16128 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char _tracef(); - -int main() { -_tracef() -; return 0; } -EOF -if { (eval echo configure:13017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + builtin and then its argument prototype would still apply. */ +char _tracef (); +int +main (void) +{ +_tracef (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:16147: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:16150: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:16153: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16156: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_Lib=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:16167: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 +if test `eval echo '${'$as_ac_Lib'}'` = yes; then + cat >>confdefs.h <<\EOF #define HAVE__TRACEF 1 EOF LIBS=`echo "$LIBS" | sed -e s/-l${cf_with_screen}// -e s/-lcurses//` LIBS="-l${cf_with_screen}_g $LIBS" use_trace=yes - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define USE_TRACE 1 EOF EXTRAO_DEP='' EXTRAOBJS="$EXTRAOBJS \$(OBJDIR)/trace.o" else - echo "$ac_t""no" 1>&6 -use_trace=no + use_trace=no fi fi else use_trace=no -fi - +fi; #AC_MSG_CHECKING(if you want debugging-trace) #AC_MSG_RESULT($use_trace) - - ## options for miscellaneous definitions -echo $ac_n "checking for domain-name""... $ac_c" 1>&6 -echo "configure:13063: checking for domain-name" >&5 +echo "$as_me:16196: checking for domain-name" >&5 +echo $ECHO_N "checking for domain-name... $ECHO_C" >&6 # Check whether --with-domain-name or --without-domain-name was given. if test "${with_domain_name+set}" = set; then withval="$with_domain_name" - : + else withval="${DOMAIN_NAME}" -fi -test -n "$withval" && \ +fi; test -n "$withval" && \ case "$withval" in #(vi yes) - { echo "configure: error: expected a value for --with-domain-name" 1>&2; exit 1; } + { { echo "$as_me:16208: error: expected a value for --with-domain-name" >&5 +echo "$as_me: error: expected a value for --with-domain-name" >&2;} + { (exit 1); exit 1; }; } ;; #(vi no) withval="" ;; @@ -13079,35 +16215,36 @@ esac DOMAIN_NAME="$withval" if test "$DOMAIN_NAME" != ""; then - cat >> confdefs.h <>confdefs.h <&6 +echo "$as_me:16223: result: $DOMAIN_NAME" >&5 +echo "${ECHO_T}$DOMAIN_NAME" >&6 if test "$USE_NNTP" = "yes" ; then -echo $ac_n "checking for NNTP default-server""... $ac_c" 1>&6 -echo "configure:13092: checking for NNTP default-server" >&5 +echo "$as_me:16227: checking for NNTP default-server" >&5 +echo $ECHO_N "checking for NNTP default-server... $ECHO_C" >&6 # Check whether --with-nntp-default-server or --without-nntp-default-server was given. if test "${with_nntp_default_server+set}" = set; then withval="$with_nntp_default_server" - : + else withval="${NNTP_DEFAULT_SERVER-news.$DOMAIN_NAME}" -fi -test -z "$withval" && withval=no +fi; test -z "$withval" && withval=no case "$withval" in #(vi yes) - { echo "configure: error: expected a value for --with-nntp-default-server" 1>&2; exit 1; } + { { echo "$as_me:16239: error: expected a value for --with-nntp-default-server" >&5 +echo "$as_me: error: expected a value for --with-nntp-default-server" >&2;} + { (exit 1); exit 1; }; } ;; #(vi no) withval="" ;; esac NNTP_DEFAULT_SERVER="$withval" - if test "$NNTP_DEFAULT_SERVER" = "" ; then if test "$DOMAIN_NAME" != "" ; then test -z "$NNTP_DEFAULT_SERVER" && case "$DOMAIN_NAME" in #((( @@ -13126,56 +16263,56 @@ NNTP_DEFAULT_SERVER="$withval" NNTP_DEFAULT_SERVER="news" fi fi -echo "$ac_t""$NNTP_DEFAULT_SERVER" 1>&6 +echo "$as_me:16266: result: $NNTP_DEFAULT_SERVER" >&5 +echo "${ECHO_T}$NNTP_DEFAULT_SERVER" >&6 fi ## These options are interdependent, so we delay defining them til now: test -n "$NNTP_DEFAULT_SERVER" \ - && cat >> confdefs.h <>confdefs.h <> confdefs.h <>confdefs.h <> confdefs.h <>confdefs.h <> confdefs.h <>confdefs.h <> confdefs.h <>confdefs.h <&6 -echo "configure:13158: checking whether to use MH style mail handling for mailgroups" >&5 +echo "$as_me:16293: checking whether to use MH style mail handling for mailgroups" >&5 +echo $ECHO_N "checking whether to use MH style mail handling for mailgroups... $ECHO_C" >&6 # Check whether --enable-mh-mail-handling or --disable-mh-mail-handling was given. if test "${enable_mh_mail_handling+set}" = set; then enableval="$enable_mh_mail_handling" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_MH_MAIL_HANDLING 1 EOF - + fi else - enableval=no -fi - -echo "$ac_t""$enableval" 1>&6 + enableval=no +fi; +echo "$as_me:16309: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 CAN_MAKEFILE= CANDIR_MAKE= -echo $ac_n "checking whether to use Cancel-Locks""... $ac_c" 1>&6 -echo "configure:13179: checking whether to use Cancel-Locks" >&5 +echo "$as_me:16314: checking whether to use Cancel-Locks" >&5 +echo $ECHO_N "checking whether to use Cancel-Locks... $ECHO_C" >&6 # Check whether --enable-cancel-locks or --disable-cancel-locks was given. if test "${enable_cancel_locks+set}" = set; then @@ -13184,524 +16321,541 @@ if test "${enable_cancel_locks+set}" = s if test "$enableval" != "no" ; then CANLIBS='-L../libcanlock -lcanlock' CAN_MAKEFILE="libcanlock/Makefile" - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define USE_CANLOCK 1 EOF - + else CANDIR_MAKE='#' CANLIBS='' fi else - enableval=no + enableval=no CANDIR_MAKE='#' CANLIBS='' -fi - -echo "$ac_t""$enableval" 1>&6 - - +fi; +echo "$as_me:16338: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 ## gsasl - used for AUTH SASL PLAIN gsasl=no -ac_safe=`echo "gsasl.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for gsasl.h""... $ac_c" 1>&6 -echo "configure:13211: checking for gsasl.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:16343: checking for gsasl.h" >&5 +echo $ECHO_N "checking for gsasl.h... $ECHO_C" >&6 +if test "${ac_cv_header_gsasl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 16349 "configure" #include "confdefs.h" #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13221: \"$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" +_ACEOF +if { (eval echo "$as_me:16353: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:16359: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_gsasl_h=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_header_gsasl_h=no fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for gsasl_check_version in -lgsasl""... $ac_c" 1>&6 -echo "configure:13238: checking for gsasl_check_version in -lgsasl" >&5 -ac_lib_var=`echo gsasl'_'gsasl_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 +echo "$as_me:16378: result: $ac_cv_header_gsasl_h" >&5 +echo "${ECHO_T}$ac_cv_header_gsasl_h" >&6 +if test $ac_cv_header_gsasl_h = yes; then + echo "$as_me:16381: checking for gsasl_check_version in -lgsasl" >&5 +echo $ECHO_N "checking for gsasl_check_version in -lgsasl... $ECHO_C" >&6 +if test "${ac_cv_lib_gsasl_gsasl_check_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lgsasl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 16389 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gsasl_check_version(); - -int main() { -gsasl_check_version() -; return 0; } -EOF -if { (eval echo configure:13257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char gsasl_check_version (); +int +main (void) +{ +gsasl_check_version (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:16408: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:16411: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:16414: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16417: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gsasl_gsasl_check_version=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_gsasl_gsasl_check_version=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:16428: result: $ac_cv_lib_gsasl_gsasl_check_version" >&5 +echo "${ECHO_T}$ac_cv_lib_gsasl_gsasl_check_version" >&6 +if test $ac_cv_lib_gsasl_gsasl_check_version = yes; then gsasl=yes -else - echo "$ac_t""no" 1>&6 fi - -else - echo "$ac_t""no" 1>&6 fi if test "$gsasl" = "yes"; then - + # Check whether --enable-gsasl or --disable-gsasl was given. if test "${enable_gsasl+set}" = set; then enableval="$enable_gsasl" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - USE_SASL=no + USE_SASL=no else USE_SASL=yes - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define USE_SASL 1 EOF LIBS="$LIBS -lgsasl" fi else - enableval=yes + enableval=yes USE_SASL=yes - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define USE_SASL 1 EOF LIBS="$LIBS -lgsasl" +fi; fi -fi - -echo $ac_n "checking whether to enable 8-bit keycodes""... $ac_c" 1>&6 -echo "configure:13312: checking whether to enable 8-bit keycodes" >&5 +echo "$as_me:16466: checking whether to enable 8-bit keycodes" >&5 +echo $ECHO_N "checking whether to enable 8-bit keycodes... $ECHO_C" >&6 # Check whether --enable-8bit-keys or --disable-8bit-keys was given. if test "${enable_8bit_keys+set}" = set; then enableval="$enable_8bit_keys" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - : + : else - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_KEY_PREFIX 1 EOF fi else - enableval=yes - cat >> confdefs.h <<\EOF + enableval=yes + cat >>confdefs.h <<\EOF #define HAVE_KEY_PREFIX 1 EOF +fi; +echo "$as_me:16488: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 -fi - -echo "$ac_t""$enableval" 1>&6 - -echo $ac_n "checking whether to enable ANSI-color""... $ac_c" 1>&6 -echo "configure:13338: checking whether to enable ANSI-color" >&5 +echo "$as_me:16491: checking whether to enable ANSI-color" >&5 +echo $ECHO_N "checking whether to enable ANSI-color... $ECHO_C" >&6 # Check whether --enable-color or --disable-color was given. if test "${enable_color+set}" = set; then enableval="$enable_color" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - : + : fi else - enableval=yes -fi - + enableval=yes +fi; use_color=$enableval -echo "$ac_t""$use_color" 1>&6 +echo "$as_me:16505: result: $use_color" >&5 +echo "${ECHO_T}$use_color" >&6 -echo $ac_n "checking whether to enable posting-etiquette""... $ac_c" 1>&6 -echo "configure:13355: checking whether to enable posting-etiquette" >&5 +echo "$as_me:16508: checking whether to enable posting-etiquette" >&5 +echo $ECHO_N "checking whether to enable posting-etiquette... $ECHO_C" >&6 # Check whether --enable-etiquette or --disable-etiquette was given. if test "${enable_etiquette+set}" = set; then enableval="$enable_etiquette" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define NO_ETIQUETTE 1 EOF - + fi else - enableval=yes -fi - -echo "$ac_t""$enableval" 1>&6 + enableval=yes +fi; +echo "$as_me:16524: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 -echo $ac_n "checking whether to strictly observe RFC2047 and break long lines""... $ac_c" 1>&6 -echo "configure:13374: checking whether to strictly observe RFC2047 and break long lines" >&5 +echo "$as_me:16527: checking whether to strictly observe RFC2047 and break long lines" >&5 +echo $ECHO_N "checking whether to strictly observe RFC2047 and break long lines... $ECHO_C" >&6 # Check whether --enable-break-long-lines or --disable-break-long-lines was given. if test "${enable_break_long_lines+set}" = set; then enableval="$enable_break_long_lines" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - : + : else - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define MIME_BREAK_LONG_LINES 1 EOF fi else - enableval=yes - cat >> confdefs.h <<\EOF + enableval=yes + cat >>confdefs.h <<\EOF #define MIME_BREAK_LONG_LINES 1 EOF +fi; +echo "$as_me:16549: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 -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:13400: checking whether to force MM_CHARSET obeyance when decoding mime" >&5 +echo "$as_me:16552: checking whether to force MM_CHARSET obeyance when decoding mime" >&5 +echo $ECHO_N "checking whether to force MM_CHARSET obeyance when decoding mime... $ECHO_C" >&6 # Check whether --enable-mime-strict-charset or --disable-mime-strict-charset was given. if test "${enable_mime_strict_charset+set}" = set; then enableval="$enable_mime_strict_charset" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - : + : else - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define MIME_STRICT_CHARSET 1 EOF fi else - enableval=yes - cat >> confdefs.h <<\EOF + enableval=yes + cat >>confdefs.h <<\EOF #define MIME_STRICT_CHARSET 1 EOF +fi; +echo "$as_me:16574: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 -fi - -echo "$ac_t""$enableval" 1>&6 - -echo $ac_n "checking for MIME character-set""... $ac_c" 1>&6 -echo "configure:13426: checking for MIME character-set" >&5 +echo "$as_me:16577: checking for MIME character-set" >&5 +echo $ECHO_N "checking for MIME character-set... $ECHO_C" >&6 # Check whether --with-mime-default-charset or --without-mime-default-charset was given. if test "${with_mime_default_charset+set}" = set; then withval="$with_mime_default_charset" - : + else withval="${MM_CHARSET-US-ASCII}" -fi -case "$withval" in #(vi +fi; case "$withval" in #(vi yes|no) - { echo "configure: error: expected a value for --with-mime-default-charset" 1>&2; exit 1; } + { { echo "$as_me:16588: error: expected a value for --with-mime-default-charset" >&5 +echo "$as_me: error: expected a value for --with-mime-default-charset" >&2;} + { (exit 1); exit 1; }; } ;; esac MM_CHARSET="$withval" -cat >> confdefs.h <>confdefs.h <&6 +echo "$as_me:16598: result: $MM_CHARSET" >&5 +echo "${ECHO_T}$MM_CHARSET" >&6 -echo $ac_n "checking for default ISO/ASCII table""... $ac_c" 1>&6 -echo "configure:13448: checking for default ISO/ASCII table" >&5 +echo "$as_me:16601: checking for default ISO/ASCII table" >&5 +echo $ECHO_N "checking for default ISO/ASCII table... $ECHO_C" >&6 # Check whether --with-iso-to-ascii or --without-iso-to-ascii was given. if test "${with_iso_to_ascii+set}" = set; then withval="$with_iso_to_ascii" - : + else withval="${DEFAULT_ISO2ASC--1}" -fi -case "$withval" in #(vi +fi; case "$withval" in #(vi yes|no) - { echo "configure: error: expected a value for --with-iso-to-ascii" 1>&2; exit 1; } + { { echo "$as_me:16612: error: expected a value for --with-iso-to-ascii" >&5 +echo "$as_me: error: expected a value for --with-iso-to-ascii" >&2;} + { (exit 1); exit 1; }; } ;; esac DEFAULT_ISO2ASC="$withval" -cat >> confdefs.h <>confdefs.h <&6 +echo "$as_me:16622: result: $DEFAULT_ISO2ASC" >&5 +echo "${ECHO_T}$DEFAULT_ISO2ASC" >&6 -echo $ac_n "checking whether to enable locale support""... $ac_c" 1>&6 -echo "configure:13470: checking whether to enable locale support" >&5 +echo "$as_me:16625: checking whether to enable locale support" >&5 +echo $ECHO_N "checking whether to enable locale support... $ECHO_C" >&6 # Check whether --enable-locale or --disable-locale was given. if test "${enable_locale+set}" = set; then enableval="$enable_locale" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define NO_LOCALE 1 EOF - + fi else - enableval=yes -fi + enableval=yes +fi; +echo "$as_me:16641: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 -echo "$ac_t""$enableval" 1>&6 - -echo $ac_n "checking whether to enable posting""... $ac_c" 1>&6 -echo "configure:13489: checking whether to enable posting" >&5 +echo "$as_me:16644: checking whether to enable posting" >&5 +echo $ECHO_N "checking whether to enable posting... $ECHO_C" >&6 # Check whether --enable-posting or --disable-posting was given. if test "${enable_posting+set}" = set; then enableval="$enable_posting" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define NO_POSTING 1 EOF - + fi else - enableval=yes -fi - -echo "$ac_t""$enableval" 1>&6 + enableval=yes +fi; +echo "$as_me:16660: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 -echo $ac_n "checking whether to enable shell escape""... $ac_c" 1>&6 -echo "configure:13508: checking whether to enable shell escape" >&5 +echo "$as_me:16663: checking whether to enable shell escape" >&5 +echo $ECHO_N "checking whether to enable shell escape... $ECHO_C" >&6 # Check whether --enable-shell-escape or --disable-shell-escape was given. if test "${enable_shell_escape+set}" = set; then enableval="$enable_shell_escape" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define NO_SHELL_ESCAPE 1 EOF - + fi else - enableval=yes -fi + enableval=yes +fi; +echo "$as_me:16679: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 -echo "$ac_t""$enableval" 1>&6 - -echo $ac_n "checking whether to have fascist newsadmin""... $ac_c" 1>&6 -echo "configure:13527: checking whether to have fascist newsadmin" >&5 +echo "$as_me:16682: checking whether to have fascist newsadmin" >&5 +echo $ECHO_N "checking whether to have fascist newsadmin... $ECHO_C" >&6 # Check whether --enable-fascist-newsadmin or --disable-fascist-newsadmin was given. if test "${enable_fascist_newsadmin+set}" = set; then enableval="$enable_fascist_newsadmin" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_FASCIST_NEWSADMIN 1 EOF - + fi else - enableval=no -fi - -echo "$ac_t""$enableval" 1>&6 + enableval=no +fi; +echo "$as_me:16698: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 -echo $ac_n "checking whether to enable inverse video and highlighting""... $ac_c" 1>&6 -echo "configure:13546: checking whether to enable inverse video and highlighting" >&5 +echo "$as_me:16701: checking whether to enable inverse video and highlighting" >&5 +echo $ECHO_N "checking whether to enable inverse video and highlighting... $ECHO_C" >&6 # Check whether --enable-inverse-video or --disable-inverse-video was given. if test "${enable_inverse_video+set}" = set; then enableval="$enable_inverse_video" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define USE_INVERSE_HACK 1 EOF - + fi else - enableval=yes -fi + enableval=yes +fi; +echo "$as_me:16717: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 -echo "$ac_t""$enableval" 1>&6 - -echo $ac_n "checking whether to enable piping support""... $ac_c" 1>&6 -echo "configure:13565: checking whether to enable piping support" >&5 +echo "$as_me:16720: checking whether to enable piping support" >&5 +echo $ECHO_N "checking whether to enable piping support... $ECHO_C" >&6 # Check whether --enable-piping or --disable-piping was given. if test "${enable_piping+set}" = set; then enableval="$enable_piping" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define DONT_HAVE_PIPING 1 EOF - + fi else - enableval=yes -fi - -echo "$ac_t""$enableval" 1>&6 + enableval=yes +fi; +echo "$as_me:16736: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 -echo $ac_n "checking whether to enable printer support""... $ac_c" 1>&6 -echo "configure:13584: checking whether to enable printer support" >&5 +echo "$as_me:16739: checking whether to enable printer support" >&5 +echo $ECHO_N "checking whether to enable printer support... $ECHO_C" >&6 # Check whether --enable-printing or --disable-printing was given. if test "${enable_printing+set}" = set; then enableval="$enable_printing" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define DISABLE_PRINTING 1 EOF - + fi else - enableval=yes -fi + enableval=yes +fi; +echo "$as_me:16755: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 -echo "$ac_t""$enableval" 1>&6 - -echo $ac_n "checking whether to unique tmp-files by appending .pid""... $ac_c" 1>&6 -echo "configure:13603: checking whether to unique tmp-files by appending .pid" >&5 +echo "$as_me:16758: checking whether to unique tmp-files by appending .pid" >&5 +echo $ECHO_N "checking whether to unique tmp-files by appending .pid... $ECHO_C" >&6 # Check whether --enable-append-pid or --disable-append-pid was given. if test "${enable_append_pid+set}" = set; then enableval="$enable_append_pid" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - : + : else - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define APPEND_PID 1 EOF fi else - enableval=yes - cat >> confdefs.h <<\EOF + enableval=yes + cat >>confdefs.h <<\EOF #define APPEND_PID 1 EOF +fi; +echo "$as_me:16780: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 -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:13629: checking whether to fallback to XHDR XREF if XOVER isn't supported" >&5 +echo "$as_me:16783: checking whether to fallback to XHDR XREF if XOVER isn't supported" >&5 +echo $ECHO_N "checking whether to fallback to XHDR XREF if XOVER isn't supported... $ECHO_C" >&6 # Check whether --enable-xhdr-xref or --disable-xhdr-xref was given. if test "${enable_xhdr_xref+set}" = set; then enableval="$enable_xhdr_xref" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - : + : else - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define XHDR_XREF 1 EOF fi else - enableval=yes - cat >> confdefs.h <<\EOF + enableval=yes + cat >>confdefs.h <<\EOF #define XHDR_XREF 1 EOF - -fi - -echo "$ac_t""$enableval" 1>&6 +fi; +echo "$as_me:16805: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&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:13656: checking whether to send a GROUP command before a LISTGROUP" >&5 +echo "$as_me:16809: checking whether to send a GROUP command before a LISTGROUP" >&5 +echo $ECHO_N "checking whether to send a GROUP command before a LISTGROUP... $ECHO_C" >&6 # Check whether --enable-broken-listgroup-fix or --disable-broken-listgroup-fix was given. if test "${enable_broken_listgroup_fix+set}" = set; then enableval="$enable_broken_listgroup_fix" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define BROKEN_LISTGROUP 1 EOF - + fi else - enableval=no -fi - -echo "$ac_t""$enableval" 1>&6 + enableval=no +fi; +echo "$as_me:16825: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 ### on some old systems the WIFEXITED()/WEXITSTATUS() macros do not work -echo $ac_n "checking whether to ignore system()s return value""... $ac_c" 1>&6 -echo "configure:13676: checking whether to ignore system()s return value" >&5 +echo "$as_me:16829: checking whether to ignore system()s return value" >&5 +echo $ECHO_N "checking whether to ignore system()s return value... $ECHO_C" >&6 # Check whether --enable-broken-system-fix or --disable-broken-system-fix was given. if test "${enable_broken_system_fix+set}" = set; then enableval="$enable_broken_system_fix" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define IGNORE_SYSTEM_STATUS 1 EOF - + fi else - enableval=no -fi - -echo "$ac_t""$enableval" 1>&6 + enableval=no +fi; +echo "$as_me:16845: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&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:13696: checking for directory containing tin.defaults file" >&5 +echo "$as_me:16849: checking for directory containing tin.defaults file" >&5 +echo $ECHO_N "checking for directory containing tin.defaults file... $ECHO_C" >&6 # Check whether --with-defaults-dir or --without-defaults-dir was given. if test "${with_defaults_dir+set}" = set; then withval="$with_defaults_dir" - : + else withval="${TIN_DEFAULTS_DIR:-/etc/tin}" -fi -if true ; then +fi; if true ; then if test "x$prefix" != xNONE; then cf_path_syntax="$prefix" @@ -13728,54 +16882,54 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } + { { echo "$as_me:16885: error: expected a pathname, not \"$withval\"" >&5 +echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } ;; esac fi eval TIN_DEFAULTS_DIR="$withval" -echo "$ac_t""$TIN_DEFAULTS_DIR" 1>&6 -cat >> confdefs.h <&5 +echo "${ECHO_T}$TIN_DEFAULTS_DIR" >&6 +cat >>confdefs.h <&6 -echo "configure:13747: checking whether to enable IPv6" >&5 +echo "$as_me:16901: checking whether to enable IPv6" >&5 +echo $ECHO_N "checking whether to enable IPv6... $ECHO_C" >&6 # Check whether --enable-ipv6 or --disable-ipv6 was given. if test "${enable_ipv6+set}" = set; then enableval="$enable_ipv6" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - : + : else - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define ENABLE_IPV6 1 EOF fi else - enableval=yes - cat >> confdefs.h <<\EOF + enableval=yes + cat >>confdefs.h <<\EOF #define ENABLE_IPV6 1 EOF - -fi - -echo "$ac_t""$enableval" 1>&6 +fi; +echo "$as_me:16923: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 if test "$enableval" = "yes"; then - -echo $ac_n "checking ipv6 stack type""... $ac_c" 1>&6 -echo "configure:13775: checking ipv6 stack type" >&5 -if eval "test \"`echo '$''{'cf_cv_ipv6type'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:16927: checking ipv6 stack type" >&5 +echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6 +if test "${cf_cv_ipv6type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_cv_ipv6type=unknown for i in solaris inria kame linux-glibc linux-libinet6 toshiba v6d zeta do @@ -13790,57 +16944,54 @@ do fi ;; (inria) - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 16948 "configure" #include "confdefs.h" #include #ifdef IPV6_INRIA_VERSION yes #endif -EOF +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* cf_cv_ipv6type=$i fi -rm -f conftest* +rm -rf conftest* ;; (kame) - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 16965 "configure" #include "confdefs.h" #include #ifdef __KAME__ yes #endif -EOF +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* cf_cv_ipv6type=$i fi -rm -f conftest* +rm -rf conftest* ;; (linux-glibc) - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 16982 "configure" #include "confdefs.h" #include #if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 yes #endif -EOF +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* cf_cv_ipv6type=$i fi -rm -f conftest* +rm -rf conftest* ;; (linux-libinet6) @@ -13853,57 +17004,54 @@ rm -f conftest* fi ;; (toshiba) - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 17008 "configure" #include "confdefs.h" #include #ifdef _TOSHIBA_INET6 yes #endif -EOF +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* cf_cv_ipv6type=$i fi -rm -f conftest* +rm -rf conftest* ;; (v6d) - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 17025 "configure" #include "confdefs.h" #include #ifdef __V6D__ yes #endif -EOF +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* cf_cv_ipv6type=$i fi -rm -f conftest* +rm -rf conftest* ;; (zeta) - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 17042 "configure" #include "confdefs.h" #include #ifdef _ZETA_MINAMI_INET6 yes #endif -EOF +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* cf_cv_ipv6type=$i fi -rm -f conftest* +rm -rf conftest* ;; esac @@ -13913,17 +17061,14 @@ rm -f conftest* done fi - -echo "$ac_t""$cf_cv_ipv6type" 1>&6 - - - +echo "$as_me:17064: result: $cf_cv_ipv6type" >&5 +echo "${ECHO_T}$cf_cv_ipv6type" >&6 cf_ipv6lib=none cf_ipv6dir=none -echo $ac_n "checking for IPv6 library if required""... $ac_c" 1>&6 -echo "configure:13927: checking for IPv6 library if required" >&5 +echo "$as_me:17070: checking for IPv6 library if required" >&5 +echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6 case $cf_cv_ipv6type in (solaris) ;; @@ -13952,30 +17097,44 @@ case $cf_cv_ipv6type in cf_ipv6dir=v6 ;; esac -echo "$ac_t""$cf_ipv6lib" 1>&6 +echo "$as_me:17100: result: $cf_ipv6lib" >&5 +echo "${ECHO_T}$cf_ipv6lib" >&6 if test "$cf_ipv6lib" != "none"; then - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 17106 "configure" #include "confdefs.h" #include #include #include #include -int main() { +int +main (void) +{ getaddrinfo(0, 0, 0, 0) -; return 0; } -EOF -if { (eval echo configure:13972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:17122: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:17125: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:17128: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17131: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 - - cf_search= # collect the current set of include-directories from compiler flags @@ -13986,7 +17145,7 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then case $cf_header_path in (-I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` - + test "x$cf_header_path" != "xNONE" && \ test -d "$cf_header_path" && \ { @@ -14008,7 +17167,6 @@ fi cf_search= - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -14020,7 +17178,6 @@ test -d "$prefix" && \ test -d $prefix/$cf_ipv6dir/include/$cf_ipv6dir && cf_search="$cf_search $prefix/$cf_ipv6dir/include/$cf_ipv6dir" } - for cf_subdir_prefix in \ /usr \ /usr/local \ @@ -14029,7 +17186,7 @@ for cf_subdir_prefix in \ /opt/local \ $HOME do - + test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ (test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { @@ -14043,7 +17200,6 @@ test -d "$cf_subdir_prefix" && \ done - test "$includedir" != NONE && \ test "$includedir" != "/usr/include" && \ test -d "$includedir" && { @@ -14065,7 +17221,7 @@ cf_search="$cf_search $cf_header_path_li cf_header=$cf_incdir/netinet/ip6.h if test -f $cf_header then - + if test -n "$cf_incdir" ; then for cf_add_incdir in $cf_incdir do @@ -14088,24 +17244,41 @@ if test -n "$cf_incdir" ; then if test "$GCC" = yes then cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 17252 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ printf("Hello") -; return 0; } -EOF -if { (eval echo configure:14101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:17264: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:17267: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:17270: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17273: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_have_incdir=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -14114,8 +17287,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:14118: testing adding $cf_add_incdir to include-path ..." 1>&5 - +echo "${as_me:-configure}:17290: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -14137,87 +17309,116 @@ fi fi test -n "$verbose" && echo " ... tested $cf_header" 1>&6 done - + fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - eval 'cf_cv_have_lib_'$cf_ipv6lib'=no' cf_libdir="" - echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 -echo "configure:14149: 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 < -/* Override any gcc2 internal prototype to avoid an error. */ + echo "$as_me:17318: checking for getaddrinfo" >&5 +echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6 +if test "${ac_cv_func_getaddrinfo+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 17324 "configure" +#include "confdefs.h" +#define getaddrinfo autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef getaddrinfo + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char getaddrinfo(); + builtin and then its argument prototype would still apply. */ +char getaddrinfo (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_getaddrinfo) || defined (__stub___getaddrinfo) -choke me -#else -getaddrinfo(); +#error found stub for getaddrinfo #endif -; return 0; } -EOF -if { (eval echo configure:14177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_getaddrinfo=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_getaddrinfo=no" -fi -rm -rf conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'getaddrinfo`\" = yes"; then - echo "$ac_t""yes" 1>&6 + return getaddrinfo (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:17355: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:17358: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:17361: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17364: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_getaddrinfo=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_getaddrinfo=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:17374: result: $ac_cv_func_getaddrinfo" >&5 +echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6 +if test $ac_cv_func_getaddrinfo = yes; then eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' else - echo "$ac_t""no" 1>&6 cf_save_LIBS="$LIBS" - echo $ac_n "checking for getaddrinfo in -l$cf_ipv6lib""... $ac_c" 1>&6 -echo "configure:14197: checking for getaddrinfo in -l$cf_ipv6lib" >&5 + echo "$as_me:17381: checking for getaddrinfo in -l$cf_ipv6lib" >&5 +echo $ECHO_N "checking for getaddrinfo in -l$cf_ipv6lib... $ECHO_C" >&6 LIBS="-l$cf_ipv6lib $LIBS" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 17385 "configure" #include "confdefs.h" #include #include #include #include -int main() { +int +main (void) +{ getaddrinfo(0, 0, 0, 0) -; return 0; } -EOF -if { (eval echo configure:14211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:17401: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:17404: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:17407: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17410: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:17412: result: yes" >&5 +echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +echo "$as_me:17419: result: no" >&5 +echo "${ECHO_T}no" >&6 - echo "$ac_t""no" 1>&6 - cf_search= cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then @@ -14226,7 +17427,7 @@ if test -n "${LDFLAGS}${LIBS}" ; then case $cf_library_path in (-L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` - + test "x$cf_library_path" != "xNONE" && \ test -d "$cf_library_path" && \ { @@ -14244,10 +17445,8 @@ test -d "$cf_library_path" && \ done fi - cf_search= - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -14259,7 +17458,6 @@ test -d "$prefix" && \ test -d $prefix/$cf_ipv6dir/lib/$cf_ipv6dir && cf_search="$cf_search $prefix/$cf_ipv6dir/lib/$cf_ipv6dir" } - for cf_subdir_prefix in \ /usr \ /usr/local \ @@ -14268,7 +17466,7 @@ for cf_subdir_prefix in \ /opt/local \ $HOME do - + test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ (test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { @@ -14282,69 +17480,82 @@ test -d "$cf_subdir_prefix" && \ done - cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo $ac_n "checking for -l$cf_ipv6lib in $cf_libdir""... $ac_c" 1>&6 -echo "configure:14292: checking for -l$cf_ipv6lib in $cf_libdir" >&5 + echo "$as_me:17487: checking for -l$cf_ipv6lib in $cf_libdir" >&5 +echo $ECHO_N "checking for -l$cf_ipv6lib in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 17491 "configure" #include "confdefs.h" #include #include #include #include -int main() { +int +main (void) +{ getaddrinfo(0, 0, 0, 0) -; return 0; } -EOF -if { (eval echo configure:14306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:17507: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:17510: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:17513: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17516: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:17518: result: yes" >&5 +echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - echo "$ac_t""no" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +echo "$as_me:17525: result: no" >&5 +echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done - + fi -rm -rf conftest* - +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib - if test $cf_found_library = no ; then - { echo "configure: error: No $cf_ipv6lib library found, cannot continue. You must fetch lib$cf_ipv6lib.a -from an appropriate IPv6 kit and compile beforehand." 1>&2; exit 1; } + { { echo "$as_me:17540: error: No $cf_ipv6lib library found, cannot continue. You must fetch lib$cf_ipv6lib.a +from an appropriate IPv6 kit and compile beforehand." >&5 +echo "$as_me: error: No $cf_ipv6lib library found, cannot continue. You must fetch lib$cf_ipv6lib.a +from an appropriate IPv6 kit and compile beforehand." >&2;} + { (exit 1); exit 1; }; } fi -fi - - - +fi -echo $ac_n "checking working getaddrinfo""... $ac_c" 1>&6 -echo "configure:14339: checking working getaddrinfo" >&5 -if eval "test \"`echo '$''{'cf_cv_getaddrinfo'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:17548: checking working getaddrinfo" >&5 +echo $ECHO_N "checking working getaddrinfo... $ECHO_C" >&6 +if test "${cf_cv_getaddrinfo+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + if test "$cross_compiling" = yes; then cf_cv_getaddrinfo=unknown else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 17558 "configure" #include "confdefs.h" #include @@ -14422,158 +17633,186 @@ int main(void) ${cf_cv_main_return:-return}(1); } -EOF -if { (eval echo configure:14427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:17638: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:17641: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:17643: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17646: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_getaddrinfo=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - cf_cv_getaddrinfo=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_getaddrinfo=no fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi - -echo "$ac_t""$cf_cv_getaddrinfo" 1>&6 +echo "$as_me:17659: result: $cf_cv_getaddrinfo" >&5 +echo "${ECHO_T}$cf_cv_getaddrinfo" >&6 if test "$cf_cv_getaddrinfo" = yes ; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_GAI_STRERROR 1 EOF - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define HAVE_GETADDRINFO 1 EOF fi - if test "$cf_cv_getaddrinfo" != "yes"; then if test "$cf_cv_ipv6type" != "linux"; then - echo "configure: warning: You must get working getaddrinfo() function, -or you can specify "--disable-ipv6"" 1>&2 + { echo "$as_me:17675: WARNING: You must get working getaddrinfo() function, +or you can specify \"--disable-ipv6\"" >&5 +echo "$as_me: WARNING: You must get working getaddrinfo() function, +or you can specify \"--disable-ipv6\"" >&2;} else - echo "configure: warning: The getaddrinfo() implementation on your system seems be buggy. + { echo "$as_me:17680: WARNING: The getaddrinfo() implementation on your system seems be buggy. +You should upgrade your system library to the newest version +of GNU C library (aka glibc)." >&5 +echo "$as_me: WARNING: The getaddrinfo() implementation on your system seems be buggy. You should upgrade your system library to the newest version -of GNU C library (aka glibc)." 1>&2 +of GNU C library (aka glibc)." >&2;} fi fi - fi + for ac_func in getaddrinfo getnameinfo do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14471: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:17694: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 17700 "configure" +#include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + builtin and then its argument prototype would still apply. */ +char $ac_func (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); +#error found stub for $ac_func #endif -; return 0; } + return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:17731: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:17734: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:17737: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17740: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:17750: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_$ac_func=no" -fi -rm -rf conftest* -fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}" + LIBOBJS="$LIBOBJS $ac_func.$ac_objext" fi done - - ### should we use 64 bit article numbers if possible? -echo $ac_n "checking whether to enable long article numbers""... $ac_c" 1>&6 -echo "configure:14528: checking whether to enable long article numbers" >&5 +echo "$as_me:17763: checking whether to enable long article numbers" >&5 +echo $ECHO_N "checking whether to enable long article numbers... $ECHO_C" >&6 # Check whether --enable-long-article-numbers or --disable-long-article-numbers was given. if test "${enable_long_article_numbers+set}" = set; then enableval="$enable_long_article_numbers" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define ENABLE_LONG_ARTICLE_NUMBERS 1 EOF - + fi else - enableval=no -fi - -echo "$ac_t""$enableval" 1>&6 + enableval=no +fi; +echo "$as_me:17779: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 ### 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:14548: checking whether to make a coffee while compiling" >&5 +echo "$as_me:17783: checking whether to make a coffee while compiling" >&5 +echo $ECHO_N "checking whether to make a coffee while compiling... $ECHO_C" >&6 # Check whether --with-coffee or --without-coffee was given. if test "${with_coffee+set}" = set; then withval="$with_coffee" case "$withval" in yes) - echo "$ac_t""yes - with milk - please!" 1>&6 - cat >> confdefs.h <<\EOF + echo "$as_me:17791: result: yes - with milk - please!" >&5 +echo "${ECHO_T}yes - with milk - please!" >&6 + cat >>confdefs.h <<\EOF #define HAVE_COFFEE 1 EOF ;; *) - echo "$ac_t""no" 1>&6 + echo "$as_me:17799: result: no" >&5 +echo "${ECHO_T}no" >&6 ;; esac else - echo "$ac_t""no" 1>&6 -fi - + echo "$as_me:17804: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi; ### checks for compiler characteristics -echo $ac_n "checking for makeflags variable""... $ac_c" 1>&6 -echo "configure:14573: checking for makeflags variable" >&5 -if eval "test \"`echo '$''{'cf_cv_makeflags'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:17810: checking for makeflags variable" >&5 +echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 +if test "${cf_cv_makeflags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_cv_makeflags='' for cf_option in '-${MAKEFLAGS}' '${MFLAGS}' do @@ -14594,555 +17833,725 @@ CF_EOF esac break ;; - (.-) ;; - (*) echo "given option \"$cf_option\", no match \"$cf_result\"" + (.-) + ;; + (*) + +echo "${as_me:-configure}:17840: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 + ;; esac done rm -f cf_makeflags.tmp fi - -echo "$ac_t""$cf_cv_makeflags" 1>&6 - - +echo "$as_me:17848: result: $cf_cv_makeflags" >&5 +echo "${ECHO_T}$cf_cv_makeflags" >&6 ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:14619: checking for working const" >&5 -if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_main_return=return + +echo "$as_me:17858: checking for an ANSI C-conforming const" >&5 +echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 +if test "${ac_cv_c_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 17864 "configure" #include "confdefs.h" -int main() { +int +main (void) +{ +/* FIXME: Include the comments suggested by Paul. */ +#ifndef __cplusplus + /* Ultrix mips cc rejects this. */ + typedef int charset[2]; + const charset x; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *ccp; + char **p; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + ccp = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++ccp; + p = (char**) ccp; + ccp = (char const *const *) p; + { /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; }; + struct s *b; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + } +#endif -/* Ultrix mips cc rejects this. */ -typedef int charset[2]; const charset x; -/* SunOS 4.1.1 cc rejects this. */ -char const *const *ccp; -char **p; -/* NEC SVR4.0.2 mips cc rejects this. */ -struct point {int x, y;}; -static struct point const zero = {0,0}; -/* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in an arm - of an if-expression whose if-part is not a constant expression */ -const char *g = "string"; -ccp = &g + (g ? g-g : 0); -/* HPUX 7.0 cc rejects these. */ -++ccp; -p = (char**) ccp; -ccp = (char const *const *) p; -{ /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; -} -{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; -} -{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; -} -{ /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; -} -{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; + ; + return 0; } - -; return 0; } -EOF -if { (eval echo configure:14673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:17922: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:17925: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:17928: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17931: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_const=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_const=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_const=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_c_const" 1>&6 +echo "$as_me:17941: result: $ac_cv_c_const" >&5 +echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then - cat >> confdefs.h <<\EOF -#define const + +cat >>confdefs.h <<\EOF +#define const EOF fi -echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:14694: checking for inline" >&5 -if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:17951: checking for inline" >&5 +echo $ECHO_N "checking for inline... $ECHO_C" >&6 +if test "${ac_cv_c_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 17959 "configure" #include "confdefs.h" - -int main() { -} $ac_kw foo() { -; return 0; } -EOF -if { (eval echo configure:14708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* +#ifndef __cplusplus +static $ac_kw int static_foo () {return 0; } +$ac_kw int foo () {return 0; } +#endif + +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:17968: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:17971: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:17974: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17977: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext done fi - -echo "$ac_t""$ac_cv_c_inline" 1>&6 -case "$ac_cv_c_inline" in +echo "$as_me:17988: result: $ac_cv_c_inline" >&5 +echo "${ECHO_T}$ac_cv_c_inline" >&6 +case $ac_cv_c_inline in inline | yes) ;; - no) cat >> confdefs.h <<\EOF -#define inline + no) +cat >>confdefs.h <<\EOF +#define inline EOF ;; - *) cat >> confdefs.h <>confdefs.h <&6 -echo "configure:14735: 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 +echo "$as_me:18003: checking for ansi token expansion/substitution" >&5 +echo $ECHO_N "checking for ansi token expansion/substitution... $ECHO_C" >&6 +if test "${cf_cv_cpp_expands+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 18010 "configure" #include "confdefs.h" #define string(n) #n -int main() { +int +main (void) +{ char *s = string(token) -; return 0; } -EOF -if { (eval echo configure:14749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:18023: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:18026: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:18029: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18032: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_cpp_expands=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_cpp_expands=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_cpp_expands=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$ac_t""$cf_cv_cpp_expands" 1>&6 -test $cf_cv_cpp_expands = yes && cat >> confdefs.h <<\EOF +echo "$as_me:18044: result: $cf_cv_cpp_expands" >&5 +echo "${ECHO_T}$cf_cv_cpp_expands" >&6 +test $cf_cv_cpp_expands = yes && cat >>confdefs.h <<\EOF #define CPP_DOES_EXPAND 1 EOF - - -echo $ac_n "checking for ansi token concatenation""... $ac_c" 1>&6 -echo "configure:14770: 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 +echo "$as_me:18050: checking for ansi token concatenation" >&5 +echo $ECHO_N "checking for ansi token concatenation... $ECHO_C" >&6 +if test "${cf_cv_cpp_concats+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 18057 "configure" #include "confdefs.h" #define concat(a,b) a ## b -int main() { +int +main (void) +{ char *firstlast = "y", *s = concat(first,last) -; return 0; } -EOF -if { (eval echo configure:14784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:18070: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:18073: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:18076: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18079: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_cpp_concats=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_cpp_concats=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_cpp_concats=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$ac_t""$cf_cv_cpp_concats" 1>&6 -test $cf_cv_cpp_concats = yes && cat >> confdefs.h <<\EOF +echo "$as_me:18091: result: $cf_cv_cpp_concats" >&5 +echo "${ECHO_T}$cf_cv_cpp_concats" >&6 +test $cf_cv_cpp_concats = yes && cat >>confdefs.h <<\EOF #define CPP_DOES_CONCAT 1 EOF - - -echo $ac_n "checking if nested parameters work""... $ac_c" 1>&6 -echo "configure:14805: 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 +echo "$as_me:18097: checking if nested parameters work" >&5 +echo $ECHO_N "checking if nested parameters work... $ECHO_C" >&6 +if test "${cf_cv_nested_params+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 18104 "configure" #include "confdefs.h" -int main() { +int +main (void) +{ extern void (*sigdisp(int sig, void (*func)(int sig)))(int sig) -; return 0; } -EOF -if { (eval echo configure:14818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:18116: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:18119: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:18122: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18125: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_nested_params=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_nested_params=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_nested_params=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$ac_t""$cf_cv_nested_params" 1>&6 -test $cf_cv_nested_params = yes && cat >> confdefs.h <<\EOF +echo "$as_me:18137: result: $cf_cv_nested_params" >&5 +echo "${ECHO_T}$cf_cv_nested_params" >&6 +test $cf_cv_nested_params = yes && cat >>confdefs.h <<\EOF #define HAVE_NESTED_PARAMS 1 EOF - - - ### Checks for header files. -echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:14841: 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 +echo "$as_me:18144: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 18150 "configure" #include "confdefs.h" #include #include #include #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14854: \"$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* + +_ACEOF +if { (eval echo "$as_me:18158: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:18164: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_cv_header_stdc=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_header_stdc=no fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 18186 "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "memchr" >/dev/null 2>&1; then : else - rm -rf conftest* ac_cv_header_stdc=no fi -rm -f conftest* +rm -rf conftest* 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 <conftest.$ac_ext <<_ACEOF +#line 18204 "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "free" >/dev/null 2>&1; then : else - rm -rf conftest* ac_cv_header_stdc=no fi -rm -f conftest* +rm -rf conftest* fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 18225 "configure" #include "confdefs.h" #include -#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int main () { int i; for (i = 0; i < 256; i++) -if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); -exit (0); } +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif -EOF -if { (eval echo configure:14921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main (void) +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + $ac_main_return(2); + $ac_main_return (0); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:18251: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:18254: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:18256: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18259: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_header_stdc=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_header_stdc=no fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi fi - -echo "$ac_t""$ac_cv_header_stdc" 1>&6 +echo "$as_me:18272: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define STDC_HEADERS 1 EOF fi ac_header_dirent=no -for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h -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:14949: 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 +for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +echo "$as_me:18285: checking for $ac_hdr that defines DIR" >&5 +echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 18291 "configure" #include "confdefs.h" #include #include <$ac_hdr> -int main() { -DIR *dirp = 0; -; return 0; } -EOF -if { (eval echo configure:14962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_dirent_$ac_safe=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_dirent_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:18309: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:18312: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18315: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_Header=no" +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:18325: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + +ac_header_dirent=$ac_hdr; break fi + 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:14987: 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 + echo "$as_me:18338: checking for opendir in -ldir" >&5 +echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 +if test "${ac_cv_lib_dir_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 18346 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir(); - -int main() { -opendir() -; return 0; } -EOF -if { (eval echo configure:15006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char opendir (); +int +main (void) +{ +opendir (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:18365: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:18368: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:18371: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18374: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dir_opendir=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_dir_opendir=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:18385: result: $ac_cv_lib_dir_opendir" >&5 +echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 +if test $ac_cv_lib_dir_opendir = yes; then LIBS="$LIBS -ldir" -else - echo "$ac_t""no" 1>&6 fi else -echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:15028: 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 + echo "$as_me:18392: checking for opendir in -lx" >&5 +echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 +if test "${ac_cv_lib_x_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 18400 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir(); - -int main() { -opendir() -; return 0; } -EOF -if { (eval echo configure:15047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char opendir (); +int +main (void) +{ +opendir (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:18419: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:18422: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:18425: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18428: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_x_opendir=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_x_opendir=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:18439: result: $ac_cv_lib_x_opendir" >&5 +echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 +if test $ac_cv_lib_x_opendir = yes; then LIBS="$LIBS -lx" -else - echo "$ac_t""no" 1>&6 fi fi -echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:15070: 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 +echo "$as_me:18447: checking whether time.h and sys/time.h may both be included" >&5 +echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 +if test "${ac_cv_header_time+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 18453 "configure" #include "confdefs.h" #include #include #include -int main() { -struct tm *tp; -; return 0; } -EOF -if { (eval echo configure:15084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + +int +main (void) +{ +if ((struct tm *) 0) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:18469: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:18472: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:18475: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18478: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_header_time=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_time=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_header_time=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_header_time" 1>&6 +echo "$as_me:18488: result: $ac_cv_header_time" >&5 +echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define TIME_WITH_SYS_TIME 1 EOF fi -echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:15105: 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 +echo "$as_me:18498: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 +if test "${ac_cv_header_sys_wait_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 18504 "configure" #include "confdefs.h" #include #include #ifndef WEXITSTATUS -#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) +# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) #endif #ifndef WIFEXITED -#define WIFEXITED(stat_val) (((stat_val) & 255) == 0) +# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif -int main() { -int s; -wait (&s); -s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; -; return 0; } -EOF -if { (eval echo configure:15126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + +int +main (void) +{ + int s; + wait (&s); + s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:18526: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:18529: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:18532: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18535: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_header_sys_wait_h=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_sys_wait_h=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_header_sys_wait_h=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6 +echo "$as_me:18545: result: $ac_cv_header_sys_wait_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 if test $ac_cv_header_sys_wait_h = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_SYS_WAIT_H 1 EOF fi - for cf_hdr in \ argz.h \ arpa/inet.h \ @@ -15202,134 +18611,109 @@ for cf_hdr in \ wctype.h \ do - echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6 -echo "configure:15207: checking for $cf_hdr" >&5 - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for $cf_hdr... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 18617 "configure" #include "confdefs.h" #include #include <$cf_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15217: \"$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* +_ACEOF +if { (eval echo "$as_me:18624: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:18630: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then cf_found=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* cf_found=no fi -rm -f conftest* -echo "$ac_t""$cf_found" 1>&6 +rm -f conftest.err conftest.$ac_ext +echo "$as_me:18648: result: $cf_found" >&5 +echo "${ECHO_T}$cf_found" >&6 if test $cf_found = yes ; then - + cf_tr_hdr=`echo "$cf_hdr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6 -echo "configure:15255: 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:15265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 18678 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:18682: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:18688: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - echo "$ac_t""no" 1>&6 + ac_cpp_err=yes fi -done - - -if test "$ISC" = yes ; then - for ac_hdr in sys/termio.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:15297: 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:15307: \"$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" +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done -fi if test "$ac_cv_header_termios_h" = yes ; then case "$CFLAGS $CPPFLAGS" in (*-D_POSIX_SOURCE*) @@ -15337,62 +18721,88 @@ if test "$ac_cv_header_termios_h" = yes (*) termios_bad=maybe ;; esac if test "$termios_bad" = maybe ; then - echo $ac_n "checking whether termios.h needs _POSIX_SOURCE""... $ac_c" 1>&6 -echo "configure:15342: checking whether termios.h needs _POSIX_SOURCE" >&5 - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 18727 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ struct termios foo; int x = foo.c_iflag -; return 0; } -EOF -if { (eval echo configure:15351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:18739: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:18742: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:18745: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18748: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then termios_bad=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - cat > conftest.$ac_ext <&5 +cat conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +#line 18756 "configure" #include "confdefs.h" #define _POSIX_SOURCE #include -int main() { +int +main (void) +{ struct termios foo; int x = foo.c_iflag -; return 0; } -EOF -if { (eval echo configure:15369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:18770: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:18773: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:18776: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18779: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then termios_bad=unknown else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - termios_bad=yes cat >> confdefs.h <<\EOF + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +termios_bad=yes +cat >>confdefs.h <<\EOF #define _POSIX_SOURCE 1 EOF fi -rm -f conftest* - +rm -f conftest.$ac_objext conftest.$ac_ext + fi -rm -f conftest* - echo "$ac_t""$termios_bad" 1>&6 +rm -f conftest.$ac_objext conftest.$ac_ext + echo "$as_me:18795: result: $termios_bad" >&5 +echo "${ECHO_T}$termios_bad" >&6 fi fi - - -echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6 -echo "configure:15392: checking declaration of size-change" >&5 -if eval "test \"`echo '$''{'cf_cv_sizechange'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:18800: checking declaration of size-change" >&5 +echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 +if test "${cf_cv_sizechange+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_cv_sizechange=unknown cf_save_CPPFLAGS="$CPPFLAGS" @@ -15400,9 +18810,15 @@ for cf_opts in "" "NEED_PTEM_H" do CPPFLAGS="$cf_save_CPPFLAGS" - test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 18821 "configure" #include "confdefs.h" #include #ifdef HAVE_TERMIOS_H @@ -15412,45 +18828,60 @@ do #include #endif #endif + #ifdef NEED_PTEM_H /* This is a workaround for SCO: they neglected to define struct winsize in * termios.h -- it's only in termio.h and ptem.h */ -#include -#include +#include +#include #endif -#if !defined(sun) || !defined(HAVE_TERMIOS_H) + +#ifdef HAVE_SYS_IOCTL_H #include #endif -int main() { +int +main (void) +{ #ifdef TIOCGSIZE - struct ttysize win; /* FIXME: what system is this? */ + struct ttysize win; /* SunOS 3.0... */ int y = win.ts_lines; int x = win.ts_cols; #else #ifdef TIOCGWINSZ - struct winsize win; + struct winsize win; /* everything else */ int y = win.ws_row; int x = win.ws_col; #else no TIOCGSIZE or TIOCGWINSZ #endif /* TIOCGWINSZ */ #endif /* TIOCGSIZE */ - -; return 0; } -EOF -if { (eval echo configure:15445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:18867: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:18870: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:18873: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18876: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_sizechange=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_sizechange=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_sizechange=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$cf_save_CPPFLAGS" if test "$cf_cv_sizechange" = yes ; then @@ -15461,16 +18892,17 @@ rm -f conftest* done fi - -echo "$ac_t""$cf_cv_sizechange" 1>&6 +echo "$as_me:18895: result: $cf_cv_sizechange" >&5 +echo "${ECHO_T}$cf_cv_sizechange" >&6 if test "$cf_cv_sizechange" != no ; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_SIZECHANGE 1 EOF case $cf_cv_sizechange in (NEED*) - cat >> confdefs.h <>confdefs.h <&6 -echo "configure:15484: 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 +echo "$as_me:18913: checking if sys/time.h conflicts with sys/select.h" >&5 +echo $ECHO_N "checking if sys/time.h conflicts with sys/select.h... $ECHO_C" >&6 +if test "${cf_cv_sys_select_timeval+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + for cf_opts in no yes do -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 18922 "configure" #include "confdefs.h" #define yes 1 @@ -15512,366 +18943,847 @@ cat > conftest.$ac_ext < #endif -int main() { +int +main (void) +{ struct timeval foo -; return 0; } -EOF -if { (eval echo configure:15520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:18955: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:18958: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:18961: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18964: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_sys_select_timeval=$cf_opts break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_sys_select_timeval=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_sys_select_timeval=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$ac_t""$cf_cv_sys_select_timeval" 1>&6 -test $cf_cv_sys_select_timeval = yes && cat >> confdefs.h <<\EOF +echo "$as_me:18978: result: $cf_cv_sys_select_timeval" >&5 +echo "${ECHO_T}$cf_cv_sys_select_timeval" >&6 +test $cf_cv_sys_select_timeval = yes && cat >>confdefs.h <<\EOF #define NEED_TIMEVAL_FIX 1 EOF +echo "$as_me:18984: checking for va_copy" >&5 +echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 +if test "${cf_cv_have_va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cat >conftest.$ac_ext <<_ACEOF +#line 18991 "configure" +#include "confdefs.h" +#include -### Checks for Datatypes. -echo $ac_n "checking for gid_t""... $ac_c" 1>&6 -echo "configure:15544: 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 +int +main (void) +{ + + static va_list dst; + static va_list src; + va_copy(dst, src) + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:19008: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:19011: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:19014: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19017: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_va_copy=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_have_va_copy=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:19027: result: $cf_cv_have_va_copy" >&5 +echo "${ECHO_T}$cf_cv_have_va_copy" >&6 + +if test "$cf_cv_have_va_copy" = yes; +then + +cat >>confdefs.h <<\EOF +#define HAVE_VA_COPY 1 +EOF + +else # !cf_cv_have_va_copy + +echo "$as_me:19039: checking for __va_copy" >&5 +echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6 +if test "${cf_cv_have___va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cat >conftest.$ac_ext <<_ACEOF +#line 19046 "configure" +#include "confdefs.h" + +#include + +int +main (void) +{ + + static va_list dst; + static va_list src; + __va_copy(dst, src) + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:19063: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:19066: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:19069: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19072: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have___va_copy=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_have___va_copy=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:19082: result: $cf_cv_have___va_copy" >&5 +echo "${ECHO_T}$cf_cv_have___va_copy" >&6 + +if test "$cf_cv_have___va_copy" = yes +then + +cat >>confdefs.h <<\EOF +#define HAVE___VA_COPY 1 +EOF + +else # !cf_cv_have___va_copy + +echo "$as_me:19094: checking for __builtin_va_copy" >&5 +echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6 +if test "${cf_cv_have___builtin_va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 19101 "configure" #include "confdefs.h" -#include -#if STDC_HEADERS -#include -#include -#endif + +#include + +int +main (void) +{ + + static va_list dst; + static va_list src; + __builtin_va_copy(dst, src) + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:19118: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:19121: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:19124: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19127: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have___builtin_va_copy=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_have___builtin_va_copy=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:19137: result: $cf_cv_have___builtin_va_copy" >&5 +echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6 + +test "$cf_cv_have___builtin_va_copy" = yes && + +cat >>confdefs.h <<\EOF +#define HAVE___BUILTIN_VA_COPY 1 EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])gid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_type_gid_t=yes + +fi # cf_cv_have___va_copy + +fi # cf_cv_have_va_copy + +case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy}" in +(*yes*) + ;; + +(*) + echo "$as_me:19155: checking if we can simply copy va_list" >&5 +echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6 +if test "${cf_cv_pointer_va_list+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - rm -rf conftest* - ac_cv_type_gid_t=no + +cat >conftest.$ac_ext <<_ACEOF +#line 19162 "configure" +#include "confdefs.h" + +#include + +int +main (void) +{ + + va_list dst; + va_list src; + dst = src + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:19179: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:19182: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:19185: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19188: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_pointer_va_list=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_pointer_va_list=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -rm -f conftest* +echo "$as_me:19198: result: $cf_cv_pointer_va_list" >&5 +echo "${ECHO_T}$cf_cv_pointer_va_list" >&6 + + if test "$cf_cv_pointer_va_list" = no + then + echo "$as_me:19203: checking if we can copy va_list indirectly" >&5 +echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6 +if test "${cf_cv_array_va_list+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cat >conftest.$ac_ext <<_ACEOF +#line 19210 "configure" +#include "confdefs.h" + +#include + +int +main (void) +{ + + va_list dst; + va_list src; + *dst = *src + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:19227: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:19230: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:19233: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19236: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_array_va_list=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_array_va_list=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:19246: result: $cf_cv_array_va_list" >&5 +echo "${ECHO_T}$cf_cv_array_va_list" >&6 + test "$cf_cv_array_va_list" = yes && +cat >>confdefs.h <<\EOF +#define ARRAY_VA_LIST 1 +EOF + + fi + ;; +esac + +### Checks for Datatypes. +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:19264: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 19270 "configure" +#include "confdefs.h" +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:19276: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:19279: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:19282: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19285: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_Header=no" +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:19295: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 -if test $ac_cv_type_gid_t = no; then - cat >> confdefs.h <<\EOF +done + +echo "$as_me:19305: checking for gid_t" >&5 +echo $ECHO_N "checking for gid_t... $ECHO_C" >&6 +if test "${ac_cv_type_gid_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 19311 "configure" +#include "confdefs.h" +$ac_includes_default +int +main (void) +{ +if ((gid_t *) 0) + return 0; +if (sizeof (gid_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:19326: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:19329: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:19332: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19335: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_gid_t=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_gid_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:19345: result: $ac_cv_type_gid_t" >&5 +echo "${ECHO_T}$ac_cv_type_gid_t" >&6 +if test $ac_cv_type_gid_t = yes; then + : +else + +cat >>confdefs.h <&6 -echo "configure:15577: 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 +echo "$as_me:19357: checking for mode_t" >&5 +echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 +if test "${ac_cv_type_mode_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 19363 "configure" #include "confdefs.h" -#include -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* +$ac_includes_default +int +main (void) +{ +if ((mode_t *) 0) + return 0; +if (sizeof (mode_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:19378: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:19381: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:19384: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19387: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_mode_t=yes else - rm -rf conftest* - ac_cv_type_mode_t=no -fi -rm -f conftest* + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_mode_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:19397: result: $ac_cv_type_mode_t" >&5 +echo "${ECHO_T}$ac_cv_type_mode_t" >&6 +if test $ac_cv_type_mode_t = yes; then + : +else -fi -echo "$ac_t""$ac_cv_type_mode_t" 1>&6 -if test $ac_cv_type_mode_t = no; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <&6 -echo "configure:15610: 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 +echo "$as_me:19409: checking for off_t" >&5 +echo $ECHO_N "checking for off_t... $ECHO_C" >&6 +if test "${ac_cv_type_off_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 19415 "configure" #include "confdefs.h" -#include -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* +$ac_includes_default +int +main (void) +{ +if ((off_t *) 0) + return 0; +if (sizeof (off_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:19430: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:19433: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:19436: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19439: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_off_t=yes else - rm -rf conftest* - ac_cv_type_off_t=no -fi -rm -f conftest* + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_off_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:19449: result: $ac_cv_type_off_t" >&5 +echo "${ECHO_T}$ac_cv_type_off_t" >&6 +if test $ac_cv_type_off_t = yes; then + : +else -fi -echo "$ac_t""$ac_cv_type_off_t" 1>&6 -if test $ac_cv_type_off_t = no; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <&6 -echo "configure:15643: 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 +echo "$as_me:19461: checking for pid_t" >&5 +echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 +if test "${ac_cv_type_pid_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 19467 "configure" #include "confdefs.h" -#include -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* +$ac_includes_default +int +main (void) +{ +if ((pid_t *) 0) + return 0; +if (sizeof (pid_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:19482: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:19485: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:19488: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19491: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else - rm -rf conftest* - ac_cv_type_pid_t=no -fi -rm -f conftest* + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_pid_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:19501: result: $ac_cv_type_pid_t" >&5 +echo "${ECHO_T}$ac_cv_type_pid_t" >&6 +if test $ac_cv_type_pid_t = yes; then + : +else -fi -echo "$ac_t""$ac_cv_type_pid_t" 1>&6 -if test $ac_cv_type_pid_t = no; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <&6 -echo "configure:15676: 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 +echo "$as_me:19513: checking for size_t" >&5 +echo $ECHO_N "checking for size_t... $ECHO_C" >&6 +if test "${ac_cv_type_size_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 19519 "configure" #include "confdefs.h" -#include -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* +$ac_includes_default +int +main (void) +{ +if ((size_t *) 0) + return 0; +if (sizeof (size_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:19534: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:19537: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:19540: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19543: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_size_t=yes else - rm -rf conftest* - ac_cv_type_size_t=no -fi -rm -f conftest* + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_size_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:19553: result: $ac_cv_type_size_t" >&5 +echo "${ECHO_T}$ac_cv_type_size_t" >&6 +if test $ac_cv_type_size_t = yes; then + : +else -fi -echo "$ac_t""$ac_cv_type_size_t" 1>&6 -if test $ac_cv_type_size_t = no; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <&6 -echo "configure:15709: 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 +echo "$as_me:19565: checking for ssize_t" >&5 +echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 +if test "${ac_cv_type_ssize_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 19571 "configure" #include "confdefs.h" -#include -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])ssize_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* +$ac_includes_default +int +main (void) +{ +if ((ssize_t *) 0) + return 0; +if (sizeof (ssize_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:19586: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:19589: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:19592: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19595: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_ssize_t=yes else - rm -rf conftest* - ac_cv_type_ssize_t=no -fi -rm -f conftest* + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_ssize_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:19605: result: $ac_cv_type_ssize_t" >&5 +echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 +if test $ac_cv_type_ssize_t = yes; then + : +else -fi -echo "$ac_t""$ac_cv_type_ssize_t" 1>&6 -if test $ac_cv_type_ssize_t = no; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <&6 -echo "configure:15742: 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 +echo "$as_me:19617: checking for time_t" >&5 +echo $ECHO_N "checking for time_t... $ECHO_C" >&6 +if test "${ac_cv_type_time_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 19623 "configure" #include "confdefs.h" -#include -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])time_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* +$ac_includes_default +int +main (void) +{ +if ((time_t *) 0) + return 0; +if (sizeof (time_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:19638: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:19641: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:19644: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19647: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_time_t=yes else - rm -rf conftest* - ac_cv_type_time_t=no -fi -rm -f conftest* + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_time_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:19657: result: $ac_cv_type_time_t" >&5 +echo "${ECHO_T}$ac_cv_type_time_t" >&6 +if test $ac_cv_type_time_t = yes; then + : +else -fi -echo "$ac_t""$ac_cv_type_time_t" 1>&6 -if test $ac_cv_type_time_t = no; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h < conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 19670 "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "in_addr_t" >/dev/null 2>&1; then : else - rm -rf conftest* - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 19681 "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "in_addr_t" >/dev/null 2>&1; then : else - rm -rf conftest* - - echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6 -echo "configure:15797: checking for in_addr_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_in_addr_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + + echo "$as_me:19691: checking for in_addr_t" >&5 +echo $ECHO_N "checking for in_addr_t... $ECHO_C" >&6 +if test "${ac_cv_type_in_addr_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 19697 "configure" #include "confdefs.h" -#include -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])in_addr_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* +$ac_includes_default +int +main (void) +{ +if ((in_addr_t *) 0) + return 0; +if (sizeof (in_addr_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:19712: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:19715: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:19718: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19721: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_in_addr_t=yes else - rm -rf conftest* - ac_cv_type_in_addr_t=no -fi -rm -f conftest* + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_in_addr_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:19731: result: $ac_cv_type_in_addr_t" >&5 +echo "${ECHO_T}$ac_cv_type_in_addr_t" >&6 +if test $ac_cv_type_in_addr_t = yes; then + : +else -fi -echo "$ac_t""$ac_cv_type_in_addr_t" 1>&6 -if test $ac_cv_type_in_addr_t = no; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <&6 -echo "configure:15838: 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 +echo "$as_me:19749: checking for uid_t in sys/types.h" >&5 +echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 +if test "${ac_cv_type_uid_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 19755 "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "uid_t" >/dev/null 2>&1; then - rm -rf conftest* ac_cv_type_uid_t=yes else - rm -rf conftest* ac_cv_type_uid_t=no fi -rm -f conftest* +rm -rf conftest* fi - -echo "$ac_t""$ac_cv_type_uid_t" 1>&6 +echo "$as_me:19769: result: $ac_cv_type_uid_t" >&5 +echo "${ECHO_T}$ac_cv_type_uid_t" >&6 if test $ac_cv_type_uid_t = no; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define uid_t int EOF - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define gid_t int EOF fi - -echo $ac_n "checking for quad_t""... $ac_c" 1>&6 -echo "configure:15873: checking for quad_t" >&5 -cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for quad_t... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line 19786 "configure" #include "confdefs.h" #include @@ -15880,62 +19792,90 @@ cat > conftest.$ac_ext < #endif /* 0 */ -int main() { +int +main (void) +{ quad_t x; x = 0 -; return 0; } -EOF -if { (eval echo configure:15888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:19804: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:19807: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:19810: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19813: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_quad_t=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_quad_t=no -fi -rm -f conftest* -echo "$ac_t""$ac_cv_quad_t" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_quad_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:19822: result: $ac_cv_quad_t" >&5 +echo "${ECHO_T}$ac_cv_quad_t" >&6 if test $ac_cv_quad_t = yes; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_QUAD_T 1 EOF fi -echo $ac_n "checking for long long""... $ac_c" 1>&6 -echo "configure:15907: checking for long long" >&5 -cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for long long... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line 19834 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ long long x; x = 0 -; return 0; } -EOF -if { (eval echo configure:15918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:19848: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:19851: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:19854: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19857: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_long_long=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_long_long=no -fi -rm -f conftest* -echo "$ac_t""$ac_cv_long_long" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_long_long=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:19866: result: $ac_cv_long_long" >&5 +echo "${ECHO_T}$ac_cv_long_long" >&6 if test $ac_cv_long_long = yes; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_LONG_LONG 1 EOF fi -echo $ac_n "checking for int_least64_t""... $ac_c" 1>&6 -echo "configure:15937: checking for int_least64_t" >&5 -cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for int_least64_t... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line 19878 "configure" #include "confdefs.h" #ifdef HAVE_STDINT_H @@ -15945,31 +19885,44 @@ cat > conftest.$ac_ext < #endif -int main() { +int +main (void) +{ int_least64_t x; x = 0 -; return 0; } -EOF -if { (eval echo configure:15953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:19897: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:19900: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:19903: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19906: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_int_least64_t=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_int_least64_t=no -fi -rm -f conftest* -echo "$ac_t""$ac_cv_int_least64_t" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_int_least64_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:19915: result: $ac_cv_int_least64_t" >&5 +echo "${ECHO_T}$ac_cv_int_least64_t" >&6 if test $ac_cv_int_least64_t = yes; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_INT_LEAST64_T 1 EOF - - echo $ac_n "checking for INT64_C""... $ac_c" 1>&6 -echo "configure:15971: checking for INT64_C" >&5 - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for INT64_C... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 19925 "configure" #include "confdefs.h" #ifdef HAVE_STDINT_H @@ -15979,34 +19932,47 @@ echo "configure:15971: checking for INT6 #include #endif -int main() { +int +main (void) +{ int_least64_t x; x = INT64_C(0) -; return 0; } -EOF -if { (eval echo configure:15987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:19944: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:19947: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:19950: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19953: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_int64_c=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_int64_c=no -fi -rm -f conftest* - echo "$ac_t""$ac_cv_int64_c" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_int64_c=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + echo "$as_me:19962: result: $ac_cv_int64_c" >&5 +echo "${ECHO_T}$ac_cv_int64_c" >&6 if test $ac_cv_int64_c = yes; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_INT64_C 1 EOF fi fi - -echo $ac_n "checking for nl_item""... $ac_c" 1>&6 -echo "configure:16008: checking for nl_item" >&5 -cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for nl_item... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line 19975 "configure" #include "confdefs.h" #ifdef HAVE_LANGINFO_H @@ -16017,23 +19983,37 @@ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:19995: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:19998: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:20001: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:20004: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_nl_item=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_nl_item=no -fi -rm -f conftest* -echo "$ac_t""$ac_cv_nl_item" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_nl_item=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:20013: result: $ac_cv_nl_item" >&5 +echo "${ECHO_T}$ac_cv_nl_item" >&6 if test $ac_cv_nl_item = yes; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_NL_ITEM 1 EOF @@ -16042,246 +20022,308 @@ fi ### Checks for libraries. # 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:16047: 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 +echo "$as_me:20025: checking for UUInitialize in -luu" >&5 +echo $ECHO_N "checking for UUInitialize in -luu... $ECHO_C" >&6 +if test "${ac_cv_lib_uu_UUInitialize+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-luu $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 20033 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char UUInitialize(); - -int main() { -UUInitialize() -; return 0; } -EOF -if { (eval echo configure:16066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_safe=`echo "uudeview.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for uudeview.h""... $ac_c" 1>&6 -echo "configure:16083: 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 + builtin and then its argument prototype would still apply. */ +char UUInitialize (); +int +main (void) +{ +UUInitialize (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:20052: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:20055: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:20058: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:20061: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_uu_UUInitialize=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_uu_UUInitialize=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:20072: result: $ac_cv_lib_uu_UUInitialize" >&5 +echo "${ECHO_T}$ac_cv_lib_uu_UUInitialize" >&6 +if test $ac_cv_lib_uu_UUInitialize = yes; then + echo "$as_me:20075: checking for uudeview.h" >&5 +echo $ECHO_N "checking for uudeview.h... $ECHO_C" >&6 +if test "${ac_cv_header_uudeview_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 20081 "configure" #include "confdefs.h" #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16093: \"$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" +_ACEOF +if { (eval echo "$as_me:20085: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:20091: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_uudeview_h=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_header_uudeview_h=no fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF +echo "$as_me:20110: result: $ac_cv_header_uudeview_h" >&5 +echo "${ECHO_T}$ac_cv_header_uudeview_h" >&6 +if test $ac_cv_header_uudeview_h = yes; then + cat >>confdefs.h <<\EOF #define HAVE_LIBUU 1 EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_UUDEVIEW_H 1 EOF LIBS="$LIBS -luu" - -else - echo "$ac_t""no" 1>&6 -fi - -else - echo "$ac_t""no" 1>&6 fi - +fi # ICU - International Components for Unicode # TODO: do separate checks for -# - unorm_normalize() -# - uidna_IDNToUnicode() +# - unorm_normalize() # deprecated since ICU 56 +# - uidna_IDNToUnicode() # deprecated since ICU 56 # - ubidi_open() # and for IDNA2008 # - uidna_openUTS46() # - uidna_nameToUnicode() +# - unorm2_normalize() cf_try_icuuc="no" cf_try_icuuc46="no" -ac_safe=`echo "unicode/unorm.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for unicode/unorm.h""... $ac_c" 1>&6 -echo "configure:16142: 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 +echo "$as_me:20138: checking for unicode/unorm.h" >&5 +echo $ECHO_N "checking for unicode/unorm.h... $ECHO_C" >&6 +if test "${ac_cv_header_unicode_unorm_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 20144 "configure" #include "confdefs.h" #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16152: \"$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" +_ACEOF +if { (eval echo "$as_me:20148: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:20154: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_unicode_unorm_h=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_header_unicode_unorm_h=no fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - ac_safe=`echo "unicode/ustring.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for unicode/ustring.h""... $ac_c" 1>&6 -echo "configure:16171: 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 +echo "$as_me:20173: result: $ac_cv_header_unicode_unorm_h" >&5 +echo "${ECHO_T}$ac_cv_header_unicode_unorm_h" >&6 +if test $ac_cv_header_unicode_unorm_h = yes; then + + echo "$as_me:20177: checking for unicode/ustring.h" >&5 +echo $ECHO_N "checking for unicode/ustring.h... $ECHO_C" >&6 +if test "${ac_cv_header_unicode_ustring_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 20183 "configure" #include "confdefs.h" #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16181: \"$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" +_ACEOF +if { (eval echo "$as_me:20187: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:20193: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_unicode_ustring_h=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_header_unicode_ustring_h=no fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cat >> confdefs.h <<\EOF +echo "$as_me:20212: result: $ac_cv_header_unicode_ustring_h" >&5 +echo "${ECHO_T}$ac_cv_header_unicode_ustring_h" >&6 +if test $ac_cv_header_unicode_ustring_h = yes; then + + cat >>confdefs.h <<\EOF #define HAVE_UNICODE_UNORM_H 1 EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_UNICODE_USTRING_H 1 EOF - echo $ac_n "checking for unorm_normalize in libicuuc""... $ac_c" 1>&6 -echo "configure:16207: checking for unorm_normalize in libicuuc" >&5 + echo "$as_me:20224: checking for unorm_normalize in libicuuc" >&5 +echo $ECHO_N "checking for unorm_normalize in libicuuc... $ECHO_C" >&6 cf_save_LIBS="$LIBS" cf_try_icuuc="no" LIBS="$LIBS -licuuc" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 20230 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ int32_t needed, ustr = NULL; UErrorCode status; needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status); -; return 0; } -EOF -if { (eval echo configure:16222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - - cat >> confdefs.h <<\EOF + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:20245: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:20248: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:20251: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:20254: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cat >>confdefs.h <<\EOF #define HAVE_LIBICUUC 1 EOF cf_try_icuuc="yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +LIBS=$cf_save_LIBS - LIBS=$cf_save_LIBS - fi -rm -rf conftest* - echo "$ac_t""$cf_try_icuuc" 1>&6 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + echo "$as_me:20269: result: $cf_try_icuuc" >&5 +echo "${ECHO_T}$cf_try_icuuc" >&6 cf_save_LIBS="$LIBS" - ac_safe=`echo "unicode/uidna.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for unicode/uidna.h""... $ac_c" 1>&6 -echo "configure:16242: checking for unicode/uidna.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:20272: checking for unicode/uidna.h" >&5 +echo $ECHO_N "checking for unicode/uidna.h... $ECHO_C" >&6 +if test "${ac_cv_header_unicode_uidna_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 20278 "configure" #include "confdefs.h" #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16252: \"$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" +_ACEOF +if { (eval echo "$as_me:20282: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:20288: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_unicode_uidna_h=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_header_unicode_uidna_h=no fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cat >> confdefs.h <<\EOF +echo "$as_me:20307: result: $ac_cv_header_unicode_uidna_h" >&5 +echo "${ECHO_T}$ac_cv_header_unicode_uidna_h" >&6 +if test $ac_cv_header_unicode_uidna_h = yes; then + + cat >>confdefs.h <<\EOF #define HAVE_UNICODE_UIDNA_H 1 EOF - -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for uidna_nameToUnicode in libicuuc""... $ac_c" 1>&6 -echo "configure:16279: checking for uidna_nameToUnicode in libicuuc" >&5 - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for uidna_nameToUnicode in libicuuc... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 20320 "configure" #include "confdefs.h" #include #include -int main() { +int +main (void) +{ UErrorCode status = U_ZERO_ERROR; UIDNAInfo info = UIDNA_INFO_INITIALIZER; @@ -16289,183 +20331,270 @@ int main() { uidna_openUTS46(UNORM_DEFAULT, &status); uidna_nameToUnicode(uts46, NULL, 0, NULL, 0, &info, &status); uidna_close(uts46); -; return 0; } -EOF -if { (eval echo configure:16295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - - cat >> confdefs.h <<\EOF + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:20339: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:20342: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:20345: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:20348: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cat >>confdefs.h <<\EOF #define HAVE_LIBICUUC_46_API 1 EOF cf_try_icuuc46="yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +LIBS=$cf_save_LIBS - LIBS=$cf_save_LIBS - fi -rm -rf conftest* - echo "$ac_t""$cf_try_icuuc46" 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:16314: 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 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + echo "$as_me:20363: result: $cf_try_icuuc46" >&5 +echo "${ECHO_T}$cf_try_icuuc46" >&6 + echo "$as_me:20365: checking for unicode/ubidi.h" >&5 +echo $ECHO_N "checking for unicode/ubidi.h... $ECHO_C" >&6 +if test "${ac_cv_header_unicode_ubidi_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 20371 "configure" #include "confdefs.h" #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16324: \"$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" +_ACEOF +if { (eval echo "$as_me:20375: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:20381: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_unicode_ubidi_h=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_header_unicode_ubidi_h=no fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cat >> confdefs.h <<\EOF +echo "$as_me:20400: result: $ac_cv_header_unicode_ubidi_h" >&5 +echo "${ECHO_T}$ac_cv_header_unicode_ubidi_h" >&6 +if test $ac_cv_header_unicode_ubidi_h = yes; then + + 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 fi +fi +# IDNA2008 +echo "$as_me:20415: checking for unicode/unorm2.h" >&5 +echo $ECHO_N "checking for unicode/unorm2.h... $ECHO_C" >&6 +if test "${ac_cv_header_unicode_unorm2_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 20421 "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:20425: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:20431: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_unicode_unorm2_h=yes else - echo "$ac_t""no" 1>&6 + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_header_unicode_unorm2_h=no fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:20450: result: $ac_cv_header_unicode_unorm2_h" >&5 +echo "${ECHO_T}$ac_cv_header_unicode_unorm2_h" >&6 +if test $ac_cv_header_unicode_unorm2_h = yes; then + + cat >>confdefs.h <<\EOF +#define HAVE_UNICODE_UNORM2_H 1 +EOF +fi # without icuuc try GNU libunistring for normalization if test $cf_try_icuuc = no ; then - ac_safe=`echo "unitypes.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for unitypes.h""... $ac_c" 1>&6 -echo "configure:16365: checking for unitypes.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:20462: checking for unitypes.h" >&5 +echo $ECHO_N "checking for unitypes.h... $ECHO_C" >&6 +if test "${ac_cv_header_unitypes_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 20468 "configure" #include "confdefs.h" #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16375: \"$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" +_ACEOF +if { (eval echo "$as_me:20472: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:20478: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_unitypes_h=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_header_unitypes_h=no fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - ac_safe=`echo "uninorm.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for uninorm.h""... $ac_c" 1>&6 -echo "configure:16394: checking for uninorm.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:20497: result: $ac_cv_header_unitypes_h" >&5 +echo "${ECHO_T}$ac_cv_header_unitypes_h" >&6 +if test $ac_cv_header_unitypes_h = yes; then + + echo "$as_me:20501: checking for uninorm.h" >&5 +echo $ECHO_N "checking for uninorm.h... $ECHO_C" >&6 +if test "${ac_cv_header_uninorm_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 20507 "configure" #include "confdefs.h" #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16404: \"$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" +_ACEOF +if { (eval echo "$as_me:20511: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:20517: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_uninorm_h=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_header_uninorm_h=no fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cat >> confdefs.h <<\EOF +echo "$as_me:20536: result: $ac_cv_header_uninorm_h" >&5 +echo "${ECHO_T}$ac_cv_header_uninorm_h" >&6 +if test $ac_cv_header_uninorm_h = yes; then + + cat >>confdefs.h <<\EOF #define HAVE_UNITYPES_H 1 EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_UNINORM_H 1 EOF - echo $ac_n "checking for u8_normalize in libunistring""... $ac_c" 1>&6 -echo "configure:16430: checking for u8_normalize in libunistring" >&5 + echo "$as_me:20548: checking for u8_normalize in libunistring" >&5 +echo $ECHO_N "checking for u8_normalize in libunistring... $ECHO_C" >&6 cf_save_LIBS="$LIBS" cf_try_unistring="no" LIBS="$LIBS -lunistring" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 20554 "configure" #include "confdefs.h" #include #include -int main() { +int +main (void) +{ size_t ol = 0; u8_normalize(UNINORM_NFC, (uint8_t *) "x", 2, NULL, &ol); -; return 0; } -EOF -if { (eval echo configure:16445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - - cat >> confdefs.h <<\EOF + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:20569: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:20572: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:20575: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:20578: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cat >>confdefs.h <<\EOF #define HAVE_LIBUNISTRING 1 EOF cf_try_unistring="yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +LIBS=$cf_save_LIBS - LIBS=$cf_save_LIBS - fi -rm -rf conftest* - echo "$ac_t""$cf_try_unistring" 1>&6 - -else - echo "$ac_t""no" 1>&6 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + echo "$as_me:20593: result: $cf_try_unistring" >&5 +echo "${ECHO_T}$cf_try_unistring" >&6 + fi - -else - echo "$ac_t""no" 1>&6 fi fi @@ -16473,412 +20602,520 @@ fi # without icuuc try libidn for Internationalized Domain Names / IDN 2003 # TODO: check for libidn2 if test $cf_try_icuuc = no ; then - echo $ac_n "checking for stringprep_check_version in -lidn""... $ac_c" 1>&6 -echo "configure:16478: 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 + echo "$as_me:20605: checking for stringprep_check_version in -lidn" >&5 +echo $ECHO_N "checking for stringprep_check_version in -lidn... $ECHO_C" >&6 +if test "${ac_cv_lib_idn_stringprep_check_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lidn $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 20613 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char stringprep_check_version(); - -int main() { -stringprep_check_version() -; return 0; } -EOF -if { (eval echo configure:16497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_safe=`echo "stringprep.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for stringprep.h""... $ac_c" 1>&6 -echo "configure:16514: 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 + builtin and then its argument prototype would still apply. */ +char stringprep_check_version (); +int +main (void) +{ +stringprep_check_version (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:20632: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:20635: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:20638: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:20641: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_idn_stringprep_check_version=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_idn_stringprep_check_version=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:20652: result: $ac_cv_lib_idn_stringprep_check_version" >&5 +echo "${ECHO_T}$ac_cv_lib_idn_stringprep_check_version" >&6 +if test $ac_cv_lib_idn_stringprep_check_version = yes; then + echo "$as_me:20655: checking for stringprep.h" >&5 +echo $ECHO_N "checking for stringprep.h... $ECHO_C" >&6 +if test "${ac_cv_header_stringprep_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 20661 "configure" #include "confdefs.h" #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16524: \"$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" +_ACEOF +if { (eval echo "$as_me:20665: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:20671: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_stringprep_h=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_header_stringprep_h=no fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cat >> confdefs.h <<\EOF +echo "$as_me:20690: result: $ac_cv_header_stringprep_h" >&5 +echo "${ECHO_T}$ac_cv_header_stringprep_h" >&6 +if test $ac_cv_header_stringprep_h = yes; then + + cat >>confdefs.h <<\EOF #define HAVE_STRINGPREP_H 1 EOF - ac_safe=`echo "idna.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for idna.h""... $ac_c" 1>&6 -echo "configure:16547: 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 + echo "$as_me:20698: checking for idna.h" >&5 +echo $ECHO_N "checking for idna.h... $ECHO_C" >&6 +if test "${ac_cv_header_idna_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 20704 "configure" #include "confdefs.h" #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16557: \"$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" +_ACEOF +if { (eval echo "$as_me:20708: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:20714: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_idna_h=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_header_idna_h=no fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cat >> confdefs.h <<\EOF +echo "$as_me:20733: result: $ac_cv_header_idna_h" >&5 +echo "${ECHO_T}$ac_cv_header_idna_h" >&6 +if test $ac_cv_header_idna_h = yes; then + + cat >>confdefs.h <<\EOF #define HAVE_IDNA_H 1 EOF - echo $ac_n "checking for idna_to_unicode_lzlz in -lidn""... $ac_c" 1>&6 -echo "configure:16579: 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 + echo "$as_me:20741: checking for idna_to_unicode_lzlz in -lidn" >&5 +echo $ECHO_N "checking for idna_to_unicode_lzlz in -lidn... $ECHO_C" >&6 +if test "${ac_cv_lib_idn_idna_to_unicode_lzlz+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lidn $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 20749 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char idna_to_unicode_lzlz(); - -int main() { -idna_to_unicode_lzlz() -; return 0; } -EOF -if { (eval echo configure:16598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char idna_to_unicode_lzlz (); +int +main (void) +{ +idna_to_unicode_lzlz (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:20768: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:20771: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:20774: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:20777: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_idn_idna_to_unicode_lzlz=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_idn_idna_to_unicode_lzlz=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:20788: result: $ac_cv_lib_idn_idna_to_unicode_lzlz" >&5 +echo "${ECHO_T}$ac_cv_lib_idn_idna_to_unicode_lzlz" >&6 +if test $ac_cv_lib_idn_idna_to_unicode_lzlz = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_IDNA_TO_UNICODE_LZLZ 1 EOF - echo $ac_n "checking for IDNA_USE_STD3_ASCII_RULES""... $ac_c" 1>&6 -echo "configure:16619: checking for IDNA_USE_STD3_ASCII_RULES" >&5 - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for IDNA_USE_STD3_ASCII_RULES... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 20799 "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "IDNA_USE_STD3_ASCII_RULES" >/dev/null 2>&1; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF + + cat >>confdefs.h <<\EOF #define HAVE_IDNA_USE_STD3_ASCII_RULES 1 EOF - echo "$ac_t""yes" 1>&6 + echo "$as_me:20811: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - rm -rf conftest* - echo "$ac_t""no" 1>&6 - + echo "$as_me:20814: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi -rm -f conftest* +rm -rf conftest* - -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for idna_strerror in -lidn""... $ac_c" 1>&6 -echo "configure:16647: checking for idna_strerror in -lidn" >&5 -ac_lib_var=`echo idn'_'idna_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 + echo "$as_me:20822: checking for idna_strerror in -lidn" >&5 +echo $ECHO_N "checking for idna_strerror in -lidn... $ECHO_C" >&6 +if test "${ac_cv_lib_idn_idna_strerror+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lidn $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 20830 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char idna_strerror(); - -int main() { -idna_strerror() -; return 0; } -EOF -if { (eval echo configure:16666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char idna_strerror (); +int +main (void) +{ +idna_strerror (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:20849: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:20852: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:20855: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:20858: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_idn_idna_strerror=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_idn_idna_strerror=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:20869: result: $ac_cv_lib_idn_idna_strerror" >&5 +echo "${ECHO_T}$ac_cv_lib_idn_idna_strerror" >&6 +if test $ac_cv_lib_idn_idna_strerror = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_IDNA_STRERROR 1 EOF - -else - echo "$ac_t""no" 1>&6 fi - -else - echo "$ac_t""no" 1>&6 fi - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_LIBIDN 1 EOF LIBS="$LIBS -lidn" - -else - echo "$ac_t""no" 1>&6 + fi - -else - echo "$ac_t""no" 1>&6 fi fi # libidnkit - Internationalized Domain Names / IDN 2008 -echo $ac_n "checking for idn_decodename in -lidnkit""... $ac_c" 1>&6 -echo "configure:16715: checking for idn_decodename in -lidnkit" >&5 -ac_lib_var=`echo idnkit'_'idn_decodename | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:20894: checking for idn_decodename in -lidnkit" >&5 +echo $ECHO_N "checking for idn_decodename in -lidnkit... $ECHO_C" >&6 +if test "${ac_cv_lib_idnkit_idn_decodename+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lidnkit $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 20902 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char idn_decodename(); - -int main() { -idn_decodename() -; return 0; } -EOF -if { (eval echo configure:16734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - ac_safe=`echo "idn/api.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for idn/api.h""... $ac_c" 1>&6 -echo "configure:16752: checking for idn/api.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + builtin and then its argument prototype would still apply. */ +char idn_decodename (); +int +main (void) +{ +idn_decodename (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:20921: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:20924: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:20927: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:20930: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_idnkit_idn_decodename=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_idnkit_idn_decodename=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:20941: result: $ac_cv_lib_idnkit_idn_decodename" >&5 +echo "${ECHO_T}$ac_cv_lib_idnkit_idn_decodename" >&6 +if test $ac_cv_lib_idnkit_idn_decodename = yes; then + + echo "$as_me:20945: checking for idn/api.h" >&5 +echo $ECHO_N "checking for idn/api.h... $ECHO_C" >&6 +if test "${ac_cv_header_idn_api_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 20951 "configure" #include "confdefs.h" #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16762: \"$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" +_ACEOF +if { (eval echo "$as_me:20955: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:20961: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_idn_api_h=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_header_idn_api_h=no fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - echo $ac_n "checking for IDN_DECODE_LOOKUP""... $ac_c" 1>&6 -echo "configure:16780: checking for IDN_DECODE_LOOKUP" >&5 +echo "$as_me:20980: result: $ac_cv_header_idn_api_h" >&5 +echo "${ECHO_T}$ac_cv_header_idn_api_h" >&6 +if test $ac_cv_header_idn_api_h = yes; then + + echo "$as_me:20984: checking for IDN_DECODE_LOOKUP" >&5 +echo $ECHO_N "checking for IDN_DECODE_LOOKUP... $ECHO_C" >&6 cf_save_LIBS="$LIBS" LIBS="$LIBS -lidnkit" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 20989 "configure" #include "confdefs.h" #include #include -int main() { +int +main (void) +{ idn_result_t rs; char in[255], out[255]; strcpy(in, "xn--brenfe-fta9a2q.de"); rs = idn_decodename(IDN_DECODE_LOOKUP, &in, &out, 254); idn_result_tostring(rs); -; return 0; } -EOF -if { (eval echo configure:16797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - - cat >> confdefs.h <<\EOF + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:21007: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:21010: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:21013: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21016: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cat >>confdefs.h <<\EOF #define HAVE_LIBIDNKIT 1 EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_IDN_API_H 1 EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_IDN_DECODENAME 1 EOF - echo "$ac_t""yes" 1>&6 + echo "$as_me:21031: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 - LIBS=$cf_save_LIBS - echo "$ac_t""no" 1>&6 - -fi -rm -rf conftest* - -else - echo "$ac_t""no" 1>&6 -fi - + echo "$as_me:21038: result: no" >&5 +echo "${ECHO_T}no" >&6 -else - echo "$ac_t""no" 1>&6 fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +fi if test $use_curses != no ; then cf_cv_termlib=$cf_with_screen else - -if eval "test \"`echo '$''{'cf_cv_termlib'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +if test "${cf_cv_termlib+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_cv_termlib=none -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 21058 "configure" #include "confdefs.h" -int main() { +int +main (void) +{ char *x=(char*)tgoto("",0,0) -; return 0; } -EOF -if { (eval echo configure:16852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - cat > conftest.$ac_ext <&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:21073: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:21076: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21079: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cat >conftest.$ac_ext <<_ACEOF +#line 21082 "configure" #include "confdefs.h" -int main() { +int +main (void) +{ int x=tigetstr("") -; return 0; } -EOF -if { (eval echo configure:16862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:21094: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:21097: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:21100: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21103: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_termlib=terminfo else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - cf_cv_termlib=termcap + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_termlib=termcap fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext test -n "$verbose" && echo " using functions in predefined $cf_cv_termlib LIBS" 1>&6 -echo "${as_me:-configure}:16874: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 - - +echo "${as_me:-configure}:21114: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 if test "$cf_cv_termlib" = none; then # FreeBSD's linker gives bogus results for AC_CHECK_LIB, saying that @@ -16889,27 +21126,41 @@ if test "$cf_cv_termlib" = none; then LIBS="-l$cf_lib $cf_save_LIBS" for cf_func in tigetstr tgetstr do - echo $ac_n "checking for $cf_func in -l$cf_lib""... $ac_c" 1>&6 -echo "configure:16894: checking for $cf_func in -l$cf_lib" >&5 - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 21132 "configure" #include "confdefs.h" -int main() { +int +main (void) +{ int x=$cf_func("") -; return 0; } -EOF -if { (eval echo configure:16903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:21144: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:21147: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:21150: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21153: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_result=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - cf_result=no -fi -rm -rf conftest* - echo "$ac_t""$cf_result" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_result=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + echo "$as_me:21162: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then if test "$cf_func" = tigetstr ; then cf_cv_termlib=terminfo @@ -16925,42 +21176,57 @@ rm -rf conftest* 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:16930: 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 + echo "$as_me:21179: checking for initscr in -lcurses" >&5 +echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6 +if test "${ac_cv_lib_curses_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lcurses $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 21187 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char initscr(); - -int main() { -initscr() -; return 0; } -EOF -if { (eval echo configure:16949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char initscr (); +int +main (void) +{ +initscr (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:21206: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:21209: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:21212: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21215: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_curses_initscr=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_curses_initscr=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:21226: result: $ac_cv_lib_curses_initscr" >&5 +echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6 +if test $ac_cv_lib_curses_initscr = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cf_add_libs="-lcurses" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -16977,46 +21243,59 @@ do done LIBS="$cf_add_libs" -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:16986: 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 + echo "$as_me:21248: checking for tgoto in -ltermcap" >&5 +echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6 +if test "${ac_cv_lib_termcap_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ltermcap $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 21256 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char tgoto(); - -int main() { -tgoto() -; return 0; } -EOF -if { (eval echo configure:17005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char tgoto (); +int +main (void) +{ +tgoto (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:21275: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:21278: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:21281: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21284: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_termcap_tgoto=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_termcap_tgoto=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:21295: result: $ac_cv_lib_termcap_tgoto" >&5 +echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6 +if test $ac_cv_lib_termcap_tgoto = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cf_add_libs="-ltermcap" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -17033,64 +21312,74 @@ do done LIBS="$cf_add_libs" cf_cv_termlib=termcap -else - echo "$ac_t""no" 1>&6 fi fi fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test "$cf_cv_termlib" = none; then - echo "configure: warning: Cannot find -ltermlib, -lcurses, or -ltermcap" 1>&2 + { echo "$as_me:21322: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5 +echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;} fi 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:17054: checking if we should include termcap.h" >&5 + echo "$as_me:21330: checking if we should include termcap.h" >&5 +echo $ECHO_N "checking if we should include termcap.h... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -I$srcdir/include" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 21335 "configure" #include "confdefs.h" #define HAVE_TERMCAP_H 1 #include -int main() { +int +main (void) +{ #ifdef NCURSES_VERSION make an error #endif -; return 0; } -EOF -if { (eval echo configure:17071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:21353: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:21356: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:21359: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21362: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_result=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_result=no -fi -rm -f conftest* - echo "$ac_t""$cf_result" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_result=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + echo "$as_me:21371: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 CFLAGS="$cf_save_CFLAGS" - test $cf_result = yes && cat >> confdefs.h <<\EOF + test $cf_result = yes && cat >>confdefs.h <<\EOF #define HAVE_TERMCAP_H 1 EOF - - -echo $ac_n "checking for term.h""... $ac_c" 1>&6 -echo "configure:17090: checking for term.h" >&5 -if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:21378: checking for term.h" >&5 +echo $ECHO_N "checking for term.h... $ECHO_C" >&6 +if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - # If we found , look for , but always look # for if we do not find the variant. @@ -17106,27 +21395,40 @@ esac for cf_header in $cf_header_list do - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 21399 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> #include <${cf_header}> -int main() { +int +main (void) +{ WINDOW *x -; return 0; } -EOF -if { (eval echo configure:17120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:21413: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:21416: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:21419: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21422: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_term_header=$cf_header break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_term_header=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_term_header=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext done case $cf_cv_term_header in @@ -17135,8 +21437,8 @@ case $cf_cv_term_header in # us use GNU termcap. This handles the most common case. for cf_header in ncurses/term.h ncursesw/term.h do - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 21441 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -17145,58 +21447,72 @@ case $cf_cv_term_header in #else make an error #endif -int main() { +int +main (void) +{ WINDOW *x -; return 0; } -EOF -if { (eval echo configure:17153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:21459: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:21462: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:21465: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21468: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_term_header=$cf_header break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_term_header=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_term_header=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext done ;; esac fi - -echo "$ac_t""$cf_cv_term_header" 1>&6 +echo "$as_me:21483: result: $cf_cv_term_header" >&5 +echo "${ECHO_T}$cf_cv_term_header" >&6 case $cf_cv_term_header in (term.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_TERM_H 1 EOF ;; (ncurses/term.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_NCURSES_TERM_H 1 EOF ;; (ncursesw/term.h) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_NCURSESW_TERM_H 1 EOF ;; esac - - -echo $ac_n "checking if we should include curses.h or termcap.h""... $ac_c" 1>&6 -echo "configure:17196: 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 +echo "$as_me:21510: checking if we should include curses.h or termcap.h" >&5 +echo $ECHO_N "checking if we should include curses.h or termcap.h... $ECHO_C" >&6 +if test "${cf_cv_need_curses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_save_CPPFLAGS="$CPPFLAGS" cf_cv_need_curses_h=no @@ -17209,48 +21525,75 @@ do test -n "$cf_c_opts" && CPPFLAGS="$CPPFLAGS -D$cf_c_opts" test -n "$cf_t_opts" && CPPFLAGS="$CPPFLAGS -D$cf_t_opts" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 21529 "configure" #include "confdefs.h" /* $cf_c_opts $cf_t_opts */ $CHECK_DECL_HDRS -int main() { +int +main (void) +{ char *x = (char *)tgoto("") -; return 0; } -EOF -if { (eval echo configure:17222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:21542: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:21545: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:21548: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21551: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then test "$cf_cv_need_curses_h" = no && { cf_cv_need_curses_h=maybe cf_ok_c_opts=$cf_c_opts cf_ok_t_opts=$cf_t_opts } else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - echo "Recompiling with corrected call (C:$cf_c_opts, T:$cf_t_opts)" >&5 - cat > conftest.$ac_ext <&5 +cat conftest.$ac_ext >&5 +echo "Recompiling with corrected call (C:$cf_c_opts, T:$cf_t_opts)" >&5 + cat >conftest.$ac_ext <<_ACEOF +#line 21563 "configure" #include "confdefs.h" $CHECK_DECL_HDRS -int main() { +int +main (void) +{ char *x = (char *)tgoto("",0,0) -; return 0; } -EOF -if { (eval echo configure:17243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:21576: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:21579: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:21582: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21585: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_need_curses_h=yes cf_ok_c_opts=$cf_c_opts cf_ok_t_opts=$cf_t_opts else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext CPPFLAGS="$cf_save_CPPFLAGS" test "$cf_cv_need_curses_h" = yes && break @@ -17276,50 +21619,49 @@ if test "$cf_cv_need_curses_h" != no ; t fi fi - -echo "$ac_t""$cf_cv_need_curses_h" 1>&6 +echo "$as_me:21622: result: $cf_cv_need_curses_h" >&5 +echo "${ECHO_T}$cf_cv_need_curses_h" >&6 case $cf_cv_need_curses_h in (both) - cat >> confdefs.h <>confdefs.h <> confdefs.h <>confdefs.h <> confdefs.h <>confdefs.h <> confdefs.h <>confdefs.h <> confdefs.h <>confdefs.h <&6 -echo "configure:17319: 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 +echo "$as_me:21660: checking declaration of tputs 3rd param" >&5 +echo $ECHO_N "checking declaration of tputs 3rd param... $ECHO_C" >&6 +if test "${cf_cv_type_outchar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cf_cv_type_outchar="int OutChar(int)" cf_cv_found=no @@ -17330,29 +21672,43 @@ for P in int void; do for Q in int void; do for R in int char; do for S in "" const; do - -echo "${as_me:-configure}:17335: testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 - cat > conftest.$ac_ext <&5 + + cat >conftest.$ac_ext <<_ACEOF +#line 21679 "configure" #include "confdefs.h" $CHECK_DECL_HDRS -int main() { +int +main (void) +{ extern $Q OutChar($R); extern $P tputs ($S char *string, int nlines, $Q (*_f)($R)); tputs("", 1, OutChar) -; return 0; } -EOF -if { (eval echo configure:17347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:21693: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:21696: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:21699: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21702: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_type_outchar="$Q OutChar($R)" cf_cv_found=yes break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext done test $cf_cv_found = yes && break done @@ -17362,12 +21718,13 @@ done done fi - -echo "$ac_t""$cf_cv_type_outchar" 1>&6 +echo "$as_me:21721: result: $cf_cv_type_outchar" >&5 +echo "${ECHO_T}$cf_cv_type_outchar" >&6 case $cf_cv_type_outchar in (int*) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define OUTC_RETURN 1 EOF @@ -17375,7 +21732,8 @@ EOF esac case $cf_cv_type_outchar in (*char*) - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define OUTC_ARGS char c EOF @@ -17389,7 +21747,7 @@ fi cf_tc_funcs= cf_tc_externs= if test ".$cf_cv_termlib" = .terminfo ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define USE_TERMINFO 1 EOF @@ -17397,40 +21755,53 @@ EOF cf_tc_externs="$cf_tc_funcs tgoto tigetstr tputs tigetflag" elif test ".$cf_cv_termlib" = .termcap ; then # BSD 'tputs()' may need 'PC' to be set. - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 21759 "configure" #include "confdefs.h" -int main() { +int +main (void) +{ extern char PC; PC = 0 -; return 0; } -EOF -if { (eval echo configure:17409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - cat >> confdefs.h <<\EOF + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:21771: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:21774: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:21777: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21780: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cat >>confdefs.h <<\EOF #define HAVE_EXTERN_TCAP_PC 1 EOF else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext cf_tc_funcs="tgetint tgetnum tparam tparm" cf_tc_externs="$cf_tc_funcs tgoto tgetstr tputs tgetent tgetflag" fi ### Checks for external-data - -echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6 -echo "configure:17428: 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 +echo "$as_me:21797: checking if external errno is declared" >&5 +echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 +if test "${cf_cv_dcl_errno+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 21804 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -17438,31 +21809,44 @@ else #endif #include #include -#include -int main() { +#include +int +main (void) +{ int x = (int) errno -; return 0; } -EOF -if { (eval echo configure:17447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:21822: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:21825: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:21828: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21831: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_dcl_errno=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_dcl_errno=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_dcl_errno=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_dcl_errno" 1>&6 +echo "$as_me:21842: result: $cf_cv_dcl_errno" >&5 +echo "${ECHO_T}$cf_cv_dcl_errno" >&6 if test "$cf_cv_dcl_errno" = no ; then - + cf_result=`echo "decl_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6 -echo "configure:17475: 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 +echo "$as_me:21857: checking if external errno exists" >&5 +echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 +if test "${cf_cv_have_errno+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 21864 "configure" #include "confdefs.h" #undef errno extern int errno; -int main() { +int +main (void) +{ errno = 2 -; return 0; } -EOF -if { (eval echo configure:17491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:21879: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:21882: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:21885: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21888: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_have_errno=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - cf_cv_have_errno=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_have_errno=no fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_have_errno" 1>&6 +echo "$as_me:21899: result: $cf_cv_have_errno" >&5 +echo "${ECHO_T}$cf_cv_have_errno" >&6 if test "$cf_cv_have_errno" = yes ; then - + cf_result=`echo "have_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6 -echo "configure:17523: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:21915: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 21921 "configure" +#include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + builtin and then its argument prototype would still apply. */ +char $ac_func (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); +#error found stub for $ac_func #endif -; return 0; } -EOF -if { (eval echo configure:17551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_$ac_func=no" -fi -rm -rf conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:21955: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:21958: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21961: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:21971: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_STRERROR 1 EOF else - echo "$ac_t""no" 1>&6 - -echo $ac_n "checking if external sys_nerr is declared""... $ac_c" 1>&6 -echo "configure:17578: 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 +echo "$as_me:21983: checking if external sys_nerr is declared" >&5 +echo $ECHO_N "checking if external sys_nerr is declared... $ECHO_C" >&6 +if test "${cf_cv_dcl_sys_nerr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 21990 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -17588,31 +21995,44 @@ else #endif #include #include -#include -int main() { +#include +int +main (void) +{ int x = (int) sys_nerr -; return 0; } -EOF -if { (eval echo configure:17597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:22008: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:22011: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:22014: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:22017: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_dcl_sys_nerr=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_dcl_sys_nerr=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_dcl_sys_nerr=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_dcl_sys_nerr" 1>&6 +echo "$as_me:22028: result: $cf_cv_dcl_sys_nerr" >&5 +echo "${ECHO_T}$cf_cv_dcl_sys_nerr" >&6 if test "$cf_cv_dcl_sys_nerr" = no ; then - + cf_result=`echo "decl_sys_nerr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6 -echo "configure:17625: 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 +echo "$as_me:22043: checking if external sys_nerr exists" >&5 +echo $ECHO_N "checking if external sys_nerr exists... $ECHO_C" >&6 +if test "${cf_cv_have_sys_nerr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 22050 "configure" #include "confdefs.h" #undef sys_nerr extern int sys_nerr; -int main() { +int +main (void) +{ sys_nerr = 2 -; return 0; } -EOF -if { (eval echo configure:17641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:22065: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:22068: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:22071: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:22074: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_have_sys_nerr=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - cf_cv_have_sys_nerr=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_have_sys_nerr=no fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_have_sys_nerr" 1>&6 +echo "$as_me:22085: result: $cf_cv_have_sys_nerr" >&5 +echo "${ECHO_T}$cf_cv_have_sys_nerr" >&6 if test "$cf_cv_have_sys_nerr" = yes ; then - + cf_result=`echo "have_sys_nerr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6 -echo "configure:17670: 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 +echo "$as_me:22098: checking if external sys_errlist is declared" >&5 +echo $ECHO_N "checking if external sys_errlist is declared... $ECHO_C" >&6 +if test "${cf_cv_dcl_sys_errlist+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 22105 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -17680,31 +22110,44 @@ else #endif #include #include -#include -int main() { +#include +int +main (void) +{ int x = (int) sys_errlist -; return 0; } -EOF -if { (eval echo configure:17689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:22123: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:22126: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:22129: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:22132: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_dcl_sys_errlist=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_dcl_sys_errlist=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_dcl_sys_errlist=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_dcl_sys_errlist" 1>&6 +echo "$as_me:22143: result: $cf_cv_dcl_sys_errlist" >&5 +echo "${ECHO_T}$cf_cv_dcl_sys_errlist" >&6 if test "$cf_cv_dcl_sys_errlist" = no ; then - + cf_result=`echo "decl_sys_errlist" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6 -echo "configure:17717: 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 +echo "$as_me:22158: checking if external sys_errlist exists" >&5 +echo $ECHO_N "checking if external sys_errlist exists... $ECHO_C" >&6 +if test "${cf_cv_have_sys_errlist+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 22165 "configure" #include "confdefs.h" #undef sys_errlist extern int sys_errlist; -int main() { +int +main (void) +{ sys_errlist = 2 -; return 0; } -EOF -if { (eval echo configure:17733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:22180: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:22183: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:22186: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:22189: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_have_sys_errlist=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - cf_cv_have_sys_errlist=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_have_sys_errlist=no fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_have_sys_errlist" 1>&6 +echo "$as_me:22200: result: $cf_cv_have_sys_errlist" >&5 +echo "${ECHO_T}$cf_cv_have_sys_errlist" >&6 if test "$cf_cv_have_sys_errlist" = yes ; then - + cf_result=`echo "have_sys_errlist" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6 -echo "configure:17835: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:22287: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 22293 "configure" +#include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + builtin and then its argument prototype would still apply. */ +char $ac_func (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); +#error found stub for $ac_func #endif -; return 0; } + return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:22324: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:22327: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:22330: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:22333: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:22343: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_$ac_func=no" -fi -rm -rf conftest* -fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done +echo "$as_me:22353: checking for flock" >&5 +echo $ECHO_N "checking for flock... $ECHO_C" >&6 +if test "${ac_cv_func_flock+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 22359 "configure" +#include "confdefs.h" +#define flock autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef flock -echo $ac_n "checking for flock""... $ac_c" 1>&6 -echo "configure:17889: 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 < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char flock(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_flock) || defined (__stub___flock) -choke me -#else -flock(); +#ifdef __cplusplus +extern "C" #endif -; return 0; } -EOF -if { (eval echo configure:17917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_flock=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char flock (void); + +int +main (void) +{ - eval "ac_cv_func_flock=no" -fi -rm -rf conftest* -fi +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_flock) || defined (__stub___flock) +#error found stub for flock +#endif -if eval "test \"`echo '$ac_cv_func_'flock`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + return flock (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:22390: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:22393: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:22396: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:22399: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_flock=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_flock=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:22409: result: $ac_cv_func_flock" >&5 +echo "${ECHO_T}$ac_cv_func_flock" >&6 +if test $ac_cv_func_flock = yes; then + cat >>confdefs.h <<\EOF #define HAVE_FLOCK 1 EOF else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for flock in -lbsd""... $ac_c" 1>&6 -echo "configure:17939: 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 + echo "$as_me:22418: checking for flock in -lbsd" >&5 +echo $ECHO_N "checking for flock in -lbsd... $ECHO_C" >&6 +if test "${ac_cv_lib_bsd_flock+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 22426 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char flock(); - -int main() { -flock() -; return 0; } -EOF -if { (eval echo configure:17958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + builtin and then its argument prototype would still apply. */ +char flock (); +int +main (void) +{ +flock (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:22445: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:22448: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:22451: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:22454: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_bsd_flock=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_bsd_flock=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:22465: result: $ac_cv_lib_bsd_flock" >&5 +echo "${ECHO_T}$ac_cv_lib_bsd_flock" >&6 +if test $ac_cv_lib_bsd_flock = yes; then + cat >>confdefs.h <<\EOF #define HAVE_FLOCK 1 EOF LIBS="$LIBS -lbsd" -else - echo "$ac_t""no" 1>&6 fi fi - # clock_gettime() / librt -echo $ac_n "checking for clock_gettime""... $ac_c" 1>&6 -echo "configure:17987: checking for clock_gettime" >&5 -if eval "test \"`echo '$''{'ac_cv_func_clock_gettime'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ +echo "$as_me:22478: checking for clock_gettime" >&5 +echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6 +if test "${ac_cv_func_clock_gettime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 22484 "configure" +#include "confdefs.h" +#define clock_gettime autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef clock_gettime + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char clock_gettime(); + builtin and then its argument prototype would still apply. */ +char clock_gettime (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_clock_gettime) || defined (__stub___clock_gettime) -choke me -#else -clock_gettime(); +#error found stub for clock_gettime #endif -; return 0; } -EOF -if { (eval echo configure:18015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_clock_gettime=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_clock_gettime=no" -fi -rm -rf conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'clock_gettime`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + return clock_gettime (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:22515: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:22518: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:22521: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:22524: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_clock_gettime=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_clock_gettime=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:22534: result: $ac_cv_func_clock_gettime" >&5 +echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6 +if test $ac_cv_func_clock_gettime = yes; then + cat >>confdefs.h <<\EOF #define HAVE_CLOCK_GETTIME 1 EOF else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for clock_gettime in -lrt""... $ac_c" 1>&6 -echo "configure:18037: checking for clock_gettime in -lrt" >&5 -ac_lib_var=`echo rt'_'clock_gettime | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:22543: checking for clock_gettime in -lrt" >&5 +echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6 +if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lrt $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 22551 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char clock_gettime(); - -int main() { -clock_gettime() -; return 0; } -EOF -if { (eval echo configure:18056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + builtin and then its argument prototype would still apply. */ +char clock_gettime (); +int +main (void) +{ +clock_gettime (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:22570: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:22573: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:22576: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:22579: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_rt_clock_gettime=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_rt_clock_gettime=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:22590: result: $ac_cv_lib_rt_clock_gettime" >&5 +echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6 +if test $ac_cv_lib_rt_clock_gettime = yes; then + cat >>confdefs.h <<\EOF #define HAVE_CLOCK_GETTIME 1 EOF LIBS="$LIBS -lrt" - -else - echo "$ac_t""no" 1>&6 -fi - +fi fi +echo "$as_me:22603: checking for memset_s" >&5 +echo $ECHO_N "checking for memset_s... $ECHO_C" >&6 +if test "$cross_compiling" = yes; then + echo "$as_me:22606: result: unknown" >&5 +echo "${ECHO_T}unknown" >&6 + +else + cat >conftest.$ac_ext <<_ACEOF +#line 22611 "configure" +#include "confdefs.h" +/* Request C11 Annex K */ +#define __STDC_WANT_LIB_EXT1__ 1 +#include +#include +int main() +{ + char buf[10] = { 1 }; + if (memset_s((void*) buf, (size_t) 100, 0, (size_t) 1)) + return(-1); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:22626: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:22629: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:22631: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:22634: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + echo "$as_me:22637: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + cat >>confdefs.h <<\EOF +#define HAVE_MEMSET_S 1 +EOF - echo $ac_n "checking for wide char and multibyte support""... $ac_c" 1>&6 -echo "configure:18088: 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 <&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +echo "$as_me:22647: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + echo "$as_me:22653: checking for wide char and multibyte support" >&5 +echo $ECHO_N "checking for wide char and multibyte support... $ECHO_C" >&6 +if test "${am_cv_multibyte_able+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 22659 "configure" #include "confdefs.h" #include #ifdef HAVE_STDLIB_H @@ -18102,7 +22669,9 @@ else # include #endif /* HAVE_WCTYPE_H */ -int main() { +int +main (void) +{ const char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0x00}; char ocb[5]; wchar_t wcb[5]; @@ -18141,22 +22710,35 @@ const char icb[5] = {0xa4, 0xa4, 0xa4, 0 mbstowcs(format, "%s", 2); swprintf(wcb, 5, format, "test"); wcsncat(wcb2, wcb, 5); -; return 0; } -EOF -if { (eval echo configure:18147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:22718: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:22721: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:22724: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:22727: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then am_cv_multibyte_able=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - cf_save_LIBS="$LIBS" + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_save_LIBS="$LIBS" LIBS="-lutf8 $LIBS" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 22736 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ const char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0x00}; char ocb[5]; wchar_t wcb[5]; @@ -18195,86 +22777,111 @@ const char icb[5] = {0xa4, 0xa4, 0xa4, 0 mbstowcs(format, "%s", 2); swprintf(wcb, 5, format, "test"); wcsncat(wcb2, wcb, 5); -; return 0; } -EOF -if { (eval echo configure:18201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:22785: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:22788: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:22791: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:22794: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then am_cv_multibyte_able=libutf8 else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - am_cv_multibyte_able=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +am_cv_multibyte_able=no fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - -fi -rm -rf conftest* - + fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$ac_t""$am_cv_multibyte_able" 1>&6 +fi +echo "$as_me:22809: result: $am_cv_multibyte_able" >&5 +echo "${ECHO_T}$am_cv_multibyte_able" >&6 if test "$am_cv_multibyte_able" != no; then if test "$am_cv_multibyte_able" = libutf8; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_LIBUTF8_H 1 EOF LIBS="-lutf8 $LIBS" fi - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define MULTIBYTE_ABLE 1 EOF fi - -echo $ac_n "checking if gettimeofday takes two arguments""... $ac_c" 1>&6 -echo "configure:18235: checking if gettimeofday takes two arguments" >&5 -cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking if gettimeofday takes two arguments... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line 22829 "configure" #include "confdefs.h" #if HAVE_SYS_TIME_H #include #endif -int main() { +int +main (void) +{ struct timeval *tv; struct timezone *tz; gettimeofday(&tv, &tz); -; return 0; } -EOF -if { (eval echo configure:18249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:22846: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:22849: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:22852: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:22855: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_gettimeofday_2args=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_func_gettimeofday_2args=no -fi -rm -f conftest* -echo "$ac_t""$ac_cv_func_gettimeofday_2args" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_gettimeofday_2args=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:22864: result: $ac_cv_func_gettimeofday_2args" >&5 +echo "${ECHO_T}$ac_cv_func_gettimeofday_2args" >&6 if test $ac_cv_func_gettimeofday_2args = yes; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define GETTIMEOFDAY_2ARGS 1 EOF fi -echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:18268: 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 +echo "$as_me:22873: checking return type of signal handlers" >&5 +echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 +if test "${ac_cv_type_signal+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 22879 "configure" #include "confdefs.h" #include #include #ifdef signal -#undef signal +# undef signal #endif #ifdef __cplusplus extern "C" void (*signal (int, void (*)(int)))(int); @@ -18282,116 +22889,149 @@ extern "C" void (*signal (int, void (*)( void (*signal ()) (); #endif -int main() { +int +main (void) +{ int i; -; return 0; } -EOF -if { (eval echo configure:18290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:22901: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:22904: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:22907: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:22910: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_signal=void else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_type_signal=int + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_signal=int fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:22920: result: $ac_cv_type_signal" >&5 +echo "${ECHO_T}$ac_cv_type_signal" >&6 -echo "$ac_t""$ac_cv_type_signal" 1>&6 -cat >> confdefs.h <>confdefs.h <&6 -echo "configure:18310: 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 +echo "$as_me:22927: checking declaration of signal arguments" >&5 +echo $ECHO_N "checking declaration of signal arguments... $ECHO_C" >&6 +if test "${cf_cv_sig_args+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_cv_sig_args= for cf_test in "int sig" "int sig, ..." do - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 22937 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ extern RETSIGTYPE catch($cf_test); signal(SIGINT, catch) -; return 0; } -EOF -if { (eval echo configure:18327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:22950: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:22953: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:22956: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:22959: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_sig_args="$cf_test";break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$ac_t""$cf_cv_sig_args" 1>&6 -cat >> confdefs.h <&5 +echo "${ECHO_T}$cf_cv_sig_args" >&6 +cat >>confdefs.h <&6 -echo "configure:18353: 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 +echo "$as_me:22979: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 +if test "${cf_cv_sigact_bad+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 22986 "configure" #include "confdefs.h" #include #include -int main() { +int +main (void) +{ struct sigaction act -; return 0; } -EOF -if { (eval echo configure:18368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:23000: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:23003: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:23006: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:23009: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_sigact_bad=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_sigact_bad=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_sigact_bad=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:23020: result: $cf_cv_sigact_bad" >&5 +echo "${ECHO_T}$cf_cv_sigact_bad" >&6 -echo "$ac_t""$cf_cv_sigact_bad" 1>&6 - -test "$cf_cv_sigact_bad" = yes && cat >> confdefs.h <<\EOF +test "$cf_cv_sigact_bad" = yes && cat >>confdefs.h <<\EOF #define SVR4_ACTION 1 EOF - -echo $ac_n "checking if we have sigaction/related functions""... $ac_c" 1>&6 -echo "configure:18389: 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 +echo "$as_me:23027: checking if we have sigaction/related functions" >&5 +echo $ECHO_N "checking if we have sigaction/related functions... $ECHO_C" >&6 +if test "${cf_cv_sigaction_funcs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 23034 "configure" #include "confdefs.h" #ifdef SVR4_ACTION @@ -18399,7 +23039,9 @@ cat > conftest.$ac_ext < #include -int main() { +int +main (void) +{ RETSIGTYPE (*func)(SIG_ARGS) = SIG_IGN; struct sigaction sa, osa; @@ -18407,40 +23049,50 @@ int main() { sa.sa_flags = 0; sigemptyset (&sa.sa_mask); sigaction (SIGBUS,&sa,&osa); -; return 0; } -EOF -if { (eval echo configure:18413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:23057: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:23060: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:23063: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:23066: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_sigaction_funcs=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - cf_cv_sigaction_funcs=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_sigaction_funcs=no fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:23076: result: $cf_cv_sigaction_funcs" >&5 +echo "${ECHO_T}$cf_cv_sigaction_funcs" >&6 -echo "$ac_t""$cf_cv_sigaction_funcs" 1>&6 - -test "$cf_cv_sigaction_funcs" = yes && cat >> confdefs.h <<\EOF +test "$cf_cv_sigaction_funcs" = yes && cat >>confdefs.h <<\EOF #define HAVE_POSIX_JC 1 EOF - fi -echo $ac_n "checking for fork""... $ac_c" 1>&6 -echo "configure:18435: checking for fork" >&5 -if eval "test \"`echo '$''{'cf_cv_func_fork'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:23085: checking for fork" >&5 +echo $ECHO_N "checking for fork... $ECHO_C" >&6 +if test "${cf_cv_func_fork+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + if test "$cross_compiling" = yes; then cf_cv_func_fork=unknown else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 23095 "configure" #include "confdefs.h" int main() @@ -18449,130 +23101,168 @@ int main() ${cf_cv_main_return:-return}(1); ${cf_cv_main_return:-return}(0); } -EOF -if { (eval echo configure:18454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:23106: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:23109: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:23111: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:23114: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_func_fork=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - cf_cv_func_fork=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_func_fork=no fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi -echo "$ac_t""$cf_cv_func_fork" 1>&6 -test $cf_cv_func_fork = yes && cat >> confdefs.h <<\EOF +echo "$as_me:23127: result: $cf_cv_func_fork" >&5 +echo "${ECHO_T}$cf_cv_func_fork" >&6 +test $cf_cv_func_fork = yes && cat >>confdefs.h <<\EOF #define HAVE_FORK 1 EOF +echo "$as_me:23133: checking for memmove" >&5 +echo $ECHO_N "checking for memmove... $ECHO_C" >&6 +if test "${ac_cv_func_memmove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 23139 "configure" +#include "confdefs.h" +#define memmove autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef memmove +#ifdef __cplusplus +extern "C" +#endif -echo $ac_n "checking for memmove""... $ac_c" 1>&6 -echo "configure:18476: 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 < -/* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char memmove(); + builtin and then its argument prototype would still apply. */ +char memmove (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_memmove) || defined (__stub___memmove) -choke me -#else -memmove(); +#error found stub for memmove #endif -; return 0; } -EOF -if { (eval echo configure:18504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_memmove=yes" + return memmove (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:23170: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:23173: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:23176: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:23179: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_memmove=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_memmove=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:23189: result: $ac_cv_func_memmove" >&5 +echo "${ECHO_T}$ac_cv_func_memmove" >&6 +if test $ac_cv_func_memmove = yes; then + : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "ac_cv_func_memmove=no" -fi -rm -rf conftest* -fi +echo "$as_me:23195: checking for bcopy" >&5 +echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 +if test "${ac_cv_func_bcopy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 23201 "configure" +#include "confdefs.h" +#define bcopy autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef bcopy -if eval "test \"`echo '$ac_cv_func_'memmove`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 +#ifdef __cplusplus +extern "C" +#endif -echo $ac_n "checking for bcopy""... $ac_c" 1>&6 -echo "configure:18523: 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 < -/* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char bcopy(); + builtin and then its argument prototype would still apply. */ +char bcopy (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_bcopy) || defined (__stub___bcopy) -choke me -#else -bcopy(); +#error found stub for bcopy #endif -; return 0; } -EOF -if { (eval echo configure:18551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_bcopy=yes" + return bcopy (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:23232: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:23235: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:23238: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:23241: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_bcopy=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_bcopy=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:23251: result: $ac_cv_func_bcopy" >&5 +echo "${ECHO_T}$ac_cv_func_bcopy" >&6 +if test $ac_cv_func_bcopy = yes; then + + echo "$as_me:23255: checking if bcopy does overlapping moves" >&5 +echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 +if test "${cf_cv_good_bcopy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_bcopy=no" -fi -rm -rf conftest* -fi -if eval "test \"`echo '$ac_cv_func_'bcopy`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - echo $ac_n "checking if bcopy does overlapping moves""... $ac_c" 1>&6 -echo "configure:18567: 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 - if test "$cross_compiling" = yes; then cf_cv_good_bcopy=unknown else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 23265 "configure" #include "confdefs.h" int main(void) { @@ -18583,37 +23273,46 @@ int main(void) { bcopy(temp+5, temp+15, 10); ${cf_cv_main_return:-return} (strcmp(temp, "klmnopqrstuwwxypqrstuwwxyz")); } - -EOF -if { (eval echo configure:18589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then + +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:23279: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:23282: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:23284: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:23287: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_good_bcopy=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - cf_cv_good_bcopy=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_good_bcopy=no fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi +echo "$as_me:23300: result: $cf_cv_good_bcopy" >&5 +echo "${ECHO_T}$cf_cv_good_bcopy" >&6 -echo "$ac_t""$cf_cv_good_bcopy" 1>&6 - else - echo "$ac_t""no" 1>&6 -cf_cv_good_bcopy=no + cf_cv_good_bcopy=no fi if test "$cf_cv_good_bcopy" = yes ; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define USE_OK_BCOPY 1 EOF else - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define USE_MY_MEMMOVE 1 EOF @@ -18621,110 +23320,140 @@ EOF fi - -echo $ac_n "checking if select expects int * arguments""... $ac_c" 1>&6 -echo "configure:18627: checking if select expects int * arguments" >&5 -cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking if select expects int * arguments... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line 23326 "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "select\(.*, *int *\*," >/dev/null 2>&1; then - rm -rf conftest* - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_SELECT_INTP 1 EOF - echo "$ac_t""yes" 1>&6 + echo "$as_me:23336: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - rm -rf conftest* - echo "$ac_t""no" 1>&6 + echo "$as_me:23339: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -rm -f conftest* - +rm -rf conftest* -echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 -echo "configure:18649: 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 +echo "$as_me:23345: checking whether closedir returns void" >&5 +echo $ECHO_N "checking whether closedir returns void... $ECHO_C" >&6 +if test "${ac_cv_func_closedir_void+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then ac_cv_func_closedir_void=yes else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 23354 "configure" #include "confdefs.h" -#include +$ac_includes_default #include <$ac_header_dirent> -int closedir(); main() { exit(closedir(opendir(".")) != 0); } -EOF -if { (eval echo configure:18663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +#ifndef __cplusplus +int closedir (); +#endif + +int +main (void) +{ +$ac_main_return (closedir (opendir (".")) != 0); + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:23371: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:23374: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:23376: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:23379: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_closedir_void=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_func_closedir_void=yes + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_closedir_void=yes fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi - -echo "$ac_t""$ac_cv_func_closedir_void" 1>&6 +echo "$as_me:23391: result: $ac_cv_func_closedir_void" >&5 +echo "${ECHO_T}$ac_cv_func_closedir_void" >&6 if test $ac_cv_func_closedir_void = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define CLOSEDIR_VOID 1 EOF 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:18689: 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 + echo "$as_me:23403: checking whether setvbuf arguments are reversed" >&5 +echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 +if test "${ac_cv_func_setvbuf_reversed+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + { { echo "$as_me:23409: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 23414 "configure" #include "confdefs.h" #include /* If setvbuf has the reversed format, exit 0. */ -main () { +int +main (void) +{ /* This call has the arguments reversed. A reversed system may check and see that the address of main is not _IOLBF, _IONBF, or _IOFBF, and return nonzero. */ if (setvbuf(stdout, _IOLBF, (char *) main, BUFSIZ) != 0) - exit(1); + $ac_main_return(1); putc('\r', stdout); - exit(0); /* Non-reversed systems segv here. */ + $ac_main_return(0); /* Non-reversed systems segv here. */ } -EOF -if { (eval echo configure:18711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:23431: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:23434: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:23436: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:23439: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_setvbuf_reversed=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_func_setvbuf_reversed=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_setvbuf_reversed=no fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - rm -f core core.* *.core fi - -echo "$ac_t""$ac_cv_func_setvbuf_reversed" 1>&6 +echo "$as_me:23452: result: $ac_cv_func_setvbuf_reversed" >&5 +echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 if test $ac_cv_func_setvbuf_reversed = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define SETVBUF_REVERSED 1 EOF @@ -18733,6 +23462,7 @@ fi fi ### Checks for network library functions. + for ac_func in \ gai_strerror \ getaddrinfo \ @@ -18744,103 +23474,128 @@ for ac_func in \ strncasecmp \ do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18749: 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 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:23478: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 23484 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + builtin and then its argument prototype would still apply. */ +char $ac_func (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); +#error found stub for $ac_func #endif -; return 0; } -EOF -if { (eval echo configure:18777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_$ac_func=yes" + return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:23515: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:23518: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:23521: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:23524: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_$ac_func=no" + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&6 -fi -done - +fi +done -echo $ac_n "checking for type sigaction_t""... $ac_c" 1>&6 -echo "configure:18804: 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 +echo "$as_me:23544: checking for type sigaction_t" >&5 +echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 +if test "${cf_cv_type_sigaction+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 23551 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ sigaction_t x -; return 0; } -EOF -if { (eval echo configure:18818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:23564: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:23567: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:23570: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:23573: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_type_sigaction=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_type_sigaction=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_type_sigaction=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$ac_t""$cf_cv_type_sigaction" 1>&6 -test "$cf_cv_type_sigaction" = yes && cat >> confdefs.h <<\EOF +echo "$as_me:23584: result: $cf_cv_type_sigaction" >&5 +echo "${ECHO_T}$cf_cv_type_sigaction" >&6 +test "$cf_cv_type_sigaction" = yes && +cat >>confdefs.h <<\EOF #define HAVE_TYPE_SIGACTION 1 EOF - - -echo $ac_n "checking for nonconflicting termios.h""... $ac_c" 1>&6 -echo "configure:18838: 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 +echo "$as_me:23591: checking for nonconflicting termios.h" >&5 +echo $ECHO_N "checking for nonconflicting termios.h... $ECHO_C" >&6 +if test "${cf_cv_use_termios_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 23598 "configure" #include "confdefs.h" #ifdef HAVE_IOCTL_H @@ -18855,88 +23610,112 @@ else #include #endif -int main() { +int +main (void) +{ struct termios save_tty; (void) tcsetattr (0, TCSANOW, &save_tty); (void) tcgetattr (0, &save_tty) -; return 0; } -EOF -if { (eval echo configure:18866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:23625: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:23628: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:23631: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:23634: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_use_termios_h=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - cf_cv_use_termios_h=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_use_termios_h=no fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$ac_t""$cf_cv_use_termios_h" 1>&6 +echo "$as_me:23646: result: $cf_cv_use_termios_h" >&5 +echo "${ECHO_T}$cf_cv_use_termios_h" >&6 if test $cf_cv_use_termios_h = yes; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_TERMIOS_H 1 EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_TCGETATTR 1 EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_TCSETATTR 1 EOF fi - -echo $ac_n "checking for passwd.pw_gecos""... $ac_c" 1>&6 -echo "configure:18897: 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 +echo "$as_me:23663: checking for passwd.pw_gecos" >&5 +echo $ECHO_N "checking for passwd.pw_gecos... $ECHO_C" >&6 +if test "${cf_cv_pw_gecos+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 23670 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ struct passwd foo; char bar = foo.pw_gecos -; return 0; } -EOF -if { (eval echo configure:18914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:23686: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:23689: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:23692: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:23695: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_pw_gecos=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_pw_gecos=no -fi -rm -f conftest* -fi - -echo "$ac_t""$cf_cv_pw_gecos" 1>&6 -test $cf_cv_pw_gecos = no && cat >> confdefs.h <<\EOF + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_pw_gecos=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:23705: result: $cf_cv_pw_gecos" >&5 +echo "${ECHO_T}$cf_cv_pw_gecos" >&6 +test $cf_cv_pw_gecos = no && cat >>confdefs.h <<\EOF #define DONT_HAVE_PW_GECOS 1 EOF - - -echo $ac_n "checking for tm.tm_gmtoff""... $ac_c" 1>&6 -echo "configure:18934: 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 +echo "$as_me:23711: checking for tm.tm_gmtoff" >&5 +echo $ECHO_N "checking for tm.tm_gmtoff... $ECHO_C" >&6 +if test "${cf_cv_tm_gmtoff+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 23718 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME @@ -18950,35 +23729,48 @@ else # endif #endif -int main() { +int +main (void) +{ struct tm foo; long bar = foo.tm_gmtoff -; return 0; } -EOF -if { (eval echo configure:18960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:23743: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:23746: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:23749: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:23752: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_tm_gmtoff=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_tm_gmtoff=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_tm_gmtoff=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$ac_t""$cf_cv_tm_gmtoff" 1>&6 -test $cf_cv_tm_gmtoff = no && cat >> confdefs.h <<\EOF +echo "$as_me:23763: result: $cf_cv_tm_gmtoff" >&5 +echo "${ECHO_T}$cf_cv_tm_gmtoff" >&6 +test $cf_cv_tm_gmtoff = no && +cat >>confdefs.h <<\EOF #define DONT_HAVE_TM_GMTOFF 1 EOF - - -echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:18980: 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 +echo "$as_me:23770: checking for long file names" >&5 +echo $ECHO_N "checking for long file names... $ECHO_C" >&6 +if test "${ac_cv_sys_long_file_names+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_sys_long_file_names=yes # Test for long file names in all the places we know might matter: @@ -18992,71 +23784,83 @@ else # /var/tmp likewise # /usr/tmp likewise if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then - ac_tmpdirs="$TMPDIR" + ac_tmpdirs=$TMPDIR else ac_tmpdirs='/tmp /var/tmp /usr/tmp' fi for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do test -d $ac_dir || continue test -w $ac_dir || continue # It is less confusing to not echo anything here. - (echo 1 > $ac_dir/conftest9012345) 2>/dev/null - (echo 2 > $ac_dir/conftest9012346) 2>/dev/null - val=`cat $ac_dir/conftest9012345 2>/dev/null` - if test ! -f $ac_dir/conftest9012345 || test "$val" != 1; then + ac_xdir=$ac_dir/cf$$ + (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue + ac_tf1=$ac_xdir/conftest9012345 + ac_tf2=$ac_xdir/conftest9012346 + (echo 1 >$ac_tf1) 2>/dev/null + (echo 2 >$ac_tf2) 2>/dev/null + ac_val=`cat $ac_tf1 2>/dev/null` + if test ! -f $ac_tf1 || test "$ac_val" != 1; then ac_cv_sys_long_file_names=no - rm -f $ac_dir/conftest9012345 $ac_dir/conftest9012346 2>/dev/null + rm -rf $ac_xdir 2>/dev/null break fi - rm -f $ac_dir/conftest9012345 $ac_dir/conftest9012346 2>/dev/null + rm -rf $ac_xdir 2>/dev/null done fi - -echo "$ac_t""$ac_cv_sys_long_file_names" 1>&6 +echo "$as_me:23809: result: $ac_cv_sys_long_file_names" >&5 +echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 if test $ac_cv_sys_long_file_names = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_LONG_FILE_NAMES 1 EOF fi - -for ac_hdr in sys/wait.h +for ac_header 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:19028: 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 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:23822: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 23828 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:23832: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:23838: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:19038: \"$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" + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done @@ -19067,83 +23871,100 @@ cf_wait_headers="$cf_wait_headers #include " else -for ac_hdr in wait.h + +for ac_header 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:19075: 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 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:23878: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 23884 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:23888: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:23894: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:19085: \"$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" + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done -for ac_hdr in waitstatus.h +for ac_header 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:19115: 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 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:23926: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 23932 "configure" #include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:19125: \"$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" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:23936: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:23942: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done @@ -19159,41 +23980,54 @@ cf_wait_headers="$cf_wait_headers fi fi - - -echo $ac_n "checking for union wait""... $ac_c" 1>&6 -echo "configure:19166: checking for union wait" >&5 -if eval "test \"`echo '$''{'cf_cv_type_unionwait'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:23983: checking for union wait" >&5 +echo $ECHO_N "checking for union wait... $ECHO_C" >&6 +if test "${cf_cv_type_unionwait+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 23990 "configure" #include "confdefs.h" $cf_wait_headers -int main() { +int +main (void) +{ int x; int y = WEXITSTATUS(x); int z = WTERMSIG(x); wait(&x); - -; return 0; } -EOF -if { (eval echo configure:19183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:24006: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:24009: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:24012: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:24015: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_type_unionwait=no echo compiles ok w/o union wait 1>&5 - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 24025 "configure" #include "confdefs.h" $cf_wait_headers -int main() { +int +main (void) +{ union wait x; #ifdef WEXITSTATUS int y = WEXITSTATUS(x); @@ -19202,44 +24036,54 @@ union wait x; int z = WTERMSIG(x); #endif wait(&x); - -; return 0; } -EOF -if { (eval echo configure:19209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:24045: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:24048: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:24051: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:24054: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_type_unionwait=yes echo compiles ok with union wait and possibly macros too 1>&5 - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - cf_cv_type_unionwait=no +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_type_unionwait=no fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$ac_t""$cf_cv_type_unionwait" 1>&6 -test $cf_cv_type_unionwait = yes && cat >> confdefs.h <<\EOF +echo "$as_me:24069: result: $cf_cv_type_unionwait" >&5 +echo "${ECHO_T}$cf_cv_type_unionwait" >&6 +test $cf_cv_type_unionwait = yes && +cat >>confdefs.h <<\EOF #define HAVE_TYPE_UNIONWAIT 1 EOF - - - -echo $ac_n "checking if the system function returns usable child-status""... $ac_c" 1>&6 -echo "configure:19234: 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 +echo "$as_me:24076: checking if the system function returns usable child-status" >&5 +echo $ECHO_N "checking if the system function returns usable child-status... $ECHO_C" >&6 +if test "${cf_cv_system_status+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + if test "$cross_compiling" = yes; then cf_cv_system_status=unknown else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 24086 "configure" #include "confdefs.h" #include @@ -19271,76 +24115,92 @@ int main() ${cf_cv_main_return:-return}(1); } -EOF -if { (eval echo configure:19276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:24120: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:24123: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:24125: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:24128: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_system_status=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - if test "$cross_compiling" = yes; then + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +if test "$cross_compiling" = yes; then cf_cv_system_status=unknown else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 24139 "configure" #include "confdefs.h" int main() { ${cf_cv_main_return:-return}(system("exit 23") != (23 << 8)); } -EOF -if { (eval echo configure:19291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:24144: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:24147: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:24149: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:24152: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_system_status=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - cf_cv_system_status=unknown + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_system_status=unknown fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi -echo "$ac_t""$cf_cv_system_status" 1>&6 -test $cf_cv_system_status = no && cat >> confdefs.h <<\EOF +echo "$as_me:24169: result: $cf_cv_system_status" >&5 +echo "${ECHO_T}$cf_cv_system_status" >&6 +test $cf_cv_system_status = no && cat >>confdefs.h <<\EOF #define USE_SYSTEM_STATUS 1 EOF - - # Check if we are trying to use curses+color, but cannot if test $use_color = yes ; then if test $use_curses = no ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_COLOR 1 EOF elif test $cf_with_screen = pdcurses ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_COLOR 1 EOF else - if test "$cf_cv_ncurses_version" != no ; then -echo $ac_n "checking for obsolete/broken version of ncurses""... $ac_c" 1>&6 -echo "configure:19334: 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 +echo "$as_me:24190: checking for obsolete/broken version of ncurses" >&5 +echo $ECHO_N "checking for obsolete/broken version of ncurses... $ECHO_C" >&6 +if test "${cf_cv_ncurses_broken+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 24197 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> -int main() { +int +main (void) +{ #if defined(NCURSES_VERSION) && defined(wgetbkgd) make an error @@ -19348,86 +24208,116 @@ int main() { int x = 1 #endif -; return 0; } -EOF -if { (eval echo configure:19354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:24216: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:24219: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:24222: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:24225: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_ncurses_broken=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_ncurses_broken=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_ncurses_broken=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$ac_t""$cf_cv_ncurses_broken" 1>&6 +echo "$as_me:24237: result: $cf_cv_ncurses_broken" >&5 +echo "${ECHO_T}$cf_cv_ncurses_broken" >&6 if test "$cf_cv_ncurses_broken" = yes ; then - echo "configure: warning: hmm... you should get an up-to-date version of ncurses" 1>&2 - cat >> confdefs.h <<\EOF + { echo "$as_me:24240: WARNING: hmm... you should get an up-to-date version of ncurses" >&5 +echo "$as_me: WARNING: hmm... you should get an up-to-date version of ncurses" >&2;} + +cat >>confdefs.h <<\EOF #define NCURSES_BROKEN 1 EOF fi fi - -echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6 -echo "configure:19379: 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 +echo "$as_me:24250: checking if curses supports color attributes" >&5 +echo $ECHO_N "checking if curses supports color attributes... $ECHO_C" >&6 +if test "${cf_cv_color_curses+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 24257 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> -int main() { +int +main (void) +{ chtype x = COLOR_BLUE; has_colors(); start_color(); #ifndef NCURSES_BROKEN wbkgd(curscr, getbkgd(stdscr)); /* X/Open XPG4 aka SVr4 Curses */ #endif - -; return 0; } -EOF -if { (eval echo configure:19400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:24277: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:24280: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:24283: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:24286: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_color_curses=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - cf_cv_color_curses=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_color_curses=no fi -rm -rf conftest* - +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi -echo "$ac_t""$cf_cv_color_curses" 1>&6 +echo "$as_me:24298: result: $cf_cv_color_curses" >&5 +echo "${ECHO_T}$cf_cv_color_curses" >&6 if test $cf_cv_color_curses = yes ; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define COLOR_CURSES 1 EOF - test ".$cf_cv_ncurses_broken" != .yes && cat >> confdefs.h <<\EOF + test ".$cf_cv_ncurses_broken" != .yes && +cat >>confdefs.h <<\EOF #define HAVE_GETBKGD 1 EOF fi if test $cf_cv_color_curses = yes ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_COLOR 1 EOF else - echo "configure: warning: This curses library does not support color" 1>&2 + { echo "$as_me:24319: WARNING: This curses library does not support color" >&5 +echo "$as_me: WARNING: This curses library does not support color" >&2;} fi fi fi @@ -19444,22 +24334,21 @@ else fi if test $check_sig_const = yes ; then - -echo $ac_n "checking for redefinable signal constants""... $ac_c" 1>&6 -echo "configure:19451: 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 +echo "$as_me:24338: checking for redefinable signal constants" >&5 +echo $ECHO_N "checking for redefinable signal constants... $ECHO_C" >&6 +if test "${cf_cv_sig_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_cv_sig_const=no if test -n "$cf_cv_sig_args"; then cf_test=`echo $cf_cv_sig_args|sed -e s/sig//` if test "$cross_compiling" = yes; then cf_cv_sig_const=unknown else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 24351 "configure" #include "confdefs.h" #define NEW_DFL ((RETSIGTYPE (*)($cf_test))0) @@ -19485,89 +24374,109 @@ int main() signal(SIGINT, SIG_DFL); ${cf_cv_main_return:-return}(0); } -EOF -if { (eval echo configure:19490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:24379: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:24382: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:24384: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:24387: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_sig_const=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - cf_cv_sig_const=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_sig_const=no fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi fi -echo "$ac_t""$cf_cv_sig_const" 1>&6 -test "$cf_cv_sig_const" = yes && cat >> confdefs.h <<\EOF +echo "$as_me:24402: result: $cf_cv_sig_const" >&5 +echo "${ECHO_T}$cf_cv_sig_const" >&6 +test "$cf_cv_sig_const" = yes && cat >>confdefs.h <<\EOF #define DECL_SIG_CONST 1 EOF - fi - -echo $ac_n "checking for ANSI qsort""... $ac_c" 1>&6 -echo "configure:19516: checking for ANSI qsort" >&5 -if eval "test \"`echo '$''{'cf_cv_comptype'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:24410: checking for ANSI qsort" >&5 +echo $ECHO_N "checking for ANSI qsort... $ECHO_C" >&6 +if test "${cf_cv_comptype+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 24417 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H #include #endif -int main() { +int +main (void) +{ extern int compare(const void *, const void *); char *foo = "string"; qsort(foo, sizeof(foo)/sizeof(*foo), sizeof(*foo), compare) -; return 0; } -EOF -if { (eval echo configure:19534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:24434: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:24437: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:24440: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:24443: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_comptype=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_comptype=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_comptype=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$ac_t""$cf_cv_comptype" 1>&6 +echo "$as_me:24455: result: $cf_cv_comptype" >&5 +echo "${ECHO_T}$cf_cv_comptype" >&6 if test $cf_cv_comptype = yes; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_COMPTYPE_VOID 1 EOF else - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_COMPTYPE_CHAR 1 EOF fi - -echo $ac_n "checking if application can dump core""... $ac_c" 1>&6 -echo "configure:19562: 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 +echo "$as_me:24469: checking if application can dump core" >&5 +echo $ECHO_N "checking if application can dump core... $ECHO_C" >&6 +if test "${cf_cv_corefile+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + if test "$cross_compiling" = yes; then cf_cv_corefile=unknown else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 24479 "configure" #include "confdefs.h" #include @@ -19607,28 +24516,35 @@ int main() ${cf_cv_main_return:-return}(1); #endif } -EOF -if { (eval echo configure:19612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:24521: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:24524: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:24526: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:24529: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_corefile=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - cf_cv_corefile=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_corefile=no fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi -echo "$ac_t""$cf_cv_corefile" 1>&6 -test $cf_cv_corefile = yes && cat >> confdefs.h <<\EOF +echo "$as_me:24542: result: $cf_cv_corefile" >&5 +echo "${ECHO_T}$cf_cv_corefile" >&6 +test $cf_cv_corefile = yes && cat >>confdefs.h <<\EOF #define HAVE_COREFILE 1 EOF - - ### test this last, since it uses a partly-built autoconf.h # Setup includes for test-program to verify declarations CHECK_DECL_FLAG="-I$srcdir/include -I$srcdir/pcre" @@ -19654,20 +24570,18 @@ do ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - -echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:19660: 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 +echo "$as_me:24573: checking for missing \"${ac_func}\" extern" >&5 +echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 +if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - -echo "${as_me:-configure}:19666: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:24579: testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 24584 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -19676,63 +24590,88 @@ $CHECK_DECL_HDRS struct zowie { int a; double b; struct zowie *c; char d; }; extern struct zowie *${ac_func}(); -int main() { - +int +main (void) +{ -; return 0; } -EOF -if { (eval echo configure:19685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:24602: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:24605: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:24608: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:24611: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 24619 "configure" #include "confdefs.h" #define DECL_${cf_1_up} $CHECK_DECL_HDRS -int main() { +int +main (void) +{ long x = 0 -; return 0; } -EOF -if { (eval echo configure:19703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:24634: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:24637: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:24640: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:24643: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval 'cf_cv_func_'${ac_func}'=yes' else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval 'cf_cv_func_'${ac_func}'=no' + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval 'cf_cv_func_'${ac_func}'=no' fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext else eval 'cf_cv_func_'${ac_func}'=yes' fi else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval 'cf_cv_func_'${ac_func}'=no' + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval 'cf_cv_func_'${ac_func}'=no' fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" fi eval 'cf_result=$cf_cv_func_'${ac_func} -echo "$ac_t""$cf_result" 1>&6 -test $cf_result = yes && cat >> confdefs.h <&5 +echo "${ECHO_T}$cf_result" >&6 +test $cf_result = yes && cat >>confdefs.h <&6 -echo "configure:19752: 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 +echo "$as_me:24688: checking for missing \"${ac_func}\" extern" >&5 +echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 +if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - -echo "${as_me:-configure}:19758: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:24694: testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 24699 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -19768,63 +24705,88 @@ $CHECK_DECL_HDRS struct zowie { int a; double b; struct zowie *c; char d; }; extern struct zowie *${ac_func}(); -int main() { - +int +main (void) +{ -; return 0; } -EOF -if { (eval echo configure:19777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:24717: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:24720: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:24723: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:24726: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 24734 "configure" #include "confdefs.h" #define DECL_${cf_1_up} $CHECK_DECL_HDRS -int main() { +int +main (void) +{ long x = 0 -; return 0; } -EOF -if { (eval echo configure:19795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:24749: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:24752: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:24755: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:24758: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval 'cf_cv_func_'${ac_func}'=yes' else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval 'cf_cv_func_'${ac_func}'=no' + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval 'cf_cv_func_'${ac_func}'=no' fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext else eval 'cf_cv_func_'${ac_func}'=yes' fi else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval 'cf_cv_func_'${ac_func}'=no' + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval 'cf_cv_func_'${ac_func}'=no' fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" fi eval 'cf_result=$cf_cv_func_'${ac_func} -echo "$ac_t""$cf_result" 1>&6 -test $cf_result = yes && cat >> confdefs.h <&5 +echo "${ECHO_T}$cf_result" >&6 +test $cf_result = yes && cat >>confdefs.h <&6 -echo "configure:19842: 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 +echo "$as_me:24801: checking for missing \"${ac_func}\" extern" >&5 +echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 +if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - -echo "${as_me:-configure}:19848: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:24807: testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 24812 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -19858,57 +24818,83 @@ $CHECK_DECL_HDRS struct zowie { int a; double b; struct zowie *c; char d; }; extern struct zowie *${ac_func}(); -int main() { - +int +main (void) +{ -; return 0; } -EOF -if { (eval echo configure:19867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:24830: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:24833: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:24836: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:24839: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 24847 "configure" #include "confdefs.h" #define DECL_${cf_1_up} $CHECK_DECL_HDRS -int main() { +int +main (void) +{ long x = 0 -; return 0; } -EOF -if { (eval echo configure:19885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:24862: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:24865: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:24868: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:24871: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval 'cf_cv_func_'${ac_func}'=yes' else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval 'cf_cv_func_'${ac_func}'=no' + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval 'cf_cv_func_'${ac_func}'=no' fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext else eval 'cf_cv_func_'${ac_func}'=yes' fi else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval 'cf_cv_func_'${ac_func}'=no' + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval 'cf_cv_func_'${ac_func}'=no' fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" fi eval 'cf_result=$cf_cv_func_'${ac_func} -echo "$ac_t""$cf_result" 1>&6 -test $cf_result = yes && cat >> confdefs.h <&5 +echo "${ECHO_T}$cf_result" >&6 +test $cf_result = yes && cat >>confdefs.h <&6 -echo "configure:19988: 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 +echo "$as_me:24971: checking for missing \"${ac_func}\" extern" >&5 +echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 +if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - -echo "${as_me:-configure}:19994: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:24977: testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 24982 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -20004,63 +24988,88 @@ $CHECK_DECL_HDRS struct zowie { int a; double b; struct zowie *c; char d; }; extern struct zowie *${ac_func}(); -int main() { - +int +main (void) +{ -; return 0; } -EOF -if { (eval echo configure:20013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:25000: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:25003: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:25006: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25009: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 25017 "configure" #include "confdefs.h" #define DECL_${cf_1_up} $CHECK_DECL_HDRS -int main() { +int +main (void) +{ long x = 0 -; return 0; } -EOF -if { (eval echo configure:20031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:25032: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:25035: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:25038: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25041: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval 'cf_cv_func_'${ac_func}'=yes' else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval 'cf_cv_func_'${ac_func}'=no' + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval 'cf_cv_func_'${ac_func}'=no' fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext else eval 'cf_cv_func_'${ac_func}'=yes' fi else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval 'cf_cv_func_'${ac_func}'=no' + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval 'cf_cv_func_'${ac_func}'=no' fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" fi eval 'cf_result=$cf_cv_func_'${ac_func} -echo "$ac_t""$cf_result" 1>&6 -test $cf_result = yes && cat >> confdefs.h <&5 +echo "${ECHO_T}$cf_result" >&6 +test $cf_result = yes && cat >>confdefs.h <&6 -echo "configure:20075: 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 +echo "$as_me:25081: checking for missing \"${ac_func}\" extern" >&5 +echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 +if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - -echo "${as_me:-configure}:20081: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:25087: testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 25092 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -20091,57 +25098,83 @@ $CHECK_DECL_HDRS struct zowie { int a; double b; struct zowie *c; char d; }; extern struct zowie *${ac_func}(); -int main() { - +int +main (void) +{ -; return 0; } -EOF -if { (eval echo configure:20100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:25110: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:25113: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:25116: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25119: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 25127 "configure" #include "confdefs.h" #define DECL_${cf_1_up} $CHECK_DECL_HDRS -int main() { +int +main (void) +{ long x = 0 -; return 0; } -EOF -if { (eval echo configure:20118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:25142: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:25145: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:25148: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25151: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval 'cf_cv_func_'${ac_func}'=yes' else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval 'cf_cv_func_'${ac_func}'=no' + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval 'cf_cv_func_'${ac_func}'=no' fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext else eval 'cf_cv_func_'${ac_func}'=yes' fi else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval 'cf_cv_func_'${ac_func}'=no' + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval 'cf_cv_func_'${ac_func}'=no' fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" fi eval 'cf_result=$cf_cv_func_'${ac_func} -echo "$ac_t""$cf_result" 1>&6 -test $cf_result = yes && cat >> confdefs.h <&5 +echo "${ECHO_T}$cf_result" >&6 +test $cf_result = yes && cat >>confdefs.h <&6 -echo "configure:20165: 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 +echo "$as_me:25195: checking for missing \"${ac_func}\" extern" >&5 +echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 +if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - -echo "${as_me:-configure}:20171: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:25201: testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 25206 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -20181,79 +25212,103 @@ $CHECK_DECL_HDRS struct zowie { int a; double b; struct zowie *c; char d; }; extern struct zowie *${ac_func}(); -int main() { - +int +main (void) +{ -; return 0; } -EOF -if { (eval echo configure:20190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:25224: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:25227: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:25230: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25233: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 25241 "configure" #include "confdefs.h" #define DECL_${cf_1_up} $CHECK_DECL_HDRS -int main() { +int +main (void) +{ long x = 0 -; return 0; } -EOF -if { (eval echo configure:20208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:25256: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:25259: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:25262: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25265: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval 'cf_cv_func_'${ac_func}'=yes' else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval 'cf_cv_func_'${ac_func}'=no' + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval 'cf_cv_func_'${ac_func}'=no' fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext else eval 'cf_cv_func_'${ac_func}'=yes' fi else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval 'cf_cv_func_'${ac_func}'=no' + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval 'cf_cv_func_'${ac_func}'=no' fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" fi eval 'cf_result=$cf_cv_func_'${ac_func} -echo "$ac_t""$cf_result" 1>&6 -test $cf_result = yes && cat >> confdefs.h <&5 +echo "${ECHO_T}$cf_result" >&6 +test $cf_result = yes && cat >>confdefs.h <&6 -echo "configure:20246: checking for working TIOCGWINSZ" >&5 -if eval "test \"`echo '$''{'cf_cv_use_tiocgwinsz'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:25299: checking for working TIOCGWINSZ" >&5 +echo $ECHO_N "checking for working TIOCGWINSZ... $ECHO_C" >&6 +if test "${cf_cv_use_tiocgwinsz+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -D__CPROTO__ $CHECK_DECL_FLAG" if test "$cross_compiling" = yes; then cf_cv_use_tiocgwinsz=unknown else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 25311 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -20277,41 +25332,48 @@ int main() } ${cf_cv_main_return:-return}(0); /* we cannot guarantee this is run interactively */ } -EOF -if { (eval echo configure:20282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:25337: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:25340: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:25342: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25345: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_use_tiocgwinsz=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - cf_cv_use_tiocgwinsz=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_use_tiocgwinsz=no fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - rm -f autoconf.h CFLAGS="$cf_save_CFLAGS" fi -echo "$ac_t""$cf_cv_use_tiocgwinsz" 1>&6 -test $cf_cv_use_tiocgwinsz != yes && cat >> confdefs.h <<\EOF +echo "$as_me:25360: result: $cf_cv_use_tiocgwinsz" >&5 +echo "${ECHO_T}$cf_cv_use_tiocgwinsz" >&6 +test $cf_cv_use_tiocgwinsz != yes && cat >>confdefs.h <<\EOF #define DONT_HAVE_SIGWINCH 1 EOF - - ### append special libraries that get in the way of testing case $debug_malloc in DBMALLOC) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define USE_DBMALLOC 1 EOF LIBS="$LIBS -ldbmalloc" ;; DMALLOC) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define USE_DMALLOC 1 EOF @@ -20322,80 +25384,137 @@ esac ### Use gettext ### this also calls AM_LANGINFO_CODESET and AM_ICONV ### so we don't need to do the tests ourselves. -# Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:20329: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if test -n "$ac_tool_prefix"; then + # 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 "$as_me:25390: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="ranlib" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +echo "$as_me:25405: found $ac_dir/$ac_word" >&5 +break +done + fi fi -RANLIB="$ac_cv_prog_RANLIB" +RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 + echo "$as_me:25413: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:25416: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -# 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:20359: 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 +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +echo "$as_me:25425: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext < -int main() { -char *p = alloca(2 * sizeof(int)); -; return 0; } -EOF -if { (eval echo configure:20371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - ac_cv_header_alloca_h=yes + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_RANLIB="ranlib" +echo "$as_me:25440: found $ac_dir/$ac_word" >&5 +break +done - ac_cv_header_alloca_h=no + test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" fi -rm -rf conftest* fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + echo "$as_me:25449: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6 +else + echo "$as_me:25452: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + RANLIB=$ac_ct_RANLIB +else + RANLIB="$ac_cv_prog_RANLIB" +fi + +# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works +# for constant arguments. Useless! +echo "$as_me:25463: checking for working alloca.h" >&5 +echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 +if test "${ac_cv_working_alloca_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 25469 "configure" +#include "confdefs.h" +#include +int +main (void) +{ +char *p = (char *) alloca (2 * sizeof (int)); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:25481: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:25484: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:25487: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25490: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_working_alloca_h=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_working_alloca_h=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:25500: result: $ac_cv_working_alloca_h" >&5 +echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 +if test $ac_cv_working_alloca_h = yes; then -echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 -if test $ac_cv_header_alloca_h = yes; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define HAVE_ALLOCA_H 1 EOF fi -echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:20392: checking for alloca" >&5 -if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:25510: checking for alloca" >&5 +echo $ECHO_N "checking for alloca... $ECHO_C" >&6 +if test "${ac_cv_func_alloca_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 25516 "configure" #include "confdefs.h" - #ifdef __GNUC__ # define alloca __builtin_alloca #else @@ -20417,48 +25536,62 @@ char *alloca (); # endif #endif -int main() { -char *p = (char *) alloca(1); -; return 0; } -EOF -if { (eval echo configure:20425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - +int +main (void) +{ +char *p = (char *) alloca (1); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:25548: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:25551: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:25554: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25557: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_alloca_works=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - ac_cv_func_alloca_works=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_alloca_works=no fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:25567: result: $ac_cv_func_alloca_works" >&5 +echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 -echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 if test $ac_cv_func_alloca_works = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_ALLOCA 1 EOF -fi - -if test $ac_cv_func_alloca_works = no; then +else # The SVR3 libPW and SVR4 libucb both contain incompatible functions - # that cause trouble. Some versions do not even contain alloca or - # contain a buggy version. If you still want to use their alloca, - # use ar to extract alloca.o from them instead of compiling alloca.c. - ALLOCA=alloca.${ac_objext} - cat >> confdefs.h <<\EOF +# that cause trouble. Some versions do not even contain alloca or +# contain a buggy version. If you still want to use their alloca, +# use ar to extract alloca.o from them instead of compiling alloca.c. + +ALLOCA=alloca.$ac_objext + +cat >>confdefs.h <<\EOF #define C_ALLOCA 1 EOF - -echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:20457: 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 +echo "$as_me:25588: checking whether \`alloca.c' needs Cray hooks" >&5 +echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 +if test "${ac_cv_os_cray+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 25594 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -20466,89 +25599,104 @@ webecray wenotbecray #endif -EOF +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "webecray" >/dev/null 2>&1; then - rm -rf conftest* ac_cv_os_cray=yes else - rm -rf conftest* ac_cv_os_cray=no fi -rm -f conftest* +rm -rf conftest* fi - -echo "$ac_t""$ac_cv_os_cray" 1>&6 +echo "$as_me:25612: result: $ac_cv_os_cray" >&5 +echo "${ECHO_T}$ac_cv_os_cray" >&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:20487: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ + for ac_func in _getb67 GETB67 getb67; do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:25617: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 25623 "configure" +#include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + builtin and then its argument prototype would still apply. */ +char $ac_func (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); +#error found stub for $ac_func #endif -; return 0; } -EOF -if { (eval echo configure:20515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_$ac_func=no" -fi -rm -rf conftest* -fi + return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:25654: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:25657: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:25660: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25663: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:25673: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <>confdefs.h <&6 + break fi -done + done fi -echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:20542: 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 +echo "$as_me:25687: checking stack direction for C alloca" >&5 +echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 +if test "${ac_cv_c_stack_direction+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then ac_cv_c_stack_direction=0 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 25696 "configure" #include "confdefs.h" -find_stack_direction () +int +find_stack_direction (void) { static char *addr = 0; auto char dummy; @@ -20560,139 +25708,172 @@ find_stack_direction () else return (&dummy > addr) ? 1 : -1; } -main () + +int +main (void) { - exit (find_stack_direction() < 0); + $ac_main_return (find_stack_direction () < 0); } -EOF -if { (eval echo configure:20569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:25719: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:25722: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:25724: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25727: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_stack_direction=1 else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_c_stack_direction=-1 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_stack_direction=-1 fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi +echo "$as_me:25739: result: $ac_cv_c_stack_direction" >&5 +echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 -echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 -cat >> confdefs.h <>confdefs.h <&6 -echo "configure:20594: 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 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:25751: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 25757 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:25761: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:25767: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:20604: \"$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" + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done for ac_func in getpagesize do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20633: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:25799: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 25805 "configure" +#include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + builtin and then its argument prototype would still apply. */ +char $ac_func (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); +#error found stub for $ac_func #endif -; return 0; } + return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:25836: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:25839: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:25842: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25845: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:25855: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_$ac_func=no" -fi -rm -rf conftest* -fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done -echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:20686: 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 +echo "$as_me:25865: checking for working mmap" >&5 +echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 +if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then ac_cv_func_mmap_fixed_mapped=no else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 25874 "configure" #include "confdefs.h" - +$ac_includes_default /* Thanks to Mike Haertel and Jim Avera for this test. Here is a matrix of mmap possibilities: mmap private not fixed @@ -20705,34 +25886,34 @@ else back from the file, nor mmap's back from the file at a different address. (There have been systems where private was not correctly implemented like the infamous i386 svr4.0, and systems where the - VM page cache was not coherent with the filesystem buffer cache + VM page cache was not coherent with the file system buffer cache like early versions of FreeBSD and possibly contemporary NetBSD.) For shared mappings, we should conversely verify that changes get - propogated back to all the places they're supposed to be. + propagated back to all the places they're supposed to be. Grep wants private fixed already mapped. The main things grep needs to know about mmap are: * does it exist and is it safe to write into the mmap'd area * how to use it (BSD variants) */ -#include + #include #include -/* This mess was copied from the GNU getpagesize.h. */ -#ifndef HAVE_GETPAGESIZE -# ifdef HAVE_UNISTD_H -# include -# endif +#if !STDC_HEADERS && !HAVE_STDLIB_H +char *malloc (); +#endif +/* This mess was copied from the GNU getpagesize.h. */ +#if !HAVE_GETPAGESIZE /* Assume that all systems that can run configure have sys/param.h. */ -# ifndef HAVE_SYS_PARAM_H +# if !HAVE_SYS_PARAM_H # define HAVE_SYS_PARAM_H 1 # endif # ifdef _SC_PAGESIZE # define getpagesize() sysconf(_SC_PAGESIZE) # else /* no _SC_PAGESIZE */ -# ifdef HAVE_SYS_PARAM_H +# if HAVE_SYS_PARAM_H # include # ifdef EXEC_PAGESIZE # define getpagesize() EXEC_PAGESIZE @@ -20759,107 +25940,102 @@ else #endif /* no HAVE_GETPAGESIZE */ -#ifdef __cplusplus -extern "C" { void *malloc(unsigned); } -#else -char *malloc(); -#endif - int -main() +main (void) { - char *data, *data2, *data3; - int i, pagesize; - int fd; - - pagesize = getpagesize(); - - /* - * First, make a file with some known garbage in it. - */ - data = malloc(pagesize); - if (!data) - exit(1); - for (i = 0; i < pagesize; ++i) - *(data + i) = rand(); - umask(0); - fd = creat("conftestmmap", 0600); - if (fd < 0) - exit(1); - if (write(fd, data, pagesize) != pagesize) - exit(1); - close(fd); - - /* - * Next, try to mmap the file at a fixed address which - * already has something else allocated at it. If we can, - * also make sure that we see the same garbage. - */ - fd = open("conftestmmap", O_RDWR); - if (fd < 0) - exit(1); - data2 = malloc(2 * pagesize); - if (!data2) - exit(1); - data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); - if (data2 != mmap(data2, pagesize, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, 0L)) - exit(1); - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data2 + i)) - exit(1); - - /* - * Finally, make sure that changes to the mapped area - * do not percolate back to the file as seen by read(). - * (This is a bug on some variants of i386 svr4.0.) - */ - for (i = 0; i < pagesize; ++i) - *(data2 + i) = *(data2 + i) + 1; - data3 = malloc(pagesize); - if (!data3) - exit(1); - if (read(fd, data3, pagesize) != pagesize) - exit(1); - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data3 + i)) - exit(1); - close(fd); - unlink("conftestmmap"); - exit(0); + char *data, *data2, *data3; + int i, pagesize; + int fd; + + pagesize = getpagesize (); + + /* First, make a file with some known garbage in it. */ + data = (char *) malloc (pagesize); + if (!data) + $ac_main_return (1); + for (i = 0; i < pagesize; ++i) + *(data + i) = rand (); + umask (0); + fd = creat ("conftest.mmap", 0600); + if (fd < 0) + $ac_main_return (1); + if (write (fd, data, pagesize) != pagesize) + $ac_main_return (1); + close (fd); + + /* Next, try to mmap the file at a fixed address which already has + something else allocated at it. If we can, also make sure that + we see the same garbage. */ + fd = open ("conftest.mmap", O_RDWR); + if (fd < 0) + $ac_main_return (1); + data2 = (char *) malloc (2 * pagesize); + if (!data2) + $ac_main_return (1); + data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); + if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_FIXED, fd, 0L)) + $ac_main_return (1); + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data2 + i)) + $ac_main_return (1); + + /* Finally, make sure that changes to the mapped area do not + percolate back to the file as seen by read(). (This is a bug on + some variants of i386 svr4.0.) */ + for (i = 0; i < pagesize; ++i) + *(data2 + i) = *(data2 + i) + 1; + data3 = (char *) malloc (pagesize); + if (!data3) + $ac_main_return (1); + if (read (fd, data3, pagesize) != pagesize) + $ac_main_return (1); + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data3 + i)) + $ac_main_return (1); + close (fd); + $ac_main_return (0); } - -EOF -if { (eval echo configure:20834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:26001: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:26004: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:26006: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:26009: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_mmap_fixed_mapped=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_func_mmap_fixed_mapped=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_mmap_fixed_mapped=no fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi - -echo "$ac_t""$ac_cv_func_mmap_fixed_mapped" 1>&6 +echo "$as_me:26021: result: $ac_cv_func_mmap_fixed_mapped" >&5 +echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 if test $ac_cv_func_mmap_fixed_mapped = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_MMAP 1 EOF fi +rm -f conftest.mmap - -echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:20858: 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 +echo "$as_me:26032: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6 +if test "${ac_cv_gnu_library_2_1+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 26038 "configure" #include "confdefs.h" #include @@ -20868,25 +26044,22 @@ else Lucky GNU user #endif #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "Lucky GNU user" >/dev/null 2>&1; then - rm -rf conftest* ac_cv_gnu_library_2_1=yes else - rm -rf conftest* ac_cv_gnu_library_2_1=no fi -rm -f conftest* +rm -rf conftest* fi +echo "$as_me:26058: result: $ac_cv_gnu_library_2_1" >&5 +echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6 -echo "$ac_t""$ac_cv_gnu_library_2_1" 1>&6 - GLIBC21="$ac_cv_gnu_library_2_1" - cf_makefile=Makefile test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'` @@ -20894,9 +26067,10 @@ test -z "$ALL_LINGUAS" && ALL_LINGUAS=`t # Allow override of "config.h" definition: : ${CONFIG_H:=config.h} - if test -z "$PACKAGE" ; then - { echo "configure: error: CF_BUNDLED_INTL used without setting PACKAGE variable" 1>&2; exit 1; } + { { echo "$as_me:26071: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5 +echo "$as_me: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&2;} + { (exit 1); exit 1; }; } fi if test -z "$VERSION" ; then @@ -20907,126 +26081,140 @@ else fi fi - - - for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ +for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ stdlib.h string.h unistd.h sys/param.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:20918: 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 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:26088: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 26094 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:26098: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:26104: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:20928: \"$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" + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done - for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \ +for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ strdup strtoul tsearch __argz_count __argz_stringify __argz_next do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20959: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:26138: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 26144 "configure" +#include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + builtin and then its argument prototype would still apply. */ +char $ac_func (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); +#error found stub for $ac_func #endif -; return 0; } + return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:26175: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:26178: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:26181: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:26184: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:26194: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "ac_cv_func_$ac_func=no" -fi -rm -rf conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done - - - - # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given. if test "${with_libiconv_prefix+set}" = set; then withval="$with_libiconv_prefix" - - + case "$withval" in (no) ;; (yes) ;; (*) - for cf_searchpath in `echo "$withval" | tr $PATH_SEPARATOR ' '`; do if test -d $cf_searchpath/include; then - + if test -n "$cf_searchpath/include" ; then for cf_add_incdir in $cf_searchpath/include do @@ -21049,24 +26237,41 @@ if test -n "$cf_searchpath/include" ; th if test "$GCC" = yes then cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 26245 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ printf("Hello") -; return 0; } -EOF -if { (eval echo configure:21062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:26257: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:26260: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:26263: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:26266: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_have_incdir=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -21075,8 +26280,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:21079: testing adding $cf_add_incdir to include-path ..." 1>&5 - +echo "${as_me:-configure}:26283: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -21094,7 +26298,7 @@ echo "${as_me:-configure}:21079: testing fi elif test -d $cf_searchpath/../include ; then - + if test -n "$cf_searchpath/../include" ; then for cf_add_incdir in $cf_searchpath/../include do @@ -21117,24 +26321,41 @@ if test -n "$cf_searchpath/../include" ; if test "$GCC" = yes then cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 26329 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ printf("Hello") -; return 0; } -EOF -if { (eval echo configure:21130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:26341: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:26344: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:26347: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:26350: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_have_incdir=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -21143,8 +26364,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:21147: testing adding $cf_add_incdir to include-path ..." 1>&5 - +echo "${as_me:-configure}:26367: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -21162,10 +26382,12 @@ echo "${as_me:-configure}:21147: testing fi else -{ echo "configure: error: cannot find libiconv under $withval" 1>&2; exit 1; } +{ { echo "$as_me:26385: error: cannot find libiconv under $withval" >&5 +echo "$as_me: error: cannot find libiconv under $withval" >&2;} + { (exit 1); exit 1; }; } fi if test -d $cf_searchpath/lib; then - + if test -n "$cf_searchpath/lib" ; then for cf_add_libdir in $cf_searchpath/lib do @@ -21185,8 +26407,7 @@ if test -n "$cf_searchpath/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:21189: testing adding $cf_add_libdir to library-path ..." 1>&5 - +echo "${as_me:-configure}:26410: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -21195,7 +26416,7 @@ echo "${as_me:-configure}:21189: testing fi elif test -d $cf_searchpath ; then - + if test -n "$cf_searchpath" ; then for cf_add_libdir in $cf_searchpath do @@ -21215,8 +26436,7 @@ if test -n "$cf_searchpath" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:21219: testing adding $cf_add_libdir to library-path ..." 1>&5 - +echo "${as_me:-configure}:26439: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -21225,110 +26445,127 @@ echo "${as_me:-configure}:21219: testing fi else -{ echo "configure: error: cannot find libiconv under $withval" 1>&2; exit 1; } +{ { echo "$as_me:26448: error: cannot find libiconv under $withval" >&5 +echo "$as_me: error: cannot find libiconv under $withval" >&2;} + { (exit 1); exit 1; }; } fi done ;; esac - -fi - +fi; - echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:21241: checking for iconv" >&5 -if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:26459: checking for iconv" >&5 +echo $ECHO_N "checking for iconv... $ECHO_C" >&6 +if test "${am_cv_func_iconv+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - # If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these # will be set on completion of the AC_TRY_LINK below. cf_cv_header_path_iconv= cf_cv_library_path_iconv= - -echo "${as_me:-configure}:21254: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 - +echo "${as_me:-configure}:26470: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_LIBS="$LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 26475 "configure" #include "confdefs.h" #include #include -int main() { +int +main (void) +{ iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd); -; return 0; } -EOF -if { (eval echo configure:21274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:26494: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:26497: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:26500: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:26503: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_find_linkage_iconv=yes cf_cv_header_path_iconv=/usr/include cf_cv_library_path_iconv=/usr/lib -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 LIBS="-liconv $cf_save_LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 26517 "configure" #include "confdefs.h" #include #include -int main() { +int +main (void) +{ iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd); -; return 0; } -EOF -if { (eval echo configure:21304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:26536: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:26539: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:26542: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:26545: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_find_linkage_iconv=yes cf_cv_header_path_iconv=/usr/include cf_cv_library_path_iconv=/usr/lib cf_cv_library_file_iconv="-liconv" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 - cf_cv_find_linkage_iconv=no LIBS="$cf_save_LIBS" test -n "$verbose" && echo " find linkage for iconv library" 1>&6 -echo "${as_me:-configure}:21322: testing find linkage for iconv library ..." 1>&5 - - - -echo "${as_me:-configure}:21326: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:26562: testing find linkage for iconv library ..." 1>&5 +echo "${as_me:-configure}:26564: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" - cf_search= # collect the current set of include-directories from compiler flags @@ -21339,7 +26576,7 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then case $cf_header_path in (-I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` - + test "x$cf_header_path" != "xNONE" && \ test -d "$cf_header_path" && \ { @@ -21361,7 +26598,6 @@ fi cf_search= - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -21373,7 +26609,6 @@ test -d "$prefix" && \ test -d $prefix/iconv/include/iconv && cf_search="$cf_search $prefix/iconv/include/iconv" } - for cf_subdir_prefix in \ /usr \ /usr/local \ @@ -21382,7 +26617,7 @@ for cf_subdir_prefix in \ /opt/local \ $HOME do - + test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ (test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { @@ -21396,7 +26631,6 @@ test -d "$cf_subdir_prefix" && \ done - test "$includedir" != NONE && \ test "$includedir" != "/usr/include" && \ test -d "$includedir" && { @@ -21418,61 +26652,72 @@ cf_search="$cf_search $cf_header_path_li if test -d $cf_cv_header_path_iconv ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_iconv" 1>&6 -echo "${as_me:-configure}:21422: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 +echo "${as_me:-configure}:26655: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 + CPPFLAGS="$cf_save_CPPFLAGS" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_iconv" - CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 26663 "configure" #include "confdefs.h" #include #include -int main() { +int +main (void) +{ iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd); -; return 0; } -EOF -if { (eval echo configure:21441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - test -n "$verbose" && echo " ... found iconv headers in $cf_cv_header_path_iconv" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:26682: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:26685: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:26688: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:26691: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then -echo "${as_me:-configure}:21446: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 + test -n "$verbose" && echo " ... found iconv headers in $cf_cv_header_path_iconv" 1>&6 +echo "${as_me:-configure}:26696: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 cf_cv_find_linkage_iconv=maybe cf_test_CPPFLAGS="$CPPFLAGS" break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + CPPFLAGS="$cf_save_CPPFLAGS" - + fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi done if test "$cf_cv_find_linkage_iconv" = maybe ; then - -echo "${as_me:-configure}:21467: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 - +echo "${as_me:-configure}:26714: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" - - if test "$cf_cv_find_linkage_iconv" != yes ; then - + cf_search= cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then @@ -21481,7 +26726,7 @@ if test -n "${LDFLAGS}${LIBS}" ; then case $cf_library_path in (-L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` - + test "x$cf_library_path" != "xNONE" && \ test -d "$cf_library_path" && \ { @@ -21499,10 +26744,8 @@ test -d "$cf_library_path" && \ done fi - cf_search= - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -21514,7 +26757,6 @@ test -d "$prefix" && \ test -d $prefix/iconv/lib/iconv && cf_search="$cf_search $prefix/iconv/lib/iconv" } - for cf_subdir_prefix in \ /usr \ /usr/local \ @@ -21523,7 +26765,7 @@ for cf_subdir_prefix in \ /opt/local \ $HOME do - + test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ (test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { @@ -21537,7 +26779,6 @@ test -d "$cf_subdir_prefix" && \ done - cf_search="$cf_library_path_list $cf_search" for cf_cv_library_path_iconv in $cf_search @@ -21545,49 +26786,60 @@ cf_search="$cf_library_path_list $cf_sea if test -d $cf_cv_library_path_iconv ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_iconv" 1>&6 -echo "${as_me:-configure}:21549: testing ... testing $cf_cv_library_path_iconv ..." 1>&5 - +echo "${as_me:-configure}:26789: testing ... testing $cf_cv_library_path_iconv ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-liconv $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_iconv" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 26795 "configure" #include "confdefs.h" #include #include -int main() { +int +main (void) +{ iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd); -; return 0; } -EOF -if { (eval echo configure:21570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - - test -n "$verbose" && echo " ... found iconv library in $cf_cv_library_path_iconv" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:26814: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:26817: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:26820: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:26823: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then -echo "${as_me:-configure}:21575: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 + test -n "$verbose" && echo " ... found iconv library in $cf_cv_library_path_iconv" 1>&6 +echo "${as_me:-configure}:26828: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 cf_cv_find_linkage_iconv=yes cf_cv_library_file_iconv="-liconv" break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 - CPPFLAGS="$cf_save_CPPFLAGS" LIBS="$cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS" - + fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi done CPPFLAGS="$cf_save_CPPFLAGS" @@ -21597,12 +26849,12 @@ rm -rf conftest* else cf_cv_find_linkage_iconv=no fi - + fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" @@ -21613,28 +26865,28 @@ am_cv_func_iconv="no, consider installin fi fi - -echo "$ac_t""$am_cv_func_iconv" 1>&6 +echo "$as_me:26868: result: $am_cv_func_iconv" >&5 +echo "${ECHO_T}$am_cv_func_iconv" >&6 if test "$am_cv_func_iconv" = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_ICONV 1 EOF + echo "$as_me:26877: checking if the declaration of iconv() needs const." >&5 +echo $ECHO_N "checking if the declaration of iconv() needs const.... $ECHO_C" >&6 +if test "${am_cv_proto_iconv_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else - echo $ac_n "checking if the declaration of iconv() needs const.""... $ac_c" 1>&6 -echo "configure:21627: checking if the declaration of iconv() needs const." >&5 -if eval "test \"`echo '$''{'am_cv_proto_iconv_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 26884 "configure" #include "confdefs.h" #include #include - + extern #ifdef __cplusplus "C" @@ -21645,23 +26897,36 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t iconv(); #endif -int main() { +int +main (void) +{ -; return 0; } -EOF -if { (eval echo configure:21653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:26909: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:26912: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:26915: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:26918: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then am_cv_proto_iconv_const=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - am_cv_proto_iconv_const=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +am_cv_proto_iconv_const=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$am_cv_proto_iconv_const" 1>&6 +echo "$as_me:26928: result: $am_cv_proto_iconv_const" >&5 +echo "${ECHO_T}$am_cv_proto_iconv_const" >&6 if test "$am_cv_proto_iconv_const" = yes ; then am_cv_proto_iconv_arg1="const" @@ -21669,7 +26934,7 @@ echo "$ac_t""$am_cv_proto_iconv_const" 1 am_cv_proto_iconv_arg1="" fi - cat >> confdefs.h <>confdefs.h < conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 26973 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ printf("Hello") -; return 0; } -EOF -if { (eval echo configure:21713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:26985: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:26988: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:26991: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:26994: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_have_incdir=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -21726,8 +27008,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:21730: testing adding $cf_add_incdir to include-path ..." 1>&5 - +echo "${as_me:-configure}:27011: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -21746,7 +27027,7 @@ fi if test -n "$cf_cv_library_file_iconv" ; then LIBICONV="-liconv" - + if test -n "$cf_cv_library_path_iconv" ; then for cf_add_libdir in $cf_cv_library_path_iconv do @@ -21766,8 +27047,7 @@ if test -n "$cf_cv_library_path_iconv" ; if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:21770: testing adding $cf_add_libdir to library-path ..." 1>&5 - +echo "${as_me:-configure}:27050: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -21778,91 +27058,114 @@ fi fi fi - - - -echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:21786: 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 +echo "$as_me:27061: checking for nl_langinfo and CODESET" >&5 +echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 +if test "${am_cv_langinfo_codeset+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 27067 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ char* cs = nl_langinfo(CODESET); -; return 0; } -EOF -if { (eval echo configure:21798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:27079: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:27082: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:27085: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:27088: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then am_cv_langinfo_codeset=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - am_cv_langinfo_codeset=no -fi -rm -rf conftest* - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +am_cv_langinfo_codeset=no fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$ac_t""$am_cv_langinfo_codeset" 1>&6 +fi +echo "$as_me:27099: result: $am_cv_langinfo_codeset" >&5 +echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test $am_cv_langinfo_codeset = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_LANGINFO_CODESET 1 EOF fi if test $ac_cv_header_locale_h = yes; then - echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:21821: 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 + echo "$as_me:27110: checking for LC_MESSAGES" >&5 +echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 +if test "${am_cv_val_LC_MESSAGES+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 27116 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ return LC_MESSAGES -; return 0; } -EOF -if { (eval echo configure:21833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:27128: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:27131: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:27134: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:27137: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then am_cv_val_LC_MESSAGES=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - am_cv_val_LC_MESSAGES=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +am_cv_val_LC_MESSAGES=no fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - -echo "$ac_t""$am_cv_val_LC_MESSAGES" 1>&6 +echo "$as_me:27147: result: $am_cv_val_LC_MESSAGES" >&5 +echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 if test $am_cv_val_LC_MESSAGES = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_LC_MESSAGES 1 EOF fi fi - echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:21854: checking whether NLS is requested" >&5 - - + echo "$as_me:27157: checking whether NLS is requested" >&5 +echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 + # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" USE_NLS=$enableval else USE_NLS=yes -fi - - echo "$ac_t""$USE_NLS" 1>&6 - +fi; + echo "$as_me:27167: result: $USE_NLS" >&5 +echo "${ECHO_T}$USE_NLS" >&6 BUILD_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no @@ -21870,22 +27173,23 @@ fi if test "$USE_NLS" = "yes"; then POSUB=po - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define ENABLE_NLS 1 EOF - echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:21879: checking whether included gettext is requested" >&5 - + echo "$as_me:27181: checking whether included gettext is requested" >&5 +echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6 + # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" nls_cv_force_use_gnu_gettext=$withval else nls_cv_force_use_gnu_gettext=no -fi - - echo "$ac_t""$nls_cv_force_use_gnu_gettext" 1>&6 +fi; + echo "$as_me:27191: result: $nls_cv_force_use_gnu_gettext" >&5 +echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6 nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then @@ -21897,10 +27201,10 @@ fi # 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:21902: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:27204: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_MSGFMT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case "$MSGFMT" in ([\\/]*|?:[\\/]*) @@ -21924,56 +27228,58 @@ esac fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != ":"; then - echo "$ac_t""$MSGFMT" 1>&6 + echo "$as_me:27231: result: $MSGFMT" >&5 +echo "${ECHO_T}$MSGFMT" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:27234: result: no" >&5 +echo "${ECHO_T}no" >&6 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:21936: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:27240: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_GMSGFMT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$GMSGFMT" in - /*) + case $GMSGFMT in + [\\/]* | ?:[\\/]*) ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_GMSGFMT="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_GMSGFMT="$ac_dir/$ac_word" + echo "$as_me:27257: found $ac_dir/$ac_word" >&5 + break +fi +done + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ;; esac fi -GMSGFMT="$ac_cv_path_GMSGFMT" +GMSGFMT=$ac_cv_path_GMSGFMT + if test -n "$GMSGFMT"; then - echo "$ac_t""$GMSGFMT" 1>&6 + echo "$as_me:27269: result: $GMSGFMT" >&5 +echo "${ECHO_T}$GMSGFMT" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:27272: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - - # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:21975: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:27279: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_XGETTEXT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case "$XGETTEXT" in ([\\/]*|?:[\\/]*) @@ -21997,16 +27303,17 @@ esac fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - echo "$ac_t""$XGETTEXT" 1>&6 + echo "$as_me:27306: result: $XGETTEXT" >&5 +echo "${ECHO_T}$XGETTEXT" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:27309: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - cf_save_OPTS_1="$CPPFLAGS" if test "x$cf_save_msgfmt_path" = "x$MSGFMT" && \ test "x$cf_save_xgettext_path" = "x$XGETTEXT" ; then - + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -22027,13 +27334,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -22048,14 +27355,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -22063,7 +27370,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -22071,11 +27378,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -22086,36 +27392,30 @@ esac done if test -n "$cf_new_cflags" ; then - - + test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - - + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then - - + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - fi cf_save_LIBS_1="$LIBS" - + cf_add_libs="$LIBICONV" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -22132,100 +27432,116 @@ do done LIBS="$cf_add_libs" - - - # If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these # will be set on completion of the AC_TRY_LINK below. cf_cv_header_path_intl= cf_cv_library_path_intl= - -echo "${as_me:-configure}:22145: testing Starting FIND_LINKAGE(intl,) ..." 1>&5 - +echo "${as_me:-configure}:27440: testing Starting FIND_LINKAGE(intl,) ..." 1>&5 cf_save_LIBS="$LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 27445 "configure" #include "confdefs.h" #include extern int _nl_msg_cat_cntr; -int main() { +int +main (void) +{ bindtextdomain ("", ""); return (int) gettext ("") - + #ifndef IGNORE_MSGFMT_HACK + _nl_msg_cat_cntr #endif -; return 0; } -EOF -if { (eval echo configure:22168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:27467: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:27470: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:27473: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:27476: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_find_linkage_intl=yes cf_cv_header_path_intl=/usr/include cf_cv_library_path_intl=/usr/lib else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 LIBS="-lintl $cf_save_LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 27490 "configure" #include "confdefs.h" #include extern int _nl_msg_cat_cntr; -int main() { +int +main (void) +{ bindtextdomain ("", ""); return (int) gettext ("") - + #ifndef IGNORE_MSGFMT_HACK + _nl_msg_cat_cntr #endif -; return 0; } -EOF -if { (eval echo configure:22201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:27512: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:27515: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:27518: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:27521: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_find_linkage_intl=yes cf_cv_header_path_intl=/usr/include cf_cv_library_path_intl=/usr/lib cf_cv_library_file_intl="-lintl" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 - cf_cv_find_linkage_intl=no LIBS="$cf_save_LIBS" test -n "$verbose" && echo " find linkage for intl library" 1>&6 -echo "${as_me:-configure}:22219: testing find linkage for intl library ..." 1>&5 - - - -echo "${as_me:-configure}:22223: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5 +echo "${as_me:-configure}:27538: testing find linkage for intl library ..." 1>&5 +echo "${as_me:-configure}:27540: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" - cf_search= # collect the current set of include-directories from compiler flags @@ -22236,7 +27552,7 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then case $cf_header_path in (-I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` - + test "x$cf_header_path" != "xNONE" && \ test -d "$cf_header_path" && \ { @@ -22258,7 +27574,6 @@ fi cf_search= - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -22270,7 +27585,6 @@ test -d "$prefix" && \ test -d $prefix/intl/include/intl && cf_search="$cf_search $prefix/intl/include/intl" } - for cf_subdir_prefix in \ /usr \ /usr/local \ @@ -22279,7 +27593,7 @@ for cf_subdir_prefix in \ /opt/local \ $HOME do - + test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ (test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { @@ -22293,7 +27607,6 @@ test -d "$cf_subdir_prefix" && \ done - test "$includedir" != NONE && \ test "$includedir" != "/usr/include" && \ test -d "$includedir" && { @@ -22315,64 +27628,75 @@ cf_search="$cf_search $cf_header_path_li if test -d $cf_cv_header_path_intl ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_intl" 1>&6 -echo "${as_me:-configure}:22319: testing ... testing $cf_cv_header_path_intl ..." 1>&5 +echo "${as_me:-configure}:27631: testing ... testing $cf_cv_header_path_intl ..." 1>&5 + + CPPFLAGS="$cf_save_CPPFLAGS" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_intl" - CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_intl" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 27639 "configure" #include "confdefs.h" #include extern int _nl_msg_cat_cntr; -int main() { +int +main (void) +{ bindtextdomain ("", ""); return (int) gettext ("") - + #ifndef IGNORE_MSGFMT_HACK + _nl_msg_cat_cntr #endif -; return 0; } -EOF -if { (eval echo configure:22341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - test -n "$verbose" && echo " ... found intl headers in $cf_cv_header_path_intl" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:27661: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:27664: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:27667: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:27670: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then -echo "${as_me:-configure}:22346: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5 + test -n "$verbose" && echo " ... found intl headers in $cf_cv_header_path_intl" 1>&6 +echo "${as_me:-configure}:27675: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5 cf_cv_find_linkage_intl=maybe cf_test_CPPFLAGS="$CPPFLAGS" break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + CPPFLAGS="$cf_save_CPPFLAGS" - + fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi done if test "$cf_cv_find_linkage_intl" = maybe ; then - -echo "${as_me:-configure}:22367: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5 - +echo "${as_me:-configure}:27693: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" - - if test "$cf_cv_find_linkage_intl" != yes ; then - + cf_search= cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then @@ -22381,7 +27705,7 @@ if test -n "${LDFLAGS}${LIBS}" ; then case $cf_library_path in (-L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` - + test "x$cf_library_path" != "xNONE" && \ test -d "$cf_library_path" && \ { @@ -22399,10 +27723,8 @@ test -d "$cf_library_path" && \ done fi - cf_search= - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -22414,7 +27736,6 @@ test -d "$prefix" && \ test -d $prefix/intl/lib/intl && cf_search="$cf_search $prefix/intl/lib/intl" } - for cf_subdir_prefix in \ /usr \ /usr/local \ @@ -22423,7 +27744,7 @@ for cf_subdir_prefix in \ /opt/local \ $HOME do - + test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ (test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { @@ -22437,7 +27758,6 @@ test -d "$cf_subdir_prefix" && \ done - cf_search="$cf_library_path_list $cf_search" for cf_cv_library_path_intl in $cf_search @@ -22445,52 +27765,63 @@ cf_search="$cf_library_path_list $cf_sea if test -d $cf_cv_library_path_intl ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_intl" 1>&6 -echo "${as_me:-configure}:22449: testing ... testing $cf_cv_library_path_intl ..." 1>&5 - +echo "${as_me:-configure}:27768: testing ... testing $cf_cv_library_path_intl ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lintl $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_intl" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 27774 "configure" #include "confdefs.h" #include extern int _nl_msg_cat_cntr; -int main() { +int +main (void) +{ bindtextdomain ("", ""); return (int) gettext ("") - + #ifndef IGNORE_MSGFMT_HACK + _nl_msg_cat_cntr #endif -; return 0; } -EOF -if { (eval echo configure:22473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - - test -n "$verbose" && echo " ... found intl library in $cf_cv_library_path_intl" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:27796: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:27799: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:27802: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:27805: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then -echo "${as_me:-configure}:22478: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5 + test -n "$verbose" && echo " ... found intl library in $cf_cv_library_path_intl" 1>&6 +echo "${as_me:-configure}:27810: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5 cf_cv_find_linkage_intl=yes cf_cv_library_file_intl="-lintl" break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 - CPPFLAGS="$cf_save_CPPFLAGS" LIBS="$cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS" - + fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi done CPPFLAGS="$cf_save_CPPFLAGS" @@ -22500,12 +27831,12 @@ rm -rf conftest* else cf_cv_find_linkage_intl=no fi - + fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" @@ -22515,27 +27846,26 @@ else cf_cv_func_gettext=no fi - - echo $ac_n "checking for libintl.h and gettext()""... $ac_c" 1>&6 -echo "configure:22521: checking for libintl.h and gettext()" >&5 - echo "$ac_t""$cf_cv_func_gettext" 1>&6 + echo "$as_me:27849: checking for libintl.h and gettext()" >&5 +echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6 + echo "$as_me:27851: result: $cf_cv_func_gettext" >&5 +echo "${ECHO_T}$cf_cv_func_gettext" >&6 LIBS="$cf_save_LIBS_1" CPPFLAGS="$cf_save_OPTS_1" if test "$cf_cv_func_gettext" = yes ; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_LIBINTL_H 1 EOF - if test "$PACKAGE" != gettext; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_GETTEXT 1 EOF - - if test -n "$cf_cv_header_path_intl" ; then for cf_add_incdir in $cf_cv_header_path_intl do @@ -22558,24 +27888,41 @@ if test -n "$cf_cv_header_path_intl" ; t if test "$GCC" = yes then cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 27896 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ printf("Hello") -; return 0; } -EOF -if { (eval echo configure:22571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:27908: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:27911: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:27914: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:27917: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_have_incdir=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -22584,8 +27931,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:22588: testing adding $cf_add_incdir to include-path ..." 1>&5 - +echo "${as_me:-configure}:27934: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -22602,10 +27948,9 @@ echo "${as_me:-configure}:22588: testing done fi - if test -n "$cf_cv_library_file_intl" ; then INTLLIBS="$cf_cv_library_file_intl $LIBICONV" - + if test -n "$cf_cv_library_path_intl" ; then for cf_add_libdir in $cf_cv_library_path_intl do @@ -22625,8 +27970,7 @@ if test -n "$cf_cv_library_path_intl" ; if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:22629: testing adding $cf_add_libdir to library-path ..." 1>&5 - +echo "${as_me:-configure}:27973: testing adding $cf_add_libdir to library-path ..." 1>&5 INTLLIBS="-L$cf_add_libdir $INTLLIBS" fi @@ -22638,58 +27982,73 @@ fi gt_save_LIBS="$LIBS" LIBS="$LIBS $INTLLIBS" - for ac_func in dcgettext + +for ac_func in dcgettext do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:22645: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:27989: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 27995 "configure" +#include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + builtin and then its argument prototype would still apply. */ +char $ac_func (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); +#error found stub for $ac_func #endif -; return 0; } + return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:28026: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:28029: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:28032: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:28035: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:28045: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_$ac_func=no" -fi -rm -rf conftest* -fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done @@ -22697,8 +28056,9 @@ done CATOBJEXT=.gmo fi - else - echo "configure: warning: disabling NLS feature" 1>&2 + elif test -z "$MSGFMT" || test -z "$XGETTEXT" ; then + { echo "$as_me:28060: WARNING: disabling NLS feature" >&5 +echo "$as_me: WARNING: disabling NLS feature" >&2;} sed -e /ENABLE_NLS/d confdefs.h >confdefs.tmp mv confdefs.tmp confdefs.h ALL_LINGUAS= @@ -22728,7 +28088,8 @@ done LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` elif test "$nls_cv_use_gnu_gettext" = "yes"; then nls_cv_use_gnu_gettext=no - echo "configure: warning: no NLS library is packaged with this application" 1>&2 + { echo "$as_me:28091: WARNING: no NLS library is packaged with this application" >&5 +echo "$as_me: WARNING: no NLS library is packaged with this application" >&2;} fi fi @@ -22736,7 +28097,8 @@ done if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then : ; else - echo "configure: warning: found msgfmt program is not GNU msgfmt" 1>&2 + { echo "$as_me:28100: WARNING: found msgfmt program is not GNU msgfmt" >&5 +echo "$as_me: WARNING: found msgfmt program is not GNU msgfmt" >&2;} fi fi @@ -22744,58 +28106,62 @@ done if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then : ; else - echo "configure: warning: found xgettext program is not GNU xgettext" 1>&2 + { echo "$as_me:28109: WARNING: found xgettext program is not GNU xgettext" >&5 +echo "$as_me: WARNING: found xgettext program is not GNU xgettext" >&2;} fi fi fi if test "$XGETTEXT" != ":"; then - - + ac_config_commands="$ac_config_commands default-1" + if test "$PACKAGE" = gettext; then BUILD_INCLUDED_LIBINTL=yes fi - + 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. + # 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:22766: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:28127: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_INTLBISON+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$INTLBISON"; then ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_INTLBISON="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_INTLBISON="$ac_prog" +echo "$as_me:28142: found $ac_dir/$ac_word" >&5 +break +done + fi fi -INTLBISON="$ac_cv_prog_INTLBISON" +INTLBISON=$ac_cv_prog_INTLBISON if test -n "$INTLBISON"; then - echo "$ac_t""$INTLBISON" 1>&6 + echo "$as_me:28150: result: $INTLBISON" >&5 +echo "${ECHO_T}$INTLBISON" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:28153: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -test -n "$INTLBISON" && break + test -n "$INTLBISON" && break done if test -z "$INTLBISON"; then ac_verc_fail=yes else - echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:22799: checking version of bison" >&5 + echo "$as_me:28163: checking version of bison" >&5 +echo $ECHO_N "checking version of bison... $ECHO_C" >&6 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;; @@ -22803,48 +28169,35 @@ echo "configure:22799: checking version ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; (*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; esac - echo "$ac_t""$ac_prog_version" 1>&6 + echo "$as_me:28172: result: $ac_prog_version" >&5 +echo "${ECHO_T}$ac_prog_version" >&6 fi if test $ac_verc_fail = yes; then INTLBISON=: fi fi - + for lang in $ALL_LINGUAS; do GMOFILES="$GMOFILES $lang.gmo" POFILES="$POFILES $lang.po" done fi - - - - - - - - - - nls_cv_header_intl= nls_cv_header_libgt= DATADIRNAME=share - INSTOBJEXT=.mo - GENCAT=gencat - - if test "x$CATOBJEXT" != "x"; then if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else - echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:22848: checking for catalogs to be installed" >&5 + echo "$as_me:28199: checking for catalogs to be installed" >&5 +echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -22863,7 +28216,8 @@ echo "configure:22848: checking for cata fi done LINGUAS=$NEW_LINGUAS - echo "$ac_t""$LINGUAS" 1>&6 + echo "$as_me:28219: result: $LINGUAS" >&5 +echo "${ECHO_T}$LINGUAS" >&6 fi if test -n "$LINGUAS"; then @@ -22872,49 +28226,45 @@ echo "configure:22848: checking for cata fi INTL_LIBTOOL_SUFFIX_PREFIX= - - if test "$USE_NLS" = yes ; then - + # Check whether --with-textdomain or --without-textdomain was given. if test "${with_textdomain+set}" = set; then withval="$with_textdomain" NLS_TEXTDOMAIN=$withval else NLS_TEXTDOMAIN=$PACKAGE -fi +fi; - cat >> confdefs.h <>confdefs.h <&6 -echo "configure:22907: checking if we should use included message-library" >&5 - +echo "$as_me:28255: checking if we should use included message-library" >&5 +echo $ECHO_N "checking if we should use included message-library... $ECHO_C" >&6 + # Check whether --enable-included-msgs or --disable-included-msgs was given. if test "${enable_included_msgs+set}" = set; then enableval="$enable_included_msgs" use_our_messages=$enableval else use_our_messages=yes +fi; fi - -fi -echo "$ac_t""$use_our_messages" 1>&6 +echo "$as_me:28266: result: $use_our_messages" >&5 +echo "${ECHO_T}$use_our_messages" >&6 fi MSG_DIR_MAKE="#" @@ -22924,10 +28274,6 @@ then MSG_DIR_MAKE= fi - - - - if test "$USE_INCLUDED_LIBINTL" = yes ; then if test "$nls_cv_force_use_gnu_gettext" = yes ; then : @@ -22937,7 +28283,8 @@ if test "$USE_INCLUDED_LIBINTL" = yes ; INTLDIR_MAKE="#" fi if test -z "$INTLDIR_MAKE"; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_LIBGETTEXT_H 1 EOF @@ -22954,43 +28301,52 @@ EOF else INTLDIR_MAKE="#" if test "$USE_NLS" = yes ; then - for ac_hdr in libintl.h + +for ac_header in libintl.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:22962: 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 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:28308: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 28314 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:28318: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:28324: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:22972: \"$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" + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done @@ -22998,7 +28354,10 @@ done fi if test -z "$INTLDIR_MAKE" ; then - CPPFLAGS="$CPPFLAGS -I../intl" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I../intl" + fi if test "$BUILD_INCLUDED_LIBINTL" = yes ; then @@ -23009,26 +28368,23 @@ else GT_NO="#" fi - - - - - - if test "$USE_INCLUDED_LIBINTL" = yes ; then if test "$nls_cv_force_use_gnu_gettext" = yes ; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_GETTEXT 1 EOF elif test "$nls_cv_use_gnu_gettext" = yes ; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_GETTEXT 1 EOF fi if test -n "$nls_cv_header_intl" ; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_LIBINTL_H 1 EOF @@ -23048,51 +28404,64 @@ bison*) esac if test ".$use_alloca" = .yes ; then - + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:23056: 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 +echo "$as_me:28410: checking for working alloca.h" >&5 +echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 +if test "${ac_cv_working_alloca_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 28416 "configure" #include "confdefs.h" #include -int main() { -char *p = alloca(2 * sizeof(int)); -; return 0; } -EOF -if { (eval echo configure:23068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - ac_cv_header_alloca_h=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - ac_cv_header_alloca_h=no -fi -rm -rf conftest* -fi +int +main (void) +{ +char *p = (char *) alloca (2 * sizeof (int)); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:28428: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:28431: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:28434: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:28437: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_working_alloca_h=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_working_alloca_h=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:28447: result: $ac_cv_working_alloca_h" >&5 +echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 +if test $ac_cv_working_alloca_h = yes; then -echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 -if test $ac_cv_header_alloca_h = yes; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define HAVE_ALLOCA_H 1 EOF fi -echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:23089: checking for alloca" >&5 -if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:28457: checking for alloca" >&5 +echo $ECHO_N "checking for alloca... $ECHO_C" >&6 +if test "${ac_cv_func_alloca_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 28463 "configure" #include "confdefs.h" - #ifdef __GNUC__ # define alloca __builtin_alloca #else @@ -23114,48 +28483,62 @@ char *alloca (); # endif #endif -int main() { -char *p = (char *) alloca(1); -; return 0; } -EOF -if { (eval echo configure:23122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - +int +main (void) +{ +char *p = (char *) alloca (1); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:28495: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:28498: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:28501: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:28504: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_alloca_works=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - ac_cv_func_alloca_works=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_alloca_works=no fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:28514: result: $ac_cv_func_alloca_works" >&5 +echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 -echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 if test $ac_cv_func_alloca_works = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_ALLOCA 1 EOF -fi - -if test $ac_cv_func_alloca_works = no; then +else # The SVR3 libPW and SVR4 libucb both contain incompatible functions - # that cause trouble. Some versions do not even contain alloca or - # contain a buggy version. If you still want to use their alloca, - # use ar to extract alloca.o from them instead of compiling alloca.c. - ALLOCA=alloca.${ac_objext} - cat >> confdefs.h <<\EOF +# that cause trouble. Some versions do not even contain alloca or +# contain a buggy version. If you still want to use their alloca, +# use ar to extract alloca.o from them instead of compiling alloca.c. + +ALLOCA=alloca.$ac_objext + +cat >>confdefs.h <<\EOF #define C_ALLOCA 1 EOF - -echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:23154: 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 +echo "$as_me:28535: checking whether \`alloca.c' needs Cray hooks" >&5 +echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 +if test "${ac_cv_os_cray+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 28541 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -23163,89 +28546,104 @@ webecray wenotbecray #endif -EOF +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "webecray" >/dev/null 2>&1; then - rm -rf conftest* ac_cv_os_cray=yes else - rm -rf conftest* ac_cv_os_cray=no fi -rm -f conftest* +rm -rf conftest* fi - -echo "$ac_t""$ac_cv_os_cray" 1>&6 +echo "$as_me:28559: result: $ac_cv_os_cray" >&5 +echo "${ECHO_T}$ac_cv_os_cray" >&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:23184: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ + for ac_func in _getb67 GETB67 getb67; do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:28564: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 28570 "configure" +#include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + builtin and then its argument prototype would still apply. */ +char $ac_func (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); +#error found stub for $ac_func #endif -; return 0; } -EOF -if { (eval echo configure:23212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_$ac_func=no" -fi -rm -rf conftest* -fi + return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:28601: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:28604: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:28607: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:28610: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:28620: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <>confdefs.h <&6 + break fi -done + done fi -echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:23239: 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 +echo "$as_me:28634: checking stack direction for C alloca" >&5 +echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 +if test "${ac_cv_c_stack_direction+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then ac_cv_c_stack_direction=0 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 28643 "configure" #include "confdefs.h" -find_stack_direction () +int +find_stack_direction (void) { static char *addr = 0; auto char dummy; @@ -23257,33 +28655,43 @@ find_stack_direction () else return (&dummy > addr) ? 1 : -1; } -main () + +int +main (void) { - exit (find_stack_direction() < 0); + $ac_main_return (find_stack_direction () < 0); } -EOF -if { (eval echo configure:23266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:28666: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:28669: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:28671: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:28674: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_stack_direction=1 else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_c_stack_direction=-1 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_stack_direction=-1 fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi +echo "$as_me:28686: result: $ac_cv_c_stack_direction" >&5 +echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 -echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 -cat >> confdefs.h <>confdefs.h <&6 -echo "configure:23311: checking for $cf_hdr" >&5 - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for $cf_hdr... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 28719 "configure" #include "confdefs.h" #include #include <$cf_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:23321: \"$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* +_ACEOF +if { (eval echo "$as_me:28726: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:28732: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then cf_found=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* cf_found=no fi -rm -f conftest* -echo "$ac_t""$cf_found" 1>&6 +rm -f conftest.err conftest.$ac_ext +echo "$as_me:28750: result: $cf_found" >&5 +echo "${ECHO_T}$cf_found" >&6 if test $cf_found = yes ; then - + cf_tr_hdr=`echo "$cf_hdr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6 -echo "configure:23347: checking for iconv_open() //TRANSLIT extension" >&5 +echo "$as_me:28763: checking for iconv_open() //TRANSLIT extension" >&5 +echo $ECHO_N "checking for iconv_open() //TRANSLIT extension... $ECHO_C" >&6 if test "$cross_compiling" = yes; then - echo "$ac_t""unknown" 1>&6 + + echo "$as_me:28767: result: unknown" >&5 +echo "${ECHO_T}unknown" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 28772 "configure" #include "confdefs.h" #ifdef HAVE_ICONV_H @@ -23365,23 +28785,38 @@ int main() { exit(1); exit(0); } -EOF -if { (eval echo configure:23370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - cat >> confdefs.h <<\EOF +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:28790: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:28793: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:28795: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:28798: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cat >>confdefs.h <<\EOF #define HAVE_ICONV_OPEN_TRANSLIT 1 EOF - echo "$ac_t""yes" 1>&6 + + echo "$as_me:28805: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - echo "$ac_t""no" 1>&6 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + + echo "$as_me:28813: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - # FIXME / TESTME # locale is broken on cygwin < 1.7.0 # group/other bits don't work on cygwin < 1.7.0 @@ -23391,76 +28826,90 @@ case "$host_os" in case `uname -r | sed 's,(.*,,'` in B*|1.0-6].*) # multiple defects - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define NO_LOCALE 1 EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define NO_LOCKING 1 EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define FILE_MODE_BROKEN 1 EOF ;; 1.7.*) # link does not work - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define NO_LOCKING 1 EOF ;; *) - echo $ac_n "checking for link""... $ac_c" 1>&6 -echo "configure:23417: checking for link" >&5 -if eval "test \"`echo '$''{'ac_cv_func_link'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ + echo "$as_me:28850: checking for link" >&5 +echo $ECHO_N "checking for link... $ECHO_C" >&6 +if test "${ac_cv_func_link+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 28856 "configure" +#include "confdefs.h" +#define link autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef link + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char link(); + builtin and then its argument prototype would still apply. */ +char link (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_link) || defined (__stub___link) -choke me -#else -link(); +#error found stub for link #endif -; return 0; } -EOF -if { (eval echo configure:23445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_link=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_link=no" -fi -rm -rf conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'link`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + return link (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:28887: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:28890: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:28893: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:28896: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_link=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_link=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:28906: result: $ac_cv_func_link" >&5 +echo "${ECHO_T}$ac_cv_func_link" >&6 +if test $ac_cv_func_link = yes; then + cat >>confdefs.h <<\EOF #define HAVE_LINK 1 EOF -else - echo "$ac_t""no" 1>&6 fi ;; @@ -23468,80 +28917,88 @@ fi ;; *haiku*) # link does not work - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define NO_LOCKING 1 EOF ;; *) - echo $ac_n "checking for link""... $ac_c" 1>&6 -echo "configure:23479: checking for link" >&5 -if eval "test \"`echo '$''{'ac_cv_func_link'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ + echo "$as_me:28926: checking for link" >&5 +echo $ECHO_N "checking for link... $ECHO_C" >&6 +if test "${ac_cv_func_link+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 28932 "configure" +#include "confdefs.h" +#define link autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef link + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char link(); + builtin and then its argument prototype would still apply. */ +char link (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_link) || defined (__stub___link) -choke me -#else -link(); +#error found stub for link #endif -; return 0; } -EOF -if { (eval echo configure:23507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_link=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_link=no" -fi -rm -rf conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'link`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + return link (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:28963: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:28966: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:28969: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:28972: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_link=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_link=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:28982: result: $ac_cv_func_link" >&5 +echo "${ECHO_T}$ac_cv_func_link" >&6 +if test $ac_cv_func_link = yes; then + cat >>confdefs.h <<\EOF #define HAVE_LINK 1 EOF -else - echo "$ac_t""no" 1>&6 fi esac if test "$cf_cv_termlib" = pdcurses ; then - # If we find X, set shell vars x_includes and x_libraries to the -# paths, otherwise set no_x=yes. -# 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:23537: checking for X" >&5 - + echo "$as_me:28994: checking for X" >&5 +echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then withval="$with_x" - : -fi +fi; # $have_x is `yes', `no', `disabled', or empty when we do not yet know. if test "x$with_x" = xno; then # The user explicitly disabled X. @@ -23551,16 +29008,16 @@ else # Both variables are already set. have_x=yes else -if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + if test "${ac_cv_have_x+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else # One or both of the vars are not set, and there is no cached value. -ac_x_includes=NO ac_x_libraries=NO -rm -fr conftestdir -if mkdir conftestdir; then - cd conftestdir +ac_x_includes=no ac_x_libraries=no +rm -fr conftest.dir +if mkdir conftest.dir; then + cd conftest.dir # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat > Imakefile <<'EOF' + cat >Imakefile <<'EOF' acfindx: @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' EOF @@ -23568,176 +29025,157 @@ EOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl; do + for ac_extension in a so sl dylib dll; do if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then + test -f $ac_im_libdir/libX11.$ac_extension; then ac_im_usrlibdir=$ac_im_libdir; break fi done # Screen out bogus values from the imake configuration. They are # bogus both because they are the default anyway, and because # using them would break gcc on systems where it needs fixed includes. - case "$ac_im_incroot" in + case $ac_im_incroot in /usr/include) ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;; + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; esac - case "$ac_im_usrlibdir" in + case $ac_im_usrlibdir in /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; esac fi cd .. - rm -fr conftestdir + rm -fr conftest.dir fi -if test "$ac_x_includes" = NO; then - # Guess where to find include files, by looking for this one X11 .h file. - test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h +# Standard set of common directories for X headers. +# Check X11 before X11Rn because it is often a symlink to the current release. +ac_x_header_dirs=' +/usr/X11/include +/usr/X11R6/include +/usr/X11R5/include +/usr/X11R4/include + +/usr/include/X11 +/usr/include/X11R6 +/usr/include/X11R5 +/usr/include/X11R4 + +/usr/local/X11/include +/usr/local/X11R6/include +/usr/local/X11R5/include +/usr/local/X11R4/include + +/usr/local/include/X11 +/usr/local/include/X11R6 +/usr/local/include/X11R5 +/usr/local/include/X11R4 + +/usr/X386/include +/usr/x386/include +/usr/XFree86/include/X11 + +/usr/include +/usr/local/include +/usr/unsupported/include +/usr/athena/include +/usr/local/x11r5/include +/usr/lpp/Xamples/include + +/usr/openwin/include +/usr/openwin/share/include' +if test "$ac_x_includes" = no; then + # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 29091 "configure" #include "confdefs.h" -#include <$x_direct_test_include> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:23605: \"$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* +#include +_ACEOF +if { (eval echo "$as_me:29095: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:29101: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # We can compile using X headers with no special include directory. ac_x_includes= else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - # Look for the header file in a standard set of common directories. -# Check X11 before X11Rn because it is often a symlink to the current release. - for ac_dir in \ - /usr/X11/include \ - /usr/X11R6/include \ - /usr/X11R5/include \ - /usr/X11R4/include \ - \ - /usr/include/X11 \ - /usr/include/X11R6 \ - /usr/include/X11R5 \ - /usr/include/X11R4 \ - \ - /usr/local/X11/include \ - /usr/local/X11R6/include \ - /usr/local/X11R5/include \ - /usr/local/X11R4/include \ - \ - /usr/local/include/X11 \ - /usr/local/include/X11R6 \ - /usr/local/include/X11R5 \ - /usr/local/include/X11R4 \ - \ - /usr/X386/include \ - /usr/x386/include \ - /usr/XFree86/include/X11 \ - \ - /usr/include \ - /usr/local/include \ - /usr/unsupported/include \ - /usr/athena/include \ - /usr/local/x11r5/include \ - /usr/lpp/Xamples/include \ - \ - /usr/openwin/include \ - /usr/openwin/share/include \ - ; \ - do - if test -r "$ac_dir/$x_direct_test_include"; then - ac_x_includes=$ac_dir - break - fi - done + for ac_dir in $ac_x_header_dirs; do + if test -r "$ac_dir/X11/Intrinsic.h"; then + ac_x_includes=$ac_dir + break + fi +done fi -rm -f conftest* -fi # $ac_x_includes = NO +rm -f conftest.err conftest.$ac_ext +fi # $ac_x_includes = no -if test "$ac_x_libraries" = NO; then +if test "$ac_x_libraries" = no; then # Check for the libraries. - - test -z "$x_direct_test_library" && x_direct_test_library=Xt - test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc - # See if we find them without any special options. # Don't add to $LIBS permanently. - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 29134 "configure" #include "confdefs.h" - -int main() { -${x_direct_test_function}() -; return 0; } -EOF -if { (eval echo configure:23681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - LIBS="$ac_save_LIBS" +#include +int +main (void) +{ +XtMalloc (0) + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:29146: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:29149: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:29152: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:29155: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries= else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - LIBS="$ac_save_LIBS" -# First see if replacing the include by lib works. -# Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ - /usr/X11/lib \ - /usr/X11R6/lib \ - /usr/X11R5/lib \ - /usr/X11R4/lib \ - \ - /usr/lib/X11 \ - /usr/lib/X11R6 \ - /usr/lib/X11R5 \ - /usr/lib/X11R4 \ - \ - /usr/local/X11/lib \ - /usr/local/X11R6/lib \ - /usr/local/X11R5/lib \ - /usr/local/X11R4/lib \ - \ - /usr/local/lib/X11 \ - /usr/local/lib/X11R6 \ - /usr/local/lib/X11R5 \ - /usr/local/lib/X11R4 \ - \ - /usr/X386/lib \ - /usr/x386/lib \ - /usr/XFree86/lib/X11 \ - \ - /usr/lib \ - /usr/local/lib \ - /usr/unsupported/lib \ - /usr/athena/lib \ - /usr/local/x11r5/lib \ - /usr/lpp/Xamples/lib \ - /lib/usr/lib/X11 \ - \ - /usr/openwin/lib \ - /usr/openwin/share/lib \ - ; \ -do - for ac_extension in a so sl; do - if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +LIBS=$ac_save_LIBS +for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` +do + # Don't even attempt the hair of trying to link an X program! + for ac_extension in a so sl dylib dll; do + if test -r $ac_dir/libXt.$ac_extension; then ac_x_libraries=$ac_dir break 2 fi done done fi -rm -rf conftest* -fi # $ac_x_libraries = NO +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi # $ac_x_libraries = no -if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then +if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then # Didn't find X anywhere. Cache the known absence of X. ac_cv_have_x="have_x=no" else @@ -23746,12 +29184,14 @@ else ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" fi fi + fi eval "$ac_cv_have_x" fi # $with_x != no if test "$have_x" != yes; then - echo "$ac_t""$have_x" 1>&6 + echo "$as_me:29193: result: $have_x" >&5 +echo "${ECHO_T}$have_x" >&6 no_x=yes else # If each of the values was on the command line, it overrides each guess. @@ -23760,12 +29200,14 @@ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6 + echo "$as_me:29203: result: libraries $x_libraries, headers $x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define X_DISPLAY_MISSING 1 EOF @@ -23780,60 +29222,89 @@ else X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . - case "`(uname -sr) 2>/dev/null`" in + 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:23787: checking whether -R must be followed by a space" >&5 - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 + ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" + cat >conftest.$ac_ext <<_ACEOF +#line 29231 "configure" #include "confdefs.h" -int main() { +int +main (void) +{ -; return 0; } -EOF -if { (eval echo configure:23797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:29243: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:29246: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:29249: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:29252: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_R_nospace=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - ac_R_nospace=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_R_nospace=no fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_nospace = yes; then - echo "$ac_t""no" 1>&6 + echo "$as_me:29262: result: no" >&5 +echo "${ECHO_T}no" >&6 X_LIBS="$X_LIBS -R$x_libraries" else LIBS="$ac_xsave_LIBS -R $x_libraries" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 29268 "configure" #include "confdefs.h" -int main() { +int +main (void) +{ -; return 0; } -EOF -if { (eval echo configure:23820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:29280: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:29283: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:29286: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:29289: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_R_space=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - ac_R_space=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_R_space=no fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_space = yes; then - echo "$ac_t""yes" 1>&6 + echo "$as_me:29299: result: yes" >&5 +echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$ac_t""neither works" 1>&6 + echo "$as_me:29303: result: neither works" >&5 +echo "${ECHO_T}neither works" >&6 fi fi - LIBS="$ac_xsave_LIBS" + LIBS=$ac_xsave_LIBS esac fi @@ -23844,594 +29315,828 @@ rm -rf conftest* if test "$ISC" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" else - # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And karl@cs.umb.edu says + # Martyn Johnson says this is needed for Ultrix, if the X + # libraries were built with DECnet support. And Karl Berry 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:23852: 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 -else - ac_save_LIBS="$LIBS" -LIBS="-ldnet $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 29323 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa(); - -int main() { -dnet_ntoa() -; return 0; } -EOF -if { (eval echo configure:23871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" + builtin and then its argument prototype would still apply. */ +char XOpenDisplay (); +int +main (void) +{ +XOpenDisplay (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:29342: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:29345: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:29348: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:29351: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +echo "$as_me:29357: checking for dnet_ntoa in -ldnet" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 +if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldnet $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 29365 "configure" +#include "confdefs.h" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dnet_ntoa (); +int +main (void) +{ +dnet_ntoa (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:29384: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:29387: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:29390: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:29393: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dnet_dnet_ntoa=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_dnet_dnet_ntoa=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:29404: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 +if test $ac_cv_lib_dnet_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -else - echo "$ac_t""no" 1>&6 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:23893: 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 + echo "$as_me:29411: checking for dnet_ntoa in -ldnet_stub" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 +if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 29419 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa(); - -int main() { -dnet_ntoa() -; return 0; } -EOF -if { (eval echo configure:23912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char dnet_ntoa (); +int +main (void) +{ +dnet_ntoa (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:29438: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:29441: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:29444: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:29447: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dnet_stub_dnet_ntoa=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_dnet_stub_dnet_ntoa=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:29458: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 +if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -else - echo "$ac_t""no" 1>&6 fi fi +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$ac_xsave_LIBS" # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, # to get the SysV transport functions. - # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4) + # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) # needs -lnsl. # 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:23941: 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 < -/* Override any gcc2 internal prototype to avoid an error. */ + # on Irix 5.2, according to T.E. Dickey. + # The functions gethostbyname, getservbyname, and inet_addr are + # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. + echo "$as_me:29477: checking for gethostbyname" >&5 +echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 +if test "${ac_cv_func_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 29483 "configure" +#include "confdefs.h" +#define gethostbyname autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef gethostbyname + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname(); + builtin and then its argument prototype would still apply. */ +char gethostbyname (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) -choke me -#else -gethostbyname(); +#error found stub for gethostbyname #endif -; return 0; } -EOF -if { (eval echo configure:23969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_gethostbyname=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_gethostbyname=no" -fi -rm -rf conftest* + return gethostbyname (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:29514: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:29517: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:29520: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:29523: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_gethostbyname=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_gethostbyname=no fi - -if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:29533: result: $ac_cv_func_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 if test $ac_cv_func_gethostbyname = no; then - echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:23990: 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 + echo "$as_me:29537: checking for gethostbyname in -lnsl" >&5 +echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 29545 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname(); - -int main() { -gethostbyname() -; return 0; } -EOF -if { (eval echo configure:24009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" + builtin and then its argument prototype would still apply. */ +char gethostbyname (); +int +main (void) +{ +gethostbyname (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:29564: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:29567: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:29570: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:29573: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_nsl_gethostbyname=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_nsl_gethostbyname=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:29584: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 +if test $ac_cv_lib_nsl_gethostbyname = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi -rm -rf conftest* -LIBS="$ac_save_LIBS" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" + if test $ac_cv_lib_nsl_gethostbyname = no; then + echo "$as_me:29591: checking for gethostbyname in -lbsd" >&5 +echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 +if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$ac_t""no" 1>&6 + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbsd $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 29599 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gethostbyname (); +int +main (void) +{ +gethostbyname (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:29618: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:29621: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:29624: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:29627: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_bsd_gethostbyname=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_bsd_gethostbyname=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:29638: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 +if test $ac_cv_lib_bsd_gethostbyname = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi + fi fi # lieder@skyler.mavd.honeywell.com says without -lsocket, # socket/setsockopt and other routines are undefined under SCO ODT # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary - # on later versions), says simon@lia.di.epfl.ch: it contains - # gethostby* variants that don't use the nameserver (or something). - # -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:24039: 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 < -/* Override any gcc2 internal prototype to avoid an error. */ + # on later versions), says Simon Leinen: it contains gethostby* + # variants that don't use the nameserver (or something). -lsocket + # must be given before -lnsl if both are needed. We assume that + # if connect needs -lnsl, so does gethostbyname. + echo "$as_me:29654: checking for connect" >&5 +echo $ECHO_N "checking for connect... $ECHO_C" >&6 +if test "${ac_cv_func_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 29660 "configure" +#include "confdefs.h" +#define connect autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef connect + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect(); + builtin and then its argument prototype would still apply. */ +char connect (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_connect) || defined (__stub___connect) -choke me -#else -connect(); +#error found stub for connect #endif -; return 0; } -EOF -if { (eval echo configure:24067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_connect=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_connect=no" -fi -rm -rf conftest* + return connect (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:29691: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:29694: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:29697: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:29700: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_connect=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_connect=no fi - -if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:29710: result: $ac_cv_func_connect" >&5 +echo "${ECHO_T}$ac_cv_func_connect" >&6 if test $ac_cv_func_connect = no; then - echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:24088: 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 + echo "$as_me:29714: checking for connect in -lsocket" >&5 +echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 +if test "${ac_cv_lib_socket_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 29722 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect(); - -int main() { -connect() -; return 0; } -EOF -if { (eval echo configure:24107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char connect (); +int +main (void) +{ +connect (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:29741: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:29744: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:29747: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:29750: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_socket_connect=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_socket_connect=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:29761: result: $ac_cv_lib_socket_connect" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 +if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -else - echo "$ac_t""no" 1>&6 fi 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:24131: 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 < -/* Override any gcc2 internal prototype to avoid an error. */ + # Guillermo Gomez says -lposix is necessary on A/UX. + echo "$as_me:29770: checking for remove" >&5 +echo $ECHO_N "checking for remove... $ECHO_C" >&6 +if test "${ac_cv_func_remove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 29776 "configure" +#include "confdefs.h" +#define remove autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef remove + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove(); + builtin and then its argument prototype would still apply. */ +char remove (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_remove) || defined (__stub___remove) -choke me -#else -remove(); +#error found stub for remove #endif -; return 0; } -EOF -if { (eval echo configure:24159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_remove=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_remove=no" -fi -rm -rf conftest* + return remove (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:29807: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:29810: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:29813: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:29816: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_remove=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_remove=no fi - -if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:29826: result: $ac_cv_func_remove" >&5 +echo "${ECHO_T}$ac_cv_func_remove" >&6 if test $ac_cv_func_remove = no; then - echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:24180: 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 + echo "$as_me:29830: checking for remove in -lposix" >&5 +echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 +if test "${ac_cv_lib_posix_remove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 29838 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove(); - -int main() { -remove() -; return 0; } -EOF -if { (eval echo configure:24199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char remove (); +int +main (void) +{ +remove (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:29857: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:29860: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:29863: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:29866: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_posix_remove=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_posix_remove=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:29877: result: $ac_cv_lib_posix_remove" >&5 +echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 +if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -else - echo "$ac_t""no" 1>&6 fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:24223: 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 < -/* Override any gcc2 internal prototype to avoid an error. */ + echo "$as_me:29886: checking for shmat" >&5 +echo $ECHO_N "checking for shmat... $ECHO_C" >&6 +if test "${ac_cv_func_shmat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 29892 "configure" +#include "confdefs.h" +#define shmat autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef shmat + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat(); + builtin and then its argument prototype would still apply. */ +char shmat (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_shmat) || defined (__stub___shmat) -choke me -#else -shmat(); +#error found stub for shmat #endif -; return 0; } -EOF -if { (eval echo configure:24251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_shmat=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_shmat=no" -fi -rm -rf conftest* + return shmat (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:29923: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:29926: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:29929: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:29932: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_shmat=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_shmat=no fi - -if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:29942: result: $ac_cv_func_shmat" >&5 +echo "${ECHO_T}$ac_cv_func_shmat" >&6 if test $ac_cv_func_shmat = no; then - echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:24272: 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 + echo "$as_me:29946: checking for shmat in -lipc" >&5 +echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 +if test "${ac_cv_lib_ipc_shmat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 29954 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat(); - -int main() { -shmat() -; return 0; } -EOF -if { (eval echo configure:24291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char shmat (); +int +main (void) +{ +shmat (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:29973: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:29976: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:29979: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:29982: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ipc_shmat=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_ipc_shmat=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:29993: result: $ac_cv_lib_ipc_shmat" >&5 +echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 +if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -else - echo "$ac_t""no" 1>&6 fi fi fi # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS="$LDFLAGS" + ac_save_LDFLAGS=$LDFLAGS test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to # check for ICE first), but we must link in the order -lSM -lICE or # we get undefined symbols. So assume we have SM if we have ICE. # These have to be linked with before -lX11, unlike the other # 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:24324: 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 + # John Interrante, Karl Berry + echo "$as_me:30011: checking for IceConnectionNumber in -lICE" >&5 +echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 30019 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char IceConnectionNumber(); - -int main() { -IceConnectionNumber() -; return 0; } -EOF -if { (eval echo configure:24343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char IceConnectionNumber (); +int +main (void) +{ +IceConnectionNumber (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:30038: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:30041: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:30044: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:30047: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ICE_IceConnectionNumber=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_ICE_IceConnectionNumber=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:30058: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 +if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -else - echo "$ac_t""no" 1>&6 fi - LDFLAGS="$ac_save_LDFLAGS" + LDFLAGS=$ac_save_LDFLAGS fi - cf_x_athena=${cf_x_athena:-Xaw} -echo $ac_n "checking if you want to link with Xaw 3d library""... $ac_c" 1>&6 -echo "configure:24371: checking if you want to link with Xaw 3d library" >&5 +echo "$as_me:30070: checking if you want to link with Xaw 3d library" >&5 +echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6 withval= # Check whether --with-Xaw3d or --without-Xaw3d was given. if test "${with_Xaw3d+set}" = set; then withval="$with_Xaw3d" - : -fi +fi; if test "$withval" = yes ; then cf_x_athena=Xaw3d - echo "$ac_t""yes" 1>&6 + echo "$as_me:30081: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:30084: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo $ac_n "checking if you want to link with Xaw 3d xft library""... $ac_c" 1>&6 -echo "configure:24388: checking if you want to link with Xaw 3d xft library" >&5 +echo "$as_me:30088: checking if you want to link with Xaw 3d xft library" >&5 +echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6 withval= # Check whether --with-Xaw3dxft or --without-Xaw3dxft was given. if test "${with_Xaw3dxft+set}" = set; then withval="$with_Xaw3dxft" - : -fi +fi; if test "$withval" = yes ; then cf_x_athena=Xaw3dxft - echo "$ac_t""yes" 1>&6 + echo "$as_me:30099: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:30102: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo $ac_n "checking if you want to link with neXT Athena library""... $ac_c" 1>&6 -echo "configure:24405: checking if you want to link with neXT Athena library" >&5 +echo "$as_me:30106: checking if you want to link with neXT Athena library" >&5 +echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6 withval= # Check whether --with-neXtaw or --without-neXtaw was given. if test "${with_neXtaw+set}" = set; then withval="$with_neXtaw" - : -fi +fi; if test "$withval" = yes ; then cf_x_athena=neXtaw - echo "$ac_t""yes" 1>&6 + echo "$as_me:30117: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:30120: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo $ac_n "checking if you want to link with Athena-Plus library""... $ac_c" 1>&6 -echo "configure:24422: checking if you want to link with Athena-Plus library" >&5 +echo "$as_me:30124: checking if you want to link with Athena-Plus library" >&5 +echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6 withval= # Check whether --with-XawPlus or --without-XawPlus was given. if test "${with_XawPlus+set}" = set; then withval="$with_XawPlus" - : -fi +fi; if test "$withval" = yes ; then cf_x_athena=XawPlus - echo "$ac_t""yes" 1>&6 + echo "$as_me:30135: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:30138: result: no" >&5 +echo "${ECHO_T}no" >&6 fi cf_x_athena_lib="" @@ -24446,28 +30151,22 @@ if test "$PKG_CONFIG" != none ; then lib${cf_x_athena} \ lib${cf_x_athena}-devel do - - if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then test -n "$verbose" && echo " found package $cf_athena_pkg" 1>&6 -echo "${as_me:-configure}:24456: testing found package $cf_athena_pkg ..." 1>&5 - +echo "${as_me:-configure}:30158: testing found package $cf_athena_pkg ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs $cf_athena_pkg 2>/dev/null`" test -n "$verbose" && echo " package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:24463: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 - +echo "${as_me:-configure}:30164: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:24468: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:30168: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 - - cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -24488,13 +30187,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -24509,14 +30208,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -24524,7 +30223,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -24532,11 +30231,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -24547,33 +30245,26 @@ esac done if test -n "$cf_new_cflags" ; then - - + test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - - + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then - - + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - - cf_add_libs="$cf_pkgconfig_libs" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -24590,17 +30281,14 @@ do done LIBS="$cf_add_libs" - cf_x_athena_lib="$cf_pkgconfig_libs" - + cf_x_athena_LIBS=`echo "HAVE_LIB_$cf_x_athena" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6 -echo "${as_me:-configure}:24612: testing ..trimmed $LIBS ..." 1>&5 - +echo "${as_me:-configure}:30299: testing ..trimmed $LIBS ..." 1>&5 ;; esac done - -echo $ac_n "checking for usable $cf_x_athena/Xmu package""... $ac_c" 1>&6 -echo "configure:24621: checking for usable $cf_x_athena/Xmu package" >&5 -if eval "test \"`echo '$''{'cf_cv_xaw_compat'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:30305: checking for usable $cf_x_athena/Xmu package" >&5 +echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6 +if test "${cf_cv_xaw_compat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 30312 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ int check = XmuCompareISOLatin1("big", "small") -; return 0; } -EOF -if { (eval echo configure:24638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:30328: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:30331: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:30334: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:30337: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_xaw_compat=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - cf_cv_xaw_compat=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_xaw_compat=no fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_xaw_compat" 1>&6 +echo "$as_me:30347: result: $cf_cv_xaw_compat" >&5 +echo "${ECHO_T}$cf_cv_xaw_compat" >&6 if test "$cf_cv_xaw_compat" = no then @@ -24657,33 +30356,26 @@ echo "$ac_t""$cf_cv_xaw_compat" 1>&6 (*) test -n "$verbose" && echo " work around broken package" 1>&6 -echo "${as_me:-configure}:24661: testing work around broken package ..." 1>&5 - +echo "${as_me:-configure}:30359: testing work around broken package ..." 1>&5 cf_save_xmu="$LIBS" cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^ *//' -e 's/ .*//'` - - if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then test -n "$verbose" && echo " found package xmu" 1>&6 -echo "${as_me:-configure}:24672: testing found package xmu ..." 1>&5 - +echo "${as_me:-configure}:30367: testing found package xmu ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs xmu 2>/dev/null`" test -n "$verbose" && echo " package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:24679: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 - +echo "${as_me:-configure}:30373: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xmu LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:24684: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 - +echo "${as_me:-configure}:30377: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 - cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -24704,13 +30396,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -24725,14 +30417,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -24740,7 +30432,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -24748,11 +30440,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -24763,33 +30454,26 @@ esac done if test -n "$cf_new_cflags" ; then - - + test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - - + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then - - + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - - cf_add_libs="$cf_pkgconfig_libs" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -24806,43 +30490,32 @@ do done LIBS="$cf_add_libs" - LIBS="$cf_save_xmu" - -test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:24815: testing ...before $LIBS ..." 1>&5 +test -n "$verbose" && echo " ...before $LIBS" 1>&6 +echo "${as_me:-configure}:30497: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:24821: testing ...after $LIBS ..." 1>&5 - +echo "${as_me:-configure}:30502: testing ...after $LIBS ..." 1>&5 - - else cf_pkgconfig_incs= cf_pkgconfig_libs= - - -test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:24833: testing ...before $LIBS ..." 1>&5 +test -n "$verbose" && echo " ...before $LIBS" 1>&6 +echo "${as_me:-configure}:30510: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:24839: testing ...after $LIBS ..." 1>&5 - +echo "${as_me:-configure}:30515: testing ...after $LIBS ..." 1>&5 - - fi - for cf_trim_lib in Xmu Xt X11 do case "$LIBS" in @@ -24850,8 +30523,7 @@ fi LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6 -echo "${as_me:-configure}:24854: testing ..trimmed $LIBS ..." 1>&5 - +echo "${as_me:-configure}:30526: testing ..trimmed $LIBS ..." 1>&5 ;; esac @@ -24872,29 +30544,22 @@ fi fi if test -z "$cf_x_athena_lib" ; then - - - if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then test -n "$verbose" && echo " found package Xext" 1>&6 -echo "${as_me:-configure}:24883: testing found package Xext ..." 1>&5 - +echo "${as_me:-configure}:30551: testing found package Xext ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs Xext 2>/dev/null`" test -n "$verbose" && echo " package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:24890: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 - +echo "${as_me:-configure}:30557: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package Xext LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:24895: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:30561: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 - - cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -24915,13 +30580,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -24936,14 +30601,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -24951,7 +30616,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -24959,11 +30624,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -24974,33 +30638,26 @@ esac done if test -n "$cf_new_cflags" ; then - - + test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - - + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then - - + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - - cf_add_libs="$cf_pkgconfig_libs" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -25021,43 +30678,58 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - - echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:25027: 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 + + echo "$as_me:30682: checking for XextCreateExtension in -lXext" >&5 +echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6 +if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 30690 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XextCreateExtension(); - -int main() { -XextCreateExtension() -; return 0; } -EOF -if { (eval echo configure:25046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char XextCreateExtension (); +int +main (void) +{ +XextCreateExtension (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:30709: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:30712: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:30715: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:30718: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xext_XextCreateExtension=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_Xext_XextCreateExtension=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:30729: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6 +if test $ac_cv_lib_Xext_XextCreateExtension = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cf_add_libs="-lXext" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -25074,17 +30746,10 @@ do done LIBS="$cf_add_libs" -else - echo "$ac_t""no" 1>&6 fi fi - - - - - # OSX is schizoid about who owns /usr/X11 (old) versus /opt/X11 (new), and (and # in some cases has installed dummy files in the former, other cases replaced # it with a link to the new location). This complicates the configure script. @@ -25093,28 +30758,22 @@ fi # If none of these are set, the configuration is almost certainly broken. if test -z "${X_CFLAGS}${X_PRE_LIBS}${X_LIBS}${X_EXTRA_LIBS}" then - - if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:25103: testing found package x11 ..." 1>&5 - +echo "${as_me:-configure}:30765: testing found package x11 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs x11 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:25110: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 - +echo "${as_me:-configure}:30771: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:25115: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 - +echo "${as_me:-configure}:30775: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 - cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -25135,13 +30794,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -25156,14 +30815,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -25171,7 +30830,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -25179,11 +30838,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -25194,33 +30852,26 @@ esac done if test -n "$cf_new_cflags" ; then - - + test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - - + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then - - + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - - cf_add_libs="$cf_pkgconfig_libs" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -25241,31 +30892,25 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - echo "configure: warning: unable to find X11 library" 1>&2 + { echo "$as_me:30895: WARNING: unable to find X11 library" >&5 +echo "$as_me: WARNING: unable to find X11 library" >&2;} fi - - - if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:25254: testing found package ice ..." 1>&5 - +echo "${as_me:-configure}:30902: testing found package ice ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs ice 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:25261: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 - +echo "${as_me:-configure}:30908: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:25266: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 - +echo "${as_me:-configure}:30912: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 - cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -25286,13 +30931,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -25307,14 +30952,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -25322,7 +30967,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -25330,11 +30975,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -25345,33 +30989,26 @@ esac done if test -n "$cf_new_cflags" ; then - - + test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - - + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then - - + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - - cf_add_libs="$cf_pkgconfig_libs" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -25392,31 +31029,25 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - echo "configure: warning: unable to find ICE library" 1>&2 + { echo "$as_me:31032: WARNING: unable to find ICE library" >&5 +echo "$as_me: WARNING: unable to find ICE library" >&2;} fi - - - if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:25405: testing found package sm ..." 1>&5 - +echo "${as_me:-configure}:31039: testing found package sm ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs sm 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:25412: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 - +echo "${as_me:-configure}:31045: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:25417: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 - +echo "${as_me:-configure}:31049: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 - cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -25437,13 +31068,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -25458,14 +31089,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -25473,7 +31104,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -25481,11 +31112,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -25496,33 +31126,26 @@ esac done if test -n "$cf_new_cflags" ; then - - + test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - - + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then - - + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - - cf_add_libs="$cf_pkgconfig_libs" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -25543,31 +31166,25 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - echo "configure: warning: unable to find SM library" 1>&2 + { echo "$as_me:31169: WARNING: unable to find SM library" >&5 +echo "$as_me: WARNING: unable to find SM library" >&2;} fi - - - if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:25556: testing found package xt ..." 1>&5 - +echo "${as_me:-configure}:31176: testing found package xt ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs xt 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:25563: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 - +echo "${as_me:-configure}:31182: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:25568: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 - +echo "${as_me:-configure}:31186: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 - cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -25588,13 +31205,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -25609,14 +31226,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -25624,7 +31241,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -25632,11 +31249,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -25647,33 +31263,26 @@ esac done if test -n "$cf_new_cflags" ; then - - + test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - - + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then - - + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - - cf_add_libs="$cf_pkgconfig_libs" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -25694,35 +31303,29 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - echo "configure: warning: unable to find Xt library" 1>&2 + { echo "$as_me:31306: WARNING: unable to find Xt library" >&5 +echo "$as_me: WARNING: unable to find Xt library" >&2;} fi fi cf_have_X_LIBS=no - - - if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:25711: testing found package xt ..." 1>&5 - +echo "${as_me:-configure}:31317: testing found package xt ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs xt 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:25718: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 - +echo "${as_me:-configure}:31323: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:25723: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:31327: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 - - cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -25743,13 +31346,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -25764,14 +31367,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -25779,7 +31382,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -25787,11 +31390,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -25802,33 +31404,26 @@ esac done if test -n "$cf_new_cflags" ; then - - + test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - - + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then - - + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - - cf_add_libs="$cf_pkgconfig_libs" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -25845,77 +31440,81 @@ do done LIBS="$cf_add_libs" - - case "x$LIBS" in (*-lX11*) ;; (*) # we have an "xt" package, but it may omit Xt's dependency on X11 -echo $ac_n "checking for usable X dependency""... $ac_c" 1>&6 -echo "configure:25857: checking for usable X dependency" >&5 -if eval "test \"`echo '$''{'cf_cv_xt_x11_compat'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:31448: checking for usable X dependency" >&5 +echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6 +if test "${cf_cv_xt_x11_compat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 31455 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ int rc1 = XDrawLine((Display*) 0, (Drawable) 0, (GC) 0, 0, 0, 0, 0); int rc2 = XClearWindow((Display*) 0, (Window) 0); int rc3 = XMoveWindow((Display*) 0, (Window) 0, 0, 0); int rc4 = XMoveResizeWindow((Display*)0, (Window)0, 0, 0, 0, 0); -; return 0; } -EOF -if { (eval echo configure:25877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:31474: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:31477: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:31480: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:31483: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_xt_x11_compat=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - cf_cv_xt_x11_compat=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_xt_x11_compat=no fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_xt_x11_compat" 1>&6 +echo "$as_me:31493: result: $cf_cv_xt_x11_compat" >&5 +echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6 if test "$cf_cv_xt_x11_compat" = no then test -n "$verbose" && echo " work around broken X11 dependency" 1>&6 -echo "${as_me:-configure}:25894: testing work around broken X11 dependency ..." 1>&5 - +echo "${as_me:-configure}:31499: testing work around broken X11 dependency ..." 1>&5 # 2010/11/19 - good enough until a working Xt on Xcb is delivered. - - if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:25904: testing found package x11 ..." 1>&5 - +echo "${as_me:-configure}:31506: testing found package x11 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs x11 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:25911: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 - +echo "${as_me:-configure}:31512: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:25916: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:31516: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 - - cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -25936,13 +31535,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -25957,14 +31556,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -25972,7 +31571,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -25980,11 +31579,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -25995,33 +31593,26 @@ esac done if test -n "$cf_new_cflags" ; then - - + test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - - + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then - - + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - - cf_add_libs="$cf_pkgconfig_libs" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -26042,18 +31633,15 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - -test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:26049: testing ...before $LIBS ..." 1>&5 +test -n "$verbose" && echo " ...before $LIBS" 1>&6 +echo "${as_me:-configure}:31639: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:26055: testing ...after $LIBS ..." 1>&5 - - +echo "${as_me:-configure}:31644: testing ...after $LIBS ..." 1>&5 fi @@ -26061,36 +31649,49 @@ fi ;; esac -echo $ac_n "checking for usable X Toolkit package""... $ac_c" 1>&6 -echo "configure:26066: checking for usable X Toolkit package" >&5 -if eval "test \"`echo '$''{'cf_cv_xt_ice_compat'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:31652: checking for usable X Toolkit package" >&5 +echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6 +if test "${cf_cv_xt_ice_compat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 31659 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ int num = IceConnectionNumber(0) -; return 0; } -EOF -if { (eval echo configure:26082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:31674: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:31677: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:31680: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:31683: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_xt_ice_compat=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - cf_cv_xt_ice_compat=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_xt_ice_compat=no fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_xt_ice_compat" 1>&6 +echo "$as_me:31693: result: $cf_cv_xt_ice_compat" >&5 +echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 if test "$cf_cv_xt_ice_compat" = no then @@ -26103,31 +31704,23 @@ echo "$ac_t""$cf_cv_xt_ice_compat" 1>&6 (*) test -n "$verbose" && echo " work around broken ICE dependency" 1>&6 -echo "${as_me:-configure}:26107: testing work around broken ICE dependency ..." 1>&5 - - - - +echo "${as_me:-configure}:31707: testing work around broken ICE dependency ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:26116: testing found package ice ..." 1>&5 - +echo "${as_me:-configure}:31712: testing found package ice ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs ice 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:26123: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 - +echo "${as_me:-configure}:31718: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:26128: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:31722: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 - - cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -26148,13 +31741,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -26169,14 +31762,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -26184,7 +31777,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -26192,11 +31785,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -26207,33 +31799,26 @@ esac done if test -n "$cf_new_cflags" ; then - - + test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - - + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then - - + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - - cf_add_libs="$cf_pkgconfig_libs" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -26250,28 +31835,21 @@ do done LIBS="$cf_add_libs" - - - if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:26260: testing found package sm ..." 1>&5 - +echo "${as_me:-configure}:31841: testing found package sm ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs sm 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:26267: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 - +echo "${as_me:-configure}:31847: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:26272: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:31851: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 - - cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -26292,13 +31870,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -26313,14 +31891,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -26328,7 +31906,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -26336,11 +31914,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -26351,33 +31928,26 @@ esac done if test -n "$cf_new_cflags" ; then - - + test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - - + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then - - + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - - cf_add_libs="$cf_pkgconfig_libs" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -26404,18 +31974,15 @@ fi else cf_pkgconfig_incs= cf_pkgconfig_libs= - -test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:26411: testing ...before $LIBS ..." 1>&5 +test -n "$verbose" && echo " ...before $LIBS" 1>&6 +echo "${as_me:-configure}:31980: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:26417: testing ...after $LIBS ..." 1>&5 - - +echo "${as_me:-configure}:31985: testing ...after $LIBS ..." 1>&5 fi @@ -26430,14 +31997,12 @@ fi else cf_pkgconfig_incs= cf_pkgconfig_libs= - LDFLAGS="$X_LIBS $LDFLAGS" - -test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:26440: testing checking additions to CFLAGS ..." 1>&5 +test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 +echo "${as_me:-configure}:32005: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -26462,13 +32027,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -26483,14 +32048,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -26498,7 +32063,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -26506,11 +32071,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -26523,10 +32087,8 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:26527: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 - +echo "${as_me:-configure}:32090: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 - test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -26535,10 +32097,8 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:26539: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:32100: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -26547,134 +32107,170 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:26551: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 - +echo "${as_me:-configure}:32110: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - if test "x$cf_check_cflags" != "x$CFLAGS" ; then -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 32119 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ printf("Hello world"); -; return 0; } -EOF -if { (eval echo configure:26572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:32131: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:32134: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:32137: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:32140: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 - -echo "${as_me:-configure}:26580: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 +echo "${as_me:-configure}:32148: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:26586: testing but keeping change to \$CPPFLAGS ..." 1>&5 - +echo "${as_me:-configure}:32153: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_flags" fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - - echo $ac_n "checking for XOpenDisplay""... $ac_c" 1>&6 -echo "configure:26597: checking for XOpenDisplay" >&5 -if eval "test \"`echo '$''{'ac_cv_func_XOpenDisplay'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:32161: checking for XOpenDisplay" >&5 +echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6 +if test "${ac_cv_func_XOpenDisplay+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 32167 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char XOpenDisplay(); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ +#define XOpenDisplay autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef XOpenDisplay + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XOpenDisplay(); + builtin and then its argument prototype would still apply. */ +char XOpenDisplay (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_XOpenDisplay) || defined (__stub___XOpenDisplay) -choke me -#else -XOpenDisplay(); +#error found stub for XOpenDisplay #endif -; return 0; } -EOF -if { (eval echo configure:26625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_XOpenDisplay=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_XOpenDisplay=no" -fi -rm -rf conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'XOpenDisplay`\" = yes"; then - echo "$ac_t""yes" 1>&6 + return XOpenDisplay (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:32198: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:32201: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:32204: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:32207: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_XOpenDisplay=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_XOpenDisplay=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:32217: result: $ac_cv_func_XOpenDisplay" >&5 +echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6 +if test $ac_cv_func_XOpenDisplay = yes; then : else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:26644: 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 + echo "$as_me:32223: checking for XOpenDisplay in -lX11" >&5 +echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 +if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 32231 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XOpenDisplay(); - -int main() { -XOpenDisplay() -; return 0; } -EOF -if { (eval echo configure:26663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char XOpenDisplay (); +int +main (void) +{ +XOpenDisplay (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:32250: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:32253: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:32256: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:32259: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_X11_XOpenDisplay=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_X11_XOpenDisplay=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:32270: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 +if test $ac_cv_lib_X11_XOpenDisplay = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cf_add_libs="-lX11" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -26691,118 +32287,144 @@ do done LIBS="$cf_add_libs" -else - echo "$ac_t""no" 1>&6 fi fi + echo "$as_me:32294: checking for XtAppInitialize" >&5 +echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6 +if test "${ac_cv_func_XtAppInitialize+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 32300 "configure" +#include "confdefs.h" +#define XtAppInitialize autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef XtAppInitialize + +#ifdef __cplusplus +extern "C" +#endif - echo $ac_n "checking for XtAppInitialize""... $ac_c" 1>&6 -echo "configure:26703: checking for XtAppInitialize" >&5 -if eval "test \"`echo '$''{'ac_cv_func_XtAppInitialize'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XtAppInitialize(); + builtin and then its argument prototype would still apply. */ +char XtAppInitialize (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_XtAppInitialize) || defined (__stub___XtAppInitialize) -choke me -#else -XtAppInitialize(); +#error found stub for XtAppInitialize #endif -; return 0; } -EOF -if { (eval echo configure:26731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_XtAppInitialize=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_XtAppInitialize=no" -fi -rm -rf conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'XtAppInitialize`\" = yes"; then - echo "$ac_t""yes" 1>&6 + return XtAppInitialize (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:32331: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:32334: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:32337: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:32340: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_XtAppInitialize=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_XtAppInitialize=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:32350: result: $ac_cv_func_XtAppInitialize" >&5 +echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6 +if test $ac_cv_func_XtAppInitialize = yes; then : else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:26750: 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 + echo "$as_me:32356: checking for XtAppInitialize in -lXt" >&5 +echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6 +if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 32364 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XtAppInitialize(); - -int main() { -XtAppInitialize() -; return 0; } -EOF -if { (eval echo configure:26769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" + builtin and then its argument prototype would still apply. */ +char XtAppInitialize (); +int +main (void) +{ +XtAppInitialize (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:32383: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:32386: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:32389: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:32392: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xt_XtAppInitialize=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_Xt_XtAppInitialize=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:32403: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 +echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6 +if test $ac_cv_lib_Xt_XtAppInitialize = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define HAVE_LIBXT 1 EOF cf_have_X_LIBS=Xt LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS" -else - echo "$ac_t""no" 1>&6 fi fi - fi - if test $cf_have_X_LIBS = no ; then - echo "configure: warning: Unable to successfully link X Toolkit library (-lXt) with + { echo "$as_me:32420: WARNING: Unable to successfully link X Toolkit library (-lXt) with test program. You will have to check and add the proper libraries by hand -to makefile." 1>&2 +to makefile." >&5 +echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with +test program. You will have to check and add the proper libraries by hand +to makefile." >&2;} fi - cf_x_athena_root=$cf_x_athena cf_x_athena_inc="" @@ -26816,34 +32438,52 @@ do cf_save="$CPPFLAGS" cf_test=X11/$cf_x_athena_root/SimpleMenu.h if test $cf_path != default ; then - CPPFLAGS="$cf_save -I$cf_path/include" - echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6 -echo "configure:26822: checking for $cf_test in $cf_path" >&5 + CPPFLAGS="$cf_save" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_path/include" + + echo "$as_me:32446: checking for $cf_test in $cf_path" >&5 +echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6 else - echo $ac_n "checking for $cf_test""... $ac_c" 1>&6 -echo "configure:26825: checking for $cf_test" >&5 + echo "$as_me:32449: checking for $cf_test" >&5 +echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 fi - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 32453 "configure" #include "confdefs.h" #include #include <$cf_test> -int main() { +int +main (void) +{ -; return 0; } -EOF -if { (eval echo configure:26837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:32467: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:32470: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:32473: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:32476: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_result=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_result=no -fi -rm -f conftest* - echo "$ac_t""$cf_result" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_result=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + echo "$as_me:32485: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_x_athena_inc=$cf_path break @@ -26854,12 +32494,15 @@ rm -f conftest* done if test -z "$cf_x_athena_inc" ; then - echo "configure: warning: Unable to successfully find Athena header files with test program" 1>&2 + { echo "$as_me:32497: WARNING: Unable to successfully find Athena header files with test program" >&5 +echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;} elif test "$cf_x_athena_inc" != default ; then - CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_x_athena_inc" + fi - cf_x_athena_root=$cf_x_athena cf_x_athena_lib="" @@ -26883,7 +32526,7 @@ do cf_save="$LIBS" cf_test=XawSimpleMenuAddGlobalActions if test $cf_path != default ; then - + cf_add_libs="-L$cf_path/lib $cf_libs" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -26900,10 +32543,10 @@ do done LIBS="$cf_add_libs" - echo $ac_n "checking for $cf_libs in $cf_path""... $ac_c" 1>&6 -echo "configure:26905: checking for $cf_libs in $cf_path" >&5 + echo "$as_me:32546: checking for $cf_libs in $cf_path" >&5 +echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6 else - + cf_add_libs="$cf_libs" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -26920,32 +32563,46 @@ do done LIBS="$cf_add_libs" - echo $ac_n "checking for $cf_test in $cf_libs""... $ac_c" 1>&6 -echo "configure:26925: checking for $cf_test in $cf_libs" >&5 + echo "$as_me:32566: checking for $cf_test in $cf_libs" >&5 +echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6 fi - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 32570 "configure" #include "confdefs.h" #include #include -int main() { +int +main (void) +{ $cf_test((XtAppContext) 0) -; return 0; } -EOF -if { (eval echo configure:26939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:32586: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:32589: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:32592: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:32595: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_result=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - cf_result=no -fi -rm -rf conftest* - echo "$ac_t""$cf_result" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_result=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + echo "$as_me:32604: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_x_athena_lib="$cf_libs" break @@ -26958,68 +32615,199 @@ rm -rf conftest* done if test -z "$cf_x_athena_lib" ; then - { echo "configure: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" 1>&2; exit 1; } + { { echo "$as_me:32618: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 +echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;} + { (exit 1); exit 1; }; } fi - cf_x_athena_LIBS=`echo "HAVE_LIB_$cf_x_athena" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -cat >> confdefs.h <>confdefs.h <&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$XCURSES_CONFIG"; then + ac_cv_prog_XCURSES_CONFIG="$XCURSES_CONFIG" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog" +echo "$as_me:32651: found $ac_dir/$ac_word" >&5 +break +done +fi +fi +XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG +if test -n "$XCURSES_CONFIG"; then + echo "$as_me:32659: result: $XCURSES_CONFIG" >&5 +echo "${ECHO_T}$XCURSES_CONFIG" >&6 +else + echo "$as_me:32662: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi - - -for ac_prog in xcurses-config + test -n "$XCURSES_CONFIG" && break + done +fi +if test -z "$XCURSES_CONFIG"; then + ac_ct_XCURSES_CONFIG=$XCURSES_CONFIG + for ac_prog in xcurses-config do -# Extract the first word of "$ac_prog", so it can be a program name with args. + # 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:26984: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_XCURSES_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$XCURSES_CONFIG" in - /*) - ac_cv_path_XCURSES_CONFIG="$XCURSES_CONFIG" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_XCURSES_CONFIG="$XCURSES_CONFIG" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_XCURSES_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac +echo "$as_me:32675: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_XCURSES_CONFIG"; then + ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_ct_XCURSES_CONFIG" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog" +echo "$as_me:32690: found $ac_dir/$ac_word" >&5 +break +done + fi -XCURSES_CONFIG="$ac_cv_path_XCURSES_CONFIG" -if test -n "$XCURSES_CONFIG"; then - echo "$ac_t""$XCURSES_CONFIG" 1>&6 +fi +ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG +if test -n "$ac_ct_XCURSES_CONFIG"; then + echo "$as_me:32698: result: $ac_ct_XCURSES_CONFIG" >&5 +echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:32701: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -test -n "$XCURSES_CONFIG" && break + test -n "$ac_ct_XCURSES_CONFIG" && break done -test -n "$XCURSES_CONFIG" || XCURSES_CONFIG="none" +test -n "$ac_ct_XCURSES_CONFIG" || ac_ct_XCURSES_CONFIG="none" + XCURSES_CONFIG=$ac_ct_XCURSES_CONFIG +fi if test "$XCURSES_CONFIG" != none ; then -CPPFLAGS="$CPPFLAGS `$XCURSES_CONFIG --cflags`" +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in `$XCURSES_CONFIG --cflags` +do +case $cf_fix_cppflags in +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case $cf_add_cflags in + (-D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case $cf_add_cflags in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi cf_add_libs="`$XCURSES_CONFIG --libs`" # Filter out duplicates - this happens with badly-designed ".pc" files... @@ -27037,7 +32825,6 @@ do done LIBS="$cf_add_libs" - cf_cv_lib_XCurses=yes else @@ -27046,8 +32833,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:27050: testing checking additions to CFLAGS ..." 1>&5 - +echo "${as_me:-configure}:32836: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -27072,13 +32858,13 @@ case $cf_fix_cppflags in && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" continue elif test "${cf_tst_cflags}" = "\"'" ; then - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -27093,14 +32879,14 @@ case $cf_fix_cppflags in case $cf_add_cflags in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ;; esac - + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" @@ -27108,7 +32894,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (*) - + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " cf_new_cflags="${cf_new_cflags}$cf_add_cflags" @@ -27116,11 +32902,10 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ esac ;; (yes) - + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -27133,10 +32918,8 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:27137: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:32921: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 - - test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -27145,10 +32928,8 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:27149: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 - +echo "${as_me:-configure}:32931: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -27157,86 +32938,108 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:27161: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:32941: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 - - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi - - - if test "x$cf_check_cflags" != "x$CFLAGS" ; then -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 32950 "configure" #include "confdefs.h" #include -int main() { +int +main (void) +{ printf("Hello world"); -; return 0; } -EOF -if { (eval echo configure:27182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:32962: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:32965: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:32968: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:32971: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 - -echo "${as_me:-configure}:27190: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 +echo "${as_me:-configure}:32979: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:27196: testing but keeping change to \$CPPFLAGS ..." 1>&5 - +echo "${as_me:-configure}:32984: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_flags" fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:27206: 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 +echo "$as_me:32992: checking for XOpenDisplay in -lX11" >&5 +echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 +if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_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 - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 +cat >conftest.$ac_ext <<_ACEOF +#line 33000 "configure" +#include "confdefs.h" - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char XOpenDisplay (); +int +main (void) +{ +XOpenDisplay (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:33019: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:33022: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:33025: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:33028: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_X11_XOpenDisplay=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_X11_XOpenDisplay=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:33039: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 +if test $ac_cv_lib_X11_XOpenDisplay = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cf_add_libs="-lX11" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS @@ -27253,16 +33056,13 @@ do done LIBS="$cf_add_libs" -else - echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking for XCurses library""... $ac_c" 1>&6 -echo "configure:27262: checking for XCurses library" >&5 -if eval "test \"`echo '$''{'cf_cv_lib_XCurses'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:33061: checking for XCurses library" >&5 +echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6 +if test "${cf_cv_lib_XCurses+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cf_add_libs="-lXCurses" # Filter out duplicates - this happens with badly-designed ".pc" files... @@ -27280,149 +33080,191 @@ do done LIBS="$cf_add_libs" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 33084 "configure" #include "confdefs.h" #include char *XCursesProgramName = "test"; -int main() { +int +main (void) +{ XCursesExit(); -; return 0; } -EOF -if { (eval echo configure:27295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:33099: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:33102: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:33105: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:33108: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_lib_XCurses=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - cf_cv_lib_XCurses=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_lib_XCurses=no fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_lib_XCurses" 1>&6 +echo "$as_me:33119: result: $cf_cv_lib_XCurses" >&5 +echo "${ECHO_T}$cf_cv_lib_XCurses" >&6 fi if test $cf_cv_lib_XCurses = yes ; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define UNIX 1 EOF - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define XCURSES 1 EOF - ac_safe=`echo "xcurses.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for xcurses.h""... $ac_c" 1>&6 -echo "configure:27323: checking for xcurses.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:33134: checking for xcurses.h" >&5 +echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6 +if test "${ac_cv_header_xcurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 33140 "configure" #include "confdefs.h" #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:27333: \"$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" +_ACEOF +if { (eval echo "$as_me:33144: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:33150: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_xcurses_h=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_header_xcurses_h=no fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF +echo "$as_me:33169: result: $ac_cv_header_xcurses_h" >&5 +echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6 +if test $ac_cv_header_xcurses_h = yes; then + +cat >>confdefs.h <<\EOF #define HAVE_XCURSES 1 EOF -else - echo "$ac_t""no" 1>&6 fi else - { echo "configure: error: Cannot link with XCurses" 1>&2; exit 1; } + { { echo "$as_me:33180: error: Cannot link with XCurses" >&5 +echo "$as_me: error: Cannot link with XCurses" >&2;} + { (exit 1); exit 1; }; } fi fi -for ac_func in vwprintw + +for ac_func in vw_printw do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:27365: 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 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:33190: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 33196 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + +#ifdef __cplusplus +extern "C" +#endif + /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + builtin and then its argument prototype would still apply. */ +char $ac_func (void); -int main() { +int +main (void) +{ -/* The GNU C library defines this for functions which it implements +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); +#error found stub for $ac_func #endif -; return 0; } + return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:33227: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:33230: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:33233: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:33236: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:33246: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_func_$ac_func=no" -fi -rm -rf conftest* -fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done - ### sum up warnings if test "$cf_cv_termlib" = none ; then - echo "configure: warning: no term-lib found, you might run into trouble later." 1>&2 + { echo "$as_me:33258: WARNING: no term-lib found, you might run into trouble later." >&5 +echo "$as_me: WARNING: no term-lib found, you might run into trouble later." >&2;} fi if test "$YACC" = "" ; then - echo "configure: warning: no yacc-parser found, you might run into trouble later." 1>&2 + { echo "$as_me:33262: WARNING: no yacc-parser found, you might run into trouble later." >&5 +echo "$as_me: WARNING: no yacc-parser found, you might run into trouble later." >&2;} fi if test "$RANLIB" = "" ; then - echo "configure: warning: no library archive builder found, you might run into trouble later." 1>&2 + { echo "$as_me:33266: WARNING: no library archive builder found, you might run into trouble later." >&5 +echo "$as_me: WARNING: no library archive builder found, you might run into trouble later." >&2;} fi ### Finally, build autoconf.h and the makefiles @@ -27430,533 +33272,1054 @@ CFLAGS="$CFLAGS $EXTRA_CFLAGS" LINTFLAGS=$LINTFLAGS - - cf_define=`echo "$CC"|sed -e 's/\\\\/\\\\134/g' -e 's/^[ ]\\+//' -e 's/[ ]\\+$//' -e 's/"/\\\\042/g'` -cat >> confdefs.h <>confdefs.h <> confdefs.h <>confdefs.h <> confdefs.h <>confdefs.h <> confdefs.h <>confdefs.h <> confdefs.h <>confdefs.h <> confdefs.h <>confdefs.h <> confdefs.h <>confdefs.h < confcache <<\EOF +ac_config_files="$ac_config_files $PCRE_MAKEFILE $SUB_MAKEFILE $CAN_MAKEFILE src/Makefile" +cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. # -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. # -EOF +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. # So, don't put newlines in cache variables' values. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else +{ + (set) 2>&1 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n \ + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + ;; + esac; +} | + sed ' + t clear + : clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + : end' >>confcache +if cmp -s $cache_file confcache; then :; else if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file + test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + cat confcache >$cache_file else echo "not updating unwritable cache $cache_file" fi fi rm -f confcache - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# Any assignment to VPATH causes Sun make to only execute -# the first set of double-colon rules, so remove it if not needed. -# If there is a colon in the path, we need to keep it. +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/; +s/:*\${srcdir}:*/:/; +s/:*@srcdir@:*/:/; +s/^\([^=]*=[ ]*\):*/\1/; +s/:*$//; +s/^[^=]*=[ ]*$//; +}' fi -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 - DEFS=-DHAVE_CONFIG_H -# Without the "./", some shells look in PATH for config.status. : ${CONFIG_STATUS=./config.status} - -echo creating $CONFIG_STATUS -rm -f $CONFIG_STATUS -cat > $CONFIG_STATUS <&5 +echo "$as_me: creating $CONFIG_STATUS" >&6;} +cat >$CONFIG_STATUS <<_ACEOF +#! $SHELL # Generated automatically by configure. # Run this file to recreate the current configuration. -# This directory was configured as follows, -# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# -# $0 $ac_configure_args -# # Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. +# configure, is in config.log if it exists. -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -for ac_option +debug=false +SHELL=\${CONFIG_SHELL-$SHELL} +ac_cs_invocation="\$0 \$@" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi + +# Name of the executable. +as_me=`echo "$0" |sed 's,.*[\\/],,'` + +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links + as_ln_s='cp -p' + else + as_ln_s='ln -s' + fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.file + +as_executable_p="test -f" + +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + +# NLS nuisances. +$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } +$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } +$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } +$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } +$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } +$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } +$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } +$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } + +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' +' +IFS=" $as_nl" + +# CDPATH. +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } + +exec 6>&1 + +_ACEOF + +# Files that config.status was made for. +if test -n "$ac_config_files"; then + echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS +fi + +if test -n "$ac_config_headers"; then + echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS +fi + +if test -n "$ac_config_links"; then + echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS +fi + +if test -n "$ac_config_commands"; then + echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS +fi + +cat >>$CONFIG_STATUS <<\EOF + +ac_cs_usage="\ +\`$as_me' instantiates files from templates according to the +current configuration. + +Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit + -V, --version print version number, then exit + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE + +Configuration files: +$config_files + +Configuration headers: +$config_headers + +Configuration commands: +$config_commands + +Report bugs to ." +EOF + +cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF +# If no file are specified by the user, then we need to provide default +# value. By we need to know if files were specified by the user. +ac_need_defaults=: +while test $# != 0 do - case "\$ac_option" in + case $1 in + --*=*) + ac_option=`expr "x$1" : 'x\([^=]*\)='` + ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` + shift + set dummy "$ac_option" "$ac_optarg" ${1+"$@"} + shift + ;; + -*);; + *) # This is not an option, so the user has probably given explicit + # arguments. + ac_need_defaults=false;; + esac + + case $1 in + # Handling of the options. +EOF +cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF + --version | --vers* | -V ) + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header + { { echo "$as_me:33565: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&5 +echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2;} + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit 0 ;; + --debug | --d* | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + shift + CONFIG_FILES="$CONFIG_FILES $1" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + shift + CONFIG_HEADERS="$CONFIG_HEADERS $1" + ac_need_defaults=false;; + + # This is an error. + -*) { { echo "$as_me:33584: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&5 +echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2;} + { (exit 1); exit 1; }; } ;; + + *) ac_config_targets="$ac_config_targets $1" ;; + esac + shift done -ac_given_srcdir=$srcdir -ac_given_INSTALL="$INSTALL" +exec 5>>config.log +cat >&5 << _ACEOF -trap 'rm -fr `echo "$PCRE_MAKEFILE - $SUB_MAKEFILE - $CAN_MAKEFILE - src/Makefile include/autoconf.h:include/autoconf.hin" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -EOF -cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF -$ac_vpsub -$extrasub -s%@SHELL@%$SHELL%g -s%@CFLAGS@%$CFLAGS%g -s%@CPPFLAGS@%$CPPFLAGS%g -s%@CXXFLAGS@%$CXXFLAGS%g -s%@FFLAGS@%$FFLAGS%g -s%@DEFS@%$DEFS%g -s%@LDFLAGS@%$LDFLAGS%g -s%@LIBS@%$LIBS%g -s%@exec_prefix@%$exec_prefix%g -s%@prefix@%$prefix%g -s%@program_transform_name@%$program_transform_name%g -s%@bindir@%$bindir%g -s%@sbindir@%$sbindir%g -s%@libexecdir@%$libexecdir%g -s%@datadir@%$datadir%g -s%@sysconfdir@%$sysconfdir%g -s%@sharedstatedir@%$sharedstatedir%g -s%@localstatedir@%$localstatedir%g -s%@libdir@%$libdir%g -s%@includedir@%$includedir%g -s%@oldincludedir@%$oldincludedir%g -s%@infodir@%$infodir%g -s%@mandir@%$mandir%g -s%@PACKAGE@%$PACKAGE%g -s%@VERSION@%$VERSION%g -s%@host@%$host%g -s%@host_alias@%$host_alias%g -s%@host_cpu@%$host_cpu%g -s%@host_vendor@%$host_vendor%g -s%@host_os@%$host_os%g -s%@PATH_SEPARATOR@%$PATH_SEPARATOR%g -s%@DESTDIR@%$DESTDIR%g -s%@XLC@%$XLC%g -s%@CC@%$CC%g -s%@EXTRA_CPPFLAGS@%$EXTRA_CPPFLAGS%g -s%@CPP@%$CPP%g -s%@SET_MAKE@%$SET_MAKE%g -s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g -s%@INSTALL_DATA@%$INSTALL_DATA%g -s%@YACC@%$YACC%g -s%@LINT@%$LINT%g -s%@EXEEXT@%$EXEEXT%g -s%@OBJEXT@%$OBJEXT%g -s%@PROG_EXT@%$PROG_EXT%g -s%@LIB_PREFIX@%$LIB_PREFIX%g -s%@LN_S@%$LN_S%g -s%@BUILD_CC@%$BUILD_CC%g -s%@BUILD_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 -s%@build_vendor@%$build_vendor%g -s%@build_os@%$build_os%g -s%@RANLIB@%$RANLIB%g -s%@LD@%$LD%g -s%@AR@%$AR%g -s%@ARFLAGS@%$ARFLAGS%g -s%@PATH_ISPELL@%$PATH_ISPELL%g -s%@PATH_METAMAIL@%$PATH_METAMAIL%g -s%@PATH_SUM@%$PATH_SUM%g -s%@DEFAULT_EDITOR@%$DEFAULT_EDITOR%g -s%@DEFAULT_MAILER@%$DEFAULT_MAILER%g -s%@PATH_PGP@%$PATH_PGP%g -s%@PATH_PGPK@%$PATH_PGPK%g -s%@PATH_GPG@%$PATH_GPG%g -s%@PATH_SLRNFACE@%$PATH_SLRNFACE%g -s%@DEFAULT_SHELL@%$DEFAULT_SHELL%g -s%@ENABLE_DEBUG@%$ENABLE_DEBUG%g -s%@ECHO_LT@%$ECHO_LT%g -s%@ECHO_LD@%$ECHO_LD%g -s%@RULE_CC@%$RULE_CC%g -s%@SHOW_CC@%$SHOW_CC%g -s%@ECHO_CC@%$ECHO_CC%g -s%@EXTRA_CFLAGS@%$EXTRA_CFLAGS%g -s%@NEWSLIBDIR@%$NEWSLIBDIR%g -s%@SPOOLDIR@%$SPOOLDIR%g -s%@NOVROOTDIR@%$NOVROOTDIR%g -s%@INEWSDIR@%$INEWSDIR%g -s%@INEWS@%$INEWS%g -s%@PKG_CONFIG@%$PKG_CONFIG%g -s%@NCURSES_CONFIG@%$NCURSES_CONFIG%g -s%@PCRE_MAJOR@%$PCRE_MAJOR%g -s%@PCRE_MINOR@%$PCRE_MINOR%g -s%@PCRE_DATE@%$PCRE_DATE%g -s%@PCRE_DEFINES@%$PCRE_DEFINES%g -s%@PCREDIR_MAKE@%$PCREDIR_MAKE%g -s%@PCREDIR_LIBS@%$PCREDIR_LIBS%g -s%@PCREDIR_CPPFLAGS@%$PCREDIR_CPPFLAGS%g -s%@LINK_SIZE@%$LINK_SIZE%g -s%@EXTRAOBJS@%$EXTRAOBJS%g -s%@EXTRAO_DEP@%$EXTRAO_DEP%g -s%@CANDIR_MAKE@%$CANDIR_MAKE%g -s%@CANLIBS@%$CANLIBS%g -s%@TIN_DEFAULTS_DIR@%$TIN_DEFAULTS_DIR%g -s%@LIBOBJS@%$LIBOBJS%g -s%@cf_cv_makeflags@%$cf_cv_makeflags%g -s%@CONFIG_H@%$CONFIG_H%g -s%@ALLOCA@%$ALLOCA%g -s%@GLIBC21@%$GLIBC21%g -s%@LIBICONV@%$LIBICONV%g -s%@USE_NLS@%$USE_NLS%g -s%@MSGFMT@%$MSGFMT%g -s%@GMSGFMT@%$GMSGFMT%g -s%@XGETTEXT@%$XGETTEXT%g -s%@INTLBISON@%$INTLBISON%g -s%@BUILD_INCLUDED_LIBINTL@%$BUILD_INCLUDED_LIBINTL%g -s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g -s%@CATALOGS@%$CATALOGS%g -s%@CATOBJEXT@%$CATOBJEXT%g -s%@GMOFILES@%$GMOFILES%g -s%@INTLLIBS@%$INTLLIBS%g -s%@INTLOBJS@%$INTLOBJS%g -s%@POFILES@%$POFILES%g -s%@POSUB@%$POSUB%g -s%@DATADIRNAME@%$DATADIRNAME%g -s%@INSTOBJEXT@%$INSTOBJEXT%g -s%@GENCAT@%$GENCAT%g -s%@INTL_LIBTOOL_SUFFIX_PREFIX@%$INTL_LIBTOOL_SUFFIX_PREFIX%g -s%@NLS_TEXTDOMAIN@%$NLS_TEXTDOMAIN%g -s%@MSG_DIR_MAKE@%$MSG_DIR_MAKE%g -s%@SUB_MAKEFILE@%$SUB_MAKEFILE%g -s%@INTLDIR_MAKE@%$INTLDIR_MAKE%g -s%@GT_YES@%$GT_YES%g -s%@GT_NO@%$GT_NO%g -s%@X_CFLAGS@%$X_CFLAGS%g -s%@X_PRE_LIBS@%$X_PRE_LIBS%g -s%@X_LIBS@%$X_LIBS%g -s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g -s%@XCURSES_CONFIG@%$XCURSES_CONFIG%g -s%@LINTFLAGS@%$LINTFLAGS%g +## ----------------------- ## +## Running config.status. ## +## ----------------------- ## -CEOF +This file was extended by $as_me 2.52.20181006, executed with + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + > $ac_cs_invocation +on `(hostname || uname -n) 2>/dev/null | sed 1q` + +_ACEOF EOF -cat >> $CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS < conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file - else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi +EOF + +cat >>$CONFIG_STATUS <<\EOF +for ac_config_target in $ac_config_targets +do + case "$ac_config_target" in + # Handling of arguments. + "$PCRE_MAKEFILE" ) CONFIG_FILES="$CONFIG_FILES $PCRE_MAKEFILE" ;; + "$SUB_MAKEFILE" ) CONFIG_FILES="$CONFIG_FILES $SUB_MAKEFILE" ;; + "$CAN_MAKEFILE" ) CONFIG_FILES="$CONFIG_FILES $CAN_MAKEFILE" ;; + "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; + "include/autoconf.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/autoconf.h:include/autoconf.hin" ;; + *) { { echo "$as_me:33632: error: invalid argument: $ac_config_target" >&5 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi + +# Create a temporary directory, and hook for its removal unless debugging. +$debug || +{ + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 +} + +# Create a (secure) tmp directory for tmp files. +: ${TMPDIR=/tmp} +{ + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=$TMPDIR/cs$$-$RANDOM + (umask 077 && mkdir $tmp) +} || +{ + echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + { (exit 1); exit 1; } +} + +EOF + +cat >>$CONFIG_STATUS <\$tmp/subs.sed <<\\CEOF +s,@SHELL@,$SHELL,;t t +s,@exec_prefix@,$exec_prefix,;t t +s,@prefix@,$prefix,;t t +s,@program_transform_name@,$program_transform_name,;t t +s,@bindir@,$bindir,;t t +s,@sbindir@,$sbindir,;t t +s,@libexecdir@,$libexecdir,;t t +s,@datarootdir@,$datarootdir,;t t +s,@datadir@,$datadir,;t t +s,@sysconfdir@,$sysconfdir,;t t +s,@sharedstatedir@,$sharedstatedir,;t t +s,@localstatedir@,$localstatedir,;t t +s,@runstatedir@,$runstatedir,;t t +s,@libdir@,$libdir,;t t +s,@includedir@,$includedir,;t t +s,@oldincludedir@,$oldincludedir,;t t +s,@infodir@,$infodir,;t t +s,@mandir@,$mandir,;t t +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t +s,@build_alias@,$build_alias,;t t +s,@host_alias@,$host_alias,;t t +s,@target_alias@,$target_alias,;t t +s,@ECHO_C@,$ECHO_C,;t t +s,@ECHO_N@,$ECHO_N,;t t +s,@ECHO_T@,$ECHO_T,;t t +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +s,@DEFS@,$DEFS,;t t +s,@LIBS@,$LIBS,;t t +s,@PACKAGE@,$PACKAGE,;t t +s,@VERSION@,$VERSION,;t t +s,@build@,$build,;t t +s,@build_cpu@,$build_cpu,;t t +s,@build_vendor@,$build_vendor,;t t +s,@build_os@,$build_os,;t t +s,@host@,$host,;t t +s,@host_cpu@,$host_cpu,;t t +s,@host_vendor@,$host_vendor,;t t +s,@host_os@,$host_os,;t t +s,@DESTDIR@,$DESTDIR,;t t +s,@XLC@,$XLC,;t t +s,@CC@,$CC,;t t +s,@CFLAGS@,$CFLAGS,;t t +s,@LDFLAGS@,$LDFLAGS,;t t +s,@CPPFLAGS@,$CPPFLAGS,;t t +s,@ac_ct_CC@,$ac_ct_CC,;t t +s,@EXEEXT@,$EXEEXT,;t t +s,@OBJEXT@,$OBJEXT,;t t +s,@EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t +s,@CPP@,$CPP,;t t +s,@SET_MAKE@,$SET_MAKE,;t t +s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t +s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t +s,@INSTALL_DATA@,$INSTALL_DATA,;t t +s,@YACC@,$YACC,;t t +s,@LINT@,$LINT,;t t +s,@PROG_EXT@,$PROG_EXT,;t t +s,@LIB_PREFIX@,$LIB_PREFIX,;t t +s,@LN_S@,$LN_S,;t t +s,@BUILD_CC@,$BUILD_CC,;t t +s,@BUILD_CPP@,$BUILD_CPP,;t t +s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t +s,@BUILD_CPPFLAGS@,$BUILD_CPPFLAGS,;t t +s,@BUILD_LDFLAGS@,$BUILD_LDFLAGS,;t t +s,@BUILD_LIBS@,$BUILD_LIBS,;t t +s,@BUILD_EXEEXT@,$BUILD_EXEEXT,;t t +s,@BUILD_OBJEXT@,$BUILD_OBJEXT,;t t +s,@RANLIB@,$RANLIB,;t t +s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t +s,@LD@,$LD,;t t +s,@ac_ct_LD@,$ac_ct_LD,;t t +s,@AR@,$AR,;t t +s,@ac_ct_AR@,$ac_ct_AR,;t t +s,@ARFLAGS@,$ARFLAGS,;t t +s,@PATH_ISPELL@,$PATH_ISPELL,;t t +s,@PATH_METAMAIL@,$PATH_METAMAIL,;t t +s,@PATH_SUM@,$PATH_SUM,;t t +s,@DEFAULT_EDITOR@,$DEFAULT_EDITOR,;t t +s,@DEFAULT_MAILER@,$DEFAULT_MAILER,;t t +s,@PATH_PGP@,$PATH_PGP,;t t +s,@PATH_PGPK@,$PATH_PGPK,;t t +s,@PATH_GPG@,$PATH_GPG,;t t +s,@PATH_SLRNFACE@,$PATH_SLRNFACE,;t t +s,@DEFAULT_SHELL@,$DEFAULT_SHELL,;t t +s,@ENABLE_DEBUG@,$ENABLE_DEBUG,;t t +s,@ECHO_LT@,$ECHO_LT,;t t +s,@ECHO_LD@,$ECHO_LD,;t t +s,@RULE_CC@,$RULE_CC,;t t +s,@SHOW_CC@,$SHOW_CC,;t t +s,@ECHO_CC@,$ECHO_CC,;t t +s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t +s,@NEWSLIBDIR@,$NEWSLIBDIR,;t t +s,@SPOOLDIR@,$SPOOLDIR,;t t +s,@NOVROOTDIR@,$NOVROOTDIR,;t t +s,@INEWSDIR@,$INEWSDIR,;t t +s,@INEWS@,$INEWS,;t t +s,@PKG_CONFIG@,$PKG_CONFIG,;t t +s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t +s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t +s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t +s,@PCRE_MAJOR@,$PCRE_MAJOR,;t t +s,@PCRE_MINOR@,$PCRE_MINOR,;t t +s,@PCRE_DATE@,$PCRE_DATE,;t t +s,@PCRE_DEFINES@,$PCRE_DEFINES,;t t +s,@PCREDIR_MAKE@,$PCREDIR_MAKE,;t t +s,@PCREDIR_LIBS@,$PCREDIR_LIBS,;t t +s,@PCREDIR_CPPFLAGS@,$PCREDIR_CPPFLAGS,;t t +s,@LINK_SIZE@,$LINK_SIZE,;t t +s,@UTF8@,$UTF8,;t t +s,@UCP@,$UCP,;t t +s,@EXTRAOBJS@,$EXTRAOBJS,;t t +s,@EXTRAO_DEP@,$EXTRAO_DEP,;t t +s,@CANDIR_MAKE@,$CANDIR_MAKE,;t t +s,@CANLIBS@,$CANLIBS,;t t +s,@TIN_DEFAULTS_DIR@,$TIN_DEFAULTS_DIR,;t t +s,@LIBOBJS@,$LIBOBJS,;t t +s,@cf_cv_makeflags@,$cf_cv_makeflags,;t t +s,@CONFIG_H@,$CONFIG_H,;t t +s,@ALLOCA@,$ALLOCA,;t t +s,@GLIBC21@,$GLIBC21,;t t +s,@LIBICONV@,$LIBICONV,;t t +s,@USE_NLS@,$USE_NLS,;t t +s,@MSGFMT@,$MSGFMT,;t t +s,@GMSGFMT@,$GMSGFMT,;t t +s,@XGETTEXT@,$XGETTEXT,;t t +s,@INTLBISON@,$INTLBISON,;t t +s,@BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t +s,@USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t +s,@CATALOGS@,$CATALOGS,;t t +s,@CATOBJEXT@,$CATOBJEXT,;t t +s,@GMOFILES@,$GMOFILES,;t t +s,@INTLLIBS@,$INTLLIBS,;t t +s,@INTLOBJS@,$INTLOBJS,;t t +s,@POFILES@,$POFILES,;t t +s,@POSUB@,$POSUB,;t t +s,@DATADIRNAME@,$DATADIRNAME,;t t +s,@INSTOBJEXT@,$INSTOBJEXT,;t t +s,@GENCAT@,$GENCAT,;t t +s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t +s,@NLS_TEXTDOMAIN@,$NLS_TEXTDOMAIN,;t t +s,@MSG_DIR_MAKE@,$MSG_DIR_MAKE,;t t +s,@SUB_MAKEFILE@,$SUB_MAKEFILE,;t t +s,@INTLDIR_MAKE@,$INTLDIR_MAKE,;t t +s,@GT_YES@,$GT_YES,;t t +s,@GT_NO@,$GT_NO,;t t +s,@X_CFLAGS@,$X_CFLAGS,;t t +s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t +s,@X_LIBS@,$X_LIBS,;t t +s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t +s,@XCURSES_CONFIG@,$XCURSES_CONFIG,;t t +s,@ac_ct_XCURSES_CONFIG@,$ac_ct_XCURSES_CONFIG,;t t +s,@LINTFLAGS@,$LINTFLAGS,;t t +CEOF + EOF -cat >> $CONFIG_STATUS <>$CONFIG_STATUS <<\EOF + # Split the substitutions into bite-sized pieces for seds with + # small command number limits, like on Digital OSF/1 and HP-UX. + ac_max_sed_lines=48 + ac_sed_frag=1 # Number of current file. + ac_beg=1 # First line for current file. + ac_end=$ac_max_sed_lines # Line after last line for current file. + ac_more_lines=: + ac_sed_cmds= + while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + else + sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + fi + if test ! -s $tmp/subs.frag; then + ac_more_lines=false + else + # The purpose of the label and of the branching condition is to + # speed up the sed processing (if there are no `@' at all, there + # is no need to browse any of the substitutions). + # These are the two extra sed commands mentioned above. + (echo ':t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed + # It is possible to make a multiline substitution using escaped newlines. + # Ensure that we do not split the substitution between script fragments. + ac_BEG=$ac_end + ac_END=`expr $ac_end + $ac_max_sed_lines` + sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next + if test -s $tmp/subs.next; then + grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit + if test ! -s $tmp/subs.edit; then + grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit + if test ! -s $tmp/subs.edit; then + if test $ac_beg -gt 1; then + ac_end=`expr $ac_end - 1` + continue + fi + fi + fi + fi + + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + else + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + fi + ac_sed_frag=`expr $ac_sed_frag + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_lines` + fi + done + if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat + fi +fi # test -n "$CONFIG_FILES" -CONFIG_FILES=\${CONFIG_FILES-"$PCRE_MAKEFILE - $SUB_MAKEFILE - $CAN_MAKEFILE - src/Makefile"} EOF -cat >> $CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then +cat >>$CONFIG_STATUS <<\EOF +for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; esac - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" + { case "$ac_dir" in + [\\/]* | ?:[\\/]* ) as_incr_dir=;; + *) as_incr_dir=.;; +esac +as_dummy="$ac_dir" +for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do + case $as_mkdir_dir in + # Skip DOS drivespec + ?:) as_incr_dir=$as_mkdir_dir ;; + *) + as_incr_dir=$as_incr_dir/$as_mkdir_dir + test -d "$as_incr_dir" || mkdir "$as_incr_dir" + ;; + esac +done; } + + ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` + ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` else ac_dir_suffix= ac_dots= fi - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + case $srcdir in + .) ac_srcdir=. + if test -z "$ac_dots"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; + ac_srcdir=$ac_dots$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_dots$srcdir ;; esac - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_dots$INSTALL ;; esac - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; - esac + if test x"$ac_file" != x-; then + { echo "$as_me:33971: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated automatically by config.status. */ + configure_input="Generated automatically from `echo $ac_file_in | + sed 's,.*/,,'` by configure." + + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:33989: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; + *) # Relative + if test -f "$f"; then + # Build tree + echo $f + elif test -f "$srcdir/$f"; then + # Source tree + echo $srcdir/$f + else + # /dev/null tree + { { echo "$as_me:34002: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; + esac + done` || { (exit 1); exit 1; } +EOF +cat >>$CONFIG_STATUS <<\EOF + ac_warn_datarootdir=no + if test x"$ac_file" != x-; then + for ac_item in $ac_file_inputs + do + ac_seen=`grep '@\(datadir\|mandir\|infodir\)@' $ac_item` + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' $ac_item` + if test -z "$ac_used"; then + { echo "$as_me:34018: WARNING: datarootdir was used implicitly but not set: +$ac_seen" >&5 +echo "$as_me: WARNING: datarootdir was used implicitly but not set: +$ac_seen" >&2;} + ac_warn_datarootdir=yes + fi + fi + ac_seen=`grep '${datarootdir}' $ac_item` + if test -n "$ac_seen"; then + { echo "$as_me:34027: WARNING: datarootdir was used explicitly but not set: +$ac_seen" >&5 +echo "$as_me: WARNING: datarootdir was used explicitly but not set: +$ac_seen" >&2;} + ac_warn_datarootdir=yes + fi + done + fi + +if test "x$ac_warn_datarootdir" = xyes; then + ac_sed_cmds="$ac_sed_cmds | sed -e 's,@datarootdir@,\${prefix}/share,g' -e 's,\${datarootdir},\${prefix}/share,g'" +fi + +EOF +cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s,@configure_input@,$configure_input,;t t +s,@srcdir@,$ac_srcdir,;t t +s,@top_srcdir@,$ac_top_srcdir,;t t +s,@INSTALL@,$ac_INSTALL,;t t +" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out + rm -f $tmp/stdin + if test x"$ac_file" != x-; then + cp $tmp/out $ac_file + + for ac_name in prefix exec_prefix datarootdir + do + ac_seen=`fgrep -n '${'$ac_name'[:=].*}' $ac_file` + if test -n "$ac_seen"; then + ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` + if test -z "$ac_init"; then + ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` + { echo "$as_me:34064: WARNING: Variable $ac_name is used but was not set: +$ac_seen" >&5 +echo "$as_me: WARNING: Variable $ac_name is used but was not set: +$ac_seen" >&2;} + fi + fi + done + egrep -n '@[a-z_][a-z_0-9]+@' $ac_file >$tmp/out + egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out + if test -s $tmp/out; then + ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` + { echo "$as_me:34075: WARNING: Some variables may not be substituted: +$ac_seen" >&5 +echo "$as_me: WARNING: Some variables may not be substituted: +$ac_seen" >&2;} + fi + else + cat $tmp/out + fi + rm -f $tmp/out + +done +EOF +cat >>$CONFIG_STATUS <<\EOF - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -s%@INSTALL@%$INSTALL%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* +# +# CONFIG_HEADER section. +# # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where # NAME is the cpp macro being defined and VALUE is the value it is being given. # # ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' -ac_dC='\3' -ac_dD='%g' -# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". -ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='\([ ]\)%\1#\2define\3' +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='[ ].*$,\1#\2' +ac_dC=' ' +ac_dD=',;t' +# ac_i turns "#undef NAME" with trailing blanks into "#define NAME VALUE". +ac_iA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_iB='\([ ]\),\1#\2define\3' +ac_iC=' ' +ac_iD='\4,;t' +# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uB='$,\1#\2define\3' ac_uC=' ' -ac_uD='\4%g' -# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_eB='$%\1#\2define\3' -ac_eC=' ' -ac_eD='%g' +ac_uD=',;t' -if test "${CONFIG_HEADERS+set}" != set; then -EOF -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -fi -for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then +for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; esac - echo creating $ac_file + test x"$ac_file" != x- && { echo "$as_me:34124: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} - rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - cat $ac_file_inputs > conftest.in + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:34135: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; + *) # Relative + if test -f "$f"; then + # Build tree + echo $f + elif test -f "$srcdir/$f"; then + # Source tree + echo $srcdir/$f + else + # /dev/null tree + { { echo "$as_me:34148: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; + esac + done` || { (exit 1); exit 1; } + # Remove the trailing spaces. + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in EOF - -# Transform confdefs.h into a sed script conftest.vals that substitutes -# the proper values into config.h.in to produce config.h. And first: -# Protect against being on the right side of a sed subst in config.status. -# Protect against being in an unquoted here document in config.status. -rm -f conftest.vals -cat > conftest.hdr <<\EOF -s/[\\&%]/\\&/g -s%[\\$`]%\\&%g -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp -s%ac_d%ac_u%gp -s%ac_u%ac_e%gp -EOF -sed -n -f conftest.hdr confdefs.h > conftest.vals -rm -f conftest.hdr +# Transform confdefs.h into two sed scripts, `conftest.defines' and +# `conftest.undefs', that substitutes the proper values into +# config.h.in to produce config.h. The first handles `#define' +# templates, and the second `#undef' templates. +# And first: Protect against being on the right side of a sed subst in +# config.status. Protect against being in an unquoted here document +# in config.status. +rm -f conftest.defines conftest.undefs +# Using a here document instead of a string reduces the quoting nightmare. +# Putting comments in sed scripts is not portable. +# +# `end' is used to avoid that the second main sed command (meant for +# 0-ary CPP macros) applies to n-ary macro definitions. +# See the Autoconf documentation for `clear'. +cat >confdef2sed.sed <<\EOF +s/[\\&,]/\\&/g +s,[\\$`],\\&,g +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp +t end +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp +: end +EOF +# If some macros were called several times there might be several times +# the same #defines, which is useless. Nevertheless, we may not want to +# sort them, since we want the *last* AC-DEFINE to be honored. +uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines +sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs +sed 's/ac_d/ac_i/g' conftest.defines >>conftest.undefs +rm -f confdef2sed.sed # This sed command replaces #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. -cat >> conftest.vals <<\EOF -s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% +cat >>conftest.undefs <<\EOF +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, EOF -# Break up conftest.vals because some shells have a limit on -# the size of here documents, and old seds have small limits too. - +# Break up conftest.defines because some shells have a limit on the size +# of here documents, and old seds have small limits too (100 cmds). +echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS +echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS +echo ' :' >>$CONFIG_STATUS +rm -f conftest.tail +while grep . conftest.defines >/dev/null +do + # Write a limited-size here document to $tmp/defines.sed. + echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS + # Speed up: don't consider the non `#define' lines. + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS + echo 'CEOF + sed -f $tmp/defines.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in +' >>$CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail + rm -f conftest.defines + mv conftest.tail conftest.defines +done +rm -f conftest.defines +echo ' fi # egrep' >>$CONFIG_STATUS +echo >>$CONFIG_STATUS + +# Break up conftest.undefs because some shells have a limit on the size +# of here documents, and old seds have small limits too (100 cmds). +echo ' # Handle all the #undef templates' >>$CONFIG_STATUS rm -f conftest.tail -while : +while grep . conftest.undefs >/dev/null do - ac_lines=`grep -c . conftest.vals` - # grep -c gives empty output for an empty file on some AIX systems. - if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi - # Write a limited-size here document to conftest.frag. - echo ' cat > conftest.frag <> $CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS + # Write a limited-size here document to $tmp/undefs.sed. + echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS + # Speed up: don't consider the non `#undef' + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS echo 'CEOF - sed -f conftest.frag conftest.in > conftest.out - rm -f conftest.in - mv conftest.out conftest.in -' >> $CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail - rm -f conftest.vals - mv conftest.tail conftest.vals -done -rm -f conftest.vals - - -cat >> $CONFIG_STATUS <<\EOF - rm -f conftest.frag conftest.h - echo "/* $ac_file. Generated automatically by configure. */" > conftest.h - cat conftest.in >> conftest.h - rm -f conftest.in - if cmp -s $ac_file conftest.h 2>/dev/null; then - echo "$ac_file is unchanged" - rm -f conftest.h + sed -f $tmp/undefs.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in +' >>$CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail + rm -f conftest.undefs + mv conftest.tail conftest.undefs +done +rm -f conftest.undefs + +cat >>$CONFIG_STATUS <<\EOF + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated automatically by config.status. */ + if test x"$ac_file" = x-; then + echo "/* Generated automatically by configure. */" >$tmp/config.h else - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h + fi + cat $tmp/in >>$tmp/config.h + rm -f $tmp/in + if test x"$ac_file" != x-; then + if cmp -s $ac_file $tmp/config.h 2>/dev/null; then + { echo "$as_me:34266: $ac_file is unchanged" >&5 +echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" + { case "$ac_dir" in + [\\/]* | ?:[\\/]* ) as_incr_dir=;; + *) as_incr_dir=.;; +esac +as_dummy="$ac_dir" +for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do + case $as_mkdir_dir in + # Skip DOS drivespec + ?:) as_incr_dir=$as_mkdir_dir ;; + *) + as_incr_dir=$as_incr_dir/$as_mkdir_dir + test -d "$as_incr_dir" || mkdir "$as_incr_dir" + ;; + esac +done; } + + fi + rm -f $ac_file + mv $tmp/config.h $ac_file fi - rm -f $ac_file - mv conftest.h $ac_file + else + cat $tmp/config.h + rm -f $tmp/config.h fi -fi; done - +done EOF -cat >> $CONFIG_STATUS <>$CONFIG_STATUS <<\EOF +# +# CONFIG_COMMANDS section. +# +for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue + ac_dest=`echo "$ac_file" | sed 's,:.*,,'` + ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` -# Extra initialization commands, if any + case $ac_dest in + default-1 ) for ac_file in $CONFIG_FILES; do -EOF -cat >> $CONFIG_STATUS <<\EOF -for ac_file in $CONFIG_FILES; do - # Support "outfile[:infile[:infile...]]" case "$ac_file" in (*:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; esac - + # PO directories have a Makefile.in generated from Makefile.inn. case "$ac_file" in (*/[Mm]akefile.in) @@ -27968,13 +34331,13 @@ for ac_file in $CONFIG_FILES; do # In autoconf-2.13 it is called $ac_given_srcdir. # In autoconf-2.50 it is called $srcdir. test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - + case "$ac_given_srcdir" in (.) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; (/*) top_srcdir="$ac_given_srcdir" ;; (*) top_srcdir="$ac_dots$ac_given_srcdir" ;; esac - + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then rm -f "$ac_dir/POTFILES" test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" @@ -27984,12 +34347,33 @@ for ac_file in $CONFIG_FILES; do fi ;; esac - done -# Extra commands, if any + done ;; + esac +done +EOF + +cat >>$CONFIG_STATUS <<\EOF -exit 0 +{ (exit 0); exit 0; } EOF chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +ac_clean_files=$ac_clean_files_save + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + exec 5>/dev/null + $SHELL $CONFIG_STATUS || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || { (exit 1); exit 1; } +fi diff -Nurp '--exclude=.bzr*' tin-2.4.2/configure.in tin-2.4.3/configure.in --- tin-2.4.2/configure.in 2017-12-24 12:52:06.000000000 +0100 +++ tin-2.4.3/configure.in 2018-12-24 10:28:03.507999295 +0100 @@ -2,10 +2,10 @@ dnl Project : tin - a Usenet reader dnl Module : configure.in dnl Author : Thomas E. Dickey dnl Created : 1995-08-24 -dnl Updated : 2017-06-13 +dnl Updated : 2018-12-05 dnl Notes : dnl -dnl Copyright (c) 1995-2018 Thomas E. Dickey +dnl Copyright (c) 1995-2019 Thomas E. Dickey dnl All rights reserved. dnl dnl Redistribution and use in source and binary forms, with or without @@ -41,7 +41,7 @@ AC_PREFIX_DEFAULT(/usr/local) dnl PACKAGE is required for GNU gettext PACKAGE=tin -VERSION=2.4.2 +VERSION=2.4.3 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(PACKAGE) @@ -81,7 +81,7 @@ case "$host_os" in esac ### Native Language Support -ALL_LINGUAS="da de en_GB et fr ru sv tr zh_CN zh_TW" +ALL_LINGUAS="da de en_GB es et fr ru sv tr zh_CN zh_TW" ### Checks for programs save_CFLAGS="$CFLAGS" @@ -106,10 +106,6 @@ CF_PROG_AR CF_AR_FLAGS case "$host_cpu:$host_vendor:$host_os" in - # check for MacOS X, exclude Darwin on ix86 -# powerpc:apple:darwin*) #(vi -# AC_DEFINE(MAC_OS_X) -# ;; # check for cygwin environment # -DSTATIC is needed for pcre *:*:*cygwin*) #(vi @@ -458,6 +454,10 @@ PCRE_MAKEFILE= if test "$PCRE_HOME" = "no" ; then LINK_SIZE="-DLINK_SIZE=2" AC_SUBST(LINK_SIZE) + UTF8="-DSUPPORT_UTF8" + UCP="-DSUPPORT_UCP" + AC_SUBST(UTF8) + AC_SUBST(UCP) PCRE_MAKEFILE="$PCRE_MAKEFILE pcre/Makefile pcre/RunTest" fi @@ -738,7 +738,6 @@ CF_CPP_EXPANDS CF_CPP_CONCATS CF_CHECK_NESTED_PARAMS - ### Checks for header files. AC_HEADER_STDC AC_HEADER_DIRENT @@ -806,6 +805,7 @@ CF_CHECK_HEADERS(\ ### Checks that depend on existence-checks for headers CF_SIZECHANGE CF_SYS_SELECT_TIMEVAL +CF_VA_COPY ### Checks for Datatypes. AC_CHECK_TYPE(gid_t, int) @@ -911,12 +911,13 @@ AC_CHECK_LIB(uu, UUInitialize, # ICU - International Components for Unicode # TODO: do separate checks for -# - unorm_normalize() -# - uidna_IDNToUnicode() +# - unorm_normalize() # deprecated since ICU 56 +# - uidna_IDNToUnicode() # deprecated since ICU 56 # - ubidi_open() # and for IDNA2008 # - uidna_openUTS46() # - uidna_nameToUnicode() +# - unorm2_normalize() cf_try_icuuc="no" cf_try_icuuc46="no" AC_CHECK_HEADER(unicode/unorm.h,[ @@ -959,6 +960,10 @@ AC_CHECK_HEADER(unicode/unorm.h,[ ]) ]) ]) +# IDNA2008 +AC_CHECK_HEADER(unicode/unorm2.h, [ + AC_DEFINE(HAVE_UNICODE_UNORM2_H) +]) # without icuuc try GNU libunistring for normalization if test $cf_try_icuuc = no ; then @@ -1087,6 +1092,8 @@ AC_CHECK_FUNCS(\ chmod \ closesocket \ execlp \ + explicit_bzero \ + explicit_memset \ fcntl \ fdopen \ fork \ @@ -1139,7 +1146,6 @@ AC_CHECK_FUNCS(\ unlink \ use_default_colors \ usleep \ - vasprintf \ vsnprintf \ waitpid \ $cf_tc_funcs ) @@ -1160,6 +1166,26 @@ AC_CHECK_FUNC(clock_gettime, ] ) +AC_MSG_CHECKING([for memset_s]) +AC_TRY_RUN([ +/* Request C11 Annex K */ +#define __STDC_WANT_LIB_EXT1__ 1 +#include +#include +int main() +{ + char buf[10] = { 1 }; + if (memset_s((void*) buf, (size_t) 100, 0, (size_t) 1)) + return(-1); +}], + [ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_MEMSET_S) + ], + [AC_MSG_RESULT([no])], + [AC_MSG_RESULT([unknown])] +) + AM_MULTIBYTE_ABLE AC_MSG_CHECKING(if gettimeofday takes two arguments) @@ -1422,9 +1448,16 @@ int main() { exit(1); exit(0); }], - AC_DEFINE(HAVE_ICONV_OPEN_TRANSLIT) AC_MSG_RESULT(yes), - AC_MSG_RESULT(no), - AC_MSG_RESULT(unknown) + [ + AC_DEFINE(HAVE_ICONV_OPEN_TRANSLIT) + AC_MSG_RESULT(yes) + ], + [ + AC_MSG_RESULT(no) + ], + [ + AC_MSG_RESULT(unknown) + ] ) # FIXME / TESTME @@ -1460,7 +1493,7 @@ esac if test "$cf_cv_termlib" = pdcurses ; then CF_PDCURSES_X11 fi -AC_CHECK_FUNCS(vwprintw) +AC_CHECK_FUNCS(vw_printw) ### sum up warnings if test "$cf_cv_termlib" = none ; then @@ -1485,7 +1518,7 @@ CF_DEFINE_STRING(TIN_CPP, "$CPP") CF_DEFINE_STRING(TIN_CPPFLAGS, "$CPPFLAGS") CF_DEFINE_STRING(TIN_LD, "$CC") CF_DEFINE_STRING(TIN_LDFLAGS, "$LDFLAGS") -CF_DEFINE_STRING(TIN_LIBS, "$LIBS") +CF_DEFINE_STRING(TIN_LIBS, "$PCREDIR_LIBS $LIBS") AC_OUTPUT($PCRE_MAKEFILE $SUB_MAKEFILE diff -Nurp '--exclude=.bzr*' tin-2.4.2/doc/CHANGES tin-2.4.3/doc/CHANGES --- tin-2.4.2/doc/CHANGES 2017-12-22 09:31:25.000000000 +0100 +++ tin-2.4.3/doc/CHANGES 2018-12-24 10:28:01.295913045 +0100 @@ -1,8 +1,68 @@ +-- 2.4.3 release 20181224 "Glen Mhor" -- + + 012) Thomas E. Dickey + ADD. update configure macros + ADD. check for va_copy() for pre C99 systems + FIX. aclocal.m4, configure[.in], autoconf.h[in], tin.h, memory.c + screen.c, string.c, tcurses.c + + 011) Francisco Javier Serrador + ADD. spanish translation + FIX. es.po + + 010) Matt Anton + ADD. updated french translation + FIX. fr.po + + 009) Dennis Preiser + BUG. ensure destination of match_string() is NULL terminated + BUG. possible buffer overflows with long translations + BUG. fixed length buffer in rfc1522_decode() may overflow + ADD. don't idna_decode() strings which are not IDNA encoded + ADD. ability to filter on Path:-header + FIX. art.c, config.c, feed.c, filter.c, getline.c, help.c, lang.c + main.c, memory.c, nntplib.c, page.c, rfc2047.c, save.c, screen.c + extern.h, nntplib.h, proto.h, tin.h, tin.5 + + 008) Urs Janssen + ADD. config.guess, config.sub update + ADD. checks for explicit_bzero(), explicit_memset(), memset_s() + ADD. check for unicode/unorm2.h to favor unorm2_normalize() over + unorm_normalize() if found + ADD. NFKC_case_fold normalization if unicode/unorm2.h is found + ADD. don't strip binray with "make install" + ADD. match_string()/match_item() now stop on first '\n' + ADD. don't show broken active file messages if not running with -D 1 + ADD. accept arbitrary line length in mail.active file + ADD. allow (multiple) -v for debug mode + ADD. honor NDEBUG in assert() replacement + BUG. possible buffer overflow when prompting for a wildcard search + pattern in get_search_pattern() + BUG. possible buffer overflows with long translations + BUG. pointer arithmetic with possible NULL pointer + BUG. didn't recheck CAPABILITIES after auth + BUG. transport-padding on mime boundaries wasn't ignored + BUG. get_group_from_list() used in 'L'lookup_msgid() couldn't handle + FWS as of RFC 5536 3.1.4. + ADD. rename FOLLOW_USEFOR_DRAFT to ALLOW_FWS_IN_NEWSGROUPLIST + ADD. remove some redundant assigns + ADD. switch from autoconf-2.13.20110430 to autoconf-2.52.20181006 + ADD. be more verbose on connections errors when get_tcp6_socket() + is used (debian bug #232924) + FIX. active.c, art.c, auth.c, config.c, cook.c, debug.c, feed.c + getline.c, group.c, header.c, help.c, init.c, keymap.c, lang.c + list.c, mail.c, main.c, misc.c, newsrc.c, nntplib.c, options_menu.c + page.c, post.c, read.c, rfc1524.c, rfc2045.c, rfc2046.c, rfc2047.c + save.c, search.c, screen.c, select.c, signal.c, sigfile.c + strftime.c, string.c, extern.h, proto.h, tin.h, config.guess + config.sub, aclocal.m4, configure[.in], autoconf.h[in] + Makefile[.in], tin.1, tin.5 + -- 2.4.2 release 20171224 "Lochhead" -- 007) Thomas E. Dickey ADD. update configure macros - FIX. aclocal.m4, configure + FIX. aclocal.m4, configure[.in] 006) Mesutcan Kurt ADD. updated turkish translation diff -Nurp '--exclude=.bzr*' tin-2.4.2/doc/CHANGES.old tin-2.4.3/doc/CHANGES.old --- tin-2.4.2/doc/CHANGES.old 2017-12-22 09:36:43.000000000 +0100 +++ tin-2.4.3/doc/CHANGES.old 2018-11-20 09:07:29.277060905 +0100 @@ -289,7 +289,7 @@ U001) Matt Anton be 497 bytes max). BUG. hypothetic out of bounds write in msg_add_header() if more than MAX_MSG_HEADERS are added automatically - BUG. don't null strings will illegal multibyte sequences, just replace + BUG. don't null strings with illegal multibyte sequences, just replace everything after the fist illegal sequence with ? FIX. active.c, config.c, feed.c, lang.c, page.c, post.c, read.c, rfc2046.c, string.c, config.guess, config.sub, de.po @@ -378,7 +378,7 @@ U016) Toomas Soome ADD. user defined screen layout at selection, group and thread level (debian bug #63877) - BUG. the code for genetaring initials (used for quote_chars) was not + BUG. the code for generating initials (used for quote_chars) was not multibyte safe FIX. attrib.c, config.c, group.c, init.c, lang.c, memory.c, misc.c options_menu.c, page.c, post.c, save.c, screen.c, select.c, string.c @@ -485,7 +485,7 @@ U004) Thomas E. Dickey ADD. config.guess, config.sub update ADD. heapsort.c fallback - ADD. compile heapsort.c and xface.c conditionaly + ADD. compile heapsort.c and xface.c conditionally ADD. configure check for libunistring if libicuuc is not found ADD. configure check for setvbug ADD. prefer libicuuc for idna2003 decoding over libidn @@ -555,7 +555,7 @@ U029) Thomas E. Dickey BUG. SIGWINCH at page level after a connection timeout lead to a crash - BUG. no SIGWINCH hadling in setup_check_article() + BUG. no SIGWINCH handling in setup_check_article() BUG. comments in references were not skipped BUG. fixed some display problems in the !USE_CURSES case ADD. info message on SearchRepeat without previous search @@ -774,9 +774,9 @@ U014) Urs Janssen ADD. convert MOTD from UTF-8 to local-charset ADD. warn about aliased groups ADD. reduce number of "LIST ACTIVE grp" cmds send with -n if server - announces "LIST ACTIVE" capabillity + announces "LIST ACTIVE" capability ADD. reduce number of "LIST NEWSGROUPS grp" cmds send with -n if server - announces "LIST NEWSGROUPS" capabillity + announces "LIST NEWSGROUPS" capability ADD. prefer "LIST COUNTS" over "LIST ACTIVE" when announced via CAPABILITIES BUG. NULL was only allowed once to unbound a keymapping @@ -1182,7 +1182,7 @@ U044) Travis Brown options_menu.c, tincfg.tbl, tin.1, tin.5 U043) Urs Janssen - BUG. POST_EDIT was mssing from post_cancel_keys + BUG. POST_EDIT was missing from post_cancel_keys BUG. GLOBAL_QUIT was missing from post_edit_keys and post_edit_ext_keys and not rebindable in post_continue_keys BUG. duplicated onlinehelp entries @@ -1291,7 +1291,7 @@ U032) Michael Bienia ') - ADD. unifiy option-value description formats + ADD. unify option-value description formats BUG. missing file truncation in do_rfc15211522_encode() FIX. extern.h, keymap.h, menukeys.h, proto.h, tin.h, cook.c, global.c group.c, help.c, keymap.c, lang.c, options_menu.c, page.c, post.c @@ -1342,7 +1342,7 @@ U028) Michael Bienia @@ -1729,7 +1729,7 @@ U166) Andreas Metzler BUG. manpage cleanups BUG. //TRANSLIT might not work correct - BUG. changing thread_articles via 'M'enu while being an 'emtpy' + BUG. changing thread_articles via 'M'enu while being an 'empty' group caused a crash ADD. +/-MULTIBYTE_ABLE to -V output FIX. config.c, main.c, misc.c, tin.1, tin.5 @@ -1755,7 +1755,7 @@ U163) Jason Faultless - BUG. -lintl may not be linked to executable if using a "externl" lib + BUG. -lintl may not be linked to executable if using an "external" lib FIX. aclocal.m4, configure[.in], Makefile[.in], Makefile.inn U161) Corinna Vinschen @@ -1887,7 +1887,7 @@ U146) Urs Janssen BUG. didn't read attributes file when started with '-q' flag BUG. parse_rfc822_headers() did also decode the address-part of of headers like From/To - BUG. removed some hardcoded keys + BUG. removed some hard coded keys BUG. fixed a few typos in the french translation BUG. -S without -n did also save new groups BUG. $AUTOSUBSRIBE was broken @@ -2429,7 +2429,7 @@ U089) Urs Janssen BUG. sometimes illegal From-fields were written to local cached overviews BUG. missing From caused crashes when replying - BUG. match_string() doesn't allow emtpy strings (U048) + BUG. match_string() doesn't allow empty strings (U048) BUG. duplicated Cancel-Lock in rare cases BUG. eat_re() could modify subject in aborted posts BUG. unknown Content-Transfer-Encodings defaulted to 7bit instead of @@ -2716,7 +2716,7 @@ U059) Urs Janssen BUG. insert_from_header() didn't fclose() open files on invalid From: lines BUG. off by one quoting error in cooked mode with no headers shown - in followups/replys + in followups/replies BUG. backup_file() treated missing source files as an error BUG. if a nntp:-url only contained the name of a group but didn't specify an article the last group name component wasn't recognized @@ -2822,16 +2822,16 @@ U052) Urs Janssen mailboxes BUG. fetch_postponed_article() didn't unquote quoted From_ lines BUG. storing in MMDF mailboxes was broken - BUG. quoting long lines in followups/replys lead to wrong quote + BUG. quoting long lines in followups/replies lead to wrong quote levels BUG. didn't compile on MacOS X with apples gcc-port BUG. contains_nonprintables() check for encoded words was to soft - BUG. off by one quoting error in followups/replys + BUG. off by one quoting error in followups/replies BUG. url_handler.sh didn't handle uppercase schemes and & in URLs BUG. 'U' in raw_mode crashed tin BUG. newline missing in bugreport ADD. .ps (Palestinian Territories) as a valid TLD - ADD. use the raw-article for followups/replys if pager is in + ADD. use the raw-article for followups/replies if pager is in raw-mode ADD. config.guess, config.sub, metamutt (1.15 -> 1.17) update ADD. expiretover script for purging old cached overview data @@ -3420,7 +3420,7 @@ U001) Urs Janssen FIX. misc.c 681) Vincent Lefevre - BUG. used C-style comparsion in shell script + BUG. used C-style comparison in shell script FIX. configure[.in] 680) Dawid Kuroczko @@ -3726,7 +3726,7 @@ U001) Urs Janssen FIX. feed.c, save.c, tin.1 639) Roland Rosenfeld - ADD. respect mail_address for mail-replys if not using interactive + ADD. respect mail_address for mail-replies if not using interactive mailer (!use_mailreader_i) FIX. post.c @@ -3933,7 +3933,7 @@ U001) Urs Janssen 610) Jason Faultless BUG. if the shell tin is running in is SIGHUP tin could fall into - a endless loop + an endless loop FIX. read.c, signal.c 609) Ralf Doeblitz @@ -4113,7 +4113,7 @@ U001) Urs Janssen 583) Urs Janssen BUG. compile with -DDONT_HAVE_PIPING didn't work BUG. broken newsrc-lines could cause a core-dump - BUG. if starting with on commandline group, tin doesn't display + BUG. if starting with on command-line group, tin doesn't display any groupnames after leaving group-level BUG. no check for empty but present Followup-To line if posting to multiple newsgroups @@ -4405,7 +4405,7 @@ U001) Urs Janssen FIX. several supplied patches 533) Ralf Doeblitz - BUG. commandline flags overridden by tinrc values + BUG. command-line flags overridden by tinrc values BUG. screen not initialized to default attributes when using color BUG. documentation for default_filter_kill_header and default_filter_select_header outdated in man page @@ -4424,7 +4424,7 @@ U001) Urs Janssen FIX. rfc1521.c 530) Urs Janssen - BUG. Newsgroups:-line was present in mail-replys, renamed it to + BUG. Newsgroups:-line was present in mail-replies, renamed it to X-Newsgroups (RFC 822 doesn't define a Newsgroups:-header) for mail_to_author and removed it from mail_to_someone where it's usually present in the body. @@ -4447,7 +4447,7 @@ U001) Urs Janssen FIX. tin.h, filter.c, group.c 527) Jason Faultless - BUG. 'A'uthor search backwards might produce a + BUG. 'A'uthor search backwards might produce an invalid offset into arts[] FIX. search.c @@ -4729,7 +4729,7 @@ U001) Urs Janssen prompt.c, select.c, active.c 480) Roland Rosenfeld - BUG. search in 'M'enu ends in a endless loop if no match was found + BUG. search in 'M'enu ends in an endless loop if no match was found BUG. off by one error when jumping direct to a 'M'enu option ADD. runtime check if color is supported FIX. search.c, extern.h, proto.h, color.c, config.c, group.c, lang.c @@ -5187,7 +5187,7 @@ U001) Urs Janssen 412) Urs Janssen ADD. test for curses before reading any config-files - BUG. upon Supersedes Reply-To: was inserted even if $REPLYTO was't set + BUG. upon Supersedes Reply-To: was inserted even if $REPLYTO wasn't set FIX. main.c, post.c 411) Oliver B. Warzecha @@ -5498,7 +5498,7 @@ U001) Urs Janssen 358) Kevin Lentin BUG. When reading mail groups tin tries to connect the server - ADD. prompt_yn2() now allows only 'y','n','ESC' as a answer + ADD. prompt_yn2() now allows only 'y','n','ESC' as an answer BUG. if you answer the reconnect to server question with no or the connection is broken the newsrc is written out before tin exits. FIX. several supplied patches diff -Nurp '--exclude=.bzr*' tin-2.4.2/doc/CREDITS tin-2.4.3/doc/CREDITS --- tin-2.4.2/doc/CREDITS 2017-05-03 19:47:32.000000000 +0200 +++ tin-2.4.3/doc/CREDITS 2018-04-19 13:28:41.161189809 +0200 @@ -57,13 +57,13 @@ Peter Van Rossem, Clifton Royston, Rado Rich Salz, Gary Sanders, Nickolay Saukh, John Sauter, Christopher Sawtell, Holger Schif, Volker Schmidt, John Schmitz, Torsten Schneider, Stefan Scholl, Rainer Scholz, Juergen Schroeder, Larry Schwimmer, Randy Scott, Bart Sears, -Karl-Olav Serrander, Ozge Sevinc, Doug Sewell, Chung-chieh Shan, -Philip Shearer, Jungshik Shin, Sergey Shkonda, Andreas Siegert, -Andrey Simonenko, Mark Smith, Toomas Soome, Steve Spearman, Glenn Spell, -Helmut Springer, Cliff Stanford, Steve Starck, Jason Steiner, Ralf Stephan, -Michael Stenns, Helmrich Streitmatter, Hans Werner Strube, Dieter Stueken, -Ed Sznyter, Lech Szychowski, Dean Takemori, Darrell Tangman, Derek Terveer, -Carsten Theis, Julian Thompson, David Tiller, Andry Timonin, +Karl-Olav Serrander, Francisco Javier Serrador, Ozge Sevinc, Doug Sewell, +Chung-chieh Shan, Philip Shearer, Jungshik Shin, Sergey Shkonda, +Andreas Siegert, Andrey Simonenko, Mark Smith, Toomas Soome, Steve Spearman, +Glenn Spell, Helmut Springer, Cliff Stanford, Steve Starck, Jason Steiner, +Ralf Stephan, Michael Stenns, Helmrich Streitmatter, Hans Werner Strube, +Dieter Stueken, Ed Sznyter, Lech Szychowski, Dean Takemori, Darrell Tangman, +Derek Terveer, Carsten Theis, Julian Thompson, David Tiller, Andry Timonin, Elmar W. Tischhauser, Mark Tomlin, Mark Tomlinson, Michael Traub, Martin Treusch von Buttlar, Mark Trumbull, Alex Vasylenko, Michael Velten, Adri Verhoef, Paul Vickers, Corinna Vinschen, Mingye Wang, Oliver B. Warzecha, diff -Nurp '--exclude=.bzr*' tin-2.4.2/doc/INSTALL tin-2.4.3/doc/INSTALL --- tin-2.4.2/doc/INSTALL 2017-08-10 09:34:30.000000000 +0200 +++ tin-2.4.3/doc/INSTALL 2018-11-22 16:38:04.380558629 +0100 @@ -261,7 +261,7 @@ Can be overridden by setting the environ Bypass a bug in some broken NNTPservers which need an extra GROUP command before accepting a LISTGROUP command. This can be also used to bypass the bug in some servers (i.e. DeleGate, SurgeNews) where LISTGROUP doesn't -select the group and thus subseqent cmds. fail. +select the group and thus subsequent cmds. fail. --enable-xhdr-xref (default: on) If disabled, don't allow using XHDR XREF if XOVER doesn't work to mark @@ -517,9 +517,9 @@ me know the problems by sending me a bug within tin). See doc/reading-mail.txt for further information. --enable-cancel-locks (default: off) -Turn on Cancel-Locks. This feature requires the client to know the -Message-ID of the posting, so if your server does not offer server side -purposed IDs you have to mess around with EVIL_INSIDE +Turn on Cancel-Locks (RFC 8315). This feature requires the client to know +the Message-ID of the posting, so if your server does not offer server side +purposed IDs you have to mess around with EVIL_INSIDE. --enable-heapsort (default: on) Enable heapsort(3) as alternative to qsort(3). In large groups with a long @@ -657,9 +657,10 @@ allow additional toplevel domains (GNKSA EVIL_INSIDE let tin generate Message-IDs -FOLLOW_USEFOR_DRAFT +ALLOW_FWS_IN_NEWSGROUPLIST issue a warning instead of an error-message if Newsgroups: or Followup-To:-header contains spaces, newlines or tabs. +See RFC 5536 3.1.4. and RFC 5536 3.2.6. Compiled & installed diff -Nurp '--exclude=.bzr*' tin-2.4.2/doc/TODO tin-2.4.3/doc/TODO --- tin-2.4.2/doc/TODO 2017-12-22 09:37:04.000000000 +0100 +++ tin-2.4.3/doc/TODO 2018-12-06 09:52:21.985271058 +0100 @@ -114,6 +114,9 @@ o mailers other than sendmail (f.e. elm New features ------------ +o allow per server cache_overview_files setting via serverrc. + [20180215 Urs Janssen ] + o implement SAVE_APPEND_FILE_ALL ('A') and SAVE_OVERWRITE_ALL ('O') keys which just ask once if file(s) already exist (open_save_filename()). [20170811 Urs Janssen ] @@ -124,8 +127,7 @@ o add second pipe command when piping m sense). [20160412 Urs Janssen ] -o allow abort piping multiple articles, ESC/'z' just aborts the current - one +o allow abort piping multiple articles, ESC/'z' just aborts the current one [20160409 Urs Janssen ] o add per scope getart_limit via attributes @@ -137,11 +139,11 @@ o add support for %A (Address), %C (Fir [20130925 Urs Janssen ] o add a key to "drop" pending data from the server (either by - disconnet/reconnect (fast but reconnect may fail due to rate limit or ...) + disconnect/reconnect (fast but reconnect may fail due to rate limit or ...) or via calling drain_buffer() (might be slow if there is much pending data)) so one doesn't have to quit and restart tin if the client/server - communication get's desynced (i.e by reading an article which has a non - dotstuffed lone '.' in it or the like) + communication gets desynced (i.e by reading an article which has a non + dot-stuffed lone '.' in it or the like) [20130615 Urs Janssen ] o x_body currently doesn't allow cmd. execution via ! like x_headers @@ -275,14 +277,11 @@ o add "Face:" (incompatible "X-Face:"-r o turn CA_ERROR_SPACE_IN_NEWSGROUPS, CA_ERROR_NEWLINE_IN_NEWSGROUPS, CA_ERROR_SPACE_IN_FOLLOWUP_TO, CA_ERROR_NEWLINE_IN_FOLLOWUP_TO into - CA_WARNING_s (see draft-ietf-usefor-article-06.txt 5.5) and mark them + CA_WARNING_s (see RFC 5536 3.1.4. and 3.2.6.) and mark them for removal in the future. - [define FOLLOW_USEFOR_DRAFT to turn the mentioned errors into + [define ALLOW_FWS_IN_NEWSGROUPLIST to turn the mentioned errors into warnings. 20011226 Urs Janssen ] -o check FOLLOW_USEFOR_DRAFT code against RFC 5536 - [20120221 Urs Janssen ] - o support "Suggested Minimal Digest Format" @@ -341,7 +340,7 @@ o check if server supports 'LIST MODERA leave the mailing to the server; if the group has limited distribution inform the user, ...) -o if using "-n" commandline switch you can't subscribe to newsgroups not +o if using "-n" command-line switch you can't subscribe to newsgroups not present in your newsrc - a simple check against the server (e.g. GROUP $newsgroup or if !NNTP try to stat the dir) would help. if the server understands "LIST ACTIVE grp" we could also get the group's @@ -368,7 +367,7 @@ o MIME-pgp support according to RFC 201 storing the raw-offset of each part in the article would be very helpful. o pgpverify invocation with a single key instead of '|''a''pgpverify' or a - buildin pgpverify solution. + built-in pgpverify solution. o pgp-{6,7} support @@ -437,7 +436,7 @@ o Add to the attachment menu ('V'): '%' (toggle rot13 encoding of screen content) '&' (GLOBAL_TOGGLE_COLOR) -o Add a commandline switch (-V) that prints out all values of cpp-symbols +o Add a command-line switch (-V) that prints out all values of cpp-symbols etc. [partly done, but should be cleaned up] o Reorganize tinrc into related sections for easier editing @@ -445,7 +444,7 @@ o Reorganize tinrc into related section o A system-wide tinrc configuration file (to hold some defaults). [done: /etc/tin/tinrc] A key code to reset to the system defaults. - Maybe a second file which could be used to force settings (eg + Maybe a second file which could be used to force settings (eg. inews & mailer) (tin.defaults [--with-defaults-dir] is a start) o when From: only contains "First-name Last-name" tin strips the @@ -526,7 +525,7 @@ o add config option for (external) view Filtering enhancements ---------------------- -o add xref filter to the filter-menu +o add Xref + Path filter to the filter-menu o add spamassassin interface when ever adding body filters @@ -538,6 +537,7 @@ o add command: mark all articles older/ o fix kill/hot mechanism so that it is possible to match articles on arbitrary headers + [done for Path, Dennis] o don't strip "Re: " out of the subject before applying the filter on it @@ -600,12 +600,12 @@ o ditch MAX_MSG_HEADERS (post.c) o always display (also) the servers error response string to the user, currently tin sometimes gives generic messages (e.g. when authentication - fails), but the servers response may include additional infos (like + fails), but the servers response may include additional info (like bandwidth exceeded) [20101230 Urs Janssen ] -o rewrite mini-help, remove the long strings and generate them dynamiclly - one help text for each key makes translations more easy and uniq and can +o rewrite mini-help, remove the long strings and generate them dynamically + one help text for each key makes translations more easy and unique and can use the available space on the screen much better if not running on 80 columns. [20100326 Urs Janssen ] @@ -627,16 +627,12 @@ o tinrc.confirm_choice should be writte o use read()/write() instead of fputs()/fgets() on socket -o move several (server related) files into the per-server dir - e.g.: +o move several (server related) files into the per-server dir e.g.: ${TIN_INDEX_NEWSDIR-"${TIN_HOMEDIR-"$HOME"}/.tin"}/.news${NNTPSERVER+"-$NNTPSERVER"}/ should be ${TIN_INDEX_NEWSDIR-"${TIN_HOMEDIR-"$HOME"}/.tin"}${NNTPSERVER+"/$NNTPSERVER"}/.news/ [20050807 Urs Janssen ] -o upgrade configure-script to >= autoconf-2.61 - [20050728 Urs Janssen ] - o remove untranslatable constructs like txt_prefix_* [20050413 Urs Janssen ] @@ -655,7 +651,7 @@ o read_overview() calls eat_re() which subject. the modified subject is used for batch_mode opperatios (-N/-M) which might not be what ppl. expect and eat_re() is the only function which needs the 'regex' overhead in batch_mode... (see also the note - about "Re: "strpping at "Filtering enhancements"). + about "Re: "-stripping at "Filtering enhancements"). [20050225 Urs Janssen ] o use new_nntp_command() instead of nntp_command() in the rest of the @@ -788,14 +784,14 @@ o make select/group/thread/page-level m o make mm_network_charset an "option_list" to avoid junk input or undesired (UTF-1, UTF-7, UTF-16*, UTF-32*, UCS-2, UCS-4, ...) encodings. - add configure check for the hardcoded charsets (try iconv_open(x, + add configure check for the hard coded charsets (try iconv_open(x, us-ascii) on each...) and disable those not available. (think about more network charsets (GB2312, GB18030, Shift_JIS, ISO-8859-6[-{I,E}], ISO-8859-8[-{I,E}], ISO-8859-11, VISCII, VIQR; check whether KOI8-RU is still used/valid)) [done except configure check 20010907 urs@tin.org] -o make mm_network_charset an user configurable item list +o make mm_network_charset a user configurable item list ("US-ASCII:ISO-8859-1:ISO-8859-9:ISO-8859-15:UTF-8", "US-ASCII:ISO 8859-5:KOI8-R:UTF-8", "EUC-CN:ISO-2022-CN:ISO-2022-CN-EXT:Big5:UTF-8", whatever) @@ -813,18 +809,26 @@ o add IDNA 2003 (RFC 3490ff.) and IDNA [20030917 Urs Janssen ] o add normalization - (via or + (via or or ) (done for search strings only, missing for "threading" by subject etc. pp.) [20031209 Michael Bienia ] +o rewrite ICU configure checks + [20180710 Urs Janssen ] + o check for wcsftime() and if found use it instead of strftime() (at least in page.c). [20130129 Urs Janssen ] Docs/online help ---------------- +o document the difference between + - "-D 1" (nntp dialog with likely long multilines responses skipped) + - "-vD 1" (full nntp dialog) + - "-vvD 1" (full nntp dialog plus diagnostic messages) + o the documentation of PageFollowupQuoteHeaders (^W) and PageReplyQuoteHeaders (^E) is wrong as not all headers but just those visible via news_headers_to_display (or all if raw mode is on @@ -838,14 +842,14 @@ o the online help of GroupMarkUnselArtR o document the different signals/actions (e.g. SIGUSR2 writes newsrc) [20080209 Urs Janssen ] -o exit staus documentation in the man page isn't correct, we have more +o exit status documentation in the man page isn't correct, we have more exit codes than just 0/1 (and 2 in the -Z case). [20080320 Urs Janssen ] -o review the danish, swedish, turkish, russian and kinyarwanda translations - (da.po, sv.po, tr.po, ru.po, rw.po); add/finish man-page translation(s). +o review the spanish, swedish and russian translations + (es.po, sv.po, ru.po); add/finish missing man-page translation(s). -o add installation guide (in html) +o add installation guide (in html?) o add cross-compilation hints CC="crosscc" LD="crossld" AR="crossar" RANLIB=":" MAKE="crossmake" \ @@ -871,6 +875,9 @@ Not yet classified o allow per group cancel_lock_algo setting via attributes? [20170810 Urs Janssen ] +o allow per group cache_overview_files setting via attributes? + [20180215 Urs Janssen ] + o abort HEAD/NEXT loop on 5xx responses to HEAD? (see art.c:open_art_header()) [20161011 Urs Janssen ] @@ -953,9 +960,6 @@ o the documentation suggests that novro fix the documentation or the behaviour. [20100103 Urs Janssen ] -o FOLLOW_USEFOR_DRAFT is a misnomer as RFC 5536 is released - [20091225 Urs Janssen ] - o un/subscribe_pattern() is very slow on servers with a huge active file [20091223 Urs Janssen ] @@ -981,7 +985,7 @@ o create debug output in ${TIN_HOMEDIR-"$HOME"}/.tin"}${NNTPSERVER+"/$NNTPSERVER"} instead of in $TMPDIR (as it may contain username and password, access restrictions in $TMPDIR are a bad idea as other users - need to be able to overwrite the file) + need to be able to overwrite the file (multi user system)). [20080211 Urs Janssen ] o -M/-N report is mailed to userid, should we use tinrc.mail_address @@ -1003,7 +1007,7 @@ o rename prompt_followupto (to prompt_e "Followup-To & Summary"; "Followup-To & Keywords"; "Summary & Keywords"; "Followup-To, Summary & Keywords"} or make it a user-definable text field like news_headers_to_display? or leave this - entirely to the user - he could tweak attributes accrodingly. + entirely to the user - he could tweak attributes accordingly. [20060503 Urs Janssen ] o in several places only the latest keybinding is shown in prompts @@ -1039,7 +1043,7 @@ o what todo if in a CTE: x-uue the CD: saving and in the overview in the pager. [urs@tin.org] -o inverse_okay's Menu description isn't accurate (invers is also used for +o inverse_okay's Menu description isn't accurate (inverse is also used for URL highlighting). mono_mark* do allow "Reverse video" even if inverse_okay=FALSE. @@ -1053,10 +1057,11 @@ o what about -a cmd-line flag? is this dropped, '&' can be used for runtime color toggling. [20021106 Urs Janssen ] -o commas in real-name might cause problems in mail-replys - From: Last, First (which is illegal) leads to - To: Last, First which is last@localhost,user@accou.nt - should we try to fix things and quote the realname part? +o commas in real-name might cause problems in mail-replies + 'From: Last, First ' (which was illegal in RFC 1036 but + is no longer with RFC 5536) leads to 'To: Last, First' + which is 'last@localhost,user@example.com' should we try to fix things and + quote the realname part? [20021007 Urs Janssen ] o setting TIN_HOMEDIR to a non-existent dir gives a "Filesystem full" @@ -1074,7 +1079,7 @@ o update gettext stuff to > gettext-0.1 o and pcre2 support (new API) -o clean up included pcre stuff and update to >= pcre-8.40 +o clean up included pcre stuff and update to >= pcre-8.42 o shows up cross-postings multiple times even if read once before getting a resync/reread active/newsrc-file diff -Nurp '--exclude=.bzr*' tin-2.4.2/doc/WHATSNEW tin-2.4.3/doc/WHATSNEW --- tin-2.4.2/doc/WHATSNEW 2017-08-09 10:10:48.000000000 +0200 +++ tin-2.4.3/doc/WHATSNEW 2018-12-05 13:36:55.335471218 +0100 @@ -9,7 +9,7 @@ New features - options to color external quotes (extquote_handling, extquote_regex, col_extquote) - LookupMessage ('L') in select level if reading via NNTP - +- filter articles based on Path, see doc/filtering for details Changes ------- @@ -26,13 +26,15 @@ qsort) sigfile=!/path/to/command no longer passes the name of the current newsgroup to command. One can specify %G which will be replaced by -the name of the current newsgroup. -To match the old behaviour: 'sigfile=!/path/to/command %G'. +the name of the current newsgroup to match the old behaviour: +'sigfile=!/path/to/command %G'. --enable-cancel-locks requires libcanlock-3 (which is included, but some distros (e.g. debian) are linking against a shared lib which may be too old). +"make install" no longer strips the tin binary + Retired Features ---------------- . groupname_max_length, can now be set via user defined screen layout at diff -Nurp '--exclude=.bzr*' tin-2.4.2/doc/filtering tin-2.4.3/doc/filtering --- tin-2.4.2/doc/filtering 2017-05-03 19:47:32.000000000 +0200 +++ tin-2.4.3/doc/filtering 2018-02-18 23:46:09.348656215 +0100 @@ -166,6 +166,7 @@ refs_only=pattern References: line (e. lines=num Lines: ; num matches more than. gnksa=[<>]?NUM GNKSA parse_from() return code xref=pattern Xref: ; filter crossposts to groups matching pattern +path=pattern Path: ; filter server names matching pattern When you are using wildmat pattern-matching, patterns in ~/.tin/filter should be delimited with "*", verbatim wildcards in patterns must be @@ -223,6 +224,22 @@ code error description 405 illegal character in realname part +Path:-filter +Restrictions - this will only work if: +- reading from local spool and +-- without access to local NOV-files and OVERVIEW.FMT or +-- local NOV files provide Path data +- or reading via NNTP and +-- NOV files provide Path data or +-- server supports HDR and announces "Path" in LIST HEADERS RANGE or +-- server does not support HDR but XHDR and returns "Path" data if requested or +-- server supports XPAT and returns "Path" data if requested +Side effects: +When unsing a Path:-filer tin _may_ rebuild locally cached overview +data if cache_overview_files=ON is set to get the Path data into the +local cache of the group where the filter is active. This will may cause +more NNTP traffic once. + 6. EXAMPLES 6.1 WILDMAT EXAMPLES @@ -314,6 +331,13 @@ case=1 score=kill from=@ac\.example\s\(John\sSmith\)$ +comment= Kill all articles which have news.example.org in +comment= in the Path: header +group=* +case=1 +score=kill +path=news\.example\.org + 7. TODO - make the time value in the filter file more human readable. diff -Nurp '--exclude=.bzr*' tin-2.4.2/doc/l10n/de/tin.1 tin-2.4.3/doc/l10n/de/tin.1 --- tin-2.4.2/doc/l10n/de/tin.1 2017-12-08 09:41:47.000000000 +0100 +++ tin-2.4.3/doc/l10n/de/tin.1 2018-12-06 10:39:35.488850171 +0100 @@ -3,7 +3,7 @@ .\" Module : tin.1 .\" Author : I. Lea, U. Janssen .\" Created : 1991-08-23 -.\" Updated : 2017-10-06 +.\" Updated : 2018-11-07 .\" Notes : use american english; still needs some work, e.g.: .\" - document authorization (.newsauth) .\" - document random organization feature @@ -14,7 +14,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH tin 1 "24. Dezember 2017" 2.4.2 "Usenet Newsreader" +.TH tin 1 "24. Dezember 2018" 2.4.3 "Usenet Newsreader" .\" .\" .SH NAME @@ -115,7 +115,7 @@ Keine Gruppenbeschreibungen und die Serv \fB\-D\fP\fI Debuggrad\fP Debuggrad angeben (1 = NNTP, 2 = Filter, 4 = newsrc, 8 = Threading, 16 = Speicher, 32 = attributes, 64 = Diverses, 128 = vorhandene Debugdateien -löschen). +löschen). Im NNTP\-Level steuert \*(rq\fB\-v\fP\*(rq die Ausführlichkeit der Ausgabe. .TP \fB\-f\fP\fI Datei\fP Benutze die angegebene newsrc\-Datei anstelle von @@ -127,7 +127,11 @@ Zugehörigen Newsserver und newsrc\-Date via NNTP gelesen wird. .TP \fB\-G\fP\fI Artikellimit\fP -Beschränkt die Anzahl der zu ladenden Artikel pro Gruppe. +Limit the number of articles/group to retrieve from the server. If +\fIarticle\-limit\fP is > 0 not more than the last \fIarticle\-limit\fP +articles/group are fetched from the server. If \fIarticle\-limit\fP is < 0 +\fBtin\fP will start fetching articles from your first unread minus absolute +value of \fIarticle\-limit\fP. Default is 0, which means no limit. .TP \fB\-h\fP Kurzübersicht der verfügbaren Kommandozeilenoptionen. @@ -144,13 +148,13 @@ abruft und \fBcache_overview_files\fP au \fB\-l\fP Get number of articles per group from the \fI${TIN_LIBDIR:\-NEWSLIBDIR}"/"${TIN_ACTIVEFILE:\-active}\fP file. If reading -via NNTP this is done with the LIST command (\fBRFC\%3977\fP ). This might +via NNTP this is done with the LIST command (\fBRFC\%3977\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}\fP file (either directly or via LIST) and then check the article count via NNTP GROUP -command (\fBRFC\%3977\fP ) \*(rq\fB\-ln\fP\*(rq. If reading via NNTP and LIST COUNTS -(\fBRFC\%6048\fP ) is available that is used instead as it gives more accurate +command (\fBRFC\%3977\fP) \*(rq\fB\-ln\fP\*(rq. If reading via NNTP and LIST COUNTS +(\fBRFC\%6048\fP) is available that is used instead as it gives more accurate article counts. .TP \fB\-m\fP\fI Verzeichnis\fP @@ -216,8 +220,9 @@ Indexdateien über einen NNTP\-Server ab abgestellt ist. .TP \fB\-v\fP -Ausführliche Ausgabe für \*(rq\fB\-c\fP\*(rq, \*(rq\fB\-M\fP\*(rq, \*(rq\fB\-N\fP\*(rq, \*(rq\fB\-S\fP\*(rq, -\&\*(rq\fB\-u\fP\*(rq und \*(rq\fB\-Z\fP\*(rq\-Optionen. +Ausführliche Ausgabe für \*(rq\fB\-D\fP\*(rq, \*(rq\fB\-c\fP\*(rq, \*(rq\fB\-M\fP\*(rq, \*(rq\fB\-N\fP\*(rq, +\&\*(rq\fB\-S\fP\*(rq, \*(rq\fB\-u\fP\*(rq und \*(rq\fB\-Z\fP\*(rq\-Optionen. Kann mehrfach verwendet +werden, um die Ausführlichkeit zu erhöhen. .TP \fB\-V\fP Versionsinformationen ausgeben. @@ -297,10 +302,10 @@ 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\fP) 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 NNTP -List Extensions (\fBRFC\%6048\fP ) and all modern servers should understand it. +directory (i.e., \fI${TIN_LIBDIR:\-NEWSLIBDIR}/subscriptions\fP) and should be +world readable. If you read news via NNTP, then your news server must +support the LIST SUBSCRIPTIONS command. It is part of the NNTP List +Extensions (\fBRFC\%6048\fP) and all modern servers should understand it. .SS ANSICHTEN \fBtin\fP hat vier unterschiedliche Arbeitsebenen: Auswahlebene, Gruppenebene, Threadebene und Artikelebene. @@ -381,13 +386,13 @@ redirected. If a thread has unread articles it is marked with \fBart_marked_unread\fP in front of the total number of articles in the thread. If there are recent articles within the thread it might be marked with \fBart_marked_recent\fP in -front of the total number of articles in the thread \- this is controlled by -the \fBrecent_time\fP option. If a thread has hot articles in it (see also +front of the total number of articles in the thread \(em this is controlled +by the \fBrecent_time\fP option. If a thread has hot articles in it (see also section "FILTERING ARTICLES") it's marked with \fBart_marked_selected\fP in front of the total number of articles in the thread. The number of lines of the first (unread) article in the thread might also be shown right before -the subject \- this is controlled by the \fBshow_info\fP option. The display can -be customized via \fBgroup_format\fP. +the subject \(em this is controlled by the \fBshow_info\fP option. The display +can be customized via \fBgroup_format\fP. .PP .\" FIXME - make this auto scale .nf @@ -544,7 +549,7 @@ Versions\-Informationen ausgeben. Gruppe 4 auswählen. .TP \fBSelectResetNewsrc '^R'\fP -Setzt die Datei \fI$(TIN_HOMEDIR:\-"$HOME"}/.newsrc\fP zurück. Dies zerstört +Setzt die Datei \fI${TIN_HOMEDIR:\-"$HOME"}/.newsrc\fP zurück. Dies zerstört alle Aufzeichnungen über gelesene Artikel, also benutze diese Funktion mit Vorsicht. .TP @@ -602,11 +607,12 @@ option. (De)aktiviere inverse Darstellung. .TP \fBLookupMessage 'L'\fP -Look up article by \*(rqMessage\-ID:\*(rq. If none of the groups listed in the -\&\*(rqNewsgroups:\*(rq\-header of the referenced article is available, just the -contents of the \*(rqNewsgroups:\*(rq\-header will be displayed in the last line. -At this level this command only works if reading via NNTP and the server -supports [X]HDR (\fBRFC\%2980\fP, \fBRFC\%3977\fP) or XPAT (\fBRFC\%2980\fP). +Artikel anhand der \*(rqMessage\-ID:\*(rq Nachschlagen. Wenn keine der in den +\&\*(rqNewsgroups:\*(rq\-Kopfzeilen des referenzierten Artikels aufgeführten Gruppen +verfügbar ist, wird in der letzten Zeile nur der Inhalt der +\&\*(rqNewsgroups:\*(rq\-Kopfzeilen angezeigt. Auf dieser Ebene funktioniert dieser +Befehl nur beim Lesen mittels NNTP und der Server muss [X]HDR (\fBRFC\%2980\fP, +\fBRFC\%3977\fP) oder XPAT (\fBRFC\%2980\fP) unterstützen. .TP \fBSelectMoveGrp 'm'\fP Move the current group within the group selection list. By entering '1' the @@ -806,9 +812,9 @@ Cycle the display of the author through tinrc variable \fBshow_author\fP. .TP \fBGroupCancel 'D'\fP -Cancel (delete) or supersede (overwrite) the current article. It must have -been posted by the same user. The cancel message can be seen in the -newsgroup 'control' or 'control.cancel'. +Löschen (cancel) oder Ersetzen (supersede) des aktuellen Artikels. Er muss +vom selben Benutzer geschrieben worden sein. Die Nachricht zum Löschen ist +in der Newsgroupe 'control' oder 'control.cancel' zu sehen. .TP \fBEditFilter 'E'\fP Filter\-Datei bearbeiten und danach anwenden. @@ -1022,9 +1028,9 @@ Cycle the display of the author through tinrc variable \fBshow_author\fP. .TP \fBThreadCancel 'D'\fP -Cancel (delete) or supersede (overwrite) the current article. It must have -been posted by the same user. The cancel message can be seen in the -newsgroup 'control' or 'control.cancel'. +Löschen (cancel) oder Ersetzen (supersede) des aktuellen Artikels. Er muss +vom selben Benutzer geschrieben worden sein. Die Nachricht zum Löschen ist +in der Newsgroupe 'control' oder 'control.cancel' zu sehen. .TP \fBEditFilter 'E'\fP Filter\-Datei bearbeiten und danach anwenden. @@ -1227,9 +1233,9 @@ Mark the rest of the current thread as r the next thread with unread articles. .TP \fBPageCancel 'D'\fP -Cancel (delete) or supersede (overwrite) the current article. It must have -been posted by the same user. The cancel message can be seen in the -newsgroup 'control' or 'control.cancel'. +Löschen (cancel) oder Ersetzen (supersede) des aktuellen Artikels. Er muss +vom selben Benutzer geschrieben worden sein. Die Nachricht zum Löschen ist +in der Newsgroupe 'control' oder 'control.cancel' zu sehen. .TP \fBPageEditArticle 'e'\fP Edit the current article. This is restricted to mailgroups and saved news. @@ -1491,8 +1497,8 @@ n.software.readers \-> n.s.readers \-> n Falls ON füge gepostete Artikel die einen neuen Thread einleiten zum Filter hinzu um eventuelle Antworten hervorzuheben. Voreinstellung ist ON. .TP -\fBFüge 'User\-Agent:'\-Header ein (advertising)\fP -Falls ON füge 'User\-Agent:'\-Header ein. Voreinstellung ist ON. +\fBFüge 'User\-Agent:'\-Kopfzeile ein (advertising)\fP +Falls ON füge 'User\-Agent:'\-Kopfzeile ein. Voreinstellung ist ON. .TP \fBÜbersp. multipart/alternative\-Teile (alternative_handling)\fP Falls ON entsorge multipart/alternative Teile des Artikels @@ -1798,8 +1804,8 @@ Default for quick (1 key) auto\-selectio \fB(default_subject_search)\fP .TP \fBZeige \-> anstatt einer Markierung (draw_arrow)\fP -Allows groups/articles to be selected by an arrow '\->' if set ON or by -an highlighted bar if set OFF. Default is OFF. +Allows groups/articles to be selected by an arrow '\->' if set ON or by a +highlighted bar if set OFF. Default is OFF. .TP \fBAufruf Ihres Editors (editor_format)\fP The format string used to create the editor start command with parameters. @@ -1858,8 +1864,8 @@ article'. \fB(info_in_last_line)\fP .\" this is missing from the Menu If ON, show current group description or article subject in the last line -(not in the pager and global menu) \- \fBToggleInfoLastLine\fP ('\fBi\fP') toggles -setting. This facility is useful as the full width of the screen is +(not in the pager and global menu) \(em \fBToggleInfoLastLine\fP ('\fBi\fP') +toggles setting. This facility is useful as the full width of the screen is available to display long subjects. Default is OFF. .TP \fBBenutze interaktives Mailprogramm (interactive_mailer)\fP @@ -2057,22 +2063,26 @@ Time in seconds to wait for a response f Setting this to 0 means no timeout. .TP \fBUnicode Normalisierungsart (normalization_form)\fP -The normalization form \fBtin\fP should use to normalize unicode input. The -possible values are: +Normalisierungsform dioe \fBtin\fP verwenden soll um die Unicode\-Eingabe zu +normalisieren. Die möglichen Werte sind: .RS +.5i .IP 0 3 \fBNone\fP: keine Normalisierung .IP 1 -\fBNFKC\fP: Compatibility Decomposition, followed by Canonical Composition +\fBNFKC\fP: Kompatibilitätszerlegung, gefolgt von kanonischer Zusammensetzung .IP 2 -\fBNFKD\fP: Compatibility Decomposition +\fBNFKD\fP: Kompatibilitätszerlegung .IP 3 -\fBNFC\fP: Canonical Decomposition, followed by Canonical Composition +\fBNFC\fP: Kanonische Zerlegung, gefolgt von kanonischer Zusammensetzung .IP 4 -\fBNFD\fP: Canonical Decomposition +\fBNFD\fP: Kanonische Zerlegung +.IP 5 +\fBNFKC_CF\fP: Kompatibilitätszerlegung, gefolgt von kanonischer +Zusammensetzung und Faltung .RE -Some normalization modes are only available if they are supported by the -library \fBtin\fP uses to do the normalization. NFC should be used if possible. +Einige Normalisierungsmodi sind nur verfügbar, wenn sie von der Bibliothek +unterstützt werden, die \fBtin\fP verwendet, um die Normalisierung +durchzuführen. Nach Möglichkeit sollte NFC verwendet werden. .TP \fBSetze Cursor auf ersten ungel. Art. (pos_first_unread)\fP If ON put cursor at first unread article in group otherwise at last @@ -2130,7 +2140,8 @@ Falls ON speichere/drucke/pipe/maile nur Artikel ausgenommen). Voreinstellung ist OFF. .TP \fBLeeres Fup'2 im Editor anzeigen (prompt_followupto)\fP -Falls ON zeige leeren Followup\-To:\-Header im Editor. Voreinstellung ist OFF. +Falls ON zeige leere Followup\-To:\-Kopfzeile im Editor. Voreinstellung ist +OFF. .TP \fBZitatzeichen (quote_chars)\fP The character used in quoting included text to article followups and mail @@ -2257,7 +2268,7 @@ and in thread listing the line count of displayed. .IP 2 \fBScore\fP, in article listing the score of an article will be displayed and -in thread listing the score of the thread will be displayed \- see also +in thread listing the score of the thread will be displayed \(em see also \fBthread_score\fP. .IP 3 \fBZeilen und Bewertung\fP, Zeilenzahl und Bewertung zusätzlich anzeigen. @@ -2395,7 +2406,7 @@ toggled in the article viewer via \fBPag \fBThreade Artikel anhand (thread_articles)\fP 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 +\fBthread_arts\fP to 0 \(en 4 in the file \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/attributes\fP. (See also "GROUP ATTRIBUTES".) The default is Both Subject and References. The choices are: .RS +.5i @@ -2782,7 +2793,7 @@ processed. A default process type can be \&\*(rq\fB\-N\fP\*(rq option) or saved (\*(rq\fB\-S\fP\*(rq 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 -\fB\%cron\fP(1) everyday while away, after which you will be mailed a report +\fB\%cron\fP(8) 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 \fBsavedir\fP directory (default is @@ -2819,12 +2830,12 @@ mark them as read) A range is simply a group of items marked using the \fBSetRange\fP (\fB'#'\fP) key. Certain \fBtin\fP commands will operate on a range if one exists rather than just the current item. A range is an expression of the form -\-, e.g. 10\-15 will highlight items 10 through 15 -on the current screen. Other than absolute numeric positions, '.' can be -used in place of the current cursor position and '$' can be used to mean the -highest number available. Currently the only commands that understand ranges -are \fBGroupMarkThdRead\fP ('\fBK\fP'), \fBMarkArtUnread\fP ('\fBz\fP') and -\fBMarkThdUnread\fP ('\fBZ\fP'). +\(en, e.g. 10\(en15 will highlight items 10 +through 15 on the current screen. Other than absolute numeric positions, '.' +can be used in place of the current cursor position and '$' can be used to +mean the highest number available. Currently the only commands that +understand ranges are \fBGroupMarkThdRead\fP ('\fBK\fP'), \fBMarkArtUnread\fP +('\fBz\fP') and \fBMarkThdUnread\fP ('\fBZ\fP'). .PP .SS "NEWSGROUP LISTEN & WILDCARDS" Several places in \fBtin\fP allow you to specify a list of newsgroups. These @@ -3025,9 +3036,10 @@ Formatanweisung stehen. Um den Score 10 Bildschirmbreite über 100 Zeichen darzustellen, lautet die Anweisung \&'\fB%10>100S\fP'. .SS "TIPPS UND TRICKS" -\fBtin\fP can be pretty much be navigated by using the four cursor keys. The -left arrow key goes up a level, the right arrow key goes down a level, the -up arrow key goes up a line and the down arrow key goes down a line. +In \fBtin\fP kann weitgehend mit den vier Cursortasten navigiert werden. Die +linke Pfeiltaste geht eine Ebene nach oben, die rechte Pfeiltaste eine Ebene +nach unten, die obere Pfeiltaste eine Zeile nach oben und die untere +Pfeiltaste eine Zeile nach unten. .PP In den folgenden Newsgruppen finden sich nützliche Informationen über Newssoftware: @@ -3146,7 +3158,7 @@ updating of the index file and will be m need to be cached. .PP As indexing might take some time you may want to run \fBtin\fP form the system -batcher \fB\%cron\fP(1) with the \*(rq\fB\-u\fP\*(rq option: +batcher \fB\%cron\fP(8) with the \*(rq\fB\-u\fP\*(rq option: .PP .RS .nf @@ -3154,8 +3166,9 @@ batcher \fB\%cron\fP(1) with the \*(rq\ .fi .RE .PP -If you are low on local disk space you should consider to manually purge -cached data for groups you are not reading anymore with something like: +Falls Sie wenig Platz auf der lokalen Festplatte haben, sollten Sie in +Betracht ziehen, zwischengespeicherte Daten für Gruppen, die Sie nicht mehr +lesen, manuell zu bereinigen: .PP .RS .nf @@ -3325,17 +3338,16 @@ Für eine ausführlich Beschreibung sieh .\" - add undocumented env-vars (if any) .TP \fBTINRC\fP -Definieren Sie diese Variable, wenn Sie Befehlszeilenoptionen angeben -möchten, mit denen \fBtin\fP gestartet werden soll, um die Eingabe zu sparen, -jedesmal wenn \fBtin\fP ausgeführt werden soll. Der Inhalt der -Umgebungsvariablen wird den angegebenen Befehlszeilenoptionen vorangestellt -bevor sie auf Gültigkeit analysiert wird um Sie manuell übersteuern zu -können. +Setzen Sie diese Variable wenn Sie Befehlszeilenoptionen angeben möchten mit +denen \fBtin\fP gestartet werden soll um die Eingabe, jedesmal wenn \fBtin\fP +ausgeführt wird, zu sparen. Der Inhalt der Umgebungsvariablen wird den +angegebenen Befehlszeilenoptionen vorangestellt \(em bevor diese auf +Gültigkeit überprüft werden \(em um Sie manuell übersteuern zu können. .TP \fBTIN_HOMEDIR\fP -Define this variable if you do not want the \fI.tin\fP directory in -\fI$HOME/\fP. E.g., if you want all \fBtin\fP's private files in \fI/tmp/.tin\fP you -would set $\fBTIN_HOMEDIR\fP to \fI/tmp\fP. +Setzen Sie diese Variable falls Sie das \fI.tin\fP Verzeichnis nicht in +\fI$HOME/\fPhaben möchten. Wenn Sie z.B. alle privaten Dateien von \fBtin\fP in +\fI/tmp/.tin\fP haben möchten, setzen Sie $\fBTIN_HOMEDIR\fP auf \fI/tmp\fP. .TP \fBTIN_INDEX_NEWSDIR\fP Define this variable if you do not want the \fI.news\fP directory in @@ -3353,31 +3365,27 @@ Define this variable if you do not want files in \fI/tmp/.save\fP you would set $\fBTIN_INDEX_SAVEDIR\fP to \fI/tmp\fP. .TP \fBTIN_LIBDIR\fP -Definieren Sie diese Variable, wenn Sie den \fBNEWSLIBDIR/active\fP\-Pfad -überschreiben wollen, der in das \fBtin\fP\-Binary einkompiliert wurde. Falls -\fBtin\fP im NNTP\-Modus läuft, hat diese Variable keine Auswirkung. Sollte -$\fBTIN_LIBDIR\fP gesetzt sein wird es $\fBTIN_ACTIVEFILE\fP vorangestellt. +Define this variable if you want to override the \fBNEWSLIBDIR\fP path that was +compiled into the \fBtin\fP binary, default is \fI/usr/lib/news\fP. If \fBtin\fP is +running in NNTP mode setting this variable has no effect. .TP \fBTIN_SPOOLDIR\fP -Definieren Sie diese Variable, wenn Sie den \fBNEWSLIBDIR/active\fP\-Pfad -überschreiben wollen, der in das \fBtin\fP\-Binary einkompiliert wurde. Falls -\fBtin\fP im NNTP\-Modus läuft, hat diese Variable keine Auswirkung. Sollte -$\fBTIN_LIBDIR\fP gesetzt sein wird es $\fBTIN_ACTIVEFILE\fP vorangestellt. +Define this variable if you want to override the \fBSPOOLDIR\fP path that was +compiled into the \fBtin\fP binary, default is \fI/var/spool/news\fP. If \fBtin\fP +is running in NNTP mode setting this variable has no effect. .TP \fBTIN_NOVROOTDIR\fP -Definieren Sie diese Variable, wenn Sie den \fBNEWSLIBDIR/active\fP\-Pfad -überschreiben wollen, der in das \fBtin\fP\-Binary einkompiliert wurde. Falls -\fBtin\fP im NNTP\-Modus läuft, hat diese Variable keine Auswirkung. Sollte -$\fBTIN_LIBDIR\fP gesetzt sein wird es $\fBTIN_ACTIVEFILE\fP vorangestellt. +Define this variable if you want to override the \fBNOVROOTDIR\fP path that was +compiled into the \fBtin\fP binary, default is \fBSPOOLDIR\fP (see above). If +\fBtin\fP is running in NNTP mode setting this variable has no effect. .TP \fBTIN_NOVFILENAME\fP -Definieren Sie diese Variable, wenn Sie den \fBNEWSLIBDIR/active\fP\-Pfad -überschreiben wollen, der in das \fBtin\fP\-Binary einkompiliert wurde. Falls -\fBtin\fP im NNTP\-Modus läuft, hat diese Variable keine Auswirkung. Sollte -$\fBTIN_LIBDIR\fP gesetzt sein wird es $\fBTIN_ACTIVEFILE\fP vorangestellt. +Define this variable if you want to override the \fBOVERVIEW_FILE\fP filename +that was compiled into the \fBtin\fP binary, default is \fI.overview\fP. If \fBtin\fP +is running in NNTP mode setting this variable has no effect. .TP \fBTIN_ACTIVEFILE\fP -Definieren Sie diese Variable, wenn Sie den \fBNEWSLIBDIR/active\fP\-Pfad +Setzen Sie diese Variable, wenn Sie den \fBNEWSLIBDIR/active\fP\-Pfad überschreiben wollen, der in das \fBtin\fP\-Binary einkompiliert wurde. Falls \fBtin\fP im NNTP\-Modus läuft, hat diese Variable keine Auswirkung. Sollte $\fBTIN_LIBDIR\fP gesetzt sein wird es $\fBTIN_ACTIVEFILE\fP vorangestellt. @@ -3439,13 +3447,13 @@ DomainOS spezifisch, wie $\fBORGANISATIO (siehe oben). .TP \fBREPLYTO\fP -Set the article header field \*(rqReply\-To:\*(rq to the return address specified -by the variable. This is useful if you wish to receive replies at a -different address. +Setzt die \*(rqReply\-To:\*(rq\-Kopfzeile auf die in der Variable angegebene +Rücksendeadresse. Dies ist nützlich, wenn Sie Antworten an eine andere +Adresse erhalten möchten. .TP \fBNAME\fP -Overrides the full name given in the gecos\-files in \fI/etc/passwd\fP, see also -\fBmail_address\fP. +Überschreibt den vollständigen Namen, der im Geos\-Feld in \fI/etc/passwd\fP +angegeben ist, siehe auch \fBmail_address\fP. .TP \fBREALNAME\fP Same as $\fBNAME\fP. @@ -3636,10 +3644,11 @@ Speichern der \fI${TIN_HOMEDIR:\-"$HOME" .\" .\" Falls \fBtin\fP im Debug\-Modus (\*(rq\fB\-D n\fP\*(rq) gestartet wird, werden in -\fB$TMPDIR\fP weltlesbare Dateien erzeugt, welche das NNTP\-Passwort des -Benutzers im Klartext enthalten können. Auf Multiuser\-Systemen sollte daher -$TMPDIR auf einen sicheren Speicherort gesetzt werden, bevor \fBtin\fP im -Debug\-Modus gestartet wird (z. B. TMPDIR=$HOME tin \-D 1). +\fB$TMPDIR\fP für alle Benutzer lesbare Dateien erzeugt, welche das +NNTP\-Passwort des aktuellen Benutzers im Klartext enthalten können. Auf +Multiuser\-Systemen sollte daher $TMPDIR auf einen sicheren Speicherort +gesetzt werden, bevor \fBtin\fP im Debug\-Modus gestartet wird +(z. B. TMPDIR=$HOME tin \-D 1). .SH "KONFORM ZU" .\" - RFC\%2045, RFC\%2047, RFC\%2231, RFC\%2980, RFC\%3977, RFC\%4155 .\" RFC\%4643, RFC\%5322, RFC\%5536, RFC\%5537, RFC\%6048 or whatever @@ -3670,8 +3679,8 @@ überprüfen Sie bitte, ob die aktuellst falls nicht, bitte erst aktualisieren! Sehen Sie sich die doc/TODO\-Datei für bekannte Fehler an. Wenn Sie immer noch meinen einen Fehler gefunden zu haben benutzen Sie bitte die Funktion \fBBugReport\fP ('\fBR\fP') und schreiben -auf Englisch. Bitte fügen Sie Ihrem Bug\-Report KEINE Core\-Datei bei \- außer -wir haben diese anfordert. +auf Englisch. Bitte fügen Sie Ihrem Bug\-Report KEINE Core\-Datei bei \(em +außer wir haben diese anfordert. .SH GESCHICHTE \fBtin\fP basiert auf \fB\%tass\fP(1), einem Newsreader der von Rich Skrenta entwickelt und dessen Code im März 1991 von ihm in alt.sources @@ -3726,7 +3735,7 @@ Urs Janßen Erika Mustermann .\" .SH "SIEHE AUCH" -\fB\%cron\fP(1), \fB\%elm\fP(1), \fB\%emacs\fP(1), \fB\%gpg\fP(1), \fB\%inews\fP(1), +\fB\%cron\fP(8), \fB\%elm\fP(1), \fB\%emacs\fP(1), \fB\%gpg\fP(1), \fB\%inews\fP(1), \fB\%ispell\fP(1), \fB\%lp\fP(1), \fB\%lpr\fP(1), \fB\%metamail\fP(1), \fB\%noffle\fP(1), \fB\%perl\fP(1), \fB\%perlre\fP(1), \fB\%pgp\fP(1), \fB\%rn\fP(1), \fB\%sendmail\fP(1), \fB\%shar\fP(1), \fB\%slrnface\fP(1), \fB\%tass\fP(1), \fB\%unshar\fP(1), diff -Nurp '--exclude=.bzr*' tin-2.4.2/doc/l10n/de/tin.5 tin-2.4.3/doc/l10n/de/tin.5 --- tin-2.4.2/doc/l10n/de/tin.5 2017-12-08 09:41:47.000000000 +0100 +++ tin-2.4.3/doc/l10n/de/tin.5 2018-12-06 10:39:36.192878824 +0100 @@ -2,7 +2,7 @@ .\" Module : tin.5 .\" Author : U. Janssen .\" Created : 2000-07-10 -.\" Updated : 2017-10-06 +.\" Updated : 2018-11-07 .\" Notes : needs a some work .\" .\" @@ -11,7 +11,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH tin 5 "24. Dezember 2017" 2.4.2 "Usenet Newsreader" +.TH tin 5 "24. Dezember 2018" 2.4.3 "Usenet Newsreader" .SH NAME tin, rtin \- zugehörige Dateien @@ -55,24 +55,26 @@ Zeilenenden ('\en' aka LF) haben. \fI/etc/mail/mailcap\fP .sp .RS -\fB\%mailcap\fP(5) files as defined in \fBRFC\%1524\fP. The mailcap files are -read by \fB\%tin\fP(1) to determine how to display non\-text messages at the -local site. Any line that starts with "#" is a comment. Blank lines are -ignored. Otherwise, each line defines a single mailcap entry for a single -content type. Long lines may be continued by ending them with a backslash -character, "\e". -.sp -Each individual mailcap entry consists of a content\-type specification, a -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 \*(rqContent\-Type:\*(rq 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 -The "command" field is any UNIX command and is used to specify the -interpreter for the given type of message. It will be passed to the shell -via the \fB\%system\fP(3) facility. +\fB\%mailcap\fP(5)\-Dateien, wie in \fBRFC\%1524\fP definiert. Die Mailcap\-Dateien +werden von \fB\%tin\fP(1) gelesen, um zu bestimmen, wie Nicht\-Text\-Nachrichten +angezeigt werden können. Jede Zeile die mit "#" beginnt ist ein +Kommentar. Leerzeilen werden ignoriert. Andernfalls definiert jede Zeile +einen einzelnen Mailcap\-Eintrag für einen Inhaltstyp. Lange Zeilen können +fortgesetzt werden, indem man sie mit einem Backslash\-Zeichen "\e" beendet. +.sp +Jeder einzelne Mailcap\-Eintrag besteht aus einer Content\-Typ\-Spezifikation, +einem Befehl zum Ausführen und (möglicherweise) einem Satz optionaler +"Flag"\-Werte. +.sp +Das Feld "Typ" ist ein beliebiger Name für einen legalen Inhaltstyp. Es ist +die Zeichenkette, die mit der \*(rqContent\-Type:\*(rq\-Kopfzeile verglichen wird, +um zu entscheiden, ob dies der Mailcap\-Eintrag ist, der der aktuellen +Nachricht entspricht. Zusätzlich kann das Feld Typ einen Subtyp oder einen +Platzhalter enthalten, der allen Subtypen entspricht. +.sp +Das Feld "command" ist ein beliebiger UNIX\-Befehl und wird verwendet, um den +Interpreter für den angegebenen Nachrichtentyp anzugeben. Es wird über die +\fB\%system\fP(3)\-Funktion an die Shell übergeben. .sp .\" .\" Two special codes can appear in the viewing command for objects of type @@ -91,7 +93,7 @@ will be replaced by the value of the nam \&\*(rqContent\-Type:\*(rq header. Finally, if the field contains "\e%", those two characters will be replaced by a single "%" character. .sp -Besides the type and command field the following "flags" are defined: +Neben dem Typ und dem Befehlsfeld sind folgende "Flags" definiert: .TP \fBcompose\fP The "compose" field may be used to specify a program that can be used to @@ -100,8 +102,8 @@ support mail composing agents that suppo of mail using external composing agents. As with the view\-command, the semantics of program execution are operating system dependent. The result of the composing program may be data that is not yet suitable for mail -transport \- that is, a Content\-Transfer\-Encoding may need to be applied to -the data. +transport \(em that is, a Content\-Transfer\-Encoding may need to be applied +to the data. .TP \fBcomposetyped\fP The "composetyped" field is similar to the "compose" field, but is to be @@ -130,7 +132,7 @@ machine architecture, or the window syst not the mailcap line applies. It specifies a program to be run to test some condition. The semantics of execution and of the value returned by the test program are operating system dependent. If the test fails, a subsequent -mailcap entry should be sought. Multiple test fields are not permitted \- +mailcap entry should be sought. Multiple test fields are not permitted \(em since a test can call a program, it can already be arbitrarily complex. .TP \fBneedsterminal\fP @@ -229,9 +231,10 @@ the default server given at compile time \fI${TIN_HOMEDIR:\-"$HOME"}/.cancelsecret\fP .sp .RS -secret to be used for cancel\-locks if \fB\%tin\fP(1) is build with support for -it. An empty secret file disables the cancel\-lock creation in that -case. This file should be readable only by the user. +Geheimwort das für cancel\-locks verwendet werden soll falls \fB\%tin\fP(1) mit +Unterstützung dafür gebaut wurde. Eine leere Datei deaktiviert in diesem +Fall die Erstellung des Cancel\-locks. Diese Datei sollte nur für den +Benutzer lesbar sein. .RE .PP @@ -686,7 +689,7 @@ Identisch mit der tinrc\-Variable gleich .TP \fBundeclared_charset\fP Assume (broken) articles without MIME charset declaration have this charset -\- default is US\-ASCII. This attribute works only on systems with working +\(em default is US\-ASCII. This attribute works only on systems with working \fB\%iconv\fP(3), others might have to compile \fB\%tin\fP(1) with \-\-disable\-mime\-strict\-charset. .PP @@ -793,8 +796,12 @@ into the same format \*(rqNewsgroups:\*( separated newsgroup list with all other information (i.e. the article counter) removed. .TP -\fBZeit\fP -time_t value when rule expires +.\" TODO: document option in detail +\fBpath\fP +Match against \*(rqPath:\*(rq line. This may not work on some servers. +.TP +\fBtime\fP +time_t Wert wann die Regel abläuft .PP .TP Beispiel: @@ -1177,7 +1184,7 @@ Falls ON füge gepostete Artikel die ein hinzu um eventuelle Antworten hervorzuheben. Voreinstellung ist ON. .TP \fBadvertising\fP -Falls ON füge 'User\-Agent:'\-Header ein. Voreinstellung ist ON. +Falls ON füge 'User\-Agent:'\-Kopfzeile ein. Voreinstellung ist ON. .TP \fBalternative_handling\fP Falls ON entsorge multipart/alternative Teile des Artikels @@ -1469,8 +1476,8 @@ Default for quick (1 key) auto\-selectio \fBdefault_subject_search\fP .TP \fBdraw_arrow\fP -Allows groups/articles to be selected by an arrow '\->' if set ON or by -an highlighted bar if set OFF. Default is OFF. +Allows groups/articles to be selected by an arrow '\->' if set ON or by a +highlighted bar if set OFF. Default is OFF. .TP \fBeditor_format\fP The format string used to create the editor start command with parameters. @@ -1545,8 +1552,8 @@ article'. .TP \fBinfo_in_last_line\fP If ON, show current group description or article subject in the last line -(not in the pager and global menu) \- \fBToggleInfoLastLine\fP ('\fBi\fP') toggles -setting. This facility is useful as the full width of the screen is +(not in the pager and global menu) \(em \fBToggleInfoLastLine\fP ('\fBi\fP') +toggles setting. This facility is useful as the full width of the screen is available to display long subjects. Default is OFF. .TP \fBinteractive_mailer\fP @@ -1745,13 +1752,16 @@ possible values are: .IP 0 3 \fBNone\fP: keine Normalisierung .IP 1 -\fBNFKC\fP: Compatibility Decomposition, followed by Canonical Composition +\fBNFKC\fP: Kompatibilitätszerlegung, gefolgt von kanonischer Zusammensetzung .IP 2 -\fBNFKD\fP: Compatibility Decomposition +\fBNFKD\fP: Kompatibilitätszerlegung .IP 3 -\fBNFC\fP: Canonical Decomposition, followed by Canonical Composition +\fBNFC\fP: Kanonische Zerlegung, gefolgt von kanonischer Zusammensetzung .IP 4 -\fBNFD\fP: Canonical Decomposition +\fBNFD\fP: Kanonische Zerlegung +.IP 5 +\fBNFKC_CF\fP: Kompatibilitätszerlegung, gefolgt von kanonischer +Zusammensetzung und Faltung .RE Some normalization modes are only available if they are supported by the library \fB\%tin\fP(1) uses to do the normalization. NFC should be used if @@ -1817,8 +1827,8 @@ Falls ON speichere/drucke/pipe/maile nur Artikel ausgenommen). Voreinstellung ist OFF. .TP \fBprompt_followupto\fP -Falls ON zeige leeren \*(rqFollowup\-To:\*(rq\-Header im Editor. Voreinstellung ist -OFF. +Falls ON zeige leere \*(rqFollowup\-To:\*(rq\-Kopfzeile im Editor. Voreinstellung +ist OFF. .TP \fBquote_chars\fP .\" TODO: document %s @@ -1965,7 +1975,7 @@ and in thread listing the line count of displayed. .IP 2 \fBScore\fP, in article listing the score of an article will be displayed and -in thread listing the score of the thread will be displayed \- see also +in thread listing the score of the thread will be displayed \(em see also \fBthread_score\fP. .IP 3 \fBZeilen und Bewertung\fP, Zeilenzahl und Bewertung zusätzlich anzeigen. @@ -1992,7 +2002,7 @@ will be randomly generated from files th directory. If the path starts with a ! the program the path points to will be executed to generate a signature. In order to pass the group name to the program, %G can be specified. This will be replaced by the name of the -current newsgroup. program. \-\-none will suppress any signature. Default is +current newsgroup. \-\-none will suppress any signature. Default is \fI${TIN_HOMEDIR:\-"$HOME"}/.Sig\fP. .TP \fBsignature_repost\fP @@ -2100,7 +2110,7 @@ Thread on Subject only 2) Thread on Refe then Subject (default) 4) Thread multipart articles on Subject. 5) Thread on Percentage Match of the Subjects It's also possible to set the threading type on a per group basis by setting the group attribute variable -\fBthread_articles\fP to 0 \- 5 in the file +\fBthread_articles\fP to 0 \(en 5 in the file \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/attributes\fP. .TP \fBthread_format\fP @@ -2302,13 +2312,13 @@ Defines the default place for some confi \fI/news/db\fP. $\fBTIN_LIBDIR\fP overrides any specified value. .TP \fBbugaddress\fP -Defines the email address to which users can send bug reports using a -built\-in function. The default points to a developers mailing list located -at tin.org. You might want to change this address to one of your local -administration if you want to deal with your lusers problems on your own. +Definiert die E\-Mail\-Adresse, an die Benutzer Fehlerberichte über eine +integrierte Funktion senden können. Die Voreinstellung zeigt auf eine +Entwickler\-Mailingliste auf tin.org. Sie können diese Adresse in eine lokale +ändern, wenn Sie die Probleme Ihrer Benutzer selbst lösen wollen. .TP \fBinewsdir\fP -Defines the directory containing of the \fB\%inews\fP(1) executable +Definiert das Verzeichnis, wleches das ausführbare \fB\%inews\fP(1) enthält. .TP \fBmm_charset\fP Default charset to be used in MIME's \*(rqContent\-Type:\*(rq @@ -2459,7 +2469,7 @@ aus drei durch Leerzeichen getrennten Fe \fBName\fP ist der Name der Newsgruppe .TP -\fBZeit\fP +\fBtime\fP Zeit wann die Gruppe erzeugt wurde, ausgedrückt als Anzahl von Sekunden seit Beginn der Epoche. .TP @@ -2521,8 +2531,8 @@ LIST OVERVIEW.FMT (\fBRFC\%3977\fP). \fI${TIN_LIBDIR:\-NEWSLIBDIR}/subscriptions\fP .sp .RS -Diese Datei enthält eine Liste von Newsgroups \- eine pro Zeile \- die der -Client abonnieren sollte, wenn der Benutzer keine +Diese Datei enthält eine Liste von Newsgroups \(em eine pro Zeile \(em die +der Client abonnieren sollte, wenn der Benutzer keine ${TIN_HOMEDIR:\-"$HOME"}/.newsrc für den Newsserver hat. \fB\%tin\fP(1) versucht die Datei nur dann zu lesen, wenn Sie direkt aus dem lokalen Spool lesen. Falls Sie Nachrichten mittels NNTP lesen, verwendet \fB\%tin\fP(1) diff -Nurp '--exclude=.bzr*' tin-2.4.2/doc/l10n/de.po tin-2.4.3/doc/l10n/de.po --- tin-2.4.2/doc/l10n/de.po 2017-12-08 09:41:43.000000000 +0100 +++ tin-2.4.3/doc/l10n/de.po 2018-12-06 10:39:27.368519630 +0100 @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: tin-man 2.4.1\n" +"Project-Id-Version: tin-man 2.4.3\n" "Report-Msgid-Bugs-To: translation@tin.org\n" -"POT-Creation-Date: 2017-12-08 09:40+0100\n" -"PO-Revision-Date: 2017-10-06 14:15+0200\n" +"POT-Creation-Date: 2018-11-19 10:43+0100\n" +"PO-Revision-Date: 2018-11-14 15:30+0100\n" "Last-Translator: Urs Janssen \n" "Language-Team: German \n" "Language: de\n" @@ -24,14 +24,14 @@ msgstr "tin" #. type: TH #: doc/tin.1:12 doc/tin.5:9 #, no-wrap -msgid "December 24th, 2017" -msgstr "24. Dezember 2017" +msgid "December 24th, 2018" +msgstr "24. Dezember 2018" #. type: TH #: doc/tin.1:12 doc/tin.5:9 #, no-wrap -msgid "2.4.2" -msgstr "2.4.2" +msgid "2.4.3" +msgstr "2.4.3" #. type: TH #: doc/tin.1:12 doc/tin.5:9 @@ -151,7 +151,7 @@ msgid "Interactive mode:" msgstr "Interaktiver-Modus:" #. type: TP -#: doc/tin.1:80 doc/tin.1:93 doc/tin.1:1099 doc/tin.1:3470 +#: doc/tin.1:80 doc/tin.1:93 doc/tin.1:1106 doc/tin.1:3479 #, no-wrap msgid "B<0>" msgstr "B<0>" @@ -162,7 +162,7 @@ msgid "Successful program execution." msgstr "Programm erfolgreich beendet." #. type: TP -#: doc/tin.1:83 doc/tin.1:96 doc/tin.1:3473 +#: doc/tin.1:83 doc/tin.1:96 doc/tin.1:3482 #, no-wrap msgid "B<1>" msgstr "B<1>" @@ -173,7 +173,7 @@ msgid "Usage, syntax, configuration file msgstr "Bedien-, Syntax-, Konfigurations- oder Netzwerk-Fehler." #. type: TP -#: doc/tin.1:86 doc/tin.1:99 doc/tin.1:3476 +#: doc/tin.1:86 doc/tin.1:99 doc/tin.1:3485 #, no-wrap msgid "B<2>" msgstr "B<2>" @@ -300,23 +300,24 @@ msgid "B<-D>I< debug-level>" msgstr "B<-D>I< Debuggrad>" #. type: Plain text -#: doc/tin.1:133 +#: doc/tin.1:134 msgid "" "Enter debug-level (1 = NNTP, 2 = filter, 4 = newsrc, 8 = threading, 16 = " -"memory, 32 = attributes, 64 = misc, 128 = remove existing debug files)." +"memory, 32 = attributes, 64 = misc, 128 = remove existing debug files). For " +"NNTP-level ''B<-v>'' controls the verbosity of the output." msgstr "" "Debuggrad angeben (1 = NNTP, 2 = Filter, 4 = newsrc, 8 = Threading, 16 = " "Speicher, 32 = attributes, 64 = Diverses, 128 = vorhandene Debugdateien " -"löschen)." +"löschen). Im NNTP-Level steuert ''B<-v>'' die Ausführlichkeit der Ausgabe." #. type: TP -#: doc/tin.1:133 +#: doc/tin.1:134 #, no-wrap msgid "B<-f>I< file>" msgstr "B<-f>I< Datei>" #. type: Plain text -#: doc/tin.1:137 +#: doc/tin.1:138 msgid "" "Use the specified file of subscribed to newsgroups in place of I<" "${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>." @@ -325,13 +326,13 @@ msgstr "" "\"}/.newsrc>." #. type: TP -#: doc/tin.1:137 +#: doc/tin.1:138 #, no-wrap msgid "B<-g>I< server>" msgstr "B<-g>I< Server>" #. type: Plain text -#: doc/tin.1:142 +#: doc/tin.1:143 msgid "" "Use the server and newsrc specified in I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/" "newsrctable>. Only available when reading via NNTP." @@ -340,48 +341,53 @@ msgstr "" "newsrctable> benutzen. Nur verfügbar, wenn via NNTP gelesen wird." #. type: TP -#: doc/tin.1:142 +#: doc/tin.1:143 #, no-wrap msgid "B<-G>I< article-limit>" msgstr "B<-G>I< Artikellimit>" #. type: Plain text -#: doc/tin.1:145 -msgid "Limit the number of articles/group to retrieve from the server." -msgstr "Beschränkt die Anzahl der zu ladenden Artikel pro Gruppe." +#: doc/tin.1:151 +msgid "" +"Limit the number of articles/group to retrieve from the server. If " +"I is E 0 not more than the last I articles/" +"group are fetched from the server. If I is E 0 B " +"will start fetching articles from your first unread minus absolute value of " +"I. Default is 0, which means no limit." +msgstr "" #. type: TP -#: doc/tin.1:145 +#: doc/tin.1:151 #, no-wrap msgid "B<-h>" msgstr "B<-h>" #. type: Plain text -#: doc/tin.1:148 +#: doc/tin.1:154 msgid "Help listing all command-line options." msgstr "Kurzübersicht der verfügbaren Kommandozeilenoptionen." #. type: TP -#: doc/tin.1:148 +#: doc/tin.1:154 #, no-wrap msgid "B<-H>" msgstr "B<-H>" #. type: Plain text -#: doc/tin.1:152 +#: doc/tin.1:158 msgid "" "Brief introduction to B that is also shown the first time it is started." msgstr "" "Kurzeinführung in B welche auch beim allerersten Start ausgegeben wird." #. type: TP -#: doc/tin.1:152 +#: doc/tin.1:158 #, no-wrap msgid "B<-I>I< dir>" msgstr "B<-I>I< Verzeichnis>" #. type: Plain text -#: doc/tin.1:158 +#: doc/tin.1:164 msgid "" "Directory in which to store newsgroup index files. Default is I<" "${TIN_INDEX_NEWSDIR:-\"${TIN_HOMEDIR:-\"$HOME\"}/.tin\"}/.news>. This " @@ -394,45 +400,45 @@ msgstr "" "abruft und B ausgeschaltet ist." #. type: TP -#: doc/tin.1:158 +#: doc/tin.1:164 #, no-wrap msgid "B<-l>" msgstr "B<-l>" #. type: Plain text -#: doc/tin.1:170 +#: doc/tin.1:176 msgid "" "Get number of articles per group from the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/" "\"${TIN_ACTIVEFILE:-active}> file. If reading via NNTP this is done with the " -"LIST command (B ). This might result in incorrect article counts " +"LIST command (B). This might result in incorrect article counts " "but is usually faster than the default which is to read the I<${TIN_LIBDIR:-" "NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}> file (either directly or via " "LIST) and then check the article count via NNTP GROUP command (B ) ''B<-ln>''. If reading via NNTP and LIST COUNTS (B ) is " +"%3977>) ''B<-ln>''. If reading via NNTP and LIST COUNTS (B) is " "available that is used instead as it gives more accurate article counts." msgstr "" #. type: TP -#: doc/tin.1:170 +#: doc/tin.1:176 #, no-wrap msgid "B<-m>I< dir>" msgstr "B<-m>I< Verzeichnis>" #. type: Plain text -#: doc/tin.1:173 +#: doc/tin.1:179 msgid "Mailbox directory to use. Default is I<${TIN_HOMEDIR:-\"$HOME\"}/Mail>." msgstr "" "Zu benutzendes Mailbox-Verzeichnis. Voreinstellung ist I<${TIN_HOMEDIR:-" "\"$HOME\"}/Mail>." #. type: TP -#: doc/tin.1:173 +#: doc/tin.1:179 #, no-wrap msgid "B<-M>I< user>" msgstr "B<-M>I< Benutzer>" #. type: Plain text -#: doc/tin.1:177 +#: doc/tin.1:183 msgid "" "Mail unread articles to specified user for later reading. For more " "information read section \"AUTOMATIC MAILING AND SAVING NEW NEWS\"." @@ -442,13 +448,13 @@ msgstr "" "UND SPEICHERN VON UNGELESENEN ARTIKELN\"." #. type: TP -#: doc/tin.1:177 +#: doc/tin.1:183 #, no-wrap msgid "B<-n>" msgstr "B<-n>" #. type: Plain text -#: doc/tin.1:184 +#: doc/tin.1:190 msgid "" "Only load groups from the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-" "active}> file that are subscribed to in the user's I<${TIN_HOMEDIR:-\"$HOME" @@ -458,13 +464,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:184 +#: doc/tin.1:190 #, no-wrap msgid "B<-N>" msgstr "B<-N>" #. type: Plain text -#: doc/tin.1:188 +#: doc/tin.1:194 msgid "" "Mail unread articles to yourself for later reading. For more information " "read section \"AUTOMATIC MAILING AND SAVING NEW NEWS\"." @@ -474,13 +480,13 @@ msgstr "" "SPEICHERN VON UNGELESENEN ARTIKELN\"." #. type: TP -#: doc/tin.1:188 +#: doc/tin.1:194 #, no-wrap msgid "B<-o>" msgstr "B<-o>" #. type: Plain text -#: doc/tin.1:192 +#: doc/tin.1:198 msgid "" "Quick post all postponed articles and exit. In order for this to be really " "quick, it should be used with ''B<-n>'' if possible." @@ -489,13 +495,13 @@ msgstr "" "wieder beenden. Nach Möglichkeit mit ''B<-n>'' kombinieren." #. type: TP -#: doc/tin.1:192 +#: doc/tin.1:198 #, no-wrap msgid "B<-p>I< port>" msgstr "B<-p>I< Port>" #. type: Plain text -#: doc/tin.1:197 +#: doc/tin.1:203 msgid "" "Port to use if reading via NNTP (default is 119). This also overrides the " "environment variable $B if set. Only available when reading via " @@ -506,13 +512,13 @@ msgstr "" "via NNTP gelesen wird." #. type: TP -#: doc/tin.1:197 +#: doc/tin.1:203 #, no-wrap msgid "B<-q>" msgstr "B<-q>" #. type: Plain text -#: doc/tin.1:200 +#: doc/tin.1:206 msgid "" "Don't check for new newsgroups and skip loading the servers message of the " "day." @@ -521,13 +527,13 @@ msgstr "" "Tages nicht laden." #. type: TP -#: doc/tin.1:200 +#: doc/tin.1:206 #, no-wrap msgid "B<-Q>" msgstr "B<-Q>" #. type: Plain text -#: doc/tin.1:204 +#: doc/tin.1:210 msgid "" "Quick start. Start B as quickly as possible. Currently this is " "equivalent to ''B<-nqd>''." @@ -536,13 +542,13 @@ msgstr "" "diese Option ''B<-nqd>''." #. type: TP -#: doc/tin.1:204 +#: doc/tin.1:210 #, no-wrap msgid "B<-r>" msgstr "B<-r>" #. type: Plain text -#: doc/tin.1:209 +#: doc/tin.1:215 msgid "" "Read news remotely from the default NNTP server specified in the environment " "variable $B or contained in the file I." @@ -552,24 +558,24 @@ msgstr "" "nntpserver> enthalten ist lesen." #. type: TP -#: doc/tin.1:209 +#: doc/tin.1:215 #, no-wrap msgid "B<-R>" msgstr "B<-R>" #. type: Plain text -#: doc/tin.1:212 +#: doc/tin.1:218 msgid "Read news saved by the ''B<-S>'' option." msgstr "Lese mittels ''B<-S>'' gespeicherte Artikel." #. type: TP -#: doc/tin.1:212 +#: doc/tin.1:218 #, no-wrap msgid "B<-s>I< dir>" msgstr "B<-s>I< Verzeichnis>" #. type: Plain text -#: doc/tin.1:216 +#: doc/tin.1:222 msgid "" "Save/read articles to/in directory. Default is I<${TIN_HOMEDIR:-\"$HOME\"}/" "News>." @@ -578,13 +584,13 @@ msgstr "" "\"$HOME\"}/News>." #. type: TP -#: doc/tin.1:216 +#: doc/tin.1:222 #, no-wrap msgid "B<-S>" msgstr "B<-S>" #. type: Plain text -#: doc/tin.1:220 +#: doc/tin.1:226 msgid "" "Save unread articles for later reading by the ''B<-R>'' option. For more " "information read section \"AUTOMATIC MAILING AND SAVING NEW NEWS\"." @@ -594,13 +600,13 @@ msgstr "" "SPEICHERN VON UNGELESENEN ARTIKELN\"." #. type: TP -#: doc/tin.1:220 +#: doc/tin.1:226 #, no-wrap msgid "B<-u>" msgstr "B<-u>" #. type: Plain text -#: doc/tin.1:226 +#: doc/tin.1:232 msgid "" "Create/update index files for every group in I<${TIN_HOMEDIR:-\"$HOME\"}/." "newsrc> or file specified by the ''B<-f>'' option. This option is disabled " @@ -613,39 +619,41 @@ msgstr "" "NNTP-Server abruft und B abgestellt ist." #. type: TP -#: doc/tin.1:226 +#: doc/tin.1:232 #, no-wrap msgid "B<-v>" msgstr "B<-v>" #. type: Plain text -#: doc/tin.1:230 +#: doc/tin.1:237 msgid "" -"Verbose mode for ''B<-c>'', ''B<-M>'', ''B<-N>'', ''B<-S>'', \\&''B<-u>'' " -"and ''B<-Z>'' options." +"Verbose mode for ''B<-D>'', ''B<-c>'', ''B<-M>'', ''B<-N>'', \\&''B<-S>'', " +"''B<-u>'' and ''B<-Z>'' options. Can be used multiple times to increase " +"verbosity." msgstr "" -"Ausführliche Ausgabe für ''B<-c>'', ''B<-M>'', ''B<-N>'', ''B<-S>'', \\&''B<-" -"u>'' und ''B<-Z>''-Optionen." +"Ausführliche Ausgabe für ''B<-D>'', ''B<-c>'', ''B<-M>'', ''B<-N>'', \\&''B<-" +"S>'', ''B<-u>'' und ''B<-Z>''-Optionen. Kann mehrfach verwendet werden, um " +"die Ausführlichkeit zu erhöhen." #. type: TP -#: doc/tin.1:230 +#: doc/tin.1:237 #, no-wrap msgid "B<-V>" msgstr "B<-V>" #. type: Plain text -#: doc/tin.1:233 +#: doc/tin.1:240 msgid "Print version and date information." msgstr "Versionsinformationen ausgeben." #. type: TP -#: doc/tin.1:233 +#: doc/tin.1:240 #, no-wrap msgid "B<-w>" msgstr "B<-w>" #. type: Plain text -#: doc/tin.1:238 +#: doc/tin.1:245 msgid "" "Quick mode to post an article and then exit. This option implies \\&''B<-" "d>''. In order for this to be really quick, it should be used with ''B<-n>'' " @@ -655,25 +663,25 @@ msgstr "" "\\&''B<-d>''. Nach Möglichkeit mit ''B<-n>'' kombinieren." #. type: TP -#: doc/tin.1:238 +#: doc/tin.1:245 #, no-wrap msgid "B<-x>" msgstr "B<-x>" #. type: Plain text -#: doc/tin.1:241 +#: doc/tin.1:248 msgid "No-posting mode. You cannot post articles if you use this option." msgstr "" "Sie können keine Artikel veröffentlichen, wenn Sie diese Option verwenden." #. type: TP -#: doc/tin.1:241 +#: doc/tin.1:248 #, no-wrap msgid "B<-X>" msgstr "B<-X>" #. type: Plain text -#: doc/tin.1:246 +#: doc/tin.1:253 msgid "" "No overwrite mode. I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> and files in I<" "${TIN_HOMEDIR:-\"$HOME\"}/.tin> will not be overwritten but may be created " @@ -681,13 +689,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:246 +#: doc/tin.1:253 #, no-wrap msgid "B<-z>" msgstr "B<-z>" #. type: Plain text -#: doc/tin.1:251 +#: doc/tin.1:258 msgid "" "Only start B if there is any new/unread news. If there is news B " "will position cursor at first group with unread news. Useful for putting in " @@ -698,13 +706,13 @@ msgstr "" "positioniert. Nützlich um B in login-Dateien aufzurufen." #. type: TP -#: doc/tin.1:251 +#: doc/tin.1:258 #, no-wrap msgid "B<-Z>" msgstr "B<-Z>" #. type: Plain text -#: doc/tin.1:257 +#: doc/tin.1:264 msgid "" "Check if there is any new/unread news and exit with appropriate status. If " "\\&''B<-v>'' option is specified the number of unread articles in each group " @@ -719,7 +727,7 @@ msgstr "" "Skripten." #. type: Plain text -#: doc/tin.1:263 +#: doc/tin.1:270 msgid "" "B can also dynamically change its options by the B ('B') " "command. Any changes are written to I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/tinrc>. " @@ -728,7 +736,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:268 +#: doc/tin.1:275 msgid "" "A list of groups can be specified after the other command-line options. This " "can be useful if you wish to yank in or subscribe to a hand-picked subset of " @@ -742,7 +750,7 @@ msgstr "" "versteht." #. type: Plain text -#: doc/tin.1:273 +#: doc/tin.1:280 msgid "" "If you specify a single group-name, or a wildcard that matches a single " "group, then you will automatically enter that group. Otherwise the normal " @@ -755,7 +763,7 @@ msgstr "" "passenden zusätzlichen Gruppen." #. type: Plain text -#: doc/tin.1:277 +#: doc/tin.1:284 msgid "" "With the ''B<-w>'' flag a given group-name is used as default group to post " "to. If more than one group or a wildcard is specified only the first group " @@ -766,7 +774,7 @@ msgstr "" "wird nur die erste Gruppe bzw. die erste Gruppe verwendet, die übereinstimmt." #. type: Plain text -#: doc/tin.1:284 +#: doc/tin.1:291 msgid "" "Once you use B ('B') to yank in all active groups, or " "B ('B') to toggle the read/unread status, then " @@ -776,7 +784,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:289 +#: doc/tin.1:296 msgid "" "NB: With the ''B<-n>'' flag, only unsubscribed groups in the I<" "${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> file (or the newsrc-file given by the " @@ -785,7 +793,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:294 +#: doc/tin.1:301 msgid "" "Command-line options have higher priority than attributes and tinrc " "options. Thus, command-line option takes precedence over configured values." @@ -794,19 +802,19 @@ msgstr "" "Optionen und übersteuern daher die konfigurierten Werte." #. type: SH -#: doc/tin.1:294 +#: doc/tin.1:301 #, no-wrap msgid "USAGE" msgstr "GEBRAUCH" #. type: SS -#: doc/tin.1:297 +#: doc/tin.1:304 #, no-wrap msgid "NEWS ADMINISTRATION" msgstr "" #. type: Plain text -#: doc/tin.1:301 +#: doc/tin.1:308 msgid "" "Maintaining Netnews on large networks of machines can be a pretty time " "consuming job as I discovered when I was given the job of maintaining our " @@ -814,25 +822,25 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:311 +#: doc/tin.1:318 msgid "" "A user starting B 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., I<" -"${TIN_LIBDIR:-NEWSLIBDIR}/subscriptions>) 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 NNTP List Extensions (B ) and all modern servers should understand it." +"${TIN_LIBDIR:-NEWSLIBDIR}/subscriptions>) and should be world readable. If " +"you read news via NNTP, then your news server must support the LIST " +"SUBSCRIPTIONS command. It is part of the NNTP List Extensions (B) and all modern servers should understand it." msgstr "" #. type: SS -#: doc/tin.1:311 +#: doc/tin.1:318 #, no-wrap msgid "SCREEN FORMAT" msgstr "ANSICHTEN" #. type: Plain text -#: doc/tin.1:314 +#: doc/tin.1:321 msgid "" "B has four separate levels of operation: Selection level, Group level, " "Thread level and Article level." @@ -841,7 +849,7 @@ msgstr "" "Threadebene und Artikelebene." #. type: Plain text -#: doc/tin.1:320 +#: doc/tin.1:327 msgid "" "At the Selection level the title displays (the name of the news server and) " "the number of subscribed groups (containing new unread articles). The " @@ -856,7 +864,7 @@ msgstr "" "kann mittels B angepasst werden." #. type: Plain text -#: doc/tin.1:328 +#: doc/tin.1:335 #, no-wrap msgid "" "-EM 1 2 comp.security.announce Announcements from the CERT abou\n" @@ -872,19 +880,19 @@ msgstr "" " X 5 124 news.software.readers Discussion of software used to r\n" #. type: Plain text -#: doc/tin.1:331 +#: doc/tin.1:338 msgid "" "There may also be a character prefixing the line. An explanation follows:" msgstr "Eventuell steht am Anfang der Zeile noch eines der folgende Zeichen:" #. type: TP -#: doc/tin.1:331 +#: doc/tin.1:338 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:336 +#: doc/tin.1:343 msgid "" "This group is unsubscribed. To see only your subscribed groups use the " "B ('B') or B ('B') toggle " @@ -895,13 +903,13 @@ msgstr "" "Umschalttaste benutzt werden." #. type: TP -#: doc/tin.1:336 +#: doc/tin.1:343 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:341 +#: doc/tin.1:348 msgid "" "This is a moderated group. Any posts you make will have to be approved by " "the group administrator before it will be made public. B will ask for " @@ -912,13 +920,13 @@ msgstr "" "Posten in eine moderierte Gruppe nach einer Bestätigung." #. type: TP -#: doc/tin.1:341 +#: doc/tin.1:348 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:350 +#: doc/tin.1:357 msgid "" "This is a new newsgroup which has been created since you last used B. " "New newsgroups are not subscribed to by default (However, see the " @@ -937,13 +945,13 @@ msgstr "" "Gruppen einblenden, um sie in einer späteren Sitzung zu finden." #. type: TP -#: doc/tin.1:350 +#: doc/tin.1:357 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:355 +#: doc/tin.1:362 msgid "" "This group no longer exists. If you no longer wish to see this group then " "unsubscribe from it in the normal way. This flag will only appear if you " @@ -955,13 +963,13 @@ msgstr "" "haben." #. type: TP -#: doc/tin.1:355 +#: doc/tin.1:362 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:359 +#: doc/tin.1:366 msgid "" "You may no longer make posts to this group. Often a group will be superseded " "by a more appropriately named one." @@ -970,13 +978,13 @@ msgstr "" "Gruppe durch eine mit einem passenderen Namen ersetzt." #. type: TP -#: doc/tin.1:359 +#: doc/tin.1:366 #, no-wrap msgid "B<=>" msgstr "B<=>" #. type: Plain text -#: doc/tin.1:364 +#: doc/tin.1:371 msgid "" "This group has been renamed and you may no longer post to it. If you do, " "then you will receive an error from your news server telling you the correct " @@ -987,7 +995,7 @@ msgstr "" "Newsserver in der die Gruppe steht in die Sie posten sollten." #. type: Plain text -#: doc/tin.1:374 +#: doc/tin.1:381 msgid "" "At the Group level the title contains the name of the group, the number of " "conversation threads, the abbreviated threading method (B), " @@ -1001,13 +1009,13 @@ msgstr "" #. FIXME - make this autocenter #. type: Plain text -#: doc/tin.1:378 +#: doc/tin.1:385 #, no-wrap msgid " alt.sources (5B -50/23+ 0* 3o 0K)\n" msgstr " alt.sources (5B -50/23+ 0* 3o 0K)\n" #. type: Plain text -#: doc/tin.1:386 +#: doc/tin.1:393 msgid "" "The characters after the numbers are depending to the configuration and if " "your are in B mode or not. Some numbers could be " @@ -1018,28 +1026,28 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:397 +#: doc/tin.1:404 msgid "" "If a thread has unread articles it is marked with B in " "front of the total number of articles in the thread. If there are recent " "articles within the thread it might be marked with B in " -"front of the total number of articles in the thread - this is controlled by " -"the B option. If a thread has hot articles in it (see also " +"front of the total number of articles in the thread \\(em this is controlled " +"by the B option. If a thread has hot articles in it (see also " "section \"FILTERING ARTICLES\") it's marked with B in " "front of the total number of articles in the thread. The number of lines of " "the first (unread) article in the thread might also be shown right before " -"the subject - this is controlled by the B option. The display can " -"be customized via B." +"the subject \\(em this is controlled by the B option. The display " +"can be customized via B." msgstr "" #. type: Plain text -#: doc/tin.1:401 +#: doc/tin.1:408 #, no-wrap msgid " de.admin.net-abuse.announce (11B 13+ 1* 1o 0K) M\n" msgstr " de.admin.net-abuse.announce (11B 13+ 1* 1o 0K) M\n" #. type: Plain text -#: doc/tin.1:406 +#: doc/tin.1:413 #, no-wrap msgid "" "-E 1 + 3 108 bincancels in de.talk.sex Christopher Lueg El\n" @@ -1054,7 +1062,7 @@ msgstr "" #. FIXME - add description of fields #. type: Plain text -#: doc/tin.1:411 +#: doc/tin.1:418 msgid "" "At the Thread level the screen usually (depends on the threading method " "used) looks like this, but can be customized via B:" @@ -1064,7 +1072,7 @@ msgstr "" "angepasst werden:" #. type: Plain text -#: doc/tin.1:418 +#: doc/tin.1:425 #, no-wrap msgid "" "-E 1 [ 7] What is this funny tree in the thr Robert F. Simmig\n" @@ -1079,12 +1087,12 @@ msgstr "" #. FIXME - add description of fields #. type: Plain text -#: doc/tin.1:423 +#: doc/tin.1:430 msgid "At the Article level the page header has the following format:" msgstr "In der Artikelebene hat der Kopf der Seite folgendes Format:" #. type: Plain text -#: doc/tin.1:429 +#: doc/tin.1:436 #, no-wrap msgid "" "Sun, 28 Dec 1997 21:21:01 de.admin.news.groups Thread 20 of 86\n" @@ -1096,13 +1104,13 @@ msgstr "" "Urs Janssen Eurs@akk.orgE bei Arbeitskreis Kultur und Kommunikati\n" #. type: Plain text -#: doc/tin.1:431 +#: doc/tin.1:438 #, no-wrap msgid "article-body\n" msgstr "Artikel-Körper\n" #. type: Plain text -#: doc/tin.1:437 +#: doc/tin.1:444 msgid "" "The look of the Selection, Group and Thread level can be customized. See the " "section \"CUSTOMIZING THE SCREEN FORMAT\"." @@ -1111,13 +1119,13 @@ msgstr "" "angepasst werden. Siehe hierzu den Abschnitt \"ANSICHTEN ANPASSEN\"." #. type: SS -#: doc/tin.1:437 +#: doc/tin.1:444 #, no-wrap msgid "COMMON MOVING KEYS" msgstr "GEMEINSAME BEWEGUNGSTASTEN" #. type: Plain text -#: doc/tin.1:440 +#: doc/tin.1:447 msgid "" "This table shows the common keys used for moving around all levels within " "B." @@ -1126,13 +1134,13 @@ msgstr "" "verwendet werden." #. type: ta -#: doc/tin.1:442 +#: doc/tin.1:449 #, no-wrap msgid "\\w'Beg. of list/article 'u +\\w'ANSI/vt100 'u" msgstr "" #. type: Plain text -#: doc/tin.1:450 +#: doc/tin.1:457 #, no-wrap msgid "" "\tANSI/vt100\tOther Terminals\n" @@ -1145,13 +1153,13 @@ msgid "" msgstr "" #. type: SS -#: doc/tin.1:454 +#: doc/tin.1:461 #, no-wrap msgid "COMMON EDITING COMMANDS" msgstr "GEMEINSAME BEARBEITUNGSBEFEHLE" #. type: Plain text -#: doc/tin.1:461 +#: doc/tin.1:468 msgid "" "An B<\\%emacs>(1) style editing package allows the easy editing of input " "strings. A history list allows the easy reuse of previously entered " @@ -1165,35 +1173,35 @@ msgstr "" "Verfügung:" #. type: TP -#: doc/tin.1:462 +#: doc/tin.1:469 #, no-wrap msgid "B<^A, ^E>" msgstr "B<^A, ^E>" #. type: Plain text -#: doc/tin.1:465 +#: doc/tin.1:472 msgid "move to beginning or end of line, respectively." msgstr "An den Zeilenanfang bzw. das Zeilenende springen." #. type: TP -#: doc/tin.1:465 +#: doc/tin.1:472 #, no-wrap msgid "B<^F, ^B>" msgstr "B<^F, ^B>" #. type: Plain text -#: doc/tin.1:468 +#: doc/tin.1:475 msgid "non-destructive move forward or back one location, respectively." msgstr "" #. type: TP -#: doc/tin.1:468 +#: doc/tin.1:475 #, no-wrap msgid "B<^D>" msgstr "B<^D>" #. type: Plain text -#: doc/tin.1:472 +#: doc/tin.1:479 msgid "" "delete the character currently under the cursor, or send EOF if no " "characters in the buffer." @@ -1202,57 +1210,57 @@ msgstr "" "falls keine Zeichen im Puffer vorhanden sind." #. type: TP -#: doc/tin.1:472 +#: doc/tin.1:479 #, no-wrap msgid "B<^H, EDELE>" msgstr "B<^H, EENTFE>" #. type: Plain text -#: doc/tin.1:475 +#: doc/tin.1:482 msgid "delete character left of the cursor." msgstr "Zeichen links vom Cursor löschen." #. type: TP -#: doc/tin.1:475 +#: doc/tin.1:482 #, no-wrap msgid "B<^K>" msgstr "B<^K>" #. type: Plain text -#: doc/tin.1:478 +#: doc/tin.1:485 msgid "delete from cursor to end of line." msgstr "Lösche vom Cursor bis zum Zeilenende." #. type: TP -#: doc/tin.1:478 +#: doc/tin.1:485 #, no-wrap msgid "B<^P, ^N>" msgstr "B<^P, ^N>" #. type: Plain text -#: doc/tin.1:481 +#: doc/tin.1:488 msgid "move through history, previous and next, respectively." msgstr "Durch die Verlaufsliste vörwärts bzw. rückwärts bewegen." #. type: TP -#: doc/tin.1:481 +#: doc/tin.1:488 #, no-wrap msgid "B<^L, ^R>" msgstr "B<^L, ^R>" #. type: Plain text -#: doc/tin.1:484 +#: doc/tin.1:491 msgid "redraw the current line." msgstr "Aktuelle Zeile neu aufbauen." #. type: TP -#: doc/tin.1:484 +#: doc/tin.1:491 #, no-wrap msgid "BCRE>" msgstr "BCRE>" #. type: Plain text -#: doc/tin.1:488 +#: doc/tin.1:495 msgid "" "places line on history list if non-blank, appends newline and returns to the " "caller." @@ -1261,24 +1269,24 @@ msgstr "" "Leerzeile an und kehrt zum Anrufer zurück." #. type: TP -#: doc/tin.1:488 +#: doc/tin.1:495 #, no-wrap msgid "BESCE>" msgstr "BESCE>" #. type: Plain text -#: doc/tin.1:493 +#: doc/tin.1:500 msgid "aborts the present editing operation." msgstr "bricht den gegenwärtigen Bearbeitungsvorgang ab." #. type: SS -#: doc/tin.1:493 +#: doc/tin.1:500 #, no-wrap msgid "GLOBAL COMMANDS" msgstr "ALLGEMEINE BEFEHLE" #. type: Plain text -#: doc/tin.1:496 +#: doc/tin.1:503 msgid "" "The following commands are available at all 4 menu levels and always have " "the same effect." @@ -1287,13 +1295,13 @@ msgstr "" "überall das Gleichen." #. type: TP -#: doc/tin.1:497 doc/tin.1:1371 doc/tin.1:1424 +#: doc/tin.1:504 doc/tin.1:1378 doc/tin.1:1431 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:502 +#: doc/tin.1:509 msgid "" "Shell escape. B by itself will launch a shell, B " "EcommandE will run an external EcommandE. This facility may " @@ -1304,57 +1312,57 @@ msgstr "" "Diese Funktion wurde möglicherweise vom Systemadministrator deaktiviert." #. type: TP -#: doc/tin.1:502 +#: doc/tin.1:509 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:505 +#: doc/tin.1:512 msgid "Toggle use of ANSI color." msgstr "ANSI Farben ein-/ausschalten." #. type: TP -#: doc/tin.1:505 +#: doc/tin.1:512 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:508 +#: doc/tin.1:515 msgid "Redraw the current screen." msgstr "Bildschirminhalt neu aufbauen." #. type: TP -#: doc/tin.1:508 +#: doc/tin.1:515 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:511 +#: doc/tin.1:518 msgid "Scroll screen up by one line." msgstr "Eine Zeile nach oben blättern (scrollen)." #. type: TP -#: doc/tin.1:511 +#: doc/tin.1:518 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:514 +#: doc/tin.1:521 msgid "Scroll screen down by one line." msgstr "Eine Zeile nach unten blättern (scrollen)." #. type: TP -#: doc/tin.1:514 +#: doc/tin.1:521 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:528 +#: doc/tin.1:535 msgid "" "Reload postponed article. If your system blocks the B key you " "must quote it by pressing 'B<^V>' (CTRL-V) first. The postpone-menu offers " @@ -1370,13 +1378,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:528 doc/tin.1:1377 doc/tin.1:1431 +#: doc/tin.1:535 doc/tin.1:1384 doc/tin.1:1438 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:534 +#: doc/tin.1:541 msgid "" "Help screen of commands available on the current menu. You can use " "B ('B'), B ('B') and B ('B<" @@ -1384,24 +1392,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:534 doc/tin.1:1380 doc/tin.1:1434 +#: doc/tin.1:541 doc/tin.1:1387 doc/tin.1:1441 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:537 doc/tin.1:1383 doc/tin.1:1437 +#: doc/tin.1:544 doc/tin.1:1390 doc/tin.1:1444 msgid "Toggle the display of help mini menu at the bottom of the screen." msgstr "Mini-Hilfe am unterem Bildschirmrand ein-/ausschalten." #. type: TP -#: doc/tin.1:537 +#: doc/tin.1:544 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:543 +#: doc/tin.1:550 msgid "" "List articles posted by user. The date posted, the newsgroup and the subject " "are listed. You can use B ('B'), B ('B') and " @@ -1410,58 +1418,58 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:543 +#: doc/tin.1:550 #, no-wrap msgid "B" msgstr "B" #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:548 +#: doc/tin.1:555 msgid "Print B version information." msgstr "Versions-Informationen ausgeben." #. type: SS -#: doc/tin.1:548 +#: doc/tin.1:555 #, no-wrap msgid "NEWSGROUP SELECTION COMMANDS" msgstr "BEFEHLE ZUR GRUPPENAUSWAHL" #. type: TP -#: doc/tin.1:549 doc/tin.1:687 doc/tin.1:938 doc/tin.1:1102 doc/tin.1:3482 +#: doc/tin.1:556 doc/tin.1:694 doc/tin.1:945 doc/tin.1:1109 doc/tin.1:3491 #, no-wrap msgid "B<4>" msgstr "B<4>" #. type: Plain text -#: doc/tin.1:552 +#: doc/tin.1:559 msgid "Select group 4." msgstr "Gruppe 4 auswählen." #. type: TP -#: doc/tin.1:552 +#: doc/tin.1:559 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:556 +#: doc/tin.1:563 msgid "" "Reset I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> file. This will destroy all " "records of which articles have been read, so use this carefully." msgstr "" -"Setzt die Datei I<$(TIN_HOMEDIR:-\"$HOME\"}/.newsrc> zurück. Dies zerstört " +"Setzt die Datei I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> zurück. Dies zerstört " "alle Aufzeichnungen über gelesene Artikel, also benutze diese Funktion mit " "Vorsicht." #. type: TP -#: doc/tin.1:556 doc/tin.1:708 doc/tin.1:959 +#: doc/tin.1:563 doc/tin.1:715 doc/tin.1:966 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:560 doc/tin.1:712 doc/tin.1:963 +#: doc/tin.1:567 doc/tin.1:719 doc/tin.1:970 msgid "" "Choose a range of articles to be affected by the next command. See the " "section \"RANGES\" for more information." @@ -1470,76 +1478,76 @@ msgstr "" "wird. Siehe Abschnitt \"BEREICHE\" für weitere Informationen." #. type: TP -#: doc/tin.1:560 +#: doc/tin.1:567 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:563 +#: doc/tin.1:570 msgid "Sort the list of newsgroups." msgstr "Liste vorhandener Newsgruppen sortieren." #. type: TP -#: doc/tin.1:563 doc/tin.1:715 doc/tin.1:966 doc/tin.1:1156 doc/tin.1:1368 -#: doc/tin.1:1418 +#: doc/tin.1:570 doc/tin.1:722 doc/tin.1:973 doc/tin.1:1163 doc/tin.1:1375 +#: doc/tin.1:1425 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:566 doc/tin.1:718 doc/tin.1:969 doc/tin.1:1159 doc/tin.1:1371 -#: doc/tin.1:1421 +#: doc/tin.1:573 doc/tin.1:725 doc/tin.1:976 doc/tin.1:1166 doc/tin.1:1378 +#: doc/tin.1:1428 msgid "Repeat the previous search." msgstr "Vorherige Suche wiederholen." #. type: TP -#: doc/tin.1:566 doc/tin.1:718 doc/tin.1:969 doc/tin.1:1159 doc/tin.1:1362 -#: doc/tin.1:1412 +#: doc/tin.1:573 doc/tin.1:725 doc/tin.1:976 doc/tin.1:1166 doc/tin.1:1369 +#: doc/tin.1:1419 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:569 +#: doc/tin.1:576 msgid "Search for a group by name and description (if displayed)." msgstr "" "Vorwärts nach einer Gruppe anhand des Namens und/oder der Kurzbeschreibung " "(falls angezeigt) suchen." #. type: TP -#: doc/tin.1:569 doc/tin.1:721 doc/tin.1:972 doc/tin.1:1162 doc/tin.1:1365 -#: doc/tin.1:1415 +#: doc/tin.1:576 doc/tin.1:728 doc/tin.1:979 doc/tin.1:1169 doc/tin.1:1372 +#: doc/tin.1:1422 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:572 +#: doc/tin.1:579 msgid "Backward search through the group names and descriptions." msgstr "" "Rückwärts mach einer Gruppe anhand des Namens und/oder der Kurzbeschreibung " "(falls angezeigt) suchen." #. type: TP -#: doc/tin.1:572 +#: doc/tin.1:579 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:575 +#: doc/tin.1:582 msgid "Read current group." msgstr "Lese die aktuelle Gruppe." #. type: TP -#: doc/tin.1:575 +#: doc/tin.1:582 #, no-wrap msgid "BTABE' 'n'>" msgstr "BTABE' 'n'>" #. type: Plain text -#: doc/tin.1:579 +#: doc/tin.1:586 msgid "" "Enter next group with unread news. Will wrap around to the beginning of the " "group selection list looking for unread groups." @@ -1548,39 +1556,39 @@ msgstr "" "Gruppenliste und sucht nach ungelesenen Gruppen." #. type: TP -#: doc/tin.1:579 doc/tin.1:796 doc/tin.1:1010 doc/tin.1:1220 +#: doc/tin.1:586 doc/tin.1:803 doc/tin.1:1017 doc/tin.1:1227 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:583 +#: doc/tin.1:590 msgid "" "Make current group as all read [after confirmation] and move to the next " "group in the group selection list." msgstr "" #. type: TP -#: doc/tin.1:583 doc/tin.1:800 doc/tin.1:1014 doc/tin.1:1224 +#: doc/tin.1:590 doc/tin.1:807 doc/tin.1:1021 doc/tin.1:1231 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:587 +#: doc/tin.1:594 msgid "" "Mark current group as all read [after confirmation] and enter the next " "unread group in the group selection list." msgstr "" #. type: TP -#: doc/tin.1:587 +#: doc/tin.1:594 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:591 +#: doc/tin.1:598 msgid "" "Toggle display to show just the group name or the group name and the group " "descriptions." @@ -1589,24 +1597,24 @@ msgstr "" "der Gruppenbeschreibungen um." #. type: TP -#: doc/tin.1:591 doc/tin.1:813 doc/tin.1:1027 doc/tin.1:1236 +#: doc/tin.1:598 doc/tin.1:820 doc/tin.1:1034 doc/tin.1:1243 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:594 doc/tin.1:816 doc/tin.1:1030 doc/tin.1:1239 +#: doc/tin.1:601 doc/tin.1:823 doc/tin.1:1037 doc/tin.1:1246 msgid "Edit the filter file and reload it afterwards." msgstr "Filter-Datei bearbeiten und danach anwenden." #. type: TP -#: doc/tin.1:594 +#: doc/tin.1:601 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:598 doc/tin.1:820 +#: doc/tin.1:605 doc/tin.1:827 msgid "" "Choose a new group by name. This command can be used to access any group, " "even those not currently yanked in." @@ -1616,14 +1624,14 @@ msgstr "" "werden." #. type: TP -#: doc/tin.1:598 doc/tin.1:823 doc/tin.1:1030 doc/tin.1:1252 doc/tin.1:1374 -#: doc/tin.1:1427 +#: doc/tin.1:605 doc/tin.1:830 doc/tin.1:1037 doc/tin.1:1259 doc/tin.1:1381 +#: doc/tin.1:1434 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:603 +#: doc/tin.1:610 msgid "" "Toggle the display of the description of the current newsgroup in the last " "line. This will not be available if B was started with the \\&''B<-d>'' " @@ -1631,24 +1639,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:603 doc/tin.1:827 doc/tin.1:1033 doc/tin.1:1255 +#: doc/tin.1:610 doc/tin.1:834 doc/tin.1:1040 doc/tin.1:1262 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:606 doc/tin.1:830 doc/tin.1:1036 doc/tin.1:1258 +#: doc/tin.1:613 doc/tin.1:837 doc/tin.1:1043 doc/tin.1:1265 msgid "Toggle inverse video." msgstr "(De)aktiviere inverse Darstellung." #. type: TP -#: doc/tin.1:606 doc/tin.1:839 doc/tin.1:1042 doc/tin.1:1264 +#: doc/tin.1:613 doc/tin.1:846 doc/tin.1:1049 doc/tin.1:1271 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:613 +#: doc/tin.1:620 msgid "" "Look up article by ''Message-ID:''. If none of the groups listed in the " "''Newsgroups:''-header of the referenced article is available, just the " @@ -1656,15 +1664,21 @@ msgid "" "At this level this command only works if reading via NNTP and the server " "supports [X]HDR (B, B) or XPAT (B)." msgstr "" +"Artikel anhand der ''Message-ID:'' Nachschlagen. Wenn keine der in den " +"''Newsgroups:''-Kopfzeilen des referenzierten Artikels aufgeführten " +"Gruppen verfügbar ist, wird in der letzten Zeile nur der Inhalt der " +"''Newsgroups:''-Kopfzeilen angezeigt. Auf dieser Ebene funktioniert " +"dieser Befehl nur beim Lesen mittels NNTP und der Server muss [X]HDR " +"(B, B) oder XPAT (B) unterstützen." #. type: TP -#: doc/tin.1:613 +#: doc/tin.1:620 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:619 +#: doc/tin.1:626 msgid "" "Move the current group within the group selection list. By entering '1' the " "group will become the first displayed group in the list, by entering '8' the " @@ -1673,62 +1687,62 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:619 doc/tin.1:847 doc/tin.1:1272 +#: doc/tin.1:626 doc/tin.1:854 doc/tin.1:1279 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:623 doc/tin.1:851 doc/tin.1:1276 +#: doc/tin.1:630 doc/tin.1:858 doc/tin.1:1283 msgid "" "User configurable options menu (for more information see section \"GLOBAL " "OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES\")." msgstr "" #. type: TP -#: doc/tin.1:623 +#: doc/tin.1:630 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:626 +#: doc/tin.1:633 msgid "Positions the cursor on the next group with unread articles in it." msgstr "Setzt den Cursor auf die nächste Gruppe mit ungelesenen Artikeln." #. type: TP -#: doc/tin.1:626 doc/tin.1:868 doc/tin.1:1055 doc/tin.1:1293 +#: doc/tin.1:633 doc/tin.1:875 doc/tin.1:1062 doc/tin.1:1300 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:630 +#: doc/tin.1:637 msgid "" -"Quit B - ask the user to confirm if B is set " +"Quit B \\(em ask the user to confirm if B is set " "accordingly." msgstr "" "B beenden, falls B gesetzt ist wird nochmal nachgefragt." #. type: TP -#: doc/tin.1:630 doc/tin.1:871 doc/tin.1:1058 doc/tin.1:1296 +#: doc/tin.1:637 doc/tin.1:878 doc/tin.1:1065 doc/tin.1:1303 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:633 doc/tin.1:874 doc/tin.1:1061 doc/tin.1:1299 -msgid "Quit B - don't ask the user to confirm." +#: doc/tin.1:640 doc/tin.1:881 doc/tin.1:1068 doc/tin.1:1306 +msgid "Quit B \\(em don't ask the user to confirm." msgstr "Beendet B sofort, ohne Bestätigungsnachfrage." #. type: TP -#: doc/tin.1:633 +#: doc/tin.1:640 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:638 +#: doc/tin.1:645 msgid "" "Toggle display of all subscribed to groups and just those groups containing " "unread articles. Command has no effect if groups were specified on the " @@ -1736,13 +1750,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:638 doc/tin.1:877 doc/tin.1:1061 +#: doc/tin.1:645 doc/tin.1:884 doc/tin.1:1068 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:642 doc/tin.1:881 doc/tin.1:1065 +#: doc/tin.1:649 doc/tin.1:888 doc/tin.1:1072 msgid "" "Mail a bug report or comment to Etin-bugs@tin.orgE. This is the best " "way of getting bugs fixed and features added/changed." @@ -1752,24 +1766,24 @@ msgstr "" "bzw. nach neuen Funktionen zu fragen." #. type: TP -#: doc/tin.1:642 +#: doc/tin.1:649 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:645 +#: doc/tin.1:652 msgid "Subscribe to current group." msgstr "Ausgewählte Gruppe abonnieren." #. type: TP -#: doc/tin.1:645 +#: doc/tin.1:652 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:650 +#: doc/tin.1:657 msgid "" "Subscribe to groups matching user specified pattern. See the section " "\"NEWSGROUP LISTS & WILDCARDS\" for the types of pattern that B " @@ -1777,13 +1791,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:650 +#: doc/tin.1:657 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:655 +#: doc/tin.1:662 msgid "" "Unsubscribe to current group. This can be used to remove bogus groups. See " "B in the \"GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" @@ -1791,13 +1805,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:655 +#: doc/tin.1:662 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:660 +#: doc/tin.1:667 msgid "" "Unsubscribe to groups matching user specified pattern. See the section " "\"NEWSGROUP LISTS & WILDCARDS\" for the types of pattern that B " @@ -1805,13 +1819,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:660 doc/tin.1:905 doc/tin.1:1080 doc/tin.1:1333 +#: doc/tin.1:667 doc/tin.1:912 doc/tin.1:1087 doc/tin.1:1340 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:666 +#: doc/tin.1:673 msgid "" "Post an article to current group. If posting fails for some reason, you'll " "get the chance to B ('B') the article again, B " @@ -1820,25 +1834,25 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:666 +#: doc/tin.1:673 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:669 +#: doc/tin.1:676 msgid "Quit B without saving any changes to the configuration." msgstr "" "B beenden ohne ggf. gemachte Änderungen an den Einstellung zu speichern." #. type: TP -#: doc/tin.1:669 +#: doc/tin.1:676 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:674 +#: doc/tin.1:681 msgid "" "Yanks in all groups. Toggles the displayed groups between all the groups in " "the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}> file and just " @@ -1846,38 +1860,38 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:674 +#: doc/tin.1:681 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:678 +#: doc/tin.1:685 msgid "" "Reread the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}> file " "to see if any new news has arrived since starting B." msgstr "" #. type: TP -#: doc/tin.1:678 +#: doc/tin.1:685 #, no-wrap msgid "B" msgstr "B" #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:683 +#: doc/tin.1:690 msgid "Mark all articles in the current group as unread." msgstr "Alle Artikel in der aktuellen Gruppe als ungelesen markieren." #. type: SS -#: doc/tin.1:683 +#: doc/tin.1:690 #, no-wrap msgid "GROUP INDEX COMMANDS" msgstr "" #. type: Plain text -#: doc/tin.1:687 +#: doc/tin.1:694 msgid "" "All searches in this level are limited to unread articles if in " "B mode. B ('B') can be use " @@ -1885,44 +1899,44 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:690 +#: doc/tin.1:697 msgid "Select article 4." msgstr "Artikel 4 auswählen." #. type: TP -#: doc/tin.1:690 doc/tin.1:941 doc/tin.1:1105 +#: doc/tin.1:697 doc/tin.1:948 doc/tin.1:1112 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:694 doc/tin.1:945 doc/tin.1:1109 +#: doc/tin.1:701 doc/tin.1:952 doc/tin.1:1116 msgid "" "Auto select article(s) using a menu. Read the section \"FILTERING ARTICLES\" " "for more information." msgstr "" #. type: TP -#: doc/tin.1:694 doc/tin.1:945 doc/tin.1:1121 +#: doc/tin.1:701 doc/tin.1:952 doc/tin.1:1128 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:698 doc/tin.1:949 doc/tin.1:1125 +#: doc/tin.1:705 doc/tin.1:956 doc/tin.1:1132 msgid "" "Kill article(s) using a menu. Read the section \"FILTERING ARTICLES\" for " "more information." msgstr "" #. type: TP -#: doc/tin.1:698 doc/tin.1:949 +#: doc/tin.1:705 doc/tin.1:956 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:703 doc/tin.1:954 +#: doc/tin.1:710 doc/tin.1:961 msgid "" "Mark current article, thread, range, auto-selected (hot) articles, articles " "matching pattern or tagged articles as read. A prompt asks which type should " @@ -1930,13 +1944,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:703 doc/tin.1:954 +#: doc/tin.1:710 doc/tin.1:961 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:708 doc/tin.1:959 +#: doc/tin.1:715 doc/tin.1:966 msgid "" "Mark current article, thread, range, auto-selected (hot) articles, articles " "matching pattern or tagged articles as unread. A prompt asks which type " @@ -1944,58 +1958,58 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:712 doc/tin.1:963 doc/tin.1:1153 +#: doc/tin.1:719 doc/tin.1:970 doc/tin.1:1160 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:715 doc/tin.1:966 doc/tin.1:1156 +#: doc/tin.1:722 doc/tin.1:973 doc/tin.1:1163 msgid "Re-enter the last message that was viewed." msgstr "Zur zuletzt angezeigte Nachricht springen." #. type: Plain text -#: doc/tin.1:721 doc/tin.1:972 +#: doc/tin.1:728 doc/tin.1:979 msgid "Search forward for specified subject." msgstr "Vorwärts nach dem angegebenem Subject suchen." #. type: Plain text -#: doc/tin.1:724 doc/tin.1:975 +#: doc/tin.1:731 doc/tin.1:982 msgid "Search backwards for specified subject." msgstr "Rückwärts nach dem angegebenem Subject suchen." #. type: TP -#: doc/tin.1:724 +#: doc/tin.1:731 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:727 doc/tin.1:978 +#: doc/tin.1:734 doc/tin.1:985 msgid "Select current thread for later processing." msgstr "Wähle aktuellen Thread für die spätere Verarbeitung aus." #. type: TP -#: doc/tin.1:727 +#: doc/tin.1:734 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:731 +#: doc/tin.1:738 msgid "" "Selects all threads in current group. It is a shortcut for calling " "B with a pattern of ''*''." msgstr "" #. type: TP -#: doc/tin.1:731 +#: doc/tin.1:738 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:736 +#: doc/tin.1:743 msgid "" "Toggle selection of current thread. If at least one unread article, (but not " "every unread article) in the current thread is selected, then all unread " @@ -2003,13 +2017,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:736 +#: doc/tin.1:743 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:741 +#: doc/tin.1:748 msgid "" "For each thread in current group, if it at least one unread article is " "selected, all unread articles become selected. This is useful for auto-" @@ -2017,13 +2031,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:741 +#: doc/tin.1:748 #, no-wrap msgid "B" #. type: Plain text -#: doc/tin.1:747 +#: doc/tin.1:754 msgid "" "Prompts for a pattern with which to match on. All threads whose subjects " "match the pattern will be marked selected. A pattern of ''*'' will match all " @@ -2032,24 +2046,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:747 +#: doc/tin.1:754 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:750 +#: doc/tin.1:757 msgid "Reverse all selections on all articles." msgstr "Markierung für alle Artikel umkehren." #. type: TP -#: doc/tin.1:750 +#: doc/tin.1:757 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:756 +#: doc/tin.1:763 msgid "" "Undo all selections on all articles. It clears the toggle effect of " "B ('B') command. Thus after first doing a " @@ -2058,13 +2072,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:756 doc/tin.1:987 doc/tin.1:1179 +#: doc/tin.1:763 doc/tin.1:994 doc/tin.1:1186 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:761 doc/tin.1:992 doc/tin.1:1184 +#: doc/tin.1:768 doc/tin.1:999 doc/tin.1:1191 msgid "" "Pipe current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles into command. See the section \"MAILING " @@ -2072,13 +2086,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:761 doc/tin.1:1184 +#: doc/tin.1:768 doc/tin.1:1191 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:770 +#: doc/tin.1:777 msgid "" "Auto select article(s) with a single key [after confirmation]. The defaults " "used for selection are based upon the following four tinrc config variables: " @@ -2090,13 +2104,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:770 doc/tin.1:1193 +#: doc/tin.1:777 doc/tin.1:1200 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:779 +#: doc/tin.1:786 msgid "" "Kill article(s) with a single key [after confirmation]. The defaults used " "for killing are based upon the following four tinrc config variables: " @@ -2108,35 +2122,35 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:779 +#: doc/tin.1:786 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:782 +#: doc/tin.1:789 msgid "Read current article." msgstr "Lese den aktuelle Artikel." #. type: TP -#: doc/tin.1:782 +#: doc/tin.1:789 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" #. type: Plain text -#: doc/tin.1:785 +#: doc/tin.1:792 msgid "View next unread article or group." msgstr "Zeige nächsten den ungelesenen Artikel oder die nächste Gruppe." #. type: TP -#: doc/tin.1:785 doc/tin.1:998 doc/tin.1:1210 +#: doc/tin.1:792 doc/tin.1:1005 doc/tin.1:1217 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:789 +#: doc/tin.1:796 msgid "" "Author forward search. This searches for articles with a specific ''From:'' " "line." @@ -2145,24 +2159,24 @@ msgstr "" "Header." #. type: TP -#: doc/tin.1:789 doc/tin.1:1003 doc/tin.1:1213 +#: doc/tin.1:796 doc/tin.1:1010 doc/tin.1:1220 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:792 doc/tin.1:1006 +#: doc/tin.1:799 doc/tin.1:1013 msgid "Author backward search. Otherwise, see B ('B') above." msgstr "Autoren-Suche rückwärts. Siehe auch B ('B') oben." #. type: TP -#: doc/tin.1:792 doc/tin.1:1006 doc/tin.1:1216 +#: doc/tin.1:799 doc/tin.1:1013 doc/tin.1:1223 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:796 doc/tin.1:1010 doc/tin.1:1220 +#: doc/tin.1:803 doc/tin.1:1017 doc/tin.1:1227 msgid "" "Search the body of all articles in group (can be slow). You can abort the " "search using B ('B')." @@ -2171,65 +2185,68 @@ msgstr "" "Suche kann mit B ('B') abgebrochen werden." #. type: Plain text -#: doc/tin.1:800 +#: doc/tin.1:807 msgid "" "Mark all articles as read [after confirmation] then return to the group " "selection list. Move cursor to next group." msgstr "" #. type: Plain text -#: doc/tin.1:804 +#: doc/tin.1:811 msgid "" "Mark all articles as read [after confirmation] and enter the next group with " "unread news." msgstr "" #. type: TP -#: doc/tin.1:804 +#: doc/tin.1:811 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:808 doc/tin.1:1022 +#: doc/tin.1:815 doc/tin.1:1029 msgid "" "Cycle the display of the author through all the possible options for the " "tinrc variable B." msgstr "" #. type: TP -#: doc/tin.1:808 +#: doc/tin.1:815 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:813 doc/tin.1:1027 doc/tin.1:1233 +#: doc/tin.1:820 doc/tin.1:1034 doc/tin.1:1240 msgid "" "Cancel (delete) or supersede (overwrite) the current article. It must have " "been posted by the same user. The cancel message can be seen in the " "newsgroup 'control' or 'control.cancel'." msgstr "" +"Löschen (cancel) oder Ersetzen (supersede) des aktuellen Artikels. Er muss " +"vom selben Benutzer geschrieben worden sein. Die Nachricht zum Löschen ist " +"in der Newsgroupe 'control' oder 'control.cancel' zu sehen." #. type: TP -#: doc/tin.1:816 +#: doc/tin.1:823 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:820 +#: doc/tin.1:827 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:823 +#: doc/tin.1:830 msgid "Toggle article/group limit." msgstr "Artikel/Gruppe Beschränkungen ein-/ausschalten." #. type: Plain text -#: doc/tin.1:827 +#: doc/tin.1:834 msgid "" "Display the subject of the first article in the current thread in the last " "line." @@ -2238,13 +2255,13 @@ msgstr "" "anzeigen." #. type: TP -#: doc/tin.1:830 +#: doc/tin.1:837 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:836 +#: doc/tin.1:843 msgid "" "Mark article/thread as read and move onto the next unread article/thread. If " "a range of articles/threads is set, the range will be marked as read instead " @@ -2253,29 +2270,29 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:836 +#: doc/tin.1:843 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:839 +#: doc/tin.1:846 msgid "Open the thread under the current cursor position." msgstr "Öffnet den Thread unter der aktuellen Cursorposition." #. type: Plain text -#: doc/tin.1:842 doc/tin.1:1045 doc/tin.1:1267 +#: doc/tin.1:849 doc/tin.1:1052 doc/tin.1:1274 msgid "Look up article by ''Message-ID:''." msgstr "Artikel anhand der ''Message-ID:'' nachschlagen." #. type: TP -#: doc/tin.1:842 +#: doc/tin.1:849 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:847 doc/tin.1:1050 doc/tin.1:1272 +#: doc/tin.1:854 doc/tin.1:1057 doc/tin.1:1279 msgid "" "Mail current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to someone. See the section \"MAILING " @@ -2283,35 +2300,35 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:851 +#: doc/tin.1:858 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:854 +#: doc/tin.1:861 msgid "Go to next group." msgstr "Zur nächsten Newsgruppe springen." #. type: TP -#: doc/tin.1:854 +#: doc/tin.1:861 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:857 doc/tin.1:1282 +#: doc/tin.1:864 doc/tin.1:1289 msgid "Go to the next unread article." msgstr "Zum nächsten ungelesenen Artikel springen." #. type: TP -#: doc/tin.1:857 doc/tin.1:1050 doc/tin.1:1282 +#: doc/tin.1:864 doc/tin.1:1057 doc/tin.1:1289 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:862 doc/tin.1:1055 doc/tin.1:1287 +#: doc/tin.1:869 doc/tin.1:1062 doc/tin.1:1294 msgid "" "Send current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to printer. See the section \"MAILING " @@ -2319,51 +2336,51 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:862 +#: doc/tin.1:869 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:865 +#: doc/tin.1:872 msgid "Go to previous group." msgstr "Zur vorherigen Gruppe springen." #. type: TP -#: doc/tin.1:865 +#: doc/tin.1:872 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:868 +#: doc/tin.1:875 msgid "Go to previous unread article." msgstr "Zum vorherigen ungelesenen Artikel gehen." #. type: Plain text -#: doc/tin.1:871 doc/tin.1:1058 +#: doc/tin.1:878 doc/tin.1:1065 msgid "Return to previous level." msgstr "Kehre zur vorherigen Ebene zurück." #. type: TP -#: doc/tin.1:874 +#: doc/tin.1:881 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:877 +#: doc/tin.1:884 msgid "Toggle the display between all articles and unread articles." msgstr "Wechselt zwischen der Anzeige aller und nur ungelesener Artikel." #. type: TP -#: doc/tin.1:881 +#: doc/tin.1:888 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:886 doc/tin.1:1070 doc/tin.1:1312 +#: doc/tin.1:893 doc/tin.1:1077 doc/tin.1:1319 msgid "" "Save current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles. See the section \"MAILING PIPING " @@ -2371,24 +2388,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:886 +#: doc/tin.1:893 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:889 doc/tin.1:1073 doc/tin.1:1315 +#: doc/tin.1:896 doc/tin.1:1080 doc/tin.1:1322 msgid "Save marked articles automatically without further prompting." msgstr "Markierte Artikel automatisch ohne weiteres Nachfragen speichern." #. type: TP -#: doc/tin.1:889 +#: doc/tin.1:896 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:894 +#: doc/tin.1:901 msgid "" "Toggle tag-status of current article / thread for B ('B') / " "B ('B<|>') / B ('B') / B ('B') / " @@ -2396,13 +2413,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:894 +#: doc/tin.1:901 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:897 +#: doc/tin.1:904 msgid "" "Automatically tag in order all the parts of the current multi-part message." msgstr "" @@ -2410,13 +2427,13 @@ msgstr "" "Reihenfolge markieren." #. type: TP -#: doc/tin.1:897 +#: doc/tin.1:904 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:902 +#: doc/tin.1:909 msgid "" "Cycle the threading mode through no threading, threading by subject, " "threading by references, threading on both subject and references, group " @@ -2424,18 +2441,18 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:902 +#: doc/tin.1:909 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:905 +#: doc/tin.1:912 msgid "Untag all articles that were tagged." msgstr "Markierung aller markierten Artikel entfernen." #. type: Plain text -#: doc/tin.1:912 doc/tin.1:1087 doc/tin.1:1340 +#: doc/tin.1:919 doc/tin.1:1094 doc/tin.1:1347 msgid "" "Post an article to the current group. If posting fails for some reason, " "you'll get the chance to edit the article again via B ('B'), " @@ -2444,13 +2461,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:912 +#: doc/tin.1:919 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:918 doc/tin.1:1346 +#: doc/tin.1:925 doc/tin.1:1353 msgid "" "Repost an already posted article / thread / auto-selected (hot) articles / " "articles matching pattern / tagged articles to another newsgroup(s). Useful " @@ -2459,13 +2476,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:918 +#: doc/tin.1:925 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:926 +#: doc/tin.1:933 msgid "" "Mark all unread articles that have not been selected as read, redraw screen " "to reflect changes and put index at the first thread to begin reading. " @@ -2476,25 +2493,25 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:926 doc/tin.1:1087 doc/tin.1:1346 +#: doc/tin.1:933 doc/tin.1:1094 doc/tin.1:1353 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:929 +#: doc/tin.1:936 msgid "Mark current article as unread." msgstr "Aktuellen Artikel als ungelesen markieren." #. type: TP -#: doc/tin.1:929 doc/tin.1:1092 doc/tin.1:1349 +#: doc/tin.1:936 doc/tin.1:1099 doc/tin.1:1356 #, no-wrap msgid "B" msgstr "B" #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:936 +#: doc/tin.1:943 msgid "" "Mark current thread as unread. If a range of threads is set, the range will " "be marked as unread instead of the current thread. When tagged threads are " @@ -2502,79 +2519,79 @@ msgid "" msgstr "" #. type: SS -#: doc/tin.1:936 +#: doc/tin.1:943 #, no-wrap msgid "THREAD LISTING COMMANDS" msgstr "" #. type: Plain text -#: doc/tin.1:941 +#: doc/tin.1:948 msgid "Select article 4 within thread." msgstr "Artikel 4 aus dem Thread auswählen." #. type: TP -#: doc/tin.1:975 +#: doc/tin.1:982 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:978 +#: doc/tin.1:985 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:981 +#: doc/tin.1:988 msgid "Toggle selection of current article." msgstr "Auswahl des aktuellen Artikels umkehren." #. type: TP -#: doc/tin.1:981 +#: doc/tin.1:988 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:984 +#: doc/tin.1:991 msgid "Reverse article selections." msgstr "Artikelauswahl invertieren." #. type: TP -#: doc/tin.1:984 +#: doc/tin.1:991 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:987 +#: doc/tin.1:994 msgid "Undo all selections on current thread." msgstr "Alle Markierungen im aktuellen Thread rückgängig machen." #. type: TP -#: doc/tin.1:992 +#: doc/tin.1:999 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:995 +#: doc/tin.1:1002 msgid "Read current article within thread." msgstr "Aktuellen Artikel im Thread lesen." #. type: TP -#: doc/tin.1:995 +#: doc/tin.1:1002 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" #. type: Plain text -#: doc/tin.1:998 +#: doc/tin.1:1005 msgid "View next unread article within thread." msgstr "Nächsten ungelesenen Artikel im Thread anzeigen." #. type: Plain text -#: doc/tin.1:1003 +#: doc/tin.1:1010 msgid "" "Author forward search. This searches for articles with a specific ''From:'' " "line. The search will wrap over into the next thread if nothing is found in " @@ -2582,44 +2599,44 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1014 +#: doc/tin.1:1021 msgid "" "Mark thread as read [after confirmation] and return to the group index " "page. Move cursor to next thread." msgstr "" #. type: Plain text -#: doc/tin.1:1018 +#: doc/tin.1:1025 msgid "" "Mark thread as read [after confirmation] and enter the next thread " "containing unread news." msgstr "" #. type: TP -#: doc/tin.1:1018 +#: doc/tin.1:1025 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1022 +#: doc/tin.1:1029 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1033 doc/tin.1:1255 +#: doc/tin.1:1040 doc/tin.1:1262 msgid "Display the subject of the current article in the last line." msgstr "Subject des geöffneten Artikels in der untersten Zeile anzeigen." #. type: TP -#: doc/tin.1:1036 +#: doc/tin.1:1043 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1042 +#: doc/tin.1:1049 msgid "" "Mark article as read and move onto the next unread article. If a range of " "articles is set, the range will be marked as read instead of the current " @@ -2627,49 +2644,49 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1045 +#: doc/tin.1:1052 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1065 +#: doc/tin.1:1072 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1070 +#: doc/tin.1:1077 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1073 +#: doc/tin.1:1080 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1077 doc/tin.1:1319 +#: doc/tin.1:1084 doc/tin.1:1326 msgid "" "Toggle tag status of current article for mailing, piping, printing, saving " "or reposting." msgstr "" #. type: TP -#: doc/tin.1:1077 +#: doc/tin.1:1084 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1080 +#: doc/tin.1:1087 msgid "Untag all tagged threads." msgstr "Markierung aller markierten Threads entfernen." #. type: Plain text -#: doc/tin.1:1092 +#: doc/tin.1:1099 msgid "" "Mark current article in thread as unread. If a range of articles is set, the " "range will be marked as unread instead of the current article. When tagged " @@ -2678,95 +2695,95 @@ msgstr "" #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:1097 +#: doc/tin.1:1104 msgid "Mark all articles in thread as unread." msgstr "Alle Artikel im aktuellen Thread als ungelesen markieren." #. type: SS -#: doc/tin.1:1097 +#: doc/tin.1:1104 #, no-wrap msgid "ARTICLE VIEWER COMMANDS" msgstr "" #. type: Plain text -#: doc/tin.1:1102 +#: doc/tin.1:1109 msgid "Read the first (base) article in this thread." msgstr "Den ersten (Basis) Artikel in diesem Thread lesen." #. type: Plain text -#: doc/tin.1:1105 +#: doc/tin.1:1112 msgid "Read response 4 in this thread." msgstr "Antwort 4 im diesem Thread lesen." #. type: TP -#: doc/tin.1:1109 +#: doc/tin.1:1116 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1113 +#: doc/tin.1:1120 msgid "" "Reply through mail to the author of the current article with a copy of the " "article with all headers included." msgstr "" #. type: TP -#: doc/tin.1:1113 +#: doc/tin.1:1120 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1118 +#: doc/tin.1:1125 msgid "Perform B<\\%pgp>(1) operations on article." msgstr "B<\\%pgp>(1) Operation auf den Artikel an anwenden." #. type: TP -#: doc/tin.1:1118 +#: doc/tin.1:1125 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1121 +#: doc/tin.1:1128 msgid "Toggles the display mode (raw including all headers vs. cooked)." msgstr "" "Schaltet den Anzeigemodus um (Roh einschließlich aller Header zu " "Aufbereitet)." #. type: TP -#: doc/tin.1:1125 +#: doc/tin.1:1132 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1128 +#: doc/tin.1:1135 msgid "Toggle the TAB width between 4 and 8 characters." msgstr "Tabulatorbreite zwischen 4 und 8 Zeichen Umschalten." #. type: TP -#: doc/tin.1:1128 +#: doc/tin.1:1135 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1132 +#: doc/tin.1:1139 msgid "" "Post a followup to the current article with a copy of the article with all " "headers included." msgstr "" #. type: TP -#: doc/tin.1:1132 +#: doc/tin.1:1139 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1136 +#: doc/tin.1:1143 msgid "" "Toggle TeX to ISO decoding for current article. The default behavior is " "taken from the B variable in the tinrc file." @@ -2776,49 +2793,49 @@ msgstr "" "entnommen." #. type: TP -#: doc/tin.1:1136 +#: doc/tin.1:1143 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1139 +#: doc/tin.1:1146 msgid "" "Toggles the display of all headers vs. headers in B." msgstr "" #. type: TP -#: doc/tin.1:1139 +#: doc/tin.1:1146 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1142 +#: doc/tin.1:1149 msgid "Toggle ROT-13 decoding for this article." msgstr "ROT-13 Entschlüsseln ein-/ausschalten." #. type: TP -#: doc/tin.1:1142 +#: doc/tin.1:1149 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1146 +#: doc/tin.1:1153 msgid "" "Toggle the display of uuencoded sections. The default behavior is taken from " "the B variable in the tinrc file." msgstr "" #. type: TP -#: doc/tin.1:1146 +#: doc/tin.1:1153 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1153 +#: doc/tin.1:1160 msgid "" "The formfeed character (^L) is often used to hide 'spoilers' that the reader " "may not initially wish to see when viewing an article. Any text after a " @@ -2828,23 +2845,23 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1162 +#: doc/tin.1:1169 msgid "Forward search the text of this article." msgstr "Vorwärts innerhalb dieses Artikels suchen." #. type: Plain text -#: doc/tin.1:1165 +#: doc/tin.1:1172 msgid "Backward search the text of this article." msgstr "Rückwärts innerhalb dieses Artikels suchen." #. type: TP -#: doc/tin.1:1165 +#: doc/tin.1:1172 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1170 +#: doc/tin.1:1177 msgid "" "Skip to the end of the next quoted text-block in this article. Quoted text " "is everything which matches B, B or " @@ -2852,40 +2869,40 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1170 +#: doc/tin.1:1177 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:1173 +#: doc/tin.1:1180 msgid "Go to the first article in the current thread." msgstr "Gehe zum ersten Artikel im aktuellen Thread." #. type: TP -#: doc/tin.1:1173 +#: doc/tin.1:1180 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:1176 +#: doc/tin.1:1183 msgid "Go to the last article in the current thread." msgstr "Gehe zum letzten Artikel im aktuellen Thread." #. type: TP -#: doc/tin.1:1176 +#: doc/tin.1:1183 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1179 +#: doc/tin.1:1186 msgid "Toggle word highlighting on/off." msgstr "Wort-Hervorheben ein-/ausschalten." #. type: Plain text -#: doc/tin.1:1193 +#: doc/tin.1:1200 msgid "" "Auto select article(s) with a single key. The defaults used for selection " "are set based upon the following four tinrc config variables: " @@ -2897,7 +2914,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1202 +#: doc/tin.1:1209 msgid "" "Kill article(s) with a single key. The defaults used for killing are based " "upon the following four tinrc config variables: B, " @@ -2908,24 +2925,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1202 +#: doc/tin.1:1209 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:1205 +#: doc/tin.1:1212 msgid "Go to next base article." msgstr "Zum nächsten Basisartikel springen." #. type: TP -#: doc/tin.1:1205 +#: doc/tin.1:1212 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" #. type: Plain text -#: doc/tin.1:1210 +#: doc/tin.1:1217 msgid "" "Go to next unread article. If the tinrc variable B doesn't " "contain PageNextUnread, then this key will first page through the current " @@ -2933,337 +2950,337 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1213 +#: doc/tin.1:1220 msgid "Author forward search." msgstr "Suche nach Autor (vorwärts)." #. type: Plain text -#: doc/tin.1:1216 +#: doc/tin.1:1223 msgid "Author backward search." msgstr "Suche nach Autor (rückwärts)." #. type: Plain text -#: doc/tin.1:1224 +#: doc/tin.1:1231 msgid "" "Mark the current thread as read [after confirmation] and return to the " "previous menu. Move cursor to next item." msgstr "" #. type: Plain text -#: doc/tin.1:1228 +#: doc/tin.1:1235 msgid "" "Mark the rest of the current thread as read [after confirmation] and enter " "the next thread with unread articles." msgstr "" #. type: TP -#: doc/tin.1:1228 +#: doc/tin.1:1235 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1233 +#: doc/tin.1:1240 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1236 +#: doc/tin.1:1243 msgid "" "Edit the current article. This is restricted to mailgroups and saved news." msgstr "" #. type: TP -#: doc/tin.1:1239 +#: doc/tin.1:1246 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1242 +#: doc/tin.1:1249 msgid "" "Post a followup to the current article with a copy of the article included." msgstr "" #. type: TP -#: doc/tin.1:1242 +#: doc/tin.1:1249 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1246 +#: doc/tin.1:1253 msgid "" "Post a followup to the current article without including a copy of the " "article." msgstr "" #. type: TP -#: doc/tin.1:1246 +#: doc/tin.1:1253 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1249 +#: doc/tin.1:1256 msgid "Go to the start of the article." msgstr "Zum Anfang des Artikels springen." #. type: TP -#: doc/tin.1:1249 +#: doc/tin.1:1256 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1252 +#: doc/tin.1:1259 msgid "Go to the end of the article." msgstr "Zum Ende des Artikels springen." #. type: TP -#: doc/tin.1:1258 +#: doc/tin.1:1265 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1261 +#: doc/tin.1:1268 msgid "Mark rest of thread as read and move onto the next unread thread." msgstr "" "Markiere den Rest des Threads als gelesen und springe zu nächstem " "ungelesenen Thread." #. type: TP -#: doc/tin.1:1261 +#: doc/tin.1:1268 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1264 +#: doc/tin.1:1271 msgid "Show the thread menu that the current article is a part of." msgstr "" #. type: TP -#: doc/tin.1:1267 +#: doc/tin.1:1274 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1276 +#: doc/tin.1:1283 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1279 +#: doc/tin.1:1286 msgid "Go to the next article." msgstr "Gehe zum nächsten Artikel." #. type: TP -#: doc/tin.1:1279 +#: doc/tin.1:1286 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1287 +#: doc/tin.1:1294 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1290 +#: doc/tin.1:1297 msgid "Go to the previous article." msgstr "Gehe zum vorherigen Artikel." #. type: TP -#: doc/tin.1:1290 +#: doc/tin.1:1297 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1293 +#: doc/tin.1:1300 msgid "Go to the previous unread article." msgstr "" #. type: Plain text -#: doc/tin.1:1296 +#: doc/tin.1:1303 msgid "Return to the previous level." msgstr "Kehrt zur vorherigen Ebene zurück." #. type: TP -#: doc/tin.1:1299 +#: doc/tin.1:1306 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1303 +#: doc/tin.1:1310 msgid "" "Reply through mail to the author of the current article with a copy of the " "article included." msgstr "" #. type: TP -#: doc/tin.1:1303 +#: doc/tin.1:1310 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1307 +#: doc/tin.1:1314 msgid "" "Reply through mail to the author of the current article without including " "the original article." msgstr "" #. type: TP -#: doc/tin.1:1307 +#: doc/tin.1:1314 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1312 +#: doc/tin.1:1319 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1315 +#: doc/tin.1:1322 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1319 +#: doc/tin.1:1326 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1322 +#: doc/tin.1:1329 msgid "Return to group selection level." msgstr "Kehrt zur Auswahlebene zurück." #. type: TP -#: doc/tin.1:1322 +#: doc/tin.1:1329 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1325 +#: doc/tin.1:1332 msgid "Go to parent article." msgstr "" #. type: TP -#: doc/tin.1:1325 +#: doc/tin.1:1332 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1329 +#: doc/tin.1:1336 msgid "" "Display a list of URLs in the current article. See the section \"URL LISTING" "\" for more information." msgstr "" #. type: TP -#: doc/tin.1:1329 +#: doc/tin.1:1336 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1333 +#: doc/tin.1:1340 msgid "" "Display a list of attachments of the current article. See the section " "\"ATTACHMENT LISTING\" for more information." msgstr "" #. type: TP -#: doc/tin.1:1340 +#: doc/tin.1:1347 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1349 +#: doc/tin.1:1356 msgid "Mark article as unread." msgstr "Alle Artikel als ungelesen markieren." #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:1354 +#: doc/tin.1:1361 msgid "Mark the current thread as unread." msgstr "Markiere den aktuellen Thread als ungelesen." #. type: SS -#: doc/tin.1:1354 +#: doc/tin.1:1361 #, no-wrap msgid "URL LISTING" msgstr "URL LISTE" #. type: Plain text -#: doc/tin.1:1357 +#: doc/tin.1:1364 msgid "" "B ('B') displays a list of URLs in the current article. " "Besides the common moving keys, the following commands are available:" msgstr "" #. type: TP -#: doc/tin.1:1358 +#: doc/tin.1:1365 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:1362 +#: doc/tin.1:1369 msgid "" "The current URL will be prompted and opened using the B. " "'BESCE>' or no input will skip the URL." msgstr "" #. type: Plain text -#: doc/tin.1:1365 +#: doc/tin.1:1372 msgid "URL forward search." msgstr "Suche nach URL (vorwärts)." #. type: Plain text -#: doc/tin.1:1368 +#: doc/tin.1:1375 msgid "URL backward search." msgstr "Suche nach URL (rückwärts)." #. type: Plain text -#: doc/tin.1:1374 doc/tin.1:1427 +#: doc/tin.1:1381 doc/tin.1:1434 msgid "Shell escape." msgstr "Ausgang zur Shell." #. type: Plain text -#: doc/tin.1:1377 +#: doc/tin.1:1384 msgid "Toggle the display of the current URL in the last line." msgstr "Anzeige der aktuellen URL in der letzten Zeile (de)aktivieren." #. type: Plain text -#: doc/tin.1:1380 doc/tin.1:1434 +#: doc/tin.1:1387 doc/tin.1:1441 msgid "Help screen of commands available." msgstr "Hilfeseite der verfügbaren Befehle." #. -------------------------------------------------------------------- #. type: SS -#: doc/tin.1:1386 +#: doc/tin.1:1393 #, no-wrap msgid "ATTACHMENT LISTING" msgstr "" #. type: Plain text -#: doc/tin.1:1389 +#: doc/tin.1:1396 msgid "" "B ('B') displays a list of attachments of the current " "article. Besides the common moving keys, the following commands are " @@ -3271,108 +3288,108 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1390 +#: doc/tin.1:1397 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1393 +#: doc/tin.1:1400 msgid "Pipe attachment into command." msgstr "Anhang an Befehl weiterleiten." #. type: TP -#: doc/tin.1:1393 +#: doc/tin.1:1400 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1396 +#: doc/tin.1:1403 msgid "Save current attachment / tagged attachments to disk." msgstr "" #. type: TP -#: doc/tin.1:1396 +#: doc/tin.1:1403 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:1399 +#: doc/tin.1:1406 msgid "View attachment." msgstr "Multimediaanhänge anzeigen." #. type: TP -#: doc/tin.1:1399 +#: doc/tin.1:1406 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1402 +#: doc/tin.1:1409 msgid "Tag one or more attachments for saving." msgstr "" #. type: TP -#: doc/tin.1:1402 +#: doc/tin.1:1409 #, no-wrap msgid "B" #. type: Plain text -#: doc/tin.1:1406 +#: doc/tin.1:1413 msgid "" "Prompts for a pattern to match. All attachments whose name/description or " "content type/transfer encoding match the pattern will be tagged." msgstr "" #. type: TP -#: doc/tin.1:1406 +#: doc/tin.1:1413 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1409 +#: doc/tin.1:1416 msgid "Reverse tagging of all attachments." msgstr "Markierung der Anhänge umkehren." #. type: TP -#: doc/tin.1:1409 +#: doc/tin.1:1416 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1412 +#: doc/tin.1:1419 msgid "Untag all tagged attachments." msgstr "Markierung der markierten Anhängen aufheben." #. type: Plain text -#: doc/tin.1:1415 +#: doc/tin.1:1422 msgid "Attachment forward search." msgstr "" #. type: Plain text -#: doc/tin.1:1418 +#: doc/tin.1:1425 msgid "Attachment backward search." msgstr "" #. type: TP -#: doc/tin.1:1421 +#: doc/tin.1:1428 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1424 +#: doc/tin.1:1431 msgid "" "Pipe attachment into command. Uses the raw attachment, no decoding is done." msgstr "" #. type: Plain text -#: doc/tin.1:1431 +#: doc/tin.1:1438 msgid "" "Toggle the display of the name/description of the current attachment in the " "last line." @@ -3380,7 +3397,7 @@ msgstr "Name oder Beschreibung des Anhan #. -------------------------------------------------------------------- #. type: SS -#: doc/tin.1:1440 +#: doc/tin.1:1447 #, no-wrap msgid "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" msgstr "" @@ -3389,7 +3406,7 @@ msgstr "" #. - \fI${TIN_LIBDIR:\-NEWSLIBDIR}/tinrc\fR is used #. in the !TIN_DEFAULTS_DIR config case #. type: Plain text -#: doc/tin.1:1452 +#: doc/tin.1:1459 msgid "" "At startup, B reads in the configuration files (see also B<\\" "%tin>(5)). They contain a list of variables that can be used to configure " @@ -3400,7 +3417,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1460 +#: doc/tin.1:1467 msgid "" "The variables are user configurable by editing I<${TIN_HOMEDIR:-\"$HOME\"}/." "tin/tinrc> directly. Most of them can also be set in the GLOBAL OPTIONS MENU " @@ -3411,7 +3428,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1466 +#: doc/tin.1:1473 msgid "" "In the options menu use the cursor keys in the usual way to move around. Use " "B ('B<^J>' or 'BCRE>') to 'open' the option you wish " @@ -3421,7 +3438,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1473 +#: doc/tin.1:1480 msgid "" "As with the other menus, B ('B<^L>') will redraw the screen. You " "can use B ('B'), B ('B') and B " @@ -3431,7 +3448,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1478 +#: doc/tin.1:1485 msgid "" "The options menu provides access to the attributes menu for the current " "group by the B ('BTABE>') command. Pressing " @@ -3440,14 +3457,14 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1481 +#: doc/tin.1:1488 msgid "" "The B ('B') command brings up the scopes menu. For more " "information see section \"SCOPES MENU\"." msgstr "" #. type: Plain text -#: doc/tin.1:1485 +#: doc/tin.1:1492 msgid "" "Here is a full list of all the available variables. The name in braces is " "the name of the corresponding setting in I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/" @@ -3455,13 +3472,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1485 +#: doc/tin.1:1492 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1491 doc/tin.5:1199 +#: doc/tin.1:1498 doc/tin.5:1203 msgid "" "If ON abbreviate long newsgroup names at group selection level and article " "level (if necessary) like this: news.software.readers -E n.software." @@ -3472,13 +3489,13 @@ msgstr "" "readers -E n.s.readers -E n.s.r. Voreinstellung ist OFF." #. type: TP -#: doc/tin.1:1491 +#: doc/tin.1:1498 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1495 doc/tin.5:1203 +#: doc/tin.1:1502 doc/tin.5:1207 msgid "" "If ON add posted articles which start a new thread to filter for " "highlighting follow-ups. Default is ON." @@ -3487,24 +3504,24 @@ msgstr "" "hinzu um eventuelle Antworten hervorzuheben. Voreinstellung ist ON." #. type: TP -#: doc/tin.1:1495 +#: doc/tin.1:1502 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" #. type: Plain text -#: doc/tin.1:1498 doc/tin.5:1206 +#: doc/tin.1:1505 doc/tin.5:1210 msgid "Turn ON advertising in header (''User-Agent:''). Default is ON." -msgstr "Falls ON füge 'User-Agent:'-Header ein. Voreinstellung ist ON." +msgstr "Falls ON füge 'User-Agent:'-Kopfzeile ein. Voreinstellung ist ON." #. type: TP -#: doc/tin.1:1498 +#: doc/tin.1:1505 #, no-wrap msgid "B" msgstr "B<Übersp. multipart/alternative-Teile (alternative_handling)>" #. type: Plain text -#: doc/tin.1:1501 doc/tin.5:1209 +#: doc/tin.1:1508 doc/tin.5:1213 msgid "" "If ON strip multipart/alternative messages automatically. Default is ON." msgstr "" @@ -3512,25 +3529,25 @@ msgstr "" "Voreinstellung ist ON." #. type: TP -#: doc/tin.1:1501 +#: doc/tin.1:1508 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1504 doc/tin.5:1212 +#: doc/tin.1:1511 doc/tin.5:1216 msgid "The character used to show that an article was deleted. Default is 'D'." msgstr "" "Zeichen das anzeigt, dass ein Artikel gelöscht wurde. Voreinstellung ist 'D'." #. type: TP -#: doc/tin.1:1504 +#: doc/tin.1:1511 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1507 doc/tin.5:1215 +#: doc/tin.1:1514 doc/tin.5:1219 msgid "" "The character used to show that an article is in a range. Default is '#'." msgstr "" @@ -3538,13 +3555,13 @@ msgstr "" "befindet. Voreinstellung ist '#'." #. type: TP -#: doc/tin.1:1507 +#: doc/tin.1:1514 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1511 doc/tin.5:1219 +#: doc/tin.1:1518 doc/tin.5:1223 msgid "" "The character used to show that an article will return as an unread article " "when the group is next entered. Default is '-'." @@ -3554,13 +3571,13 @@ msgstr "" "Voreinstellung ist '-'." #. type: TP -#: doc/tin.1:1511 +#: doc/tin.1:1518 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1515 doc/tin.5:1223 +#: doc/tin.1:1522 doc/tin.5:1227 msgid "" "The character used to show that an article/thread is auto-selected (hot). " "Default is '*'." @@ -3569,13 +3586,13 @@ msgstr "" "automatisch ausgewählt ist (heiß). Voreinstellung ist '*'." #. type: TP -#: doc/tin.1:1515 +#: doc/tin.1:1522 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1519 doc/tin.5:1227 +#: doc/tin.1:1526 doc/tin.5:1231 msgid "" "The character used to show that an article/thread is recent (not older than " "X days). See also B. Default is 'o'." @@ -3584,13 +3601,13 @@ msgstr "" "(nicht älter als X Tage). Siehe auch B. Voreinstellung ist ' o'." #. type: TP -#: doc/tin.1:1519 +#: doc/tin.1:1526 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1523 doc/tin.5:1231 +#: doc/tin.1:1530 doc/tin.5:1235 msgid "" "The character used to show that an article has not been read. Default is " "'+'." @@ -3599,26 +3616,26 @@ msgstr "" "Voreinstellung ist '+'." #. type: TP -#: doc/tin.1:1523 +#: doc/tin.1:1530 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1526 doc/tin.5:1234 +#: doc/tin.1:1533 doc/tin.5:1238 msgid "The character used to show that an article was read. Default is ' '." msgstr "" "Zeichen das anzeigt, dass ein Artikel schon gelesen wurde. Voreinstellung " "ist ' '." #. type: TP -#: doc/tin.1:1526 +#: doc/tin.1:1533 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1530 doc/tin.5:1238 +#: doc/tin.1:1537 doc/tin.5:1242 msgid "" "The character used to show that an article was killed. Default is 'K'. " "B must be set accordingly." @@ -3627,26 +3644,26 @@ msgstr "" "'K'). B muss passend gesetzt sein." #. type: TP -#: doc/tin.1:1530 +#: doc/tin.1:1537 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1534 doc/tin.5:1242 +#: doc/tin.1:1541 doc/tin.5:1246 msgid "" "The character used to show that an article was hot before it was read. " "Default is ':'. B must be set accordingly." msgstr "" #. type: TP -#: doc/tin.1:1534 doc/tin.5:1242 +#: doc/tin.1:1541 doc/tin.5:1246 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1539 +#: doc/tin.1:1546 msgid "" "If ON B will ask before using a MIME viewer (B) to " "display MIME messages. This only occurs if a MIME viewer is set. Default is " @@ -3654,26 +3671,26 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1539 +#: doc/tin.1:1546 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1543 doc/tin.5:1253 +#: doc/tin.1:1550 doc/tin.5:1257 msgid "" "Automatically put your name in the ''Cc:'' and/or ''Bcc:'' field when " "mailing an article. Default is No." msgstr "" #. type: TP -#: doc/tin.1:1543 +#: doc/tin.1:1550 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1547 doc/tin.5:1257 +#: doc/tin.1:1554 doc/tin.5:1261 msgid "" "If ON automatically list thread when entering it using right arrow key. " "Default is ON." @@ -3682,24 +3699,24 @@ msgstr "" "anzeigen? Voreinstellung ist ON." #. type: TP -#: doc/tin.1:1547 +#: doc/tin.1:1554 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1550 doc/tin.1:2531 +#: doc/tin.1:1557 doc/tin.1:2540 msgid "Default is OFF." msgstr "Voreinstellung ist OFF." #. type: TP -#: doc/tin.1:1550 +#: doc/tin.1:1557 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1556 doc/tin.5:1266 +#: doc/tin.1:1563 doc/tin.5:1270 msgid "" "If ON articles/threads with ''Archive-name:'' in header will be " "automatically saved with the Archive-name & part/patch no and post processed " @@ -3707,13 +3724,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1556 +#: doc/tin.1:1563 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1561 doc/tin.5:1271 +#: doc/tin.1:1568 doc/tin.5:1275 msgid "" "If set ON articles/threads will be saved in batch mode when save \\&''B<-" "S>'' or mail ''B<-M>, B<-N>'' is specified on the command line. Default is " @@ -3724,13 +3741,13 @@ msgstr "" "Voreinstellung ist ON." #. type: TP -#: doc/tin.1:1561 +#: doc/tin.1:1568 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1566 doc/tin.5:1276 +#: doc/tin.1:1573 doc/tin.5:1280 msgid "" "If set ON a mini menu of the most useful commands will be displayed at the " "bottom of the screen for each level. Also a short posting etiquette will be " @@ -3738,13 +3755,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1566 +#: doc/tin.1:1573 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1571 +#: doc/tin.1:1578 msgid "" "If ON, create local copies of NNTP overview files. This can be used to " "considerably speed up accessing large groups when using a slow connection. " @@ -3752,13 +3769,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1571 +#: doc/tin.1:1578 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1577 doc/tin.5:1287 +#: doc/tin.1:1584 doc/tin.5:1291 msgid "" "Use this hash algorithm for cancel-locks. Only available when build with " "cancel-lock support. none disables the generation of cancel-locks. Valid " @@ -3770,313 +3787,313 @@ msgstr "" "sha512. Voreinstellung ist sha1." #. type: TP -#: doc/tin.1:1577 +#: doc/tin.1:1584 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1583 doc/tin.5:1291 +#: doc/tin.1:1590 doc/tin.5:1295 msgid "" "If set ON the user is asked when quitting if all groups read during the " "current session should be marked read. Default is OFF." msgstr "" #. type: TP -#: doc/tin.1:1583 +#: doc/tin.1:1590 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1586 doc/tin.5:1294 +#: doc/tin.1:1593 doc/tin.5:1298 msgid "Standard background color" msgstr "Standard Hintergrundfarbe" #. type: TP -#: doc/tin.1:1586 +#: doc/tin.1:1593 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1589 doc/tin.5:1297 +#: doc/tin.1:1596 doc/tin.5:1301 msgid "Color of quoted text from external sources" msgstr "Farbe des Fremdzitat-Textes" #. type: TP -#: doc/tin.1:1589 +#: doc/tin.1:1596 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1592 doc/tin.5:1300 +#: doc/tin.1:1599 doc/tin.5:1304 msgid "Color of sender (From:)" msgstr "Farbe des Autors (From:)" #. type: TP -#: doc/tin.1:1592 +#: doc/tin.1:1599 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1595 doc/tin.5:1303 +#: doc/tin.1:1602 doc/tin.5:1307 msgid "Color of header-lines" msgstr "Farbe der Artikelheaderzeilen" #. type: TP -#: doc/tin.1:1595 +#: doc/tin.1:1602 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1598 doc/tin.5:1306 +#: doc/tin.1:1605 doc/tin.5:1310 msgid "Color of help pages" msgstr "Farbe des Hilfstext" #. type: TP -#: doc/tin.1:1598 +#: doc/tin.1:1605 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1601 doc/tin.5:1309 +#: doc/tin.1:1608 doc/tin.5:1313 msgid "Color of background for inverse text" msgstr "Hintergrundfarbe für inversen Text" #. type: TP -#: doc/tin.1:1601 +#: doc/tin.1:1608 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1604 doc/tin.5:1312 +#: doc/tin.1:1611 doc/tin.5:1316 msgid "Color of foreground for inverse text" msgstr "Vordergrundfarbe für inversen Text" #. type: TP -#: doc/tin.1:1604 +#: doc/tin.1:1611 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1608 doc/tin.5:1316 +#: doc/tin.1:1615 doc/tin.5:1320 msgid "" "Color of words emphasized like _this_. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1608 +#: doc/tin.1:1615 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1612 doc/tin.5:1320 +#: doc/tin.1:1619 doc/tin.5:1324 msgid "" "Color of words emphasized like /this/. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1612 +#: doc/tin.1:1619 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1616 doc/tin.5:1324 +#: doc/tin.1:1623 doc/tin.5:1328 msgid "" "Color of words emphasized like *this*. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1616 +#: doc/tin.1:1623 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1620 doc/tin.5:1328 +#: doc/tin.1:1627 doc/tin.5:1332 msgid "" "Color of words emphasized like -this-. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1620 +#: doc/tin.1:1627 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1623 doc/tin.5:1331 +#: doc/tin.1:1630 doc/tin.5:1335 msgid "Color of mini help menu" msgstr "Farbe des Minihilfemenü" #. type: TP -#: doc/tin.1:1623 +#: doc/tin.1:1630 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1626 doc/tin.5:1334 +#: doc/tin.1:1633 doc/tin.5:1338 msgid "Color of actual news header fields" msgstr "Farbe des angezeigten Headers" #. type: TP -#: doc/tin.1:1626 +#: doc/tin.1:1633 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1629 doc/tin.5:1337 +#: doc/tin.1:1636 doc/tin.5:1341 msgid "Standard foreground color" msgstr "Standard Vordergrundfarbe" #. type: TP -#: doc/tin.1:1629 +#: doc/tin.1:1636 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1632 doc/tin.5:1340 +#: doc/tin.1:1639 doc/tin.5:1344 msgid "Color of quoted lines" msgstr "Farbe der zitierten Zeilen" #. type: TP -#: doc/tin.1:1632 +#: doc/tin.1:1639 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1635 doc/tin.5:1343 +#: doc/tin.1:1642 doc/tin.5:1347 msgid "Color of twice quoted lines" msgstr "Farbe von zweifach zitierten Zeilen" #. type: TP -#: doc/tin.1:1635 +#: doc/tin.1:1642 #, no-wrap msgid "B3 times quoted line (col_quote3)>" msgstr "B3-fach zitierten Zeilen (col_quote3)>" #. type: Plain text -#: doc/tin.1:1638 doc/tin.5:1346 +#: doc/tin.1:1645 doc/tin.5:1350 msgid "Color of E=3 times quoted lines" msgstr "Farbe von =E3-fach zitierten Zeilen" #. type: TP -#: doc/tin.1:1638 +#: doc/tin.1:1645 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1642 doc/tin.5:1350 +#: doc/tin.1:1649 doc/tin.5:1354 msgid "" "Color of response counter. This is the text that says \"Response x of y\" in " "the article viewer." msgstr "" #. type: TP -#: doc/tin.1:1642 +#: doc/tin.1:1649 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1645 doc/tin.5:1353 +#: doc/tin.1:1652 doc/tin.5:1357 msgid "Color of signatures" msgstr "Farbe von Signaturen" #. type: TP -#: doc/tin.1:1645 +#: doc/tin.1:1652 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1648 doc/tin.5:1356 +#: doc/tin.1:1655 doc/tin.5:1360 msgid "Color of urls highlight" msgstr "Farbe der hervorgehobenen URLs" #. type: TP -#: doc/tin.1:1648 +#: doc/tin.1:1655 #, no-wrap msgid "B" msgstr "B" # #. type: Plain text -#: doc/tin.1:1651 doc/tin.5:1359 +#: doc/tin.1:1658 doc/tin.5:1363 msgid "Color of verbatim blocks" msgstr "Farbe des wortgetreu darzustellenden Textes" #. type: TP -#: doc/tin.1:1651 +#: doc/tin.1:1658 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1654 doc/tin.5:1362 +#: doc/tin.1:1661 doc/tin.5:1366 msgid "Color of article subject" msgstr "Farbe der Subjectzeile" #. type: TP -#: doc/tin.1:1654 +#: doc/tin.1:1661 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1657 doc/tin.5:1365 +#: doc/tin.1:1664 doc/tin.5:1369 msgid "Color of text-lines" msgstr "Farbe der Textzeilen" #. type: TP -#: doc/tin.1:1657 +#: doc/tin.1:1664 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1660 doc/tin.5:1368 +#: doc/tin.1:1667 doc/tin.5:1372 msgid "Color of help/mail sign" msgstr "Farbe des Hilfe/Mail-Zeichens" #. type: TP -#: doc/tin.1:1660 +#: doc/tin.1:1667 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1663 +#: doc/tin.1:1670 msgid "Ask for manual confirmation to protect the user." msgstr "Vorsichtshalber um Bestätigung bitten." #. type: IP -#: doc/tin.1:1664 doc/tin.1:1670 doc/tin.1:1674 +#: doc/tin.1:1671 doc/tin.1:1677 doc/tin.1:1681 #, no-wrap msgid "\\(bu" msgstr "\\(bu" #. TODO: check if all affected commands are marked [after confirmation] #. type: Plain text -#: doc/tin.1:1670 +#: doc/tin.1:1677 msgid "" "B Ask for confirmation before executing certain dangerous commands " "(e.g., B ('B')). Commands that this affects are marked in this " @@ -4084,21 +4101,21 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1674 +#: doc/tin.1:1681 msgid "" "B You'll be asked to confirm that you wish to exit B when you use " "the B ('B') command." msgstr "" #. type: Plain text -#: doc/tin.1:1678 +#: doc/tin.1:1685 msgid "" "B: Ask for confirmation before marking all not selected (with " "B ('B') command) articles as read." msgstr "" #. type: Plain text -#: doc/tin.5:1389 +#: doc/tin.5:1393 msgid "Default is commands & quit." msgstr "Voreinstellung ist Kommandos & Ende." #. type: Plain text -#: doc/tin.5:1400 +#: doc/tin.5:1404 msgid "" "Format string used for date representation. A description of the different " "format options can be found at B<\\%strftime>(3). B<\\%tin>(1) uses B<\\" @@ -11701,61 +11765,61 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1400 +#: doc/tin.5:1404 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1402 +#: doc/tin.5:1406 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1404 +#: doc/tin.5:1408 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1407 +#: doc/tin.5:1411 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1410 +#: doc/tin.5:1414 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1414 +#: doc/tin.5:1418 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1419 +#: doc/tin.5:1423 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1423 +#: doc/tin.5:1427 #, no-wrap msgid "B" msgstr "B" #. type: ta -#: doc/tin.5:1428 doc/tin.5:1457 +#: doc/tin.5:1432 doc/tin.5:1461 #, no-wrap msgid "\\w'0,1 'u +\\w'\\'\\'Message-ID:\\'\\' & last \\'\\'References:\\'\\' entry only'u" msgstr "\\w'0,1 'u +\\w'\\'\\'Message-ID:\\'\\' & letzter \\'\\'References:\\'\\' Eintrag'u" #. type: Plain text -#: doc/tin.5:1437 doc/tin.5:1466 +#: doc/tin.5:1441 doc/tin.5:1470 #, no-wrap msgid "" "0\t''Subject:'' (case sensitive)\n" @@ -11777,139 +11841,139 @@ msgstr "" "7\t''Lines:''\n" #. type: TP -#: doc/tin.5:1439 +#: doc/tin.5:1443 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1443 +#: doc/tin.5:1447 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1448 +#: doc/tin.5:1452 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1452 +#: doc/tin.5:1456 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1468 +#: doc/tin.5:1472 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1470 +#: doc/tin.5:1474 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1472 +#: doc/tin.5:1476 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1474 +#: doc/tin.5:1478 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1476 +#: doc/tin.5:1480 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1478 +#: doc/tin.5:1482 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1480 +#: doc/tin.5:1484 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1482 +#: doc/tin.5:1486 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1484 +#: doc/tin.5:1488 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1486 +#: doc/tin.5:1490 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1488 +#: doc/tin.5:1492 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1490 +#: doc/tin.5:1494 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1492 +#: doc/tin.5:1496 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1494 +#: doc/tin.5:1498 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1496 +#: doc/tin.5:1500 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1498 +#: doc/tin.5:1502 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1500 +#: doc/tin.5:1504 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1502 +#: doc/tin.5:1506 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1511 +#: doc/tin.5:1515 msgid "" "The format string used to create the editor start command with parameters. " "Default is '%E +%N %F' with %E=Editor, %N=Linenumber and %F=Filename (e.g., /" @@ -11917,13 +11981,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1514 +#: doc/tin.5:1518 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1521 +#: doc/tin.5:1525 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, " @@ -11931,19 +11995,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1521 +#: doc/tin.5:1525 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1525 +#: doc/tin.5:1529 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1532 +#: doc/tin.5:1536 msgid "" "If B is E 0 not more than the last B " "articles/group are fetched from the server. If B is E 0 B<" @@ -11952,13 +12016,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1532 +#: doc/tin.5:1536 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1546 +#: doc/tin.5:1550 msgid "" "Which keys B<%tin>(1) should accept to jump to the next unread article. " "Possible is any combination of B and B. When " @@ -11969,7 +12033,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1553 +#: doc/tin.5:1557 msgid "" "The format string used for the Group level. Default is \"%n\\ %m\\ %R\\ %L\\ " "\\ %s\\ \\ %F\". The following substitutions are supported:" @@ -11979,13 +12043,13 @@ msgstr "" "Ersetzungen werden unterstützt:" #. type: ta -#: doc/tin.5:1555 +#: doc/tin.5:1559 #, no-wrap msgid "\\w'%G 'u +\\w'number of responses in thread'u" msgstr "\\w'%G 'u +\\w'Absender, Name und/oder E-Mail Adresse'u" #. type: Plain text -#: doc/tin.5:1567 +#: doc/tin.5:1571 #, no-wrap msgid "" "%D\tdate\n" @@ -12013,31 +12077,31 @@ msgstr "" "%%\t%\n" #. type: TP -#: doc/tin.5:1569 +#: doc/tin.5:1573 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1579 +#: doc/tin.5:1583 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1586 +#: doc/tin.5:1590 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1592 +#: doc/tin.5:1596 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1598 +#: doc/tin.5:1602 msgid "" "If greater than 0 your mailreader will be invoked earlier for reply so you " "can use more of its features (e.g. MIME, pgp, ...). 1 means include headers, " @@ -12046,32 +12110,32 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1598 +#: doc/tin.5:1602 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1602 +#: doc/tin.5:1606 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1607 +#: doc/tin.5:1611 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1611 +#: doc/tin.5:1615 msgid "" "This option controls the processing and display of articles that are killed. " "There are 3 options, default is 0 (B)." msgstr "" #. type: Plain text -#: doc/tin.5:1619 +#: doc/tin.5:1623 msgid "" "B is the 'traditional' behavior of B<\\%tin>(1). " "Only unread articles are killed once only by marking them read. As filtering " @@ -12081,106 +12145,106 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1635 +#: doc/tin.5:1639 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1645 +#: doc/tin.5:1649 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1650 +#: doc/tin.5:1654 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1669 +#: doc/tin.5:1673 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1706 +#: doc/tin.5:1710 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1718 doc/tin.5:2421 +#: doc/tin.5:1722 doc/tin.5:2426 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1751 +#: doc/tin.5:1755 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1756 +#: doc/tin.5:1760 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1761 +#: doc/tin.5:1765 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1766 +#: doc/tin.5:1770 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1771 +#: doc/tin.5:1775 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1777 +#: doc/tin.5:1781 msgid "" "These are internal timers used by B<\\%tin>(1) to keep track of new " "newsgroups. Do not change them unless you understand what they are for." msgstr "" #. type: TP -#: doc/tin.5:1798 +#: doc/tin.5:1802 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1801 +#: doc/tin.5:1805 msgid "Time in seconds to wait for a response from the server. Default is 120." msgstr "" "Maximal n Sekunden auf eine Antwort vom Server warten (0 = kein Zeitlimit). " "Voreinstellung ist 120." #. type: TP -#: doc/tin.5:1801 +#: doc/tin.5:1805 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1805 +#: doc/tin.5:1809 msgid "" "The normalization form which should be used to normalize unicode input. The " "possible values are:" msgstr "" #. type: Plain text -#: doc/tin.5:1821 +#: doc/tin.5:1827 msgid "" "Some normalization modes are only available if they are supported by the " "library B<\\%tin>(1) uses to do the normalization. NFC should be used if " @@ -12188,7 +12252,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1849 +#: doc/tin.5:1855 msgid "" "If ON, then B<\\%tin>(1) will start an appropriate viewer program to " "display any files that were post processed and uudecoded. The program is " @@ -12196,7 +12260,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1855 +#: doc/tin.5:1861 msgid "" "This specifies whether to perform post processing on saved articles. " "Because the shell archive may contain commands you may not want to be " @@ -12205,7 +12269,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1863 +#: doc/tin.5:1869 msgid "" "B, unpacking of multi-part B<\\%shar>(1) files only. " "Because the shell archive may contain commands you may not want to be " @@ -12213,19 +12277,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1866 +#: doc/tin.5:1872 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1876 +#: doc/tin.5:1882 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1886 +#: doc/tin.5:1892 msgid "" "The printer program with options that is to be used to print articles. The " "default is B<\\%lpr>(1) for BSD machines and B<\\%lp>(1) for SysV " @@ -12234,22 +12298,22 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1894 +#: doc/tin.5:1900 msgid "" "If ON show empty ''Followup-To:'' header when editing an article. Default " "is OFF." msgstr "" -"Falls ON zeige leeren ''Followup-To:''-Header im Editor. Voreinstellung ist " +"Falls ON zeige leere ''Followup-To:''-Kopfzeile im Editor. Voreinstellung ist " "OFF." #. type: TP -#: doc/tin.5:1900 +#: doc/tin.5:1906 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1906 +#: doc/tin.5:1912 msgid "" "This bit coded integer value controls how articles are to be quoted when " "following up or replying to them. Any of the following options can be " @@ -12258,7 +12322,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1911 +#: doc/tin.5:1917 msgid "" "B Compress quote characters together when quoting multiple " "times (for example, 'E E E' will be turned into " @@ -12266,7 +12330,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1917 +#: doc/tin.5:1923 msgid "" "B This option is off by default. Signatures are always " "quoted regardless of this option when you are viewing an article in raw mode " @@ -12275,18 +12339,18 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1919 +#: doc/tin.5:1925 msgid "B This option is on by default." msgstr "B Diese Option ist standardmäßig aktiviert." #. type: TP -#: doc/tin.5:1920 +#: doc/tin.5:1926 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1927 +#: doc/tin.5:1933 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then B<" @@ -12294,13 +12358,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1927 +#: doc/tin.5:1933 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1934 +#: doc/tin.5:1940 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -12308,13 +12372,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1934 +#: doc/tin.5:1940 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1941 +#: doc/tin.5:1947 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -12322,19 +12386,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1941 +#: doc/tin.5:1947 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1945 +#: doc/tin.5:1951 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1952 +#: doc/tin.5:1958 msgid "" "If ON B<%tin>(1) does the rendering of bi-directional text. If OFF B<" "%tin>(1) leaves the rendering of bi-directional text to the terminal. " @@ -12342,49 +12406,49 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1952 +#: doc/tin.5:1958 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1961 +#: doc/tin.5:1967 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1965 +#: doc/tin.5:1971 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1969 +#: doc/tin.5:1975 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1973 +#: doc/tin.5:1979 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1977 +#: doc/tin.5:1983 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1985 +#: doc/tin.5:1991 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1989 +#: doc/tin.5:1995 msgid "" "The format string used for the Selection level. Default is \"%f\\ %n\\ %U\\ " "\\ %G\\ \\ %d\". The following substitutions are supported:" @@ -12394,13 +12458,13 @@ msgstr "" "Ersetzungen werden unterstützt:" #. type: ta -#: doc/tin.5:1991 +#: doc/tin.5:1997 #, no-wrap msgid "\\w'%G 'u +\\w'current group number'u" msgstr "\\w'%G 'u +\\w'Anzahl ungelesener Artikel'u" #. type: Plain text -#: doc/tin.5:1998 +#: doc/tin.5:2004 #, no-wrap msgid "" "%G\tgroup name\n" @@ -12418,19 +12482,19 @@ msgstr "" "%%\t%\n" #. type: TP -#: doc/tin.5:2000 +#: doc/tin.5:2006 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2031 +#: doc/tin.5:2037 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2040 +#: doc/tin.5:2046 msgid "" "If ON show a short group description text after newsgroup name at the group " "selection level. The ''B<-d>'' command-line flag will override the setting " @@ -12441,32 +12505,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2062 +#: doc/tin.5:2068 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:2083 -msgid "" -"The path that specifies the signature file to use when posting, following up " -"to or replying to an article. If the path is a directory then the signature " -"will be randomly generated from files that are in the specified directory. " -"If the path starts with a ! the program the path points to will be executed " -"to generate a signature. In order to pass the group name to the program, %G " -"can be specified. This will be replaced by the name of the current " -"newsgroup. program. --none will suppress any signature. Default is I<" -"${TIN_HOMEDIR:-\"$HOME\"}/.Sig>." -msgstr "" - #. type: TP -#: doc/tin.5:2086 +#: doc/tin.5:2091 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2093 +#: doc/tin.5:2098 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -12474,19 +12525,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2139 +#: doc/tin.5:2144 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2146 +#: doc/tin.5:2151 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2153 +#: doc/tin.5:2158 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -12494,31 +12545,31 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2158 +#: doc/tin.5:2163 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2162 +#: doc/tin.5:2167 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2171 +#: doc/tin.5:2176 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2175 +#: doc/tin.5:2180 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2182 +#: doc/tin.5:2187 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -12526,7 +12577,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2187 +#: doc/tin.5:2192 msgid "" "Decode German style TeX umlaut codes to ISO If ON, show \"a as Umlaut-a, " "etc. Default is OFF. This behavior can also be toggled in the article viewer " @@ -12534,19 +12585,19 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2197 +#: doc/tin.5:2202 msgid "" "Defines which threading method to use. The choices are: 0) Don't thread, 1) " "Thread on Subject only 2) Thread on References only, 3) Thread on References " "then Subject (default) 4) Thread multipart articles on Subject. 5) Thread " "on Percentage Match of the Subjects It's also possible to set the threading " "type on a per group basis by setting the group attribute variable " -"B to 0 - 5 in the file I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/" +"B to 0 \\(en 5 in the file I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/" "attributes>." msgstr "" #. type: Plain text -#: doc/tin.5:2201 +#: doc/tin.5:2206 msgid "" "The format string used for the Thread level. Default is \"%n\\ %m\\ \\ " "[%L]\\ \\ %T\\ \\ %F\". The following substitutions are supported:" @@ -12556,13 +12607,13 @@ msgstr "" "Ersetzungen werden unterstützt:" #. type: ta -#: doc/tin.5:2203 +#: doc/tin.5:2208 #, no-wrap msgid "\\w'%G 'u +\\w'from, name and/or address'u" msgstr "\\w'%G 'u +\\w'Subject und/oder Baumdarstellung des Thread'u" #. type: Plain text -#: doc/tin.5:2214 +#: doc/tin.5:2219 #, no-wrap msgid "" "%D\tdate\n" @@ -12588,7 +12639,7 @@ msgstr "" "%%\t%\n" #. type: Plain text -#: doc/tin.5:2221 +#: doc/tin.5:2226 msgid "" "Defines how close the subjects must match while threading by Percentage " "Match for threads to be considered part of a single thread. This value is in " @@ -12596,32 +12647,32 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2225 +#: doc/tin.5:2230 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2237 +#: doc/tin.5:2242 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2251 +#: doc/tin.5:2256 msgid "" "Allows you to select how B<%tin>(1) treats blank lines in article bodies. " "Default is 0. This option does not affect lines within verbatim blocks." msgstr "" #. type: TP -#: doc/tin.5:2270 +#: doc/tin.5:2275 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2277 +#: doc/tin.5:2282 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -12629,13 +12680,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2277 +#: doc/tin.5:2282 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2281 +#: doc/tin.5:2286 msgid "" "If ON remove I<${TIN_HOMEDIR:-\"$HOME\"}/.article> after posting. Default is " "ON." @@ -12644,54 +12695,54 @@ msgstr "" "Voreinstellung ist ON." #. type: TP -#: doc/tin.5:2281 +#: doc/tin.5:2286 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2286 +#: doc/tin.5:2291 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2289 +#: doc/tin.5:2294 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2294 +#: doc/tin.5:2299 msgid "If enabled B<\\%tin>(1) uses ANSI-colors. Default is OFF." msgstr "" #. type: TP -#: doc/tin.5:2294 +#: doc/tin.5:2299 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2297 +#: doc/tin.5:2302 msgid "Use scroll keys on keypad. Default is OFF." msgstr "" "Navigationstasten auf dem Tastenfeld verwenden. Voreinstellung ist OFF." #. type: TP -#: doc/tin.5:2297 +#: doc/tin.5:2302 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2303 +#: doc/tin.5:2308 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2315 +#: doc/tin.5:2320 msgid "" "If enabled B<\\%slrnface>(1) will be used to interpret the ''X-Face:'' " "header. For this option to have any effect, B<\\%tin>(1) must be running in " @@ -12700,19 +12751,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2315 +#: doc/tin.5:2320 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2319 +#: doc/tin.5:2324 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2323 +#: doc/tin.5:2328 msgid "" "A regular expression that B will use to find the begin of a verbatim " "block. Default is #v+" @@ -12721,13 +12772,13 @@ msgstr "" "Absatzes findet. Voreinstellung ist #v+" #. type: TP -#: doc/tin.5:2323 +#: doc/tin.5:2328 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2327 +#: doc/tin.5:2332 msgid "" "A regular expression that B will use to find the end of a verbatim " "block. Default is #v-" @@ -12736,13 +12787,13 @@ msgstr "" "Absatzes findet. Voreinstellung ist #v-" #. type: TP -#: doc/tin.5:2330 +#: doc/tin.5:2335 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2346 +#: doc/tin.5:2351 msgid "" "Allows you to select how B<\\%tin>(1) matches strings. The default is 0 and " "uses the wildmat notation, which is how this has traditionally been " @@ -12754,31 +12805,31 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2346 +#: doc/tin.5:2351 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2358 +#: doc/tin.5:2363 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2366 +#: doc/tin.5:2371 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2382 +#: doc/tin.5:2387 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2398 +#: doc/tin.5:2403 msgid "" "Yet another global configuration file with \"I=I\" pairs. " "This one is for the more general options which usually can't be controlled " @@ -12788,31 +12839,31 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2398 +#: doc/tin.5:2403 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2401 +#: doc/tin.5:2406 msgid "Sets a global domain name used in From lines" msgstr "Setzt den globalen Domänennamen, der in From-Zeilen verwendet wird" #. type: Plain text -#: doc/tin.5:2405 +#: doc/tin.5:2410 msgid "" "Defines the name of your organization. $B overrides any " "specified value." msgstr "" #. type: TP -#: doc/tin.5:2405 +#: doc/tin.5:2410 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2410 +#: doc/tin.5:2415 msgid "" "Defines the default place for some configuration files, common values are I, I, I or I. " @@ -12820,40 +12871,45 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2410 +#: doc/tin.5:2415 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2416 +#: doc/tin.5:2421 msgid "" "Defines the email address to which users can send bug reports using a built-" "in function. The default points to a developers mailing list located at tin." "org. You might want to change this address to one of your local " "administration if you want to deal with your lusers problems on your own." msgstr "" +"Definiert die E-Mail-Adresse, an die Benutzer Fehlerberichte über eine " +"integrierte Funktion senden können. Die Voreinstellung zeigt auf eine " +"Entwickler-Mailingliste auf tin.org. Sie können diese Adresse in eine lokale " +"ändern, wenn Sie die Probleme Ihrer Benutzer selbst lösen wollen." #. type: TP -#: doc/tin.5:2416 +#: doc/tin.5:2421 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2421 -msgid "Defines the directory containing of the B<\\%inews>(1) executable" +#: doc/tin.5:2426 +msgid "Defines the directory containing the B<\\%inews>(1) executable." msgstr "" +"Definiert das Verzeichnis, wleches das ausführbare B<\\%inews>(1) enthält." #. type: Plain text -#: doc/tin.5:2425 +#: doc/tin.5:2430 msgid "" "Default charset to be used in MIME's ''Content-Type:'' header. " "$B overrides any specified value." msgstr "" #. type: Plain text -#: doc/tin.5:2428 +#: doc/tin.5:2433 msgid "" "Default encoding scheme used in MIME articles. 8bit might be the best value." msgstr "" @@ -12861,7 +12917,7 @@ msgstr "" "die beste Wahl." #. type: Plain text -#: doc/tin.5:2432 +#: doc/tin.5:2437 msgid "" "Default encoding scheme used in MIME letters. quoted-printable is a good " "choice here." @@ -12870,13 +12926,13 @@ msgstr "" "eine gute Wahl." #. type: TP -#: doc/tin.5:2432 +#: doc/tin.5:2437 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2438 +#: doc/tin.5:2443 msgid "" "Allow unregistered top level domains. As the list of valid TLDs is no longer " "actively maintained the default was changed to ON starting with B<\\" @@ -12887,13 +12943,13 @@ msgstr "" "Voreinstellung auf ON geändert." #. type: TP -#: doc/tin.5:2438 +#: doc/tin.5:2443 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2442 +#: doc/tin.5:2447 msgid "" "Don't generate a ''Sender:'' header. This has an effect only if " "B is set to --internal." @@ -12902,13 +12958,13 @@ msgstr "" "steht wird die Einstellung ignoriert." #. type: TP -#: doc/tin.5:2442 +#: doc/tin.5:2447 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2447 +#: doc/tin.5:2452 msgid "" "Base of your newsspool (Bnews, Cnews and INN traditional spool style), " "common values are I, I, I. " @@ -12916,13 +12972,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2447 +#: doc/tin.5:2452 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2455 +#: doc/tin.5:2460 msgid "" "Base of your NOV database B<\\%newsoverview>(5) (tradspool style; might be " "the same dir as I), common values are I, I" msgstr "B" #. type: Plain text -#: doc/tin.5:2459 +#: doc/tin.5:2464 msgid "" "Name of a single overview file, common values are I<.overview>, I. $B overrides any specified value." @@ -12946,13 +13002,13 @@ msgstr "" "view>. $B übersteuert den angegebenen Wert." #. type: TP -#: doc/tin.5:2459 +#: doc/tin.5:2464 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2464 +#: doc/tin.5:2469 msgid "" "Full pathname of your newssystem's overview.fmt file; usually the overview." "fmt file is in I, so you only have to change this setting if " @@ -12960,13 +13016,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2464 +#: doc/tin.5:2469 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2470 +#: doc/tin.5:2475 msgid "" "Full pathname of your newssystem's active file; usually the active file " "resides in I and is named I, so you only have to change " @@ -12975,13 +13031,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2470 +#: doc/tin.5:2475 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2475 +#: doc/tin.5:2480 msgid "" "Full pathname of your newssystem's active.times file; usually the active." "times file is I, so you only have to change this setting if your " @@ -12989,13 +13045,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2475 +#: doc/tin.5:2480 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2480 +#: doc/tin.5:2485 msgid "" "Full pathname of your newssystem's newsgroups file; usually the newsgroups " "file is in I, so you only have to change this setting if your " @@ -13006,13 +13062,13 @@ msgstr "" "Einstellung nur ändern müssen wenn sich Ihre Konfiguration unterscheidet." #. type: TP -#: doc/tin.5:2480 +#: doc/tin.5:2485 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2485 +#: doc/tin.5:2490 msgid "" "Full pathname of your newssystem's subscriptions file; usually the " "subscriptions file is in I, so you only have to change this " @@ -13024,12 +13080,12 @@ msgstr "" "unterscheidet." #. type: Plain text -#: doc/tin.5:2489 +#: doc/tin.5:2494 msgid "I" msgstr "I" #. type: Plain text -#: doc/tin.5:2493 +#: doc/tin.5:2498 msgid "" "translation into language specified in $B, $B or " "$B" @@ -13038,7 +13094,7 @@ msgstr "" "Sprache" #. type: Plain text -#: doc/tin.5:2507 +#: doc/tin.5:2512 msgid "" "This file lists the newsgroups that the local site receives. Each newsgroup " "should be listed only once. Each line specifies one group; within each " @@ -13052,7 +13108,7 @@ msgstr "" #. TODO: IIRC tin issues just a warning in that case? #. type: Plain text -#: doc/tin.5:2512 +#: doc/tin.5:2517 msgid "" "If an article is posted to newsgroups not mentioned in this file, those " "newsgroups are ignored. If no valid newsgroups are specified, the article " @@ -13063,7 +13119,7 @@ msgstr "" "Newsgruppen angegeben werden, wird der Artikel zurückgewiesen." #. type: Plain text -#: doc/tin.5:2515 +#: doc/tin.5:2520 msgid "" "Each line consists of four space-separated fields \"I I " "I I\"." @@ -13072,30 +13128,30 @@ msgstr "" "I I I\"." #. type: TP -#: doc/tin.5:2515 doc/tin.5:2568 +#: doc/tin.5:2520 doc/tin.5:2573 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2518 +#: doc/tin.5:2523 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2521 +#: doc/tin.5:2526 msgid "is the highest article number that has been used in that newsgroup" msgstr "die höchste Artikelnummer die je in der Gruppe benutzt wurde" #. type: TP -#: doc/tin.5:2521 +#: doc/tin.5:2526 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2528 +#: doc/tin.5:2533 msgid "" "is the lowest article number in the group; this number is not guaranteed to " "be accurate, and should only be taken to be a hint. Note that because of " @@ -13111,92 +13167,92 @@ msgstr "" "Newsgroup." #. type: TP -#: doc/tin.5:2528 +#: doc/tin.5:2533 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2531 +#: doc/tin.5:2536 msgid "can be one of those" msgstr "kann eines der folgenden sein" #. type: TP -#: doc/tin.5:2532 +#: doc/tin.5:2537 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2535 +#: doc/tin.5:2540 msgid "local postings are allowed" msgstr "lokale Postings sind erlaubt" #. type: TP -#: doc/tin.5:2535 +#: doc/tin.5:2540 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2538 +#: doc/tin.5:2543 msgid "no local postings are allowed, only remote ones" msgstr "" "lokale Postings sind nicht erlaubt, Artikel kommen nur über andere Server" #. type: TP -#: doc/tin.5:2538 +#: doc/tin.5:2543 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2541 +#: doc/tin.5:2546 msgid "the group is moderated and all postings must be approved" msgstr "die Gruppe ist moderiert und alle Postings müssen approved werden" #. type: TP -#: doc/tin.5:2541 +#: doc/tin.5:2546 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2544 +#: doc/tin.5:2549 msgid "articles in this group are not kept, but only passed on" msgstr "" "Artikel in dieser Gruppe werden nicht gespeichert sondern nur durchgereicht" #. type: TP -#: doc/tin.5:2544 +#: doc/tin.5:2549 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2547 +#: doc/tin.5:2552 msgid "articles cannot be posted to this newsgroup" msgstr "in diese Gruppe darf nicht gepostet werden" #. type: TP -#: doc/tin.5:2547 +#: doc/tin.5:2552 #, no-wrap msgid "B<=foo.bar>" msgstr "B<=foo.bar>" #. type: Plain text -#: doc/tin.5:2550 +#: doc/tin.5:2555 msgid "articles are locally filed into the ''foo.bar'' group" msgstr "Artikel werden auf dem Server in der Gruppe ''foo.bar'' abgelegt" #. type: TP -#: doc/tin.5:2551 doc/tin.5:2578 doc/tin.5:2601 +#: doc/tin.5:2556 doc/tin.5:2583 doc/tin.5:2606 #, no-wrap msgid "B<\\%tin>(1)" msgstr "B<\\%tin>(1)" #. type: Plain text -#: doc/tin.5:2557 +#: doc/tin.5:2562 msgid "" "only tries to read the file if you read directly from the local spool, if " "you read news via NNTP, B<\\%tin>(1) uses the LIST (B) or LIST " @@ -13207,7 +13263,7 @@ msgstr "" "LIST (B) oder LIST COUNTS (B)." #. type: Plain text -#: doc/tin.5:2568 +#: doc/tin.5:2573 msgid "" "This file provides a chronological record of when newsgroups are created. It " "is normally updated by the local news server (e.g. B<\\%innd>(8)) whenever " @@ -13221,7 +13277,7 @@ msgstr "" "I\"." #. type: Plain text -#: doc/tin.5:2575 +#: doc/tin.5:2580 msgid "" "is the time when the group was created, expressed as the number of seconds " "since the Epoch." @@ -13230,18 +13286,18 @@ msgstr "" "Beginn der Epoche." #. type: TP -#: doc/tin.5:2575 +#: doc/tin.5:2580 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2578 +#: doc/tin.5:2583 msgid "is the electronic mail address of the person who created the group." msgstr "die Mailadresse der Person die die Gruppe angelegt hat." #. type: Plain text -#: doc/tin.5:2584 +#: doc/tin.5:2589 msgid "" "only tries to read the file if you read directly from the local spool, if " "you read news via NNTP, B<\\%tin>(1) uses the NEWGROUPS (B) " @@ -13252,7 +13308,7 @@ msgstr "" "(B) Befehl." #. type: Plain text -#: doc/tin.5:2595 +#: doc/tin.5:2600 msgid "" "This file provides short descriptions of each newsgroup. It is normally " "updated by the local news server (e.g. B<\\%innd>(8)) whenever a new group " @@ -13265,7 +13321,7 @@ msgstr "" "Tabulator getrennten Feldern \"I\tI\"." #. type: Plain text -#: doc/tin.5:2607 +#: doc/tin.5:2612 msgid "" "only tries to read the file if you read directly from the local spool, if " "you read news via NNTP, B<\\%tin>(1) uses the LIST NEWSGROUPS (B) Befehl." #. type: Plain text -#: doc/tin.5:2616 +#: doc/tin.5:2621 msgid "" "This file might hold a default organization to be used in the " "''Organization:'' header. $B has a higher priority if set." @@ -13286,7 +13342,7 @@ msgstr "" "Priorität falls gesetzt." #. type: Plain text -#: doc/tin.5:2634 +#: doc/tin.5:2639 msgid "" "This file specifies the organization of the news overview database (see also " "B<\\%newsoverview>(5)). The order of lines in this file is important; it " @@ -13304,23 +13360,23 @@ msgstr "" "Befehl LIST OVERVIEW.FMT (B)." #. type: Plain text -#: doc/tin.5:2649 +#: doc/tin.5:2654 msgid "" -"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 the news server. B<\\%tin>(1) only tries to read the file if you read " -"directly from the local spool, if you read news via NNTP, B<\\%tin>(1) uses " -"the LIST SUBSCRIPTIONS (B) command instead." -msgstr "" -"Diese Datei enthält eine Liste von Newsgroups - eine pro Zeile - die der " -"Client abonnieren sollte, wenn der Benutzer keine ${TIN_HOMEDIR:-\"$HOME\"}/." -"newsrc für den Newsserver hat. B<\\%tin>(1) versucht die Datei nur dann zu " -"lesen, wenn Sie direkt aus dem lokalen Spool lesen. Falls Sie Nachrichten " +"This file contains a list of newsgroups \\(em one per line \\(em which the " +"client should subscribe to when the user has no ${TIN_HOMEDIR:-\"$HOME\"}/." +"newsrc for the news server. B<\\%tin>(1) only tries to read the file if " +"you read directly from the local spool, if you read news via NNTP, B<\\" +"%tin>(1) uses the LIST SUBSCRIPTIONS (B) command instead." +msgstr "" +"Diese Datei enthält eine Liste von Newsgroups \\(em eine pro Zeile \\(em die " +"der Client abonnieren sollte, wenn der Benutzer keine ${TIN_HOMEDIR:-\"$HOME" +"\"}/.newsrc für den Newsserver hat. B<\\%tin>(1) versucht die Datei nur dann " +"zu lesen, wenn Sie direkt aus dem lokalen Spool lesen. Falls Sie Nachrichten " "mittels NNTP lesen, verwendet B<\\%tin>(1) stattdessen den Befehl LIST " "SUBSCRIPTIONS (B)." #. type: Plain text -#: doc/tin.5:2696 +#: doc/tin.5:2701 msgid "" "B<\\%elm>(1), B<\\%inews>(1), B<\\%ispell>(1), B<\\%lp>(1), B<\\%lpr>(1), B<" "\\%metamail>(1), B<\\%perl>(1), B<\\%perlre>(1), B<\\%pgp>(1), B<\\%rn>(1), " diff -Nurp '--exclude=.bzr*' tin-2.4.2/doc/l10n/en_GB/tin.1 tin-2.4.3/doc/l10n/en_GB/tin.1 --- tin-2.4.2/doc/l10n/en_GB/tin.1 2017-12-08 09:41:48.000000000 +0100 +++ tin-2.4.3/doc/l10n/en_GB/tin.1 2018-12-06 10:32:24.003256060 +0100 @@ -3,7 +3,7 @@ .\" Module : tin.1 .\" Author : I. Lea, U. Janssen .\" Created : 1991-08-23 -.\" Updated : 2017-10-06 +.\" Updated : 2018-11-07 .\" Notes : use american english; still needs some work, e.g.: .\" - document authorization (.newsauth) .\" - document random organization feature @@ -14,7 +14,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH tin 1 "December 24th, 2017" 2.4.2 "Usenet newsreader" +.TH tin 1 "December 24th, 2018" 2.4.3 "Usenet newsreader" .\" .\" .SH NAME @@ -112,7 +112,8 @@ Don't load newsgroup descriptions and se .TP \fB\-D\fP\fI debug\-level\fP Enter debug\-level (1 = NNTP, 2 = filter, 4 = newsrc, 8 = threading, 16 = -memory, 32 = attributes, 64 = misc, 128 = remove existing debug files). +memory, 32 = attributes, 64 = misc, 128 = remove existing debug files). For +NNTP\-level \*(rq\fB\-v\fP\*(rq controls the verbosity of the output. .TP \fB\-f\fP\fI file\fP Use the specified file of subscribed to newsgroups in place of @@ -124,7 +125,11 @@ Use the server and newsrc specified in NNTP. .TP \fB\-G\fP\fI article\-limit\fP -Limit the number of articles/group to retrieve from the server. +Limit the number of articles/group to retrieve from the server. If +\fIarticle\-limit\fP is > 0 not more than the last \fIarticle\-limit\fP +articles/group are fetched from the server. If \fIarticle\-limit\fP is < 0 +\fBtin\fP will start fetching articles from your first unread minus absolute +value of \fIarticle\-limit\fP. Default is 0, which means no limit. .TP \fB\-h\fP Help listing all command\-line options. @@ -208,8 +213,9 @@ option. This option is disabled if \fBti NNTP server and \fBcache_overview_files\fP is turned off. .TP \fB\-v\fP -Verbose mode for \*(rq\fB\-c\fP\*(rq, \*(rq\fB\-M\fP\*(rq, \*(rq\fB\-N\fP\*(rq, \*(rq\fB\-S\fP\*(rq, \&\*(rq\fB\-u\fP\*(rq and -\&\*(rq\fB\-Z\fP\*(rq options. +Verbose mode for \*(rq\fB\-D\fP\*(rq, \*(rq\fB\-c\fP\*(rq, \*(rq\fB\-M\fP\*(rq, \*(rq\fB\-N\fP\*(rq, \&\*(rq\fB\-S\fP\*(rq, +\&\*(rq\fB\-u\fP\*(rq and \*(rq\fB\-Z\fP\*(rq options. Can be used multiple times to increase +verbosity. .TP \fB\-V\fP Print version and date information. @@ -286,10 +292,10 @@ 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\fP) 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 NNTP -List Extensions (\fBRFC\%6048\fP) and all modern servers should understand it. +directory (i.e., \fI${TIN_LIBDIR:\-NEWSLIBDIR}/subscriptions\fP) and should be +world readable. If you read news via NNTP, then your news server must +support the LIST SUBSCRIPTIONS command. It is part of the NNTP List +Extensions (\fBRFC\%6048\fP) and all modern servers should understand it. .SS "SCREEN FORMAT" \fBtin\fP has four separate levels of operation: Selection level, Group level, Thread level and Article level. @@ -368,13 +374,13 @@ redirected. If a thread has unread articles it is marked with \fBart_marked_unread\fP in front of the total number of articles in the thread. If there are recent articles within the thread it might be marked with \fBart_marked_recent\fP in -front of the total number of articles in the thread \- this is controlled by -the \fBrecent_time\fP option. If a thread has hot articles in it (see also +front of the total number of articles in the thread \(em this is controlled +by the \fBrecent_time\fP option. If a thread has hot articles in it (see also section "FILTERING ARTICLES") it's marked with \fBart_marked_selected\fP in front of the total number of articles in the thread. The number of lines of the first (unread) article in the thread might also be shown right before -the subject \- this is controlled by the \fBshow_info\fP option. The display can -be customised via \fBgroup_format\fP. +the subject \(em this is controlled by the \fBshow_info\fP option. The display +can be customised via \fBgroup_format\fP. .PP .\" FIXME - make this auto scale .nf @@ -602,11 +608,11 @@ OPTIONS MENU AND TINRC CONFIGURABLE VARI Positions the cursor on the next group with unread articles in it. .TP \fBQuit 'q'\fP -Quit \fBtin\fP \- ask the user to confirm if \fBconfirm_choice\fP is set +Quit \fBtin\fP \(em ask the user to confirm if \fBconfirm_choice\fP is set accordingly. .TP \fBQuitTin 'Q'\fP -Quit \fBtin\fP \- don't ask the user to confirm. +Quit \fBtin\fP \(em don't ask the user to confirm. .TP \fBSelectToggleReadDisplay 'r'\fP Toggle display of all subscribed to groups and just those groups containing @@ -847,7 +853,7 @@ Go to previous unread article. Return to previous level. .TP \fBQuitTin 'Q'\fP -Quit \fBtin\fP \- don't ask the user to confirm. +Quit \fBtin\fP \(em don't ask the user to confirm. .TP \fBGroupToggleReadUnread 'r'\fP Toggle the display between all articles and unread articles. @@ -1032,7 +1038,7 @@ PIPING PRINTING REPOSTING AND SAVING ART Return to previous level. .TP \fBQuitTin 'Q'\fP -Quit \fBtin\fP \- don't ask the user to confirm. +Quit \fBtin\fP \(em don't ask the user to confirm. .TP \fBBugReport 'R'\fP Mail a bug report or comment to . This is the best @@ -1267,7 +1273,7 @@ Go to the previous unread article. Return to the previous level. .TP \fBQuitTin 'Q'\fP -Quit \fBtin\fP \- don't ask the user to confirm. +Quit \fBtin\fP \(em don't ask the user to confirm. .TP \fBPageReplyQuote 'r'\fP Reply through mail to the author of the current article with a copy of the @@ -1763,7 +1769,7 @@ Default for quick (1 key) auto\-selectio .TP \fBDraw \-> instead of highlighted bar (draw_arrow)\fP Allows groups/articles to be selected by an arrow '\->' if set ON or by -an highlighted bar if set OFF. Default is OFF. +ahighlighted bar if set OFF. Default is OFF. .TP \fBInvocation of your editor (editor_format)\fP The format string used to create the editor start command with parameters. @@ -1820,8 +1826,8 @@ article'. \fB(info_in_last_line)\fP .\" this is missing from the Menu If ON, show current group description or article subject in the last line -(not in the pager and global menu) \- \fBToggleInfoLastLine\fP ('\fBi\fP') toggles -setting. This facility is useful as the full width of the screen is +(not in the pager and global menu) \(em \fBToggleInfoLastLine\fP ('\fBi\fP') +toggles setting. This facility is useful as the full width of the screen is available to display long subjects. Default is OFF. .TP \fBUse interactive mail reader (interactive_mailer)\fP @@ -2029,6 +2035,9 @@ possible values are: \fBNFC\fP: Canonical Decomposition, followed by Canonical Composition .IP 4 \fBNFD\fP: Canonical Decomposition +.IP 5 +\fBNFKC_CF\fP: Compatibility Decomposition, followed by Canonical Composition +and Case Folding .RE Some normalisation modes are only available if they are supported by the library \fBtin\fP uses to do the normalisation. NFC should be used if possible. @@ -2216,7 +2225,7 @@ and in thread listing the line count of displayed. .IP 2 \fBScore\fP, in article listing the score of an article will be displayed and -in thread listing the score of the thread will be displayed \- see also +in thread listing the score of the thread will be displayed \(em see also \fBthread_score\fP. .IP 3 \fBLines & Score\fP, display line count and score. @@ -2353,7 +2362,7 @@ toggled in the article viewer via \fBPag \fBThread articles by (thread_articles)\fP 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 +\fBthread_arts\fP to 0 \(en 4 in the file \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/attributes\fP. (See also "GROUP ATTRIBUTES".) The default is Both Subject and References. The choices are: .RS +.5i @@ -2732,7 +2741,7 @@ processed. A default process type can be \&\*(rq\fB\-N\fP\*(rq option) or saved (\*(rq\fB\-S\fP\*(rq 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 -\fB\%cron\fP(1) everyday while away, after which you will be mailed a report +\fB\%cron\fP(8) 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 \fBsavedir\fP directory (default is @@ -2769,12 +2778,12 @@ mark them as read) A range is simply a group of items marked using the \fBSetRange\fP (\fB'#'\fP) key. Certain \fBtin\fP commands will operate on a range if one exists rather than just the current item. A range is an expression of the form -\-, e.g. 10\-15 will highlight items 10 through 15 -on the current screen. Other than absolute numeric positions, '.' can be -used in place of the current cursor position and '$' can be used to mean the -highest number available. Currently the only commands that understand ranges -are \fBGroupMarkThdRead\fP ('\fBK\fP'), \fBMarkArtUnread\fP ('\fBz\fP') and -\fBMarkThdUnread\fP ('\fBZ\fP'). +\(en, e.g. 10\(en15 will highlight items 10 +through 15 on the current screen. Other than absolute numeric positions, '.' +can be used in place of the current cursor position and '$' can be used to +mean the highest number available. Currently the only commands that +understand ranges are \fBGroupMarkThdRead\fP ('\fBK\fP'), \fBMarkArtUnread\fP +('\fBz\fP') and \fBMarkThdUnread\fP ('\fBZ\fP'). .PP .SS "NEWSGROUP LISTS & WILDCARDS" Several places in \fBtin\fP allow you to specify a list of newsgroups. These @@ -2906,7 +2915,7 @@ number after the '\fB%\fP'. The followin thread level 10 characters wide: '\fB%10S\fP'. .PP If the newsgroup name is displayed together with the newsgroup description, -the width of the newsgroup name can be controlled via a optional comma +the width of the newsgroup name can be controlled via an optional comma separated second value (e.g. '\fB%60,20G\fP'). It is valid to omit the first value (e.g. ('\fB%,20G\fP')). If no second value is given, \fBtin\fP uses a default value of 32. @@ -3086,7 +3095,7 @@ updating of the index file and will be m need to be cached. .PP As indexing might take some time you may want to run \fBtin\fP form the system -batcher \fB\%cron\fP(1) with the \*(rq\fB\-u\fP\*(rq option: +batcher \fB\%cron\fP(8) with the \*(rq\fB\-u\fP\*(rq option: .PP .RS .nf @@ -3379,7 +3388,7 @@ by the variable. This is useful if you w different address. .TP \fBNAME\fP -Overrides the full name given in the gecos\-files in \fI/etc/passwd\fP, see also +Overrides the full name given in the gecos\-field in \fI/etc/passwd\fP, see also \fBmail_address\fP. .TP \fBREALNAME\fP @@ -3570,7 +3579,7 @@ Write out \fI${TIN_HOMEDIR:\-"$HOME"}/.n .\" If \fBtin\fP is started in debug mode (\*(rq\fB\-D n\fP\*(rq) it will create world readable files in \fB$TMPDIR\fP which may contain the users NNTP password in -cleartext. On multi\-user systems \fB$TMPDIR\fP should be set to a safe location +cleartext. On multiuser\-systems \fB$TMPDIR\fP should be set to a safe location before starting \fBtin\fP in debug mode (e.g. \fBTMPDIR=$HOME tin \-D 1\fP). .SH "CONFORMING TO" .\" - RFC\%2045, RFC\%2047, RFC\%2231, RFC\%2980, RFC\%3977, RFC\%4155 @@ -3650,7 +3659,7 @@ Urs Janssen .\" .\" .SH "SEE ALSO" -\fB\%cron\fP(1), \fB\%elm\fP(1), \fB\%emacs\fP(1), \fB\%gpg\fP(1), \fB\%inews\fP(1), +\fB\%cron\fP(8), \fB\%elm\fP(1), \fB\%emacs\fP(1), \fB\%gpg\fP(1), \fB\%inews\fP(1), \fB\%ispell\fP(1), \fB\%lp\fP(1), \fB\%lpr\fP(1), \fB\%metamail\fP(1), \fB\%noffle\fP(1), \fB\%perl\fP(1), \fB\%perlre\fP(1), \fB\%pgp\fP(1), \fB\%rn\fP(1), \fB\%sendmail\fP(1), \fB\%shar\fP(1), \fB\%slrnface\fP(1), \fB\%tass\fP(1), \fB\%unshar\fP(1), diff -Nurp '--exclude=.bzr*' tin-2.4.2/doc/l10n/en_GB/tin.5 tin-2.4.3/doc/l10n/en_GB/tin.5 --- tin-2.4.2/doc/l10n/en_GB/tin.5 2017-12-08 09:41:49.000000000 +0100 +++ tin-2.4.3/doc/l10n/en_GB/tin.5 2018-12-06 10:32:24.695284337 +0100 @@ -2,7 +2,7 @@ .\" Module : tin.5 .\" Author : U. Janssen .\" Created : 2000-07-10 -.\" Updated : 2017-10-06 +.\" Updated : 2018-11-07 .\" Notes : needs a some work .\" .\" @@ -11,7 +11,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH tin 5 "December 24th, 2017" 2.4.2 "Usenet newsreader" +.TH tin 5 "December 24th, 2018" 2.4.3 "Usenet newsreader" .SH NAME tin, rtin \- related files @@ -100,8 +100,8 @@ support mail composing agents that suppo of mail using external composing agents. As with the view\-command, the semantics of program execution are operating system dependent. The result of the composing program may be data that is not yet suitable for mail -transport \- that is, a Content\-Transfer\-Encoding may need to be applied to -the data. +transport \(em that is, a Content\-Transfer\-Encoding may need to be applied +to the data. .TP \fBcomposetyped\fP The "composetyped" field is similar to the "compose" field, but is to be @@ -130,7 +130,7 @@ machine architecture, or the window syst not the mailcap line applies. It specifies a program to be run to test some condition. The semantics of execution and of the value returned by the test program are operating system dependent. If the test fails, a subsequent -mailcap entry should be sought. Multiple test fields are not permitted \- +mailcap entry should be sought. Multiple test fields are not permitted \(em since a test can call a program, it can already be arbitrarily complex. .TP \fBneedsterminal\fP @@ -685,7 +685,7 @@ Identical to the tinrc variable of the s .TP \fBundeclared_charset\fP Assume (broken) articles without MIME charset declaration have this charset -\- default is US\-ASCII. This attribute works only on systems with working +\(em default is US\-ASCII. This attribute works only on systems with working \fB\%iconv\fP(3), others might have to compile \fB\%tin\fP(1) with \-\-disable\-mime\-strict\-charset. .PP @@ -791,6 +791,10 @@ into the same format \*(rqNewsgroups:\*( separated newsgroup list with all other information (i.e. the article counter) removed. .TP +.\" TODO: document option in detail +\fBpath\fP +Match against \*(rqPath:\*(rq line. This may not work on some servers. +.TP \fBtime\fP time_t value when rule expires .PP @@ -1459,7 +1463,7 @@ Default for quick (1 key) auto\-selectio .TP \fBdraw_arrow\fP Allows groups/articles to be selected by an arrow '\->' if set ON or by -an highlighted bar if set OFF. Default is OFF. +ahighlighted bar if set OFF. Default is OFF. .TP \fBeditor_format\fP The format string used to create the editor start command with parameters. @@ -1531,8 +1535,8 @@ article'. .TP \fBinfo_in_last_line\fP If ON, show current group description or article subject in the last line -(not in the pager and global menu) \- \fBToggleInfoLastLine\fP ('\fBi\fP') toggles -setting. This facility is useful as the full width of the screen is +(not in the pager and global menu) \(em \fBToggleInfoLastLine\fP ('\fBi\fP') +toggles setting. This facility is useful as the full width of the screen is available to display long subjects. Default is OFF. .TP \fBinteractive_mailer\fP @@ -1734,6 +1738,9 @@ possible values are: \fBNFC\fP: Canonical Decomposition, followed by Canonical Composition .IP 4 \fBNFD\fP: Canonical Decomposition +.IP 5 +\fBNFKC_CF\fP: Compatibility Decomposition, followed by Canonical Composition +and Case Folding .RE Some normalisation modes are only available if they are supported by the library \fB\%tin\fP(1) uses to do the normalisation. NFC should be used if @@ -1945,7 +1952,7 @@ and in thread listing the line count of displayed. .IP 2 \fBScore\fP, in article listing the score of an article will be displayed and -in thread listing the score of the thread will be displayed \- see also +in thread listing the score of the thread will be displayed \(em see also \fBthread_score\fP. .IP 3 \fBLines & Score\fP, display line count and score. @@ -1972,7 +1979,7 @@ will be randomly generated from files th directory. If the path starts with a ! the program the path points to will be executed to generate a signature. In order to pass the group name to the program, %G can be specified. This will be replaced by the name of the -current newsgroup. program. \-\-none will suppress any signature. Default is +current newsgroup. \-\-none will suppress any signature. Default is \fI${TIN_HOMEDIR:\-"$HOME"}/.Sig\fP. .TP \fBsignature_repost\fP @@ -2079,7 +2086,7 @@ Thread on Subject only 2) Thread on Refe then Subject (default) 4) Thread multipart articles on Subject. 5) Thread on Percentage Match of the Subjects It's also possible to set the threading type on a per group basis by setting the group attribute variable -\fBthread_articles\fP to 0 \- 5 in the file +\fBthread_articles\fP to 0 \(en 5 in the file \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/attributes\fP. .TP \fBthread_format\fP @@ -2278,7 +2285,7 @@ at tin.org. You might want to change thi administration if you want to deal with your lusers problems on your own. .TP \fBinewsdir\fP -Defines the directory containing of the \fB\%inews\fP(1) executable +Defines the directory containing the \fB\%inews\fP(1) executable. .TP \fBmm_charset\fP Default charset to be used in MIME's \*(rqContent\-Type:\*(rq @@ -2485,11 +2492,12 @@ uses the LIST OVERVIEW.FMT (\fBRFC\%3977 \fI${TIN_LIBDIR:\-NEWSLIBDIR}/subscriptions\fP .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 -the news server. \fB\%tin\fP(1) only tries to read the file if you read -directly from the local spool, if you read news via NNTP, \fB\%tin\fP(1) uses -the LIST SUBSCRIPTIONS (\fBRFC\%6048\fP) command instead. +This file contains a list of newsgroups \(em one per line \(em which the +client should subscribe to when the user has no +${TIN_HOMEDIR:\-"$HOME"}/.newsrc for the news server. \fB\%tin\fP(1) only +tries to read the file if you read directly from the local spool, if you +read news via NNTP, \fB\%tin\fP(1) uses the LIST SUBSCRIPTIONS (\fBRFC\%6048\fP) +command instead. .RE .PP diff -Nurp '--exclude=.bzr*' tin-2.4.2/doc/l10n/en_GB.po tin-2.4.3/doc/l10n/en_GB.po --- tin-2.4.2/doc/l10n/en_GB.po 2017-12-08 09:41:27.000000000 +0100 +++ tin-2.4.3/doc/l10n/en_GB.po 2018-12-06 10:32:20.279103846 +0100 @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: tin-man 2.4.1\n" +"Project-Id-Version: tin-man 2.4.3\n" "Report-Msgid-Bugs-To: translation@tin.org\n" -"POT-Creation-Date: 2017-12-08 09:40+0100\n" -"PO-Revision-Date: 2017-10-06 14:25+0100\n" +"POT-Creation-Date: 2018-12-06 10:31+0100\n" +"PO-Revision-Date: 2018-03-22 13:45+0100\n" "Last-Translator: Urs Janssen \n" "Language-Team: LANGUAGE \n" "Language: en_GB\n" @@ -24,14 +24,14 @@ msgstr "tin" #. type: TH #: doc/tin.1:12 doc/tin.5:9 #, no-wrap -msgid "December 24th, 2017" -msgstr "December 24th, 2017" +msgid "December 24th, 2018" +msgstr "December 24th, 2018" #. type: TH #: doc/tin.1:12 doc/tin.5:9 #, no-wrap -msgid "2.4.2" -msgstr "2.4.2" +msgid "2.4.3" +msgstr "2.4.3" #. type: TH #: doc/tin.1:12 doc/tin.5:9 @@ -149,7 +149,7 @@ msgid "Interactive mode:" msgstr "Interactive mode:" #. type: TP -#: doc/tin.1:80 doc/tin.1:93 doc/tin.1:1099 doc/tin.1:3470 +#: doc/tin.1:80 doc/tin.1:93 doc/tin.1:1106 doc/tin.1:3479 #, no-wrap msgid "B<0>" msgstr "B<0>" @@ -160,7 +160,7 @@ msgid "Successful program execution." msgstr "Successful program execution." #. type: TP -#: doc/tin.1:83 doc/tin.1:96 doc/tin.1:3473 +#: doc/tin.1:83 doc/tin.1:96 doc/tin.1:3482 #, no-wrap msgid "B<1>" msgstr "B<1>" @@ -171,7 +171,7 @@ msgid "Usage, syntax, configuration file msgstr "Usage, syntax, configuration file or network error." #. type: TP -#: doc/tin.1:86 doc/tin.1:99 doc/tin.1:3476 +#: doc/tin.1:86 doc/tin.1:99 doc/tin.1:3485 #, no-wrap msgid "B<2>" msgstr "B<2>" @@ -298,22 +298,24 @@ msgid "B<-D>I< debug-level>" msgstr "B<-D>I< debug-level>" #. type: Plain text -#: doc/tin.1:133 +#: doc/tin.1:134 msgid "" "Enter debug-level (1 = NNTP, 2 = filter, 4 = newsrc, 8 = threading, 16 = " -"memory, 32 = attributes, 64 = misc, 128 = remove existing debug files)." +"memory, 32 = attributes, 64 = misc, 128 = remove existing debug files). For " +"NNTP-level ''B<-v>'' controls the verbosity of the output." msgstr "" "Enter debug-level (1 = NNTP, 2 = filter, 4 = newsrc, 8 = threading, 16 = " -"memory, 32 = attributes, 64 = misc, 128 = remove existing debug files)." +"memory, 32 = attributes, 64 = misc, 128 = remove existing debug files). For " +"NNTP-level ''B<-v>'' controls the verbosity of the output." #. type: TP -#: doc/tin.1:133 +#: doc/tin.1:134 #, no-wrap msgid "B<-f>I< file>" msgstr "B<-f>I< file>" #. type: Plain text -#: doc/tin.1:137 +#: doc/tin.1:138 msgid "" "Use the specified file of subscribed to newsgroups in place of I<" "${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>." @@ -322,13 +324,13 @@ msgstr "" "${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>." #. type: TP -#: doc/tin.1:137 +#: doc/tin.1:138 #, no-wrap msgid "B<-g>I< server>" msgstr "B<-g>I< server>" #. type: Plain text -#: doc/tin.1:142 +#: doc/tin.1:143 msgid "" "Use the server and newsrc specified in I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/" "newsrctable>. Only available when reading via NNTP." @@ -337,48 +339,58 @@ msgstr "" "newsrctable>. Only available when reading via NNTP." #. type: TP -#: doc/tin.1:142 +#: doc/tin.1:143 #, no-wrap msgid "B<-G>I< article-limit>" msgstr "B<-G>I< article-limit>" #. type: Plain text -#: doc/tin.1:145 -msgid "Limit the number of articles/group to retrieve from the server." -msgstr "Limit the number of articles/group to retrieve from the server." +#: doc/tin.1:151 +msgid "" +"Limit the number of articles/group to retrieve from the server. If " +"I is E 0 not more than the last I articles/" +"group are fetched from the server. If I is E 0 B " +"will start fetching articles from your first unread minus absolute value of " +"I. Default is 0, which means no limit." +msgstr "" +"Limit the number of articles/group to retrieve from the server. If " +"I is E 0 not more than the last I articles/" +"group are fetched from the server. If I is E 0 B " +"will start fetching articles from your first unread minus absolute value of " +"I. Default is 0, which means no limit." #. type: TP -#: doc/tin.1:145 +#: doc/tin.1:151 #, no-wrap msgid "B<-h>" msgstr "B<-h>" #. type: Plain text -#: doc/tin.1:148 +#: doc/tin.1:154 msgid "Help listing all command-line options." msgstr "Help listing all command-line options." #. type: TP -#: doc/tin.1:148 +#: doc/tin.1:154 #, no-wrap msgid "B<-H>" msgstr "B<-H>" #. type: Plain text -#: doc/tin.1:152 +#: doc/tin.1:158 msgid "" "Brief introduction to B that is also shown the first time it is started." msgstr "" "Brief introduction to B that is also shown the first time it is started." #. type: TP -#: doc/tin.1:152 +#: doc/tin.1:158 #, no-wrap msgid "B<-I>I< dir>" msgstr "B<-I>I< dir>" #. type: Plain text -#: doc/tin.1:158 +#: doc/tin.1:164 msgid "" "Directory in which to store newsgroup index files. Default is I<" "${TIN_INDEX_NEWSDIR:-\"${TIN_HOMEDIR:-\"$HOME\"}/.tin\"}/.news>. This " @@ -391,21 +403,21 @@ msgstr "" "B is turned off." #. type: TP -#: doc/tin.1:158 +#: doc/tin.1:164 #, no-wrap msgid "B<-l>" msgstr "B<-l>" #. type: Plain text -#: doc/tin.1:170 +#: doc/tin.1:176 msgid "" "Get number of articles per group from the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/" "\"${TIN_ACTIVEFILE:-active}> file. If reading via NNTP this is done with the " -"LIST command (B ). This might result in incorrect article counts " +"LIST command (B). This might result in incorrect article counts " "but is usually faster than the default which is to read the I<${TIN_LIBDIR:-" "NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}> file (either directly or via " "LIST) and then check the article count via NNTP GROUP command (B ) ''B<-ln>''. If reading via NNTP and LIST COUNTS (B ) is " +"%3977>) ''B<-ln>''. If reading via NNTP and LIST COUNTS (B) is " "available that is used instead as it gives more accurate article counts." msgstr "" "Get number of articles per group from the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/" @@ -418,25 +430,25 @@ msgstr "" "available that is used instead as it gives more accurate article counts." #. type: TP -#: doc/tin.1:170 +#: doc/tin.1:176 #, no-wrap msgid "B<-m>I< dir>" msgstr "B<-m>I< dir>" #. type: Plain text -#: doc/tin.1:173 +#: doc/tin.1:179 msgid "Mailbox directory to use. Default is I<${TIN_HOMEDIR:-\"$HOME\"}/Mail>." msgstr "" "Mailbox directory to use. Default is I<${TIN_HOMEDIR:-\"$HOME\"}/Mail>." #. type: TP -#: doc/tin.1:173 +#: doc/tin.1:179 #, no-wrap msgid "B<-M>I< user>" msgstr "B<-M>I< user>" #. type: Plain text -#: doc/tin.1:177 +#: doc/tin.1:183 msgid "" "Mail unread articles to specified user for later reading. For more " "information read section \"AUTOMATIC MAILING AND SAVING NEW NEWS\"." @@ -445,13 +457,13 @@ msgstr "" "information read section \"AUTOMATIC MAILING AND SAVING NEW NEWS\"." #. type: TP -#: doc/tin.1:177 +#: doc/tin.1:183 #, no-wrap msgid "B<-n>" msgstr "B<-n>" #. type: Plain text -#: doc/tin.1:184 +#: doc/tin.1:190 msgid "" "Only load groups from the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-" "active}> file that are subscribed to in the user's I<${TIN_HOMEDIR:-\"$HOME" @@ -466,13 +478,13 @@ msgstr "" "''B<-l>''." #. type: TP -#: doc/tin.1:184 +#: doc/tin.1:190 #, no-wrap msgid "B<-N>" msgstr "B<-N>" #. type: Plain text -#: doc/tin.1:188 +#: doc/tin.1:194 msgid "" "Mail unread articles to yourself for later reading. For more information " "read section \"AUTOMATIC MAILING AND SAVING NEW NEWS\"." @@ -481,13 +493,13 @@ msgstr "" "read section \"AUTOMATIC MAILING AND SAVING NEW NEWS\"." #. type: TP -#: doc/tin.1:188 +#: doc/tin.1:194 #, no-wrap msgid "B<-o>" msgstr "B<-o>" #. type: Plain text -#: doc/tin.1:192 +#: doc/tin.1:198 msgid "" "Quick post all postponed articles and exit. In order for this to be really " "quick, it should be used with ''B<-n>'' if possible." @@ -496,13 +508,13 @@ msgstr "" "quick, it should be used with ''B<-n>'' if possible." #. type: TP -#: doc/tin.1:192 +#: doc/tin.1:198 #, no-wrap msgid "B<-p>I< port>" msgstr "B<-p>I< port>" #. type: Plain text -#: doc/tin.1:197 +#: doc/tin.1:203 msgid "" "Port to use if reading via NNTP (default is 119). This also overrides the " "environment variable $B if set. Only available when reading via " @@ -513,13 +525,13 @@ msgstr "" "NNTP." #. type: TP -#: doc/tin.1:197 +#: doc/tin.1:203 #, no-wrap msgid "B<-q>" msgstr "B<-q>" #. type: Plain text -#: doc/tin.1:200 +#: doc/tin.1:206 msgid "" "Don't check for new newsgroups and skip loading the servers message of the " "day." @@ -528,13 +540,13 @@ msgstr "" "day." #. type: TP -#: doc/tin.1:200 +#: doc/tin.1:206 #, no-wrap msgid "B<-Q>" msgstr "B<-Q>" #. type: Plain text -#: doc/tin.1:204 +#: doc/tin.1:210 msgid "" "Quick start. Start B as quickly as possible. Currently this is " "equivalent to ''B<-nqd>''." @@ -543,13 +555,13 @@ msgstr "" "equivalent to ''B<-nqd>''." #. type: TP -#: doc/tin.1:204 +#: doc/tin.1:210 #, no-wrap msgid "B<-r>" msgstr "B<-r>" #. type: Plain text -#: doc/tin.1:209 +#: doc/tin.1:215 msgid "" "Read news remotely from the default NNTP server specified in the environment " "variable $B or contained in the file I." @@ -558,24 +570,24 @@ msgstr "" "variable $B or contained in the file I." #. type: TP -#: doc/tin.1:209 +#: doc/tin.1:215 #, no-wrap msgid "B<-R>" msgstr "B<-R>" #. type: Plain text -#: doc/tin.1:212 +#: doc/tin.1:218 msgid "Read news saved by the ''B<-S>'' option." msgstr "Read news saved by the ''B<-S>'' option." #. type: TP -#: doc/tin.1:212 +#: doc/tin.1:218 #, no-wrap msgid "B<-s>I< dir>" msgstr "B<-s>I< dir>" #. type: Plain text -#: doc/tin.1:216 +#: doc/tin.1:222 msgid "" "Save/read articles to/in directory. Default is I<${TIN_HOMEDIR:-\"$HOME\"}/" "News>." @@ -584,13 +596,13 @@ msgstr "" "News>." #. type: TP -#: doc/tin.1:216 +#: doc/tin.1:222 #, no-wrap msgid "B<-S>" msgstr "B<-S>" #. type: Plain text -#: doc/tin.1:220 +#: doc/tin.1:226 msgid "" "Save unread articles for later reading by the ''B<-R>'' option. For more " "information read section \"AUTOMATIC MAILING AND SAVING NEW NEWS\"." @@ -599,13 +611,13 @@ msgstr "" "information read section \"AUTOMATIC MAILING AND SAVING NEW NEWS\"." #. type: TP -#: doc/tin.1:220 +#: doc/tin.1:226 #, no-wrap msgid "B<-u>" msgstr "B<-u>" #. type: Plain text -#: doc/tin.1:226 +#: doc/tin.1:232 msgid "" "Create/update index files for every group in I<${TIN_HOMEDIR:-\"$HOME\"}/." "newsrc> or file specified by the ''B<-f>'' option. This option is disabled " @@ -618,39 +630,41 @@ msgstr "" "B is turned off." #. type: TP -#: doc/tin.1:226 +#: doc/tin.1:232 #, no-wrap msgid "B<-v>" msgstr "B<-v>" #. type: Plain text -#: doc/tin.1:230 +#: doc/tin.1:237 msgid "" -"Verbose mode for ''B<-c>'', ''B<-M>'', ''B<-N>'', ''B<-S>'', \\&''B<-u>'' " -"and ''B<-Z>'' options." +"Verbose mode for ''B<-D>'', ''B<-c>'', ''B<-M>'', ''B<-N>'', \\&''B<-S>'', " +"''B<-u>'' and ''B<-Z>'' options. Can be used multiple times to increase " +"verbosity." msgstr "" -"Verbose mode for ''B<-c>'', ''B<-M>'', ''B<-N>'', ''B<-S>'', \\&''B<-u>'' " -"and ''B<-Z>'' options." +"Verbose mode for ''B<-D>'', ''B<-c>'', ''B<-M>'', ''B<-N>'', \\&''B<-S>'', " +"''B<-u>'' and ''B<-Z>'' options. Can be used multiple times to increase " +"verbosity." #. type: TP -#: doc/tin.1:230 +#: doc/tin.1:237 #, no-wrap msgid "B<-V>" msgstr "B<-V>" #. type: Plain text -#: doc/tin.1:233 +#: doc/tin.1:240 msgid "Print version and date information." msgstr "Print version and date information." #. type: TP -#: doc/tin.1:233 +#: doc/tin.1:240 #, no-wrap msgid "B<-w>" msgstr "B<-w>" #. type: Plain text -#: doc/tin.1:238 +#: doc/tin.1:245 msgid "" "Quick mode to post an article and then exit. This option implies \\&''B<-" "d>''. In order for this to be really quick, it should be used with ''B<-n>'' " @@ -661,24 +675,24 @@ msgstr "" "if possible." #. type: TP -#: doc/tin.1:238 +#: doc/tin.1:245 #, no-wrap msgid "B<-x>" msgstr "B<-x>" #. type: Plain text -#: doc/tin.1:241 +#: doc/tin.1:248 msgid "No-posting mode. You cannot post articles if you use this option." msgstr "No-posting mode. You cannot post articles if you use this option." #. type: TP -#: doc/tin.1:241 +#: doc/tin.1:248 #, no-wrap msgid "B<-X>" msgstr "B<-X>" #. type: Plain text -#: doc/tin.1:246 +#: doc/tin.1:253 msgid "" "No overwrite mode. I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> and files in I<" "${TIN_HOMEDIR:-\"$HOME\"}/.tin> will not be overwritten but may be created " @@ -689,13 +703,13 @@ msgstr "" "if they don't exist." #. type: TP -#: doc/tin.1:246 +#: doc/tin.1:253 #, no-wrap msgid "B<-z>" msgstr "B<-z>" #. type: Plain text -#: doc/tin.1:251 +#: doc/tin.1:258 msgid "" "Only start B if there is any new/unread news. If there is news B " "will position cursor at first group with unread news. Useful for putting in " @@ -706,13 +720,13 @@ msgstr "" "login file." #. type: TP -#: doc/tin.1:251 +#: doc/tin.1:258 #, no-wrap msgid "B<-Z>" msgstr "B<-Z>" #. type: Plain text -#: doc/tin.1:257 +#: doc/tin.1:264 msgid "" "Check if there is any new/unread news and exit with appropriate status. If " "\\&''B<-v>'' option is specified the number of unread articles in each group " @@ -725,7 +739,7 @@ msgstr "" "that new/unread news exists. Useful for writing scripts." #. type: Plain text -#: doc/tin.1:263 +#: doc/tin.1:270 msgid "" "B can also dynamically change its options by the B ('B') " "command. Any changes are written to I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/tinrc>. " @@ -738,7 +752,7 @@ msgstr "" "CONFIGURABLE VARIABLES\" and B<\\%tin>(5)." #. type: Plain text -#: doc/tin.1:268 +#: doc/tin.1:275 msgid "" "A list of groups can be specified after the other command-line options. This " "can be useful if you wish to yank in or subscribe to a hand-picked subset of " @@ -751,7 +765,7 @@ msgstr "" "the types of pattern that B understands." #. type: Plain text -#: doc/tin.1:273 +#: doc/tin.1:280 msgid "" "If you specify a single group-name, or a wildcard that matches a single " "group, then you will automatically enter that group. Otherwise the normal " @@ -764,7 +778,7 @@ msgstr "" "too, as though you had yanked just those groups in." #. type: Plain text -#: doc/tin.1:277 +#: doc/tin.1:284 msgid "" "With the ''B<-w>'' flag a given group-name is used as default group to post " "to. If more than one group or a wildcard is specified only the first group " @@ -775,7 +789,7 @@ msgstr "" "respectively the first group that matches is used." #. type: Plain text -#: doc/tin.1:284 +#: doc/tin.1:291 msgid "" "Once you use B ('B') to yank in all active groups, or " "B ('B') to toggle the read/unread status, then " @@ -790,7 +804,7 @@ msgstr "" "active}> file and get them back." #. type: Plain text -#: doc/tin.1:289 +#: doc/tin.1:296 msgid "" "NB: With the ''B<-n>'' flag, only unsubscribed groups in the I<" "${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> file (or the newsrc-file given by the " @@ -803,7 +817,7 @@ msgstr "" "newsrctable>) can be matched." #. type: Plain text -#: doc/tin.1:294 +#: doc/tin.1:301 msgid "" "Command-line options have higher priority than attributes and tinrc " "options. Thus, command-line option takes precedence over configured values." @@ -812,19 +826,19 @@ msgstr "" "options. Thus, command-line option takes precedence over configured values." #. type: SH -#: doc/tin.1:294 +#: doc/tin.1:301 #, no-wrap msgid "USAGE" msgstr "USAGE" #. type: SS -#: doc/tin.1:297 +#: doc/tin.1:304 #, no-wrap msgid "NEWS ADMINISTRATION" msgstr "NEWS ADMINISTRATION" #. type: Plain text -#: doc/tin.1:301 +#: doc/tin.1:308 msgid "" "Maintaining Netnews on large networks of machines can be a pretty time " "consuming job as I discovered when I was given the job of maintaining our " @@ -835,32 +849,32 @@ msgstr "" "news system and news users." #. type: Plain text -#: doc/tin.1:311 +#: doc/tin.1:318 msgid "" "A user starting B 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., I<" -"${TIN_LIBDIR:-NEWSLIBDIR}/subscriptions>) 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 NNTP List Extensions (B ) and all modern servers should understand it." +"${TIN_LIBDIR:-NEWSLIBDIR}/subscriptions>) and should be world readable. If " +"you read news via NNTP, then your news server must support the LIST " +"SUBSCRIPTIONS command. It is part of the NNTP List Extensions (B) and all modern servers should understand it." msgstr "" "A user starting B 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., I<" -"${TIN_LIBDIR:-NEWSLIBDIR}/subscriptions>) 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 NNTP List Extensions (B) and all modern servers should understand it." +"${TIN_LIBDIR:-NEWSLIBDIR}/subscriptions>) and should be world readable. If " +"you read news via NNTP, then your news server must support the LIST " +"SUBSCRIPTIONS command. It is part of the NNTP List Extensions (B) and all modern servers should understand it." #. type: SS -#: doc/tin.1:311 +#: doc/tin.1:318 #, no-wrap msgid "SCREEN FORMAT" msgstr "SCREEN FORMAT" #. type: Plain text -#: doc/tin.1:314 +#: doc/tin.1:321 msgid "" "B has four separate levels of operation: Selection level, Group level, " "Thread level and Article level." @@ -869,7 +883,7 @@ msgstr "" "Thread level and Article level." #. type: Plain text -#: doc/tin.1:320 +#: doc/tin.1:327 msgid "" "At the Selection level the title displays (the name of the news server and) " "the number of subscribed groups (containing new unread articles). The " @@ -884,7 +898,7 @@ msgstr "" "customised via B." #. type: Plain text -#: doc/tin.1:328 +#: doc/tin.1:335 #, no-wrap msgid "" "-EM 1 2 comp.security.announce Announcements from the CERT abou\n" @@ -900,20 +914,20 @@ msgstr "" " X 5 124 news.software.readers Discussion of software used to r\n" #. type: Plain text -#: doc/tin.1:331 +#: doc/tin.1:338 msgid "" "There may also be a character prefixing the line. An explanation follows:" msgstr "" "There may also be a character prefixing the line. An explanation follows:" #. type: TP -#: doc/tin.1:331 +#: doc/tin.1:338 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:336 +#: doc/tin.1:343 msgid "" "This group is unsubscribed. To see only your subscribed groups use the " "B ('B') or B ('B') toggle " @@ -924,13 +938,13 @@ msgstr "" "keys." #. type: TP -#: doc/tin.1:336 +#: doc/tin.1:343 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:341 +#: doc/tin.1:348 msgid "" "This is a moderated group. Any posts you make will have to be approved by " "the group administrator before it will be made public. B will ask for " @@ -941,13 +955,13 @@ msgstr "" "confirmation before you post to a moderated group." #. type: TP -#: doc/tin.1:341 +#: doc/tin.1:348 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:350 +#: doc/tin.1:357 msgid "" "This is a new newsgroup which has been created since you last used B. " "New newsgroups are not subscribed to by default (However, see the " @@ -966,13 +980,13 @@ msgstr "" "in a later session." #. type: TP -#: doc/tin.1:350 +#: doc/tin.1:357 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:355 +#: doc/tin.1:362 msgid "" "This group no longer exists. If you no longer wish to see this group then " "unsubscribe from it in the normal way. This flag will only appear if you " @@ -983,13 +997,13 @@ msgstr "" "have set B to \"ask\" in the Options Menu." #. type: TP -#: doc/tin.1:355 +#: doc/tin.1:362 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:359 +#: doc/tin.1:366 msgid "" "You may no longer make posts to this group. Often a group will be superseded " "by a more appropriately named one." @@ -998,13 +1012,13 @@ msgstr "" "by a more appropriately named one." #. type: TP -#: doc/tin.1:359 +#: doc/tin.1:366 #, no-wrap msgid "B<=>" msgstr "B<=>" #. type: Plain text -#: doc/tin.1:364 +#: doc/tin.1:371 msgid "" "This group has been renamed and you may no longer post to it. If you do, " "then you will receive an error from your news server telling you the correct " @@ -1015,7 +1029,7 @@ msgstr "" "group to post to." #. type: Plain text -#: doc/tin.1:374 +#: doc/tin.1:381 msgid "" "At the Group level the title contains the name of the group, the number of " "conversation threads, the abbreviated threading method (B), " @@ -1037,13 +1051,13 @@ msgstr "" #. FIXME - make this autocenter #. type: Plain text -#: doc/tin.1:378 +#: doc/tin.1:385 #, no-wrap msgid " alt.sources (5B -50/23+ 0* 3o 0K)\n" msgstr " alt.sources (5B -50/23+ 0* 3o 0K)\n" #. type: Plain text -#: doc/tin.1:386 +#: doc/tin.1:393 msgid "" "The characters after the numbers are depending to the configuration and if " "your are in B mode or not. Some numbers could be " @@ -1060,38 +1074,38 @@ msgstr "" "redirected." #. type: Plain text -#: doc/tin.1:397 +#: doc/tin.1:404 msgid "" "If a thread has unread articles it is marked with B in " "front of the total number of articles in the thread. If there are recent " "articles within the thread it might be marked with B in " -"front of the total number of articles in the thread - this is controlled by " -"the B option. If a thread has hot articles in it (see also " +"front of the total number of articles in the thread \\(em this is controlled " +"by the B option. If a thread has hot articles in it (see also " "section \"FILTERING ARTICLES\") it's marked with B in " "front of the total number of articles in the thread. The number of lines of " "the first (unread) article in the thread might also be shown right before " -"the subject - this is controlled by the B option. The display can " -"be customized via B." +"the subject \\(em this is controlled by the B option. The display " +"can be customized via B." msgstr "" "If a thread has unread articles it is marked with B in " "front of the total number of articles in the thread. If there are recent " "articles within the thread it might be marked with B in " -"front of the total number of articles in the thread - this is controlled by " -"the B option. If a thread has hot articles in it (see also " +"front of the total number of articles in the thread \\(em this is controlled " +"by the B option. If a thread has hot articles in it (see also " "section \"FILTERING ARTICLES\") it's marked with B in " "front of the total number of articles in the thread. The number of lines of " "the first (unread) article in the thread might also be shown right before " -"the subject - this is controlled by the B option. The display can " -"be customised via B." +"the subject \\(em this is controlled by the B option. The display " +"can be customised via B." #. type: Plain text -#: doc/tin.1:401 +#: doc/tin.1:408 #, no-wrap msgid " de.admin.net-abuse.announce (11B 13+ 1* 1o 0K) M\n" msgstr " de.admin.net-abuse.announce (11B 13+ 1* 1o 0K) M\n" #. type: Plain text -#: doc/tin.1:406 +#: doc/tin.1:413 #, no-wrap msgid "" "-E 1 + 3 108 bincancels in de.talk.sex Christopher Lueg El\n" @@ -1106,7 +1120,7 @@ msgstr "" #. FIXME - add description of fields #. type: Plain text -#: doc/tin.1:411 +#: doc/tin.1:418 msgid "" "At the Thread level the screen usually (depends on the threading method " "used) looks like this, but can be customized via B:" @@ -1115,7 +1129,7 @@ msgstr "" "used) looks like this, but can be customised via B:" #. type: Plain text -#: doc/tin.1:418 +#: doc/tin.1:425 #, no-wrap msgid "" "-E 1 [ 7] What is this funny tree in the thr Robert F. Simmig\n" @@ -1130,12 +1144,12 @@ msgstr "" #. FIXME - add description of fields #. type: Plain text -#: doc/tin.1:423 +#: doc/tin.1:430 msgid "At the Article level the page header has the following format:" msgstr "At the Article level the page header has the following format:" #. type: Plain text -#: doc/tin.1:429 +#: doc/tin.1:436 #, no-wrap msgid "" "Sun, 28 Dec 1997 21:21:01 de.admin.news.groups Thread 20 of 86\n" @@ -1147,13 +1161,13 @@ msgstr "" "Urs Janssen Eurs@akk.orgE at Arbeitskreis Kultur und Kommunikati\n" #. type: Plain text -#: doc/tin.1:431 +#: doc/tin.1:438 #, no-wrap msgid "article-body\n" msgstr "article-body\n" #. type: Plain text -#: doc/tin.1:437 +#: doc/tin.1:444 msgid "" "The look of the Selection, Group and Thread level can be customized. See the " "section \"CUSTOMIZING THE SCREEN FORMAT\"." @@ -1162,13 +1176,13 @@ msgstr "" "section \"CUSTOMISING THE SCREEN FORMAT\"." #. type: SS -#: doc/tin.1:437 +#: doc/tin.1:444 #, no-wrap msgid "COMMON MOVING KEYS" msgstr "COMMON MOVING KEYS" #. type: Plain text -#: doc/tin.1:440 +#: doc/tin.1:447 msgid "" "This table shows the common keys used for moving around all levels within " "B." @@ -1177,13 +1191,13 @@ msgstr "" "B." #. type: ta -#: doc/tin.1:442 +#: doc/tin.1:449 #, no-wrap msgid "\\w'Beg. of list/article 'u +\\w'ANSI/vt100 'u" msgstr "\\w'Beg. of list/article 'u +\\w'ANSI/vt100 'u" #. type: Plain text -#: doc/tin.1:450 +#: doc/tin.1:457 #, no-wrap msgid "" "\tANSI/vt100\tOther Terminals\n" @@ -1203,13 +1217,13 @@ msgstr "" "Line Down\tB\tB (B or B<^N>)\n" #. type: SS -#: doc/tin.1:454 +#: doc/tin.1:461 #, no-wrap msgid "COMMON EDITING COMMANDS" msgstr "COMMON EDITING COMMANDS" #. type: Plain text -#: doc/tin.1:461 +#: doc/tin.1:468 msgid "" "An B<\\%emacs>(1) style editing package allows the easy editing of input " "strings. A history list allows the easy reuse of previously entered " @@ -1222,35 +1236,35 @@ msgstr "" "available when editing a string:" #. type: TP -#: doc/tin.1:462 +#: doc/tin.1:469 #, no-wrap msgid "B<^A, ^E>" msgstr "B<^A, ^E>" #. type: Plain text -#: doc/tin.1:465 +#: doc/tin.1:472 msgid "move to beginning or end of line, respectively." msgstr "move to beginning or end of line, respectively." #. type: TP -#: doc/tin.1:465 +#: doc/tin.1:472 #, no-wrap msgid "B<^F, ^B>" msgstr "B<^F, ^B>" #. type: Plain text -#: doc/tin.1:468 +#: doc/tin.1:475 msgid "non-destructive move forward or back one location, respectively." msgstr "non-destructive move forward or back one location, respectively." #. type: TP -#: doc/tin.1:468 +#: doc/tin.1:475 #, no-wrap msgid "B<^D>" msgstr "B<^D>" #. type: Plain text -#: doc/tin.1:472 +#: doc/tin.1:479 msgid "" "delete the character currently under the cursor, or send EOF if no " "characters in the buffer." @@ -1259,57 +1273,57 @@ msgstr "" "characters in the buffer." #. type: TP -#: doc/tin.1:472 +#: doc/tin.1:479 #, no-wrap msgid "B<^H, EDELE>" msgstr "B<^H, EDELE>" #. type: Plain text -#: doc/tin.1:475 +#: doc/tin.1:482 msgid "delete character left of the cursor." msgstr "delete character left of the cursor." #. type: TP -#: doc/tin.1:475 +#: doc/tin.1:482 #, no-wrap msgid "B<^K>" msgstr "B<^K>" #. type: Plain text -#: doc/tin.1:478 +#: doc/tin.1:485 msgid "delete from cursor to end of line." msgstr "delete from cursor to end of line." #. type: TP -#: doc/tin.1:478 +#: doc/tin.1:485 #, no-wrap msgid "B<^P, ^N>" msgstr "B<^P, ^N>" #. type: Plain text -#: doc/tin.1:481 +#: doc/tin.1:488 msgid "move through history, previous and next, respectively." msgstr "move through history, previous and next, respectively." #. type: TP -#: doc/tin.1:481 +#: doc/tin.1:488 #, no-wrap msgid "B<^L, ^R>" msgstr "B<^L, ^R>" #. type: Plain text -#: doc/tin.1:484 +#: doc/tin.1:491 msgid "redraw the current line." msgstr "redraw the current line." #. type: TP -#: doc/tin.1:484 +#: doc/tin.1:491 #, no-wrap msgid "BCRE>" msgstr "BCRE>" #. type: Plain text -#: doc/tin.1:488 +#: doc/tin.1:495 msgid "" "places line on history list if non-blank, appends newline and returns to the " "caller." @@ -1318,24 +1332,24 @@ msgstr "" "caller." #. type: TP -#: doc/tin.1:488 +#: doc/tin.1:495 #, no-wrap msgid "BESCE>" msgstr "BESCE>" #. type: Plain text -#: doc/tin.1:493 +#: doc/tin.1:500 msgid "aborts the present editing operation." msgstr "aborts the present editing operation." #. type: SS -#: doc/tin.1:493 +#: doc/tin.1:500 #, no-wrap msgid "GLOBAL COMMANDS" msgstr "GLOBAL COMMANDS" #. type: Plain text -#: doc/tin.1:496 +#: doc/tin.1:503 msgid "" "The following commands are available at all 4 menu levels and always have " "the same effect." @@ -1344,13 +1358,13 @@ msgstr "" "the same effect." #. type: TP -#: doc/tin.1:497 doc/tin.1:1371 doc/tin.1:1424 +#: doc/tin.1:504 doc/tin.1:1378 doc/tin.1:1431 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:502 +#: doc/tin.1:509 msgid "" "Shell escape. B by itself will launch a shell, B " "EcommandE will run an external EcommandE. This facility may " @@ -1361,57 +1375,57 @@ msgstr "" "have been disabled by the System Administrator." #. type: TP -#: doc/tin.1:502 +#: doc/tin.1:509 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:505 +#: doc/tin.1:512 msgid "Toggle use of ANSI color." msgstr "Toggle use of ANSI colour." #. type: TP -#: doc/tin.1:505 +#: doc/tin.1:512 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:508 +#: doc/tin.1:515 msgid "Redraw the current screen." msgstr "Redraw the current screen." #. type: TP -#: doc/tin.1:508 +#: doc/tin.1:515 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:511 +#: doc/tin.1:518 msgid "Scroll screen up by one line." msgstr "Scroll screen up by one line." #. type: TP -#: doc/tin.1:511 +#: doc/tin.1:518 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:514 +#: doc/tin.1:521 msgid "Scroll screen down by one line." msgstr "Scroll screen down by one line." #. type: TP -#: doc/tin.1:514 +#: doc/tin.1:521 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:528 +#: doc/tin.1:535 msgid "" "Reload postponed article. If your system blocks the B key you " "must quote it by pressing 'B<^V>' (CTRL-V) first. The postpone-menu offers " @@ -1438,13 +1452,13 @@ msgstr "" "('B<^O>''B''B'). See also ''B<-o>'' command-line switch." #. type: TP -#: doc/tin.1:528 doc/tin.1:1377 doc/tin.1:1431 +#: doc/tin.1:535 doc/tin.1:1384 doc/tin.1:1438 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:534 +#: doc/tin.1:541 msgid "" "Help screen of commands available on the current menu. You can use " "B ('B'), B ('B') and B ('B<" @@ -1455,24 +1469,24 @@ msgstr "" "\\e>') to search on this screen. B ('B') returns to the menu." #. type: TP -#: doc/tin.1:534 doc/tin.1:1380 doc/tin.1:1434 +#: doc/tin.1:541 doc/tin.1:1387 doc/tin.1:1441 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:537 doc/tin.1:1383 doc/tin.1:1437 +#: doc/tin.1:544 doc/tin.1:1390 doc/tin.1:1444 msgid "Toggle the display of help mini menu at the bottom of the screen." msgstr "Toggle the display of help mini menu at the bottom of the screen." #. type: TP -#: doc/tin.1:537 +#: doc/tin.1:544 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:543 +#: doc/tin.1:550 msgid "" "List articles posted by user. The date posted, the newsgroup and the subject " "are listed. You can use B ('B'), B ('B') and " @@ -1485,42 +1499,42 @@ msgstr "" "returns to the menu." #. type: TP -#: doc/tin.1:543 +#: doc/tin.1:550 #, no-wrap msgid "B" msgstr "B" #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:548 +#: doc/tin.1:555 msgid "Print B version information." msgstr "Print B version information." #. type: SS -#: doc/tin.1:548 +#: doc/tin.1:555 #, no-wrap msgid "NEWSGROUP SELECTION COMMANDS" msgstr "NEWSGROUP SELECTION COMMANDS" #. type: TP -#: doc/tin.1:549 doc/tin.1:687 doc/tin.1:938 doc/tin.1:1102 doc/tin.1:3482 +#: doc/tin.1:556 doc/tin.1:694 doc/tin.1:945 doc/tin.1:1109 doc/tin.1:3491 #, no-wrap msgid "B<4>" msgstr "B<4>" #. type: Plain text -#: doc/tin.1:552 +#: doc/tin.1:559 msgid "Select group 4." msgstr "Select group 4." #. type: TP -#: doc/tin.1:552 +#: doc/tin.1:559 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:556 +#: doc/tin.1:563 msgid "" "Reset I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> file. This will destroy all " "records of which articles have been read, so use this carefully." @@ -1529,13 +1543,13 @@ msgstr "" "records of which articles have been read, so use this carefully." #. type: TP -#: doc/tin.1:556 doc/tin.1:708 doc/tin.1:959 +#: doc/tin.1:563 doc/tin.1:715 doc/tin.1:966 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:560 doc/tin.1:712 doc/tin.1:963 +#: doc/tin.1:567 doc/tin.1:719 doc/tin.1:970 msgid "" "Choose a range of articles to be affected by the next command. See the " "section \"RANGES\" for more information." @@ -1544,72 +1558,72 @@ msgstr "" "section \"RANGES\" for more information." #. type: TP -#: doc/tin.1:560 +#: doc/tin.1:567 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:563 +#: doc/tin.1:570 msgid "Sort the list of newsgroups." msgstr "Sort the list of newsgroups." #. type: TP -#: doc/tin.1:563 doc/tin.1:715 doc/tin.1:966 doc/tin.1:1156 doc/tin.1:1368 -#: doc/tin.1:1418 +#: doc/tin.1:570 doc/tin.1:722 doc/tin.1:973 doc/tin.1:1163 doc/tin.1:1375 +#: doc/tin.1:1425 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:566 doc/tin.1:718 doc/tin.1:969 doc/tin.1:1159 doc/tin.1:1371 -#: doc/tin.1:1421 +#: doc/tin.1:573 doc/tin.1:725 doc/tin.1:976 doc/tin.1:1166 doc/tin.1:1378 +#: doc/tin.1:1428 msgid "Repeat the previous search." msgstr "Repeat the previous search." #. type: TP -#: doc/tin.1:566 doc/tin.1:718 doc/tin.1:969 doc/tin.1:1159 doc/tin.1:1362 -#: doc/tin.1:1412 +#: doc/tin.1:573 doc/tin.1:725 doc/tin.1:976 doc/tin.1:1166 doc/tin.1:1369 +#: doc/tin.1:1419 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:569 +#: doc/tin.1:576 msgid "Search for a group by name and description (if displayed)." msgstr "Search for a group by name and description (if displayed)." #. type: TP -#: doc/tin.1:569 doc/tin.1:721 doc/tin.1:972 doc/tin.1:1162 doc/tin.1:1365 -#: doc/tin.1:1415 +#: doc/tin.1:576 doc/tin.1:728 doc/tin.1:979 doc/tin.1:1169 doc/tin.1:1372 +#: doc/tin.1:1422 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:572 +#: doc/tin.1:579 msgid "Backward search through the group names and descriptions." msgstr "Backward search through the group names and descriptions." #. type: TP -#: doc/tin.1:572 +#: doc/tin.1:579 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:575 +#: doc/tin.1:582 msgid "Read current group." msgstr "Read current group." #. type: TP -#: doc/tin.1:575 +#: doc/tin.1:582 #, no-wrap msgid "BTABE' 'n'>" msgstr "BTABE' 'n'>" #. type: Plain text -#: doc/tin.1:579 +#: doc/tin.1:586 msgid "" "Enter next group with unread news. Will wrap around to the beginning of the " "group selection list looking for unread groups." @@ -1618,13 +1632,13 @@ msgstr "" "group selection list looking for unread groups." #. type: TP -#: doc/tin.1:579 doc/tin.1:796 doc/tin.1:1010 doc/tin.1:1220 +#: doc/tin.1:586 doc/tin.1:803 doc/tin.1:1017 doc/tin.1:1227 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:583 +#: doc/tin.1:590 msgid "" "Make current group as all read [after confirmation] and move to the next " "group in the group selection list." @@ -1633,13 +1647,13 @@ msgstr "" "group in the group selection list." #. type: TP -#: doc/tin.1:583 doc/tin.1:800 doc/tin.1:1014 doc/tin.1:1224 +#: doc/tin.1:590 doc/tin.1:807 doc/tin.1:1021 doc/tin.1:1231 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:587 +#: doc/tin.1:594 msgid "" "Mark current group as all read [after confirmation] and enter the next " "unread group in the group selection list." @@ -1648,13 +1662,13 @@ msgstr "" "unread group in the group selection list." #. type: TP -#: doc/tin.1:587 +#: doc/tin.1:594 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:591 +#: doc/tin.1:598 msgid "" "Toggle display to show just the group name or the group name and the group " "descriptions." @@ -1663,24 +1677,24 @@ msgstr "" "descriptions." #. type: TP -#: doc/tin.1:591 doc/tin.1:813 doc/tin.1:1027 doc/tin.1:1236 +#: doc/tin.1:598 doc/tin.1:820 doc/tin.1:1034 doc/tin.1:1243 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:594 doc/tin.1:816 doc/tin.1:1030 doc/tin.1:1239 +#: doc/tin.1:601 doc/tin.1:823 doc/tin.1:1037 doc/tin.1:1246 msgid "Edit the filter file and reload it afterwards." msgstr "Edit the filter file and reload it afterwards." #. type: TP -#: doc/tin.1:594 +#: doc/tin.1:601 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:598 doc/tin.1:820 +#: doc/tin.1:605 doc/tin.1:827 msgid "" "Choose a new group by name. This command can be used to access any group, " "even those not currently yanked in." @@ -1689,14 +1703,14 @@ msgstr "" "even those not currently yanked in." #. type: TP -#: doc/tin.1:598 doc/tin.1:823 doc/tin.1:1030 doc/tin.1:1252 doc/tin.1:1374 -#: doc/tin.1:1427 +#: doc/tin.1:605 doc/tin.1:830 doc/tin.1:1037 doc/tin.1:1259 doc/tin.1:1381 +#: doc/tin.1:1434 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:603 +#: doc/tin.1:610 msgid "" "Toggle the display of the description of the current newsgroup in the last " "line. This will not be available if B was started with the \\&''B<-d>'' " @@ -1707,24 +1721,24 @@ msgstr "" "option." #. type: TP -#: doc/tin.1:603 doc/tin.1:827 doc/tin.1:1033 doc/tin.1:1255 +#: doc/tin.1:610 doc/tin.1:834 doc/tin.1:1040 doc/tin.1:1262 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:606 doc/tin.1:830 doc/tin.1:1036 doc/tin.1:1258 +#: doc/tin.1:613 doc/tin.1:837 doc/tin.1:1043 doc/tin.1:1265 msgid "Toggle inverse video." msgstr "Toggle inverse video." #. type: TP -#: doc/tin.1:606 doc/tin.1:839 doc/tin.1:1042 doc/tin.1:1264 +#: doc/tin.1:613 doc/tin.1:846 doc/tin.1:1049 doc/tin.1:1271 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:613 +#: doc/tin.1:620 msgid "" "Look up article by ''Message-ID:''. If none of the groups listed in the " "''Newsgroups:''-header of the referenced article is available, just the " @@ -1739,13 +1753,13 @@ msgstr "" "supports [X]HDR (B, B) or XPAT (B)." #. type: TP -#: doc/tin.1:613 +#: doc/tin.1:620 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:619 +#: doc/tin.1:626 msgid "" "Move the current group within the group selection list. By entering '1' the " "group will become the first displayed group in the list, by entering '8' the " @@ -1758,13 +1772,13 @@ msgstr "" "group displayed." #. type: TP -#: doc/tin.1:619 doc/tin.1:847 doc/tin.1:1272 +#: doc/tin.1:626 doc/tin.1:854 doc/tin.1:1279 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:623 doc/tin.1:851 doc/tin.1:1276 +#: doc/tin.1:630 doc/tin.1:858 doc/tin.1:1283 msgid "" "User configurable options menu (for more information see section \"GLOBAL " "OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES\")." @@ -1773,50 +1787,50 @@ msgstr "" "OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES\")." #. type: TP -#: doc/tin.1:623 +#: doc/tin.1:630 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:626 +#: doc/tin.1:633 msgid "Positions the cursor on the next group with unread articles in it." msgstr "Positions the cursor on the next group with unread articles in it." #. type: TP -#: doc/tin.1:626 doc/tin.1:868 doc/tin.1:1055 doc/tin.1:1293 +#: doc/tin.1:633 doc/tin.1:875 doc/tin.1:1062 doc/tin.1:1300 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:630 +#: doc/tin.1:637 msgid "" -"Quit B - ask the user to confirm if B is set " +"Quit B \\(em ask the user to confirm if B is set " "accordingly." msgstr "" -"Quit B - ask the user to confirm if B is set " +"Quit B \\(em ask the user to confirm if B is set " "accordingly." #. type: TP -#: doc/tin.1:630 doc/tin.1:871 doc/tin.1:1058 doc/tin.1:1296 +#: doc/tin.1:637 doc/tin.1:878 doc/tin.1:1065 doc/tin.1:1303 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:633 doc/tin.1:874 doc/tin.1:1061 doc/tin.1:1299 -msgid "Quit B - don't ask the user to confirm." -msgstr "Quit B - don't ask the user to confirm." +#: doc/tin.1:640 doc/tin.1:881 doc/tin.1:1068 doc/tin.1:1306 +msgid "Quit B \\(em don't ask the user to confirm." +msgstr "Quit B \\(em don't ask the user to confirm." #. type: TP -#: doc/tin.1:633 +#: doc/tin.1:640 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:638 +#: doc/tin.1:645 msgid "" "Toggle display of all subscribed to groups and just those groups containing " "unread articles. Command has no effect if groups were specified on the " @@ -1827,13 +1841,13 @@ msgstr "" "command-line when B was started." #. type: TP -#: doc/tin.1:638 doc/tin.1:877 doc/tin.1:1061 +#: doc/tin.1:645 doc/tin.1:884 doc/tin.1:1068 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:642 doc/tin.1:881 doc/tin.1:1065 +#: doc/tin.1:649 doc/tin.1:888 doc/tin.1:1072 msgid "" "Mail a bug report or comment to Etin-bugs@tin.orgE. This is the best " "way of getting bugs fixed and features added/changed." @@ -1842,24 +1856,24 @@ msgstr "" "way of getting bugs fixed and features added/changed." #. type: TP -#: doc/tin.1:642 +#: doc/tin.1:649 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:645 +#: doc/tin.1:652 msgid "Subscribe to current group." msgstr "Subscribe to current group." #. type: TP -#: doc/tin.1:645 +#: doc/tin.1:652 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:650 +#: doc/tin.1:657 msgid "" "Subscribe to groups matching user specified pattern. See the section " "\"NEWSGROUP LISTS & WILDCARDS\" for the types of pattern that B " @@ -1870,13 +1884,13 @@ msgstr "" "understands." #. type: TP -#: doc/tin.1:650 +#: doc/tin.1:657 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:655 +#: doc/tin.1:662 msgid "" "Unsubscribe to current group. This can be used to remove bogus groups. See " "B in the \"GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" @@ -1887,13 +1901,13 @@ msgstr "" "\" section." #. type: TP -#: doc/tin.1:655 +#: doc/tin.1:662 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:660 +#: doc/tin.1:667 msgid "" "Unsubscribe to groups matching user specified pattern. See the section " "\"NEWSGROUP LISTS & WILDCARDS\" for the types of pattern that B " @@ -1904,13 +1918,13 @@ msgstr "" "understands." #. type: TP -#: doc/tin.1:660 doc/tin.1:905 doc/tin.1:1080 doc/tin.1:1333 +#: doc/tin.1:667 doc/tin.1:912 doc/tin.1:1087 doc/tin.1:1340 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:666 +#: doc/tin.1:673 msgid "" "Post an article to current group. If posting fails for some reason, you'll " "get the chance to B ('B') the article again, B " @@ -1923,24 +1937,24 @@ msgstr "" "discard it via B ('B')." #. type: TP -#: doc/tin.1:666 +#: doc/tin.1:673 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:669 +#: doc/tin.1:676 msgid "Quit B without saving any changes to the configuration." msgstr "Quit B without saving any changes to the configuration." #. type: TP -#: doc/tin.1:669 +#: doc/tin.1:676 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:674 +#: doc/tin.1:681 msgid "" "Yanks in all groups. Toggles the displayed groups between all the groups in " "the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}> file and just " @@ -1951,13 +1965,13 @@ msgstr "" "those that are subscribed to in I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>." #. type: TP -#: doc/tin.1:674 +#: doc/tin.1:681 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:678 +#: doc/tin.1:685 msgid "" "Reread the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}> file " "to see if any new news has arrived since starting B." @@ -1966,25 +1980,25 @@ msgstr "" "to see if any new news has arrived since starting B." #. type: TP -#: doc/tin.1:678 +#: doc/tin.1:685 #, no-wrap msgid "B" msgstr "B" #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:683 +#: doc/tin.1:690 msgid "Mark all articles in the current group as unread." msgstr "Mark all articles in the current group as unread." #. type: SS -#: doc/tin.1:683 +#: doc/tin.1:690 #, no-wrap msgid "GROUP INDEX COMMANDS" msgstr "GROUP INDEX COMMANDS" #. type: Plain text -#: doc/tin.1:687 +#: doc/tin.1:694 msgid "" "All searches in this level are limited to unread articles if in " "B mode. B ('B') can be use " @@ -1995,18 +2009,18 @@ msgstr "" "toggle the setting right before/after the search." #. type: Plain text -#: doc/tin.1:690 +#: doc/tin.1:697 msgid "Select article 4." msgstr "Select article 4." #. type: TP -#: doc/tin.1:690 doc/tin.1:941 doc/tin.1:1105 +#: doc/tin.1:697 doc/tin.1:948 doc/tin.1:1112 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:694 doc/tin.1:945 doc/tin.1:1109 +#: doc/tin.1:701 doc/tin.1:952 doc/tin.1:1116 msgid "" "Auto select article(s) using a menu. Read the section \"FILTERING ARTICLES\" " "for more information." @@ -2015,13 +2029,13 @@ msgstr "" "for more information." #. type: TP -#: doc/tin.1:694 doc/tin.1:945 doc/tin.1:1121 +#: doc/tin.1:701 doc/tin.1:952 doc/tin.1:1128 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:698 doc/tin.1:949 doc/tin.1:1125 +#: doc/tin.1:705 doc/tin.1:956 doc/tin.1:1132 msgid "" "Kill article(s) using a menu. Read the section \"FILTERING ARTICLES\" for " "more information." @@ -2030,13 +2044,13 @@ msgstr "" "more information." #. type: TP -#: doc/tin.1:698 doc/tin.1:949 +#: doc/tin.1:705 doc/tin.1:956 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:703 doc/tin.1:954 +#: doc/tin.1:710 doc/tin.1:961 msgid "" "Mark current article, thread, range, auto-selected (hot) articles, articles " "matching pattern or tagged articles as read. A prompt asks which type should " @@ -2047,13 +2061,13 @@ msgstr "" "be marked." #. type: TP -#: doc/tin.1:703 doc/tin.1:954 +#: doc/tin.1:710 doc/tin.1:961 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:708 doc/tin.1:959 +#: doc/tin.1:715 doc/tin.1:966 msgid "" "Mark current article, thread, range, auto-selected (hot) articles, articles " "matching pattern or tagged articles as unread. A prompt asks which type " @@ -2064,45 +2078,45 @@ msgstr "" "should be marked." #. type: TP -#: doc/tin.1:712 doc/tin.1:963 doc/tin.1:1153 +#: doc/tin.1:719 doc/tin.1:970 doc/tin.1:1160 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:715 doc/tin.1:966 doc/tin.1:1156 +#: doc/tin.1:722 doc/tin.1:973 doc/tin.1:1163 msgid "Re-enter the last message that was viewed." msgstr "Re-enter the last message that was viewed." #. type: Plain text -#: doc/tin.1:721 doc/tin.1:972 +#: doc/tin.1:728 doc/tin.1:979 msgid "Search forward for specified subject." msgstr "Search forward for specified subject." #. type: Plain text -#: doc/tin.1:724 doc/tin.1:975 +#: doc/tin.1:731 doc/tin.1:982 msgid "Search backwards for specified subject." msgstr "Search backwards for specified subject." #. type: TP -#: doc/tin.1:724 +#: doc/tin.1:731 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:727 doc/tin.1:978 +#: doc/tin.1:734 doc/tin.1:985 msgid "Select current thread for later processing." msgstr "Select current thread for later processing." #. type: TP -#: doc/tin.1:727 +#: doc/tin.1:734 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:731 +#: doc/tin.1:738 msgid "" "Selects all threads in current group. It is a shortcut for calling " "B with a pattern of ''*''." @@ -2111,13 +2125,13 @@ msgstr "" "B with a pattern of ''*''." #. type: TP -#: doc/tin.1:731 +#: doc/tin.1:738 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:736 +#: doc/tin.1:743 msgid "" "Toggle selection of current thread. If at least one unread article, (but not " "every unread article) in the current thread is selected, then all unread " @@ -2128,13 +2142,13 @@ msgstr "" "articles become selected." #. type: TP -#: doc/tin.1:736 +#: doc/tin.1:743 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:741 +#: doc/tin.1:748 msgid "" "For each thread in current group, if it at least one unread article is " "selected, all unread articles become selected. This is useful for auto-" @@ -2145,13 +2159,13 @@ msgstr "" "selection on author where reader wants to see entire thread." #. type: TP -#: doc/tin.1:741 +#: doc/tin.1:748 #, no-wrap msgid "B" #. type: Plain text -#: doc/tin.1:747 +#: doc/tin.1:754 msgid "" "Prompts for a pattern with which to match on. All threads whose subjects " "match the pattern will be marked selected. A pattern of ''*'' will match all " @@ -2164,24 +2178,24 @@ msgstr "" "was entered." #. type: TP -#: doc/tin.1:747 +#: doc/tin.1:754 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:750 +#: doc/tin.1:757 msgid "Reverse all selections on all articles." msgstr "Reverse all selections on all articles." #. type: TP -#: doc/tin.1:750 +#: doc/tin.1:757 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:756 +#: doc/tin.1:763 msgid "" "Undo all selections on all articles. It clears the toggle effect of " "B ('B') command. Thus after first doing a " @@ -2194,13 +2208,13 @@ msgstr "" "Thus, one can iteratively whittle down uninteresting threads." #. type: TP -#: doc/tin.1:756 doc/tin.1:987 doc/tin.1:1179 +#: doc/tin.1:763 doc/tin.1:994 doc/tin.1:1186 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:761 doc/tin.1:992 doc/tin.1:1184 +#: doc/tin.1:768 doc/tin.1:999 doc/tin.1:1191 msgid "" "Pipe current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles into command. See the section \"MAILING " @@ -2211,13 +2225,13 @@ msgstr "" "PIPING PRINTING REPOSTING AND SAVING ARTICLES\" for more information." #. type: TP -#: doc/tin.1:761 doc/tin.1:1184 +#: doc/tin.1:768 doc/tin.1:1191 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:770 +#: doc/tin.1:777 msgid "" "Auto select article(s) with a single key [after confirmation]. The defaults " "used for selection are based upon the following four tinrc config variables: " @@ -2236,13 +2250,13 @@ msgstr "" "information on filtering." #. type: TP -#: doc/tin.1:770 doc/tin.1:1193 +#: doc/tin.1:777 doc/tin.1:1200 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:779 +#: doc/tin.1:786 msgid "" "Kill article(s) with a single key [after confirmation]. The defaults used " "for killing are based upon the following four tinrc config variables: " @@ -2261,35 +2275,35 @@ msgstr "" "information on filtering." #. type: TP -#: doc/tin.1:779 +#: doc/tin.1:786 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:782 +#: doc/tin.1:789 msgid "Read current article." msgstr "Read current article." #. type: TP -#: doc/tin.1:782 +#: doc/tin.1:789 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" #. type: Plain text -#: doc/tin.1:785 +#: doc/tin.1:792 msgid "View next unread article or group." msgstr "View next unread article or group." #. type: TP -#: doc/tin.1:785 doc/tin.1:998 doc/tin.1:1210 +#: doc/tin.1:792 doc/tin.1:1005 doc/tin.1:1217 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:789 +#: doc/tin.1:796 msgid "" "Author forward search. This searches for articles with a specific ''From:'' " "line." @@ -2298,24 +2312,24 @@ msgstr "" "line." #. type: TP -#: doc/tin.1:789 doc/tin.1:1003 doc/tin.1:1213 +#: doc/tin.1:796 doc/tin.1:1010 doc/tin.1:1220 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:792 doc/tin.1:1006 +#: doc/tin.1:799 doc/tin.1:1013 msgid "Author backward search. Otherwise, see B ('B') above." msgstr "Author backward search. Otherwise, see B ('B') above." #. type: TP -#: doc/tin.1:792 doc/tin.1:1006 doc/tin.1:1216 +#: doc/tin.1:799 doc/tin.1:1013 doc/tin.1:1223 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:796 doc/tin.1:1010 doc/tin.1:1220 +#: doc/tin.1:803 doc/tin.1:1017 doc/tin.1:1227 msgid "" "Search the body of all articles in group (can be slow). You can abort the " "search using B ('B')." @@ -2324,7 +2338,7 @@ msgstr "" "search using B ('B')." #. type: Plain text -#: doc/tin.1:800 +#: doc/tin.1:807 msgid "" "Mark all articles as read [after confirmation] then return to the group " "selection list. Move cursor to next group." @@ -2333,7 +2347,7 @@ msgstr "" "selection list. Move cursor to next group." #. type: Plain text -#: doc/tin.1:804 +#: doc/tin.1:811 msgid "" "Mark all articles as read [after confirmation] and enter the next group with " "unread news." @@ -2342,13 +2356,13 @@ msgstr "" "unread news." #. type: TP -#: doc/tin.1:804 +#: doc/tin.1:811 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:808 doc/tin.1:1022 +#: doc/tin.1:815 doc/tin.1:1029 msgid "" "Cycle the display of the author through all the possible options for the " "tinrc variable B." @@ -2357,13 +2371,13 @@ msgstr "" "tinrc variable B." #. type: TP -#: doc/tin.1:808 +#: doc/tin.1:815 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:813 doc/tin.1:1027 doc/tin.1:1233 +#: doc/tin.1:820 doc/tin.1:1034 doc/tin.1:1240 msgid "" "Cancel (delete) or supersede (overwrite) the current article. It must have " "been posted by the same user. The cancel message can be seen in the " @@ -2374,24 +2388,24 @@ msgstr "" "newsgroup 'control' or 'control.cancel'." #. type: TP -#: doc/tin.1:816 +#: doc/tin.1:823 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:820 +#: doc/tin.1:827 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:823 +#: doc/tin.1:830 msgid "Toggle article/group limit." msgstr "Toggle article/group limit." #. type: Plain text -#: doc/tin.1:827 +#: doc/tin.1:834 msgid "" "Display the subject of the first article in the current thread in the last " "line." @@ -2400,13 +2414,13 @@ msgstr "" "line." #. type: TP -#: doc/tin.1:830 +#: doc/tin.1:837 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:836 +#: doc/tin.1:843 msgid "" "Mark article/thread as read and move onto the next unread article/thread. If " "a range of articles/threads is set, the range will be marked as read instead " @@ -2419,29 +2433,29 @@ msgstr "" "prompt asks how to proceed." #. type: TP -#: doc/tin.1:836 +#: doc/tin.1:843 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:839 +#: doc/tin.1:846 msgid "Open the thread under the current cursor position." msgstr "Open the thread under the current cursor position." #. type: Plain text -#: doc/tin.1:842 doc/tin.1:1045 doc/tin.1:1267 +#: doc/tin.1:849 doc/tin.1:1052 doc/tin.1:1274 msgid "Look up article by ''Message-ID:''." msgstr "Look up article by ''Message-ID:''." #. type: TP -#: doc/tin.1:842 +#: doc/tin.1:849 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:847 doc/tin.1:1050 doc/tin.1:1272 +#: doc/tin.1:854 doc/tin.1:1057 doc/tin.1:1279 msgid "" "Mail current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to someone. See the section \"MAILING " @@ -2452,35 +2466,35 @@ msgstr "" "PIPING PRINTING REPOSTING AND SAVING ARTICLES\" for more information." #. type: TP -#: doc/tin.1:851 +#: doc/tin.1:858 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:854 +#: doc/tin.1:861 msgid "Go to next group." msgstr "Go to next group." #. type: TP -#: doc/tin.1:854 +#: doc/tin.1:861 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:857 doc/tin.1:1282 +#: doc/tin.1:864 doc/tin.1:1289 msgid "Go to the next unread article." msgstr "Go to the next unread article." #. type: TP -#: doc/tin.1:857 doc/tin.1:1050 doc/tin.1:1282 +#: doc/tin.1:864 doc/tin.1:1057 doc/tin.1:1289 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:862 doc/tin.1:1055 doc/tin.1:1287 +#: doc/tin.1:869 doc/tin.1:1062 doc/tin.1:1294 msgid "" "Send current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to printer. See the section \"MAILING " @@ -2491,51 +2505,51 @@ msgstr "" "PIPING PRINTING REPOSTING AND SAVING ARTICLES\" for more information." #. type: TP -#: doc/tin.1:862 +#: doc/tin.1:869 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:865 +#: doc/tin.1:872 msgid "Go to previous group." msgstr "Go to previous group." #. type: TP -#: doc/tin.1:865 +#: doc/tin.1:872 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:868 +#: doc/tin.1:875 msgid "Go to previous unread article." msgstr "Go to previous unread article." #. type: Plain text -#: doc/tin.1:871 doc/tin.1:1058 +#: doc/tin.1:878 doc/tin.1:1065 msgid "Return to previous level." msgstr "Return to previous level." #. type: TP -#: doc/tin.1:874 +#: doc/tin.1:881 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:877 +#: doc/tin.1:884 msgid "Toggle the display between all articles and unread articles." msgstr "Toggle the display between all articles and unread articles." #. type: TP -#: doc/tin.1:881 +#: doc/tin.1:888 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:886 doc/tin.1:1070 doc/tin.1:1312 +#: doc/tin.1:893 doc/tin.1:1077 doc/tin.1:1319 msgid "" "Save current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles. See the section \"MAILING PIPING " @@ -2546,24 +2560,24 @@ msgstr "" "PRINTING REPOSTING AND SAVING ARTICLES\" for more information." #. type: TP -#: doc/tin.1:886 +#: doc/tin.1:893 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:889 doc/tin.1:1073 doc/tin.1:1315 +#: doc/tin.1:896 doc/tin.1:1080 doc/tin.1:1322 msgid "Save marked articles automatically without further prompting." msgstr "Save marked articles automatically without further prompting." #. type: TP -#: doc/tin.1:889 +#: doc/tin.1:896 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:894 +#: doc/tin.1:901 msgid "" "Toggle tag-status of current article / thread for B ('B') / " "B ('B<|>') / B ('B') / B ('B') / " @@ -2574,26 +2588,26 @@ msgstr "" "B ('B')." #. type: TP -#: doc/tin.1:894 +#: doc/tin.1:901 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:897 +#: doc/tin.1:904 msgid "" "Automatically tag in order all the parts of the current multi-part message." msgstr "" "Automatically tag in order all the parts of the current multi-part message." #. type: TP -#: doc/tin.1:897 +#: doc/tin.1:904 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:902 +#: doc/tin.1:909 msgid "" "Cycle the threading mode through no threading, threading by subject, " "threading by references, threading on both subject and references, group " @@ -2604,18 +2618,18 @@ msgstr "" "multipart articles into a thread (''Subject:'' based)." #. type: TP -#: doc/tin.1:902 +#: doc/tin.1:909 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:905 +#: doc/tin.1:912 msgid "Untag all articles that were tagged." msgstr "Untag all articles that were tagged." #. type: Plain text -#: doc/tin.1:912 doc/tin.1:1087 doc/tin.1:1340 +#: doc/tin.1:919 doc/tin.1:1094 doc/tin.1:1347 msgid "" "Post an article to the current group. If posting fails for some reason, " "you'll get the chance to edit the article again via B ('B'), " @@ -2628,13 +2642,13 @@ msgstr "" "o>'' command-line switch) or discard it via B ('B')." #. type: TP -#: doc/tin.1:912 +#: doc/tin.1:919 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:918 doc/tin.1:1346 +#: doc/tin.1:925 doc/tin.1:1353 msgid "" "Repost an already posted article / thread / auto-selected (hot) articles / " "articles matching pattern / tagged articles to another newsgroup(s). Useful " @@ -2647,13 +2661,13 @@ msgstr "" "your own articles." #. type: TP -#: doc/tin.1:918 +#: doc/tin.1:925 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:926 +#: doc/tin.1:933 msgid "" "Mark all unread articles that have not been selected as read, redraw screen " "to reflect changes and put index at the first thread to begin reading. " @@ -2670,25 +2684,25 @@ msgstr "" "changes permanent." #. type: TP -#: doc/tin.1:926 doc/tin.1:1087 doc/tin.1:1346 +#: doc/tin.1:933 doc/tin.1:1094 doc/tin.1:1353 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:929 +#: doc/tin.1:936 msgid "Mark current article as unread." msgstr "Mark current article as unread." #. type: TP -#: doc/tin.1:929 doc/tin.1:1092 doc/tin.1:1349 +#: doc/tin.1:936 doc/tin.1:1099 doc/tin.1:1356 #, no-wrap msgid "B" msgstr "B" #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:936 +#: doc/tin.1:943 msgid "" "Mark current thread as unread. If a range of threads is set, the range will " "be marked as unread instead of the current thread. When tagged threads are " @@ -2699,79 +2713,79 @@ msgstr "" "present, a prompt asks how to proceed." #. type: SS -#: doc/tin.1:936 +#: doc/tin.1:943 #, no-wrap msgid "THREAD LISTING COMMANDS" msgstr "THREAD LISTING COMMANDS" #. type: Plain text -#: doc/tin.1:941 +#: doc/tin.1:948 msgid "Select article 4 within thread." msgstr "Select article 4 within thread." #. type: TP -#: doc/tin.1:975 +#: doc/tin.1:982 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:978 +#: doc/tin.1:985 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:981 +#: doc/tin.1:988 msgid "Toggle selection of current article." msgstr "Toggle selection of current article." #. type: TP -#: doc/tin.1:981 +#: doc/tin.1:988 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:984 +#: doc/tin.1:991 msgid "Reverse article selections." msgstr "Reverse article selections." #. type: TP -#: doc/tin.1:984 +#: doc/tin.1:991 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:987 +#: doc/tin.1:994 msgid "Undo all selections on current thread." msgstr "Undo all selections on current thread." #. type: TP -#: doc/tin.1:992 +#: doc/tin.1:999 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:995 +#: doc/tin.1:1002 msgid "Read current article within thread." msgstr "Read current article within thread." #. type: TP -#: doc/tin.1:995 +#: doc/tin.1:1002 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" #. type: Plain text -#: doc/tin.1:998 +#: doc/tin.1:1005 msgid "View next unread article within thread." msgstr "View next unread article within thread." #. type: Plain text -#: doc/tin.1:1003 +#: doc/tin.1:1010 msgid "" "Author forward search. This searches for articles with a specific ''From:'' " "line. The search will wrap over into the next thread if nothing is found in " @@ -2782,7 +2796,7 @@ msgstr "" "the current one." #. type: Plain text -#: doc/tin.1:1014 +#: doc/tin.1:1021 msgid "" "Mark thread as read [after confirmation] and return to the group index " "page. Move cursor to next thread." @@ -2791,7 +2805,7 @@ msgstr "" "page. Move cursor to next thread." #. type: Plain text -#: doc/tin.1:1018 +#: doc/tin.1:1025 msgid "" "Mark thread as read [after confirmation] and enter the next thread " "containing unread news." @@ -2800,30 +2814,30 @@ msgstr "" "containing unread news." #. type: TP -#: doc/tin.1:1018 +#: doc/tin.1:1025 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1022 +#: doc/tin.1:1029 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1033 doc/tin.1:1255 +#: doc/tin.1:1040 doc/tin.1:1262 msgid "Display the subject of the current article in the last line." msgstr "Display the subject of the current article in the last line." #. type: TP -#: doc/tin.1:1036 +#: doc/tin.1:1043 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1042 +#: doc/tin.1:1049 msgid "" "Mark article as read and move onto the next unread article. If a range of " "articles is set, the range will be marked as read instead of the current " @@ -2834,31 +2848,31 @@ msgstr "" "article. When tagged articles are present, a prompt asks how to proceed." #. type: TP -#: doc/tin.1:1045 +#: doc/tin.1:1052 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1065 +#: doc/tin.1:1072 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1070 +#: doc/tin.1:1077 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1073 +#: doc/tin.1:1080 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1077 doc/tin.1:1319 +#: doc/tin.1:1084 doc/tin.1:1326 msgid "" "Toggle tag status of current article for mailing, piping, printing, saving " "or reposting." @@ -2867,18 +2881,18 @@ msgstr "" "or reposting." #. type: TP -#: doc/tin.1:1077 +#: doc/tin.1:1084 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1080 +#: doc/tin.1:1087 msgid "Untag all tagged threads." msgstr "Untag all tagged threads." #. type: Plain text -#: doc/tin.1:1092 +#: doc/tin.1:1099 msgid "" "Mark current article in thread as unread. If a range of articles is set, the " "range will be marked as unread instead of the current article. When tagged " @@ -2890,34 +2904,34 @@ msgstr "" #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:1097 +#: doc/tin.1:1104 msgid "Mark all articles in thread as unread." msgstr "Mark all articles in thread as unread." #. type: SS -#: doc/tin.1:1097 +#: doc/tin.1:1104 #, no-wrap msgid "ARTICLE VIEWER COMMANDS" msgstr "ARTICLE VIEWER COMMANDS" #. type: Plain text -#: doc/tin.1:1102 +#: doc/tin.1:1109 msgid "Read the first (base) article in this thread." msgstr "Read the first (base) article in this thread." #. type: Plain text -#: doc/tin.1:1105 +#: doc/tin.1:1112 msgid "Read response 4 in this thread." msgstr "Read response 4 in this thread." #. type: TP -#: doc/tin.1:1109 +#: doc/tin.1:1116 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1113 +#: doc/tin.1:1120 msgid "" "Reply through mail to the author of the current article with a copy of the " "article with all headers included." @@ -2926,46 +2940,46 @@ msgstr "" "article with all headers included." #. type: TP -#: doc/tin.1:1113 +#: doc/tin.1:1120 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1118 +#: doc/tin.1:1125 msgid "Perform B<\\%pgp>(1) operations on article." msgstr "Perform B<\\%pgp>(1) operations on article." #. type: TP -#: doc/tin.1:1118 +#: doc/tin.1:1125 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1121 +#: doc/tin.1:1128 msgid "Toggles the display mode (raw including all headers vs. cooked)." msgstr "Toggles the display mode (raw including all headers vs. cooked)." #. type: TP -#: doc/tin.1:1125 +#: doc/tin.1:1132 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1128 +#: doc/tin.1:1135 msgid "Toggle the TAB width between 4 and 8 characters." msgstr "Toggle the TAB width between 4 and 8 characters." #. type: TP -#: doc/tin.1:1128 +#: doc/tin.1:1135 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1132 +#: doc/tin.1:1139 msgid "" "Post a followup to the current article with a copy of the article with all " "headers included." @@ -2974,13 +2988,13 @@ msgstr "" "headers included." #. type: TP -#: doc/tin.1:1132 +#: doc/tin.1:1139 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1136 +#: doc/tin.1:1143 msgid "" "Toggle TeX to ISO decoding for current article. The default behavior is " "taken from the B variable in the tinrc file." @@ -2989,37 +3003,37 @@ msgstr "" "taken from the B variable in the tinrc file." #. type: TP -#: doc/tin.1:1136 +#: doc/tin.1:1143 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1139 +#: doc/tin.1:1146 msgid "" "Toggles the display of all headers vs. headers in B." msgstr "" "Toggles the display of all headers vs. headers in B." #. type: TP -#: doc/tin.1:1139 +#: doc/tin.1:1146 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1142 +#: doc/tin.1:1149 msgid "Toggle ROT-13 decoding for this article." msgstr "Toggle ROT-13 decoding for this article." #. type: TP -#: doc/tin.1:1142 +#: doc/tin.1:1149 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1146 +#: doc/tin.1:1153 msgid "" "Toggle the display of uuencoded sections. The default behavior is taken from " "the B variable in the tinrc file." @@ -3028,13 +3042,13 @@ msgstr "" "from the B variable in the tinrc file." #. type: TP -#: doc/tin.1:1146 +#: doc/tin.1:1153 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1153 +#: doc/tin.1:1160 msgid "" "The formfeed character (^L) is often used to hide 'spoilers' that the reader " "may not initially wish to see when viewing an article. Any text after a " @@ -3049,23 +3063,23 @@ msgstr "" "up will hide it again." #. type: Plain text -#: doc/tin.1:1162 +#: doc/tin.1:1169 msgid "Forward search the text of this article." msgstr "Forward search the text of this article." #. type: Plain text -#: doc/tin.1:1165 +#: doc/tin.1:1172 msgid "Backward search the text of this article." msgstr "Backward search the text of this article." #. type: TP -#: doc/tin.1:1165 +#: doc/tin.1:1172 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1170 +#: doc/tin.1:1177 msgid "" "Skip to the end of the next quoted text-block in this article. Quoted text " "is everything which matches B, B or " @@ -3076,40 +3090,40 @@ msgstr "" "B." #. type: TP -#: doc/tin.1:1170 +#: doc/tin.1:1177 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:1173 +#: doc/tin.1:1180 msgid "Go to the first article in the current thread." msgstr "Go to the first article in the current thread." #. type: TP -#: doc/tin.1:1173 +#: doc/tin.1:1180 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:1176 +#: doc/tin.1:1183 msgid "Go to the last article in the current thread." msgstr "Go to the last article in the current thread." #. type: TP -#: doc/tin.1:1176 +#: doc/tin.1:1183 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1179 +#: doc/tin.1:1186 msgid "Toggle word highlighting on/off." msgstr "Toggle word highlighting on/off." #. type: Plain text -#: doc/tin.1:1193 +#: doc/tin.1:1200 msgid "" "Auto select article(s) with a single key. The defaults used for selection " "are set based upon the following four tinrc config variables: " @@ -3128,7 +3142,7 @@ msgstr "" "information on filtering." #. type: Plain text -#: doc/tin.1:1202 +#: doc/tin.1:1209 msgid "" "Kill article(s) with a single key. The defaults used for killing are based " "upon the following four tinrc config variables: B, " @@ -3145,24 +3159,24 @@ msgstr "" "\"FILTERING ARTICLES\" for more information on filtering." #. type: TP -#: doc/tin.1:1202 +#: doc/tin.1:1209 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:1205 +#: doc/tin.1:1212 msgid "Go to next base article." msgstr "Go to next base article." #. type: TP -#: doc/tin.1:1205 +#: doc/tin.1:1212 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" #. type: Plain text -#: doc/tin.1:1210 +#: doc/tin.1:1217 msgid "" "Go to next unread article. If the tinrc variable B doesn't " "contain PageNextUnread, then this key will first page through the current " @@ -3173,17 +3187,17 @@ msgstr "" "article." #. type: Plain text -#: doc/tin.1:1213 +#: doc/tin.1:1220 msgid "Author forward search." msgstr "Author forward search." #. type: Plain text -#: doc/tin.1:1216 +#: doc/tin.1:1223 msgid "Author backward search." msgstr "Author backward search." #. type: Plain text -#: doc/tin.1:1224 +#: doc/tin.1:1231 msgid "" "Mark the current thread as read [after confirmation] and return to the " "previous menu. Move cursor to next item." @@ -3192,7 +3206,7 @@ msgstr "" "previous menu. Move cursor to next item." #. type: Plain text -#: doc/tin.1:1228 +#: doc/tin.1:1235 msgid "" "Mark the rest of the current thread as read [after confirmation] and enter " "the next thread with unread articles." @@ -3201,45 +3215,45 @@ msgstr "" "the next thread with unread articles." #. type: TP -#: doc/tin.1:1228 +#: doc/tin.1:1235 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1233 +#: doc/tin.1:1240 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1236 +#: doc/tin.1:1243 msgid "" "Edit the current article. This is restricted to mailgroups and saved news." msgstr "" "Edit the current article. This is restricted to mailgroups and saved news." #. type: TP -#: doc/tin.1:1239 +#: doc/tin.1:1246 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1242 +#: doc/tin.1:1249 msgid "" "Post a followup to the current article with a copy of the article included." msgstr "" "Post a followup to the current article with a copy of the article included." #. type: TP -#: doc/tin.1:1242 +#: doc/tin.1:1249 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1246 +#: doc/tin.1:1253 msgid "" "Post a followup to the current article without including a copy of the " "article." @@ -3248,107 +3262,107 @@ msgstr "" "article." #. type: TP -#: doc/tin.1:1246 +#: doc/tin.1:1253 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1249 +#: doc/tin.1:1256 msgid "Go to the start of the article." msgstr "Go to the start of the article." #. type: TP -#: doc/tin.1:1249 +#: doc/tin.1:1256 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1252 +#: doc/tin.1:1259 msgid "Go to the end of the article." msgstr "Go to the end of the article." #. type: TP -#: doc/tin.1:1258 +#: doc/tin.1:1265 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1261 +#: doc/tin.1:1268 msgid "Mark rest of thread as read and move onto the next unread thread." msgstr "Mark rest of thread as read and move onto the next unread thread." #. type: TP -#: doc/tin.1:1261 +#: doc/tin.1:1268 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1264 +#: doc/tin.1:1271 msgid "Show the thread menu that the current article is a part of." msgstr "Show the thread menu that the current article is a part of." #. type: TP -#: doc/tin.1:1267 +#: doc/tin.1:1274 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1276 +#: doc/tin.1:1283 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1279 +#: doc/tin.1:1286 msgid "Go to the next article." msgstr "Go to the next article." #. type: TP -#: doc/tin.1:1279 +#: doc/tin.1:1286 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1287 +#: doc/tin.1:1294 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1290 +#: doc/tin.1:1297 msgid "Go to the previous article." msgstr "Go to the previous article." #. type: TP -#: doc/tin.1:1290 +#: doc/tin.1:1297 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1293 +#: doc/tin.1:1300 msgid "Go to the previous unread article." msgstr "Go to the previous unread article." #. type: Plain text -#: doc/tin.1:1296 +#: doc/tin.1:1303 msgid "Return to the previous level." msgstr "Return to the previous level." #. type: TP -#: doc/tin.1:1299 +#: doc/tin.1:1306 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1303 +#: doc/tin.1:1310 msgid "" "Reply through mail to the author of the current article with a copy of the " "article included." @@ -3357,13 +3371,13 @@ msgstr "" "article included." #. type: TP -#: doc/tin.1:1303 +#: doc/tin.1:1310 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1307 +#: doc/tin.1:1314 msgid "" "Reply through mail to the author of the current article without including " "the original article." @@ -3372,53 +3386,53 @@ msgstr "" "the original article." #. type: TP -#: doc/tin.1:1307 +#: doc/tin.1:1314 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1312 +#: doc/tin.1:1319 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1315 +#: doc/tin.1:1322 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1319 +#: doc/tin.1:1326 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1322 +#: doc/tin.1:1329 msgid "Return to group selection level." msgstr "Return to group selection level." #. type: TP -#: doc/tin.1:1322 +#: doc/tin.1:1329 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1325 +#: doc/tin.1:1332 msgid "Go to parent article." msgstr "Go to parent article." #. type: TP -#: doc/tin.1:1325 +#: doc/tin.1:1332 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1329 +#: doc/tin.1:1336 msgid "" "Display a list of URLs in the current article. See the section \"URL LISTING" "\" for more information." @@ -3427,13 +3441,13 @@ msgstr "" "\" for more information." #. type: TP -#: doc/tin.1:1329 +#: doc/tin.1:1336 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1333 +#: doc/tin.1:1340 msgid "" "Display a list of attachments of the current article. See the section " "\"ATTACHMENT LISTING\" for more information." @@ -3442,30 +3456,30 @@ msgstr "" "\"ATTACHMENT LISTING\" for more information." #. type: TP -#: doc/tin.1:1340 +#: doc/tin.1:1347 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1349 +#: doc/tin.1:1356 msgid "Mark article as unread." msgstr "Mark article as unread." #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:1354 +#: doc/tin.1:1361 msgid "Mark the current thread as unread." msgstr "Mark the current thread as unread." #. type: SS -#: doc/tin.1:1354 +#: doc/tin.1:1361 #, no-wrap msgid "URL LISTING" msgstr "URL LISTING" #. type: Plain text -#: doc/tin.1:1357 +#: doc/tin.1:1364 msgid "" "B ('B') displays a list of URLs in the current article. " "Besides the common moving keys, the following commands are available:" @@ -3474,13 +3488,13 @@ msgstr "" "Besides the common moving keys, the following commands are available:" #. type: TP -#: doc/tin.1:1358 +#: doc/tin.1:1365 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:1362 +#: doc/tin.1:1369 msgid "" "The current URL will be prompted and opened using the B. " "'BESCE>' or no input will skip the URL." @@ -3489,39 +3503,39 @@ msgstr "" "'BESCE>' or no input will skip the URL." #. type: Plain text -#: doc/tin.1:1365 +#: doc/tin.1:1372 msgid "URL forward search." msgstr "URL forward search." #. type: Plain text -#: doc/tin.1:1368 +#: doc/tin.1:1375 msgid "URL backward search." msgstr "URL backward search." #. type: Plain text -#: doc/tin.1:1374 doc/tin.1:1427 +#: doc/tin.1:1381 doc/tin.1:1434 msgid "Shell escape." msgstr "Shell escape." #. type: Plain text -#: doc/tin.1:1377 +#: doc/tin.1:1384 msgid "Toggle the display of the current URL in the last line." msgstr "Toggle the display of the current URL in the last line." #. type: Plain text -#: doc/tin.1:1380 doc/tin.1:1434 +#: doc/tin.1:1387 doc/tin.1:1441 msgid "Help screen of commands available." msgstr "Help screen of commands available." #. -------------------------------------------------------------------- #. type: SS -#: doc/tin.1:1386 +#: doc/tin.1:1393 #, no-wrap msgid "ATTACHMENT LISTING" msgstr "ATTACHMENT LISTING" #. type: Plain text -#: doc/tin.1:1389 +#: doc/tin.1:1396 msgid "" "B ('B') displays a list of attachments of the current " "article. Besides the common moving keys, the following commands are " @@ -3532,57 +3546,57 @@ msgstr "" "available:" #. type: TP -#: doc/tin.1:1390 +#: doc/tin.1:1397 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1393 +#: doc/tin.1:1400 msgid "Pipe attachment into command." msgstr "Pipe attachment into command." #. type: TP -#: doc/tin.1:1393 +#: doc/tin.1:1400 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1396 +#: doc/tin.1:1403 msgid "Save current attachment / tagged attachments to disk." msgstr "Save current attachment / tagged attachments to disk." #. type: TP -#: doc/tin.1:1396 +#: doc/tin.1:1403 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:1399 +#: doc/tin.1:1406 msgid "View attachment." msgstr "View attachment." #. type: TP -#: doc/tin.1:1399 +#: doc/tin.1:1406 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1402 +#: doc/tin.1:1409 msgid "Tag one or more attachments for saving." msgstr "Tag one or more attachments for saving." #. type: TP -#: doc/tin.1:1402 +#: doc/tin.1:1409 #, no-wrap msgid "B" #. type: Plain text -#: doc/tin.1:1406 +#: doc/tin.1:1413 msgid "" "Prompts for a pattern to match. All attachments whose name/description or " "content type/transfer encoding match the pattern will be tagged." @@ -3591,52 +3605,52 @@ msgstr "" "content type/transfer encoding match the pattern will be tagged." #. type: TP -#: doc/tin.1:1406 +#: doc/tin.1:1413 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1409 +#: doc/tin.1:1416 msgid "Reverse tagging of all attachments." msgstr "Reverse tagging of all attachments." #. type: TP -#: doc/tin.1:1409 +#: doc/tin.1:1416 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1412 +#: doc/tin.1:1419 msgid "Untag all tagged attachments." msgstr "Untag all tagged attachments." #. type: Plain text -#: doc/tin.1:1415 +#: doc/tin.1:1422 msgid "Attachment forward search." msgstr "Attachment forward search." #. type: Plain text -#: doc/tin.1:1418 +#: doc/tin.1:1425 msgid "Attachment backward search." msgstr "Attachment backward search." #. type: TP -#: doc/tin.1:1421 +#: doc/tin.1:1428 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1424 +#: doc/tin.1:1431 msgid "" "Pipe attachment into command. Uses the raw attachment, no decoding is done." msgstr "" "Pipe attachment into command. Uses the raw attachment, no decoding is done." #. type: Plain text -#: doc/tin.1:1431 +#: doc/tin.1:1438 msgid "" "Toggle the display of the name/description of the current attachment in the " "last line." @@ -3646,7 +3660,7 @@ msgstr "" #. -------------------------------------------------------------------- #. type: SS -#: doc/tin.1:1440 +#: doc/tin.1:1447 #, no-wrap msgid "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" msgstr "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" @@ -3655,7 +3669,7 @@ msgstr "GLOBAL OPTIONS MENU AND TINRC CO #. - \fI${TIN_LIBDIR:\-NEWSLIBDIR}/tinrc\fR is used #. in the !TIN_DEFAULTS_DIR config case #. type: Plain text -#: doc/tin.1:1452 +#: doc/tin.1:1459 msgid "" "At startup, B reads in the configuration files (see also B<\\" "%tin>(5)). They contain a list of variables that can be used to configure " @@ -3672,7 +3686,7 @@ msgstr "" "distributing system-wide defaults to new users who have no private tinrc yet." #. type: Plain text -#: doc/tin.1:1460 +#: doc/tin.1:1467 msgid "" "The variables are user configurable by editing I<${TIN_HOMEDIR:-\"$HOME\"}/." "tin/tinrc> directly. Most of them can also be set in the GLOBAL OPTIONS MENU " @@ -3689,7 +3703,7 @@ msgstr "" "don't edit the file directly whilst B is running." #. type: Plain text -#: doc/tin.1:1466 +#: doc/tin.1:1473 msgid "" "In the options menu use the cursor keys in the usual way to move around. Use " "B ('B<^J>' or 'BCRE>') to 'open' the option you wish " @@ -3704,7 +3718,7 @@ msgstr "" "\\&'BESCE>' will abort without saving changes." #. type: Plain text -#: doc/tin.1:1473 +#: doc/tin.1:1480 msgid "" "As with the other menus, B ('B<^L>') will redraw the screen. You " "can use B ('B'), B ('B') and B " @@ -3719,7 +3733,7 @@ msgstr "" "keeping your changes." #. type: Plain text -#: doc/tin.1:1478 +#: doc/tin.1:1485 msgid "" "The options menu provides access to the attributes menu for the current " "group by the B ('BTABE>') command. Pressing " @@ -3732,7 +3746,7 @@ msgstr "" "information see section \"ATTRIBUTES MENU AND GROUP ATTRIBUTES\"." #. type: Plain text -#: doc/tin.1:1481 +#: doc/tin.1:1488 msgid "" "The B ('B') command brings up the scopes menu. For more " "information see section \"SCOPES MENU\"." @@ -3741,7 +3755,7 @@ msgstr "" "information see section \"SCOPES MENU\"." #. type: Plain text -#: doc/tin.1:1485 +#: doc/tin.1:1492 msgid "" "Here is a full list of all the available variables. The name in braces is " "the name of the corresponding setting in I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/" @@ -3752,13 +3766,13 @@ msgstr "" "tinrc>." #. type: TP -#: doc/tin.1:1485 +#: doc/tin.1:1492 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1491 doc/tin.5:1199 +#: doc/tin.1:1498 doc/tin.5:1203 msgid "" "If ON abbreviate long newsgroup names at group selection level and article " "level (if necessary) like this: news.software.readers -E n.software." @@ -3769,13 +3783,13 @@ msgstr "" "readers -E n.s.readers -E n.s.r. Default is OFF." #. type: TP -#: doc/tin.1:1491 +#: doc/tin.1:1498 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1495 doc/tin.5:1203 +#: doc/tin.1:1502 doc/tin.5:1207 msgid "" "If ON add posted articles which start a new thread to filter for " "highlighting follow-ups. Default is ON." @@ -3784,62 +3798,62 @@ msgstr "" "highlighting follow-ups. Default is ON." #. type: TP -#: doc/tin.1:1495 +#: doc/tin.1:1502 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1498 doc/tin.5:1206 +#: doc/tin.1:1505 doc/tin.5:1210 msgid "Turn ON advertising in header (''User-Agent:''). Default is ON." msgstr "Turn ON advertising in header (''User-Agent:''). Default is ON." #. type: TP -#: doc/tin.1:1498 +#: doc/tin.1:1505 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1501 doc/tin.5:1209 +#: doc/tin.1:1508 doc/tin.5:1213 msgid "" "If ON strip multipart/alternative messages automatically. Default is ON." msgstr "" "If ON strip multipart/alternative messages automatically. Default is ON." #. type: TP -#: doc/tin.1:1501 +#: doc/tin.1:1508 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1504 doc/tin.5:1212 +#: doc/tin.1:1511 doc/tin.5:1216 msgid "The character used to show that an article was deleted. Default is 'D'." msgstr "" "The character used to show that an article was deleted. Default is 'D'." #. type: TP -#: doc/tin.1:1504 +#: doc/tin.1:1511 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1507 doc/tin.5:1215 +#: doc/tin.1:1514 doc/tin.5:1219 msgid "" "The character used to show that an article is in a range. Default is '#'." msgstr "" "The character used to show that an article is in a range. Default is '#'." #. type: TP -#: doc/tin.1:1507 +#: doc/tin.1:1514 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1511 doc/tin.5:1219 +#: doc/tin.1:1518 doc/tin.5:1223 msgid "" "The character used to show that an article will return as an unread article " "when the group is next entered. Default is '-'." @@ -3848,13 +3862,13 @@ msgstr "" "when the group is next entered. Default is '-'." #. type: TP -#: doc/tin.1:1511 +#: doc/tin.1:1518 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1515 doc/tin.5:1223 +#: doc/tin.1:1522 doc/tin.5:1227 msgid "" "The character used to show that an article/thread is auto-selected (hot). " "Default is '*'." @@ -3863,13 +3877,13 @@ msgstr "" "Default is '*'." #. type: TP -#: doc/tin.1:1515 +#: doc/tin.1:1522 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1519 doc/tin.5:1227 +#: doc/tin.1:1526 doc/tin.5:1231 msgid "" "The character used to show that an article/thread is recent (not older than " "X days). See also B. Default is 'o'." @@ -3878,13 +3892,13 @@ msgstr "" "X days). See also B. Default is 'o'." #. type: TP -#: doc/tin.1:1519 +#: doc/tin.1:1526 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1523 doc/tin.5:1231 +#: doc/tin.1:1530 doc/tin.5:1235 msgid "" "The character used to show that an article has not been read. Default is " "'+'." @@ -3893,24 +3907,24 @@ msgstr "" "'+'." #. type: TP -#: doc/tin.1:1523 +#: doc/tin.1:1530 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1526 doc/tin.5:1234 +#: doc/tin.1:1533 doc/tin.5:1238 msgid "The character used to show that an article was read. Default is ' '." msgstr "The character used to show that an article was read. Default is ' '." #. type: TP -#: doc/tin.1:1526 +#: doc/tin.1:1533 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1530 doc/tin.5:1238 +#: doc/tin.1:1537 doc/tin.5:1242 msgid "" "The character used to show that an article was killed. Default is 'K'. " "B must be set accordingly." @@ -3919,13 +3933,13 @@ msgstr "" "B must be set accordingly." #. type: TP -#: doc/tin.1:1530 +#: doc/tin.1:1537 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1534 doc/tin.5:1242 +#: doc/tin.1:1541 doc/tin.5:1246 msgid "" "The character used to show that an article was hot before it was read. " "Default is ':'. B must be set accordingly." @@ -3934,13 +3948,13 @@ msgstr "" "Default is ':'. B must be set accordingly." #. type: TP -#: doc/tin.1:1534 doc/tin.5:1242 +#: doc/tin.1:1541 doc/tin.5:1246 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1539 +#: doc/tin.1:1546 msgid "" "If ON B will ask before using a MIME viewer (B) to " "display MIME messages. This only occurs if a MIME viewer is set. Default is " @@ -3951,13 +3965,13 @@ msgstr "" "OFF." #. type: TP -#: doc/tin.1:1539 +#: doc/tin.1:1546 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1543 doc/tin.5:1253 +#: doc/tin.1:1550 doc/tin.5:1257 msgid "" "Automatically put your name in the ''Cc:'' and/or ''Bcc:'' field when " "mailing an article. Default is No." @@ -3966,13 +3980,13 @@ msgstr "" "mailing an article. Default is No." #. type: TP -#: doc/tin.1:1543 +#: doc/tin.1:1550 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1547 doc/tin.5:1257 +#: doc/tin.1:1554 doc/tin.5:1261 msgid "" "If ON automatically list thread when entering it using right arrow key. " "Default is ON." @@ -3981,24 +3995,24 @@ msgstr "" "Default is ON." #. type: TP -#: doc/tin.1:1547 +#: doc/tin.1:1554 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1550 doc/tin.1:2531 +#: doc/tin.1:1557 doc/tin.1:2540 msgid "Default is OFF." msgstr "Default is OFF." #. type: TP -#: doc/tin.1:1550 +#: doc/tin.1:1557 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1556 doc/tin.5:1266 +#: doc/tin.1:1563 doc/tin.5:1270 msgid "" "If ON articles/threads with ''Archive-name:'' in header will be " "automatically saved with the Archive-name & part/patch no and post processed " @@ -4009,13 +4023,13 @@ msgstr "" "if B is set to something other than 'No'. Default is OFF." #. type: TP -#: doc/tin.1:1556 +#: doc/tin.1:1563 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1561 doc/tin.5:1271 +#: doc/tin.1:1568 doc/tin.5:1275 msgid "" "If set ON articles/threads will be saved in batch mode when save \\&''B<-" "S>'' or mail ''B<-M>, B<-N>'' is specified on the command line. Default is " @@ -4026,13 +4040,13 @@ msgstr "" "ON." #. type: TP -#: doc/tin.1:1561 +#: doc/tin.1:1568 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1566 doc/tin.5:1276 +#: doc/tin.1:1573 doc/tin.5:1280 msgid "" "If set ON a mini menu of the most useful commands will be displayed at the " "bottom of the screen for each level. Also a short posting etiquette will be " @@ -4043,13 +4057,13 @@ msgstr "" "displayed after composing an article. Default is ON." #. type: TP -#: doc/tin.1:1566 +#: doc/tin.1:1573 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1571 +#: doc/tin.1:1578 msgid "" "If ON, create local copies of NNTP overview files. This can be used to " "considerably speed up accessing large groups when using a slow connection. " @@ -4060,13 +4074,13 @@ msgstr "" "See also \"INDEX FILES\". Default is OFF." #. type: TP -#: doc/tin.1:1571 +#: doc/tin.1:1578 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1577 doc/tin.5:1287 +#: doc/tin.1:1584 doc/tin.5:1291 msgid "" "Use this hash algorithm for cancel-locks. Only available when build with " "cancel-lock support. none disables the generation of cancel-locks. Valid " @@ -4077,13 +4091,13 @@ msgstr "" "values are none, sha1, sha256 and sha512. Default is sha1." #. type: TP -#: doc/tin.1:1577 +#: doc/tin.1:1584 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1583 doc/tin.5:1291 +#: doc/tin.1:1590 doc/tin.5:1295 msgid "" "If set ON the user is asked when quitting if all groups read during the " "current session should be marked read. Default is OFF." @@ -4092,90 +4106,90 @@ msgstr "" "current session should be marked read. Default is OFF." #. type: TP -#: doc/tin.1:1583 +#: doc/tin.1:1590 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1586 doc/tin.5:1294 +#: doc/tin.1:1593 doc/tin.5:1298 msgid "Standard background color" msgstr "Standard background colour" #. type: TP -#: doc/tin.1:1586 +#: doc/tin.1:1593 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1589 doc/tin.5:1297 +#: doc/tin.1:1596 doc/tin.5:1301 msgid "Color of quoted text from external sources" msgstr "Colour of quoted text from external sources" #. type: TP -#: doc/tin.1:1589 +#: doc/tin.1:1596 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1592 doc/tin.5:1300 +#: doc/tin.1:1599 doc/tin.5:1304 msgid "Color of sender (From:)" msgstr "Colour of sender (From:)" #. type: TP -#: doc/tin.1:1592 +#: doc/tin.1:1599 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1595 doc/tin.5:1303 +#: doc/tin.1:1602 doc/tin.5:1307 msgid "Color of header-lines" msgstr "Colour of header-lines" #. type: TP -#: doc/tin.1:1595 +#: doc/tin.1:1602 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1598 doc/tin.5:1306 +#: doc/tin.1:1605 doc/tin.5:1310 msgid "Color of help pages" msgstr "Colour of help pages" #. type: TP -#: doc/tin.1:1598 +#: doc/tin.1:1605 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1601 doc/tin.5:1309 +#: doc/tin.1:1608 doc/tin.5:1313 msgid "Color of background for inverse text" msgstr "Colour of background for inverse text" #. type: TP -#: doc/tin.1:1601 +#: doc/tin.1:1608 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1604 doc/tin.5:1312 +#: doc/tin.1:1611 doc/tin.5:1316 msgid "Color of foreground for inverse text" msgstr "Colour of foreground for inverse text" #. type: TP -#: doc/tin.1:1604 +#: doc/tin.1:1611 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1608 doc/tin.5:1316 +#: doc/tin.1:1615 doc/tin.5:1320 msgid "" "Color of words emphasized like _this_. See also B and " "B." @@ -4184,13 +4198,13 @@ msgstr "" "B." #. type: TP -#: doc/tin.1:1608 +#: doc/tin.1:1615 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1612 doc/tin.5:1320 +#: doc/tin.1:1619 doc/tin.5:1324 msgid "" "Color of words emphasized like /this/. See also B and " "B." @@ -4199,13 +4213,13 @@ msgstr "" "B." #. type: TP -#: doc/tin.1:1612 +#: doc/tin.1:1619 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1616 doc/tin.5:1324 +#: doc/tin.1:1623 doc/tin.5:1328 msgid "" "Color of words emphasized like *this*. See also B and " "B." @@ -4214,13 +4228,13 @@ msgstr "" "B." #. type: TP -#: doc/tin.1:1616 +#: doc/tin.1:1623 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1620 doc/tin.5:1328 +#: doc/tin.1:1627 doc/tin.5:1332 msgid "" "Color of words emphasized like -this-. See also B and " "B." @@ -4229,79 +4243,79 @@ msgstr "" "B." #. type: TP -#: doc/tin.1:1620 +#: doc/tin.1:1627 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1623 doc/tin.5:1331 +#: doc/tin.1:1630 doc/tin.5:1335 msgid "Color of mini help menu" msgstr "Colour of mini help menu" #. type: TP -#: doc/tin.1:1623 +#: doc/tin.1:1630 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1626 doc/tin.5:1334 +#: doc/tin.1:1633 doc/tin.5:1338 msgid "Color of actual news header fields" msgstr "Colour of actual news header fields" #. type: TP -#: doc/tin.1:1626 +#: doc/tin.1:1633 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1629 doc/tin.5:1337 +#: doc/tin.1:1636 doc/tin.5:1341 msgid "Standard foreground color" msgstr "Standard foreground colour" #. type: TP -#: doc/tin.1:1629 +#: doc/tin.1:1636 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1632 doc/tin.5:1340 +#: doc/tin.1:1639 doc/tin.5:1344 msgid "Color of quoted lines" msgstr "Colour of quoted lines" #. type: TP -#: doc/tin.1:1632 +#: doc/tin.1:1639 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1635 doc/tin.5:1343 +#: doc/tin.1:1642 doc/tin.5:1347 msgid "Color of twice quoted lines" msgstr "Colour of twice quoted lines" #. type: TP -#: doc/tin.1:1635 +#: doc/tin.1:1642 #, no-wrap msgid "B3 times quoted line (col_quote3)>" msgstr "B3 times quoted line (col_quote3)>" #. type: Plain text -#: doc/tin.1:1638 doc/tin.5:1346 +#: doc/tin.1:1645 doc/tin.5:1350 msgid "Color of E=3 times quoted lines" msgstr "Colour of E=3 times quoted lines" #. type: TP -#: doc/tin.1:1638 +#: doc/tin.1:1645 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1642 doc/tin.5:1350 +#: doc/tin.1:1649 doc/tin.5:1354 msgid "" "Color of response counter. This is the text that says \"Response x of y\" in " "the article viewer." @@ -4310,91 +4324,91 @@ msgstr "" "in the article viewer." #. type: TP -#: doc/tin.1:1642 +#: doc/tin.1:1649 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1645 doc/tin.5:1353 +#: doc/tin.1:1652 doc/tin.5:1357 msgid "Color of signatures" msgstr "Colour of signatures" #. type: TP -#: doc/tin.1:1645 +#: doc/tin.1:1652 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1648 doc/tin.5:1356 +#: doc/tin.1:1655 doc/tin.5:1360 msgid "Color of urls highlight" msgstr "Colour of urls highlight" #. type: TP -#: doc/tin.1:1648 +#: doc/tin.1:1655 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1651 doc/tin.5:1359 +#: doc/tin.1:1658 doc/tin.5:1363 msgid "Color of verbatim blocks" msgstr "Colour of verbatim blocks" #. type: TP -#: doc/tin.1:1651 +#: doc/tin.1:1658 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1654 doc/tin.5:1362 +#: doc/tin.1:1661 doc/tin.5:1366 msgid "Color of article subject" msgstr "Colour of article subject" #. type: TP -#: doc/tin.1:1654 +#: doc/tin.1:1661 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1657 doc/tin.5:1365 +#: doc/tin.1:1664 doc/tin.5:1369 msgid "Color of text-lines" msgstr "Colour of text-lines" #. type: TP -#: doc/tin.1:1657 +#: doc/tin.1:1664 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1660 doc/tin.5:1368 +#: doc/tin.1:1667 doc/tin.5:1372 msgid "Color of help/mail sign" msgstr "Colour of help/mail sign" #. type: TP -#: doc/tin.1:1660 +#: doc/tin.1:1667 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1663 +#: doc/tin.1:1670 msgid "Ask for manual confirmation to protect the user." msgstr "Ask for manual confirmation to protect the user." #. type: IP -#: doc/tin.1:1664 doc/tin.1:1670 doc/tin.1:1674 +#: doc/tin.1:1671 doc/tin.1:1677 doc/tin.1:1681 #, no-wrap msgid "\\(bu" msgstr "\\(bu" #. TODO: check if all affected commands are marked [after confirmation] #. type: Plain text -#: doc/tin.1:1670 +#: doc/tin.1:1677 msgid "" "B Ask for confirmation before executing certain dangerous commands " "(e.g., B ('B')). Commands that this affects are marked in this " @@ -4405,7 +4419,7 @@ msgstr "" "manual with '[after confirmation]'. Default is commands & quit." #. type: Plain text -#: doc/tin.1:1674 +#: doc/tin.1:1681 msgid "" "B You'll be asked to confirm that you wish to exit B when you use " "the B ('B') command." @@ -4414,7 +4428,7 @@ msgstr "" "the B ('B') command." #. type: Plain text -#: doc/tin.1:1678 +#: doc/tin.1:1685 msgid "" "B: Ask for confirmation before marking all not selected (with " "B ('B') command) articles as read." @@ -12909,12 +12944,12 @@ msgstr "" "B ('B') command) articles as read." #. type: Plain text -#: doc/tin.5:1389 +#: doc/tin.5:1393 msgid "Default is commands & quit." msgstr "Default is commands & quit." #. type: Plain text -#: doc/tin.5:1400 +#: doc/tin.5:1404 msgid "" "Format string used for date representation. A description of the different " "format options can be found at B<\\%strftime>(3). B<\\%tin>(1) uses B<\\" @@ -12927,61 +12962,61 @@ msgstr "" "fallback code. Default is \"%a, %d %b %Y %H:%M:%S\"." #. type: TP -#: doc/tin.5:1400 +#: doc/tin.5:1404 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1402 +#: doc/tin.5:1406 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1404 +#: doc/tin.5:1408 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1407 +#: doc/tin.5:1411 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1410 +#: doc/tin.5:1414 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1414 +#: doc/tin.5:1418 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1419 +#: doc/tin.5:1423 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1423 +#: doc/tin.5:1427 #, no-wrap msgid "B" msgstr "B" #. type: ta -#: doc/tin.5:1428 doc/tin.5:1457 +#: doc/tin.5:1432 doc/tin.5:1461 #, no-wrap msgid "\\w'0,1 'u +\\w'\\'\\'Message-ID:\\'\\' & last \\'\\'References:\\'\\' entry only'u" msgstr "\\w'0,1 'u +\\w'\\'\\'Message-ID:\\'\\' & last \\'\\'References:\\'\\' entry only'u" #. type: Plain text -#: doc/tin.5:1437 doc/tin.5:1466 +#: doc/tin.5:1441 doc/tin.5:1470 #, no-wrap msgid "" "0\t''Subject:'' (case sensitive)\n" @@ -13003,139 +13038,139 @@ msgstr "" "7\t''Lines:''\n" #. type: TP -#: doc/tin.5:1439 +#: doc/tin.5:1443 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1443 +#: doc/tin.5:1447 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1448 +#: doc/tin.5:1452 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1452 +#: doc/tin.5:1456 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1468 +#: doc/tin.5:1472 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1470 +#: doc/tin.5:1474 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1472 +#: doc/tin.5:1476 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1474 +#: doc/tin.5:1478 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1476 +#: doc/tin.5:1480 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1478 +#: doc/tin.5:1482 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1480 +#: doc/tin.5:1484 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1482 +#: doc/tin.5:1486 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1484 +#: doc/tin.5:1488 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1486 +#: doc/tin.5:1490 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1488 +#: doc/tin.5:1492 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1490 +#: doc/tin.5:1494 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1492 +#: doc/tin.5:1496 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1494 +#: doc/tin.5:1498 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1496 +#: doc/tin.5:1500 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1498 +#: doc/tin.5:1502 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1500 +#: doc/tin.5:1504 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1502 +#: doc/tin.5:1506 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1511 +#: doc/tin.5:1515 msgid "" "The format string used to create the editor start command with parameters. " "Default is '%E +%N %F' with %E=Editor, %N=Linenumber and %F=Filename (e.g., /" @@ -13146,13 +13181,13 @@ msgstr "" "bin/vi +7 .article)." #. type: TP -#: doc/tin.5:1514 +#: doc/tin.5:1518 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1521 +#: doc/tin.5:1525 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, " @@ -13163,19 +13198,19 @@ msgstr "" "then B<%tin>(1) uses a built-in default." #. type: TP -#: doc/tin.5:1521 +#: doc/tin.5:1525 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1525 +#: doc/tin.5:1529 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1532 +#: doc/tin.5:1536 msgid "" "If B is E 0 not more than the last B " "articles/group are fetched from the server. If B is E 0 B<" @@ -13188,13 +13223,13 @@ msgstr "" "absolute value of B. Default is 0, which means no limit." #. type: TP -#: doc/tin.5:1532 +#: doc/tin.5:1536 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1546 +#: doc/tin.5:1550 msgid "" "Which keys B<%tin>(1) should accept to jump to the next unread article. " "Possible is any combination of B and B. When " @@ -13211,7 +13246,7 @@ msgstr "" "Default is B." #. type: Plain text -#: doc/tin.5:1553 +#: doc/tin.5:1557 msgid "" "The format string used for the Group level. Default is \"%n\\ %m\\ %R\\ %L\\ " "\\ %s\\ \\ %F\". The following substitutions are supported:" @@ -13220,13 +13255,13 @@ msgstr "" "\\ %s\\ \\ %F\". The following substitutions are supported:" #. type: ta -#: doc/tin.5:1555 +#: doc/tin.5:1559 #, no-wrap msgid "\\w'%G 'u +\\w'number of responses in thread'u" msgstr "\\w'%G 'u +\\w'number of responses in thread'u" #. type: Plain text -#: doc/tin.5:1567 +#: doc/tin.5:1571 #, no-wrap msgid "" "%D\tdate\n" @@ -13254,31 +13289,31 @@ msgstr "" "%%\t%\n" #. type: TP -#: doc/tin.5:1569 +#: doc/tin.5:1573 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1579 +#: doc/tin.5:1583 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1586 +#: doc/tin.5:1590 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1592 +#: doc/tin.5:1596 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1598 +#: doc/tin.5:1602 msgid "" "If greater than 0 your mailreader will be invoked earlier for reply so you " "can use more of its features (e.g. MIME, pgp, ...). 1 means include headers, " @@ -13291,25 +13326,25 @@ msgstr "" "usage. This option has to suit B. Default is 0." #. type: TP -#: doc/tin.5:1598 +#: doc/tin.5:1602 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1602 +#: doc/tin.5:1606 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1607 +#: doc/tin.5:1611 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1611 +#: doc/tin.5:1615 msgid "" "This option controls the processing and display of articles that are killed. " "There are 3 options, default is 0 (B)." @@ -13318,7 +13353,7 @@ msgstr "" "There are 3 options, default is 0 (B)." #. type: Plain text -#: doc/tin.5:1619 +#: doc/tin.5:1623 msgid "" "B is the 'traditional' behavior of B<\\%tin>(1). " "Only unread articles are killed once only by marking them read. As filtering " @@ -13333,73 +13368,73 @@ msgstr "" "When you reenter the group the mark will be gone." #. type: TP -#: doc/tin.5:1635 +#: doc/tin.5:1639 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1645 +#: doc/tin.5:1649 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1650 +#: doc/tin.5:1654 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1669 +#: doc/tin.5:1673 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1706 +#: doc/tin.5:1710 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1718 doc/tin.5:2421 +#: doc/tin.5:1722 doc/tin.5:2426 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1751 +#: doc/tin.5:1755 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1756 +#: doc/tin.5:1760 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1761 +#: doc/tin.5:1765 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1766 +#: doc/tin.5:1770 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1771 +#: doc/tin.5:1775 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1777 +#: doc/tin.5:1781 msgid "" "These are internal timers used by B<\\%tin>(1) to keep track of new " "newsgroups. Do not change them unless you understand what they are for." @@ -13408,25 +13443,25 @@ msgstr "" "newsgroups. Do not change them unless you understand what they are for." #. type: TP -#: doc/tin.5:1798 +#: doc/tin.5:1802 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1801 +#: doc/tin.5:1805 msgid "Time in seconds to wait for a response from the server. Default is 120." msgstr "" "Time in seconds to wait for a response from the server. Default is 120." #. type: TP -#: doc/tin.5:1801 +#: doc/tin.5:1805 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1805 +#: doc/tin.5:1809 msgid "" "The normalization form which should be used to normalize unicode input. The " "possible values are:" @@ -13435,7 +13470,7 @@ msgstr "" "possible values are:" #. type: Plain text -#: doc/tin.5:1821 +#: doc/tin.5:1827 msgid "" "Some normalization modes are only available if they are supported by the " "library B<\\%tin>(1) uses to do the normalization. NFC should be used if " @@ -13446,7 +13481,7 @@ msgstr "" "possible." #. type: Plain text -#: doc/tin.5:1849 +#: doc/tin.5:1855 msgid "" "If ON, then B<\\%tin>(1) will start an appropriate viewer program to " "display any files that were post processed and uudecoded. The program is " @@ -13457,7 +13492,7 @@ msgstr "" "determined using the B<\\%mailcap>(5) file. Default is ON." #. type: Plain text -#: doc/tin.5:1855 +#: doc/tin.5:1861 msgid "" "This specifies whether to perform post processing on saved articles. " "Because the shell archive may contain commands you may not want to be " @@ -13470,7 +13505,7 @@ msgstr "" "are allowed:" #. type: Plain text -#: doc/tin.5:1863 +#: doc/tin.5:1869 msgid "" "B, unpacking of multi-part B<\\%shar>(1) files only. " "Because the shell archive may contain commands you may not want to be " @@ -13481,19 +13516,19 @@ msgstr "" "executed, be careful with this option." #. type: TP -#: doc/tin.5:1866 +#: doc/tin.5:1872 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1876 +#: doc/tin.5:1882 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1886 +#: doc/tin.5:1892 msgid "" "The printer program with options that is to be used to print articles. The " "default is B<\\%lpr>(1) for BSD machines and B<\\%lp>(1) for SysV " @@ -13506,7 +13541,7 @@ msgstr "" "Administrator." #. type: Plain text -#: doc/tin.5:1894 +#: doc/tin.5:1900 msgid "" "If ON show empty ''Followup-To:'' header when editing an article. Default " "is OFF." @@ -13515,13 +13550,13 @@ msgstr "" "is OFF." #. type: TP -#: doc/tin.5:1900 +#: doc/tin.5:1906 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1906 +#: doc/tin.5:1912 msgid "" "This bit coded integer value controls how articles are to be quoted when " "following up or replying to them. Any of the following options can be " @@ -13534,7 +13569,7 @@ msgstr "" "characters are compressed and empty lines are quoted." #. type: Plain text -#: doc/tin.5:1911 +#: doc/tin.5:1917 msgid "" "B Compress quote characters together when quoting multiple " "times (for example, 'E E E' will be turned into " @@ -13545,7 +13580,7 @@ msgstr "" "'EEE'). This option is on by default." #. type: Plain text -#: doc/tin.5:1917 +#: doc/tin.5:1923 msgid "" "B This option is off by default. Signatures are always " "quoted regardless of this option when you are viewing an article in raw mode " @@ -13558,18 +13593,18 @@ msgstr "" "quoted regardless of this option when B is off." #. type: Plain text -#: doc/tin.5:1919 +#: doc/tin.5:1925 msgid "B This option is on by default." msgstr "B This option is on by default." #. type: TP -#: doc/tin.5:1920 +#: doc/tin.5:1926 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1927 +#: doc/tin.5:1933 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then B<" @@ -13580,13 +13615,13 @@ msgstr "" "\\%tin>(1) uses a built-in default." #. type: TP -#: doc/tin.5:1927 +#: doc/tin.5:1933 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1934 +#: doc/tin.5:1940 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -13597,13 +13632,13 @@ msgstr "" "B<\\%tin>(1) uses a built-in default." #. type: TP -#: doc/tin.5:1934 +#: doc/tin.5:1940 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1941 +#: doc/tin.5:1947 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -13614,19 +13649,19 @@ msgstr "" "B<\\%tin>(1) uses a built-in default." #. type: TP -#: doc/tin.5:1941 +#: doc/tin.5:1947 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1945 +#: doc/tin.5:1951 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1952 +#: doc/tin.5:1958 msgid "" "If ON B<%tin>(1) does the rendering of bi-directional text. If OFF B<" "%tin>(1) leaves the rendering of bi-directional text to the terminal. " @@ -13637,49 +13672,49 @@ msgstr "" "Default is OFF." #. type: TP -#: doc/tin.5:1952 +#: doc/tin.5:1958 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1961 +#: doc/tin.5:1967 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1965 +#: doc/tin.5:1971 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1969 +#: doc/tin.5:1975 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1973 +#: doc/tin.5:1979 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1977 +#: doc/tin.5:1983 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1985 +#: doc/tin.5:1991 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1989 +#: doc/tin.5:1995 msgid "" "The format string used for the Selection level. Default is \"%f\\ %n\\ %U\\ " "\\ %G\\ \\ %d\". The following substitutions are supported:" @@ -13688,13 +13723,13 @@ msgstr "" "\\ %G\\ \\ %d\". The following substitutions are supported:" #. type: ta -#: doc/tin.5:1991 +#: doc/tin.5:1997 #, no-wrap msgid "\\w'%G 'u +\\w'current group number'u" msgstr "\\w'%G 'u +\\w'current group number'u" #. type: Plain text -#: doc/tin.5:1998 +#: doc/tin.5:2004 #, no-wrap msgid "" "%G\tgroup name\n" @@ -13712,19 +13747,19 @@ msgstr "" "%%\t%\n" #. type: TP -#: doc/tin.5:2000 +#: doc/tin.5:2006 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2031 +#: doc/tin.5:2037 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2040 +#: doc/tin.5:2046 msgid "" "If ON show a short group description text after newsgroup name at the group " "selection level. The ''B<-d>'' command-line flag will override the setting " @@ -13741,40 +13776,19 @@ msgstr "" "mailgroups> for mailgroups. Default is ON." #. type: TP -#: doc/tin.5:2062 +#: doc/tin.5:2068 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:2083 -msgid "" -"The path that specifies the signature file to use when posting, following up " -"to or replying to an article. If the path is a directory then the signature " -"will be randomly generated from files that are in the specified directory. " -"If the path starts with a ! the program the path points to will be executed " -"to generate a signature. In order to pass the group name to the program, %G " -"can be specified. This will be replaced by the name of the current " -"newsgroup. program. --none will suppress any signature. Default is I<" -"${TIN_HOMEDIR:-\"$HOME\"}/.Sig>." -msgstr "" -"The path that specifies the signature file to use when posting, following up " -"to or replying to an article. If the path is a directory then the signature " -"will be randomly generated from files that are in the specified directory. " -"If the path starts with a ! the program the path points to will be executed " -"to generate a signature. In order to pass the group name to the program, %G " -"can be specified. This will be replaced by the name of the current " -"newsgroup. program. --none will suppress any signature. Default is I<" -"${TIN_HOMEDIR:-\"$HOME\"}/.Sig>." - #. type: TP -#: doc/tin.5:2086 +#: doc/tin.5:2091 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2093 +#: doc/tin.5:2098 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -13785,19 +13799,19 @@ msgstr "" "B is blank, then B<\\%tin>(1) uses a built-in default." #. type: TP -#: doc/tin.5:2139 +#: doc/tin.5:2144 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2146 +#: doc/tin.5:2151 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2153 +#: doc/tin.5:2158 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -13808,31 +13822,31 @@ msgstr "" "B is blank, then B<\\%tin>(1) uses a built-in default." #. type: TP -#: doc/tin.5:2158 +#: doc/tin.5:2163 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2162 +#: doc/tin.5:2167 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2171 +#: doc/tin.5:2176 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2175 +#: doc/tin.5:2180 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2182 +#: doc/tin.5:2187 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -13843,7 +13857,7 @@ msgstr "" "B is blank, then B<\\%tin>(1) uses a built-in default." #. type: Plain text -#: doc/tin.5:2187 +#: doc/tin.5:2192 msgid "" "Decode German style TeX umlaut codes to ISO If ON, show \"a as Umlaut-a, " "etc. Default is OFF. This behavior can also be toggled in the article viewer " @@ -13854,14 +13868,14 @@ msgstr "" "viewer via B ('B<\">')." #. type: Plain text -#: doc/tin.5:2197 +#: doc/tin.5:2202 msgid "" "Defines which threading method to use. The choices are: 0) Don't thread, 1) " "Thread on Subject only 2) Thread on References only, 3) Thread on References " "then Subject (default) 4) Thread multipart articles on Subject. 5) Thread " "on Percentage Match of the Subjects It's also possible to set the threading " "type on a per group basis by setting the group attribute variable " -"B to 0 - 5 in the file I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/" +"B to 0 \\(en 5 in the file I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/" "attributes>." msgstr "" "Defines which threading method to use. The choices are: 0) Don't thread, 1) " @@ -13869,11 +13883,11 @@ msgstr "" "then Subject (default) 4) Thread multipart articles on Subject. 5) Thread " "on Percentage Match of the Subjects It's also possible to set the threading " "type on a per group basis by setting the group attribute variable " -"B to 0 - 5 in the file I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/" +"B to 0 \\(en 5 in the file I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/" "attributes>." #. type: Plain text -#: doc/tin.5:2201 +#: doc/tin.5:2206 msgid "" "The format string used for the Thread level. Default is \"%n\\ %m\\ \\ " "[%L]\\ \\ %T\\ \\ %F\". The following substitutions are supported:" @@ -13882,13 +13896,13 @@ msgstr "" "[%L]\\ \\ %T\\ \\ %F\". The following substitutions are supported:" #. type: ta -#: doc/tin.5:2203 +#: doc/tin.5:2208 #, no-wrap msgid "\\w'%G 'u +\\w'from, name and/or address'u" msgstr "\\w'%G 'u +\\w'from, name and/or address'u" #. type: Plain text -#: doc/tin.5:2214 +#: doc/tin.5:2219 #, no-wrap msgid "" "%D\tdate\n" @@ -13914,7 +13928,7 @@ msgstr "" "%%\t%\n" #. type: Plain text -#: doc/tin.5:2221 +#: doc/tin.5:2226 msgid "" "Defines how close the subjects must match while threading by Percentage " "Match for threads to be considered part of a single thread. This value is in " @@ -13925,19 +13939,19 @@ msgstr "" "the range 0 to 100. The default is 75." #. type: TP -#: doc/tin.5:2225 +#: doc/tin.5:2230 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2237 +#: doc/tin.5:2242 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2251 +#: doc/tin.5:2256 msgid "" "Allows you to select how B<%tin>(1) treats blank lines in article bodies. " "Default is 0. This option does not affect lines within verbatim blocks." @@ -13946,13 +13960,13 @@ msgstr "" "Default is 0. This option does not affect lines within verbatim blocks." #. type: TP -#: doc/tin.5:2270 +#: doc/tin.5:2275 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2277 +#: doc/tin.5:2282 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -13963,13 +13977,13 @@ msgstr "" "B is blank, then B<\\%tin>(1) uses a built-in default." #. type: TP -#: doc/tin.5:2277 +#: doc/tin.5:2282 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2281 +#: doc/tin.5:2286 msgid "" "If ON remove I<${TIN_HOMEDIR:-\"$HOME\"}/.article> after posting. Default is " "ON." @@ -13978,53 +13992,53 @@ msgstr "" "ON." #. type: TP -#: doc/tin.5:2281 +#: doc/tin.5:2286 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2286 +#: doc/tin.5:2291 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2289 +#: doc/tin.5:2294 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2294 +#: doc/tin.5:2299 msgid "If enabled B<\\%tin>(1) uses ANSI-colors. Default is OFF." msgstr "If enabled B<\\%tin>(1) uses ANSI-colours. Default is OFF." #. type: TP -#: doc/tin.5:2294 +#: doc/tin.5:2299 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2297 +#: doc/tin.5:2302 msgid "Use scroll keys on keypad. Default is OFF." msgstr "Use scroll keys on keypad. Default is OFF." #. type: TP -#: doc/tin.5:2297 +#: doc/tin.5:2302 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2303 +#: doc/tin.5:2308 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2315 +#: doc/tin.5:2320 msgid "" "If enabled B<\\%slrnface>(1) will be used to interpret the ''X-Face:'' " "header. For this option to have any effect, B<\\%tin>(1) must be running in " @@ -14037,19 +14051,19 @@ msgstr "" "is OFF." #. type: TP -#: doc/tin.5:2315 +#: doc/tin.5:2320 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2319 +#: doc/tin.5:2324 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2323 +#: doc/tin.5:2328 msgid "" "A regular expression that B will use to find the begin of a verbatim " "block. Default is #v+" @@ -14058,13 +14072,13 @@ msgstr "" "block. Default is #v+" #. type: TP -#: doc/tin.5:2323 +#: doc/tin.5:2328 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2327 +#: doc/tin.5:2332 msgid "" "A regular expression that B will use to find the end of a verbatim " "block. Default is #v-" @@ -14073,13 +14087,13 @@ msgstr "" "block. Default is #v-" #. type: TP -#: doc/tin.5:2330 +#: doc/tin.5:2335 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2346 +#: doc/tin.5:2351 msgid "" "Allows you to select how B<\\%tin>(1) matches strings. The default is 0 and " "uses the wildmat notation, which is how this has traditionally been " @@ -14098,31 +14112,31 @@ msgstr "" "wildmat notation." #. type: TP -#: doc/tin.5:2346 +#: doc/tin.5:2351 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2358 +#: doc/tin.5:2363 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2366 +#: doc/tin.5:2371 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2382 +#: doc/tin.5:2387 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2398 +#: doc/tin.5:2403 msgid "" "Yet another global configuration file with \"I=I\" pairs. " "This one is for the more general options which usually can't be controlled " @@ -14137,18 +14151,18 @@ msgstr "" "I." #. type: TP -#: doc/tin.5:2398 +#: doc/tin.5:2403 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2401 +#: doc/tin.5:2406 msgid "Sets a global domain name used in From lines" msgstr "Sets a global domain name used in From lines" #. type: Plain text -#: doc/tin.5:2405 +#: doc/tin.5:2410 msgid "" "Defines the name of your organization. $B overrides any " "specified value." @@ -14157,13 +14171,13 @@ msgstr "" "specified value." #. type: TP -#: doc/tin.5:2405 +#: doc/tin.5:2410 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2410 +#: doc/tin.5:2415 msgid "" "Defines the default place for some configuration files, common values are I, I, I or I. " @@ -14174,13 +14188,13 @@ msgstr "" "$B overrides any specified value." #. type: TP -#: doc/tin.5:2410 +#: doc/tin.5:2415 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2416 +#: doc/tin.5:2421 msgid "" "Defines the email address to which users can send bug reports using a built-" "in function. The default points to a developers mailing list located at tin." @@ -14193,18 +14207,18 @@ msgstr "" "administration if you want to deal with your lusers problems on your own." #. type: TP -#: doc/tin.5:2416 +#: doc/tin.5:2421 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2421 -msgid "Defines the directory containing of the B<\\%inews>(1) executable" -msgstr "Defines the directory containing of the B<\\%inews>(1) executable" +#: doc/tin.5:2426 +msgid "Defines the directory containing the B<\\%inews>(1) executable." +msgstr "Defines the directory containing the B<\\%inews>(1) executable." #. type: Plain text -#: doc/tin.5:2425 +#: doc/tin.5:2430 msgid "" "Default charset to be used in MIME's ''Content-Type:'' header. " "$B overrides any specified value." @@ -14213,14 +14227,14 @@ msgstr "" "$B overrides any specified value." #. type: Plain text -#: doc/tin.5:2428 +#: doc/tin.5:2433 msgid "" "Default encoding scheme used in MIME articles. 8bit might be the best value." msgstr "" "Default encoding scheme used in MIME articles. 8bit might be the best value." #. type: Plain text -#: doc/tin.5:2432 +#: doc/tin.5:2437 msgid "" "Default encoding scheme used in MIME letters. quoted-printable is a good " "choice here." @@ -14229,13 +14243,13 @@ msgstr "" "choice here." #. type: TP -#: doc/tin.5:2432 +#: doc/tin.5:2437 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2438 +#: doc/tin.5:2443 msgid "" "Allow unregistered top level domains. As the list of valid TLDs is no longer " "actively maintained the default was changed to ON starting with B<\\" @@ -14246,13 +14260,13 @@ msgstr "" "%tin>(1) version 2.1.5" #. type: TP -#: doc/tin.5:2438 +#: doc/tin.5:2443 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2442 +#: doc/tin.5:2447 msgid "" "Don't generate a ''Sender:'' header. This has an effect only if " "B is set to --internal." @@ -14261,13 +14275,13 @@ msgstr "" "B is set to --internal." #. type: TP -#: doc/tin.5:2442 +#: doc/tin.5:2447 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2447 +#: doc/tin.5:2452 msgid "" "Base of your newsspool (Bnews, Cnews and INN traditional spool style), " "common values are I, I, I. " @@ -14278,13 +14292,13 @@ msgstr "" "$B overrides any specified value." #. type: TP -#: doc/tin.5:2447 +#: doc/tin.5:2452 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2455 +#: doc/tin.5:2460 msgid "" "Base of your NOV database B<\\%newsoverview>(5) (tradspool style; might be " "the same dir as I), common values are I, I" msgstr "B" #. type: Plain text -#: doc/tin.5:2459 +#: doc/tin.5:2464 msgid "" "Name of a single overview file, common values are I<.overview>, I. $B overrides any specified value." @@ -14312,13 +14326,13 @@ msgstr "" "view>. $B overrides any specified value." #. type: TP -#: doc/tin.5:2459 +#: doc/tin.5:2464 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2464 +#: doc/tin.5:2469 msgid "" "Full pathname of your newssystem's overview.fmt file; usually the overview." "fmt file is in I, so you only have to change this setting if " @@ -14329,13 +14343,13 @@ msgstr "" "your configuration differs." #. type: TP -#: doc/tin.5:2464 +#: doc/tin.5:2469 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2470 +#: doc/tin.5:2475 msgid "" "Full pathname of your newssystem's active file; usually the active file " "resides in I and is named I, so you only have to change " @@ -14348,13 +14362,13 @@ msgstr "" "specified value." #. type: TP -#: doc/tin.5:2470 +#: doc/tin.5:2475 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2475 +#: doc/tin.5:2480 msgid "" "Full pathname of your newssystem's active.times file; usually the active." "times file is I, so you only have to change this setting if your " @@ -14365,13 +14379,13 @@ msgstr "" "configuration differs." #. type: TP -#: doc/tin.5:2475 +#: doc/tin.5:2480 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2480 +#: doc/tin.5:2485 msgid "" "Full pathname of your newssystem's newsgroups file; usually the newsgroups " "file is in I, so you only have to change this setting if your " @@ -14382,13 +14396,13 @@ msgstr "" "configuration differs." #. type: TP -#: doc/tin.5:2480 +#: doc/tin.5:2485 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2485 +#: doc/tin.5:2490 msgid "" "Full pathname of your newssystem's subscriptions file; usually the " "subscriptions file is in I, so you only have to change this " @@ -14399,12 +14413,12 @@ msgstr "" "setting if your configuration differs." #. type: Plain text -#: doc/tin.5:2489 +#: doc/tin.5:2494 msgid "I" msgstr "I" #. type: Plain text -#: doc/tin.5:2493 +#: doc/tin.5:2498 msgid "" "translation into language specified in $B, $B or " "$B" @@ -14413,7 +14427,7 @@ msgstr "" "$B" #. type: Plain text -#: doc/tin.5:2507 +#: doc/tin.5:2512 msgid "" "This file lists the newsgroups that the local site receives. Each newsgroup " "should be listed only once. Each line specifies one group; within each " @@ -14427,7 +14441,7 @@ msgstr "" #. TODO: IIRC tin issues just a warning in that case? #. type: Plain text -#: doc/tin.5:2512 +#: doc/tin.5:2517 msgid "" "If an article is posted to newsgroups not mentioned in this file, those " "newsgroups are ignored. If no valid newsgroups are specified, the article " @@ -14438,7 +14452,7 @@ msgstr "" "is rejected." #. type: Plain text -#: doc/tin.5:2515 +#: doc/tin.5:2520 msgid "" "Each line consists of four space-separated fields \"I I " "I I\"." @@ -14447,30 +14461,30 @@ msgstr "" "I I\"." #. type: TP -#: doc/tin.5:2515 doc/tin.5:2568 +#: doc/tin.5:2520 doc/tin.5:2573 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2518 +#: doc/tin.5:2523 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2521 +#: doc/tin.5:2526 msgid "is the highest article number that has been used in that newsgroup" msgstr "is the highest article number that has been used in that newsgroup" #. type: TP -#: doc/tin.5:2521 +#: doc/tin.5:2526 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2528 +#: doc/tin.5:2533 msgid "" "is the lowest article number in the group; this number is not guaranteed to " "be accurate, and should only be taken to be a hint. Note that because of " @@ -14485,90 +14499,90 @@ msgstr "" "are no articles in the newsgroup." #. type: TP -#: doc/tin.5:2528 +#: doc/tin.5:2533 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2531 +#: doc/tin.5:2536 msgid "can be one of those" msgstr "can be one of those" #. type: TP -#: doc/tin.5:2532 +#: doc/tin.5:2537 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2535 +#: doc/tin.5:2540 msgid "local postings are allowed" msgstr "local postings are allowed" #. type: TP -#: doc/tin.5:2535 +#: doc/tin.5:2540 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2538 +#: doc/tin.5:2543 msgid "no local postings are allowed, only remote ones" msgstr "no local postings are allowed, only remote ones" #. type: TP -#: doc/tin.5:2538 +#: doc/tin.5:2543 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2541 +#: doc/tin.5:2546 msgid "the group is moderated and all postings must be approved" msgstr "the group is moderated and all postings must be approved" #. type: TP -#: doc/tin.5:2541 +#: doc/tin.5:2546 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2544 +#: doc/tin.5:2549 msgid "articles in this group are not kept, but only passed on" msgstr "articles in this group are not kept, but only passed on" #. type: TP -#: doc/tin.5:2544 +#: doc/tin.5:2549 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2547 +#: doc/tin.5:2552 msgid "articles cannot be posted to this newsgroup" msgstr "articles cannot be posted to this newsgroup" #. type: TP -#: doc/tin.5:2547 +#: doc/tin.5:2552 #, no-wrap msgid "B<=foo.bar>" msgstr "B<=foo.bar>" #. type: Plain text -#: doc/tin.5:2550 +#: doc/tin.5:2555 msgid "articles are locally filed into the ''foo.bar'' group" msgstr "articles are locally filed into the ''foo.bar'' group" #. type: TP -#: doc/tin.5:2551 doc/tin.5:2578 doc/tin.5:2601 +#: doc/tin.5:2556 doc/tin.5:2583 doc/tin.5:2606 #, no-wrap msgid "B<\\%tin>(1)" msgstr "B<\\%tin>(1)" #. type: Plain text -#: doc/tin.5:2557 +#: doc/tin.5:2562 msgid "" "only tries to read the file if you read directly from the local spool, if " "you read news via NNTP, B<\\%tin>(1) uses the LIST (B) or LIST " @@ -14579,7 +14593,7 @@ msgstr "" "COUNTS (B) command instead." #. type: Plain text -#: doc/tin.5:2568 +#: doc/tin.5:2573 msgid "" "This file provides a chronological record of when newsgroups are created. It " "is normally updated by the local news server (e.g. B<\\%innd>(8)) whenever " @@ -14592,7 +14606,7 @@ msgstr "" "\"I I
\\|] [\\|B<-o>\\||\\|B<-w>\\|]\\|] [\\|" +"B<-D> I\\|] [\\|B<-G> I\\|] [\\|B<-f> " +"I\\|] [\\|B<-g> I\\|] [\\|B<-m> I\\|] [\\|B<-" +"p> I\\|] [\\|B<-I> I\\|]\\ \\|[I\\|[\\|,.\\|.\\|." +"\\|]\\|]\\|]" +msgstr "" + +#. type: SH +#: doc/tin.1:49 doc/tin.5:14 +#, no-wrap +msgid "DESCRIPTION" +msgstr "DESCRIPCIÓN" + +#. type: Plain text +#: doc/tin.1:58 +msgid "" +"B is a full-screen easy to use Usenet newsreader. It can read news " +"locally (e.g., I) or remotely (B or B option) " +"via a NNTP (Network News Transport Protocol) server. It will automatically " +"utilize NOV B<\\%newsoverview>(5) style index files if available locally or " +"via the NNTP [X]OVER command (B, B)." +msgstr "" + +#. type: Plain text +#: doc/tin.1:64 +msgid "" +"B has four separate levels of operation: Selection level, Group level, " +"Thread level and Article level. Use the B ('B') command to view a " +"list of the commands available at a particular level." +msgstr "" + +#. type: Plain text +#: doc/tin.1:72 +msgid "" +"On startup B will show a list of the newsgroups found in I<" +"${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>. An arrow '-E' or highlighted bar " +"will point to the first newsgroup. Move to a group by using the terminal " +"arrow keys (terminal dependent) or B ('B') and B ('B'). Use " +"PgUp/PgDn (terminal dependent) or B ('B<^U>') (CTRL-U) and " +"B ('B<^D>') (CTRL-D) to page up/down. Enter a newsgroup by " +"pressing 'BCRE>'." +msgstr "" + +#. type: Plain text +#: doc/tin.1:77 +msgid "" +"The B ('BTABE>') key enters the next " +"newsgroup with unread articles." +msgstr "" + +#. type: SH +#: doc/tin.1:77 +#, no-wrap +msgid "EXIT STATUS" +msgstr "ESTADO SALIENTE" + +#. type: Plain text +#: doc/tin.1:79 +msgid "Interactive mode:" +msgstr "" + +#. type: TP +#: doc/tin.1:80 doc/tin.1:93 doc/tin.1:1106 doc/tin.1:3479 +#, no-wrap +msgid "B<0>" +msgstr "B<0>" + +#. type: Plain text +#: doc/tin.1:83 +msgid "Successful program execution." +msgstr "Ejecución del programa correcta." + +#. type: TP +#: doc/tin.1:83 doc/tin.1:96 doc/tin.1:3482 +#, no-wrap +msgid "B<1>" +msgstr "B<1>" + +#. type: Plain text +#: doc/tin.1:86 doc/tin.1:99 +msgid "Usage, syntax, configuration file or network error." +msgstr "" + +#. type: TP +#: doc/tin.1:86 doc/tin.1:99 doc/tin.1:3485 +#, no-wrap +msgid "B<2>" +msgstr "B<2>" + +#. type: Plain text +#: doc/tin.1:89 +msgid "NNTP error." +msgstr "Error NNTP" + +#. type: Plain text +#: doc/tin.1:92 +msgid "Batch mode (''B<-Z>''):" +msgstr "" + +#. type: Plain text +#: doc/tin.1:96 +msgid "No unread news" +msgstr "" + +#. type: Plain text +#: doc/tin.1:102 +msgid "Unread news" +msgstr "" + +#. type: SH +#: doc/tin.1:105 +#, no-wrap +msgid "OPTIONS" +msgstr "OPCIONES" + +#. type: TP +#: doc/tin.1:106 +#, no-wrap +msgid "B<-4>" +msgstr "B<-4>" + +#. type: Plain text +#: doc/tin.1:109 +msgid "" +"Force connecting via IPv4 to the remote NNTP server. Only available when " +"build with IPv6 support." +msgstr "" + +#. type: TP +#: doc/tin.1:109 +#, no-wrap +msgid "B<-6>" +msgstr "B<-6>" + +#. type: Plain text +#: doc/tin.1:112 +msgid "" +"Force connecting via IPv6 to the remote NNTP server. Only available when " +"build with IPv6 support." +msgstr "" + +#. type: TP +#: doc/tin.1:112 +#, no-wrap +msgid "B<-a>" +msgstr "B<-a>" + +#. type: Plain text +#: doc/tin.1:115 +msgid "Toggle ANSI color (default is off)." +msgstr "" + +#. type: TP +#: doc/tin.1:115 +#, no-wrap +msgid "B<-A>" +msgstr "B<-A>" + +#. type: Plain text +#: doc/tin.1:118 +msgid "" +"Force authentication on initial connect. Only available when reading via " +"NNTP." +msgstr "" + +#. type: TP +#: doc/tin.1:118 +#, no-wrap +msgid "B<-c>" +msgstr "B<-c>" + +#. type: Plain text +#: doc/tin.1:123 +msgid "" +"Create/update index files for every group in I<${TIN_HOMEDIR:-\"$HOME\"}/." +"newsrc> or file specified by the ''B<-f>'' option and mark all articles as " +"read." +msgstr "" + +#. type: TP +#: doc/tin.1:123 +#, no-wrap +msgid "B<-d>" +msgstr "B<-d>" + +# +#. FIXME: explain debug levels +#. type: Plain text +#: doc/tin.1:129 +msgid "" +"Don't load newsgroup descriptions and servers message of the day " +"(interactive mode)." +msgstr "" + +#. type: TP +#: doc/tin.1:129 +#, no-wrap +msgid "B<-D>I< debug-level>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:134 +msgid "" +"Enter debug-level (1 = NNTP, 2 = filter, 4 = newsrc, 8 = threading, 16 = " +"memory, 32 = attributes, 64 = misc, 128 = remove existing debug files). For " +"NNTP-level ''B<-v>'' controls the verbosity of the output." +msgstr "" + +#. type: TP +#: doc/tin.1:134 +#, no-wrap +msgid "B<-f>I< file>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:138 +msgid "" +"Use the specified file of subscribed to newsgroups in place of I<" +"${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>." +msgstr "" + +#. type: TP +#: doc/tin.1:138 +#, no-wrap +msgid "B<-g>I< server>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:143 +msgid "" +"Use the server and newsrc specified in I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/" +"newsrctable>. Only available when reading via NNTP." +msgstr "" + +#. type: TP +#: doc/tin.1:143 +#, no-wrap +msgid "B<-G>I< article-limit>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:151 +msgid "" +"Limit the number of articles/group to retrieve from the server. If " +"I is E 0 not more than the last I articles/" +"group are fetched from the server. If I is E 0 B " +"will start fetching articles from your first unread minus absolute value of " +"I. Default is 0, which means no limit." +msgstr "" + +#. type: TP +#: doc/tin.1:151 +#, no-wrap +msgid "B<-h>" +msgstr "B<-h>" + +#. type: Plain text +#: doc/tin.1:154 +msgid "Help listing all command-line options." +msgstr "" + +#. type: TP +#: doc/tin.1:154 +#, no-wrap +msgid "B<-H>" +msgstr "B<-H>" + +#. type: Plain text +#: doc/tin.1:158 +msgid "" +"Brief introduction to B that is also shown the first time it is started." +msgstr "" + +#. type: TP +#: doc/tin.1:158 +#, no-wrap +msgid "B<-I>I< dir>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:164 +msgid "" +"Directory in which to store newsgroup index files. Default is I<" +"${TIN_INDEX_NEWSDIR:-\"${TIN_HOMEDIR:-\"$HOME\"}/.tin\"}/.news>. This " +"option has no effect if B retrieves its index files via NNTP and " +"B is turned off." +msgstr "" + +#. type: TP +#: doc/tin.1:164 +#, no-wrap +msgid "B<-l>" +msgstr "B<-l>" + +#. type: Plain text +#: doc/tin.1:176 +msgid "" +"Get number of articles per group from the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/" +"\"${TIN_ACTIVEFILE:-active}> file. If reading via NNTP this is done with the " +"LIST command (B). This might result in incorrect article counts " +"but is usually faster than the default which is to read the I<${TIN_LIBDIR:-" +"NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}> file (either directly or via " +"LIST) and then check the article count via NNTP GROUP command (B) ''B<-ln>''. If reading via NNTP and LIST COUNTS (B) is " +"available that is used instead as it gives more accurate article counts." +msgstr "" + +#. type: TP +#: doc/tin.1:176 +#, no-wrap +msgid "B<-m>I< dir>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:179 +msgid "Mailbox directory to use. Default is I<${TIN_HOMEDIR:-\"$HOME\"}/Mail>." +msgstr "" + +#. type: TP +#: doc/tin.1:179 +#, no-wrap +msgid "B<-M>I< user>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:183 +msgid "" +"Mail unread articles to specified user for later reading. For more " +"information read section \"AUTOMATIC MAILING AND SAVING NEW NEWS\"." +msgstr "" + +#. type: TP +#: doc/tin.1:183 +#, no-wrap +msgid "B<-n>" +msgstr "B<-n>" + +#. type: Plain text +#: doc/tin.1:190 +msgid "" +"Only load groups from the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-" +"active}> file that are subscribed to in the user's I<${TIN_HOMEDIR:-\"$HOME" +"\"}/.newsrc>. This allows a noticeable speedup when connecting via a slow " +"line, but B may not be able detect which groups are moderated. See also " +"''B<-l>''." +msgstr "" + +#. type: TP +#: doc/tin.1:190 +#, no-wrap +msgid "B<-N>" +msgstr "B<-N>" + +#. type: Plain text +#: doc/tin.1:194 +msgid "" +"Mail unread articles to yourself for later reading. For more information " +"read section \"AUTOMATIC MAILING AND SAVING NEW NEWS\"." +msgstr "" + +#. type: TP +#: doc/tin.1:194 +#, no-wrap +msgid "B<-o>" +msgstr "B<-o>" + +#. type: Plain text +#: doc/tin.1:198 +msgid "" +"Quick post all postponed articles and exit. In order for this to be really " +"quick, it should be used with ''B<-n>'' if possible." +msgstr "" + +#. type: TP +#: doc/tin.1:198 +#, no-wrap +msgid "B<-p>I< port>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:203 +msgid "" +"Port to use if reading via NNTP (default is 119). This also overrides the " +"environment variable $B if set. Only available when reading via " +"NNTP." +msgstr "" + +#. type: TP +#: doc/tin.1:203 +#, no-wrap +msgid "B<-q>" +msgstr "B<-q>" + +#. type: Plain text +#: doc/tin.1:206 +msgid "" +"Don't check for new newsgroups and skip loading the servers message of the " +"day." +msgstr "" + +#. type: TP +#: doc/tin.1:206 +#, no-wrap +msgid "B<-Q>" +msgstr "B<-Q>" + +#. type: Plain text +#: doc/tin.1:210 +msgid "" +"Quick start. Start B as quickly as possible. Currently this is " +"equivalent to ''B<-nqd>''." +msgstr "" + +#. type: TP +#: doc/tin.1:210 +#, no-wrap +msgid "B<-r>" +msgstr "B<-r>" + +#. type: Plain text +#: doc/tin.1:215 +msgid "" +"Read news remotely from the default NNTP server specified in the environment " +"variable $B or contained in the file I." +msgstr "" + +#. type: TP +#: doc/tin.1:215 +#, no-wrap +msgid "B<-R>" +msgstr "B<-R>" + +#. type: Plain text +#: doc/tin.1:218 +msgid "Read news saved by the ''B<-S>'' option." +msgstr "" + +#. type: TP +#: doc/tin.1:218 +#, no-wrap +msgid "B<-s>I< dir>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:222 +msgid "" +"Save/read articles to/in directory. Default is I<${TIN_HOMEDIR:-\"$HOME\"}/" +"News>." +msgstr "" + +#. type: TP +#: doc/tin.1:222 +#, no-wrap +msgid "B<-S>" +msgstr "B<-S>" + +#. type: Plain text +#: doc/tin.1:226 +msgid "" +"Save unread articles for later reading by the ''B<-R>'' option. For more " +"information read section \"AUTOMATIC MAILING AND SAVING NEW NEWS\"." +msgstr "" + +#. type: TP +#: doc/tin.1:226 +#, no-wrap +msgid "B<-u>" +msgstr "B<-u>" + +#. type: Plain text +#: doc/tin.1:232 +msgid "" +"Create/update index files for every group in I<${TIN_HOMEDIR:-\"$HOME\"}/." +"newsrc> or file specified by the ''B<-f>'' option. This option is disabled " +"if B retrieves its index files via a NNTP server and " +"B is turned off." +msgstr "" + +#. type: TP +#: doc/tin.1:232 +#, no-wrap +msgid "B<-v>" +msgstr "B<-v>" + +#. type: Plain text +#: doc/tin.1:237 +msgid "" +"Verbose mode for ''B<-D>'', ''B<-c>'', ''B<-M>'', ''B<-N>'', \\&''B<-S>'', " +"''B<-u>'' and ''B<-Z>'' options. Can be used multiple times to increase " +"verbosity." +msgstr "" + +#. type: TP +#: doc/tin.1:237 +#, no-wrap +msgid "B<-V>" +msgstr "B<-V>" + +#. type: Plain text +#: doc/tin.1:240 +msgid "Print version and date information." +msgstr "" + +#. type: TP +#: doc/tin.1:240 +#, no-wrap +msgid "B<-w>" +msgstr "B<-w>" + +#. type: Plain text +#: doc/tin.1:245 +msgid "" +"Quick mode to post an article and then exit. This option implies \\&''B<-" +"d>''. In order for this to be really quick, it should be used with ''B<-n>'' " +"if possible." +msgstr "" + +#. type: TP +#: doc/tin.1:245 +#, no-wrap +msgid "B<-x>" +msgstr "B<-x>" + +#. type: Plain text +#: doc/tin.1:248 +msgid "No-posting mode. You cannot post articles if you use this option." +msgstr "" + +#. type: TP +#: doc/tin.1:248 +#, no-wrap +msgid "B<-X>" +msgstr "B<-X>" + +#. type: Plain text +#: doc/tin.1:253 +msgid "" +"No overwrite mode. I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> and files in I<" +"${TIN_HOMEDIR:-\"$HOME\"}/.tin> will not be overwritten but may be created " +"if they don't exist." +msgstr "" + +#. type: TP +#: doc/tin.1:253 +#, no-wrap +msgid "B<-z>" +msgstr "B<-z>" + +#. type: Plain text +#: doc/tin.1:258 +msgid "" +"Only start B if there is any new/unread news. If there is news B " +"will position cursor at first group with unread news. Useful for putting in " +"login file." +msgstr "" + +#. type: TP +#: doc/tin.1:258 +#, no-wrap +msgid "B<-Z>" +msgstr "B<-Z>" + +#. type: Plain text +#: doc/tin.1:264 +msgid "" +"Check if there is any new/unread news and exit with appropriate status. If " +"\\&''B<-v>'' 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." +msgstr "" + +#. type: Plain text +#: doc/tin.1:270 +msgid "" +"B can also dynamically change its options by the B ('B') " +"command. Any changes are written to I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/tinrc>. " +"For more information see section \"GLOBAL OPTIONS MENU AND TINRC " +"CONFIGURABLE VARIABLES\" and B<\\%tin>(5)." +msgstr "" + +#. type: Plain text +#: doc/tin.1:275 +msgid "" +"A list of groups can be specified after the other command-line options. This " +"can be useful if you wish to yank in or subscribe to a hand-picked subset of " +"the active newsgroups. See the section \"NEWSGROUP LISTS & WILDCARDS\" for " +"the types of pattern that B understands." +msgstr "" + +#. type: Plain text +#: doc/tin.1:280 +msgid "" +"If you specify a single group-name, or a wildcard that matches a single " +"group, then you will automatically enter that group. Otherwise the normal " +"group selection screen will appear, but with all the matching groups present " +"too, as though you had yanked just those groups in." +msgstr "" + +#. type: Plain text +#: doc/tin.1:284 +msgid "" +"With the ''B<-w>'' flag a given group-name is used as default group to post " +"to. If more than one group or a wildcard is specified only the first group " +"respectively the first group that matches is used." +msgstr "" + +#. type: Plain text +#: doc/tin.1:291 +msgid "" +"Once you use B ('B') to yank in all active groups, or " +"B ('B') to toggle the read/unread status, then " +"the command-line groups will be gone. You can use B " +"('B') to reread the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-" +"active}> file and get them back." +msgstr "" + +#. type: Plain text +#: doc/tin.1:296 +msgid "" +"NB: With the ''B<-n>'' flag, only unsubscribed groups in the I<" +"${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> file (or the newsrc-file given by the " +"\\&''B<-f>'' command-line switch or via I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/" +"newsrctable>) can be matched." +msgstr "" + +#. type: Plain text +#: doc/tin.1:301 +msgid "" +"Command-line options have higher priority than attributes and tinrc " +"options. Thus, command-line option takes precedence over configured values." +msgstr "" + +#. type: SH +#: doc/tin.1:301 +#, no-wrap +msgid "USAGE" +msgstr "UTILIZACIÓN" + +#. type: SS +#: doc/tin.1:304 +#, no-wrap +msgid "NEWS ADMINISTRATION" +msgstr "ADMINISTRACIÓN DE NOTICIARIOS" + +#. type: Plain text +#: doc/tin.1:308 +msgid "" +"Maintaining Netnews on large networks of machines can be a pretty time " +"consuming job as I discovered when I was given the job of maintaining our " +"news system and news users." +msgstr "" + +#. type: Plain text +#: doc/tin.1:318 +msgid "" +"A user starting B 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., I<" +"${TIN_LIBDIR:-NEWSLIBDIR}/subscriptions>) and should be world readable. If " +"you read news via NNTP, then your news server must support the LIST " +"SUBSCRIPTIONS command. It is part of the NNTP List Extensions (B) and all modern servers should understand it." +msgstr "" + +#. type: SS +#: doc/tin.1:318 +#, no-wrap +msgid "SCREEN FORMAT" +msgstr "PERSONALIZANDO FORMATO DE PANTALLA" + +#. type: Plain text +#: doc/tin.1:321 +msgid "" +"B has four separate levels of operation: Selection level, Group level, " +"Thread level and Article level." +msgstr "" + +#. type: Plain text +#: doc/tin.1:327 +msgid "" +"At the Selection level the title displays (the name of the news server and) " +"the number of subscribed groups (containing new unread articles). The " +"newsgroups are displayed in the middle of the screen usually with the number " +"of unread articles displayed on the same line in front, but it can be " +"customized via B." +msgstr "" + +#. type: Plain text +#: doc/tin.1:335 +#, no-wrap +msgid "" +"-EM 1 2 comp.security.announce Announcements from the CERT abou\n" +" M 2 1 news.admin.announce Announcements for news adminstra\n" +" 3 22 news.software.misc News-related software other than\n" +" 4 1475 news.software.nntp The Network News Transfer Protoc\n" +" X 5 124 news.software.readers Discussion of software used to r\n" +msgstr "" + +#. type: Plain text +#: doc/tin.1:338 +msgid "" +"There may also be a character prefixing the line. An explanation follows:" +msgstr "" + +#. type: TP +#: doc/tin.1:338 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:343 +msgid "" +"This group is unsubscribed. To see only your subscribed groups use the " +"B ('B') or B ('B') toggle " +"keys." +msgstr "" + +#. type: TP +#: doc/tin.1:343 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:348 +msgid "" +"This is a moderated group. Any posts you make will have to be approved by " +"the group administrator before it will be made public. B will ask for " +"confirmation before you post to a moderated group." +msgstr "" + +#. type: TP +#: doc/tin.1:348 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:357 +msgid "" +"This is a new newsgroup which has been created since you last used B. " +"New newsgroups are not subscribed to by default (However, see the " +"$B / $B environment variables). Subscribe " +"to it in the normal way if you wish the group to continue to appear in your " +"Selection Menu. Simply ignore new newsgroups and they will be gone the next " +"time you start B. You will have to yank in all the groups to find them " +"in a later session." +msgstr "" + +#. type: TP +#: doc/tin.1:357 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:362 +msgid "" +"This group no longer exists. If you no longer wish to see this group then " +"unsubscribe from it in the normal way. This flag will only appear if you " +"have set B to \"ask\" in the Options Menu." +msgstr "" + +#. type: TP +#: doc/tin.1:362 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:366 +msgid "" +"You may no longer make posts to this group. Often a group will be superseded " +"by a more appropriately named one." +msgstr "" + +#. type: TP +#: doc/tin.1:366 +#, no-wrap +msgid "B<=>" +msgstr "B<=>" + +#. type: Plain text +#: doc/tin.1:371 +msgid "" +"This group has been renamed and you may no longer post to it. If you do, " +"then you will receive an error from your news server telling you the correct " +"group to post to." +msgstr "" + +#. type: Plain text +#: doc/tin.1:381 +msgid "" +"At the Group level the title contains the name of the group, the number of " +"conversation threads, the abbreviated threading method (B), " +"the limit of articles to get (if set; B), the total number of " +"(unread) articles (B or B), the number " +"of hot articles B, the number of read hot articles (if " +"any; B), the number of recent articles " +"(B) and the number of killed articles " +"(B). I.e.:" +msgstr "" + +#. FIXME - make this autocenter +#. type: Plain text +#: doc/tin.1:385 +#, no-wrap +msgid " alt.sources (5B -50/23+ 0* 3o 0K)\n" +msgstr "" + +#. type: Plain text +#: doc/tin.1:393 +msgid "" +"The characters after the numbers are depending to the configuration and if " +"your are in B 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 ''B<-n>'' command-line " +"switch!) if the group is moderated, set to no posting or postings to it get " +"redirected." +msgstr "" + +#. type: Plain text +#: doc/tin.1:404 +msgid "" +"If a thread has unread articles it is marked with B in " +"front of the total number of articles in the thread. If there are recent " +"articles within the thread it might be marked with B in " +"front of the total number of articles in the thread \\(em this is controlled " +"by the B option. If a thread has hot articles in it (see also " +"section \"FILTERING ARTICLES\") it's marked with B in " +"front of the total number of articles in the thread. The number of lines of " +"the first (unread) article in the thread might also be shown right before " +"the subject \\(em this is controlled by the B option. The display " +"can be customized via B." +msgstr "" + +#. type: Plain text +#: doc/tin.1:408 +#, no-wrap +msgid " de.admin.net-abuse.announce (11B 13+ 1* 1o 0K) M\n" +msgstr "" + +#. type: Plain text +#: doc/tin.1:413 +#, no-wrap +msgid "" +"-E 1 + 3 108 bincancels in de.talk.sex Christopher Lueg El\n" +" 2 + 69 EMP/ECP gecancelt. xynx. BI= 10 Henning Weede Ehwee\n" +" 3 o 93 EMP gecancelt. SouthBeach/Palms Henning Weede Ehwee\n" +" 4 * 368 E1997-11-12E Fremdcancel-FAQ Thomas Roessler Ero\n" +msgstr "" + +#. FIXME - add description of fields +#. type: Plain text +#: doc/tin.1:418 +msgid "" +"At the Thread level the screen usually (depends on the threading method " +"used) looks like this, but can be customized via B:" +msgstr "" + +#. type: Plain text +#: doc/tin.1:425 +#, no-wrap +msgid "" +"-E 1 [ 7] What is this funny tree in the thr Robert F. Simmig\n" +" 2 [ 12] +-E Sephan Wagner Es\n" +" 3 [ 230] | `-ETin thread-level (was: What is Bob Johnson Ebob\n" +" 4 [ 22] `-Etin threading menu Brian Richardson\n" +msgstr "" + +#. FIXME - add description of fields +#. type: Plain text +#: doc/tin.1:430 +msgid "At the Article level the page header has the following format:" +msgstr "" + +#. type: Plain text +#: doc/tin.1:436 +#, no-wrap +msgid "" +"Sun, 28 Dec 1997 21:21:01 de.admin.news.groups Thread 20 of 86\n" +"Lines 50 Re: EINSPRUCH zu RESULT:de.comm.mobil.ALL Article 47 of 59\n" +"Urs Janssen Eurs@akk.orgE at Arbeitskreis Kultur und Kommunikati\n" +msgstr "" + +#. type: Plain text +#: doc/tin.1:438 +#, no-wrap +msgid "article-body\n" +msgstr "" + +#. type: Plain text +#: doc/tin.1:444 +msgid "" +"The look of the Selection, Group and Thread level can be customized. See the " +"section \"CUSTOMIZING THE SCREEN FORMAT\"." +msgstr "" + +#. type: SS +#: doc/tin.1:444 +#, no-wrap +msgid "COMMON MOVING KEYS" +msgstr "TECLAS DE MOVIMIENTO COMUNES" + +#. type: Plain text +#: doc/tin.1:447 +msgid "" +"This table shows the common keys used for moving around all levels within " +"B." +msgstr "" + +#. type: ta +#: doc/tin.1:449 +#, no-wrap +msgid "\\w'Beg. of list/article 'u +\\w'ANSI/vt100 'u" +msgstr "" + +#. type: Plain text +#: doc/tin.1:457 +#, no-wrap +msgid "" +"\tANSI/vt100\tOther Terminals\n" +"Beg. of list/article\tB\tB (B<^>)\n" +"End of list/article\tB\tB (B<$>)\n" +"Page Up\tB\tB (B, B<^U> or B<^B>)\n" +"Page Down\tB\tB (B<^D> or B<^F> or BSPACEE>)\n" +"Line Up\tB\tB (B or B<^P>)\n" +"Line Down\tB\tB (B or B<^N>)\n" +msgstr "" + +#. type: SS +#: doc/tin.1:461 +#, no-wrap +msgid "COMMON EDITING COMMANDS" +msgstr "MANDATOS COMUNES EDITADOS" + +#. type: Plain text +#: doc/tin.1:468 +msgid "" +"An B<\\%emacs>(1) style editing package allows the easy editing of input " +"strings. A history list allows the easy reuse of previously entered " +"strings. In addition to the cursor keys, the following commands are " +"available when editing a string:" +msgstr "" + +#. type: TP +#: doc/tin.1:469 +#, no-wrap +msgid "B<^A, ^E>" +msgstr "B<^A, ^E>" + +#. type: Plain text +#: doc/tin.1:472 +msgid "move to beginning or end of line, respectively." +msgstr "" + +#. type: TP +#: doc/tin.1:472 +#, no-wrap +msgid "B<^F, ^B>" +msgstr "B<^F, ^B>" + +#. type: Plain text +#: doc/tin.1:475 +msgid "non-destructive move forward or back one location, respectively." +msgstr "" + +#. type: TP +#: doc/tin.1:475 +#, no-wrap +msgid "B<^D>" +msgstr "B<^D>" + +#. type: Plain text +#: doc/tin.1:479 +msgid "" +"delete the character currently under the cursor, or send EOF if no " +"characters in the buffer." +msgstr "" + +#. type: TP +#: doc/tin.1:479 +#, no-wrap +msgid "B<^H, EDELE>" +msgstr "B<^H, EBORR>" + +#. type: Plain text +#: doc/tin.1:482 +msgid "delete character left of the cursor." +msgstr "" + +#. type: TP +#: doc/tin.1:482 +#, no-wrap +msgid "B<^K>" +msgstr "B<^K>" + +#. type: Plain text +#: doc/tin.1:485 +msgid "delete from cursor to end of line." +msgstr "" + +#. type: TP +#: doc/tin.1:485 +#, no-wrap +msgid "B<^P, ^N>" +msgstr "B<^P, ^N>" + +#. type: Plain text +#: doc/tin.1:488 +msgid "move through history, previous and next, respectively." +msgstr "" + +#. type: TP +#: doc/tin.1:488 +#, no-wrap +msgid "B<^L, ^R>" +msgstr "B<^L, ^R>" + +#. type: Plain text +#: doc/tin.1:491 +msgid "redraw the current line." +msgstr "" + +#. type: TP +#: doc/tin.1:491 +#, no-wrap +msgid "BCRE>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:495 +msgid "" +"places line on history list if non-blank, appends newline and returns to the " +"caller." +msgstr "" + +#. type: TP +#: doc/tin.1:495 +#, no-wrap +msgid "BESCE>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:500 +msgid "aborts the present editing operation." +msgstr "" + +#. type: SS +#: doc/tin.1:500 +#, no-wrap +msgid "GLOBAL COMMANDS" +msgstr "MANDATOS GLOBALES" + +#. type: Plain text +#: doc/tin.1:503 +msgid "" +"The following commands are available at all 4 menu levels and always have " +"the same effect." +msgstr "" + +#. type: TP +#: doc/tin.1:504 doc/tin.1:1378 doc/tin.1:1431 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:509 +msgid "" +"Shell escape. B by itself will launch a shell, B " +"EcommandE will run an external EcommandE. This facility may " +"have been disabled by the System Administrator." +msgstr "" + +#. type: TP +#: doc/tin.1:509 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:512 +msgid "Toggle use of ANSI color." +msgstr "" + +#. type: TP +#: doc/tin.1:512 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:515 +msgid "Redraw the current screen." +msgstr "" + +#. type: TP +#: doc/tin.1:515 +#, no-wrap +msgid "B'>" +msgstr "B'>" + +#. type: Plain text +#: doc/tin.1:518 +msgid "Scroll screen up by one line." +msgstr "" + +#. type: TP +#: doc/tin.1:518 +#, no-wrap +msgid "B'>" +msgstr "B'>" + +#. type: Plain text +#: doc/tin.1:521 +msgid "Scroll screen down by one line." +msgstr "" + +#. type: TP +#: doc/tin.1:521 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:535 +msgid "" +"Reload postponed article. If your system blocks the B key you " +"must quote it by pressing 'B<^V>' (CTRL-V) first. The postpone-menu offers " +"the following actions: B ('B') = reload and spawn editor; " +"B ('B') = post article (without spawning editor); " +"B ('B') = post all postponed articles (without spawning " +"editor); B ('B') = skip this article; B ('B') = quit " +"postponed menu. Currently there is no 'simple' way to delete a postponed " +"article from the postponed-file, you have to use the following command " +"sequence instead: reload it with B, enter editor with " +"B, quit editor, discard posting with B " +"('B<^O>''B''B'). See also ''B<-o>'' command-line switch." +msgstr "" + +#. type: TP +#: doc/tin.1:535 doc/tin.1:1384 doc/tin.1:1438 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:541 +msgid "" +"Help screen of commands available on the current menu. You can use " +"B ('B'), B ('B') and B ('B<" +"\\e>') to search on this screen. B ('B') returns to the menu." +msgstr "" + +#. type: TP +#: doc/tin.1:541 doc/tin.1:1387 doc/tin.1:1441 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:544 doc/tin.1:1390 doc/tin.1:1444 +msgid "Toggle the display of help mini menu at the bottom of the screen." +msgstr "" + +#. type: TP +#: doc/tin.1:544 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:550 +msgid "" +"List articles posted by user. The date posted, the newsgroup and the subject " +"are listed. You can use B ('B'), B ('B') and " +"B ('B<\\e>') to search on this screen. B ('B') " +"returns to the menu." +msgstr "" + +#. type: TP +#: doc/tin.1:550 +#, no-wrap +msgid "B" +msgstr "B" + +#. -------------------------------------------------------------------- +#. type: Plain text +#: doc/tin.1:555 +msgid "Print B version information." +msgstr "" + +#. type: SS +#: doc/tin.1:555 +#, no-wrap +msgid "NEWSGROUP SELECTION COMMANDS" +msgstr "MANDATOS SELECCIONADOS DE GRUPOS NOTICIARIOS" + +#. type: TP +#: doc/tin.1:556 doc/tin.1:694 doc/tin.1:945 doc/tin.1:1109 doc/tin.1:3491 +#, no-wrap +msgid "B<4>" +msgstr "B<4>" + +#. type: Plain text +#: doc/tin.1:559 +msgid "Select group 4." +msgstr "" + +#. type: TP +#: doc/tin.1:559 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:563 +msgid "" +"Reset I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> file. This will destroy all " +"records of which articles have been read, so use this carefully." +msgstr "" + +#. type: TP +#: doc/tin.1:563 doc/tin.1:715 doc/tin.1:966 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:567 doc/tin.1:719 doc/tin.1:970 +msgid "" +"Choose a range of articles to be affected by the next command. See the " +"section \"RANGES\" for more information." +msgstr "" + +#. type: TP +#: doc/tin.1:567 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:570 +msgid "Sort the list of newsgroups." +msgstr "" + +#. type: TP +#: doc/tin.1:570 doc/tin.1:722 doc/tin.1:973 doc/tin.1:1163 doc/tin.1:1375 +#: doc/tin.1:1425 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:573 doc/tin.1:725 doc/tin.1:976 doc/tin.1:1166 doc/tin.1:1378 +#: doc/tin.1:1428 +msgid "Repeat the previous search." +msgstr "" + +#. type: TP +#: doc/tin.1:573 doc/tin.1:725 doc/tin.1:976 doc/tin.1:1166 doc/tin.1:1369 +#: doc/tin.1:1419 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:576 +msgid "Search for a group by name and description (if displayed)." +msgstr "" + +#. type: TP +#: doc/tin.1:576 doc/tin.1:728 doc/tin.1:979 doc/tin.1:1169 doc/tin.1:1372 +#: doc/tin.1:1422 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:579 +msgid "Backward search through the group names and descriptions." +msgstr "" + +#. type: TP +#: doc/tin.1:579 +#, no-wrap +msgid "BCRE'>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:582 +msgid "Read current group." +msgstr "" + +#. type: TP +#: doc/tin.1:582 +#, no-wrap +msgid "BTABE' 'n'>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:586 +msgid "" +"Enter next group with unread news. Will wrap around to the beginning of the " +"group selection list looking for unread groups." +msgstr "" + +#. type: TP +#: doc/tin.1:586 doc/tin.1:803 doc/tin.1:1017 doc/tin.1:1227 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:590 +msgid "" +"Make current group as all read [after confirmation] and move to the next " +"group in the group selection list." +msgstr "" + +#. type: TP +#: doc/tin.1:590 doc/tin.1:807 doc/tin.1:1021 doc/tin.1:1231 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:594 +msgid "" +"Mark current group as all read [after confirmation] and enter the next " +"unread group in the group selection list." +msgstr "" + +#. type: TP +#: doc/tin.1:594 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:598 +msgid "" +"Toggle display to show just the group name or the group name and the group " +"descriptions." +msgstr "" + +#. type: TP +#: doc/tin.1:598 doc/tin.1:820 doc/tin.1:1034 doc/tin.1:1243 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:601 doc/tin.1:823 doc/tin.1:1037 doc/tin.1:1246 +msgid "Edit the filter file and reload it afterwards." +msgstr "" + +#. type: TP +#: doc/tin.1:601 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:605 doc/tin.1:827 +msgid "" +"Choose a new group by name. This command can be used to access any group, " +"even those not currently yanked in." +msgstr "" + +#. type: TP +#: doc/tin.1:605 doc/tin.1:830 doc/tin.1:1037 doc/tin.1:1259 doc/tin.1:1381 +#: doc/tin.1:1434 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:610 +msgid "" +"Toggle the display of the description of the current newsgroup in the last " +"line. This will not be available if B was started with the \\&''B<-d>'' " +"option." +msgstr "" + +#. type: TP +#: doc/tin.1:610 doc/tin.1:834 doc/tin.1:1040 doc/tin.1:1262 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:613 doc/tin.1:837 doc/tin.1:1043 doc/tin.1:1265 +msgid "Toggle inverse video." +msgstr "" + +#. type: TP +#: doc/tin.1:613 doc/tin.1:846 doc/tin.1:1049 doc/tin.1:1271 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:620 +msgid "" +"Look up article by ''Message-ID:''. If none of the groups listed in the " +"''Newsgroups:''-header of the referenced article is available, just the " +"contents of the ''Newsgroups:''-header will be displayed in the last line. " +"At this level this command only works if reading via NNTP and the server " +"supports [X]HDR (B, B) or XPAT (B)." +msgstr "" + +#. type: TP +#: doc/tin.1:620 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:626 +msgid "" +"Move the current group within the group selection list. By entering '1' the " +"group will become the first displayed group in the list, by entering '8' the " +"eighth group in the list etc. By entering '$' the group will be the last " +"group displayed." +msgstr "" + +#. type: TP +#: doc/tin.1:626 doc/tin.1:854 doc/tin.1:1279 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:630 doc/tin.1:858 doc/tin.1:1283 +msgid "" +"User configurable options menu (for more information see section \"GLOBAL " +"OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES\")." +msgstr "" + +#. type: TP +#: doc/tin.1:630 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:633 +msgid "Positions the cursor on the next group with unread articles in it." +msgstr "" + +#. type: TP +#: doc/tin.1:633 doc/tin.1:875 doc/tin.1:1062 doc/tin.1:1300 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:637 +msgid "" +"Quit B \\(em ask the user to confirm if B is set " +"accordingly." +msgstr "" + +#. type: TP +#: doc/tin.1:637 doc/tin.1:878 doc/tin.1:1065 doc/tin.1:1303 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:640 doc/tin.1:881 doc/tin.1:1068 doc/tin.1:1306 +msgid "Quit B \\(em don't ask the user to confirm." +msgstr "" + +#. type: TP +#: doc/tin.1:640 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:645 +msgid "" +"Toggle display of all subscribed to groups and just those groups containing " +"unread articles. Command has no effect if groups were specified on the " +"command-line when B was started." +msgstr "" + +#. type: TP +#: doc/tin.1:645 doc/tin.1:884 doc/tin.1:1068 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:649 doc/tin.1:888 doc/tin.1:1072 +msgid "" +"Mail a bug report or comment to Etin-bugs@tin.orgE. This is the best " +"way of getting bugs fixed and features added/changed." +msgstr "" + +#. type: TP +#: doc/tin.1:649 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:652 +msgid "Subscribe to current group." +msgstr "" + +#. type: TP +#: doc/tin.1:652 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:657 +msgid "" +"Subscribe to groups matching user specified pattern. See the section " +"\"NEWSGROUP LISTS & WILDCARDS\" for the types of pattern that B " +"understands." +msgstr "" + +#. type: TP +#: doc/tin.1:657 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:662 +msgid "" +"Unsubscribe to current group. This can be used to remove bogus groups. See " +"B in the \"GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" +"\" section." +msgstr "" + +#. type: TP +#: doc/tin.1:662 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:667 +msgid "" +"Unsubscribe to groups matching user specified pattern. See the section " +"\"NEWSGROUP LISTS & WILDCARDS\" for the types of pattern that B " +"understands." +msgstr "" + +#. type: TP +#: doc/tin.1:667 doc/tin.1:912 doc/tin.1:1087 doc/tin.1:1340 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:673 +msgid "" +"Post an article to current group. If posting fails for some reason, you'll " +"get the chance to B ('B') the article again, B " +"('B') it for later processing (see also ''B<-o>'' command-line switch) or " +"discard it via B ('B')." +msgstr "" + +#. type: TP +#: doc/tin.1:673 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:676 +msgid "Quit B without saving any changes to the configuration." +msgstr "" + +#. type: TP +#: doc/tin.1:676 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:681 +msgid "" +"Yanks in all groups. Toggles the displayed groups between all the groups in " +"the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}> file and just " +"those that are subscribed to in I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>." +msgstr "" + +#. type: TP +#: doc/tin.1:681 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:685 +msgid "" +"Reread the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}> file " +"to see if any new news has arrived since starting B." +msgstr "" + +#. type: TP +#: doc/tin.1:685 +#, no-wrap +msgid "B" +msgstr "B" + +#. -------------------------------------------------------------------- +#. type: Plain text +#: doc/tin.1:690 +msgid "Mark all articles in the current group as unread." +msgstr "" + +#. type: SS +#: doc/tin.1:690 +#, no-wrap +msgid "GROUP INDEX COMMANDS" +msgstr "ÃNDICE DE MANDATOS AGRUPADOS" + +#. type: Plain text +#: doc/tin.1:694 +msgid "" +"All searches in this level are limited to unread articles if in " +"B mode. B ('B') can be use " +"toggle the setting right before/after the search." +msgstr "" + +#. type: Plain text +#: doc/tin.1:697 +msgid "Select article 4." +msgstr "" + +#. type: TP +#: doc/tin.1:697 doc/tin.1:948 doc/tin.1:1112 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:701 doc/tin.1:952 doc/tin.1:1116 +msgid "" +"Auto select article(s) using a menu. Read the section \"FILTERING ARTICLES\" " +"for more information." +msgstr "" + +#. type: TP +#: doc/tin.1:701 doc/tin.1:952 doc/tin.1:1128 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:705 doc/tin.1:956 doc/tin.1:1132 +msgid "" +"Kill article(s) using a menu. Read the section \"FILTERING ARTICLES\" for " +"more information." +msgstr "" + +#. type: TP +#: doc/tin.1:705 doc/tin.1:956 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:710 doc/tin.1:961 +msgid "" +"Mark current article, thread, range, auto-selected (hot) articles, articles " +"matching pattern or tagged articles as read. A prompt asks which type should " +"be marked." +msgstr "" + +#. type: TP +#: doc/tin.1:710 doc/tin.1:961 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:715 doc/tin.1:966 +msgid "" +"Mark current article, thread, range, auto-selected (hot) articles, articles " +"matching pattern or tagged articles as unread. A prompt asks which type " +"should be marked." +msgstr "" + +#. type: TP +#: doc/tin.1:719 doc/tin.1:970 doc/tin.1:1160 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:722 doc/tin.1:973 doc/tin.1:1163 +msgid "Re-enter the last message that was viewed." +msgstr "" + +#. type: Plain text +#: doc/tin.1:728 doc/tin.1:979 +msgid "Search forward for specified subject." +msgstr "" + +#. type: Plain text +#: doc/tin.1:731 doc/tin.1:982 +msgid "Search backwards for specified subject." +msgstr "" + +#. type: TP +#: doc/tin.1:731 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:734 doc/tin.1:985 +msgid "Select current thread for later processing." +msgstr "" + +#. type: TP +#: doc/tin.1:734 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:738 +msgid "" +"Selects all threads in current group. It is a shortcut for calling " +"B with a pattern of ''*''." +msgstr "" + +#. type: TP +#: doc/tin.1:738 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:743 +msgid "" +"Toggle selection of current thread. If at least one unread article, (but not " +"every unread article) in the current thread is selected, then all unread " +"articles become selected." +msgstr "" + +#. type: TP +#: doc/tin.1:743 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:748 +msgid "" +"For each thread in current group, if it at least one unread article is " +"selected, all unread articles become selected. This is useful for auto-" +"selection on author where reader wants to see entire thread." +msgstr "" + +#. type: TP +#: doc/tin.1:748 +#, no-wrap +msgid "B" + +#. type: Plain text +#: doc/tin.1:754 +msgid "" +"Prompts for a pattern with which to match on. All threads whose subjects " +"match the pattern will be marked selected. A pattern of ''*'' will match all " +"subjects. Entering just 'BCRE>' will re-use the last pattern that " +"was entered." +msgstr "" + +#. type: TP +#: doc/tin.1:754 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:757 +msgid "Reverse all selections on all articles." +msgstr "" + +#. type: TP +#: doc/tin.1:757 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:763 +msgid "" +"Undo all selections on all articles. It clears the toggle effect of " +"B ('B') command. Thus after first doing a " +"B, one can then do B to reset articles. " +"Thus, one can iteratively whittle down uninteresting threads." +msgstr "" + +#. type: TP +#: doc/tin.1:763 doc/tin.1:994 doc/tin.1:1186 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:768 doc/tin.1:999 doc/tin.1:1191 +msgid "" +"Pipe current article / thread / auto-selected (hot) articles / articles " +"matching pattern / tagged articles into command. See the section \"MAILING " +"PIPING PRINTING REPOSTING AND SAVING ARTICLES\" for more information." +msgstr "" + +#. type: TP +#: doc/tin.1:768 doc/tin.1:1191 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:777 +msgid "" +"Auto select article(s) with a single key [after confirmation]. The defaults " +"used for selection are based upon the following four tinrc config variables: " +"B, B, " +"B and B. Read " +"the section \"GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES\" for a " +"full explanation of these variables and \"FILTERING ARTICLES\" for more " +"information on filtering." +msgstr "" + +#. type: TP +#: doc/tin.1:777 doc/tin.1:1200 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:786 +msgid "" +"Kill article(s) with a single key [after confirmation]. The defaults used " +"for killing are based upon the following four tinrc config variables: " +"B, B, " +"B and B. Read the " +"section \"GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES\" for a full " +"explanation of these variables and \"FILTERING ARTICLES\" for more " +"information on filtering." +msgstr "" + +#. type: TP +#: doc/tin.1:786 +#, no-wrap +msgid "BCRE'>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:789 +msgid "Read current article." +msgstr "" + +#. type: TP +#: doc/tin.1:789 +#, no-wrap +msgid "BTABE'>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:792 +msgid "View next unread article or group." +msgstr "" + +#. type: TP +#: doc/tin.1:792 doc/tin.1:1005 doc/tin.1:1217 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:796 +msgid "" +"Author forward search. This searches for articles with a specific ''From:'' " +"line." +msgstr "" + +#. type: TP +#: doc/tin.1:796 doc/tin.1:1010 doc/tin.1:1220 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:799 doc/tin.1:1013 +msgid "Author backward search. Otherwise, see B ('B') above." +msgstr "" + +#. type: TP +#: doc/tin.1:799 doc/tin.1:1013 doc/tin.1:1223 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:803 doc/tin.1:1017 doc/tin.1:1227 +msgid "" +"Search the body of all articles in group (can be slow). You can abort the " +"search using B ('B')." +msgstr "" + +#. type: Plain text +#: doc/tin.1:807 +msgid "" +"Mark all articles as read [after confirmation] then return to the group " +"selection list. Move cursor to next group." +msgstr "" + +#. type: Plain text +#: doc/tin.1:811 +msgid "" +"Mark all articles as read [after confirmation] and enter the next group with " +"unread news." +msgstr "" + +#. type: TP +#: doc/tin.1:811 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:815 doc/tin.1:1029 +msgid "" +"Cycle the display of the author through all the possible options for the " +"tinrc variable B." +msgstr "" + +#. type: TP +#: doc/tin.1:815 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:820 doc/tin.1:1034 doc/tin.1:1240 +msgid "" +"Cancel (delete) or supersede (overwrite) the current article. It must have " +"been posted by the same user. The cancel message can be seen in the " +"newsgroup 'control' or 'control.cancel'." +msgstr "" + +#. type: TP +#: doc/tin.1:823 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.1:827 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:830 +msgid "Toggle article/group limit." +msgstr "" + +#. type: Plain text +#: doc/tin.1:834 +msgid "" +"Display the subject of the first article in the current thread in the last " +"line." +msgstr "" + +#. type: TP +#: doc/tin.1:837 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:843 +msgid "" +"Mark article/thread as read and move onto the next unread article/thread. If " +"a range of articles/threads is set, the range will be marked as read instead " +"of the current article/thread. When tagged articles/threads are present, a " +"prompt asks how to proceed." +msgstr "" + +#. type: TP +#: doc/tin.1:843 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:846 +msgid "Open the thread under the current cursor position." +msgstr "" + +#. type: Plain text +#: doc/tin.1:849 doc/tin.1:1052 doc/tin.1:1274 +msgid "Look up article by ''Message-ID:''." +msgstr "" + +#. type: TP +#: doc/tin.1:849 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:854 doc/tin.1:1057 doc/tin.1:1279 +msgid "" +"Mail current article / thread / auto-selected (hot) articles / articles " +"matching pattern / tagged articles to someone. See the section \"MAILING " +"PIPING PRINTING REPOSTING AND SAVING ARTICLES\" for more information." +msgstr "" + +#. type: TP +#: doc/tin.1:858 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:861 +msgid "Go to next group." +msgstr "" + +#. type: TP +#: doc/tin.1:861 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:864 doc/tin.1:1289 +msgid "Go to the next unread article." +msgstr "" + +#. type: TP +#: doc/tin.1:864 doc/tin.1:1057 doc/tin.1:1289 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:869 doc/tin.1:1062 doc/tin.1:1294 +msgid "" +"Send current article / thread / auto-selected (hot) articles / articles " +"matching pattern / tagged articles to printer. See the section \"MAILING " +"PIPING PRINTING REPOSTING AND SAVING ARTICLES\" for more information." +msgstr "" + +#. type: TP +#: doc/tin.1:869 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:872 +msgid "Go to previous group." +msgstr "" + +#. type: TP +#: doc/tin.1:872 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:875 +msgid "Go to previous unread article." +msgstr "" + +#. type: Plain text +#: doc/tin.1:878 doc/tin.1:1065 +msgid "Return to previous level." +msgstr "" + +#. type: TP +#: doc/tin.1:881 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:884 +msgid "Toggle the display between all articles and unread articles." +msgstr "" + +#. type: TP +#: doc/tin.1:888 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:893 doc/tin.1:1077 doc/tin.1:1319 +msgid "" +"Save current article / thread / auto-selected (hot) articles / articles " +"matching pattern / tagged articles. See the section \"MAILING PIPING " +"PRINTING REPOSTING AND SAVING ARTICLES\" for more information." +msgstr "" + +#. type: TP +#: doc/tin.1:893 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:896 doc/tin.1:1080 doc/tin.1:1322 +msgid "Save marked articles automatically without further prompting." +msgstr "" + +#. type: TP +#: doc/tin.1:896 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:901 +msgid "" +"Toggle tag-status of current article / thread for B ('B') / " +"B ('B<|>') / B ('B') / B ('B') / " +"B ('B')." +msgstr "" + +#. type: TP +#: doc/tin.1:901 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:904 +msgid "" +"Automatically tag in order all the parts of the current multi-part message." +msgstr "" + +#. type: TP +#: doc/tin.1:904 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:909 +msgid "" +"Cycle the threading mode through no threading, threading by subject, " +"threading by references, threading on both subject and references, group " +"multipart articles into a thread (''Subject:'' based)." +msgstr "" + +#. type: TP +#: doc/tin.1:909 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:912 +msgid "Untag all articles that were tagged." +msgstr "" + +#. type: Plain text +#: doc/tin.1:919 doc/tin.1:1094 doc/tin.1:1347 +msgid "" +"Post an article to the current group. If posting fails for some reason, " +"you'll get the chance to edit the article again via B ('B'), " +"postpone it for later processing via B ('B') (see also ''B<-" +"o>'' command-line switch) or discard it via B ('B')." +msgstr "" + +#. type: TP +#: doc/tin.1:919 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:925 doc/tin.1:1353 +msgid "" +"Repost an already posted article / thread / auto-selected (hot) articles / " +"articles matching pattern / tagged articles to another newsgroup(s). Useful " +"for reposting from global to local newsgroups. Do not use this to crosspost " +"your own articles." +msgstr "" + +#. type: TP +#: doc/tin.1:925 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:933 +msgid "" +"Mark all unread articles that have not been selected as read, redraw screen " +"to reflect changes and put index at the first thread to begin reading. " +"Pressing B ('B') again will toggle back to the way " +"it was before. See B ('B<~>') command for clearing the toggle " +"effect, leaving the group will also clear the toggle effect and make the " +"changes permanent." +msgstr "" + +#. type: TP +#: doc/tin.1:933 doc/tin.1:1094 doc/tin.1:1353 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:936 +msgid "Mark current article as unread." +msgstr "" + +#. type: TP +#: doc/tin.1:936 doc/tin.1:1099 doc/tin.1:1356 +#, no-wrap +msgid "B" +msgstr "B" + +#. -------------------------------------------------------------------- +#. type: Plain text +#: doc/tin.1:943 +msgid "" +"Mark current thread as unread. If a range of threads is set, the range will " +"be marked as unread instead of the current thread. When tagged threads are " +"present, a prompt asks how to proceed." +msgstr "" + +#. type: SS +#: doc/tin.1:943 +#, no-wrap +msgid "THREAD LISTING COMMANDS" +msgstr "HILOS DE MANDATOS LISTADOS" + +#. type: Plain text +#: doc/tin.1:948 +msgid "Select article 4 within thread." +msgstr "" + +#. type: TP +#: doc/tin.1:982 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.1:985 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:988 +msgid "Toggle selection of current article." +msgstr "" + +#. type: TP +#: doc/tin.1:988 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:991 +msgid "Reverse article selections." +msgstr "" + +#. type: TP +#: doc/tin.1:991 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:994 +msgid "Undo all selections on current thread." +msgstr "" + +#. type: TP +#: doc/tin.1:999 +#, no-wrap +msgid "BCRE'>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1002 +msgid "Read current article within thread." +msgstr "" + +#. type: TP +#: doc/tin.1:1002 +#, no-wrap +msgid "BTABE'>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1005 +msgid "View next unread article within thread." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1010 +msgid "" +"Author forward search. This searches for articles with a specific ''From:'' " +"line. The search will wrap over into the next thread if nothing is found in " +"the current one." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1021 +msgid "" +"Mark thread as read [after confirmation] and return to the group index " +"page. Move cursor to next thread." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1025 +msgid "" +"Mark thread as read [after confirmation] and enter the next thread " +"containing unread news." +msgstr "" + +#. type: TP +#: doc/tin.1:1025 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.1:1029 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1040 doc/tin.1:1262 +msgid "Display the subject of the current article in the last line." +msgstr "" + +#. type: TP +#: doc/tin.1:1043 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1049 +msgid "" +"Mark article as read and move onto the next unread article. If a range of " +"articles is set, the range will be marked as read instead of the current " +"article. When tagged articles are present, a prompt asks how to proceed." +msgstr "" + +#. type: TP +#: doc/tin.1:1052 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.1:1072 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.1:1077 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.1:1080 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1084 doc/tin.1:1326 +msgid "" +"Toggle tag status of current article for mailing, piping, printing, saving " +"or reposting." +msgstr "" + +#. type: TP +#: doc/tin.1:1084 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1087 +msgid "Untag all tagged threads." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1099 +msgid "" +"Mark current article in thread as unread. If a range of articles is set, the " +"range will be marked as unread instead of the current article. When tagged " +"articles are present, a prompt asks how to proceed." +msgstr "" + +#. -------------------------------------------------------------------- +#. type: Plain text +#: doc/tin.1:1104 +msgid "Mark all articles in thread as unread." +msgstr "" + +#. type: SS +#: doc/tin.1:1104 +#, no-wrap +msgid "ARTICLE VIEWER COMMANDS" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1109 +msgid "Read the first (base) article in this thread." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1112 +msgid "Read response 4 in this thread." +msgstr "" + +#. type: TP +#: doc/tin.1:1116 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1120 +msgid "" +"Reply through mail to the author of the current article with a copy of the " +"article with all headers included." +msgstr "" + +#. type: TP +#: doc/tin.1:1120 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1125 +msgid "Perform B<\\%pgp>(1) operations on article." +msgstr "" + +#. type: TP +#: doc/tin.1:1125 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1128 +msgid "Toggles the display mode (raw including all headers vs. cooked)." +msgstr "" + +#. type: TP +#: doc/tin.1:1132 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1135 +msgid "Toggle the TAB width between 4 and 8 characters." +msgstr "" + +#. type: TP +#: doc/tin.1:1135 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1139 +msgid "" +"Post a followup to the current article with a copy of the article with all " +"headers included." +msgstr "" + +#. type: TP +#: doc/tin.1:1139 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1143 +msgid "" +"Toggle TeX to ISO decoding for current article. The default behavior is " +"taken from the B variable in the tinrc file." +msgstr "" + +#. type: TP +#: doc/tin.1:1143 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1146 +msgid "" +"Toggles the display of all headers vs. headers in B." +msgstr "" + +#. type: TP +#: doc/tin.1:1146 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1149 +msgid "Toggle ROT-13 decoding for this article." +msgstr "" + +#. type: TP +#: doc/tin.1:1149 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1153 +msgid "" +"Toggle the display of uuencoded sections. The default behavior is taken from " +"the B variable in the tinrc file." +msgstr "" + +#. type: TP +#: doc/tin.1:1153 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1160 +msgid "" +"The formfeed character (^L) is often used to hide 'spoilers' that the reader " +"may not initially wish to see when viewing an article. Any text after a " +"formfeed is not displayed. This key-press acts like a reveal key and turns " +"the hidden text back on. Scrolling down will also reveal the text, scrolling " +"up will hide it again." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1169 +msgid "Forward search the text of this article." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1172 +msgid "Backward search the text of this article." +msgstr "" + +#. type: TP +#: doc/tin.1:1172 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1177 +msgid "" +"Skip to the end of the next quoted text-block in this article. Quoted text " +"is everything which matches B, B or " +"B." +msgstr "" + +#. type: TP +#: doc/tin.1:1177 +#, no-wrap +msgid "B'>" +msgstr "B'>" + +#. type: Plain text +#: doc/tin.1:1180 +msgid "Go to the first article in the current thread." +msgstr "" + +#. type: TP +#: doc/tin.1:1180 +#, no-wrap +msgid "B'>" +msgstr "B'>" + +#. type: Plain text +#: doc/tin.1:1183 +msgid "Go to the last article in the current thread." +msgstr "" + +#. type: TP +#: doc/tin.1:1183 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1186 +msgid "Toggle word highlighting on/off." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1200 +msgid "" +"Auto select article(s) with a single key. The defaults used for selection " +"are set based upon the following four tinrc config variables: " +"B, B, " +"B and B Read the " +"section \"GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES\" for a full " +"explanation of these variables and \"FILTERING ARTICLES\" for more " +"information on filtering." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1209 +msgid "" +"Kill article(s) with a single key. The defaults used for killing are based " +"upon the following four tinrc config variables: B, " +"B, B and " +"B. Read the section \"GLOBAL OPTIONS MENU AND " +"TINRC CONFIGURABLE VARIABLES\" for a full explanation of these variables and " +"\"FILTERING ARTICLES\" for more information on filtering." +msgstr "" + +#. type: TP +#: doc/tin.1:1209 +#, no-wrap +msgid "BCRE'>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1212 +msgid "Go to next base article." +msgstr "" + +#. type: TP +#: doc/tin.1:1212 +#, no-wrap +msgid "BTABE'>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1217 +msgid "" +"Go to next unread article. If the tinrc variable B doesn't " +"contain PageNextUnread, then this key will first page through the current " +"article." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1220 +msgid "Author forward search." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1223 +msgid "Author backward search." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1231 +msgid "" +"Mark the current thread as read [after confirmation] and return to the " +"previous menu. Move cursor to next item." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1235 +msgid "" +"Mark the rest of the current thread as read [after confirmation] and enter " +"the next thread with unread articles." +msgstr "" + +#. type: TP +#: doc/tin.1:1235 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.1:1240 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1243 +msgid "" +"Edit the current article. This is restricted to mailgroups and saved news." +msgstr "" + +#. type: TP +#: doc/tin.1:1246 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1249 +msgid "" +"Post a followup to the current article with a copy of the article included." +msgstr "" + +#. type: TP +#: doc/tin.1:1249 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1253 +msgid "" +"Post a followup to the current article without including a copy of the " +"article." +msgstr "" + +#. type: TP +#: doc/tin.1:1253 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1256 +msgid "Go to the start of the article." +msgstr "" + +#. type: TP +#: doc/tin.1:1256 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1259 +msgid "Go to the end of the article." +msgstr "" + +#. type: TP +#: doc/tin.1:1265 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1268 +msgid "Mark rest of thread as read and move onto the next unread thread." +msgstr "" + +#. type: TP +#: doc/tin.1:1268 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1271 +msgid "Show the thread menu that the current article is a part of." +msgstr "" + +#. type: TP +#: doc/tin.1:1274 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.1:1283 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1286 +msgid "Go to the next article." +msgstr "" + +#. type: TP +#: doc/tin.1:1286 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.1:1294 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1297 +msgid "Go to the previous article." +msgstr "" + +#. type: TP +#: doc/tin.1:1297 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1300 +msgid "Go to the previous unread article." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1303 +msgid "Return to the previous level." +msgstr "" + +#. type: TP +#: doc/tin.1:1306 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1310 +msgid "" +"Reply through mail to the author of the current article with a copy of the " +"article included." +msgstr "" + +#. type: TP +#: doc/tin.1:1310 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1314 +msgid "" +"Reply through mail to the author of the current article without including " +"the original article." +msgstr "" + +#. type: TP +#: doc/tin.1:1314 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.1:1319 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.1:1322 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.1:1326 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1329 +msgid "Return to group selection level." +msgstr "" + +#. type: TP +#: doc/tin.1:1329 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1332 +msgid "Go to parent article." +msgstr "" + +#. type: TP +#: doc/tin.1:1332 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1336 +msgid "" +"Display a list of URLs in the current article. See the section \"URL LISTING" +"\" for more information." +msgstr "" + +#. type: TP +#: doc/tin.1:1336 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1340 +msgid "" +"Display a list of attachments of the current article. See the section " +"\"ATTACHMENT LISTING\" for more information." +msgstr "" + +#. type: TP +#: doc/tin.1:1347 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1356 +msgid "Mark article as unread." +msgstr "" + +#. -------------------------------------------------------------------- +#. type: Plain text +#: doc/tin.1:1361 +msgid "Mark the current thread as unread." +msgstr "" + +#. type: SS +#: doc/tin.1:1361 +#, no-wrap +msgid "URL LISTING" +msgstr "LISTADO URL" + +#. type: Plain text +#: doc/tin.1:1364 +msgid "" +"B ('B') displays a list of URLs in the current article. " +"Besides the common moving keys, the following commands are available:" +msgstr "" + +#. type: TP +#: doc/tin.1:1365 +#, no-wrap +msgid "BCRE'>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1369 +msgid "" +"The current URL will be prompted and opened using the B. " +"'BESCE>' or no input will skip the URL." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1372 +msgid "URL forward search." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1375 +msgid "URL backward search." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1381 doc/tin.1:1434 +msgid "Shell escape." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1384 +msgid "Toggle the display of the current URL in the last line." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1387 doc/tin.1:1441 +msgid "Help screen of commands available." +msgstr "" + +#. -------------------------------------------------------------------- +#. type: SS +#: doc/tin.1:1393 +#, no-wrap +msgid "ATTACHMENT LISTING" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1396 +msgid "" +"B ('B') displays a list of attachments of the current " +"article. Besides the common moving keys, the following commands are " +"available:" +msgstr "" + +#. type: TP +#: doc/tin.1:1397 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1400 +msgid "Pipe attachment into command." +msgstr "" + +#. type: TP +#: doc/tin.1:1400 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1403 +msgid "Save current attachment / tagged attachments to disk." +msgstr "" + +#. type: TP +#: doc/tin.1:1403 +#, no-wrap +msgid "BCRE'>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1406 +msgid "View attachment." +msgstr "Vea adjunto." + +#. type: TP +#: doc/tin.1:1406 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1409 +msgid "Tag one or more attachments for saving." +msgstr "" + +#. type: TP +#: doc/tin.1:1409 +#, no-wrap +msgid "B" + +#. type: Plain text +#: doc/tin.1:1413 +msgid "" +"Prompts for a pattern to match. All attachments whose name/description or " +"content type/transfer encoding match the pattern will be tagged." +msgstr "" + +#. type: TP +#: doc/tin.1:1413 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1416 +msgid "Reverse tagging of all attachments." +msgstr "" + +#. type: TP +#: doc/tin.1:1416 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1419 +msgid "Untag all tagged attachments." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1422 +msgid "Attachment forward search." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1425 +msgid "Attachment backward search." +msgstr "" + +#. type: TP +#: doc/tin.1:1428 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1431 +msgid "" +"Pipe attachment into command. Uses the raw attachment, no decoding is done." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1438 +msgid "" +"Toggle the display of the name/description of the current attachment in the " +"last line." +msgstr "" + +#. -------------------------------------------------------------------- +#. type: SS +#: doc/tin.1:1447 +#, no-wrap +msgid "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" +msgstr "" + +#. FIXME - add missing descriptions +#. - \fI${TIN_LIBDIR:\-NEWSLIBDIR}/tinrc\fR is used +#. in the !TIN_DEFAULTS_DIR config case +#. type: Plain text +#: doc/tin.1:1459 +msgid "" +"At startup, B reads in the configuration files (see also B<\\" +"%tin>(5)). They contain a list of variables that can be used to configure " +"the way B works. If it exists, the global configuration file, I is read. After that, the user's own configuration file is read " +"from I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/tinrc>. The global file is useful for " +"distributing system-wide defaults to new users who have no private tinrc yet." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1467 +msgid "" +"The variables are user configurable by editing I<${TIN_HOMEDIR:-\"$HOME\"}/." +"tin/tinrc> directly. Most of them can also be set in the GLOBAL OPTIONS MENU " +"which is accessed by pressing B ('B') at all levels. It " +"allows the user to customize the behavior of B. The options are saved " +"to the file I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/tinrc> when you exit B so " +"don't edit the file directly whilst B is running." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1473 +msgid "" +"In the options menu use the cursor keys in the usual way to move around. Use " +"B ('B<^J>' or 'BCRE>') to 'open' the option you wish " +"to change. You will need to enter a new value or use 'BSPACEE>' to " +"toggle the available options. B will save the new value, " +"\\&'BESCE>' will abort without saving changes." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1480 +msgid "" +"As with the other menus, B ('B<^L>') will redraw the screen. You " +"can use B ('B'), B ('B') and B " +"('B<\\e>') to search for a specific option. Use B ('B') to exit the " +"option menu and keep your changes. Use B ('B') to exit without " +"keeping your changes." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1485 +msgid "" +"The options menu provides access to the attributes menu for the current " +"group by the B ('BTABE>') command. Pressing " +"B again toggles back to the options menu. For more " +"information see section \"ATTRIBUTES MENU AND GROUP ATTRIBUTES\"." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1488 +msgid "" +"The B ('B') command brings up the scopes menu. For more " +"information see section \"SCOPES MENU\"." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1492 +msgid "" +"Here is a full list of all the available variables. The name in braces is " +"the name of the corresponding setting in I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/" +"tinrc>." +msgstr "" + +#. type: TP +#: doc/tin.1:1492 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1498 doc/tin.5:1203 +msgid "" +"If ON abbreviate long newsgroup names at group selection level and article " +"level (if necessary) like this: news.software.readers -E n.software." +"readers -E n.s.readers -E n.s.r. Default is OFF." +msgstr "" + +#. type: TP +#: doc/tin.1:1498 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1502 doc/tin.5:1207 +msgid "" +"If ON add posted articles which start a new thread to filter for " +"highlighting follow-ups. Default is ON." +msgstr "" + +#. type: TP +#: doc/tin.1:1502 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1505 doc/tin.5:1210 +msgid "Turn ON advertising in header (''User-Agent:''). Default is ON." +msgstr "" + +#. type: TP +#: doc/tin.1:1505 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1508 doc/tin.5:1213 +msgid "" +"If ON strip multipart/alternative messages automatically. Default is ON." +msgstr "" + +#. type: TP +#: doc/tin.1:1508 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1511 doc/tin.5:1216 +msgid "The character used to show that an article was deleted. Default is 'D'." +msgstr "" + +#. type: TP +#: doc/tin.1:1511 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1514 doc/tin.5:1219 +msgid "" +"The character used to show that an article is in a range. Default is '#'." +msgstr "" + +#. type: TP +#: doc/tin.1:1514 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1518 doc/tin.5:1223 +msgid "" +"The character used to show that an article will return as an unread article " +"when the group is next entered. Default is '-'." +msgstr "" + +#. type: TP +#: doc/tin.1:1518 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1522 doc/tin.5:1227 +msgid "" +"The character used to show that an article/thread is auto-selected (hot). " +"Default is '*'." +msgstr "" + +#. type: TP +#: doc/tin.1:1522 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1526 doc/tin.5:1231 +msgid "" +"The character used to show that an article/thread is recent (not older than " +"X days). See also B. Default is 'o'." +msgstr "" + +#. type: TP +#: doc/tin.1:1526 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1530 doc/tin.5:1235 +msgid "" +"The character used to show that an article has not been read. Default is " +"'+'." +msgstr "" + +#. type: TP +#: doc/tin.1:1530 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1533 doc/tin.5:1238 +msgid "The character used to show that an article was read. Default is ' '." +msgstr "" + +#. type: TP +#: doc/tin.1:1533 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1537 doc/tin.5:1242 +msgid "" +"The character used to show that an article was killed. Default is 'K'. " +"B must be set accordingly." +msgstr "" + +#. type: TP +#: doc/tin.1:1537 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1541 doc/tin.5:1246 +msgid "" +"The character used to show that an article was hot before it was read. " +"Default is ':'. B must be set accordingly." +msgstr "" + +#. type: TP +#: doc/tin.1:1541 doc/tin.5:1246 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1546 +msgid "" +"If ON B will ask before using a MIME viewer (B) to " +"display MIME messages. This only occurs if a MIME viewer is set. Default is " +"OFF." +msgstr "" + +#. type: TP +#: doc/tin.1:1546 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1550 doc/tin.5:1257 +msgid "" +"Automatically put your name in the ''Cc:'' and/or ''Bcc:'' field when " +"mailing an article. Default is No." +msgstr "" + +#. type: TP +#: doc/tin.1:1550 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1554 doc/tin.5:1261 +msgid "" +"If ON automatically list thread when entering it using right arrow key. " +"Default is ON." +msgstr "" + +#. type: TP +#: doc/tin.1:1554 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1557 doc/tin.1:2540 +msgid "Default is OFF." +msgstr "" + +#. type: TP +#: doc/tin.1:1557 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1563 doc/tin.5:1270 +msgid "" +"If ON articles/threads with ''Archive-name:'' in header will be " +"automatically saved with the Archive-name & part/patch no and post processed " +"if B is set to something other than 'No'. Default is OFF." +msgstr "" + +#. type: TP +#: doc/tin.1:1563 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1568 doc/tin.5:1275 +msgid "" +"If set ON articles/threads will be saved in batch mode when save \\&''B<-" +"S>'' or mail ''B<-M>, B<-N>'' is specified on the command line. Default is " +"ON." +msgstr "" + +#. type: TP +#: doc/tin.1:1568 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1573 doc/tin.5:1280 +msgid "" +"If set ON a mini menu of the most useful commands will be displayed at the " +"bottom of the screen for each level. Also a short posting etiquette will be " +"displayed after composing an article. Default is ON." +msgstr "" + +#. type: TP +#: doc/tin.1:1573 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1578 +msgid "" +"If ON, create local copies of NNTP overview files. This can be used to " +"considerably speed up accessing large groups when using a slow connection. " +"See also \"INDEX FILES\". Default is OFF." +msgstr "" + +#. type: TP +#: doc/tin.1:1578 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1584 doc/tin.5:1291 +msgid "" +"Use this hash algorithm for cancel-locks. Only available when build with " +"cancel-lock support. none disables the generation of cancel-locks. Valid " +"values are none, sha1, sha256 and sha512. Default is sha1." +msgstr "" + +#. type: TP +#: doc/tin.1:1584 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1590 doc/tin.5:1295 +msgid "" +"If set ON the user is asked when quitting if all groups read during the " +"current session should be marked read. Default is OFF." +msgstr "" + +#. type: TP +#: doc/tin.1:1590 +#, fuzzy, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1593 doc/tin.5:1298 +#, fuzzy +msgid "Standard background color" +msgstr "Color de fondo estándar" + +#. type: TP +#: doc/tin.1:1593 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1596 doc/tin.5:1301 +msgid "Color of quoted text from external sources" +msgstr "" + +#. type: TP +#: doc/tin.1:1596 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1599 doc/tin.5:1304 +msgid "Color of sender (From:)" +msgstr "" + +#. type: TP +#: doc/tin.1:1599 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1602 doc/tin.5:1307 +msgid "Color of header-lines" +msgstr "" + +#. type: TP +#: doc/tin.1:1602 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1605 doc/tin.5:1310 +msgid "Color of help pages" +msgstr "" + +#. type: TP +#: doc/tin.1:1605 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1608 doc/tin.5:1313 +msgid "Color of background for inverse text" +msgstr "" + +#. type: TP +#: doc/tin.1:1608 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1611 doc/tin.5:1316 +msgid "Color of foreground for inverse text" +msgstr "" + +#. type: TP +#: doc/tin.1:1611 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1615 doc/tin.5:1320 +msgid "" +"Color of words emphasized like _this_. See also B and " +"B." +msgstr "" + +#. type: TP +#: doc/tin.1:1615 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1619 doc/tin.5:1324 +msgid "" +"Color of words emphasized like /this/. See also B and " +"B." +msgstr "" + +#. type: TP +#: doc/tin.1:1619 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1623 doc/tin.5:1328 +msgid "" +"Color of words emphasized like *this*. See also B and " +"B." +msgstr "" + +#. type: TP +#: doc/tin.1:1623 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1627 doc/tin.5:1332 +msgid "" +"Color of words emphasized like -this-. See also B and " +"B." +msgstr "" + +#. type: TP +#: doc/tin.1:1627 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1630 doc/tin.5:1335 +msgid "Color of mini help menu" +msgstr "" + +#. type: TP +#: doc/tin.1:1630 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1633 doc/tin.5:1338 +msgid "Color of actual news header fields" +msgstr "" + +#. type: TP +#: doc/tin.1:1633 +#, fuzzy, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1636 doc/tin.5:1341 +#, fuzzy +msgid "Standard foreground color" +msgstr "Color de primer plano estándar" + +#. type: TP +#: doc/tin.1:1636 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1639 doc/tin.5:1344 +msgid "Color of quoted lines" +msgstr "" + +#. type: TP +#: doc/tin.1:1639 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1642 doc/tin.5:1347 +msgid "Color of twice quoted lines" +msgstr "" + +#. type: TP +#: doc/tin.1:1642 +#, no-wrap +msgid "B3 times quoted line (col_quote3)>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1645 doc/tin.5:1350 +msgid "Color of E=3 times quoted lines" +msgstr "" + +#. type: TP +#: doc/tin.1:1645 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1649 doc/tin.5:1354 +msgid "" +"Color of response counter. This is the text that says \"Response x of y\" in " +"the article viewer." +msgstr "" + +#. type: TP +#: doc/tin.1:1649 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1652 doc/tin.5:1357 +msgid "Color of signatures" +msgstr "" + +#. type: TP +#: doc/tin.1:1652 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1655 doc/tin.5:1360 +msgid "Color of urls highlight" +msgstr "" + +#. type: TP +#: doc/tin.1:1655 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1658 doc/tin.5:1363 +msgid "Color of verbatim blocks" +msgstr "" + +#. type: TP +#: doc/tin.1:1658 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1661 doc/tin.5:1366 +msgid "Color of article subject" +msgstr "" + +#. type: TP +#: doc/tin.1:1661 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1664 doc/tin.5:1369 +msgid "Color of text-lines" +msgstr "" + +#. type: TP +#: doc/tin.1:1664 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1667 doc/tin.5:1372 +msgid "Color of help/mail sign" +msgstr "" + +#. type: TP +#: doc/tin.1:1667 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1670 +msgid "Ask for manual confirmation to protect the user." +msgstr "" + +#. type: IP +#: doc/tin.1:1671 doc/tin.1:1677 doc/tin.1:1681 +#, no-wrap +msgid "\\(bu" +msgstr "" + +#. TODO: check if all affected commands are marked [after confirmation] +#. type: Plain text +#: doc/tin.1:1677 +msgid "" +"B Ask for confirmation before executing certain dangerous commands " +"(e.g., B ('B')). Commands that this affects are marked in this " +"manual with '[after confirmation]'. Default is commands & quit." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1681 +msgid "" +"B You'll be asked to confirm that you wish to exit B when you use " +"the B ('B') command." +msgstr "" + +#. type: Plain text +#: doc/tin.1:1685 +msgid "" +"B: Ask for confirmation before marking all not selected (with " +"B ('B') command) articles as read." +msgstr "" + +#. type: Plain text +#: doc/tin.5:1393 +msgid "Default is commands & quit." +msgstr "" + +#. type: Plain text +#: doc/tin.5:1404 +msgid "" +"Format string used for date representation. A description of the different " +"format options can be found at B<\\%strftime>(3). B<\\%tin>(1) uses B<\\" +"%strftime>(3) when available and supports most format options in his " +"fallback code. Default is \"%a, %d %b %Y %H:%M:%S\"." +msgstr "" + +#. type: TP +#: doc/tin.5:1404 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1406 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1408 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1411 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1414 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1418 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1423 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1427 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: ta +#: doc/tin.5:1432 doc/tin.5:1461 +#, no-wrap +msgid "\\w'0,1 'u +\\w'\\'\\'Message-ID:\\'\\' & last \\'\\'References:\\'\\' entry only'u" +msgstr "" + +#. type: Plain text +#: doc/tin.5:1441 doc/tin.5:1470 +#, no-wrap +msgid "" +"0\t''Subject:'' (case sensitive)\n" +"1\t''Subject:'' (ignore case)\n" +"2\t''From:'' (case sensitive)\n" +"3\t''From:'' (ignore case)\n" +"4\t''Message-ID:'' & full ''References:'' line\n" +"5\t''Message-ID:'' & last ''References:'' entry only\n" +"6\t''Message-ID:'' entry only\n" +"7\t''Lines:''\n" +msgstr "" + +#. type: TP +#: doc/tin.5:1443 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1447 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1452 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1456 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1472 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1474 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1476 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1478 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1480 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1482 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1484 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1486 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1488 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1490 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1492 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1494 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1496 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1498 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1500 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1502 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1504 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1506 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:1515 +msgid "" +"The format string used to create the editor start command with parameters. " +"Default is '%E +%N %F' with %E=Editor, %N=Linenumber and %F=Filename (e.g., /" +"bin/vi +7 .article)." +msgstr "" + +#. type: TP +#: doc/tin.5:1518 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:1525 +msgid "" +"A regular expression that will be applied when reading articles. All " +"matching lines are shown in B. If B is blank, " +"then B<%tin>(1) uses a built-in default." +msgstr "" + +#. type: TP +#: doc/tin.5:1525 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1529 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:1536 +msgid "" +"If B is E 0 not more than the last B " +"articles/group are fetched from the server. If B is E 0 B<" +"\\%tin>(1) will start fetching articles from your first unread minus " +"absolute value of B. Default is 0, which means no limit." +msgstr "" + +#. type: TP +#: doc/tin.5:1536 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:1550 +msgid "" +"Which keys B<%tin>(1) should accept to jump to the next unread article. " +"Possible is any combination of B and B. When " +"B is set B<%tin>(1) jumps to the next article at the end of the " +"current one. When B is set B<%tin>(1) jumps immediately to " +"the next article when B ('BTABE>') is pressed. " +"Default is B." +msgstr "" + +#. type: Plain text +#: doc/tin.5:1557 +msgid "" +"The format string used for the Group level. Default is \"%n\\ %m\\ %R\\ %L\\ " +"\\ %s\\ \\ %F\". The following substitutions are supported:" +msgstr "" + +#. type: ta +#: doc/tin.5:1559 +#, no-wrap +msgid "\\w'%G 'u +\\w'number of responses in thread'u" +msgstr "" + +#. type: Plain text +#: doc/tin.5:1571 +#, no-wrap +msgid "" +"%D\tdate\n" +"%F\tfrom, name and/or address\n" +"%I\tinitials\n" +"%L\tline count\n" +"%M\tmessage-id\n" +"%R\tnumber of responses in thread\n" +"%S\tscore\n" +"%m\tarticle marks\n" +"%n\tcurrent thread number\n" +"%s\tsubject\n" +"%%\t%\n" +msgstr "" + +#. type: TP +#: doc/tin.5:1573 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1583 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1590 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1596 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:1602 +msgid "" +"If greater than 0 your mailreader will be invoked earlier for reply so you " +"can use more of its features (e.g. MIME, pgp, ...). 1 means include headers, " +"2 means don't include headers (old use_mailreader_i=ON option). 0 turns off " +"usage. This option has to suit B. Default is 0." +msgstr "" + +#. type: TP +#: doc/tin.5:1602 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1606 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1611 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:1615 +msgid "" +"This option controls the processing and display of articles that are killed. " +"There are 3 options, default is 0 (B)." +msgstr "" + +#. type: Plain text +#: doc/tin.5:1623 +msgid "" +"B is the 'traditional' behavior of B<\\%tin>(1). " +"Only unread articles are killed once only by marking them read. As filtering " +"only happens on unread articles with B set to 0, " +"B and B are only shown once. " +"When you reenter the group the mark will be gone." +msgstr "" + +#. type: TP +#: doc/tin.5:1639 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1649 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1654 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1673 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1710 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1722 doc/tin.5:2426 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1755 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1760 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1765 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1770 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1775 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:1781 +msgid "" +"These are internal timers used by B<\\%tin>(1) to keep track of new " +"newsgroups. Do not change them unless you understand what they are for." +msgstr "" + +#. type: TP +#: doc/tin.5:1802 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:1805 +msgid "Time in seconds to wait for a response from the server. Default is 120." +msgstr "" + +#. type: TP +#: doc/tin.5:1805 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:1809 +msgid "" +"The normalization form which should be used to normalize unicode input. The " +"possible values are:" +msgstr "" + +#. type: Plain text +#: doc/tin.5:1827 +msgid "" +"Some normalization modes are only available if they are supported by the " +"library B<\\%tin>(1) uses to do the normalization. NFC should be used if " +"possible." +msgstr "" + +#. type: Plain text +#: doc/tin.5:1855 +msgid "" +"If ON, then B<\\%tin>(1) will start an appropriate viewer program to " +"display any files that were post processed and uudecoded. The program is " +"determined using the B<\\%mailcap>(5) file. Default is ON." +msgstr "" + +#. type: Plain text +#: doc/tin.5:1861 +msgid "" +"This specifies whether to perform post processing on saved articles. " +"Because the shell archive may contain commands you may not want to be " +"executed, be careful when extracting shell archives. The following values " +"are allowed:" +msgstr "" + +#. type: Plain text +#: doc/tin.5:1869 +msgid "" +"B, unpacking of multi-part B<\\%shar>(1) files only. " +"Because the shell archive may contain commands you may not want to be " +"executed, be careful with this option." +msgstr "" + +#. type: TP +#: doc/tin.5:1872 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1882 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:1892 +msgid "" +"The printer program with options that is to be used to print articles. The " +"default is B<\\%lpr>(1) for BSD machines and B<\\%lp>(1) for SysV " +"machines. Printing from B<\\%tin>(1) may have been disabled by the System " +"Administrator." +msgstr "" + +#. type: Plain text +#: doc/tin.5:1900 +msgid "" +"If ON show empty ''Followup-To:'' header when editing an article. Default " +"is OFF." +msgstr "" + +#. type: TP +#: doc/tin.5:1906 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:1912 +msgid "" +"This bit coded integer value controls how articles are to be quoted when " +"following up or replying to them. Any of the following options can be " +"combined by adding all relevant values. Default is 5, which means that quote " +"characters are compressed and empty lines are quoted." +msgstr "" + +#. type: Plain text +#: doc/tin.5:1917 +msgid "" +"B Compress quote characters together when quoting multiple " +"times (for example, 'E E E' will be turned into " +"'EEE'). This option is on by default." +msgstr "" + +#. type: Plain text +#: doc/tin.5:1923 +msgid "" +"B This option is off by default. Signatures are always " +"quoted regardless of this option when you are viewing an article in raw mode " +"B ('B<^H>') and followup or reply to it. Signatures are never " +"quoted regardless of this option when B is off." +msgstr "" + +#. type: Plain text +#: doc/tin.5:1925 +msgid "B This option is on by default." +msgstr "" + +#. type: TP +#: doc/tin.5:1926 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:1933 +msgid "" +"A regular expression that will be applied when reading articles. All " +"matching lines are shown in B. If B is blank, then B<" +"\\%tin>(1) uses a built-in default." +msgstr "" + +#. type: TP +#: doc/tin.5:1933 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:1940 +msgid "" +"A regular expression that will be applied when reading articles. All " +"matching lines are shown in B. If B is blank, then " +"B<\\%tin>(1) uses a built-in default." +msgstr "" + +#. type: TP +#: doc/tin.5:1940 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:1947 +msgid "" +"A regular expression that will be applied when reading articles. All " +"matching lines are shown in B. If B is blank, then " +"B<\\%tin>(1) uses a built-in default." +msgstr "" + +#. type: TP +#: doc/tin.5:1947 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1951 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:1958 +msgid "" +"If ON B<%tin>(1) does the rendering of bi-directional text. If OFF B<" +"%tin>(1) leaves the rendering of bi-directional text to the terminal. " +"Default is OFF." +msgstr "" + +#. type: TP +#: doc/tin.5:1958 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1967 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1971 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1975 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1979 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1983 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1991 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:1995 +msgid "" +"The format string used for the Selection level. Default is \"%f\\ %n\\ %U\\ " +"\\ %G\\ \\ %d\". The following substitutions are supported:" +msgstr "" + +#. type: ta +#: doc/tin.5:1997 +#, no-wrap +msgid "\\w'%G 'u +\\w'current group number'u" +msgstr "" + +#. type: Plain text +#: doc/tin.5:2004 +#, no-wrap +msgid "" +"%G\tgroup name\n" +"%U\tunread count\n" +"%d\tdescription\n" +"%f\tgroup flag\n" +"%n\tcurrent group number\n" +"%%\t%\n" +msgstr "" + +#. type: TP +#: doc/tin.5:2006 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:2037 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2046 +msgid "" +"If ON show a short group description text after newsgroup name at the group " +"selection level. The ''B<-d>'' command-line flag will override the setting " +"and turn descriptions off. The text used is taken from the I<${TIN_LIBDIR:-" +"NEWSLIBDIR}/newsgroups> file and if supported (requires B<\\%tin>(1) to be " +"build with mh-mail-handling support) from I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/" +"mailgroups> for mailgroups. Default is ON." +msgstr "" + +#. type: TP +#: doc/tin.5:2068 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:2091 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2098 +msgid "" +"A regular expression that will be applied when reading articles. All " +"matching words are shown in B or B. If " +"B is blank, then B<\\%tin>(1) uses a built-in default." +msgstr "" + +#. type: TP +#: doc/tin.5:2144 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:2151 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2158 +msgid "" +"A regular expression that will be applied when reading articles. All " +"matching words are shown in B or B. If " +"B is blank, then B<\\%tin>(1) uses a built-in default." +msgstr "" + +#. type: TP +#: doc/tin.5:2163 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:2167 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:2176 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:2180 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2187 +msgid "" +"A regular expression that will be applied when reading articles. All " +"matching words are shown in B or B. If " +"B is blank, then B<\\%tin>(1) uses a built-in default." +msgstr "" + +#. type: Plain text +#: doc/tin.5:2192 +msgid "" +"Decode German style TeX umlaut codes to ISO If ON, show \"a as Umlaut-a, " +"etc. Default is OFF. This behavior can also be toggled in the article viewer " +"via B ('B<\">')." +msgstr "" + +#. type: Plain text +#: doc/tin.5:2202 +msgid "" +"Defines which threading method to use. The choices are: 0) Don't thread, 1) " +"Thread on Subject only 2) Thread on References only, 3) Thread on References " +"then Subject (default) 4) Thread multipart articles on Subject. 5) Thread " +"on Percentage Match of the Subjects It's also possible to set the threading " +"type on a per group basis by setting the group attribute variable " +"B to 0 \\(en 5 in the file I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/" +"attributes>." +msgstr "" + +#. type: Plain text +#: doc/tin.5:2206 +msgid "" +"The format string used for the Thread level. Default is \"%n\\ %m\\ \\ " +"[%L]\\ \\ %T\\ \\ %F\". The following substitutions are supported:" +msgstr "" + +#. type: ta +#: doc/tin.5:2208 +#, no-wrap +msgid "\\w'%G 'u +\\w'from, name and/or address'u" +msgstr "" + +#. type: Plain text +#: doc/tin.5:2219 +#, no-wrap +msgid "" +"%D\tdate\n" +"%F\tfrom, name and/or address\n" +"%I\tinitials\n" +"%L\tline count\n" +"%M\tmessage-id\n" +"%S\tscore\n" +"%T\tthread tree\n" +"%m\tarticle marks\n" +"%n\tcurrent article number\n" +"%%\t%\n" +msgstr "" + +#. type: Plain text +#: doc/tin.5:2226 +msgid "" +"Defines how close the subjects must match while threading by Percentage " +"Match for threads to be considered part of a single thread. This value is in " +"the range 0 to 100. The default is 75." +msgstr "" + +#. type: TP +#: doc/tin.5:2230 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:2242 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2256 +msgid "" +"Allows you to select how B<%tin>(1) treats blank lines in article bodies. " +"Default is 0. This option does not affect lines within verbatim blocks." +msgstr "" + +#. type: TP +#: doc/tin.5:2275 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2282 +msgid "" +"A regular expression that will be applied when reading articles. All " +"matching words are shown in B or B. If " +"B is blank, then B<\\%tin>(1) uses a built-in default." +msgstr "" + +#. type: TP +#: doc/tin.5:2282 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2286 +msgid "" +"If ON remove I<${TIN_HOMEDIR:-\"$HOME\"}/.article> after posting. Default is " +"ON." +msgstr "" + +#. type: TP +#: doc/tin.5:2286 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:2291 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:2294 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2299 +msgid "If enabled B<\\%tin>(1) uses ANSI-colors. Default is OFF." +msgstr "" + +#. type: TP +#: doc/tin.5:2299 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2302 +msgid "Use scroll keys on keypad. Default is OFF." +msgstr "" + +#. type: TP +#: doc/tin.5:2302 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:2308 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2320 +msgid "" +"If enabled B<\\%slrnface>(1) will be used to interpret the ''X-Face:'' " +"header. For this option to have any effect, B<\\%tin>(1) must be running in " +"a B<\\%xterm>(1x) and B<\\%slrnface>(1) must be in your $B. Default " +"is OFF." +msgstr "" + +#. type: TP +#: doc/tin.5:2320 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:2324 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2328 +msgid "" +"A regular expression that B will use to find the begin of a verbatim " +"block. Default is #v+" +msgstr "" + +#. type: TP +#: doc/tin.5:2328 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2332 +msgid "" +"A regular expression that B will use to find the end of a verbatim " +"block. Default is #v-" +msgstr "" + +#. type: TP +#: doc/tin.5:2335 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2351 +msgid "" +"Allows you to select how B<\\%tin>(1) matches strings. The default is 0 and " +"uses the wildmat notation, which is how this has traditionally been " +"handled. Setting this to 1 allows you to use B<\\%perl>(1) compatible " +"regular expressions B<\\%pcre>(3). (see also B<\\%perlre>(1) and B<\\" +"%pcrepattern>(3)). You will probably want to update your filter file if you " +"use this regularly. NB: Newsgroup names will always be matched using the " +"wildmat notation." +msgstr "" + +#. type: TP +#: doc/tin.5:2351 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:2363 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:2371 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:2387 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2403 +msgid "" +"Yet another global configuration file with \"I=I\" pairs. " +"This one is for the more general options which usually can't be controlled " +"via I<${TIN_LIBDIR:-NEWSLIBDIR}/tinrc> and/or I<${TIN_HOMEDIR:-\"$HOME\"}/." +"tin/tinrc> like resetting (to override the built-in default) the " +"I." +msgstr "" + +#. type: TP +#: doc/tin.5:2403 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2406 +msgid "Sets a global domain name used in From lines" +msgstr "" + +#. type: Plain text +#: doc/tin.5:2410 +msgid "" +"Defines the name of your organization. $B overrides any " +"specified value." +msgstr "" + +#. type: TP +#: doc/tin.5:2410 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2415 +msgid "" +"Defines the default place for some configuration files, common values are I, I, I or I. " +"$B overrides any specified value." +msgstr "" + +#. type: TP +#: doc/tin.5:2415 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2421 +msgid "" +"Defines the email address to which users can send bug reports using a built-" +"in function. The default points to a developers mailing list located at tin." +"org. You might want to change this address to one of your local " +"administration if you want to deal with your lusers problems on your own." +msgstr "" + +#. type: TP +#: doc/tin.5:2421 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2426 +msgid "Defines the directory containing the B<\\%inews>(1) executable." +msgstr "" + +#. type: Plain text +#: doc/tin.5:2430 +msgid "" +"Default charset to be used in MIME's ''Content-Type:'' header. " +"$B overrides any specified value." +msgstr "" + +#. type: Plain text +#: doc/tin.5:2433 +msgid "" +"Default encoding scheme used in MIME articles. 8bit might be the best value." +msgstr "" + +#. type: Plain text +#: doc/tin.5:2437 +msgid "" +"Default encoding scheme used in MIME letters. quoted-printable is a good " +"choice here." +msgstr "" + +#. type: TP +#: doc/tin.5:2437 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2443 +msgid "" +"Allow unregistered top level domains. As the list of valid TLDs is no longer " +"actively maintained the default was changed to ON starting with B<\\" +"%tin>(1) version 2.1.5" +msgstr "" + +#. type: TP +#: doc/tin.5:2443 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2447 +msgid "" +"Don't generate a ''Sender:'' header. This has an effect only if " +"B is set to --internal." +msgstr "" + +#. type: TP +#: doc/tin.5:2447 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2452 +msgid "" +"Base of your newsspool (Bnews, Cnews and INN traditional spool style), " +"common values are I, I, I. " +"$B overrides any specified value." +msgstr "" + +#. type: TP +#: doc/tin.5:2452 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2460 +msgid "" +"Base of your NOV database B<\\%newsoverview>(5) (tradspool style; might be " +"the same dir as I), common values are I, I, I. $B overrides any " +"specified value." +msgstr "" + +#. type: TP +#: doc/tin.5:2460 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2464 +msgid "" +"Name of a single overview file, common values are I<.overview>, I. $B overrides any specified value." +msgstr "" + +#. type: TP +#: doc/tin.5:2464 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2469 +msgid "" +"Full pathname of your newssystem's overview.fmt file; usually the overview." +"fmt file is in I, so you only have to change this setting if " +"your configuration differs." +msgstr "" + +#. type: TP +#: doc/tin.5:2469 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2475 +msgid "" +"Full pathname of your newssystem's active file; usually the active file " +"resides in I and is named I, so you only have to change " +"this setting if your configuration differs. $B overrides any " +"specified value." +msgstr "" + +#. type: TP +#: doc/tin.5:2475 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2480 +msgid "" +"Full pathname of your newssystem's active.times file; usually the active." +"times file is I, so you only have to change this setting if your " +"configuration differs." +msgstr "" + +#. type: TP +#: doc/tin.5:2480 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2485 +msgid "" +"Full pathname of your newssystem's newsgroups file; usually the newsgroups " +"file is in I, so you only have to change this setting if your " +"configuration differs." +msgstr "" + +#. type: TP +#: doc/tin.5:2485 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2490 +msgid "" +"Full pathname of your newssystem's subscriptions file; usually the " +"subscriptions file is in I, so you only have to change this " +"setting if your configuration differs." +msgstr "" + +#. type: Plain text +#: doc/tin.5:2494 +msgid "I" +msgstr "I" + +#. type: Plain text +#: doc/tin.5:2498 +msgid "" +"translation into language specified in $B, $B or " +"$B" +msgstr "" +"traducido en idiomas especificados dentro de $B, $B o " +"$B" + +#. type: Plain text +#: doc/tin.5:2512 +msgid "" +"This file lists the newsgroups that the local site receives. Each newsgroup " +"should be listed only once. Each line specifies one group; within each " +"newsgroup, articles are assigned unique names, which are monotonically " +"increasing numbers." +msgstr "" + +#. TODO: IIRC tin issues just a warning in that case? +#. type: Plain text +#: doc/tin.5:2517 +msgid "" +"If an article is posted to newsgroups not mentioned in this file, those " +"newsgroups are ignored. If no valid newsgroups are specified, the article " +"is rejected." +msgstr "" + +#. type: Plain text +#: doc/tin.5:2520 +msgid "" +"Each line consists of four space-separated fields \"I I " +"I I\"." +msgstr "" + +#. type: TP +#: doc/tin.5:2520 doc/tin.5:2573 +#, no-wrap +msgid "B" +msgstr "" + +#. type: TP +#: doc/tin.5:2523 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.5:2526 +msgid "is the highest article number that has been used in that newsgroup" +msgstr "" + +#. type: TP +#: doc/tin.5:2526 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.5:2533 +msgid "" +"is the lowest article number in the group; this number is not guaranteed to " +"be accurate, and should only be taken to be a hint. Note that because of " +"article cancellations, there may be gaps in the numbering sequence. If the " +"lowest article number is greater than the highest article number, then there " +"are no articles in the newsgroup." +msgstr "" + +#. type: TP +#: doc/tin.5:2533 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.5:2536 +msgid "can be one of those" +msgstr "" + +#. type: TP +#: doc/tin.5:2537 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2540 +msgid "local postings are allowed" +msgstr "" + +#. type: TP +#: doc/tin.5:2540 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2543 +msgid "no local postings are allowed, only remote ones" +msgstr "" + +#. type: TP +#: doc/tin.5:2543 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2546 +msgid "the group is moderated and all postings must be approved" +msgstr "" + +#. type: TP +#: doc/tin.5:2546 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2549 +msgid "articles in this group are not kept, but only passed on" +msgstr "" + +#. type: TP +#: doc/tin.5:2549 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2552 +msgid "articles cannot be posted to this newsgroup" +msgstr "" + +#. type: TP +#: doc/tin.5:2552 +#, no-wrap +msgid "B<=foo.bar>" +msgstr "B<=foo.bar>" + +#. type: Plain text +#: doc/tin.5:2555 +msgid "articles are locally filed into the ''foo.bar'' group" +msgstr "" + +#. type: TP +#: doc/tin.5:2556 doc/tin.5:2583 doc/tin.5:2606 +#, no-wrap +msgid "B<\\%tin>(1)" +msgstr "B<\\%tin>(1)" + +#. type: Plain text +#: doc/tin.5:2562 +msgid "" +"only tries to read the file if you read directly from the local spool, if " +"you read news via NNTP, B<\\%tin>(1) uses the LIST (B) or LIST " +"COUNTS (B) command instead." +msgstr "" + +#. type: Plain text +#: doc/tin.5:2573 +msgid "" +"This file provides a chronological record of when newsgroups are created. It " +"is normally updated by the local news server (e.g. B<\\%innd>(8)) whenever " +"a new group is created. Each line consist of three space-separated fields " +"\"I I') above." msgstr "" #. type: TP -#: doc/tin.1:792 doc/tin.1:1006 doc/tin.1:1216 +#: doc/tin.1:799 doc/tin.1:1013 doc/tin.1:1223 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:796 doc/tin.1:1010 doc/tin.1:1220 +#: doc/tin.1:803 doc/tin.1:1017 doc/tin.1:1227 msgid "" "Search the body of all articles in group (can be slow). You can abort the " "search using B ('B')." msgstr "" #. type: Plain text -#: doc/tin.1:800 +#: doc/tin.1:807 msgid "" "Mark all articles as read [after confirmation] then return to the group " "selection list. Move cursor to next group." msgstr "" #. type: Plain text -#: doc/tin.1:804 +#: doc/tin.1:811 msgid "" "Mark all articles as read [after confirmation] and enter the next group with " "unread news." msgstr "" #. type: TP -#: doc/tin.1:804 +#: doc/tin.1:811 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:808 doc/tin.1:1022 +#: doc/tin.1:815 doc/tin.1:1029 msgid "" "Cycle the display of the author through all the possible options for the " "tinrc variable B." msgstr "" #. type: TP -#: doc/tin.1:808 +#: doc/tin.1:815 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:813 doc/tin.1:1027 doc/tin.1:1233 +#: doc/tin.1:820 doc/tin.1:1034 doc/tin.1:1240 msgid "" "Cancel (delete) or supersede (overwrite) the current article. It must have " "been posted by the same user. The cancel message can be seen in the " @@ -2026,37 +2032,37 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:816 +#: doc/tin.1:823 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:820 +#: doc/tin.1:827 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:823 +#: doc/tin.1:830 msgid "Toggle article/group limit." msgstr "" #. type: Plain text -#: doc/tin.1:827 +#: doc/tin.1:834 msgid "" "Display the subject of the first article in the current thread in the last " "line." msgstr "" #. type: TP -#: doc/tin.1:830 +#: doc/tin.1:837 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:836 +#: doc/tin.1:843 msgid "" "Mark article/thread as read and move onto the next unread article/thread. If " "a range of articles/threads is set, the range will be marked as read instead " @@ -2065,29 +2071,29 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:836 +#: doc/tin.1:843 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:839 +#: doc/tin.1:846 msgid "Open the thread under the current cursor position." msgstr "" #. type: Plain text -#: doc/tin.1:842 doc/tin.1:1045 doc/tin.1:1267 +#: doc/tin.1:849 doc/tin.1:1052 doc/tin.1:1274 msgid "Look up article by ''Message-ID:''." msgstr "" #. type: TP -#: doc/tin.1:842 +#: doc/tin.1:849 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:847 doc/tin.1:1050 doc/tin.1:1272 +#: doc/tin.1:854 doc/tin.1:1057 doc/tin.1:1279 msgid "" "Mail current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to someone. See the section \"MAILING " @@ -2095,35 +2101,35 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:851 +#: doc/tin.1:858 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:854 +#: doc/tin.1:861 msgid "Go to next group." msgstr "" #. type: TP -#: doc/tin.1:854 +#: doc/tin.1:861 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:857 doc/tin.1:1282 +#: doc/tin.1:864 doc/tin.1:1289 msgid "Go to the next unread article." msgstr "" #. type: TP -#: doc/tin.1:857 doc/tin.1:1050 doc/tin.1:1282 +#: doc/tin.1:864 doc/tin.1:1057 doc/tin.1:1289 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:862 doc/tin.1:1055 doc/tin.1:1287 +#: doc/tin.1:869 doc/tin.1:1062 doc/tin.1:1294 msgid "" "Send current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to printer. See the section \"MAILING " @@ -2131,51 +2137,51 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:862 +#: doc/tin.1:869 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:865 +#: doc/tin.1:872 msgid "Go to previous group." msgstr "" #. type: TP -#: doc/tin.1:865 +#: doc/tin.1:872 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:868 +#: doc/tin.1:875 msgid "Go to previous unread article." msgstr "" #. type: Plain text -#: doc/tin.1:871 doc/tin.1:1058 +#: doc/tin.1:878 doc/tin.1:1065 msgid "Return to previous level." msgstr "" #. type: TP -#: doc/tin.1:874 +#: doc/tin.1:881 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:877 +#: doc/tin.1:884 msgid "Toggle the display between all articles and unread articles." msgstr "" #. type: TP -#: doc/tin.1:881 +#: doc/tin.1:888 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:886 doc/tin.1:1070 doc/tin.1:1312 +#: doc/tin.1:893 doc/tin.1:1077 doc/tin.1:1319 msgid "" "Save current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles. See the section \"MAILING PIPING " @@ -2183,24 +2189,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:886 +#: doc/tin.1:893 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:889 doc/tin.1:1073 doc/tin.1:1315 +#: doc/tin.1:896 doc/tin.1:1080 doc/tin.1:1322 msgid "Save marked articles automatically without further prompting." msgstr "" #. type: TP -#: doc/tin.1:889 +#: doc/tin.1:896 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:894 +#: doc/tin.1:901 msgid "" "Toggle tag-status of current article / thread for B ('B') / " "B ('B<|>') / B ('B') / B ('B') / " @@ -2208,24 +2214,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:894 +#: doc/tin.1:901 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:897 +#: doc/tin.1:904 msgid "Automatically tag in order all the parts of the current multi-part message." msgstr "" #. type: TP -#: doc/tin.1:897 +#: doc/tin.1:904 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:902 +#: doc/tin.1:909 msgid "" "Cycle the threading mode through no threading, threading by subject, " "threading by references, threading on both subject and references, group " @@ -2233,18 +2239,18 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:902 +#: doc/tin.1:909 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:905 +#: doc/tin.1:912 msgid "Untag all articles that were tagged." msgstr "" #. type: Plain text -#: doc/tin.1:912 doc/tin.1:1087 doc/tin.1:1340 +#: doc/tin.1:919 doc/tin.1:1094 doc/tin.1:1347 msgid "" "Post an article to the current group. If posting fails for some reason, " "you'll get the chance to edit the article again via B ('B'), " @@ -2253,13 +2259,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:912 +#: doc/tin.1:919 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:918 doc/tin.1:1346 +#: doc/tin.1:925 doc/tin.1:1353 msgid "" "Repost an already posted article / thread / auto-selected (hot) articles / " "articles matching pattern / tagged articles to another newsgroup(s). Useful " @@ -2268,13 +2274,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:918 +#: doc/tin.1:925 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:926 +#: doc/tin.1:933 msgid "" "Mark all unread articles that have not been selected as read, redraw screen " "to reflect changes and put index at the first thread to begin reading. " @@ -2285,25 +2291,25 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:926 doc/tin.1:1087 doc/tin.1:1346 +#: doc/tin.1:933 doc/tin.1:1094 doc/tin.1:1353 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:929 +#: doc/tin.1:936 msgid "Mark current article as unread." msgstr "" #. type: TP -#: doc/tin.1:929 doc/tin.1:1092 doc/tin.1:1349 +#: doc/tin.1:936 doc/tin.1:1099 doc/tin.1:1356 #, no-wrap msgid "B" msgstr "" #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:936 +#: doc/tin.1:943 msgid "" "Mark current thread as unread. If a range of threads is set, the range will " "be marked as unread instead of the current thread. When tagged threads are " @@ -2311,79 +2317,79 @@ msgid "" msgstr "" #. type: SS -#: doc/tin.1:936 +#: doc/tin.1:943 #, no-wrap msgid "THREAD LISTING COMMANDS" msgstr "" #. type: Plain text -#: doc/tin.1:941 +#: doc/tin.1:948 msgid "Select article 4 within thread." msgstr "" #. type: TP -#: doc/tin.1:975 +#: doc/tin.1:982 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:978 +#: doc/tin.1:985 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:981 +#: doc/tin.1:988 msgid "Toggle selection of current article." msgstr "" #. type: TP -#: doc/tin.1:981 +#: doc/tin.1:988 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:984 +#: doc/tin.1:991 msgid "Reverse article selections." msgstr "" #. type: TP -#: doc/tin.1:984 +#: doc/tin.1:991 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:987 +#: doc/tin.1:994 msgid "Undo all selections on current thread." msgstr "" #. type: TP -#: doc/tin.1:992 +#: doc/tin.1:999 #, no-wrap msgid "BCRE'>" msgstr "" #. type: Plain text -#: doc/tin.1:995 +#: doc/tin.1:1002 msgid "Read current article within thread." msgstr "" #. type: TP -#: doc/tin.1:995 +#: doc/tin.1:1002 #, no-wrap msgid "BTABE'>" msgstr "" #. type: Plain text -#: doc/tin.1:998 +#: doc/tin.1:1005 msgid "View next unread article within thread." msgstr "" #. type: Plain text -#: doc/tin.1:1003 +#: doc/tin.1:1010 msgid "" "Author forward search. This searches for articles with a specific ''From:'' " "line. The search will wrap over into the next thread if nothing is found in " @@ -2391,44 +2397,44 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1014 +#: doc/tin.1:1021 msgid "" "Mark thread as read [after confirmation] and return to the group index " "page. Move cursor to next thread." msgstr "" #. type: Plain text -#: doc/tin.1:1018 +#: doc/tin.1:1025 msgid "" "Mark thread as read [after confirmation] and enter the next thread " "containing unread news." msgstr "" #. type: TP -#: doc/tin.1:1018 +#: doc/tin.1:1025 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:1022 +#: doc/tin.1:1029 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1033 doc/tin.1:1255 +#: doc/tin.1:1040 doc/tin.1:1262 msgid "Display the subject of the current article in the last line." msgstr "" #. type: TP -#: doc/tin.1:1036 +#: doc/tin.1:1043 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1042 +#: doc/tin.1:1049 msgid "" "Mark article as read and move onto the next unread article. If a range of " "articles is set, the range will be marked as read instead of the current " @@ -2436,49 +2442,49 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1045 +#: doc/tin.1:1052 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:1065 +#: doc/tin.1:1072 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:1070 +#: doc/tin.1:1077 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:1073 +#: doc/tin.1:1080 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1077 doc/tin.1:1319 +#: doc/tin.1:1084 doc/tin.1:1326 msgid "" "Toggle tag status of current article for mailing, piping, printing, saving " "or reposting." msgstr "" #. type: TP -#: doc/tin.1:1077 +#: doc/tin.1:1084 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1080 +#: doc/tin.1:1087 msgid "Untag all tagged threads." msgstr "" #. type: Plain text -#: doc/tin.1:1092 +#: doc/tin.1:1099 msgid "" "Mark current article in thread as unread. If a range of articles is set, the " "range will be marked as unread instead of the current article. When tagged " @@ -2487,143 +2493,143 @@ msgstr "" #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:1097 +#: doc/tin.1:1104 msgid "Mark all articles in thread as unread." msgstr "" #. type: SS -#: doc/tin.1:1097 +#: doc/tin.1:1104 #, no-wrap msgid "ARTICLE VIEWER COMMANDS" msgstr "" #. type: Plain text -#: doc/tin.1:1102 +#: doc/tin.1:1109 msgid "Read the first (base) article in this thread." msgstr "" #. type: Plain text -#: doc/tin.1:1105 +#: doc/tin.1:1112 msgid "Read response 4 in this thread." msgstr "" #. type: TP -#: doc/tin.1:1109 +#: doc/tin.1:1116 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1113 +#: doc/tin.1:1120 msgid "" "Reply through mail to the author of the current article with a copy of the " "article with all headers included." msgstr "" #. type: TP -#: doc/tin.1:1113 +#: doc/tin.1:1120 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1118 +#: doc/tin.1:1125 msgid "Perform B<\\%pgp>(1) operations on article." msgstr "" #. type: TP -#: doc/tin.1:1118 +#: doc/tin.1:1125 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1121 +#: doc/tin.1:1128 msgid "Toggles the display mode (raw including all headers vs. cooked)." msgstr "" #. type: TP -#: doc/tin.1:1125 +#: doc/tin.1:1132 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1128 +#: doc/tin.1:1135 msgid "Toggle the TAB width between 4 and 8 characters." msgstr "" #. type: TP -#: doc/tin.1:1128 +#: doc/tin.1:1135 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1132 +#: doc/tin.1:1139 msgid "" "Post a followup to the current article with a copy of the article with all " "headers included." msgstr "" #. type: TP -#: doc/tin.1:1132 +#: doc/tin.1:1139 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1136 +#: doc/tin.1:1143 msgid "" "Toggle TeX to ISO decoding for current article. The default behavior is " "taken from the B variable in the tinrc file." msgstr "" #. type: TP -#: doc/tin.1:1136 +#: doc/tin.1:1143 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1139 +#: doc/tin.1:1146 msgid "" "Toggles the display of all headers vs. headers in " "B." msgstr "" #. type: TP -#: doc/tin.1:1139 +#: doc/tin.1:1146 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1142 +#: doc/tin.1:1149 msgid "Toggle ROT-13 decoding for this article." msgstr "" #. type: TP -#: doc/tin.1:1142 +#: doc/tin.1:1149 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1146 +#: doc/tin.1:1153 msgid "" "Toggle the display of uuencoded sections. The default behavior is taken from " "the B variable in the tinrc file." msgstr "" #. type: TP -#: doc/tin.1:1146 +#: doc/tin.1:1153 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1153 +#: doc/tin.1:1160 msgid "" "The formfeed character (^L) is often used to hide 'spoilers' that the reader " "may not initially wish to see when viewing an article. Any text after a " @@ -2633,23 +2639,23 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1162 +#: doc/tin.1:1169 msgid "Forward search the text of this article." msgstr "" #. type: Plain text -#: doc/tin.1:1165 +#: doc/tin.1:1172 msgid "Backward search the text of this article." msgstr "" #. type: TP -#: doc/tin.1:1165 +#: doc/tin.1:1172 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1170 +#: doc/tin.1:1177 msgid "" "Skip to the end of the next quoted text-block in this article. Quoted text " "is everything which matches B, B or " @@ -2657,40 +2663,40 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1170 +#: doc/tin.1:1177 #, no-wrap msgid "B'>" msgstr "" #. type: Plain text -#: doc/tin.1:1173 +#: doc/tin.1:1180 msgid "Go to the first article in the current thread." msgstr "" #. type: TP -#: doc/tin.1:1173 +#: doc/tin.1:1180 #, no-wrap msgid "B'>" msgstr "" #. type: Plain text -#: doc/tin.1:1176 +#: doc/tin.1:1183 msgid "Go to the last article in the current thread." msgstr "" #. type: TP -#: doc/tin.1:1176 +#: doc/tin.1:1183 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1179 +#: doc/tin.1:1186 msgid "Toggle word highlighting on/off." msgstr "" #. type: Plain text -#: doc/tin.1:1193 +#: doc/tin.1:1200 msgid "" "Auto select article(s) with a single key. The defaults used for selection " "are set based upon the following four tinrc config variables: " @@ -2702,7 +2708,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1202 +#: doc/tin.1:1209 msgid "" "Kill article(s) with a single key. The defaults used for killing are based " "upon the following four tinrc config variables: B, " @@ -2713,24 +2719,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1202 +#: doc/tin.1:1209 #, no-wrap msgid "BCRE'>" msgstr "" #. type: Plain text -#: doc/tin.1:1205 +#: doc/tin.1:1212 msgid "Go to next base article." msgstr "" #. type: TP -#: doc/tin.1:1205 +#: doc/tin.1:1212 #, no-wrap msgid "BTABE'>" msgstr "" #. type: Plain text -#: doc/tin.1:1210 +#: doc/tin.1:1217 msgid "" "Go to next unread article. If the tinrc variable B doesn't " "contain PageNextUnread, then this key will first page through the current " @@ -2738,281 +2744,281 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1213 +#: doc/tin.1:1220 msgid "Author forward search." msgstr "" #. type: Plain text -#: doc/tin.1:1216 +#: doc/tin.1:1223 msgid "Author backward search." msgstr "" #. type: Plain text -#: doc/tin.1:1224 +#: doc/tin.1:1231 msgid "" "Mark the current thread as read [after confirmation] and return to the " "previous menu. Move cursor to next item." msgstr "" #. type: Plain text -#: doc/tin.1:1228 +#: doc/tin.1:1235 msgid "" "Mark the rest of the current thread as read [after confirmation] and enter " "the next thread with unread articles." msgstr "" #. type: TP -#: doc/tin.1:1228 +#: doc/tin.1:1235 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:1233 +#: doc/tin.1:1240 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1236 +#: doc/tin.1:1243 msgid "Edit the current article. This is restricted to mailgroups and saved news." msgstr "" #. type: TP -#: doc/tin.1:1239 +#: doc/tin.1:1246 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1242 +#: doc/tin.1:1249 msgid "Post a followup to the current article with a copy of the article included." msgstr "" #. type: TP -#: doc/tin.1:1242 +#: doc/tin.1:1249 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1246 +#: doc/tin.1:1253 msgid "" "Post a followup to the current article without including a copy of the " "article." msgstr "" #. type: TP -#: doc/tin.1:1246 +#: doc/tin.1:1253 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1249 +#: doc/tin.1:1256 msgid "Go to the start of the article." msgstr "" #. type: TP -#: doc/tin.1:1249 +#: doc/tin.1:1256 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1252 +#: doc/tin.1:1259 msgid "Go to the end of the article." msgstr "" #. type: TP -#: doc/tin.1:1258 +#: doc/tin.1:1265 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1261 +#: doc/tin.1:1268 msgid "Mark rest of thread as read and move onto the next unread thread." msgstr "" #. type: TP -#: doc/tin.1:1261 +#: doc/tin.1:1268 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1264 +#: doc/tin.1:1271 msgid "Show the thread menu that the current article is a part of." msgstr "" #. type: TP -#: doc/tin.1:1267 +#: doc/tin.1:1274 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:1276 +#: doc/tin.1:1283 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1279 +#: doc/tin.1:1286 msgid "Go to the next article." msgstr "" #. type: TP -#: doc/tin.1:1279 +#: doc/tin.1:1286 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:1287 +#: doc/tin.1:1294 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1290 +#: doc/tin.1:1297 msgid "Go to the previous article." msgstr "" #. type: TP -#: doc/tin.1:1290 +#: doc/tin.1:1297 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1293 +#: doc/tin.1:1300 msgid "Go to the previous unread article." msgstr "" #. type: Plain text -#: doc/tin.1:1296 +#: doc/tin.1:1303 msgid "Return to the previous level." msgstr "" #. type: TP -#: doc/tin.1:1299 +#: doc/tin.1:1306 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1303 +#: doc/tin.1:1310 msgid "" "Reply through mail to the author of the current article with a copy of the " "article included." msgstr "" #. type: TP -#: doc/tin.1:1303 +#: doc/tin.1:1310 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1307 +#: doc/tin.1:1314 msgid "" "Reply through mail to the author of the current article without including " "the original article." msgstr "" #. type: TP -#: doc/tin.1:1307 +#: doc/tin.1:1314 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:1312 +#: doc/tin.1:1319 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:1315 +#: doc/tin.1:1322 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:1319 +#: doc/tin.1:1326 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1322 +#: doc/tin.1:1329 msgid "Return to group selection level." msgstr "" #. type: TP -#: doc/tin.1:1322 +#: doc/tin.1:1329 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1325 +#: doc/tin.1:1332 msgid "Go to parent article." msgstr "" #. type: TP -#: doc/tin.1:1325 +#: doc/tin.1:1332 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1329 +#: doc/tin.1:1336 msgid "" "Display a list of URLs in the current article. See the section \"URL " "LISTING\" for more information." msgstr "" #. type: TP -#: doc/tin.1:1329 +#: doc/tin.1:1336 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1333 +#: doc/tin.1:1340 msgid "" "Display a list of attachments of the current article. See the section " "\"ATTACHMENT LISTING\" for more information." msgstr "" #. type: TP -#: doc/tin.1:1340 +#: doc/tin.1:1347 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1349 +#: doc/tin.1:1356 msgid "Mark article as unread." msgstr "" #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:1354 +#: doc/tin.1:1361 msgid "Mark the current thread as unread." msgstr "" #. type: SS -#: doc/tin.1:1354 +#: doc/tin.1:1361 #, no-wrap msgid "URL LISTING" msgstr "" #. type: Plain text -#: doc/tin.1:1357 +#: doc/tin.1:1364 msgid "" "B ('B') displays a list of URLs in the current " "article. Besides the common moving keys, the following commands are " @@ -3020,52 +3026,52 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1358 +#: doc/tin.1:1365 #, no-wrap msgid "BCRE'>" msgstr "" #. type: Plain text -#: doc/tin.1:1362 +#: doc/tin.1:1369 msgid "" "The current URL will be prompted and opened using the " "B. 'BESCE>' or no input will skip the URL." msgstr "" #. type: Plain text -#: doc/tin.1:1365 +#: doc/tin.1:1372 msgid "URL forward search." msgstr "" #. type: Plain text -#: doc/tin.1:1368 +#: doc/tin.1:1375 msgid "URL backward search." msgstr "" #. type: Plain text -#: doc/tin.1:1374 doc/tin.1:1427 +#: doc/tin.1:1381 doc/tin.1:1434 msgid "Shell escape." msgstr "" #. type: Plain text -#: doc/tin.1:1377 +#: doc/tin.1:1384 msgid "Toggle the display of the current URL in the last line." msgstr "" #. type: Plain text -#: doc/tin.1:1380 doc/tin.1:1434 +#: doc/tin.1:1387 doc/tin.1:1441 msgid "Help screen of commands available." msgstr "" #. -------------------------------------------------------------------- #. type: SS -#: doc/tin.1:1386 +#: doc/tin.1:1393 #, no-wrap msgid "ATTACHMENT LISTING" msgstr "" #. type: Plain text -#: doc/tin.1:1389 +#: doc/tin.1:1396 msgid "" "B ('B') displays a list of attachments of the current " "article. Besides the common moving keys, the following commands are " @@ -3073,107 +3079,107 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1390 +#: doc/tin.1:1397 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1393 +#: doc/tin.1:1400 msgid "Pipe attachment into command." msgstr "" #. type: TP -#: doc/tin.1:1393 +#: doc/tin.1:1400 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1396 +#: doc/tin.1:1403 msgid "Save current attachment / tagged attachments to disk." msgstr "" #. type: TP -#: doc/tin.1:1396 +#: doc/tin.1:1403 #, no-wrap msgid "BCRE'>" msgstr "" #. type: Plain text -#: doc/tin.1:1399 +#: doc/tin.1:1406 msgid "View attachment." msgstr "" #. type: TP -#: doc/tin.1:1399 +#: doc/tin.1:1406 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1402 +#: doc/tin.1:1409 msgid "Tag one or more attachments for saving." msgstr "" #. type: TP -#: doc/tin.1:1402 +#: doc/tin.1:1409 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1409 +#: doc/tin.1:1416 msgid "Reverse tagging of all attachments." msgstr "" #. type: TP -#: doc/tin.1:1409 +#: doc/tin.1:1416 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1412 +#: doc/tin.1:1419 msgid "Untag all tagged attachments." msgstr "" #. type: Plain text -#: doc/tin.1:1415 +#: doc/tin.1:1422 msgid "Attachment forward search." msgstr "" #. type: Plain text -#: doc/tin.1:1418 +#: doc/tin.1:1425 msgid "Attachment backward search." msgstr "" #. type: TP -#: doc/tin.1:1421 +#: doc/tin.1:1428 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1424 +#: doc/tin.1:1431 msgid "Pipe attachment into command. Uses the raw attachment, no decoding is done." msgstr "" #. type: Plain text -#: doc/tin.1:1431 +#: doc/tin.1:1438 msgid "" "Toggle the display of the name/description of the current attachment in the " "last line." @@ -3181,7 +3187,7 @@ msgstr "" #. -------------------------------------------------------------------- #. type: SS -#: doc/tin.1:1440 +#: doc/tin.1:1447 #, no-wrap msgid "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" msgstr "" @@ -3190,7 +3196,7 @@ msgstr "" #. - \fI${TIN_LIBDIR:\-NEWSLIBDIR}/tinrc\fR is used #. in the !TIN_DEFAULTS_DIR config case #. type: Plain text -#: doc/tin.1:1452 +#: doc/tin.1:1459 msgid "" "At startup, B reads in the configuration files (see also " "B<\\%tin>(5)). They contain a list of variables that can be used to " @@ -3202,7 +3208,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1460 +#: doc/tin.1:1467 msgid "" "The variables are user configurable by editing " "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/tinrc> directly. Most of them can also be " @@ -3214,7 +3220,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1466 +#: doc/tin.1:1473 msgid "" "In the options menu use the cursor keys in the usual way to move around. Use " "B ('B<^J>' or 'BCRE>') to 'open' the option you wish " @@ -3224,7 +3230,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1473 +#: doc/tin.1:1480 msgid "" "As with the other menus, B ('B<^L>') will redraw the screen. You " "can use B ('B'), B ('B') and B " @@ -3234,7 +3240,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1478 +#: doc/tin.1:1485 msgid "" "The options menu provides access to the attributes menu for the current " "group by the B ('BTABE>') command. Pressing " @@ -3243,14 +3249,14 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1481 +#: doc/tin.1:1488 msgid "" "The B ('B') command brings up the scopes menu. For more " "information see section \"SCOPES MENU\"." msgstr "" #. type: Plain text -#: doc/tin.1:1485 +#: doc/tin.1:1492 msgid "" "Here is a full list of all the available variables. The name in braces is " "the name of the corresponding setting in " @@ -3258,13 +3264,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1485 +#: doc/tin.1:1492 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1491 doc/tin.5:1199 +#: doc/tin.1:1498 doc/tin.5:1203 msgid "" "If ON abbreviate long newsgroup names at group selection level and article " "level (if necessary) like this: news.software.readers -E " @@ -3272,159 +3278,159 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1491 +#: doc/tin.1:1498 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1495 doc/tin.5:1203 +#: doc/tin.1:1502 doc/tin.5:1207 msgid "" "If ON add posted articles which start a new thread to filter for " "highlighting follow-ups. Default is ON." msgstr "" #. type: TP -#: doc/tin.1:1495 +#: doc/tin.1:1502 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1498 doc/tin.5:1206 +#: doc/tin.1:1505 doc/tin.5:1210 msgid "Turn ON advertising in header (''User-Agent:''). Default is ON." msgstr "" #. type: TP -#: doc/tin.1:1498 +#: doc/tin.1:1505 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1501 doc/tin.5:1209 +#: doc/tin.1:1508 doc/tin.5:1213 msgid "If ON strip multipart/alternative messages automatically. Default is ON." msgstr "" #. type: TP -#: doc/tin.1:1501 +#: doc/tin.1:1508 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1504 doc/tin.5:1212 +#: doc/tin.1:1511 doc/tin.5:1216 msgid "The character used to show that an article was deleted. Default is 'D'." msgstr "" #. type: TP -#: doc/tin.1:1504 +#: doc/tin.1:1511 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1507 doc/tin.5:1215 +#: doc/tin.1:1514 doc/tin.5:1219 msgid "The character used to show that an article is in a range. Default is '#'." msgstr "" #. type: TP -#: doc/tin.1:1507 +#: doc/tin.1:1514 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1511 doc/tin.5:1219 +#: doc/tin.1:1518 doc/tin.5:1223 msgid "" "The character used to show that an article will return as an unread article " "when the group is next entered. Default is '-'." msgstr "" #. type: TP -#: doc/tin.1:1511 +#: doc/tin.1:1518 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1515 doc/tin.5:1223 +#: doc/tin.1:1522 doc/tin.5:1227 msgid "" "The character used to show that an article/thread is auto-selected (hot). " "Default is '*'." msgstr "" #. type: TP -#: doc/tin.1:1515 +#: doc/tin.1:1522 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1519 doc/tin.5:1227 +#: doc/tin.1:1526 doc/tin.5:1231 msgid "" "The character used to show that an article/thread is recent (not older than " "X days). See also B. Default is 'o'." msgstr "" #. type: TP -#: doc/tin.1:1519 +#: doc/tin.1:1526 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1523 doc/tin.5:1231 +#: doc/tin.1:1530 doc/tin.5:1235 msgid "" "The character used to show that an article has not been read. Default is " "'+'." msgstr "" #. type: TP -#: doc/tin.1:1523 +#: doc/tin.1:1530 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1526 doc/tin.5:1234 +#: doc/tin.1:1533 doc/tin.5:1238 msgid "The character used to show that an article was read. Default is ' '." msgstr "" #. type: TP -#: doc/tin.1:1526 +#: doc/tin.1:1533 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1530 doc/tin.5:1238 +#: doc/tin.1:1537 doc/tin.5:1242 msgid "" "The character used to show that an article was killed. Default is 'K'. " "B must be set accordingly." msgstr "" #. type: TP -#: doc/tin.1:1530 +#: doc/tin.1:1537 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1534 doc/tin.5:1242 +#: doc/tin.1:1541 doc/tin.5:1246 msgid "" "The character used to show that an article was hot before it was read. " "Default is ':'. B must be set accordingly." msgstr "" #. type: TP -#: doc/tin.1:1534 doc/tin.5:1242 +#: doc/tin.1:1541 doc/tin.5:1246 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1539 +#: doc/tin.1:1546 msgid "" "If ON B will ask before using a MIME viewer (B) to " "display MIME messages. This only occurs if a MIME viewer is set. Default is " @@ -3432,50 +3438,50 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1539 +#: doc/tin.1:1546 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1543 doc/tin.5:1253 +#: doc/tin.1:1550 doc/tin.5:1257 msgid "" "Automatically put your name in the ''Cc:'' and/or ''Bcc:'' field when " "mailing an article. Default is No." msgstr "" #. type: TP -#: doc/tin.1:1543 +#: doc/tin.1:1550 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1547 doc/tin.5:1257 +#: doc/tin.1:1554 doc/tin.5:1261 msgid "" "If ON automatically list thread when entering it using right arrow key. " "Default is ON." msgstr "" #. type: TP -#: doc/tin.1:1547 +#: doc/tin.1:1554 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1550 doc/tin.1:2531 +#: doc/tin.1:1557 doc/tin.1:2540 msgid "Default is OFF." msgstr "" #. type: TP -#: doc/tin.1:1550 +#: doc/tin.1:1557 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1556 doc/tin.5:1266 +#: doc/tin.1:1563 doc/tin.5:1270 msgid "" "If ON articles/threads with ''Archive-name:'' in header will be " "automatically saved with the Archive-name & part/patch no and post processed " @@ -3484,13 +3490,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1556 +#: doc/tin.1:1563 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1561 doc/tin.5:1271 +#: doc/tin.1:1568 doc/tin.5:1275 msgid "" "If set ON articles/threads will be saved in batch mode when save " "\\&''B<-S>'' or mail ''B<-M>, B<-N>'' is specified on the command " @@ -3498,13 +3504,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1561 +#: doc/tin.1:1568 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1566 doc/tin.5:1276 +#: doc/tin.1:1573 doc/tin.5:1280 msgid "" "If set ON a mini menu of the most useful commands will be displayed at the " "bottom of the screen for each level. Also a short posting etiquette will be " @@ -3512,13 +3518,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1566 +#: doc/tin.1:1573 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1571 +#: doc/tin.1:1578 msgid "" "If ON, create local copies of NNTP overview files. This can be used to " "considerably speed up accessing large groups when using a slow connection. " @@ -3526,13 +3532,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1571 +#: doc/tin.1:1578 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1577 doc/tin.5:1287 +#: doc/tin.1:1584 doc/tin.5:1291 msgid "" "Use this hash algorithm for cancel-locks. Only available when build with " "cancel-lock support. none disables the generation of cancel-locks. Valid " @@ -3540,312 +3546,312 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1577 +#: doc/tin.1:1584 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1583 doc/tin.5:1291 +#: doc/tin.1:1590 doc/tin.5:1295 msgid "" "If set ON the user is asked when quitting if all groups read during the " "current session should be marked read. Default is OFF." msgstr "" #. type: TP -#: doc/tin.1:1583 +#: doc/tin.1:1590 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1586 doc/tin.5:1294 +#: doc/tin.1:1593 doc/tin.5:1298 msgid "Standard background color" msgstr "" #. type: TP -#: doc/tin.1:1586 +#: doc/tin.1:1593 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1589 doc/tin.5:1297 +#: doc/tin.1:1596 doc/tin.5:1301 msgid "Color of quoted text from external sources" msgstr "" #. type: TP -#: doc/tin.1:1589 +#: doc/tin.1:1596 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1592 doc/tin.5:1300 +#: doc/tin.1:1599 doc/tin.5:1304 msgid "Color of sender (From:)" msgstr "" #. type: TP -#: doc/tin.1:1592 +#: doc/tin.1:1599 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1595 doc/tin.5:1303 +#: doc/tin.1:1602 doc/tin.5:1307 msgid "Color of header-lines" msgstr "" #. type: TP -#: doc/tin.1:1595 +#: doc/tin.1:1602 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1598 doc/tin.5:1306 +#: doc/tin.1:1605 doc/tin.5:1310 msgid "Color of help pages" msgstr "" #. type: TP -#: doc/tin.1:1598 +#: doc/tin.1:1605 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1601 doc/tin.5:1309 +#: doc/tin.1:1608 doc/tin.5:1313 msgid "Color of background for inverse text" msgstr "" #. type: TP -#: doc/tin.1:1601 +#: doc/tin.1:1608 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1604 doc/tin.5:1312 +#: doc/tin.1:1611 doc/tin.5:1316 msgid "Color of foreground for inverse text" msgstr "" #. type: TP -#: doc/tin.1:1604 +#: doc/tin.1:1611 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1608 doc/tin.5:1316 +#: doc/tin.1:1615 doc/tin.5:1320 msgid "" "Color of words emphasized like _this_. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1608 +#: doc/tin.1:1615 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1612 doc/tin.5:1320 +#: doc/tin.1:1619 doc/tin.5:1324 msgid "" "Color of words emphasized like /this/. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1612 +#: doc/tin.1:1619 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1616 doc/tin.5:1324 +#: doc/tin.1:1623 doc/tin.5:1328 msgid "" "Color of words emphasized like *this*. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1616 +#: doc/tin.1:1623 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1620 doc/tin.5:1328 +#: doc/tin.1:1627 doc/tin.5:1332 msgid "" "Color of words emphasized like -this-. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1620 +#: doc/tin.1:1627 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1623 doc/tin.5:1331 +#: doc/tin.1:1630 doc/tin.5:1335 msgid "Color of mini help menu" msgstr "" #. type: TP -#: doc/tin.1:1623 +#: doc/tin.1:1630 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1626 doc/tin.5:1334 +#: doc/tin.1:1633 doc/tin.5:1338 msgid "Color of actual news header fields" msgstr "" #. type: TP -#: doc/tin.1:1626 +#: doc/tin.1:1633 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1629 doc/tin.5:1337 +#: doc/tin.1:1636 doc/tin.5:1341 msgid "Standard foreground color" msgstr "" #. type: TP -#: doc/tin.1:1629 +#: doc/tin.1:1636 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1632 doc/tin.5:1340 +#: doc/tin.1:1639 doc/tin.5:1344 msgid "Color of quoted lines" msgstr "" #. type: TP -#: doc/tin.1:1632 +#: doc/tin.1:1639 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1635 doc/tin.5:1343 +#: doc/tin.1:1642 doc/tin.5:1347 msgid "Color of twice quoted lines" msgstr "" #. type: TP -#: doc/tin.1:1635 +#: doc/tin.1:1642 #, no-wrap msgid "B3 times quoted line (col_quote3)>" msgstr "" #. type: Plain text -#: doc/tin.1:1638 doc/tin.5:1346 +#: doc/tin.1:1645 doc/tin.5:1350 msgid "Color of E=3 times quoted lines" msgstr "" #. type: TP -#: doc/tin.1:1638 +#: doc/tin.1:1645 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1642 doc/tin.5:1350 +#: doc/tin.1:1649 doc/tin.5:1354 msgid "" "Color of response counter. This is the text that says \"Response x of y\" in " "the article viewer." msgstr "" #. type: TP -#: doc/tin.1:1642 +#: doc/tin.1:1649 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1645 doc/tin.5:1353 +#: doc/tin.1:1652 doc/tin.5:1357 msgid "Color of signatures" msgstr "" #. type: TP -#: doc/tin.1:1645 +#: doc/tin.1:1652 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1648 doc/tin.5:1356 +#: doc/tin.1:1655 doc/tin.5:1360 msgid "Color of urls highlight" msgstr "" #. type: TP -#: doc/tin.1:1648 +#: doc/tin.1:1655 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1651 doc/tin.5:1359 +#: doc/tin.1:1658 doc/tin.5:1363 msgid "Color of verbatim blocks" msgstr "" #. type: TP -#: doc/tin.1:1651 +#: doc/tin.1:1658 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1654 doc/tin.5:1362 +#: doc/tin.1:1661 doc/tin.5:1366 msgid "Color of article subject" msgstr "" #. type: TP -#: doc/tin.1:1654 +#: doc/tin.1:1661 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1657 doc/tin.5:1365 +#: doc/tin.1:1664 doc/tin.5:1369 msgid "Color of text-lines" msgstr "" #. type: TP -#: doc/tin.1:1657 +#: doc/tin.1:1664 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1660 doc/tin.5:1368 +#: doc/tin.1:1667 doc/tin.5:1372 msgid "Color of help/mail sign" msgstr "" #. type: TP -#: doc/tin.1:1660 +#: doc/tin.1:1667 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1663 +#: doc/tin.1:1670 msgid "Ask for manual confirmation to protect the user." msgstr "" #. type: IP -#: doc/tin.1:1664 doc/tin.1:1670 doc/tin.1:1674 +#: doc/tin.1:1671 doc/tin.1:1677 doc/tin.1:1681 #, no-wrap msgid "\\(bu" msgstr "" #. TODO: check if all affected commands are marked [after confirmation] #. type: Plain text -#: doc/tin.1:1670 +#: doc/tin.1:1677 msgid "" "B Ask for confirmation before executing certain dangerous commands " "(e.g., B ('B')). Commands that this affects are marked in this " @@ -3853,21 +3859,21 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1674 +#: doc/tin.1:1681 msgid "" "B You'll be asked to confirm that you wish to exit B when you use " "the B ('B') command." msgstr "" #. type: Plain text -#: doc/tin.1:1678 +#: doc/tin.1:1685 msgid "" "B: Ask for confirmation before marking all not selected (with " "B ('B') command) articles as read." msgstr "" #. type: Plain text -#: doc/tin.5:1389 +#: doc/tin.5:1393 msgid "Default is commands & quit." msgstr "" #. type: Plain text -#: doc/tin.5:1400 +#: doc/tin.5:1404 msgid "" "Format string used for date representation. A description of the different " "format options can be found at B<\\%strftime>(3). B<\\%tin>(1) uses " @@ -10889,55 +10914,55 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1400 +#: doc/tin.5:1404 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1402 +#: doc/tin.5:1406 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1404 +#: doc/tin.5:1408 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1407 +#: doc/tin.5:1411 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1410 +#: doc/tin.5:1414 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1414 +#: doc/tin.5:1418 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1419 +#: doc/tin.5:1423 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1423 +#: doc/tin.5:1427 #, no-wrap msgid "B" msgstr "" #. type: ta -#: doc/tin.5:1428 doc/tin.5:1457 +#: doc/tin.5:1432 doc/tin.5:1461 #, no-wrap msgid "" "\\w'0,1 'u +\\w'\\'\\'Message-ID:\\'\\' & last \\'\\'References:\\'\\' " @@ -10945,7 +10970,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1437 doc/tin.5:1466 +#: doc/tin.5:1441 doc/tin.5:1470 #, no-wrap msgid "" "0\t''Subject:'' (case sensitive)\n" @@ -10959,139 +10984,139 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1439 +#: doc/tin.5:1443 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1443 +#: doc/tin.5:1447 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1448 +#: doc/tin.5:1452 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1452 +#: doc/tin.5:1456 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1468 +#: doc/tin.5:1472 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1470 +#: doc/tin.5:1474 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1472 +#: doc/tin.5:1476 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1474 +#: doc/tin.5:1478 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1476 +#: doc/tin.5:1480 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1478 +#: doc/tin.5:1482 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1480 +#: doc/tin.5:1484 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1482 +#: doc/tin.5:1486 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1484 +#: doc/tin.5:1488 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1486 +#: doc/tin.5:1490 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1488 +#: doc/tin.5:1492 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1490 +#: doc/tin.5:1494 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1492 +#: doc/tin.5:1496 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1494 +#: doc/tin.5:1498 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1496 +#: doc/tin.5:1500 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1498 +#: doc/tin.5:1502 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1500 +#: doc/tin.5:1504 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1502 +#: doc/tin.5:1506 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1511 +#: doc/tin.5:1515 msgid "" "The format string used to create the editor start command with parameters. " "Default is '%E +%N %F' with %E=Editor, %N=Linenumber and %F=Filename (e.g., " @@ -11099,13 +11124,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1514 +#: doc/tin.5:1518 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1521 +#: doc/tin.5:1525 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, " @@ -11113,19 +11138,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1521 +#: doc/tin.5:1525 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1525 +#: doc/tin.5:1529 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1532 +#: doc/tin.5:1536 msgid "" "If B is E 0 not more than the last B " "articles/group are fetched from the server. If B is E 0 " @@ -11134,13 +11159,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1532 +#: doc/tin.5:1536 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1546 +#: doc/tin.5:1550 msgid "" "Which keys B<%tin>(1) should accept to jump to the next unread article. " "Possible is any combination of B and B. When " @@ -11151,20 +11176,20 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1553 +#: doc/tin.5:1557 msgid "" "The format string used for the Group level. Default is \"%n\\ %m\\ %R\\ %L\\ " "\\ %s\\ \\ %F\". The following substitutions are supported:" msgstr "" #. type: ta -#: doc/tin.5:1555 +#: doc/tin.5:1559 #, no-wrap msgid "\\w'%G 'u +\\w'number of responses in thread'u" msgstr "" #. type: Plain text -#: doc/tin.5:1567 +#: doc/tin.5:1571 #, no-wrap msgid "" "%D\tdate\n" @@ -11181,31 +11206,31 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1569 +#: doc/tin.5:1573 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1579 +#: doc/tin.5:1583 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1586 +#: doc/tin.5:1590 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1592 +#: doc/tin.5:1596 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1598 +#: doc/tin.5:1602 msgid "" "If greater than 0 your mailreader will be invoked earlier for reply so you " "can use more of its features (e.g. MIME, pgp, ...). 1 means include headers, " @@ -11214,32 +11239,32 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1598 +#: doc/tin.5:1602 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1602 +#: doc/tin.5:1606 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1607 +#: doc/tin.5:1611 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1611 +#: doc/tin.5:1615 msgid "" "This option controls the processing and display of articles that are " "killed. There are 3 options, default is 0 (B)." msgstr "" #. type: Plain text -#: doc/tin.5:1619 +#: doc/tin.5:1623 msgid "" "B is the 'traditional' behavior of B<\\%tin>(1). " "Only unread articles are killed once only by marking them read. As filtering " @@ -11249,104 +11274,104 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1635 +#: doc/tin.5:1639 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1645 +#: doc/tin.5:1649 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1650 +#: doc/tin.5:1654 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1669 +#: doc/tin.5:1673 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1706 +#: doc/tin.5:1710 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1718 doc/tin.5:2421 +#: doc/tin.5:1722 doc/tin.5:2426 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1751 +#: doc/tin.5:1755 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1756 +#: doc/tin.5:1760 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1761 +#: doc/tin.5:1765 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1766 +#: doc/tin.5:1770 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1771 +#: doc/tin.5:1775 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1777 +#: doc/tin.5:1781 msgid "" "These are internal timers used by B<\\%tin>(1) to keep track of new " "newsgroups. Do not change them unless you understand what they are for." msgstr "" #. type: TP -#: doc/tin.5:1798 +#: doc/tin.5:1802 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1801 +#: doc/tin.5:1805 msgid "Time in seconds to wait for a response from the server. Default is 120." msgstr "" #. type: TP -#: doc/tin.5:1801 +#: doc/tin.5:1805 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1805 +#: doc/tin.5:1809 msgid "" "The normalization form which should be used to normalize unicode input. The " "possible values are:" msgstr "" #. type: Plain text -#: doc/tin.5:1821 +#: doc/tin.5:1827 msgid "" "Some normalization modes are only available if they are supported by the " "library B<\\%tin>(1) uses to do the normalization. NFC should be used if " @@ -11354,7 +11379,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1849 +#: doc/tin.5:1855 msgid "" "If ON, then B<\\%tin>(1) will start an appropriate viewer program to " "display any files that were post processed and uudecoded. The program is " @@ -11362,7 +11387,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1855 +#: doc/tin.5:1861 msgid "" "This specifies whether to perform post processing on saved articles. " "Because the shell archive may contain commands you may not want to be " @@ -11371,7 +11396,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1863 +#: doc/tin.5:1869 msgid "" "B, unpacking of multi-part B<\\%shar>(1) files " "only. Because the shell archive may contain commands you may not want to be " @@ -11379,19 +11404,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1866 +#: doc/tin.5:1872 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1876 +#: doc/tin.5:1882 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1886 +#: doc/tin.5:1892 msgid "" "The printer program with options that is to be used to print articles. The " "default is B<\\%lpr>(1) for BSD machines and B<\\%lp>(1) for SysV " @@ -11400,20 +11425,20 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1894 +#: doc/tin.5:1900 msgid "" "If ON show empty ''Followup-To:'' header when editing an article. Default " "is OFF." msgstr "" #. type: TP -#: doc/tin.5:1900 +#: doc/tin.5:1906 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1906 +#: doc/tin.5:1912 msgid "" "This bit coded integer value controls how articles are to be quoted when " "following up or replying to them. Any of the following options can be " @@ -11422,7 +11447,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1911 +#: doc/tin.5:1917 msgid "" "B Compress quote characters together when quoting multiple " "times (for example, 'E E E' will be turned into " @@ -11430,7 +11455,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1917 +#: doc/tin.5:1923 msgid "" "B This option is off by default. Signatures are always " "quoted regardless of this option when you are viewing an article in raw mode " @@ -11439,18 +11464,18 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1919 +#: doc/tin.5:1925 msgid "B This option is on by default." msgstr "" #. type: TP -#: doc/tin.5:1920 +#: doc/tin.5:1926 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1927 +#: doc/tin.5:1933 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -11458,13 +11483,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1927 +#: doc/tin.5:1933 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1934 +#: doc/tin.5:1940 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -11472,13 +11497,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1934 +#: doc/tin.5:1940 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1941 +#: doc/tin.5:1947 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -11486,19 +11511,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1941 +#: doc/tin.5:1947 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1945 +#: doc/tin.5:1951 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1952 +#: doc/tin.5:1958 msgid "" "If ON B<%tin>(1) does the rendering of bi-directional text. If OFF " "B<%tin>(1) leaves the rendering of bi-directional text to the " @@ -11506,62 +11531,62 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1952 +#: doc/tin.5:1958 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1961 +#: doc/tin.5:1967 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1965 +#: doc/tin.5:1971 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1969 +#: doc/tin.5:1975 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1973 +#: doc/tin.5:1979 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1977 +#: doc/tin.5:1983 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1985 +#: doc/tin.5:1991 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1989 +#: doc/tin.5:1995 msgid "" "The format string used for the Selection level. Default is \"%f\\ %n\\ %U\\ " "\\ %G\\ \\ %d\". The following substitutions are supported:" msgstr "" #. type: ta -#: doc/tin.5:1991 +#: doc/tin.5:1997 #, no-wrap msgid "\\w'%G 'u +\\w'current group number'u" msgstr "" #. type: Plain text -#: doc/tin.5:1998 +#: doc/tin.5:2004 #, no-wrap msgid "" "%G\tgroup name\n" @@ -11573,19 +11598,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2000 +#: doc/tin.5:2006 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2031 +#: doc/tin.5:2037 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2040 +#: doc/tin.5:2046 msgid "" "If ON show a short group description text after newsgroup name at the group " "selection level. The ''B<-d>'' command-line flag will override the setting " @@ -11596,32 +11621,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2062 +#: doc/tin.5:2068 #, no-wrap msgid "B" msgstr "" -#. type: Plain text -#: doc/tin.5:2083 -msgid "" -"The path that specifies the signature file to use when posting, following up " -"to or replying to an article. If the path is a directory then the signature " -"will be randomly generated from files that are in the specified " -"directory. If the path starts with a ! the program the path points to will " -"be executed to generate a signature. In order to pass the group name to the " -"program, %G can be specified. This will be replaced by the name of the " -"current newsgroup. program. --none will suppress any signature. Default is " -"I<${TIN_HOMEDIR:-\"$HOME\"}/.Sig>." -msgstr "" - #. type: TP -#: doc/tin.5:2086 +#: doc/tin.5:2091 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2093 +#: doc/tin.5:2098 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -11629,19 +11641,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2139 +#: doc/tin.5:2144 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2146 +#: doc/tin.5:2151 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2153 +#: doc/tin.5:2158 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -11649,31 +11661,31 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2158 +#: doc/tin.5:2163 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2162 +#: doc/tin.5:2167 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2171 +#: doc/tin.5:2176 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2175 +#: doc/tin.5:2180 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2182 +#: doc/tin.5:2187 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -11681,7 +11693,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2187 +#: doc/tin.5:2192 msgid "" "Decode German style TeX umlaut codes to ISO If ON, show \"a as Umlaut-a, " "etc. Default is OFF. This behavior can also be toggled in the article viewer " @@ -11689,32 +11701,32 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2197 +#: doc/tin.5:2202 msgid "" "Defines which threading method to use. The choices are: 0) Don't thread, 1) " "Thread on Subject only 2) Thread on References only, 3) Thread on References " "then Subject (default) 4) Thread multipart articles on Subject. 5) Thread " "on Percentage Match of the Subjects It's also possible to set the threading " "type on a per group basis by setting the group attribute variable " -"B to 0 - 5 in the file " +"B to 0 \\(en 5 in the file " "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/attributes>." msgstr "" #. type: Plain text -#: doc/tin.5:2201 +#: doc/tin.5:2206 msgid "" "The format string used for the Thread level. Default is \"%n\\ %m\\ \\ " "[%L]\\ \\ %T\\ \\ %F\". The following substitutions are supported:" msgstr "" #. type: ta -#: doc/tin.5:2203 +#: doc/tin.5:2208 #, no-wrap msgid "\\w'%G 'u +\\w'from, name and/or address'u" msgstr "" #. type: Plain text -#: doc/tin.5:2214 +#: doc/tin.5:2219 #, no-wrap msgid "" "%D\tdate\n" @@ -11730,7 +11742,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2221 +#: doc/tin.5:2226 msgid "" "Defines how close the subjects must match while threading by Percentage " "Match for threads to be considered part of a single thread. This value is in " @@ -11738,32 +11750,32 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2225 +#: doc/tin.5:2230 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2237 +#: doc/tin.5:2242 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2251 +#: doc/tin.5:2256 msgid "" "Allows you to select how B<%tin>(1) treats blank lines in article bodies. " "Default is 0. This option does not affect lines within verbatim blocks." msgstr "" #. type: TP -#: doc/tin.5:2270 +#: doc/tin.5:2275 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2277 +#: doc/tin.5:2282 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -11771,66 +11783,66 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2277 +#: doc/tin.5:2282 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2281 +#: doc/tin.5:2286 msgid "" "If ON remove I<${TIN_HOMEDIR:-\"$HOME\"}/.article> after posting. Default is " "ON." msgstr "" #. type: TP -#: doc/tin.5:2281 +#: doc/tin.5:2286 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2286 +#: doc/tin.5:2291 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2289 +#: doc/tin.5:2294 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2294 +#: doc/tin.5:2299 msgid "If enabled B<\\%tin>(1) uses ANSI-colors. Default is OFF." msgstr "" #. type: TP -#: doc/tin.5:2294 +#: doc/tin.5:2299 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2297 +#: doc/tin.5:2302 msgid "Use scroll keys on keypad. Default is OFF." msgstr "" #. type: TP -#: doc/tin.5:2297 +#: doc/tin.5:2302 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2303 +#: doc/tin.5:2308 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2315 +#: doc/tin.5:2320 msgid "" "If enabled B<\\%slrnface>(1) will be used to interpret the ''X-Face:'' " "header. For this option to have any effect, B<\\%tin>(1) must be running in " @@ -11839,45 +11851,45 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2315 +#: doc/tin.5:2320 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2319 +#: doc/tin.5:2324 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2323 +#: doc/tin.5:2328 msgid "" "A regular expression that B will use to find the begin of a verbatim " "block. Default is #v+" msgstr "" #. type: TP -#: doc/tin.5:2323 +#: doc/tin.5:2328 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2327 +#: doc/tin.5:2332 msgid "" "A regular expression that B will use to find the end of a verbatim " "block. Default is #v-" msgstr "" #. type: TP -#: doc/tin.5:2330 +#: doc/tin.5:2335 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2346 +#: doc/tin.5:2351 msgid "" "Allows you to select how B<\\%tin>(1) matches strings. The default is 0 and " "uses the wildmat notation, which is how this has traditionally been " @@ -11889,31 +11901,31 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2346 +#: doc/tin.5:2351 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2358 +#: doc/tin.5:2363 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2366 +#: doc/tin.5:2371 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2382 +#: doc/tin.5:2387 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2398 +#: doc/tin.5:2403 msgid "" "Yet another global configuration file with \"I=I\" " "pairs. This one is for the more general options which usually can't be " @@ -11923,31 +11935,31 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2398 +#: doc/tin.5:2403 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2401 +#: doc/tin.5:2406 msgid "Sets a global domain name used in From lines" msgstr "" #. type: Plain text -#: doc/tin.5:2405 +#: doc/tin.5:2410 msgid "" "Defines the name of your organization. $B overrides any " "specified value." msgstr "" #. type: TP -#: doc/tin.5:2405 +#: doc/tin.5:2410 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2410 +#: doc/tin.5:2415 msgid "" "Defines the default place for some configuration files, common values are " "I, I, I or " @@ -11955,13 +11967,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2410 +#: doc/tin.5:2415 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2416 +#: doc/tin.5:2421 msgid "" "Defines the email address to which users can send bug reports using a " "built-in function. The default points to a developers mailing list located " @@ -11970,43 +11982,43 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2416 +#: doc/tin.5:2421 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2421 -msgid "Defines the directory containing of the B<\\%inews>(1) executable" +#: doc/tin.5:2426 +msgid "Defines the directory containing the B<\\%inews>(1) executable." msgstr "" #. type: Plain text -#: doc/tin.5:2425 +#: doc/tin.5:2430 msgid "" "Default charset to be used in MIME's ''Content-Type:'' " "header. $B overrides any specified value." msgstr "" #. type: Plain text -#: doc/tin.5:2428 +#: doc/tin.5:2433 msgid "Default encoding scheme used in MIME articles. 8bit might be the best value." msgstr "" #. type: Plain text -#: doc/tin.5:2432 +#: doc/tin.5:2437 msgid "" "Default encoding scheme used in MIME letters. quoted-printable is a good " "choice here." msgstr "" #. type: TP -#: doc/tin.5:2432 +#: doc/tin.5:2437 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2438 +#: doc/tin.5:2443 msgid "" "Allow unregistered top level domains. As the list of valid TLDs is no longer " "actively maintained the default was changed to ON starting with B<\\%tin>(1) " @@ -12014,26 +12026,26 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2438 +#: doc/tin.5:2443 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2442 +#: doc/tin.5:2447 msgid "" "Don't generate a ''Sender:'' header. This has an effect only if " "B is set to --internal." msgstr "" #. type: TP -#: doc/tin.5:2442 +#: doc/tin.5:2447 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2447 +#: doc/tin.5:2452 msgid "" "Base of your newsspool (Bnews, Cnews and INN traditional spool style), " "common values are I, I, I. " @@ -12041,13 +12053,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2447 +#: doc/tin.5:2452 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2455 +#: doc/tin.5:2460 msgid "" "Base of your NOV database B<\\%newsoverview>(5) (tradspool style; might be " "the same dir as I), common values are I, " @@ -12056,26 +12068,26 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2455 +#: doc/tin.5:2460 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2459 +#: doc/tin.5:2464 msgid "" "Name of a single overview file, common values are I<.overview>, " "I. $B overrides any specified value." msgstr "" #. type: TP -#: doc/tin.5:2459 +#: doc/tin.5:2464 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2464 +#: doc/tin.5:2469 msgid "" "Full pathname of your newssystem's overview.fmt file; usually the " "overview.fmt file is in I, so you only have to change this " @@ -12083,13 +12095,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2464 +#: doc/tin.5:2469 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2470 +#: doc/tin.5:2475 msgid "" "Full pathname of your newssystem's active file; usually the active file " "resides in I and is named I, so you only have to change " @@ -12098,13 +12110,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2470 +#: doc/tin.5:2475 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2475 +#: doc/tin.5:2480 msgid "" "Full pathname of your newssystem's active.times file; usually the " "active.times file is I, so you only have to change this setting " @@ -12112,13 +12124,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2475 +#: doc/tin.5:2480 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2480 +#: doc/tin.5:2485 msgid "" "Full pathname of your newssystem's newsgroups file; usually the newsgroups " "file is in I, so you only have to change this setting if your " @@ -12126,13 +12138,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2480 +#: doc/tin.5:2485 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2485 +#: doc/tin.5:2490 msgid "" "Full pathname of your newssystem's subscriptions file; usually the " "subscriptions file is in I, so you only have to change this " @@ -12140,19 +12152,19 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2489 +#: doc/tin.5:2494 msgid "I" msgstr "" #. type: Plain text -#: doc/tin.5:2493 +#: doc/tin.5:2498 msgid "" "translation into language specified in $B, $B or " "$B" msgstr "" #. type: Plain text -#: doc/tin.5:2507 +#: doc/tin.5:2512 msgid "" "This file lists the newsgroups that the local site receives. Each newsgroup " "should be listed only once. Each line specifies one group; within each " @@ -12162,7 +12174,7 @@ msgstr "" #. TODO: IIRC tin issues just a warning in that case? #. type: Plain text -#: doc/tin.5:2512 +#: doc/tin.5:2517 msgid "" "If an article is posted to newsgroups not mentioned in this file, those " "newsgroups are ignored. If no valid newsgroups are specified, the article " @@ -12170,37 +12182,37 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2515 +#: doc/tin.5:2520 msgid "" "Each line consists of four space-separated fields \"I I " "I I\"." msgstr "" #. type: TP -#: doc/tin.5:2515 doc/tin.5:2568 +#: doc/tin.5:2520 doc/tin.5:2573 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2518 +#: doc/tin.5:2523 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2521 +#: doc/tin.5:2526 msgid "is the highest article number that has been used in that newsgroup" msgstr "" #. type: TP -#: doc/tin.5:2521 +#: doc/tin.5:2526 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2528 +#: doc/tin.5:2533 msgid "" "is the lowest article number in the group; this number is not guaranteed to " "be accurate, and should only be taken to be a hint. Note that because of " @@ -12210,90 +12222,90 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2528 +#: doc/tin.5:2533 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2531 +#: doc/tin.5:2536 msgid "can be one of those" msgstr "" #. type: TP -#: doc/tin.5:2532 +#: doc/tin.5:2537 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2535 +#: doc/tin.5:2540 msgid "local postings are allowed" msgstr "" #. type: TP -#: doc/tin.5:2535 +#: doc/tin.5:2540 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2538 +#: doc/tin.5:2543 msgid "no local postings are allowed, only remote ones" msgstr "" #. type: TP -#: doc/tin.5:2538 +#: doc/tin.5:2543 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2541 +#: doc/tin.5:2546 msgid "the group is moderated and all postings must be approved" msgstr "" #. type: TP -#: doc/tin.5:2541 +#: doc/tin.5:2546 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2544 +#: doc/tin.5:2549 msgid "articles in this group are not kept, but only passed on" msgstr "" #. type: TP -#: doc/tin.5:2544 +#: doc/tin.5:2549 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2547 +#: doc/tin.5:2552 msgid "articles cannot be posted to this newsgroup" msgstr "" #. type: TP -#: doc/tin.5:2547 +#: doc/tin.5:2552 #, no-wrap msgid "B<=foo.bar>" msgstr "" #. type: Plain text -#: doc/tin.5:2550 +#: doc/tin.5:2555 msgid "articles are locally filed into the ''foo.bar'' group" msgstr "" #. type: TP -#: doc/tin.5:2551 doc/tin.5:2578 doc/tin.5:2601 +#: doc/tin.5:2556 doc/tin.5:2583 doc/tin.5:2606 #, no-wrap msgid "B<\\%tin>(1)" msgstr "" #. type: Plain text -#: doc/tin.5:2557 +#: doc/tin.5:2562 msgid "" "only tries to read the file if you read directly from the local spool, if " "you read news via NNTP, B<\\%tin>(1) uses the LIST (B) or LIST " @@ -12301,7 +12313,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2568 +#: doc/tin.5:2573 msgid "" "This file provides a chronological record of when newsgroups are created. It " "is normally updated by the local news server (e.g. B<\\%innd>(8)) whenever " @@ -12310,25 +12322,25 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2575 +#: doc/tin.5:2580 msgid "" "is the time when the group was created, expressed as the number of seconds " "since the Epoch." msgstr "" #. type: TP -#: doc/tin.5:2575 +#: doc/tin.5:2580 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2578 +#: doc/tin.5:2583 msgid "is the electronic mail address of the person who created the group." msgstr "" #. type: Plain text -#: doc/tin.5:2584 +#: doc/tin.5:2589 msgid "" "only tries to read the file if you read directly from the local spool, if " "you read news via NNTP, B<\\%tin>(1) uses the NEWGROUPS (B) " @@ -12336,7 +12348,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2595 +#: doc/tin.5:2600 msgid "" "This file provides short descriptions of each newsgroup. It is normally " "updated by the local news server (e.g. B<\\%innd>(8)) whenever a new group " @@ -12345,7 +12357,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2607 +#: doc/tin.5:2612 msgid "" "only tries to read the file if you read directly from the local spool, if " "you read news via NNTP, B<\\%tin>(1) uses the LIST NEWSGROUPS " @@ -12353,14 +12365,14 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2616 +#: doc/tin.5:2621 msgid "" "This file might hold a default organization to be used in the " "''Organization:'' header. $B has a higher priority if set." msgstr "" #. type: Plain text -#: doc/tin.5:2634 +#: doc/tin.5:2639 msgid "" "This file specifies the organization of the news overview database (see also " "B<\\%newsoverview>(5)). The order of lines in this file is important; it " @@ -12371,17 +12383,18 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2649 +#: doc/tin.5:2654 msgid "" -"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 the news server. B<\\%tin>(1) only tries to read the file if you read " -"directly from the local spool, if you read news via NNTP, B<\\%tin>(1) uses " -"the LIST SUBSCRIPTIONS (B) command instead." +"This file contains a list of newsgroups \\(em one per line \\(em which the " +"client should subscribe to when the user has no " +"${TIN_HOMEDIR:-\"$HOME\"}/.newsrc for the news server. B<\\%tin>(1) only " +"tries to read the file if you read directly from the local spool, if you " +"read news via NNTP, B<\\%tin>(1) uses the LIST SUBSCRIPTIONS " +"(B) command instead." msgstr "" #. type: Plain text -#: doc/tin.5:2696 +#: doc/tin.5:2701 msgid "" "B<\\%elm>(1), B<\\%inews>(1), B<\\%ispell>(1), B<\\%lp>(1), B<\\%lpr>(1), " "B<\\%metamail>(1), B<\\%perl>(1), B<\\%perlre>(1), B<\\%pgp>(1), " diff -Nurp '--exclude=.bzr*' tin-2.4.2/doc/mmdf.5 tin-2.4.3/doc/mmdf.5 --- tin-2.4.2/doc/mmdf.5 2017-05-03 19:47:32.000000000 +0200 +++ tin-2.4.3/doc/mmdf.5 2018-03-21 16:04:36.996640228 +0100 @@ -2,7 +2,7 @@ .\" Module : mmdf.5 .\" Author : U. Janssen .\" Created : 2002-02-18 -.\" Updated : 2013-11-04 +.\" Updated : 2018-03-21 .\" Notes : needs a lot of work .\" .TH mmdf 5 "November 5th, 2013" "Unix" "User Manuals" @@ -42,7 +42,7 @@ Subject: test .br From what I learned about the MMDF-format: .br -... +\&... .br ^A^A^A^A .br diff -Nurp '--exclude=.bzr*' tin-2.4.2/doc/opt-case.1 tin-2.4.3/doc/opt-case.1 --- tin-2.4.2/doc/opt-case.1 2017-05-03 19:47:32.000000000 +0200 +++ tin-2.4.3/doc/opt-case.1 2018-10-05 08:26:01.826062022 +0200 @@ -85,7 +85,7 @@ .\" Ip Item .\" X<> Xref (embedded .\" Of course, you have to process the output yourself -.\" in some meaninful fashion. +.\" in some meaningful fashion. .if \nF \{ .de IX .tm Index:\\$1\t\\n%\t"\\$2" diff -Nurp '--exclude=.bzr*' tin-2.4.2/doc/plp_snprintf.3 tin-2.4.3/doc/plp_snprintf.3 --- tin-2.4.2/doc/plp_snprintf.3 2017-05-03 19:47:32.000000000 +0200 +++ tin-2.4.3/doc/plp_snprintf.3 2018-10-04 11:38:00.187006195 +0200 @@ -36,7 +36,7 @@ security, etc etc. .LP This version of the plp_snprintf documentation is based on the snprintf() manual page from BSDI Inc, -the POSIX printf() documention, and the 4.4 BSD Release printf() manual page. +the POSIX printf() documentation, and the 4.4 BSD Release printf() manual page. .LP The plp_snprintf() source code is freely distributible under the following license terms: diff -Nurp '--exclude=.bzr*' tin-2.4.2/doc/tin.1 tin-2.4.3/doc/tin.1 --- tin-2.4.2/doc/tin.1 2017-12-08 09:40:45.000000000 +0100 +++ tin-2.4.3/doc/tin.1 2018-12-06 10:31:31.325102344 +0100 @@ -3,13 +3,13 @@ .\" Module : tin.1 .\" Author : I. Lea, U. Janssen .\" Created : 1991-08-23 -.\" Updated : 2017-10-06 +.\" Updated : 2018-11-07 .\" Notes : use american english; still needs some work, e.g.: .\" - document authorization (.newsauth) .\" - document random organization feature .\" .\" -.TH tin 1 "December 24th, 2017" "2.4.2" "Usenet newsreader" +.TH tin 1 "December 24th, 2018" "2.4.3" "Usenet newsreader" .\" .\" .SH NAME @@ -130,6 +130,7 @@ Don't load newsgroup descriptions and se .BI \-D " debug-level" Enter debug-level (1 = NNTP, 2 = filter, 4 = newsrc, 8 = threading, 16 = memory, 32 = attributes, 64 = misc, 128 = remove existing debug files). +For NNTP-level ''\fB\-v\fP'' controls the verbosity of the output. .TP .BI \-f " file" Use the specified file of subscribed to newsgroups in place of @@ -142,6 +143,11 @@ reading via NNTP. .TP .BI \-G " article-limit" Limit the number of articles/group to retrieve from the server. +If \fIarticle-limit\fP is > 0 not more than the last \fIarticle-limit\fP +articles/group are fetched from the server. If \fIarticle-limit\fP +is < 0 \fBtin\fP will start fetching articles from your first unread +minus absolute value of \fIarticle-limit\fP. Default is 0, which +means no limit. .TP .B \-h Help listing all command-line options. @@ -159,13 +165,13 @@ NNTP and \fBcache_overview_files\fP is t .BI \-l Get number of articles per group from the \fI${TIN_LIBDIR:\-NEWSLIBDIR}"/"${TIN_ACTIVEFILE:\-active}\fR file. If -reading via NNTP this is done with the LIST command (\fBRFC\%3977\fP ). This +reading via NNTP this is done with the LIST command (\fBRFC\%3977\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 (either directly or via LIST) and then check the article count via -NNTP GROUP command (\fBRFC\%3977\fP ) ''\fB\-ln\fP''. If reading via -NNTP and LIST COUNTS (\fBRFC\%6048\fP ) is available that is used instead +NNTP GROUP command (\fBRFC\%3977\fP) ''\fB\-ln\fP''. If reading via +NNTP and LIST COUNTS (\fBRFC\%6048\fP) is available that is used instead as it gives more accurate article counts. .TP .BI \-m " dir" @@ -225,8 +231,9 @@ option. This option is disabled if \fBti 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. +Verbose mode for ''\fB\-D\fP'', ''\fB\-c\fP'', ''\fB\-M\fP'', ''\fB\-N\fP'', +\&''\fB\-S\fP'', ''\fB\-u\fP'' and ''\fB\-Z\fP'' options. Can be used multiple +times to increase verbosity. .TP .B \-V Print version and date information. @@ -303,9 +310,9 @@ A user starting \fBtin\fP for the first 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 -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 NNTP -List Extensions (\fBRFC\%6048\fP ) and all modern servers should understand it. +be world readable. If you read news via NNTP, then your news server must +support the LIST SUBSCRIPTIONS command. It is part of the NNTP List +Extensions (\fBRFC\%6048\fP) and all modern servers should understand it. .\" .\" .SS "SCREEN FORMAT" @@ -388,11 +395,11 @@ If a thread has unread articles it is ma in front of the total number of articles in the thread. If there are recent articles within the thread it might be marked with \fBart_marked_recent\fP in front of the total number of articles in the -thread - this is controlled by the \fBrecent_time\fP option. If a thread has +thread \(em this is controlled by the \fBrecent_time\fP option. If a thread has hot articles in it (see also section "FILTERING ARTICLES") it's marked with \fBart_marked_selected\fP in front of the total number of articles in the thread. The number of lines of the first (unread) article in the thread -might also be shown right before the subject - this is controlled by the +might also be shown right before the subject \(em this is controlled by the \fBshow_info\fP option. The display can be customized via \fBgroup_format\fP. .PP .\" FIXME - make this auto scale @@ -625,11 +632,11 @@ OPTIONS MENU AND TINRC CONFIGURABLE VARI Positions the cursor on the next group with unread articles in it. .TP .B Quit 'q' -Quit \fBtin\fP - ask the user to confirm if \fBconfirm_choice\fP is +Quit \fBtin\fP \(em ask the user to confirm if \fBconfirm_choice\fP is set accordingly. .TP .B QuitTin 'Q' -Quit \fBtin\fP - don't ask the user to confirm. +Quit \fBtin\fP \(em don't ask the user to confirm. .TP .B SelectToggleReadDisplay 'r' Toggle display of all subscribed to groups and just those groups containing @@ -870,7 +877,7 @@ Go to previous unread article. Return to previous level. .TP .B QuitTin 'Q' -Quit \fBtin\fP - don't ask the user to confirm. +Quit \fBtin\fP \(em don't ask the user to confirm. .TP .B GroupToggleReadUnread 'r' Toggle the display between all articles and unread articles. @@ -1057,7 +1064,7 @@ PIPING PRINTING REPOSTING AND SAVING ART Return to previous level. .TP .B QuitTin 'Q' -Quit \fBtin\fP - don't ask the user to confirm. +Quit \fBtin\fP \(em don't ask the user to confirm. .TP .B BugReport 'R' Mail a bug report or comment to . This is the best way @@ -1295,7 +1302,7 @@ Go to the previous unread article. Return to the previous level. .TP .B QuitTin 'Q' -Quit \fBtin\fP - don't ask the user to confirm. +Quit \fBtin\fP \(em don't ask the user to confirm. .TP .B PageReplyQuote 'r' Reply through mail to the author of the current article with a copy of the @@ -1803,7 +1810,7 @@ Default for quick (1 key) auto-selection .TP .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. +by a highlighted bar if set OFF. Default is OFF. .TP .B Invocation of your editor (editor_format) The format string used to create the editor start command with parameters. @@ -1863,7 +1870,7 @@ built-in NNTP inews), else it is "inews .B (info_in_last_line) .\" this is missing from the Menu If ON, show current group description or article subject in the last line -(not in the pager and global menu) - \fBToggleInfoLastLine\fP ('\fBi\fP') +(not in the pager and global menu) \(em \fBToggleInfoLastLine\fP ('\fBi\fP') toggles setting. This facility is useful as the full width of the screen is available to display long subjects. Default is OFF. .TP @@ -2093,6 +2100,8 @@ The possible values are: \fBNFC\fP: Canonical Decomposition, followed by Canonical Composition .IP 4 \fBNFD\fP: Canonical Decomposition +.IP 5 +\fBNFKC_CF\fP: Compatibility Decomposition, followed by Canonical Composition and Case Folding .RE Some normalization modes are only available if they are supported by the library \fBtin\fP uses to do the normalization. NFC should be used if @@ -2293,7 +2302,7 @@ displayed and in thread listing the line will be displayed. .IP 2 \fBScore\fP, in article listing the score of an article will be displayed -and in thread listing the score of the thread will be displayed - see also +and in thread listing the score of the thread will be displayed \(em see also \fBthread_score\fP. .IP 3 \fBLines & Score\fP, display line count and score. @@ -2431,7 +2440,7 @@ toggled in the article viewer via \fBPag .B Thread articles by (thread_articles) 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 +\fBthread_arts\fP to 0 \(en 4 in the file \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/attributes\fR. (See also "GROUP ATTRIBUTES".) The default is Both Subject and References. The choices are: @@ -2834,7 +2843,7 @@ via \fBpost_process_type\fP. \&''\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) +.BR \%cron (8) 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 @@ -2872,7 +2881,7 @@ mark them as read) A range is simply a group of items marked using the \fBSetRange\fP (\fB'#'\fP) key. Certain \fBtin\fP commands will operate on a range if one exists rather than just the current item. A range is an -expression of the form -, e.g. 10-15 will highlight items +expression of the form \(en, e.g. 10\(en15 will highlight items 10 through 15 on the current screen. Other than absolute numeric positions, '.' can be used in place of the current cursor position and '$' can be used to mean the highest number available. Currently @@ -3017,7 +3026,7 @@ number after the '\fB%\fP'. The followin thread level 10 characters wide: '\fB%10S\fP'. .PP If the newsgroup name is displayed together with the newsgroup description, -the width of the newsgroup name can be controlled via a optional comma +the width of the newsgroup name can be controlled via an optional comma separated second value (e.g. '\fB%60,20G\fP'). It is valid to omit the first value (e.g. ('\fB%,20G\fP')). If no second value is given, \fBtin\fP uses a default value of 32. @@ -3203,7 +3212,7 @@ will be much faster as only new articles .PP As indexing might take some time you may want to run \fBtin\fP form the system batcher -.BR \%cron (1) +.BR \%cron (8) with the ''\fB\-u\fP'' option: .PP .RS @@ -3505,7 +3514,7 @@ by the variable. This is useful if you w different address. .TP .B NAME -Overrides the full name given in the gecos-files in \fI/etc/passwd\fR, see +Overrides the full name given in the gecos-field in \fI/etc/passwd\fR, see also \fBmail_address\fP. .TP .B REALNAME @@ -3832,7 +3841,7 @@ Urs Janssen .\" .\" .SH "SEE ALSO" -.BR \%cron (1), +.BR \%cron (8), .BR \%elm (1), .BR \%emacs (1), .BR \%gpg (1), diff -Nurp '--exclude=.bzr*' tin-2.4.2/doc/tin.5 tin-2.4.3/doc/tin.5 --- tin-2.4.2/doc/tin.5 2017-12-08 09:40:53.000000000 +0100 +++ tin-2.4.3/doc/tin.5 2018-12-06 10:31:40.933495302 +0100 @@ -2,11 +2,11 @@ .\" Module : tin.5 .\" Author : U. Janssen .\" Created : 2000-07-10 -.\" Updated : 2017-10-06 +.\" Updated : 2018-11-07 .\" Notes : needs a some work .\" .\" -.TH tin 5 "December 24th, 2017" "2.4.2" "Usenet newsreader" +.TH tin 5 "December 24th, 2018" "2.4.3" "Usenet newsreader" .SH NAME tin, rtin \- related files @@ -100,7 +100,7 @@ support mail composing agents that suppo of mail using external composing agents. As with the view-command, the semantics of program execution are operating system dependent. The result of the composing program may be data that is not yet suitable for mail -transport - that is, a Content\-Transfer\-Encoding may need to be applied to +transport \(em that is, a Content\-Transfer\-Encoding may need to be applied to the data. .TP .B composetyped @@ -130,7 +130,7 @@ machine architecture, or the window syst not the mailcap line applies. It specifies a program to be run to test some condition. The semantics of execution and of the value returned by the test program are operating system dependent. If the test fails, a subsequent -mailcap entry should be sought. Multiple test fields are not permitted - +mailcap entry should be sought. Multiple test fields are not permitted \(em since a test can call a program, it can already be arbitrarily complex. .TP .B needsterminal @@ -697,7 +697,7 @@ Identical to the tinrc variable of the s .TP .B undeclared_charset Assume (broken) articles without MIME charset declaration have this -charset - default is US-ASCII. This attribute works only on systems +charset \(em default is US-ASCII. This attribute works only on systems with working .BR \%iconv (3), others might have to compile @@ -808,6 +808,10 @@ turned into the same format ''Newsgroups into a comma separated newsgroup list with all other information (i.e. the article counter) removed. .TP +.\" TODO: document option in detail +.B path +Match against ''Path:'' line. This may not work on some servers. +.TP .B time time_t value when rule expires .PP @@ -1502,7 +1506,7 @@ Default for quick (1 key) auto-selection .TP .B 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. +by a highlighted bar if set OFF. Default is OFF. .TP .B editor_format The format string used to create the editor start command with parameters. @@ -1586,7 +1590,7 @@ built-in NNTP inews), else it is "inews .TP .B info_in_last_line If ON, show current group description or article subject in the last line -(not in the pager and global menu) - \fBToggleInfoLastLine\fP ('\fBi\fP') +(not in the pager and global menu) \(em \fBToggleInfoLastLine\fP ('\fBi\fP') toggles setting. This facility is useful as the full width of the screen is available to display long subjects. Default is OFF. .TP @@ -1813,6 +1817,8 @@ The possible values are: \fBNFC\fP: Canonical Decomposition, followed by Canonical Composition .IP 4 \fBNFD\fP: Canonical Decomposition +.IP 5 +\fBNFKC_CF\fP: Compatibility Decomposition, followed by Canonical Composition and Case Folding .RE Some normalization modes are only available if they are supported by the library @@ -2050,7 +2056,7 @@ displayed and in thread listing the line will be displayed. .IP 2 \fBScore\fP, in article listing the score of an article will be displayed -and in thread listing the score of the thread will be displayed - see also +and in thread listing the score of the thread will be displayed \(em see also \fBthread_score\fP. .IP 3 \fBLines & Score\fP, display line count and score. @@ -2077,8 +2083,7 @@ signature will be randomly generated fro directory. If the path starts with a ! the program the path points to will be executed to generate a signature. In order to pass the group name to the program, %G can be specified. This will be replaced by the name of the -current newsgroup. -program. \-\-none will suppress any signature. +current newsgroup. \-\-none will suppress any signature. Default is \fI${TIN_HOMEDIR:\-"$HOME"}/.Sig\fR. .TP .B signature_repost @@ -2192,7 +2197,7 @@ Defines which threading method to use. T 4) Thread multipart articles on Subject. 5) Thread on Percentage Match of the Subjects It's also possible to set the threading type on a per group basis by setting -the group attribute variable \fBthread_articles\fP to 0 - 5 in the file +the group attribute variable \fBthread_articles\fP to 0 \(en 5 in the file \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/attributes\fR. .TP .B thread_format @@ -2415,9 +2420,9 @@ at tin.org. You might want to change thi administration if you want to deal with your lusers problems on your own. .TP .B inewsdir -Defines the directory containing of the +Defines the directory containing the .BR \%inews (1) -executable +executable. .TP .B mm_charset Default charset to be used in MIME's ''Content\-Type:'' header. $\fBMM_CHARSET\fP @@ -2638,7 +2643,7 @@ uses the LIST OVERVIEW.FMT (\fBRFC\%3977 .\" 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 +This file contains a list of newsgroups \(em one per line \(em which the client should subscribe to when the user has no ${TIN_HOMEDIR:\-"$HOME"}/.newsrc for the news server. .BR \%tin (1) diff -Nurp '--exclude=.bzr*' tin-2.4.2/doc/tinews.1 tin-2.4.3/doc/tinews.1 --- tin-2.4.2/doc/tinews.1 2017-12-08 09:36:57.000000000 +0100 +++ tin-2.4.3/doc/tinews.1 2018-12-20 00:06:32.862459175 +0100 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "tinews.pl 1" -.TH tinews.pl 1 "December 8th, 2017" "1.1.49" "Post and sign an article via NNTP" +.TH tinews.pl 1 "December 19th, 2018" "1.1.50" "Post and sign an article via NNTP" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -148,6 +148,10 @@ tinews.pl \- Post and sign an article vi \&\fBtinews.pl\fR reads an article on \s-1STDIN,\s0 signs it via \fIpgp\fR\|(1) or \&\fIgpg\fR\|(1) and posts it to a news server. .PP +The article shall not contain any raw 8\-bit data or it needs to +already have the relevant MIME-headers as \fBtinews.pl\fR will not +add any MIME-headers nor encode its input. +.PP If the article contains To:, Cc: or Bcc: headers and mail-actions are configured it will automatically add a \*(L"Posted-And-Mailed: yes\*(R" header to the article and send out the mail-copies. @@ -157,7 +161,7 @@ Cancel-Lock: (and Cancel-Key: if require .PP The input should have unix line endings (<\s-1LF\s0>, '\en'). .SH "OPTIONS" -.IX Xref "tinews, commandline options" +.IX Xref "tinews, command-line options" .IX Header "OPTIONS" .ie n .IP "\-\fBa\fR ""Approved"" | \-\-\fBapproved\fR ""Approved""" 4 .el .IP "\-\fBa\fR \f(CWApproved\fR | \-\-\fBapproved\fR \f(CWApproved\fR" 4 @@ -289,7 +293,9 @@ These options are accepted for compatibi .IP "\-\fBD\fR | \-\fBN\fR | \-\-\fBdebug\fR" 4 .IX Xref "-D -N --debug" .IX Item "-D | -N | --debug" -These options are accepted but do not have any functionality yet. +Enable warnings about raw 8\-bit data and set \fINet::NNTP\fR\|(3pm) in debug +mode, enable warnings about raw 8\-bit data, warn about disabled options +due to lacking perl-modules or executables and unreadable files. .SH "EXIT STATUS" .IX Header "EXIT STATUS" The following exit values are returned: @@ -351,7 +357,7 @@ The '\-\fBr\fR' command-line option over .IX Xref "$ORGANIZATION ORGANIZATION" .IX Item "$ORGANIZATION" Set the article header field Organization: to the contents of the variable -if there isn't already a Organization: header in the article. The '\-\fBo\fR' +if there isn't already an Organization: header in the article. The '\-\fBo\fR' command-line option overrides \fB\f(CB$ORGANIZATION\fB\fR. .ie n .IP "\fB\fB$DISTRIBUTION\fB\fR" 4 .el .IP "\fB\f(CB$DISTRIBUTION\fB\fR" 4 @@ -418,8 +424,8 @@ security is an issue, don't use this scr \&\fIGetopt::Long\fR\|(3pm), \fINet::NNTP\fR\|(3pm), <\fITime::Local\fR\|(3pm)> and \&\fITerm::Readline\fR\|(3pm). .PP -If the Cancel-Lock feature is enabled the following additional modules -must be installed: \fIMIME::Base64\fR\|(3pm), \fIDigest::SHA\fR\|(3pm) or +If the Cancel-Lock feature (\s-1RFC 8315\s0) is enabled the following additional +modules must be installed: \fIMIME::Base64\fR\|(3pm), \fIDigest::SHA\fR\|(3pm) or \&\fIDigest::SHA1\fR\|(3pm) and \fIDigest::HMAC_SHA1\fR\|(3pm). sha256 and sha512 as algorithms for \fBcanlock-algorithm\fR are only available with \fIDigest::SHA\fR\|(3pm). .PP @@ -431,6 +437,9 @@ algorithms for \fBcanlock-algorithm\fR a .Ve .PP before using \fBtinews.pl\fR. See for details. +.PP +\&\fBtinews.pl\fR does not do any \s-1MIME\s0 encoding, its input should be already +properly encoded and have all relevant headers set. .SH "AUTHOR" .IX Header "AUTHOR" Urs Janssen , diff -Nurp '--exclude=.bzr*' tin-2.4.2/include/autoconf.hin tin-2.4.3/include/autoconf.hin --- tin-2.4.2/include/autoconf.hin 2017-12-08 08:52:23.000000000 +0100 +++ tin-2.4.3/include/autoconf.hin 2018-12-05 22:46:28.292446819 +0100 @@ -3,10 +3,10 @@ * Module : autoconf.hin * Author : Thomas Dickey * Created : 1995-08-24 - * Updated : 2017-06-13 + * Updated : 2018-12-05 * Notes : #include files, #defines & struct's * - * Copyright (c) 1995-2018 Thomas Dickey + * Copyright (c) 1995-2019 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -68,11 +68,6 @@ # undef NEED_PTEM_H /* - * Mac OS X need some extras - */ -# undef MAC_OS_X - -/* * SEIUX has strange struct utsname values */ # undef SEIUX @@ -173,6 +168,7 @@ # undef HAVE_IOCTL_H # undef HAVE_LANGINFO_H # undef HAVE_LIBC_H +# undef HAVE_LIBINTL_H # undef HAVE_LOCALE_H # undef HAVE_MALLOC_H # undef HAVE_NCURSESW_NCURSES_H @@ -314,9 +310,8 @@ # undef HAVE_UNLINK # undef HAVE_USE_DEFAULT_COLORS # undef HAVE_USLEEP -# undef HAVE_VASPRINTF # undef HAVE_VSNPRINTF -# undef HAVE_VWPRINTW +# undef HAVE_VW_PRINTW # undef HAVE_WAITPID # undef HAVE__TRACEF @@ -684,6 +679,7 @@ * used for unicode normalization */ # undef HAVE_UNICODE_UNORM_H +# undef HAVE_UNICODE_UNORM2_H # undef HAVE_UNICODE_USTRING_H # undef HAVE_UNICODE_UBIDI_H # undef HAVE_UNICODE_UIDNA_H @@ -885,6 +881,18 @@ Added missing headers after gettext upda /* Define if you have . */ # undef HAVE_VFORK_H +/* Define if you have the va_copy feature */ +# undef HAVE_VA_COPY + +/* Define if you have the __va_copy feature */ +# undef HAVE___VA_COPY + +/* Define if you have the __builtin_va_copy feature */ +# undef HAVE___BUILTIN_VA_COPY + +/* Define if va_list is an array, and none of va_copy/__va_copy/__builtin_va_copy are supported */ +# undef ARRAY_VA_LIST + /* Define if you have the vprintf function. */ # undef HAVE_VPRINTF @@ -919,6 +927,11 @@ Added missing headers after gettext upda */ # undef STACK_DIRECTION +/* libcanlock */ +# undef HAVE_EXPLICIT_BZERO +# undef HAVE_EXPLICIT_MEMSET +# undef HAVE_MEMSET_S + /* Define if the X Window System is missing or not being used. */ # undef X_DISPLAY_MISSING @@ -934,7 +947,6 @@ Added missing headers after gettext upda */ # undef FILE_MODE_BROKEN - /* * define if newsserver can't handle pipelined (streamed) commands * TODO: write configure option diff -Nurp '--exclude=.bzr*' tin-2.4.2/include/bool.h tin-2.4.3/include/bool.h --- tin-2.4.2/include/bool.h 2017-12-08 08:52:23.000000000 +0100 +++ tin-2.4.3/include/bool.h 2018-11-23 16:29:04.091721360 +0100 @@ -6,7 +6,7 @@ * Updated : 2013-01-09 * Notes : * - * Copyright (c) 1997-2018 Urs Janssen + * Copyright (c) 1997-2019 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/include/bugrep.h tin-2.4.3/include/bugrep.h --- tin-2.4.2/include/bugrep.h 2017-12-08 08:52:23.000000000 +0100 +++ tin-2.4.3/include/bugrep.h 2018-11-23 16:29:04.119722493 +0100 @@ -6,7 +6,7 @@ * Updated : 2006-02-15 * Notes : * - * Copyright (c) 1997-2018 Urs Janssen + * Copyright (c) 1997-2019 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/include/debug.h tin-2.4.3/include/debug.h --- tin-2.4.2/include/debug.h 2017-12-08 08:52:23.000000000 +0100 +++ tin-2.4.3/include/debug.h 2018-11-23 16:29:04.143723465 +0100 @@ -6,7 +6,7 @@ * Updated : 2016-02-27 * Notes : * - * Copyright (c) 2007-2018 Urs Janssen + * Copyright (c) 2007-2019 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/include/extern.h tin-2.4.3/include/extern.h --- tin-2.4.2/include/extern.h 2017-12-08 08:52:23.000000000 +0100 +++ tin-2.4.3/include/extern.h 2018-11-23 16:29:04.171724599 +0100 @@ -3,10 +3,10 @@ * Module : extern.h * Author : I. Lea * Created : 1991-04-01 - * Updated : 2017-08-13 + * Updated : 2018-11-22 * Notes : * - * Copyright (c) 1997-2018 Iain Lea + * Copyright (c) 1997-2019 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -517,7 +517,6 @@ extern constext txt_author_search_forwar extern constext txt_autoselecting_articles[]; extern constext txt_autosubscribed[]; extern constext txt_autosubscribing_groups[]; -extern constext txt_bad_active_file[]; extern constext txt_bad_article[]; extern constext txt_bad_attrib[]; extern constext txt_bad_command[]; @@ -536,6 +535,7 @@ extern constext txt_cancelling_art[]; extern constext txt_cannot_create[]; extern constext txt_cannot_create_uniq_name[]; extern constext txt_cannot_find_base_art[]; +extern constext txt_cannot_filter_on_path[]; #ifdef NNTP_ABLE extern constext txt_cannot_get_nntp_server_name[]; #endif /* NNTP_ABLE */ @@ -561,7 +561,7 @@ extern constext txt_checking_for_news[]; extern constext txt_checking_new_groups[]; #if !defined(HAVE_LIBUU) && defined(M_UNIX) && defined(HAVE_SUM) && !defined(DONT_HAVE_PIPING) extern constext txt_checksum_of_file[]; -#endif /* !HAVE_LIBUU && M_UNIX && HAVE SUM && !DONT_HAVE_PIPING */ +#endif /* !HAVE_LIBUU && M_UNIX && HAVE_SUM && !DONT_HAVE_PIPING */ extern constext txt_choose_post_process_type[]; #ifdef HAVE_COLOR extern constext txt_color_off[]; @@ -657,9 +657,6 @@ extern constext txt_error_header_line_mi extern constext txt_error_header_line_not_7bit[]; extern constext txt_error_header_line_space[]; extern constext txt_error_insecure_permissions[]; -#ifdef NNTP_ABLE - extern constext txt_error_invalid_response_to_group[]; -#endif /* NNTP_ABLE */ #if defined(HAVE_SETLOCALE) && !defined(NO_LOCALE) extern constext txt_error_locale[]; #endif /* HAVE_SETLOCALE && !NO_LOCALE */ @@ -689,9 +686,6 @@ extern constext txt_error_unknown_dlevel #if defined(NNTP_ABLE) && defined(HAVE_GETSERVBYNAME) && !defined(INET6) extern constext txt_error_unknown_service[]; #endif /* NNTP_ABLE && HAVE_GETSERVBYNAME && !INET6 */ -#ifdef NNTP_ABLE - extern constext txt_error_wrong_newsgroupname_in_group_response[]; -#endif /* NNTP_ABLE */ extern constext txt_esc[]; extern constext txt_exiting[]; extern constext txt_external_mail_done[]; @@ -1121,6 +1115,9 @@ extern constext txt_postpone_repost[]; extern constext txt_prefix_hot[]; extern constext txt_prefix_tagged[]; extern constext txt_prefix_untagged[]; +#ifdef NNTP_ABLE + extern constext txt_prep_for_filter_on_path[]; +#endif /* NNTP_ABLE */ extern constext txt_prompt_fup_ignore[]; extern constext txt_prompt_unchanged_mail[]; extern constext txt_prompt_see_postponed[]; @@ -1262,7 +1259,7 @@ extern constext txt_toggled_tex2iso[]; extern constext txt_toggled_tabwidth[]; #if defined(NNTP_ABLE) && defined(HAVE_INET_NTOA) && !defined(INET6) extern constext txt_trying[]; -#endif /* NNTP_ABLE && HAVE_INET_NTOA && ! INET6 */ +#endif /* NNTP_ABLE && HAVE_INET_NTOA && !INET6 */ #ifndef NO_LOCKING extern constext txt_trying_dotlock[]; extern constext txt_trying_lock[]; @@ -1291,7 +1288,6 @@ extern constext txt_usage_dont_check_new extern constext txt_usage_dont_save_files_on_quit[]; extern constext txt_usage_dont_show_descriptions[]; #ifdef NNTP_ABLE - extern constext txt_unparseable_counts[]; extern constext txt_usage_force_authentication[]; #ifdef INET6 extern constext txt_usage_force_ipv4[]; @@ -1329,6 +1325,7 @@ extern constext txt_usage_verbose[]; extern constext txt_usage_version[]; extern constext txt_useful_without_batch_mode[]; extern constext txt_useful_with_batch_mode[]; +extern constext txt_useful_with_batch_or_debug_mode[]; extern constext txt_useless_combination[]; extern constext txt_use_mime[]; extern constext txt_value_out_of_range[]; @@ -1342,10 +1339,10 @@ extern constext txt_warn_cancel[]; #endif /* CHARSET_CONVERSION */ extern constext txt_warn_downgrade[]; extern constext txt_warn_encoding_and_external_inews[]; -#ifdef FOLLOW_USEFOR_DRAFT +#ifdef ALLOW_FWS_IN_NEWSGROUPLIST extern constext txt_warn_header_line_comma[]; extern constext txt_warn_header_line_groups_contd[]; -#endif /* FOLLOW_USEFOR_DRAFT */ +#endif /* ALLOW_FWS_IN_NEWSGROUPLIST */ extern constext txt_warn_example_hierarchy[]; extern constext txt_warn_multiple_sigs[]; extern constext txt_warn_newsrc[]; @@ -1411,7 +1408,6 @@ extern int attrib_file_offset; extern int cCOLS; extern int cLINES; extern int curr_line; -extern int debug; extern int filter_file_offset; extern int input_context; extern int iso2asc_supported; @@ -1440,6 +1436,8 @@ extern int xcol; extern int xmouse; extern int xrow; +extern unsigned short debug; + extern t_artnum *base; extern signed long int read_newsrc_lines; @@ -1519,7 +1517,7 @@ extern t_bool reread_active_for_posted_a extern t_bool show_description; extern t_bool show_subject; extern t_bool batch_mode; -extern t_bool verbose; +extern int verbose; extern t_bool xref_supported; extern t_bool expensive_over_parse; @@ -1640,10 +1638,10 @@ extern t_bool word_highlight; #endif /* HAVE_FASCIST_NEWSADMIN */ -#ifndef FOLLOW_USEFOR_DRAFT +#ifndef ALLOW_FWS_IN_NEWSGROUPLIST extern constext txt_error_header_line_comma[]; extern constext txt_error_header_line_groups_contd[]; -#endif /* !FOLLOW_USEFOR_DRAFT */ +#endif /* !ALLOW_FWS_IN_NEWSGROUPLIST */ #ifdef HAVE_PGP_GPG extern constext txt_pgp_add[]; diff -Nurp '--exclude=.bzr*' tin-2.4.2/include/keymap.h tin-2.4.3/include/keymap.h --- tin-2.4.2/include/keymap.h 2017-12-08 08:52:23.000000000 +0100 +++ tin-2.4.3/include/keymap.h 2018-11-23 16:29:04.203725895 +0100 @@ -6,7 +6,7 @@ * Updated : 2011-01-25 * Notes : * - * Copyright (c) 1999-2018 Jason Faultless + * Copyright (c) 1999-2019 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/include/newsrc.h tin-2.4.3/include/newsrc.h --- tin-2.4.2/include/newsrc.h 2017-12-08 08:52:23.000000000 +0100 +++ tin-2.4.3/include/newsrc.h 2018-11-23 16:29:04.235727191 +0100 @@ -6,7 +6,7 @@ * Updated : 2003-11-18 * Notes : newsrc bit handling * - * Copyright (c) 1997-2018 Iain Lea , Rich Skrenta + * Copyright (c) 1997-2019 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/include/nntplib.h tin-2.4.3/include/nntplib.h --- tin-2.4.2/include/nntplib.h 2017-12-08 08:52:23.000000000 +0100 +++ tin-2.4.3/include/nntplib.h 2018-11-23 16:29:04.259728162 +0100 @@ -3,10 +3,10 @@ * Module : nntplib.h * Author : I.Lea * Created : 1991-04-01 - * Updated : 2016-01-03 + * Updated : 2018-02-10 * Notes : nntp.h 1.5.11/1.6 with extensions for tin * - * Copyright (c) 1991-2018 Iain Lea + * Copyright (c) 1991-2019 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -95,6 +95,8 @@ #define OK_ARTICLE 220 /* Article (head & body) follows */ #define OK_HEAD 221 /* Head follows */ +#define OK_XHDR 221 /* headers follow */ +#define OK_XPAT 221 /* headers follow */ #define OK_BODY 222 /* Body follows */ #define OK_NOTEXT 223 /* No text sent -- stat, next, last */ #define OK_XOVER 224 /* .overview data follows */ @@ -188,6 +190,8 @@ struct t_capabilities { t_bool list_active_times:1; /* LIST ACTIVE.TIMES, optional */ t_bool list_distrib_pats:1; /* LIST DISTRIB.PATS, optional */ t_bool list_headers:1; /* LIST HEADERS */ + char *headers_range; /* list of headers by range */ + char *headers_id; /* list of headers by id */ t_bool list_newsgroups:1; /* LIST NEWSGROUPS */ t_bool list_overview_fmt:1; /* LIST OVERVIEW.FMT */ t_bool list_motd:1; /* LIST MOTD, "private" extension */ @@ -206,7 +210,7 @@ struct t_capabilities { t_bool starttls:1; /* STARTTLS */ t_bool authinfo_user:1; /* AUTHINFO USER/PASS */ t_bool authinfo_sasl:1; /* AUTHINFO SASL */ - t_bool authinfo_state:1; /* AUTHINFO not supported in curent state */ + t_bool authinfo_state:1; /* AUTHINFO not supported in current state */ enum sasl_types sasl; /* SASL_NONE, SASL_PLAIN, SASL_CRAM_MD5, SASL_DIGEST_MD5, SASL_GSSAPI, SASL_EXTERNAL, SASL_OTP, SASL_NTLM, SASL_LOGIN */ t_bool compress:1; /* COMPRESS */ enum c_algorithms compress_algorithm; /* COMPRESS_NONE, COMPRESS_DEFLATE */ diff -Nurp '--exclude=.bzr*' tin-2.4.2/include/policy.h tin-2.4.3/include/policy.h --- tin-2.4.2/include/policy.h 2017-12-08 08:52:23.000000000 +0100 +++ tin-2.4.3/include/policy.h 2018-12-19 14:29:41.603548330 +0100 @@ -6,7 +6,7 @@ * Updated : 2015-09-14 * Notes : #defines and static data for policy configuration * - * Copyright (c) 1999-2018 Ralf Doeblitz + * Copyright (c) 1999-2019 Ralf Doeblitz * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -71,7 +71,7 @@ * .ca Canada .cc Cocos (Keeling) Islands * .cd Congo, Democratic People's Republic * .cf Central African Republic .cg Congo, Republic of - * .ch Switzerland .ci Côte d'Ivoire + * .ch Switzerland .ci Côte d'Ivoire * .ck Cook Islands .cl Chile * .cm Cameroon .cn China * .co Colombia .cr Costa Rica @@ -330,9 +330,9 @@ static const char *gnksa_domain_list[] = /* the next five are defined in RFC 2606, RFC 6761 */ "invalid", # if 0 - /* but four of them shoudn't be used on usenet */ + /* but four of them shouldn't be used on usenet */ "test", - "onion", + "onion", /* RFC 7686 */ "example", "localhost", # endif /* 0 */ diff -Nurp '--exclude=.bzr*' tin-2.4.2/include/proto.h tin-2.4.3/include/proto.h --- tin-2.4.2/include/proto.h 2017-12-08 08:52:23.000000000 +0100 +++ tin-2.4.3/include/proto.h 2018-11-23 16:29:04.339731402 +0100 @@ -3,10 +3,10 @@ * Module : proto.h * Author : Urs Janssen * Created : - * Updated : 2017-02-22 + * Updated : 2018-02-13 * Notes : * - * Copyright (c) 1997-2018 Urs Janssen + * Copyright (c) 1997-2019 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -190,6 +190,7 @@ extern int feed_articles(int function, i /* filter.c */ extern t_bool filter_articles(struct t_group *group); extern t_bool filter_menu(t_function type, struct t_group *group, struct t_article *art); +extern t_bool filter_on_path(struct t_group *group); extern t_bool quick_filter(t_function type, struct t_group *group, struct t_article *art); extern t_bool quick_filter_select_posted_art(struct t_group *group, const char *subj, const char *a_message_id); extern t_bool read_filter_file(const char *file); @@ -437,6 +438,7 @@ extern void nntp_close(void); #ifdef NNTP_ABLE extern FILE *nntp_command(const char *, int, char *, size_t); extern char *get_server(char *string, int size); + extern int check_extensions(int); extern int get_respcode(char *, size_t); extern int get_only_respcode(char *, size_t); extern int new_nntp_command(const char *command, int success, char *message, size_t mlen); diff -Nurp '--exclude=.bzr*' tin-2.4.2/include/rfc2046.h tin-2.4.3/include/rfc2046.h --- tin-2.4.2/include/rfc2046.h 2017-12-08 08:52:23.000000000 +0100 +++ tin-2.4.3/include/rfc2046.h 2018-11-23 16:29:04.367732536 +0100 @@ -6,7 +6,7 @@ * Updated : 2016-01-01 * Notes : rfc2046 MIME article definitions * - * Copyright (c) 2000-2018 Jason Faultless + * Copyright (c) 2000-2019 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/include/stpwatch.h tin-2.4.3/include/stpwatch.h --- tin-2.4.2/include/stpwatch.h 2017-12-08 08:52:23.000000000 +0100 +++ tin-2.4.3/include/stpwatch.h 2018-11-23 16:29:04.391733508 +0100 @@ -7,7 +7,7 @@ * Notes : Simple stopwatch routines for timing code using timeb * or gettimeofday structs * - * Copyright (c) 1993-2018 Iain Lea + * Copyright (c) 1993-2019 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/include/tcurses.h tin-2.4.3/include/tcurses.h --- tin-2.4.2/include/tcurses.h 2017-12-08 08:52:23.000000000 +0100 +++ tin-2.4.3/include/tcurses.h 2018-11-23 16:29:04.419734641 +0100 @@ -6,7 +6,7 @@ * Updated : 2011-04-02 * Notes : curses #include files, #defines & struct's * - * Copyright (c) 1997-2018 Thomas Dickey + * Copyright (c) 1997-2019 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/include/tin.h tin-2.4.3/include/tin.h --- tin-2.4.2/include/tin.h 2017-12-08 08:52:23.000000000 +0100 +++ tin-2.4.3/include/tin.h 2018-12-04 18:02:10.888932567 +0100 @@ -3,10 +3,10 @@ * Module : tin.h * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2017-03-31 + * Updated : 2018-11-27 * Notes : #include files, #defines & struct's * - * Copyright (c) 1997-2018 Iain Lea , Rich Skrenta + * Copyright (c) 1997-2019 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -79,7 +79,9 @@ #define N_(Str) Str #if defined(ENABLE_NLS) && !defined(__BUILD__) -# include +# ifdef HAVE_LIBINTL_H +# include +# endif /* HAVE_LIBINTL_H */ # define _(Text) gettext(Text) #else # undef bindtextdomain @@ -188,7 +190,6 @@ enum rc_state { RC_IGNORE, RC_CHECK, RC_ # include #endif /* HAVE_GETOPT_H */ - #if defined(ENABLE_LONG_ARTICLE_NUMBERS) && !defined(SMALL_MEMORY_MACHINE) /* * defines and typedefs for 64 bit article numbers @@ -866,7 +867,7 @@ enum rc_state { RC_IGNORE, RC_CHECK, RC_ #endif /* !DEFAULT_ISO2ASC */ #ifndef DEFAULT_COMMENT -# define DEFAULT_COMMENT "> " /* used when by follow-ups & replys */ +# define DEFAULT_COMMENT "> " /* used when by follow-ups & replies */ #endif /* !DEFAULT_COMMENT */ #ifndef ART_MARK_UNREAD # define ART_MARK_UNREAD '+' /* used to show that an art is unread */ @@ -884,7 +885,7 @@ enum rc_state { RC_IGNORE, RC_CHECK, RC_ # define ART_MARK_READ ' ' /* used to show that an art was not read or seen */ #endif /* !ART_MARK_READ */ #ifndef ART_MARK_READ_SELECTED -# define ART_MARK_READ_SELECTED ':' /* used to show that an read art is hot (kill_level >0) */ +# define ART_MARK_READ_SELECTED ':' /* used to show that a read art is hot (kill_level >0) */ #endif /* !ART_MARK_READ_SELECTED */ #ifndef ART_MARK_KILLED # define ART_MARK_KILLED 'K' /* art has been killed (kill_level >0) */ @@ -1006,7 +1007,7 @@ enum { # define INDEX2SNUM(i) ((i) - currmenu->first) #endif /* !USE_CURSES */ -#define GROUP_MATCH(s1, pat, case) (wildmat(s1, pat, case)) +#define GROUP_MATCH(s1, pat, case_s) (wildmat(s1, pat, case_s)) #define REGEX_FMT (tinrc.wildcard ? "%s" : "*%s*") @@ -1033,7 +1034,7 @@ enum { #endif /* NNTP_ABLE */ /* - * Often used macro to point to the group we are currenty in + * Often used macro to point to the group we are currently in */ #define CURR_GROUP (active[my_group[selmenu.curr]]) @@ -1281,16 +1282,20 @@ enum { #ifdef assert # undef assert #endif /* assert */ -#ifdef CPP_DOES_EXPAND -# define assert(p) if(! (p)) asfail(__FILE__, __LINE__, #p); else (void)0; +#ifdef NDEBUG +# define assert(p) ((void) 0) #else -# define assert(p) if(! (p)) asfail(__FILE__, __LINE__, "p"); else (void)0; -#endif /* CPP_DOES_EXPAND */ +# ifdef CPP_DOES_EXPAND +# define assert(p) if(!(p)) asfail(__FILE__, __LINE__, #p); else (void) 0; +# else +# define assert(p) if(!(p)) asfail(__FILE__, __LINE__, "p"); else (void) 0; +# endif /* CPP_DOES_EXPAND */ +#endif /* NDEBUG */ #define ESC 27 /* - * filter entrys expire after DEFAULT_FILTER_DAYS + * filter entries expire after DEFAULT_FILTER_DAYS */ #define DEFAULT_FILTER_DAYS 28 @@ -1378,7 +1383,7 @@ enum { # else # if defined(HAVE_LIBIDN) && defined(HAVE_STRINGPREP_H) # define HAVE_UNICODE_NORMALIZATION 1 -# endif /* HAVE_LIBIDN */ +# endif /* HAVE_LIBIDN && HAVE_STRINGPREP_H */ # endif /* HAVE_LIBUNISTRING */ # endif /* HAVE_LIBICUUC */ #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ @@ -1394,6 +1399,9 @@ enum { NORMALIZE_NFKD = 2, NORMALIZE_NFC = 3, NORMALIZE_NFD = 4 +#ifdef HAVE_UNICODE_UNORM2_H + ,NORMALIZE_NFKC_CF = 5 +#endif /* HAVE_UNICODE_UNORM2_H */ # define DEFAULT_NORMALIZE NORMALIZE_NFC # else NORMALIZE_NFKC = 1 @@ -1406,9 +1414,13 @@ enum { # ifdef HAVE_UNICODE_USTRING_H # include # endif /* HAVE_UNICODE_USTRING_H */ -# ifdef HAVE_UNICODE_UNORM_H -# include -# endif /* HAVE_UNICODE_UNORM_H */ +# ifdef HAVE_UNICODE_UNORM2_H +# include +# else +# ifdef HAVE_UNICODE_UNORM_H +# include +# endif /* HAVE_UNICODE_UNORM_H */ +# endif /* HAVE_UNICODE_UNORM2_H */ # ifdef HAVE_UNICODE_UIDNA_H # include # endif /* HAVE_UNICODE_UIDNA_H */ @@ -1492,6 +1504,7 @@ struct t_article { int gnksa_code; /* From: line from mail header (GNKSA error code) */ time_t date; /* Date: line from header in seconds */ char *xref; /* Xref: cross posted article reference line */ + char *path; /* Path: line */ /* NB: The msgid and refs are only retained until the reference tree is built */ char *msgid; /* Message-ID: unique message identifier */ char *refs; /* References: article reference id's */ @@ -1512,6 +1525,20 @@ struct t_article { t_bool keep_in_base:1; /* TRUE = keep (read) article in base[] (show_only_unread_arts) */ }; + +#ifdef NNTP_ABLE +/* + * struct t_article_range - holds ranges of article numbers to perform actions on parts of arts[] + */ +struct t_article_range { + t_artnum start; + t_artnum end; + t_artnum cnt; + struct t_article_range *next; +}; +#endif /* NNTP_ABLE */ + + /* * struct t_newsheader - holds an array of which news headers to [not] display */ @@ -1843,6 +1870,7 @@ struct t_filter { int gnksa_num; /* GNKSA code */ int score; /* score to give if rule matches */ char *xref; /* groups in xref line */ + char *path; /* server in path line */ time_t time; /* expire time in seconds */ struct t_filter *next; /* next rule valid in group */ unsigned int inscope:4; /* if group matches scope e.g. 'comp.os.*' */ @@ -2374,6 +2402,33 @@ extern struct tm *localtime(time_t *); # include #endif /* USE_SASL */ +/* + * adapted from ncurses curses.priv.h: + * If we have va_copy(), use it for assigning va_list's. + */ +#if defined(HAVE___VA_COPY) +# define begin_va_copy(dst,src) __va_copy(dst, src) +# define end_va_copy(dst) va_end(dst) +#else +# if defined(va_copy) || defined(HAVE_VA_COPY) +# define begin_va_copy(dst,src) va_copy(dst, src) +# define end_va_copy(dst) va_end(dst) +# else +# if defined(HAVE___BUILTIN_VA_COPY) +# define begin_va_copy(dst,src) __builtin_va_copy(dst, src) +# define end_va_copy(dst) va_end(dst) +# else +# if defined(ARRAY_VA_LIST) +# define begin_va_copy(dst,src) *(dst) = *(src) +# define end_va_copy(dst) /* nothing */ +# else +# define begin_va_copy(dst,src) (dst) = (src) +# define end_va_copy(dst) /* nothing */ +# endif /* ARRAY_VA_LIST */ +# endif /* HAVE___BUILTIN_VA_COPY */ +# endif /* va_copy || HAVE_VA_COPY */ +#endif /* HAVE___VA_COPY */ + /* snprintf(), vsnprintf() */ #ifndef HAVE_SNPRINTF # define snprintf plp_snprintf diff -Nurp '--exclude=.bzr*' tin-2.4.2/include/tinrc.h tin-2.4.3/include/tinrc.h --- tin-2.4.2/include/tinrc.h 2017-12-08 08:52:23.000000000 +0100 +++ tin-2.4.3/include/tinrc.h 2018-11-23 16:29:04.475736909 +0100 @@ -6,7 +6,7 @@ * Updated : 2017-08-13 * Notes : * - * Copyright (c) 1999-2018 Jason Faultless + * Copyright (c) 1999-2019 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -263,7 +263,7 @@ struct t_config { t_bool default_filter_select_case; t_bool default_filter_select_expire; # ifdef XFACE_ABLE - t_bool use_slrnface; /* Use the slrnface programme to display 'X-Face:'s */ + t_bool use_slrnface; /* Use the slrnface program to display 'X-Face:'s */ # endif /* XFACE_ABLE */ t_bool default_filter_select_global; char select_format[LEN]; /* format string for the selection level */ diff -Nurp '--exclude=.bzr*' tin-2.4.2/include/tnntp.h tin-2.4.3/include/tnntp.h --- tin-2.4.2/include/tnntp.h 2017-12-08 08:52:23.000000000 +0100 +++ tin-2.4.3/include/tnntp.h 2018-11-23 16:29:04.503738043 +0100 @@ -6,7 +6,7 @@ * Updated : 2006-02-15 * Notes : #include files, #defines & struct's * - * Copyright (c) 1997-2018 Thomas Dickey + * Copyright (c) 1997-2019 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/include/trace.h tin-2.4.3/include/trace.h --- tin-2.4.2/include/trace.h 2017-12-08 08:52:23.000000000 +0100 +++ tin-2.4.3/include/trace.h 2018-11-23 16:29:04.527739015 +0100 @@ -6,7 +6,7 @@ * Updated : 2002-11-10 * Notes : Interface of trace.c * - * Copyright (c) 1997-2018 Thomas Dickey + * Copyright (c) 1997-2019 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/include/version.h tin-2.4.3/include/version.h --- tin-2.4.2/include/version.h 2017-12-24 12:52:06.000000000 +0100 +++ tin-2.4.3/include/version.h 2018-12-24 10:28:03.572001790 +0100 @@ -6,7 +6,7 @@ * Updated : 2013-11-21 * Notes : * - * Copyright (c) 1991-2018 Iain Lea + * Copyright (c) 1991-2019 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -40,14 +40,14 @@ # define PRODUCT "tin" # ifndef TIN_AUTOCONF_H -# define VERSION "2.4.2" +# define VERSION "2.4.3" # endif /* !TIN_AUTOCONF_H */ -# define RELEASEDATE "20171224" -# define RELEASENAME "Lochhead" +# define RELEASEDATE "20181224" +# define RELEASENAME "Glen Mhor" /* config-file versions - must by dotted triples */ # define TINRC_VERSION "1.3.15" # define ATTRIBUTES_VERSION "1.0.9" -# define FILTER_VERSION "1.0.0" +# define FILTER_VERSION "1.0.1" # define KEYMAP_VERSION "1.0.9" # define SERVERCONFIG_VERSION "1.0.0" diff -Nurp '--exclude=.bzr*' tin-2.4.2/libcanlock/COPYING tin-2.4.3/libcanlock/COPYING --- tin-2.4.2/libcanlock/COPYING 2017-06-27 18:29:50.000000000 +0200 +++ tin-2.4.3/libcanlock/COPYING 2018-01-02 19:03:46.000000000 +0100 @@ -15,7 +15,7 @@ Note: The following list may not be up-t Please use the license notes in the files as legal basis! Files: configure.ac [*/]Makefile.am doc/*.in* src/secret.c util/canlock.c -Copyright (c) 2017 Michael Baeuerle +Copyright (c) 2018 Michael Baeuerle License: MIT-like Files: src/canlock.c include/canlock.h diff -Nurp '--exclude=.bzr*' tin-2.4.2/libcanlock/ChangeLog tin-2.4.3/libcanlock/ChangeLog --- tin-2.4.2/libcanlock/ChangeLog 2017-07-14 11:55:01.000000000 +0200 +++ tin-2.4.3/libcanlock/ChangeLog 2018-01-25 19:13:04.788089807 +0100 @@ -2,7 +2,7 @@ Changelog ========= -3.0.0 2017-07-14 +3.0.0 2018-01-17 API for arbitrary hash algorithm added (Written by Dennis Preiser) Support for SHA2 added (Using code from RFC6234 section 8) SHA1 implementation replaced (Using code from RFC6234 section 8) diff -Nurp '--exclude=.bzr*' tin-2.4.2/libcanlock/ChangeLog_V3 tin-2.4.3/libcanlock/ChangeLog_V3 --- tin-2.4.2/libcanlock/ChangeLog_V3 2017-07-14 11:55:01.000000000 +0200 +++ tin-2.4.3/libcanlock/ChangeLog_V3 2018-01-25 19:13:04.788089807 +0100 @@ -2,7 +2,7 @@ Changelog ========= -3.0.0 2017-07-14 +3.0.0 2018-01-17 API for arbitrary hash algorithm added (Written by Dennis Preiser) Support for SHA2 added (Using code from RFC6234 section 8) SHA1 implementation replaced (Using code from RFC6234 section 8) diff -Nurp '--exclude=.bzr*' tin-2.4.2/libcanlock/LICENSE tin-2.4.3/libcanlock/LICENSE --- tin-2.4.2/libcanlock/LICENSE 2017-06-27 18:29:50.000000000 +0200 +++ tin-2.4.3/libcanlock/LICENSE 2018-01-02 19:03:46.000000000 +0100 @@ -15,7 +15,7 @@ Note: The following list may not be up-t Please use the license notes in the files as legal basis! Files: configure.ac [*/]Makefile.am doc/*.in* src/secret.c util/canlock.c -Copyright (c) 2017 Michael Baeuerle +Copyright (c) 2018 Michael Baeuerle License: MIT-like Files: src/canlock.c include/canlock.h diff -Nurp '--exclude=.bzr*' tin-2.4.2/libcanlock/Makefile.in tin-2.4.3/libcanlock/Makefile.in --- tin-2.4.2/libcanlock/Makefile.in 2017-08-08 23:35:14.000000000 +0200 +++ tin-2.4.3/libcanlock/Makefile.in 2018-01-25 19:13:04.824091282 +0100 @@ -8,25 +8,30 @@ ARCHIVE = @AR@ @ARFLAGS@ RANLIB = @RANLIB@ RM = rm -LIBOBJS = src/usha.o src/sha1.o src/sha224-256.o src/sha384-512.o src/hmac.o src/base64.o src/canlock.o +LIBOBJS = src/secret.o src/usha.o src/sha1.o src/sha224-256.o src/sha384-512.o src/hmac.o src/base64.o src/canlock.o LOCKLIB = $(PRELIB)canlock.a .c$o : @SHOW_CC@ @ECHO_CC@$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ -all : shatest canlocktest +all : shatest canlocktest canlock -shatest : test/hkdf.o $(LOCKLIB) +canlock : util/canlock.c $(LOCKLIB) @SHOW_CC@ - @ECHO_CC@$(CC) $(CPPFLAGS) $(CFLAGS) test/$@.c -o $@ test/hkdf.o $(LDFLAGS) + @ECHO_CC@$(CC) $(CPPFLAGS) $(CFLAGS) util/$@.c -o $@ $(LDFLAGS) canlocktest : test/canlocktest.c $(LOCKLIB) @SHOW_CC@ @ECHO_CC@$(CC) $(CPPFLAGS) $(CFLAGS) test/$@.c -o $@ $(LDFLAGS) +shatest : test/hkdf.o $(LOCKLIB) + @SHOW_CC@ + @ECHO_CC@$(CC) $(CPPFLAGS) $(CFLAGS) test/$@.c -o $@ test/hkdf.o $(LDFLAGS) + src/base64.o : src/base64.c include/base64.h src/canlock.o : src/canlock.c include/canlock.h +src/secret.o : src/secret.c include/canlock.h src/hmac.o : src/hmac.c include/sha.h src/usha.o : src/usha.c include/sha.h src/sha1.o : src/sha1.c include/sha.h @@ -44,10 +49,10 @@ clean : @-$(RM) -f src/*.o test/*.o test/*.out *.gmon gmon.* distclean : clean - @-$(RM) -f *.a canlocktest shatest *.exe *.h - @-$(RM) -rf canlocktest.dSYM shatest.dSYM + @-$(RM) -f *.a canlock canlocktest shatest *.exe + @-$(RM) -rf canlock.dSYM canlocktest.dSYM shatest.dSYM -test : all +test : canlocktest shatest @echo "shatest: " @./shatest -p @echo diff -Nurp '--exclude=.bzr*' tin-2.4.2/libcanlock/README tin-2.4.3/libcanlock/README --- tin-2.4.2/libcanlock/README 2017-07-14 16:46:01.000000000 +0200 +++ tin-2.4.3/libcanlock/README 2018-01-25 19:13:04.832091610 +0100 @@ -1,7 +1,9 @@ libcanlock ========== -A library for creating and verifying RFC xxxx Netnews Cancel-Locks. +A library for creating and verifying RFC 8315 Netnews Cancel-Locks. +This implementation uses the recommended algorithm from Section 4 with HMAC +based on the same hash function as . 1) General diff -Nurp '--exclude=.bzr*' tin-2.4.2/libcanlock/include/canlock-private.h tin-2.4.3/libcanlock/include/canlock-private.h --- tin-2.4.2/libcanlock/include/canlock-private.h 1970-01-01 01:00:00.000000000 +0100 +++ tin-2.4.3/libcanlock/include/canlock-private.h 2018-01-05 19:32:49.000000000 +0100 @@ -0,0 +1,45 @@ +/* + * COPYRIGHT AND PERMISSION NOTICE + * + * Copyright (c) 2018 Michael Baeuerle + * + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, and/or sell copies of the Software, and to permit persons + * to whom the Software is furnished to do so, provided that the above + * copyright notice(s) and this permission notice appear in all copies of + * the Software and that both the above copyright notice(s) and this + * permission notice appear in supporting documentation. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT + * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY + * SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF + * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Except as contained in this notice, the name of a copyright holder + * shall not be used in advertising or otherwise to promote the sale, use + * or other dealings in this Software without prior written authorization + * of the copyright holder. + */ + +#ifndef _CANLOCK_PRIVATE_H +#define _CANLOCK_PRIVATE_H + + +#include + +extern int cl_clear_secret(void *sec, size_t sec_size, size_t buf_size); + + +#endif /* _CANLOCK_PRIVATE_H */ + +/* EOF */ diff -Nurp '--exclude=.bzr*' tin-2.4.2/libcanlock/include/canlock.h tin-2.4.3/libcanlock/include/canlock.h --- tin-2.4.2/libcanlock/include/canlock.h 2017-06-28 16:23:19.000000000 +0200 +++ tin-2.4.3/libcanlock/include/canlock.h 2018-01-25 19:13:04.848092266 +0100 @@ -1,9 +1,9 @@ /* * COPYRIGHT AND PERMISSION NOTICE * - * Copyright (c) 2017 Dennis Preiser - * Copyright (c) 2017 Michael Baeuerle * Copyright (c) 2003 G.J. Andruk + * Copyright (c) 2017 Dennis Preiser + * Copyright (c) 2018 Michael Baeuerle * * All rights reserved. * @@ -38,6 +38,12 @@ /* ========================================================================== */ +/* Include header files */ + +#include /* For size_t */ + + +/* ========================================================================== */ /* Constants */ /* libcanlock API major version */ @@ -49,7 +55,7 @@ /* libcanlock legacy API V2 emulation available if nonzero */ #define CL_API_V2 1 -/* Supported hash algorithms for according to RFCxxxx */ +/* Supported hash algorithms for according to RFC 8315 */ #define CL_INVALID 0 #define CL_SHA1 1 /* IANA registered name: "sha1" */ #define CL_SHA224 2 /* IANA registered name: "sha224" */ diff -Nurp '--exclude=.bzr*' tin-2.4.2/libcanlock/include/config.h tin-2.4.3/libcanlock/include/config.h --- tin-2.4.2/libcanlock/include/config.h 1970-01-01 01:00:00.000000000 +0100 +++ tin-2.4.3/libcanlock/include/config.h 2018-01-10 20:02:59.000000000 +0100 @@ -0,0 +1,9 @@ +#ifndef TIN_AUTOCONF_H +# include "autoconf.h" +#endif /* !TIN_AUTOCONF_H */ + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "libcanlock" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "libcanlock 3.0.0" diff -Nurp '--exclude=.bzr*' tin-2.4.2/libcanlock/src/hmac.c tin-2.4.3/libcanlock/src/hmac.c --- tin-2.4.2/libcanlock/src/hmac.c 2017-03-12 16:14:37.000000000 +0100 +++ tin-2.4.3/libcanlock/src/hmac.c 2018-01-05 19:50:45.000000000 +0100 @@ -11,6 +11,7 @@ * the various SHA algorithms. */ +#include "canlock-private.h" #include "sha.h" /* @@ -46,10 +47,14 @@ int hmac(SHAversion whichSha, const unsigned char *key, int key_len, uint8_t digest[USHAMaxHashSize]) { - HMACContext context; - return hmacReset(&context, whichSha, key, key_len) || - hmacInput(&context, message_array, length) || - hmacResult(&context, digest); + int res; + HMACContext context; /* Security review: Location L1 */ + + res = hmacReset(&context, whichSha, key, key_len) || + hmacInput(&context, message_array, length) || + hmacResult(&context, digest); + cl_clear_secret((void *) &context, sizeof(HMACContext), sizeof(HMACContext)); + return res; } /* @@ -79,6 +84,7 @@ int hmacReset(HMACContext *context, enum int i, blocksize, hashsize, ret; /* inner padding - key XORd with ipad */ + /* Security review: Location L3 */ unsigned char k_ipad[USHA_Max_Message_Block_Size]; /* temporary buffer when keylen > blocksize */ @@ -97,7 +103,7 @@ int hmacReset(HMACContext *context, enum * reset it to key = HASH(key). */ if (key_len > blocksize) { - USHAContext tcontext; + USHAContext tcontext; /* Security review: Location L2 */ int err = USHAReset(&tcontext, whichSha) || USHAInput(&tcontext, key, key_len) || USHAResult(&tcontext, tempkey); @@ -105,6 +111,9 @@ int hmacReset(HMACContext *context, enum key = tempkey; key_len = hashsize; + /* tcontext contains a buffer to which key is copied by USHAInput() */ + cl_clear_secret((void *) &tcontext, + sizeof(USHAContext), sizeof(USHAContext)); } /* @@ -134,6 +143,7 @@ int hmacReset(HMACContext *context, enum ret = USHAReset(&context->shaContext, whichSha) || /* and start with inner pad */ USHAInput(&context->shaContext, k_ipad, blocksize); + cl_clear_secret((void *) k_ipad, sizeof(k_ipad), sizeof(k_ipad)); return context->Corrupted = ret; } diff -Nurp '--exclude=.bzr*' tin-2.4.2/libcanlock/src/secret.c tin-2.4.3/libcanlock/src/secret.c --- tin-2.4.2/libcanlock/src/secret.c 2017-07-14 15:20:33.000000000 +0200 +++ tin-2.4.3/libcanlock/src/secret.c 2018-01-25 19:13:04.856092593 +0100 @@ -1,5 +1,5 @@ /* ========================================================================== */ -/* Copyright (c) 2017 Michael Baeuerle +/* Copyright (c) 2018 Michael Baeuerle * * All rights reserved. * @@ -78,7 +78,7 @@ int cl_clear_secret(void *sec, size_t se * #if defined(__STDC_LIB_EXT1__) * We use the check result from autoconf instead */ -#if HAVE_MEMSET_S +#ifdef HAVE_MEMSET_S /* Standard solution using C11 Annex K */ res = (int) memset_s(sec, buf_size, 0, sec_size); if (res) @@ -89,27 +89,25 @@ int cl_clear_secret(void *sec, size_t se #else /* HAVE_MEMSET_S */ if (sec_size <= buf_size) { - /* - * There seems to be no portable way to enforce memory access in C99. - * But there is a chance that the optimizer is not smart enough and - * 'memset()' will do the job. - */ - memset(sec, 0, sec_size); - res = 1; - - /* -------------------------------------------------------------------- */ - /* OS specific functions can be called here */ - -# if HAVE_EXPLICIT_MEMSET + /* OS specific functions should be called here, if available */ +# ifdef HAVE_EXPLICIT_MEMSET /* NetBSD has 'explicit_memset()' since version 7.0 */ explicit_memset(sec, 0, sec_size); res = 0; -# elif HAVE_EXPLICIT_BZERO +# elif defined(HAVE_EXPLICIT_BZERO) /* OpenBSD has 'explicit_bzero()' since version 5.5 */ /* GNU libc has 'explicit_bzero()' since version 2.25 */ explicit_bzero(sec, sec_size); res = 0; -# endif /* HAVE_EXPLICIT_MEMSET */ +# else /* HAVE_EXPLICIT_MEMSET */ + /* + * There seems to be no portable way to enforce memory access in C99. + * But there is a chance that the optimizer is not smart enough and + * 'memset()' will do the job. + */ + memset(sec, 0, sec_size); + res = 1; +# endif } #endif /* HAVE_MEMSET_S */ } diff -Nurp '--exclude=.bzr*' tin-2.4.2/libcanlock/src/sha1.c tin-2.4.3/libcanlock/src/sha1.c --- tin-2.4.2/libcanlock/src/sha1.c 2017-03-11 15:57:45.000000000 +0100 +++ tin-2.4.3/libcanlock/src/sha1.c 2018-01-05 19:51:42.000000000 +0100 @@ -36,6 +36,7 @@ * the input. */ +#include "canlock-private.h" #include "sha.h" #include "sha-private.h" @@ -255,7 +256,7 @@ static void SHA1ProcessMessageBlock(SHA1 }; int t; /* Loop counter */ uint32_t temp; /* Temporary word value */ - uint32_t W[80]; /* Word sequence */ + uint32_t W[80]; /* Word sequence. Security review: Location L4 */ uint32_t A, B, C, D, E; /* Word buffers */ /* @@ -313,6 +314,8 @@ static void SHA1ProcessMessageBlock(SHA1 A = temp; } + cl_clear_secret((void *) W, sizeof(W), sizeof(W)); + context->Intermediate_Hash[0] += A; context->Intermediate_Hash[1] += B; context->Intermediate_Hash[2] += C; diff -Nurp '--exclude=.bzr*' tin-2.4.2/libcanlock/src/sha224-256.c tin-2.4.3/libcanlock/src/sha224-256.c --- tin-2.4.2/libcanlock/src/sha224-256.c 2017-05-06 10:44:26.000000000 +0200 +++ tin-2.4.3/libcanlock/src/sha224-256.c 2018-01-05 20:17:36.000000000 +0100 @@ -40,6 +40,7 @@ * to hash the final few bits of the input. */ +#include "canlock-private.h" #include "sha.h" #include "sha-private.h" @@ -400,9 +401,9 @@ static void SHA224_256ProcessMessageBloc 0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2 }; - int t, t4; /* Loop counter */ - uint32_t temp1, temp2; /* Temporary word value */ - uint32_t W[64]; /* Word sequence */ + int t, t4; /* Loop counter */ + uint32_t temp1, temp2; /* Temporary word value */ + uint32_t W[64]; /* Word sequence. Security review: Location L5 */ uint32_t A, B, C, D, E, F, G, H; /* Word buffers */ /* @@ -440,6 +441,8 @@ static void SHA224_256ProcessMessageBloc A = temp1 + temp2; } + cl_clear_secret((void *) W, sizeof(W), sizeof(W)); + context->Intermediate_Hash[0] += A; context->Intermediate_Hash[1] += B; context->Intermediate_Hash[2] += C; diff -Nurp '--exclude=.bzr*' tin-2.4.2/libcanlock/src/sha384-512.c tin-2.4.3/libcanlock/src/sha384-512.c --- tin-2.4.2/libcanlock/src/sha384-512.c 2017-05-04 12:07:37.000000000 +0200 +++ tin-2.4.3/libcanlock/src/sha384-512.c 2018-01-05 20:22:43.000000000 +0100 @@ -43,6 +43,7 @@ * */ +#include "canlock-private.h" #include "sha.h" #ifdef USE_32BIT_ONLY @@ -678,7 +679,7 @@ static void SHA384_512ProcessMessageBloc int t, t2, t8; /* Loop counter */ uint32_t temp1[2], temp2[2], /* Temporary word values */ temp3[2], temp4[2], temp5[2]; - uint32_t W[2*80]; /* Word sequence */ + uint32_t W[2*80]; /* Word sequence. Security review: Location L6a */ uint32_t A[2], B[2], C[2], D[2], /* Word buffers */ E[2], F[2], G[2], H[2]; @@ -751,6 +752,8 @@ static void SHA384_512ProcessMessageBloc SHA512_ADD(temp1, temp2, A); } + cl_clear_secret((void *) W, sizeof(W), sizeof(W)); + SHA512_ADDTO2(&context->Intermediate_Hash[0], A); SHA512_ADDTO2(&context->Intermediate_Hash[2], B); SHA512_ADDTO2(&context->Intermediate_Hash[4], C); @@ -791,9 +794,9 @@ static void SHA384_512ProcessMessageBloc 0x431D67C49C100D4Cll, 0x4CC5D4BECB3E42B6ll, 0x597F299CFC657E2All, 0x5FCB6FAB3AD6FAECll, 0x6C44198C4A475817ll }; - int t, t8; /* Loop counter */ - uint64_t temp1, temp2; /* Temporary word value */ - uint64_t W[80]; /* Word sequence */ + int t, t8; /* Loop counter */ + uint64_t temp1, temp2; /* Temporary word value */ + uint64_t W[80]; /* Word sequence. Security review: Location L6b */ uint64_t A, B, C, D, E, F, G, H; /* Word buffers */ /* @@ -834,6 +837,8 @@ static void SHA384_512ProcessMessageBloc A = temp1 + temp2; } + cl_clear_secret((void *) W, sizeof(W), sizeof(W)); + context->Intermediate_Hash[0] += A; context->Intermediate_Hash[1] += B; context->Intermediate_Hash[2] += C; diff -Nurp '--exclude=.bzr*' tin-2.4.2/pcre/pcre_compile.c tin-2.4.3/pcre/pcre_compile.c --- tin-2.4.2/pcre/pcre_compile.c 2017-05-03 19:47:33.000000000 +0200 +++ tin-2.4.3/pcre/pcre_compile.c 2018-12-19 14:01:58.855811855 +0100 @@ -312,7 +312,7 @@ static const unsigned char digitab[] = 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* - 71 40 */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 72- | */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* & - 87 50 */ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 88- ¬ */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 88- ¬ */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* - -103 60 */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 104- ? */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 112-119 70 */ @@ -346,7 +346,7 @@ static const unsigned char ebcdic_charta 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* - 71 */ 0x00,0x00,0x00,0x80,0x00,0x80,0x80,0x80, /* 72- | */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* & - 87 */ - 0x00,0x00,0x00,0x80,0x80,0x80,0x00,0x00, /* 88- ¬ */ + 0x00,0x00,0x00,0x80,0x80,0x80,0x00,0x00, /* 88- ¬ */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* - -103 */ 0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x80, /* 104- ? */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 112-119 */ diff -Nurp '--exclude=.bzr*' tin-2.4.2/pcre/pcre_study.c tin-2.4.3/pcre/pcre_study.c --- tin-2.4.2/pcre/pcre_study.c 2017-05-03 19:47:33.000000000 +0200 +++ tin-2.4.3/pcre/pcre_study.c 2018-07-03 17:12:16.866419201 +0200 @@ -416,7 +416,7 @@ do for (c = 0; c < 16; c++) start_bits[c] |= tcode[c]; for (c = 128; c < 256; c++) { - if ((tcode[c/8] && (1 << (c&7))) != 0) + if ((tcode[c/8] & (1 << (c&7))) != 0) { int d = (c >> 6) | 0xc0; /* Set bit for this starter */ start_bits[d/8] |= (1 << (d&7)); /* and then skip on to the */ diff -Nurp '--exclude=.bzr*' tin-2.4.2/po/POTFILES.in tin-2.4.3/po/POTFILES.in --- tin-2.4.2/po/POTFILES.in 2017-05-03 19:47:33.000000000 +0200 +++ tin-2.4.3/po/POTFILES.in 2018-04-19 13:40:32.470128651 +0200 @@ -2,33 +2,20 @@ src/active.c src/art.c src/attrib.c src/auth.c -src/charset.c -src/color.c src/config.c src/cook.c src/curses.c -src/debug.c -src/envarg.c src/feed.c src/filter.c -src/getline.c -src/global.c src/group.c -src/hashstr.c src/header.c src/help.c src/inews.c src/init.c -src/joinpath.c src/keymap.c src/lang.c -src/langinfo.c -src/list.c -src/lock.c src/mail.c src/main.c -src/memory.c -src/mimetypes.c src/misc.c src/my_tmpfile.c src/newsrc.c @@ -37,30 +24,21 @@ src/nrctbl.c src/options_menu.c src/page.c src/pgp.c -src/plp_snprintf.c src/post.c src/prompt.c src/read.c src/refs.c src/regex.c -src/rfc1524.c -src/rfc2045.c src/rfc2046.c src/rfc2047.c src/save.c src/screen.c src/search.c src/select.c -src/sigfile.c src/signal.c -src/strftime.c src/string.c src/tags.c -src/tcurses.c src/thread.c -src/tmpfile.c -src/trace.c src/version.c -src/wildmat.c src/xface.c src/xref.c Binary files tin-2.4.2/po/da.gmo and tin-2.4.3/po/da.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.2/po/da.po tin-2.4.3/po/da.po --- tin-2.4.2/po/da.po 2017-12-08 09:39:45.000000000 +0100 +++ tin-2.4.3/po/da.po 2018-12-24 10:02:03.650917852 +0100 @@ -74,7 +74,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 2.4.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-08 09:39+0100\n" +"POT-Creation-Date: 2018-12-24 10:02+0100\n" "PO-Revision-Date: 2017-02-04 09:14+0100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -84,11 +84,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: src/attrib.c:954 +#: src/attrib.c:964 msgid "Processing attributes... " msgstr "Behandler attributter ... " -#: src/attrib.c:1176 +#: src/attrib.c:1186 #, c-format msgid "" "# Do not edit this comment block\n" @@ -97,399 +97,399 @@ msgstr "" "# Rediger ikke denne kommentarblok\n" "#\n" -#: src/attrib.c:1177 +#: src/attrib.c:1187 #, c-format msgid "# scope=STRING (eg. alt.*,!alt.bin*) [mandatory]\n" msgstr "# scope=STRING (f.eks. alt.*,!alt.bin*) [krævet]\n" -#: src/attrib.c:1178 +#: src/attrib.c:1188 #, c-format msgid "# add_posted_to_filter=ON/OFF\n" msgstr "# add_posted_to_filter=ON/OFF\n" -#: src/attrib.c:1179 +#: src/attrib.c:1189 #, c-format msgid "# advertising=ON/OFF\n" msgstr "# advertising=ON/OFF\n" -#: src/attrib.c:1180 +#: src/attrib.c:1190 #, c-format msgid "# alternative_handling=ON/OFF\n" msgstr "# alternative_handling=ON/OFF\n" -#: src/attrib.c:1181 +#: src/attrib.c:1191 #, c-format msgid "# ask_for_metamail=ON/OFF\n" msgstr "# ask_for_metamail=ON/OFF\n" -#: src/attrib.c:1182 +#: src/attrib.c:1192 #, c-format msgid "# auto_cc_bcc=NUM\n" msgstr "# auto_cc_bcc=NUM\n" -#: src/attrib.c:1183 +#: src/attrib.c:1193 #, c-format msgid "# 0=No, 1=Cc, 2=Bcc, 3=Cc and Bcc\n" msgstr "# 0=No, 1=Cc, 2=Bcc, 3=Cc og Bcc\n" -#: src/attrib.c:1184 +#: src/attrib.c:1194 #, c-format msgid "# auto_list_thread=ON/OFF\n" msgstr "# auto_list_thread=ON/OFF\n" -#: src/attrib.c:1185 +#: src/attrib.c:1195 #, c-format msgid "# auto_save=ON/OFF\n" msgstr "# auto_save=ON/OFF\n" -#: src/attrib.c:1186 +#: src/attrib.c:1196 #, c-format msgid "# auto_select=ON/OFF\n" msgstr "# auto_select=ON/OFF\n" -#: src/attrib.c:1187 +#: src/attrib.c:1197 #, c-format msgid "# batch_save=ON/OFF\n" msgstr "# batch_save=ON/OFF\n" -#: src/attrib.c:1188 +#: src/attrib.c:1198 #, c-format msgid "# date_format=STRING (eg. %%a, %%d %%b %%Y %%H:%%M:%%S)\n" msgstr "# date_format=STRING (f.eks. %%a, %%d %%b %%Y %%H:%%M:%%S)\n" -#: src/attrib.c:1189 +#: src/attrib.c:1199 #, c-format msgid "# delete_tmp_files=ON/OFF\n" msgstr "# delete_tmp_files=ON/OFF\n" -#: src/attrib.c:1190 +#: src/attrib.c:1200 #, c-format msgid "# editor_format=STRING (eg. %%E +%%N %%F)\n" msgstr "# editor_format=STRING (f.eks. %%E +%%N %%F)\n" -#: src/attrib.c:1191 +#: src/attrib.c:1201 #, c-format msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "# fcc=STRING (f.eks. =postkasse)\n" -#: src/attrib.c:1192 +#: src/attrib.c:1202 #, c-format msgid "# followup_to=STRING\n" msgstr "# followup_to=STRING\n" -#: src/attrib.c:1193 +#: src/attrib.c:1203 #, c-format msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "" "# from=STRING (tilføj bare ønsket From:-linje, brug ikke anførselstegn)\n" -#: src/attrib.c:1194 +#: src/attrib.c:1204 #, c-format msgid "# group_catchup_on_exit=ON/OFF\n" msgstr "# group_catchup_on_exit=ON/OFF\n" -#: src/attrib.c:1195 +#: src/attrib.c:1205 #, c-format msgid "# group_format=STRING (eg. %%n %%m %%R %%L %%s %%F)\n" msgstr "# group_format=STRING (f.eks. %%n %%m %%R %%L %%s %%F)\n" -#: src/attrib.c:1196 +#: src/attrib.c:1206 #, c-format msgid "# mail_8bit_header=ON/OFF\n" msgstr "# mail_8bit_header=ON/OFF\n" -#: src/attrib.c:1197 +#: src/attrib.c:1207 #, c-format msgid "# mail_mime_encoding=supported_encoding" msgstr "# mail_mime_encoding=supported_encoding" -#: src/attrib.c:1205 +#: src/attrib.c:1215 #, c-format msgid "# ispell=STRING\n" msgstr "# ispell=STRING\n" -#: src/attrib.c:1207 +#: src/attrib.c:1217 #, c-format msgid "# maildir=STRING (eg. ~/Mail)\n" msgstr "# maildir=STRING (f.eks. ~/Post)\n" -#: src/attrib.c:1208 +#: src/attrib.c:1218 #, c-format msgid "# mailing_list=STRING (eg. majordomo@example.org)\n" msgstr "# mailing_list=STRING (f.eks. majordomo@example.org)\n" -#: src/attrib.c:1209 +#: src/attrib.c:1219 #, c-format msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "# mime_types_to_save=STRING (f.eks. image/*,!image/bmp)\n" -#: src/attrib.c:1210 +#: src/attrib.c:1220 #, c-format msgid "# mark_ignore_tags=ON/OFF\n" msgstr "# mark_ignore_tags=ON/OFF\n" -#: src/attrib.c:1211 +#: src/attrib.c:1221 #, c-format msgid "# mark_saved_read=ON/OFF\n" msgstr "# mark_saved_read=ON/OFF\n" -#: src/attrib.c:1212 +#: src/attrib.c:1222 #, c-format msgid "# mime_forward=ON/OFF\n" msgstr "# mime_forward=ON/OFF\n" -#: src/attrib.c:1214 +#: src/attrib.c:1224 #, c-format msgid "# mm_network_charset=supported_charset" msgstr "# mm_network_charset=supported_charset" -#: src/attrib.c:1221 +#: src/attrib.c:1231 #, c-format msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "# undeclared_charset=STRING (standard er US-ASCII)\n" -#: src/attrib.c:1223 +#: src/attrib.c:1233 #, c-format msgid "# news_headers_to_display=STRING\n" msgstr "# news_headers_to_display=STRING\n" -#: src/attrib.c:1224 +#: src/attrib.c:1234 #, c-format msgid "# news_headers_to_not_display=STRING\n" msgstr "# news_headers_to_not_display=STRING\n" -#: src/attrib.c:1225 +#: src/attrib.c:1235 #, c-format msgid "# news_quote_format=STRING\n" msgstr "# news_quote_format=STRING\n" -#: src/attrib.c:1226 +#: src/attrib.c:1236 #, c-format msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "# organization=STRING (hvis '/' er i begyndelsen, sÃ¥ læs fra fil)\n" -#: src/attrib.c:1227 +#: src/attrib.c:1237 #, c-format msgid "# pos_first_unread=ON/OFF\n" msgstr "# pos_first_unread=ON/OFF\n" -#: src/attrib.c:1228 +#: src/attrib.c:1238 #, c-format msgid "# post_8bit_header=ON/OFF\n" msgstr "# post_8bit_header=ON/OFF\n" -#: src/attrib.c:1229 +#: src/attrib.c:1239 #, c-format msgid "# post_mime_encoding=supported_encoding" msgstr "# post_mime_encoding=supported_encoding" -#: src/attrib.c:1236 +#: src/attrib.c:1246 #, c-format msgid "# post_process_type=NUM\n" msgstr "# post_process_type=NUM\n" -#: src/attrib.c:1241 +#: src/attrib.c:1251 #, c-format msgid "# post_process_view=ON/OFF\n" msgstr "# post_process_view=ON/OFF\n" -#: src/attrib.c:1242 +#: src/attrib.c:1252 #, c-format msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "# quick_kill_scope=STRING (f.eks. talk.*)\n" -#: src/attrib.c:1243 +#: src/attrib.c:1253 #, c-format msgid "# quick_kill_expire=ON/OFF\n" msgstr "# quick_kill_expire=ON/OFF\n" -#: src/attrib.c:1244 +#: src/attrib.c:1254 #, c-format msgid "# quick_kill_case=ON/OFF\n" msgstr "# quick_kill_case=ON/OFF\n" -#: src/attrib.c:1245 +#: src/attrib.c:1255 #, c-format msgid "# quick_kill_header=NUM\n" msgstr "# quick_kill_header=NUM\n" -#: src/attrib.c:1246 src/attrib.c:1255 +#: src/attrib.c:1256 src/attrib.c:1265 #, c-format msgid "# 0=Subject: (case sensitive) 1=Subject: (ignore case)\n" msgstr "# 0=Subject: (versalfølsom) 1=Subject: (ikke versalfølsom)\n" -#: src/attrib.c:1247 src/attrib.c:1256 +#: src/attrib.c:1257 src/attrib.c:1266 #, c-format msgid "# 2=From: (case sensitive) 3=From: (ignore case)\n" msgstr "# 2=From: (versalfølsom) 3=From: (ikke versalfølsom)\n" -#: src/attrib.c:1248 src/attrib.c:1257 +#: src/attrib.c:1258 src/attrib.c:1267 #, c-format msgid "# 4=Message-ID: & full References: line\n" msgstr "# 4=Message-ID: og fulde References: linje\n" -#: src/attrib.c:1249 src/attrib.c:1258 +#: src/attrib.c:1259 src/attrib.c:1268 #, c-format msgid "# 5=Message-ID: & last References: entry only\n" msgstr "# 5=Message-ID: og sidste References: kun indtastning\n" # Lines skal ikke oversættes -#: src/attrib.c:1250 src/attrib.c:1259 +#: src/attrib.c:1260 src/attrib.c:1269 #, c-format msgid "# 6=Message-ID: entry only 7=Lines:\n" msgstr "# 6=Message-ID: kun indtastning 7=Lines:\n" -#: src/attrib.c:1251 +#: src/attrib.c:1261 #, c-format msgid "# quick_select_scope=STRING\n" msgstr "# quick_select_scope=STRING\n" -#: src/attrib.c:1252 +#: src/attrib.c:1262 #, c-format msgid "# quick_select_expire=ON/OFF\n" msgstr "# quick_select_expire=ON/OFF\n" -#: src/attrib.c:1253 +#: src/attrib.c:1263 #, c-format msgid "# quick_select_case=ON/OFF\n" msgstr "# quick_select_case=ON/OFF\n" -#: src/attrib.c:1254 +#: src/attrib.c:1264 #, c-format msgid "# quick_select_header=NUM\n" msgstr "# quick_select_header=NUM\n" -#: src/attrib.c:1260 +#: src/attrib.c:1270 #, c-format msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "# quote_chars=STRING (%%s, %%S for initialer)\n" -#: src/attrib.c:1262 +#: src/attrib.c:1272 #, c-format msgid "# print_header=ON/OFF\n" msgstr "# print_header=ON/OFF\n" -#: src/attrib.c:1264 +#: src/attrib.c:1274 #, c-format msgid "# process_only_unread=ON/OFF\n" msgstr "# process_only_unread=ON/OFF\n" -#: src/attrib.c:1265 +#: src/attrib.c:1275 #, c-format msgid "# prompt_followupto=ON/OFF\n" msgstr "# prompt_followupto=ON/OFF\n" -#: src/attrib.c:1266 +#: src/attrib.c:1276 #, c-format msgid "# savedir=STRING (eg. ~user/News)\n" msgstr "# savedir=STRING (f.eks. ~user/News)\n" -#: src/attrib.c:1267 +#: src/attrib.c:1277 #, c-format msgid "# savefile=STRING (eg. =linux)\n" msgstr "# savefile=STRING (f.eks. =linux)\n" -#: src/attrib.c:1268 +#: src/attrib.c:1278 #, c-format msgid "# sigfile=STRING (eg. $var/sig)\n" msgstr "# sigfile=STRING (f.eks. $var/sig)\n" -#: src/attrib.c:1269 +#: src/attrib.c:1279 #, c-format msgid "# show_author=NUM\n" msgstr "# show_author=NUM\n" -#: src/attrib.c:1275 +#: src/attrib.c:1285 #, c-format msgid "# show_signatures=ON/OFF\n" msgstr "# show_signatures=ON/OFF\n" -#: src/attrib.c:1276 +#: src/attrib.c:1286 #, c-format msgid "# show_only_unread_arts=ON/OFF\n" msgstr "# show_only_unread_arts=ON/OFF\n" -#: src/attrib.c:1277 +#: src/attrib.c:1287 #, c-format msgid "# sigdashes=ON/OFF\n" msgstr "# sigdashes=ON/OFF\n" -#: src/attrib.c:1278 +#: src/attrib.c:1288 #, c-format msgid "# signature_repost=ON/OFF\n" msgstr "# signature_repost=ON/OFF\n" -#: src/attrib.c:1279 +#: src/attrib.c:1289 #, c-format msgid "# sort_article_type=NUM\n" msgstr "# sort_article_type=NUM\n" -#: src/attrib.c:1297 +#: src/attrib.c:1307 #, c-format msgid "# sort_threads_type=NUM\n" msgstr "# sort_threads_type=NUM\n" -#: src/attrib.c:1306 +#: src/attrib.c:1316 #, c-format msgid "# start_editor_offset=ON/OFF\n" msgstr "# start_editor_offset=ON/OFF\n" -#: src/attrib.c:1307 +#: src/attrib.c:1317 #, c-format msgid "# tex2iso_conv=ON/OFF\n" msgstr "# tex2iso_conv=ON/OFF\n" -#: src/attrib.c:1308 +#: src/attrib.c:1318 #, c-format msgid "# thread_catchup_on_exit=ON/OFF\n" msgstr "# thread_catchup_on_exit=ON/OFF\n" -#: src/attrib.c:1309 +#: src/attrib.c:1319 #, c-format msgid "# thread_articles=NUM" msgstr "# thread_articles=NUM" -#: src/attrib.c:1316 +#: src/attrib.c:1326 #, c-format msgid "# thread_format=STRING (eg. %%n %%m [%%L] %%T %%F)\n" msgstr "# thread_format=STRING (f.eks. %%n %%m [%%L] %%T %%F)\n" -#: src/attrib.c:1317 +#: src/attrib.c:1327 #, c-format msgid "# thread_perc=NUM\n" msgstr "# thread_perc=NUM\n" -#: src/attrib.c:1318 +#: src/attrib.c:1328 #, c-format msgid "# trim_article_body=NUM\n" msgstr "# trim_article_body=NUM\n" -#: src/attrib.c:1319 +#: src/attrib.c:1329 #, c-format msgid "# 0 = Don't trim article body\n" msgstr "# 0 = Beskær ikke artiklens tekst\n" -#: src/attrib.c:1320 +#: src/attrib.c:1330 #, c-format msgid "# 1 = Skip leading blank lines\n" msgstr "# 1 = Udelad foranstillede tomme linjer\n" -#: src/attrib.c:1321 +#: src/attrib.c:1331 #, c-format msgid "# 2 = Skip trailing blank lines\n" msgstr "# 2 = Udelad efterstillede tomme linjer\n" -#: src/attrib.c:1322 +#: src/attrib.c:1332 #, c-format msgid "# 3 = Skip leading and trailing blank lines\n" msgstr "# 3 = Udelad foranstillede og efterstillede tomme linjer\n" -#: src/attrib.c:1323 +#: src/attrib.c:1333 #, c-format msgid "# 4 = Compact multiple blank lines between text blocks\n" msgstr "# 4 = Komprimer flere tomme linjer mellem tekstblokke\n" -#: src/attrib.c:1324 +#: src/attrib.c:1334 #, c-format msgid "" "# 5 = Compact multiple blank lines between text blocks and skip\n" @@ -498,7 +498,7 @@ msgstr "" "# 5 = Komprimer flere tomme linjer mellem tekstblokke og udelad\n" "# foranstillede tomme linjer\n" -#: src/attrib.c:1325 +#: src/attrib.c:1335 #, c-format msgid "" "# 6 = Compact multiple blank lines between text blocks and skip\n" @@ -507,7 +507,7 @@ msgstr "" "# 6 = Komprimer flere tomme linjer mellem tekstblokke og udelad\n" "# efterstillede tomme linjer\n" -#: src/attrib.c:1326 +#: src/attrib.c:1336 #, c-format msgid "" "# 7 = Compact multiple blank lines between text blocks and skip\n" @@ -516,37 +516,37 @@ msgstr "" "# 7 = Komprimer flere tomme linjer mellem tekstblokke og udelad\n" "# foranstillede og efterstillede tomme linjer\n" -#: src/attrib.c:1327 +#: src/attrib.c:1337 #, c-format msgid "# verbatim_handling=ON/OFF\n" msgstr "# verbatim_handling=ON/OFF\n" -#: src/attrib.c:1329 +#: src/attrib.c:1339 #, c-format msgid "# extquote_handling=ON/OFF\n" msgstr "# extquote_handling=ON/OFF\n" -#: src/attrib.c:1331 +#: src/attrib.c:1341 #, c-format msgid "# wrap_on_next_unread=ON/OFF\n" msgstr "# wrap_on_next_unread=ON/OFF\n" -#: src/attrib.c:1332 +#: src/attrib.c:1342 #, c-format msgid "# x_body=STRING (eg. ~/.tin/extra-body-text)\n" msgstr "# x_body=STRING (f.eks. ~/.tin/extra-body-text)\n" -#: src/attrib.c:1333 +#: src/attrib.c:1343 #, c-format msgid "# x_comment_to=ON/OFF\n" msgstr "# x_comment_to=ON/OFF\n" -#: src/attrib.c:1334 +#: src/attrib.c:1344 #, c-format msgid "# x_headers=STRING (eg. ~/.tin/extra-headers)\n" msgstr "# x_headers=STRING (f.eks. ~/.tin/extra-headers)\n" -#: src/attrib.c:1335 +#: src/attrib.c:1345 #, c-format msgid "" "#\n" @@ -556,7 +556,7 @@ msgstr "" "# Bemærk at det er bedst at vælge generel (globalt virkefelt)\n" # helt blank pÃ¥ hvad de mener her -#: src/attrib.c:1336 +#: src/attrib.c:1346 #, c-format msgid "" "# entries first followed by group specific entries.\n" @@ -565,7 +565,7 @@ msgstr "" "# poster først, efterfulgt af gruppespecifikke poster.\n" "#\n" -#: src/attrib.c:1337 +#: src/attrib.c:1347 #, c-format msgid "############################################################################\n" msgstr "############################################################################\n" @@ -860,59 +860,54 @@ msgstr "Automarkerer artikler (brug »%s #: src/lang.c:107 #, c-format -msgid "Active file corrupt - %s" -msgstr "Aktiv fil korrupt - %s" - -#: src/lang.c:108 -#, c-format msgid "" "Article to be posted resulted in errors/warnings. %s=quit, %s=Menu, %s=edit: " msgstr "" "Artikel til indsendelse medførte fejl/advarsler. %s=afslut, %s=menu, " "%s=rediger: " -#: src/lang.c:109 +#: src/lang.c:108 #, c-format msgid "Unrecognized attribute: %s" msgstr "Attribut ikke genkendt: %s" -#: src/lang.c:110 +#: src/lang.c:109 #, c-format msgid "Bad command. Type '%s' for help." msgstr "Forkert kommando. Tast »%s« for hjælp." -#: src/lang.c:112 +#: src/lang.c:111 msgid "Base article" msgstr "Baseartikel" -#: src/lang.c:113 +#: src/lang.c:112 msgid "Base article range" msgstr "Interval for baseartikel" -#: src/lang.c:114 +#: src/lang.c:113 #, c-format msgid "%s: Updating of index files not supported: cache_overview_files=%s" msgstr "" "%s: Opdatering af indeksfiler er ikke understøttet: cache_overview_files=%s" -#: src/lang.c:115 +#: src/lang.c:114 msgid "*** Beginning of article ***" msgstr "*** Begyndelse pÃ¥ artikel ***" -#: src/lang.c:116 +#: src/lang.c:115 msgid "*** Beginning of page ***" msgstr "*** Begyndelse pÃ¥ side ***" -#: src/lang.c:118 +#: src/lang.c:117 #, c-format msgid "Cancel (delete) or supersede (overwrite) article [%%s]? (%s/%s/%s): " msgstr "Afbryd (slet) eller fortræng (overskriv) artikel [%%s]? (%s/%s/%s): " -#: src/lang.c:119 +#: src/lang.c:118 msgid "Cancelling article..." msgstr "Fortryder artikel ..." -#: src/lang.c:121 +#: src/lang.c:120 #, c-format msgid "Cannot create %s" msgstr "Kan ikke oprette %s" @@ -1453,21 +1448,16 @@ msgstr "" msgid "Insecure permissions of %s (%o)" msgstr "Usikre tilladelser pÃ¥ %s (%o)" -#: src/lang.c:242 -#, c-format -msgid "Invalid response to GROUP command, %s" -msgstr "Ugyldigt svar pÃ¥ kommanoden GROUP, %s" - -#: src/lang.c:247 +#: src/lang.c:244 #, c-format msgid "MIME parse error: Unexpected end of %s/%s article" msgstr "MIME-fortolkningsfejl: Uventet afslutning pÃ¥ %s/%s artikel" -#: src/lang.c:248 +#: src/lang.c:245 msgid "MIME parse error: Start boundary whilst reading headers" msgstr "MIME-fortolkningsfejl: Start grænse mens teksthoveder læses" -#: src/lang.c:249 +#: src/lang.c:246 msgid "" "\n" "Error: \"poster\" is not allowed in Newsgroups!\n" @@ -1475,16 +1465,16 @@ msgstr "" "\n" "Fejl: »indsender« er ikke tilladt i nyhedsgruppe!\n" -#: src/lang.c:250 +#: src/lang.c:247 msgid "Can't get a (fully-qualified) domain-name!" msgstr "Kan ikke indhente et (fuldt gyldigt) domænenavn!" -#: src/lang.c:251 +#: src/lang.c:248 #, c-format msgid "No permissions to go into %s\n" msgstr "Ingen tilladelse til at gÃ¥ ind i %s\n" -#: src/lang.c:253 +#: src/lang.c:250 msgid "" "\n" "Error: From: line missing.\n" @@ -1492,30 +1482,30 @@ msgstr "" "\n" "Fejl: From:-linje mangler.\n" -#: src/lang.c:255 +#: src/lang.c:252 #, c-format msgid "No read permissions for %s\n" msgstr "Ingen læserettigheder for %s\n" -#: src/lang.c:256 +#: src/lang.c:253 #, c-format msgid "File %s does not exist\n" msgstr "Fil %s eksisterer ikke\n" -#: src/lang.c:257 +#: src/lang.c:254 #, c-format msgid "No write permissions for %s\n" msgstr "Ingen skriverettigheder for %s\n" -#: src/lang.c:258 +#: src/lang.c:255 msgid "Can't get user information (/etc/passwd missing?)" msgstr "Kan ikke indhente brugerinformation (/etc/passwd mangler?)" -#: src/lang.c:259 +#: src/lang.c:256 msgid "errors" msgstr "fejl" -#: src/lang.c:261 +#: src/lang.c:258 #, c-format msgid "" "\n" @@ -1525,63 +1515,63 @@ msgstr "" "Fejl pÃ¥ linje %d: Teksthoved for »afsender« er ikke tilladt (den vil blive " "tilføjet for dig)\n" -#: src/lang.c:263 +#: src/lang.c:260 #, c-format msgid "Server has non of the groups listed in %s" msgstr "Server har ingen af grupperne vist i %s" -#: src/lang.c:264 +#: src/lang.c:261 msgid "error" msgstr "fejl" -#: src/lang.c:265 +#: src/lang.c:262 msgid "Unknown display level" msgstr "Ukendt visningsniveau" -#: src/lang.c:266 +#: src/lang.c:263 msgid "" msgstr "" -#: src/lang.c:267 +#: src/lang.c:264 msgid "Exiting..." msgstr "Afslutter..." -#: src/lang.c:268 +#: src/lang.c:265 msgid "leaving external mail-reader" msgstr "forlader ekstern postlæser" -#: src/lang.c:269 +#: src/lang.c:266 #, c-format msgid "Extracting %s..." msgstr "Udpakker %s..." -#: src/lang.c:271 +#: src/lang.c:268 #, c-format msgid "Error writing %s file. Filesystem full? File reset to previous state." msgstr "" "Kunne ikke skrive %s fil. Filsystem fyldt op? Fil gendannet til tidligere " "tilstand." -#: src/lang.c:272 +#: src/lang.c:269 #, c-format msgid "Error making backup of %s file. Filesystem full?" msgstr "Fejl under oprettelse af sikkerhedskopi af %s fil. Filsystem fyldt op?" -#: src/lang.c:273 +#: src/lang.c:270 #, c-format msgid "Filtering global rules (%d/%d)..." msgstr "Filtrerer globale regler (%d/%d) ..." -#: src/lang.c:274 +#: src/lang.c:271 msgid "Rule created by: " msgstr "Regel oprettet af: " -#: src/lang.c:275 +#: src/lang.c:272 #, c-format msgid "Enter pattern [%s]> " msgstr "Indtast mønster [%s]> " -#: src/lang.c:276 +#: src/lang.c:273 #, c-format msgid "" "\n" @@ -1590,20 +1580,21 @@ msgstr "" "\n" "Du anmodte om at opfølgninger til din artikel skulle gÃ¥ til følgende %s:\n" -#: src/lang.c:277 +#: src/lang.c:274 #, c-format msgid " %s\t Answers will be directed to you by mail.\n" msgstr " %s\t Svar vil blive sendt til dig per e-post.\n" -#: src/lang.c:278 +#: src/lang.c:275 msgid "-- forwarded message --\n" msgstr "-- videresendt besked --\n" -#: src/lang.c:279 +#: src/lang.c:276 msgid "-- end of forwarded message --\n" msgstr "-- slut pÃ¥ videresendt besked --\n" -#: src/lang.c:280 +#: src/lang.c:277 +#, fuzzy msgid "" "# Format:\n" "# comment=STRING Optional. Multiple lines allowed. Comments must be " @@ -1630,6 +1621,10 @@ msgid "" "# gnksa=[<>]?NUM Optional. GNKSA parse_from() return code. '<' or '>' " "opt.\n" "# xref=PATTERN Optional. Kill pattern (e.g. alt.flame*)\n" +"# path=PATTERN Optional. Kill pattern (e.g. news.example.org)\n" +"# Be aware that filtering on Path: may significantly " +"slow\n" +"# down the process.\n" "# time=NUM Optional. time_t value when rule expires\n" "#\n" msgstr "" @@ -2688,7 +2683,7 @@ msgstr "Ingen tidligere udtryk" msgid "Operation disabled in no-overwrite mode" msgstr "Handling deaktiveret i tilstanden no-overwrite (ingen-overskrivning)" -#. TODO: replace hardcoded key-name in txt_info_postponed +#. TODO: replace hard coded key-name in txt_info_postponed #: src/lang.c:547 #, c-format msgid "%d postponed %s, reuse with ^O...\n" @@ -2718,7 +2713,7 @@ msgstr "TeX2Iso-kodet artikel" msgid "incomplete " msgstr "ufuldstændig " -#. TODO: replace hardcoded key-names +#. TODO: replace hard coded key-names #: src/lang.c:554 #, c-format msgid "" @@ -2848,8 +2843,8 @@ msgid "Kill Article Menu" msgstr "Dræb artikelmenu" #: src/lang.c:587 -#, c-format -msgid "Kill Msg-Id: [%s] (f/l/o/n): " +#, fuzzy, c-format +msgid "Kill Msg-ID: [%s] (f/l/o/n): " msgstr "Dræb Msg-Id: [%s] (f/l/o/n): " #: src/lang.c:588 @@ -3371,7 +3366,7 @@ msgstr "Fejl i regulært udtryk: study - msgid "Post a followup..." msgstr "Indsend en opfølgning ..." -#. TODO: replace hardcoded key-name in txt_post_error_ask_postpone +#. TODO: replace hard coded key-name in txt_post_error_ask_postpone #: src/lang.c:716 msgid "" "An error has occurred while posting the article. If you think that this\n" @@ -3436,225 +3431,230 @@ msgstr "Mærket %s" msgid "Untagged %s" msgstr "Uden mærke %s" -#: src/lang.c:730 +#: src/lang.c:731 +#, c-format +msgid "Preparing for filtering on Path header (%d/%d)..." +msgstr "" + +#: src/lang.c:733 msgid "Processing mail messages marked for deletion." msgstr "Behandler postbeskeder markeret for sletning." -#: src/lang.c:731 +#: src/lang.c:734 msgid "Processing saved articles marked for deletion." msgstr "Behandler gemte artikler markeret for sletning." -#: src/lang.c:732 +#: src/lang.c:735 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "Accepter Followup-To? %s=post, %s=ignore, %s=quit: " -#: src/lang.c:733 +#: src/lang.c:736 msgid "Article unchanged, abort mailing?" msgstr "Artikel uændret, afbryd postleverance" -#: src/lang.c:734 +#: src/lang.c:737 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "Ønsker du at se udsatte artikler (%d)?" -#: src/lang.c:736 +#: src/lang.c:739 msgid "Add quick kill filter?" msgstr "Tilføj filter for hurtig dræb" -#: src/lang.c:737 +#: src/lang.c:740 msgid "Add quick selection filter?" msgstr "Tilføj filter for hurtig markering" -#: src/lang.c:738 +#: src/lang.c:741 msgid "Do you really want to quit?" msgstr "Ønsker du at afslutte?" -#: src/lang.c:739 +#: src/lang.c:742 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "%s=rediger afbrydbesked, %s=afslut, %s=slet (afbryd) [%%s]: " -#: src/lang.c:740 +#: src/lang.c:743 msgid "You have tagged articles in this group - quit anyway?" msgstr "Du har mærkede artikler i denne gruppe - afslut alligevel?" -#: src/lang.c:741 +#: src/lang.c:744 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=afslut, %s=rediger, %s=udsæt: " -#: src/lang.c:742 +#: src/lang.c:745 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=afslut %s=rediger %s=gem dræbbeskrivelse: " -#: src/lang.c:743 +#: src/lang.c:746 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "%s=afslut %s=rediger %s=gem beskrivelse af vælg: " -#: src/lang.c:744 +#: src/lang.c:747 msgid "Do you really want to quit without saving your configuration?" msgstr "Ønsker du virkelig at afslutte uden at gemme din konfiguration?" -#: src/lang.c:747 +#: src/lang.c:750 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "Ugyldigt interval - '0-9.$' f.eks. 1-$ er gyldige" -#: src/lang.c:749 +#: src/lang.c:752 msgid "Do you want to abort this operation?" msgstr "Ønsker du at afbryde denne handling?" -#: src/lang.c:750 +#: src/lang.c:753 msgid "Do you want to exit tin immediately?" msgstr "Ønsker du øjeblikkeligt at afslutte tin?" -#: src/lang.c:752 +#: src/lang.c:755 msgid "Reading ('q' to quit)..." msgstr "Læser ('q' for afslut) ..." -#: src/lang.c:753 +#: src/lang.c:756 #, c-format msgid "Reading %sarticles..." msgstr "Læser %sartikler ..." -#: src/lang.c:754 +#: src/lang.c:757 #, c-format msgid "Reading %sattributes file...\n" msgstr "Læser %sattributfil ...\n" -#: src/lang.c:755 +#: src/lang.c:758 #, c-format msgid "Reading %sconfig file...\n" msgstr "Læser %skonfigurationsfil ...\n" -#: src/lang.c:756 +#: src/lang.c:759 msgid "Reading filter file...\n" msgstr "Læser filterfil ...\n" -#: src/lang.c:757 +#: src/lang.c:760 #, c-format msgid "Reading %s groups..." msgstr "Læser %s grupper ..." -#: src/lang.c:758 +#: src/lang.c:761 msgid "Reading input history file...\n" msgstr "Læser inddatahistorikfil ...\n" -#: src/lang.c:759 +#: src/lang.c:762 msgid "Reading keymap file...\n" msgstr "Læser tastaturkortfil ...\n" -#: src/lang.c:760 +#: src/lang.c:763 msgid "Reading groups from active file... " msgstr "Læser grupper fra aktiv fil ... " -#: src/lang.c:761 +#: src/lang.c:764 msgid "Reading groups from newsrc file... " msgstr "Læser grupper fra newsrc-fil ... " -#: src/lang.c:762 +#: src/lang.c:765 msgid "Reading newsgroups file... " msgstr "Læser fil med nyhedsgrupper ... " -#: src/lang.c:763 +#: src/lang.c:766 msgid "Reading newsrc file..." msgstr "Læser newsrc-fil ..." -#: src/lang.c:764 +#: src/lang.c:767 msgid "References: line " msgstr "References: linje " -#: src/lang.c:766 +#: src/lang.c:769 #, c-format msgid "(%d:%02d remaining)" msgstr "(%d:%02d igen)" -#: src/lang.c:768 +#: src/lang.c:771 #, c-format msgid "Bogus group %s removed." msgstr "Fejlbehæftet gruppe %s fjernet." -#: src/lang.c:769 +#: src/lang.c:772 msgid "Removed from the previous rule: " msgstr "Fjernet fra den forrige regel: " -#: src/lang.c:770 +#: src/lang.c:773 #, c-format msgid "Error: rename %s to %s" msgstr "Fejl: Omdøb %s til %s" -#: src/lang.c:771 +#: src/lang.c:774 msgid "Reply to author..." msgstr "Svar til forfatter..." -#: src/lang.c:772 +#: src/lang.c:775 msgid "Repost" msgstr "Gensend" -#: src/lang.c:773 +#: src/lang.c:776 msgid "Reposting article..." msgstr "Genindsender artikel..." -#: src/lang.c:774 +#: src/lang.c:777 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "Gensend artikler til grupper [%s]> " -#: src/lang.c:775 +#: src/lang.c:778 msgid "Reset newsrc?" msgstr "Nulstil newsrc?" -#: src/lang.c:776 +#: src/lang.c:779 msgid "Responses have been directed to the following newsgroups" msgstr "Svar er blevet sendt til de følgende nyhedsgrupper" -#: src/lang.c:777 +#: src/lang.c:780 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " msgstr "Svar er blevet sendt til indsender. %s=post, %s=indsend, %s=afslut: " -#: src/lang.c:779 +#: src/lang.c:782 msgid "Press to continue..." msgstr "Tast for at fortsætte ..." -#: src/lang.c:781 +#: src/lang.c:784 #, c-format msgid "Select From [%s] (y/n): " msgstr "Vælg fra [%s] (y/n): " -#: src/lang.c:782 +#: src/lang.c:785 msgid "Select Lines: (num): " msgstr "Vælg linjer: (num): " -#: src/lang.c:783 +#: src/lang.c:786 msgid "Auto-select Article Menu" msgstr "Vælg automatisk artikelmenu" -#: src/lang.c:784 -#, c-format -msgid "Select Msg-Id [%s] (f/l/o/n): " +#: src/lang.c:787 +#, fuzzy, c-format +msgid "Select Msg-ID [%s] (f/l/o/n): " msgstr "Vælg Msg-Id [%s] (f/l/o/n): " -#: src/lang.c:785 +#: src/lang.c:788 msgid "Select pattern scope: " msgstr "Vælg mønstervirkefelt: " -#: src/lang.c:786 +#: src/lang.c:789 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "Vælg emne [%s] (y/n): " -#: src/lang.c:787 +#: src/lang.c:790 msgid "Select text pattern : " msgstr "Vælg tekstmønster : " -#: src/lang.c:788 +#: src/lang.c:791 msgid "Select time in days : " msgstr "Vælg tid i dage : " -#: src/lang.c:789 +#: src/lang.c:792 #, c-format msgid "" "# %s server configuration file\n" @@ -3675,54 +3675,54 @@ msgstr "" "############################################################################\n" "\n" -#: src/lang.c:795 +#: src/lang.c:798 msgid "Showing unread groups only" msgstr "Vis kun ulæste grupper" -#: src/lang.c:796 +#: src/lang.c:799 msgid "Subject: line (ignore case) " msgstr "Subject: linje (ignorer versaler)" -#: src/lang.c:797 +#: src/lang.c:800 msgid "Subject: line (case sensitive)" msgstr "Subject: linje (versalfølsom)" -#: src/lang.c:798 +#: src/lang.c:801 msgid "Save" msgstr "Gem" -#: src/lang.c:799 +#: src/lang.c:802 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "Gem »%s« (%s/%s)?" -#: src/lang.c:800 +#: src/lang.c:803 msgid "Save configuration before continuing?" msgstr "Gem konfiguration før du fortsætter?" -#: src/lang.c:801 +#: src/lang.c:804 msgid "Save filename> " msgstr "Gem filnavn> " -#: src/lang.c:802 +#: src/lang.c:805 msgid "Saved" msgstr "Gemt" -#: src/lang.c:803 +#: src/lang.c:806 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "%4d ulæst (%4d populær) %s i %s\n" -#: src/lang.c:804 +#: src/lang.c:807 #, c-format msgid "Saved %s...\n" msgstr "Gemt %s ...\n" -#: src/lang.c:805 +#: src/lang.c:808 msgid "Nothing was saved" msgstr "Intet blev gemt" -#: src/lang.c:806 +#: src/lang.c:809 #, c-format msgid "" "\n" @@ -3731,184 +3731,184 @@ msgstr "" "\n" "%s %d %s fra %d %s\n" -#: src/lang.c:807 +#: src/lang.c:810 #, c-format msgid "-- %s saved to %s%s --" msgstr "-- %s gemt til %s%s --" -#: src/lang.c:808 +#: src/lang.c:811 #, c-format msgid "-- %s saved to %s - %s --" msgstr "-- %s gemt til %s - %s --" -#: src/lang.c:809 +#: src/lang.c:812 msgid "Saving..." msgstr "Gemmer ..." -#: src/lang.c:810 +#: src/lang.c:813 #, c-format msgid "%s: Screen initialization failed" msgstr "%s: Skærminitialisering mislykkedes" -#: src/lang.c:812 +#: src/lang.c:815 #, c-format msgid "%s: screen is too small\n" msgstr "%s: Skærm er for lille\n" -#: src/lang.c:814 +#: src/lang.c:817 #, c-format msgid "screen is too small, %s is exiting" msgstr "skærmen er for lille, %s afslutter" -#: src/lang.c:815 +#: src/lang.c:818 msgid "Delete scope?" msgstr "Slet virkefelt?" -#: src/lang.c:816 +#: src/lang.c:819 msgid "Enter scope> " msgstr "Indtast virkefelt> " -#: src/lang.c:817 +#: src/lang.c:820 msgid "Select new position> " msgstr "Vælg ny placering>" -#: src/lang.c:818 +#: src/lang.c:821 msgid "New position cannot be a global scope" msgstr "Ny placering kan ikke være et globalt virkefelt" -#: src/lang.c:819 +#: src/lang.c:822 msgid "Global scope, operation not allowed" msgstr "Global virkefelt, handling ikke tilladt" -#: src/lang.c:820 +#: src/lang.c:823 msgid "Rename scope> " msgstr "Omdøb virkefelt> " -#: src/lang.c:821 +#: src/lang.c:824 msgid "Select scope> " msgstr "Vælg virkefelt> " -#: src/lang.c:822 +#: src/lang.c:825 msgid "Scopes Menu" msgstr "Virkefeltsmenu" -#: src/lang.c:823 +#: src/lang.c:826 msgid "Scopes Menu Commands" msgstr "Kommandoer for virkefeltsmenu" -#: src/lang.c:824 +#: src/lang.c:827 #, c-format msgid "Search backwards [%s]> " msgstr "Søg baglæns [%s]> " -#: src/lang.c:825 +#: src/lang.c:828 #, c-format msgid "Search body [%s]> " msgstr "Søg tekst [%s]> " -#: src/lang.c:826 +#: src/lang.c:829 #, c-format msgid "Search forwards [%s]> " msgstr "Søg fremad [%s]> " -#: src/lang.c:827 +#: src/lang.c:830 msgid "Searching..." msgstr "Søger ..." -#: src/lang.c:828 +#: src/lang.c:831 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "Søger i artikel %d af %d ('q' for at afbryde)..." -#: src/lang.c:829 +#: src/lang.c:832 msgid "Select article> " msgstr "Vælg artikel> " -#: src/lang.c:830 +#: src/lang.c:833 msgid "" "Select option number before text or use arrow keys and . 'q' to quit." msgstr "" "Vælg indstililngsnummer før tekst eller brug piletasterne og . »q« for " "at afslutte." -#: src/lang.c:831 +#: src/lang.c:834 msgid "Select group> " msgstr "Vælg gruppe> " -#: src/lang.c:832 +#: src/lang.c:835 #, c-format msgid "Enter selection pattern [%s]> " msgstr "Indtast markeringsmønster [%s]> " -#: src/lang.c:833 +#: src/lang.c:836 msgid "Select thread> " msgstr "Vælg trÃ¥d> " -#: src/lang.c:834 +#: src/lang.c:837 #, c-format msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" msgstr "%s %s %s (\"%s\") [%s]: send en DETALJEREDE fejlrapport til %s\n" -#: src/lang.c:835 +#: src/lang.c:838 msgid "servers active-file" msgstr "servers active-fil" -#: src/lang.c:836 +#: src/lang.c:839 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "Kan ikke gÃ¥ ind i nye nyhedsgrupper. Abonner først ..." -#: src/lang.c:837 +#: src/lang.c:840 msgid "" msgstr "" -#: src/lang.c:838 +#: src/lang.c:841 #, c-format msgid "Starting: (%s)" msgstr "Starter: (%s)" -#: src/lang.c:839 +#: src/lang.c:842 #, c-format msgid "List Thread (%d of %d)" msgstr "Vis trÃ¥d (%d af %d)" -#: src/lang.c:840 +#: src/lang.c:843 #, c-format msgid "Thread (%.*s)" msgstr "TrÃ¥d (%.*s)" -#: src/lang.c:841 +#: src/lang.c:844 msgid "Enter wildcard subscribe pattern> " msgstr "Indtast abonnementmønster med jokertegn> " -#: src/lang.c:842 +#: src/lang.c:845 #, c-format msgid "subscribed to %d groups" msgstr "har tegnet abonnement pÃ¥ %d grupper" -#: src/lang.c:843 +#: src/lang.c:846 #, c-format msgid "Subscribed to %s" msgstr "har tegnet abonnement pÃ¥ %s" -#: src/lang.c:844 +#: src/lang.c:847 msgid "Subscribing... " msgstr "Abonnerer ... " -#: src/lang.c:845 +#: src/lang.c:848 #, c-format msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " msgstr "Gensend eller fortræng artikler [%%s]? (%s/%s/%s): " -#: src/lang.c:846 +#: src/lang.c:849 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "Fortræng artikler til grupper [%s]> " -#: src/lang.c:847 +#: src/lang.c:850 msgid "Superseding article ..." msgstr "Fortrænger artikel ..." -#: src/lang.c:848 +#: src/lang.c:851 #, c-format msgid "" "\n" @@ -3917,24 +3917,24 @@ msgstr "" "\n" "Stoppet. Tast 'fg' for at genstarte %s\n" -#: src/lang.c:850 +#: src/lang.c:853 #, c-format msgid "%d days" msgstr "%d dage" -#: src/lang.c:851 +#: src/lang.c:854 msgid "" msgstr "" -#: src/lang.c:852 +#: src/lang.c:855 msgid "TeX " msgstr "TeX " -#: src/lang.c:853 +#: src/lang.c:856 msgid "# Default action/prompt strings\n" msgstr "# Standardstrenge for handling/prompt\n" -#: src/lang.c:854 +#: src/lang.c:857 msgid "" "# Defaults for quick (1 key) kill & auto-selection filters\n" "# header=NUM 0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n" @@ -3953,7 +3953,7 @@ msgstr "" "# expire=ON/OFF ON=begræns til default_filter_days (antal filtrerdage)\n" " OFF=udløb aldrig\n" -#: src/lang.c:867 +#: src/lang.c:870 msgid "" "# If ON use print current subject or newsgroup description in the last line\n" msgstr "" @@ -3961,104 +3961,104 @@ msgstr "" "nyhedsgruppebeskrivelse\n" " i den sidste linje\n" -#: src/lang.c:868 +#: src/lang.c:871 msgid "# Host & time info used for detecting new groups (don't touch)\n" msgstr "" "# Værts- og tidsinformation brugt til detektering af nye grupper (rør ikke)\n" -#: src/lang.c:869 +#: src/lang.c:872 msgid "There is no news\n" msgstr "Der er ingen nyheder\n" -#: src/lang.c:870 +#: src/lang.c:873 msgid "Thread" msgstr "TrÃ¥d" -#: src/lang.c:871 +#: src/lang.c:874 msgid "Thread Level Commands" msgstr "Kommandoer pÃ¥ trÃ¥dniveau" -#: src/lang.c:872 +#: src/lang.c:875 msgid "Thread deselected" msgstr "TrÃ¥d fravalgt" -#: src/lang.c:873 +#: src/lang.c:876 msgid "Thread selected" msgstr "TrÃ¥d valgt" -#: src/lang.c:875 +#: src/lang.c:878 msgid "threads" msgstr "trÃ¥de" -#: src/lang.c:877 +#: src/lang.c:880 msgid "thread" msgstr "trÃ¥d" -#: src/lang.c:878 +#: src/lang.c:881 #, c-format msgid "Thread %4s of %4s" msgstr "TrÃ¥d %4s af %4s" -#: src/lang.c:879 +#: src/lang.c:882 msgid "Threading articles..." msgstr "Opdeler artikler i trÃ¥de ..." -#: src/lang.c:880 +#: src/lang.c:883 #, c-format msgid "Toggled word highlighting %s" msgstr "Skiftede ordfremhævelse %s" -#: src/lang.c:881 +#: src/lang.c:884 msgid "Toggled rot13 encoding" msgstr "Skiftede rot13-kodning" -#: src/lang.c:882 +#: src/lang.c:885 #, c-format msgid "Toggled german TeX encoding %s" msgstr "Skiftede tysk TeX-kodning %s" -#: src/lang.c:883 +#: src/lang.c:886 #, c-format msgid "Toggled tab-width to %d" msgstr "Skiftede indryksbredde til %d" -#: src/lang.c:885 +#: src/lang.c:888 #, c-format msgid "%d Trying to dotlock %s" msgstr "%d Forsøger at dotlock %s" -#: src/lang.c:886 +#: src/lang.c:889 #, c-format msgid "%d Trying to lock %s" msgstr "%d Forsøger at lÃ¥se %s" -#: src/lang.c:888 +#: src/lang.c:891 msgid " h=help" msgstr " h=hjælp" -#: src/lang.c:890 +#: src/lang.c:893 msgid "Unlimited" msgstr "Ubegrænset" -#: src/lang.c:891 +#: src/lang.c:894 msgid "Enter wildcard unsubscribe pattern> " msgstr "Indtast jokertegnsmønster for framelding af abonnement> " -#: src/lang.c:892 +#: src/lang.c:895 #, c-format msgid "Error decoding %s : %s" msgstr "Fejl unde afkodning af %s : %s" -#: src/lang.c:893 +#: src/lang.c:896 msgid "No end." msgstr "Ingen slutning." -#: src/lang.c:894 +#: src/lang.c:897 #, c-format msgid "%s successfully decoded." msgstr "%s dekodet med succes." -#: src/lang.c:895 +#: src/lang.c:898 #, c-format msgid "" "%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" @@ -4067,37 +4067,32 @@ msgstr "" "%*s[-- %s/%s, %suuencoded-fil, %d linjer, navn: %s --]\n" "\n" -#: src/lang.c:896 +#: src/lang.c:899 msgid "unread " msgstr "ulæst " -#: src/lang.c:897 +#: src/lang.c:900 #, c-format msgid "unsubscribed from %d groups" msgstr "frameldte abonnement fra %d grupper" -#: src/lang.c:898 +#: src/lang.c:901 #, c-format msgid "Unsubscribed from %s" msgstr "Abonnement frameldt fra %s" -#: src/lang.c:899 +#: src/lang.c:902 msgid "Unsubscribing... " msgstr "Framelder abonnement ... " -#: src/lang.c:900 +#: src/lang.c:903 msgid "Unthreading articles..." msgstr "Fjerner trÃ¥dopsætning fra artikler ..." -#: src/lang.c:901 +#: src/lang.c:904 msgid "Updated" msgstr "Opdateret" -#: src/lang.c:903 -#, c-format -msgid "unparseable \"LIST COUNTS\" line: \"%s\"" -msgstr "linjen »LIST COUNTS« kan ikke fortolkes: »%s«" - #: src/lang.c:905 msgid "Updating" msgstr "Opdaterer" @@ -4262,11 +4257,16 @@ msgid "%s only useful for batch mode ope msgstr "%s er kun nyttig for jobtilstandsoperationer\n" #: src/lang.c:939 +#, fuzzy, c-format +msgid "%s only useful for batch or debug mode operations\n" +msgstr "%s er kun nyttig for jobtilstandsoperationer\n" + +#: src/lang.c:940 #, c-format msgid "Useless combination %s and %s. Ignoring %s.\n" msgstr "Nytteløs kombination %s og %s. Ignorerer %s.\n" -#: src/lang.c:941 +#: src/lang.c:942 #, c-format msgid "" "\n" @@ -4275,12 +4275,12 @@ msgstr "" "\n" "%s%d uden for interval (0 - %d). Nulstil til 0" -#: src/lang.c:942 +#: src/lang.c:943 #, c-format msgid "View '%s' (%s/%s)?" msgstr "Vis »%s« (%s/%s)?" -#: src/lang.c:944 +#: src/lang.c:945 #, c-format msgid "" "\n" @@ -4291,7 +4291,7 @@ msgstr "" "Advarsel: indsendelse overstiger %d kolonner. Linje %d er den første lange:\n" "%-100s\n" -#: src/lang.c:945 +#: src/lang.c:946 msgid "" "\n" "Warning: article unchanged after editing\n" @@ -4299,7 +4299,7 @@ msgstr "" "\n" "Advarsel: Artikel uændret efter redigering\n" -#: src/lang.c:946 +#: src/lang.c:947 msgid "" "\n" "Warning: \"Subject:\" contains only whitespaces.\n" @@ -4307,7 +4307,7 @@ msgstr "" "\n" "Advarsel: »Subject:« indeholder kun mellemrum.\n" -#: src/lang.c:947 +#: src/lang.c:948 msgid "" "\n" "Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:" @@ -4316,7 +4316,7 @@ msgstr "" "\n" "Advarsel: »Subject:« begynder med »Re:« men der er ingen »References:«.\n" -#: src/lang.c:949 +#: src/lang.c:950 msgid "" "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" @@ -4326,7 +4326,7 @@ msgstr "" "Advarsel: Artikel har »References:« men »Subject:« begynder ikke med\n" " »Re:« og indeholder ikke »(was:«.\n" -#: src/lang.c:952 +#: src/lang.c:953 msgid "" "Read carefully!\n" "\n" @@ -4349,7 +4349,7 @@ msgstr "" "Dette er artiklen, du er ved at fjerne:\n" "\n" -#: src/lang.c:956 +#: src/lang.c:957 msgid "" "\n" "Warning: You are using a non-plain transfer encoding (such as base64 or\n" @@ -4358,7 +4358,7 @@ msgid "" " not be encoded properly.\n" msgstr "" -#: src/lang.c:961 +#: src/lang.c:962 msgid "" "\n" "Warning: \"example\" is a reserved hierarchy!\n" @@ -4366,7 +4366,7 @@ msgstr "" "\n" "Advarsel: »example« er et reserveret hierarki!\n" -#: src/lang.c:962 +#: src/lang.c:963 #, c-format msgid "" "\n" @@ -4381,7 +4381,7 @@ msgstr "" "Nogle værdier i din %s-fil har ændret sig!\n" "Læs WHATSNEW, etc ...\n" -#: src/lang.c:964 +#: src/lang.c:965 #, c-format msgid "" "\n" @@ -4394,7 +4394,7 @@ msgstr "" "Du nedgraderer til tin %s fra en nyere version!\n" "Nogle værdier i din %s-fil bliver mÃ¥ske ignoreret, andre kan ændre sig!\n" -#: src/lang.c:967 +#: src/lang.c:968 #, c-format msgid "" "Warning: tin wrote fewer groups to your\n" @@ -4404,7 +4404,7 @@ msgid "" "before you start tin once again!\n" msgstr "" -#: src/lang.c:971 +#: src/lang.c:972 #, c-format msgid "" "\n" @@ -4413,12 +4413,12 @@ msgstr "" "\n" "Advarsel: Fandt %d »-- \\n«-linjer, dette kan forvirre nogle.\n" -#: src/lang.c:972 +#: src/lang.c:973 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "Advarsel: Kun %d ud af %d artikler blev gemt" -#: src/lang.c:973 +#: src/lang.c:974 #, c-format msgid "" "\n" @@ -4432,7 +4432,7 @@ msgstr "" "Advarsel: Din signatur er længere end %d linjer. Da signaturer normalt ikke\n" " indeholder nyttig information, skal de være sÃ¥ korte som mulig.\n" -#: src/lang.c:977 +#: src/lang.c:978 #, c-format msgid "" "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " @@ -4440,7 +4440,7 @@ msgstr "" "Advarsel: Denne postadresse kan indeholde en spamfælde. %s=continue, " "%s=abort? " -#: src/lang.c:978 +#: src/lang.c:979 msgid "" "\n" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" @@ -4448,37 +4448,37 @@ msgstr "" "\n" "Advarsel: Underskrifter skal starte med '-- \\n' ikke med '--\\n'.\n" -#: src/lang.c:979 +#: src/lang.c:980 msgid "Writing attributes file..." msgstr "Skriver attributfil ..." -#: src/lang.c:981 +#: src/lang.c:982 #, c-format msgid "%d Responses" msgstr "%d svar" -#: src/lang.c:983 +#: src/lang.c:984 #, c-format msgid "Added %d %s" msgstr "Tilføjede %d %s" -#: src/lang.c:984 +#: src/lang.c:985 msgid "No unsubscribed groups to show" msgstr "Ingen grupper der ikke er tilmeldte at vise" -#: src/lang.c:985 +#: src/lang.c:986 msgid "Showing subscribed to groups only" msgstr "Viser kun tilmeldte til grupper" -#: src/lang.c:986 +#: src/lang.c:987 msgid "Yes " msgstr "Ja " -#: src/lang.c:987 +#: src/lang.c:988 msgid " You have mail" msgstr " Du har post" -#: src/lang.c:992 +#: src/lang.c:993 #, c-format msgid "" "\n" @@ -4491,11 +4491,11 @@ msgid "" " M)enu option.\n" msgstr "" -#: src/lang.c:1003 +#: src/lang.c:1004 msgid " -D mode debug mode" msgstr " -D tilstand fejlsøgningstilstand" -#: src/lang.c:1007 +#: src/lang.c:1008 msgid "" "Read carefully!\n" "\n" @@ -4512,11 +4512,11 @@ msgid "" "\n" msgstr "" -#: src/lang.c:1016 +#: src/lang.c:1017 msgid "toggle color" msgstr "slÃ¥ farve til/fra" -#: src/lang.c:1017 +#: src/lang.c:1018 msgid "" "# Changing colors of several screen parts\n" "# Possible values are:\n" @@ -4562,11 +4562,11 @@ msgstr "" "# 15 = lys hvid\n" "\n" -#: src/lang.c:1037 +#: src/lang.c:1038 msgid " -a toggle color flag" msgstr " -a skift farveflag" -#: src/lang.c:1041 +#: src/lang.c:1042 msgid "" "\n" "Error: Followup-To set to more than one newsgroup!\n" @@ -4574,7 +4574,7 @@ msgstr "" "\n" "Fejl: Followup-To angivet til mere end en nyhedsgruppe!\n" -#: src/lang.c:1042 +#: src/lang.c:1043 #, c-format msgid "" "\n" @@ -4583,7 +4583,7 @@ msgstr "" "\n" "Fejl: »%s« omdøbes, brug »%s« i steden for!\n" -#: src/lang.c:1043 +#: src/lang.c:1044 #, c-format msgid "" "\n" @@ -4592,7 +4592,7 @@ msgstr "" "\n" "Fejl: krydsindsendelse til %d nyhedsgrupper og ingen Followup-To-linje!\n" -#: src/lang.c:1044 +#: src/lang.c:1045 #, c-format msgid "" "\n" @@ -4601,7 +4601,7 @@ msgstr "" "\n" "Fejl: »%s« er ikke en gyldig nyhedsgruppe!\n" -#: src/lang.c:1046 +#: src/lang.c:1047 msgid "" "\n" "Warning: Followup-To set to more than one newsgroup!\n" @@ -4609,7 +4609,7 @@ msgstr "" "\n" "Advarsel: Followup-To angiver mere end en nyhedsgruppe!\n" -#: src/lang.c:1047 +#: src/lang.c:1048 #, c-format msgid "" "\n" @@ -4618,7 +4618,7 @@ msgstr "" "\n" "Advarsel: »%s« er omdøbt, du skal bruge »%s« i stedet for!\n" -#: src/lang.c:1048 +#: src/lang.c:1049 #, c-format msgid "" "\n" @@ -4627,7 +4627,7 @@ msgstr "" "\n" "Advarsel: krydsindsendelse til %d nyhedsgrupper og ingen Followup-To-linje!\n" -#: src/lang.c:1049 +#: src/lang.c:1050 #, c-format msgid "" "\n" @@ -4636,7 +4636,7 @@ msgstr "" "\n" "Advarsel: »%s« er ikke i din newsrc, den kan være ugyldig pÃ¥ denne side!\n" -#: src/lang.c:1050 +#: src/lang.c:1051 #, c-format msgid "" "\n" @@ -4645,79 +4645,79 @@ msgstr "" "\n" "Advarsel: »%s« er ikke en gyldig nyhedsgruppe pÃ¥ denne side!\n" -#: src/lang.c:1054 +#: src/lang.c:1055 #, c-format msgid "%d files successfully written from %d articles. %d %s occurred." msgstr "%d filer skrevet fra %d artikler. %d %s opstod." -#: src/lang.c:1055 +#: src/lang.c:1056 msgid "Missing parts." msgstr "Manglende dele." -#: src/lang.c:1056 +#: src/lang.c:1057 msgid "No beginning." msgstr "Ingen begyndelse." -#: src/lang.c:1057 +#: src/lang.c:1058 msgid "No data." msgstr "Ingen data." -#: src/lang.c:1058 +#: src/lang.c:1059 msgid "Unknown error." msgstr "Ukendt fejl." -#: src/lang.c:1061 +#: src/lang.c:1062 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "\tKontrolsum for %s (%ld %s)" -#: src/lang.c:1066 +#: src/lang.c:1067 msgid "Reading mail active file... " msgstr "Læser postaktiv fil ... " -#: src/lang.c:1067 +#: src/lang.c:1068 msgid "Reading mailgroups file... " msgstr "Læser postgruppens fil ... " -#: src/lang.c:1071 +#: src/lang.c:1072 msgid "perform PGP operations on article" msgstr "udfør PGP-handlinger pÃ¥ artikel" -#: src/lang.c:1072 +#: src/lang.c:1073 msgid "Add key(s) to public keyring?" msgstr "Tilføj nøgle(r) til offentlig nøglering?" -#: src/lang.c:1073 +#: src/lang.c:1074 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "%s=krypter, %s=underskriv, %s=begge, %s=afslut: " -#: src/lang.c:1074 +#: src/lang.c:1075 #, c-format msgid "%s=sign, %s=sign & include public key, %s=quit: " msgstr "%s=underskriv, %s=underskriv & inkluder offentlig nøgle, %s=afslut: " -#: src/lang.c:1075 +#: src/lang.c:1076 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "PGP er ikke sat op (kan ikke Ã¥bne %s)" -#: src/lang.c:1076 +#: src/lang.c:1077 msgid "Article not signed and no public keys found" msgstr "Artikel ikke underskrevet og ingen offentlige nøgler fundet" -#: src/lang.c:1078 +#: src/lang.c:1079 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" "%s=afslut, %s=rediger, %s=ispell, %s=pgp, %s=menu, %s=indsend, %s=udsæt: " -#: src/lang.c:1079 +#: src/lang.c:1080 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " msgstr "%s=afslut, %s=rediger, %s=ispell, %s=pgp, %s=send [%%s]: " -#: src/lang.c:1080 +#: src/lang.c:1081 #, c-format msgid "" "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " @@ -4725,78 +4725,73 @@ msgstr "" "%s=afslut, %s=rediger, %s=ispell, %s=pgp, %s=menu, %s=indsend, %s=udsæt " "[%%s]: " -#: src/lang.c:1082 +#: src/lang.c:1083 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "%s=afslut, %s=rediger, %s=pgp, %s=menu, %s=indsend, %s=udsæt: " -#: src/lang.c:1083 +#: src/lang.c:1084 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "%s=afslut, %s=rediger, %s=pgp, %s=send [%%s]: " -#: src/lang.c:1084 +#: src/lang.c:1085 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=afslut, %s=rediger, %s=pgp, %s=menu, %s=indsend, %s=udsæt [%%s]: " -#: src/lang.c:1088 +#: src/lang.c:1089 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " msgstr "%s=afslut, %s=rediger, %s=ispell, %s=menu, %s=indsend, %s=udsæt: " -#: src/lang.c:1089 +#: src/lang.c:1090 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "%s=afslut, %s=rediger, %s=ispell, %s=indsend [%%s]: " -#: src/lang.c:1090 +#: src/lang.c:1091 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" "%s=afslut, %s=rediger, %s=ispell, %s=menu, %s=indsend, %s=udsæt [%%s]: " -#: src/lang.c:1092 +#: src/lang.c:1093 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "%s=afslut, %s=rediger, %s=menu, %s=indsend, %s=udsæt: " -#: src/lang.c:1093 +#: src/lang.c:1094 #, c-format msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "%s=afslut, %s=rediger, %s=send [%%s]: " -#: src/lang.c:1094 +#: src/lang.c:1095 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=afslut, %s=rediger, %s=menu, %s=indsend, %s=udsæt [%%s]: " -#: src/lang.c:1103 +#: src/lang.c:1104 msgid "Try cache_overview_files to speed up things.\n" msgstr "Prøv cache_overview_files for at øge hastigheden.\n" -#: src/lang.c:1104 +#: src/lang.c:1105 msgid "Tin will use local index files instead.\n" msgstr "Tin vil i steden for anvende lokale indeksfiler.\n" -#: src/lang.c:1105 +#: src/lang.c:1106 msgid "Cannot find NNTP server name" msgstr "Kan ikke finde NNTP-servernavn" -#: src/lang.c:1106 +#: src/lang.c:1107 #, c-format msgid "Connecting to %s:%u..." msgstr "Forbinder til %s:%u ..." -#: src/lang.c:1107 -msgid "Disconnecting from server...\n" -msgstr "Afbryder fra server ...\n" - #: src/lang.c:1108 -#, c-format -msgid "" -"Wrong newsgroup name (\"%s\") in response of \"GROUP %s\" command: \"%s\"" -msgstr "Forkert nyhedsgruppenavn (»%s«) som svar til »GROUP %s«-kommando: »%s«" +#, fuzzy +msgid "Disconnecting from server..." +msgstr "Afbryder fra server ...\n" #: src/lang.c:1109 #, c-format @@ -5575,65 +5570,69 @@ msgstr "NFC" msgid "NFD" msgstr "NFD" -#: src/lang.c:1586 +#: src/lang.c:1580 +msgid "NFKC case fold" +msgstr "" + +#: src/lang.c:1589 msgid "Display Options" msgstr "Vis indstillinger" -#: src/lang.c:1593 +#: src/lang.c:1596 msgid "Color Options" msgstr "Farveindstillinger" -#: src/lang.c:1599 +#: src/lang.c:1602 msgid "Highlight Options" msgstr "Fremhævelsesindstillinger" -#: src/lang.c:1606 +#: src/lang.c:1609 msgid "Article-Limiting Options" msgstr "Artikelbegrænsende indstillinger" -#: src/lang.c:1612 +#: src/lang.c:1615 msgid "Posting/Mailing Options" msgstr "Indsendelses-/postindstillinger" -#: src/lang.c:1618 +#: src/lang.c:1621 msgid "Saving/Printing Options" msgstr "Gemnings-/udskrivningsindstillinger" -#: src/lang.c:1624 +#: src/lang.c:1627 msgid "Expert Options" msgstr "Ekspertindstillinger" -#: src/lang.c:1630 +#: src/lang.c:1633 msgid "Filtering Options" msgstr "Filterindstillinger" -#: src/lang.c:1635 src/lang.c:1666 src/lang.c:1672 src/lang.c:1699 -#: src/lang.c:1751 src/lang.c:1757 src/lang.c:1767 src/lang.c:1778 -#: src/lang.c:1796 src/lang.c:1865 src/lang.c:2066 src/lang.c:2072 -#: src/lang.c:2078 src/lang.c:2084 src/lang.c:2096 src/lang.c:2103 -#: src/lang.c:2157 src/lang.c:2166 src/lang.c:2172 src/lang.c:2179 -#: src/lang.c:2186 src/lang.c:2193 src/lang.c:2200 src/lang.c:2207 -#: src/lang.c:2214 src/lang.c:2221 src/lang.c:2228 src/lang.c:2235 -#: src/lang.c:2242 src/lang.c:2249 src/lang.c:2256 src/lang.c:2263 -#: src/lang.c:2270 src/lang.c:2277 src/lang.c:2284 src/lang.c:2291 -#: src/lang.c:2298 src/lang.c:2305 src/lang.c:2312 src/lang.c:2319 -#: src/lang.c:2326 src/lang.c:2333 src/lang.c:2340 src/lang.c:2348 -#: src/lang.c:2364 src/lang.c:2371 src/lang.c:2378 src/lang.c:2385 -#: src/lang.c:2391 src/lang.c:2397 src/lang.c:2414 src/lang.c:2426 -#: src/lang.c:2461 src/lang.c:2514 src/lang.c:2528 src/lang.c:2534 -#: src/lang.c:2559 src/lang.c:2577 src/lang.c:2594 src/lang.c:2606 -#: src/lang.c:2639 src/lang.c:2675 src/lang.c:2695 src/lang.c:2730 -#: src/lang.c:2740 src/lang.c:2747 src/lang.c:2773 src/lang.c:2797 -#: src/lang.c:2870 src/lang.c:2884 src/lang.c:2892 src/lang.c:2906 -#: src/lang.c:2912 src/lang.c:2950 +#: src/lang.c:1638 src/lang.c:1669 src/lang.c:1675 src/lang.c:1702 +#: src/lang.c:1754 src/lang.c:1760 src/lang.c:1770 src/lang.c:1781 +#: src/lang.c:1799 src/lang.c:1868 src/lang.c:2069 src/lang.c:2075 +#: src/lang.c:2081 src/lang.c:2087 src/lang.c:2099 src/lang.c:2106 +#: src/lang.c:2160 src/lang.c:2169 src/lang.c:2175 src/lang.c:2182 +#: src/lang.c:2189 src/lang.c:2196 src/lang.c:2203 src/lang.c:2210 +#: src/lang.c:2217 src/lang.c:2224 src/lang.c:2231 src/lang.c:2238 +#: src/lang.c:2245 src/lang.c:2252 src/lang.c:2259 src/lang.c:2266 +#: src/lang.c:2273 src/lang.c:2280 src/lang.c:2287 src/lang.c:2294 +#: src/lang.c:2301 src/lang.c:2308 src/lang.c:2315 src/lang.c:2322 +#: src/lang.c:2329 src/lang.c:2336 src/lang.c:2343 src/lang.c:2351 +#: src/lang.c:2367 src/lang.c:2374 src/lang.c:2381 src/lang.c:2388 +#: src/lang.c:2394 src/lang.c:2400 src/lang.c:2417 src/lang.c:2429 +#: src/lang.c:2464 src/lang.c:2517 src/lang.c:2531 src/lang.c:2537 +#: src/lang.c:2562 src/lang.c:2580 src/lang.c:2597 src/lang.c:2609 +#: src/lang.c:2642 src/lang.c:2678 src/lang.c:2698 src/lang.c:2733 +#: src/lang.c:2743 src/lang.c:2750 src/lang.c:2776 src/lang.c:2800 +#: src/lang.c:2877 src/lang.c:2892 src/lang.c:2900 src/lang.c:2914 +#: src/lang.c:2920 src/lang.c:2958 msgid " toggles, sets, cancels." msgstr " skifter, ændrer, afbryder." -#: src/lang.c:1636 +#: src/lang.c:1639 msgid "Show mini menu & posting etiquette" msgstr "Vis minimenu og indlægsetikette" -#: src/lang.c:1637 +#: src/lang.c:1640 msgid "" "# If ON show a mini menu of useful commands at each level\n" "# and posting etiquette after composing an article\n" @@ -5641,17 +5640,17 @@ msgstr "" "# Hvis slÃ¥et til, sÃ¥ vis en minimenu med nyttige kommandoer pÃ¥ hvert niveau\n" "# og indlægsetikette efter komponering af en artikel\n" -#: src/lang.c:1642 +#: src/lang.c:1645 msgid "Show short description for each newsgroup. toggles & sets." msgstr "" "Vis kort beskrivelse for hver nyhedsgruppe. skifter og " "ændrer." -#: src/lang.c:1643 +#: src/lang.c:1646 msgid "Show description of each newsgroup" msgstr "Vis beskrivelse af hver nyhedsgruppe" -#: src/lang.c:1644 +#: src/lang.c:1647 msgid "" "# If ON show group description text after newsgroup name at\n" "# group selection level\n" @@ -5659,7 +5658,7 @@ msgstr "" "# Hvis slÃ¥et til, sÃ¥ vis gruppebeskrivelsestekst efter nyhedsgruppenavn\n" "# pÃ¥ gruppemarkeringsniveau\n" -#: src/lang.c:1649 +#: src/lang.c:1652 msgid "" "Show From (author) fields in group & thread level. toggles & " "sets." @@ -5667,11 +5666,11 @@ msgstr "" "Vis Fra-felter (forfatter) i gruppe- og trÃ¥dniveau. skifter og " " ændrer." -#: src/lang.c:1650 +#: src/lang.c:1653 msgid "In group and thread level, show author by" msgstr "I gruppe- og trÃ¥dniveau, vis forfatter efter" -#: src/lang.c:1651 +#: src/lang.c:1654 msgid "" "# Part of From field to display in group and thread level\n" "# Possible values are (the default is marked with *):\n" @@ -5687,36 +5686,36 @@ msgstr "" "# * 2 = fulde navn\n" "# 3 = begge\n" -#: src/lang.c:1660 +#: src/lang.c:1663 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "" "Tegn -> eller fremhævet bjælke for markering. skifter og " "ændrer." -#: src/lang.c:1661 +#: src/lang.c:1664 msgid "Draw -> instead of highlighted bar" msgstr "Tegn -> i stedet for fremhævet bjælke" -#: src/lang.c:1662 +#: src/lang.c:1665 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "" "# Hvis slÃ¥et til, sÃ¥ brug -> ellers brug fremhævet bjælke for markering\n" -#: src/lang.c:1667 +#: src/lang.c:1670 msgid "Use inverse video for page headers" msgstr "Brug omvendt video for sideteksthoveder" -#: src/lang.c:1668 +#: src/lang.c:1671 msgid "# If ON use inverse video for page headers at different levels\n" msgstr "" "# Hvis slÃ¥et til, sÃ¥ brug omvendt video for sideteksthoveder pÃ¥ forskellige " "niveauer\n" -#: src/lang.c:1673 +#: src/lang.c:1676 msgid "Thread articles by" msgstr "TrÃ¥dopdel artikler efter" -#: src/lang.c:1674 +#: src/lang.c:1677 msgid "" "# Thread articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5736,15 +5735,15 @@ msgstr "" "# 4 = Emne med flere dele\n" "# 5 = Procentmatch\n" -#: src/lang.c:1685 +#: src/lang.c:1688 msgid "Enter percentage match required to thread together. sets." msgstr "Indtast procentmatch krævet for at lave trÃ¥de. ændrer." -#: src/lang.c:1686 +#: src/lang.c:1689 msgid "Thread percentage match" msgstr "TrÃ¥dprocentmatch" -#: src/lang.c:1688 +#: src/lang.c:1691 #, no-c-format msgid "" "# Thread percentage match...\n" @@ -5759,11 +5758,11 @@ msgid "" "# 'harppy' would be threaded separately from 'happy'\n" msgstr "" -#: src/lang.c:1700 +#: src/lang.c:1703 msgid "Score of a thread" msgstr "Bedømmelse for en trÃ¥d" -#: src/lang.c:1701 +#: src/lang.c:1704 msgid "" "# Thread score\n" "# Possible values are (the default is marked with *):\n" @@ -5777,18 +5776,18 @@ msgstr "" "# 1 = sum\n" "# 2 = gennemsnit\n" -#: src/lang.c:1709 +#: src/lang.c:1712 msgid "" "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "" "Sorter artikler efter Emne, Fra, Dato eller Bedømmelse. skifter " "og ændrer." -#: src/lang.c:1710 +#: src/lang.c:1713 msgid "Sort articles by" msgstr "Sorter artikler efter" -#: src/lang.c:1711 +#: src/lang.c:1714 msgid "" "# Sort articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5818,17 +5817,17 @@ msgstr "" "# 9 = Linjer faldende\n" "# 10 = Linjer stigende\n" -#: src/lang.c:1727 +#: src/lang.c:1730 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "" "Sorter trÃ¥de efter intet eller bedømmelse. skifter og " "ændrer." -#: src/lang.c:1728 +#: src/lang.c:1731 msgid "Sort threads by" msgstr "Sorter trÃ¥de efter" -#: src/lang.c:1729 +#: src/lang.c:1732 msgid "" "# Sort thread by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5839,53 +5838,53 @@ msgid "" "# 4 = Last posting date ascending\n" msgstr "" -#: src/lang.c:1739 +#: src/lang.c:1742 msgid "" "Put cursor at first/last unread art in groups. toggles & sets." msgstr "" "Placer markør pÃ¥ første/sidste ulæste artikel i grupper. skifter " "og ændrer." -#: src/lang.c:1740 +#: src/lang.c:1743 msgid "Go to first unread article in group" msgstr "GÃ¥ til den første ulæste artikel i gruppe" -#: src/lang.c:1741 +#: src/lang.c:1744 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "" "# Hvis slÃ¥et til, sÃ¥ placer markør ved første ulæste artikel i gruppen " "ellers\n" " ved sidste artikel\n" -#: src/lang.c:1745 +#: src/lang.c:1748 msgid "Show all articles or only unread articles. toggles & sets." msgstr "" "Vis alle artikler eller kun ulæste artikler. skifter og " "ændrer." -#: src/lang.c:1746 +#: src/lang.c:1749 msgid "Show only unread articles" msgstr "Vis kun ulæste artikler" -#: src/lang.c:1747 +#: src/lang.c:1750 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "# Hvis slÃ¥et til, sÃ¥ vis kun nye/ulæste artikler ellers vis alle.\n" -#: src/lang.c:1752 +#: src/lang.c:1755 msgid "Show only groups with unread arts" msgstr "Vis kun grupper med ulæst kunst" -#: src/lang.c:1753 +#: src/lang.c:1756 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "" "# Hvis slÃ¥et til, sÃ¥ vis kun abonnerede grupper som indeholder ulæste " "artikler.\n" -#: src/lang.c:1758 +#: src/lang.c:1761 msgid "Filter which articles" msgstr "Filtrer hvilke artikler" -#: src/lang.c:1759 +#: src/lang.c:1762 msgid "" "# Filter which articles\n" "# Possible values are (the default is marked with *):\n" @@ -5894,11 +5893,11 @@ msgid "" "# 2 = kill all articles and never show them\n" msgstr "" -#: src/lang.c:1768 +#: src/lang.c:1771 msgid "Go to the next unread article with" msgstr "GÃ¥ til den næste ulæste artikel med" -#: src/lang.c:1769 +#: src/lang.c:1772 msgid "" "# Go to the unread article with following key(s)\n" "# Possible values are (the default is marked with *):\n" @@ -5908,11 +5907,11 @@ msgid "" "# 3 = PAGE DOWN or TAB\n" msgstr "" -#: src/lang.c:1779 +#: src/lang.c:1782 msgid "How to treat blank lines" msgstr "Hvordan tomme linjer skal behandles" -#: src/lang.c:1780 +#: src/lang.c:1783 msgid "" "# Trim the article body, remove unnecessary blank lines.\n" "# Possible values are (the default is marked with *):\n" @@ -5929,27 +5928,27 @@ msgid "" "# leading and trailing blank lines\n" msgstr "" -#: src/lang.c:1797 +#: src/lang.c:1800 msgid "List thread using right arrow key" msgstr "Vis trÃ¥d via højre piletast" -#: src/lang.c:1798 +#: src/lang.c:1801 msgid "" "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "" "# Hvis slÃ¥et til, sÃ¥ vis automatisk trÃ¥d nÃ¥r den vælges via højre piletast.\n" -#: src/lang.c:1802 +#: src/lang.c:1805 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "" "Indtast tegnet som skal angive slettede artikler. ændrer, " "afbryder." -#: src/lang.c:1803 +#: src/lang.c:1806 msgid "Character to show deleted articles" msgstr "Tegn til at vise slettede artikler" -#: src/lang.c:1804 +#: src/lang.c:1807 msgid "" "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" @@ -5957,18 +5956,18 @@ msgstr "" "# Tegn brugt til at vise, at en artikel blev slettet (standard »D«)\n" "# _ ændres til ' '\n" -#: src/lang.c:1809 +#: src/lang.c:1812 msgid "" "Enter character to indicate articles in a range. sets, cancels." msgstr "" "Indtast tegnet som skal angive artikler i et interval. ændrer, " "afbryder." -#: src/lang.c:1810 +#: src/lang.c:1813 msgid "Character to show inrange articles" msgstr "Tegn til at vise artikler i et interval" -#: src/lang.c:1811 +#: src/lang.c:1814 msgid "" "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" @@ -5976,7 +5975,7 @@ msgstr "" "# Tegn brugt til at vise, at en artikel er i et interval (standard »#«)\n" "# _ ændres til ' '\n" -#: src/lang.c:1816 +#: src/lang.c:1819 msgid "" "Enter character to indicate that article will return. sets, " "cancels." @@ -5984,11 +5983,11 @@ msgstr "" "Indtast tegnet som skal angive at artikel vil returnere. ændrer, " "afbryder." -#: src/lang.c:1817 +#: src/lang.c:1820 msgid "Character to show returning arts" msgstr "Tegn til at vise returnerende artikler" -#: src/lang.c:1818 +#: src/lang.c:1821 msgid "" "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" @@ -5996,17 +5995,17 @@ msgstr "" "# Tegn brugt til at vise, at en artikel vil returnere (standard »-«)\n" "# _ ændres til ' '\n" -#: src/lang.c:1823 +#: src/lang.c:1826 msgid "" "Enter character to indicate selected articles. sets, cancels." msgstr "" "Indtast tegnet som skal angive valgte artikler. ændrer, afbryder." -#: src/lang.c:1824 +#: src/lang.c:1827 msgid "Character to show selected articles" msgstr "Tegn der viser valgte artikler" -#: src/lang.c:1825 +#: src/lang.c:1828 msgid "" "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" @@ -6015,16 +6014,16 @@ msgstr "" "'*')\n" "# _ ændres til ' '\n" -#: src/lang.c:1830 +#: src/lang.c:1833 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "" "Indtast tegn for at indikere seneste artikler. ændrer, afbryder." -#: src/lang.c:1831 +#: src/lang.c:1834 msgid "Character to show recent articles" msgstr "Tegn til at vise seneste artikler" -#: src/lang.c:1832 +#: src/lang.c:1835 msgid "" "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" @@ -6032,16 +6031,16 @@ msgstr "" "# Tegn brugt til at vise, at en artikel er ny (standard 'o')\n" "# _ ændres til ' '\n" -#: src/lang.c:1837 +#: src/lang.c:1840 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "" "Indtast tegnet som skal angive ulæste artikler. ændrer, afbryder." -#: src/lang.c:1838 +#: src/lang.c:1841 msgid "Character to show unread articles" msgstr "Tegn til visning af ulæste artikler" -#: src/lang.c:1839 +#: src/lang.c:1842 msgid "" "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" @@ -6049,16 +6048,16 @@ msgstr "" "# Tegn brugt til at vise, at en artikel er ulæst (standard '+')\n" "# _ ændres til ' '\n" -#: src/lang.c:1844 +#: src/lang.c:1847 msgid "Enter character to indicate read articles. sets, cancels." msgstr "" "Indtast tegn til at angive læste artikler. ændrer, afbryder." -#: src/lang.c:1845 +#: src/lang.c:1848 msgid "Character to show read articles" msgstr "Tegn til at vise læste artikler" -#: src/lang.c:1846 +#: src/lang.c:1849 msgid "" "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" @@ -6066,16 +6065,16 @@ msgstr "" "# Tegn bruges til at vise, at en artikel er læst (standard ' ')\n" "# _ ændres til ' '\n" -#: src/lang.c:1851 +#: src/lang.c:1854 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "" "Indtast tegn til at indikere dræbte artikler. ændrer, afbryder." -#: src/lang.c:1852 +#: src/lang.c:1855 msgid "Character to show killed articles" msgstr "Tegn til at vise dræbte artikler" -#: src/lang.c:1853 +#: src/lang.c:1856 msgid "" "# Character used to show that an art was killed (default 'K')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" @@ -6083,18 +6082,18 @@ msgstr "" "# Tegn brugt til at vise, at en artikel er dræbt (standard 'K')\n" "# kill_level skal angives jævnfør dette, _ ændres til ' '\n" -#: src/lang.c:1858 +#: src/lang.c:1861 msgid "" "Enter character to indicate read selected articles. sets, cancels." msgstr "" "Indtast tegnet som skal angive læste valgte artikler. ændrer, " "afbryder." -#: src/lang.c:1859 +#: src/lang.c:1862 msgid "Character to show readselected arts" msgstr "Tegn brugt til at vise læsevalgte artikler" -#: src/lang.c:1860 +#: src/lang.c:1863 msgid "" "# Character used to show that an art was selected before read (default ':')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" @@ -6103,11 +6102,11 @@ msgstr "" "':')\n" "# kill_level skal angives jævnfør dette, _ ændres til ' '\n" -#: src/lang.c:1866 +#: src/lang.c:1869 msgid "Abbreviate long newsgroup names" msgstr "Forkort lange nyhedsgruppenavne" -#: src/lang.c:1867 +#: src/lang.c:1870 msgid "" "# If ON abbreviate (if necessary) long newsgroup names at group selection\n" "# level and article level like this:\n" @@ -6118,7 +6117,7 @@ msgstr "" "# markeringsniveau og artikelniveau sÃ¥ledes:\n" "# news.software.readers -> n.software.readers -> n.s.readers -> n.s.r.\n" -#: src/lang.c:1873 +#: src/lang.c:1876 msgid "" "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" @@ -6126,11 +6125,11 @@ msgstr "" "0 = fuld siderulning, -1 = vis forrige sidste linje som første pÃ¥ næste " "side, -2 = halv side" -#: src/lang.c:1874 +#: src/lang.c:1877 msgid "Number of lines to scroll in pager" msgstr "Antallet af linjer at rulle i tekstsøgeren" -#: src/lang.c:1875 +#: src/lang.c:1878 msgid "" "# Number of lines that cursor-up/down will scroll in article pager\n" "# Possible values are (the default is marked with *):\n" @@ -6148,30 +6147,30 @@ msgstr "" "# * 1 = linje efter linje\n" "# 2 eller større = rul med 2 eller flere linjer (kun i artikelsøgeren)\n" -#: src/lang.c:1885 +#: src/lang.c:1888 msgid "Display signatures. toggles & sets." msgstr "Vis underskrifter. skifter og ændrer." -#: src/lang.c:1886 +#: src/lang.c:1889 msgid "Display signatures" msgstr "Vis underskrifter" -#: src/lang.c:1887 +#: src/lang.c:1890 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "# Hvis OFF (FRA) sÃ¥ vis ikke underskrifter nÃ¥r der vises artikler\n" -#: src/lang.c:1891 +#: src/lang.c:1894 msgid "" "Display uuencoded data as tagged attachments. toggles & sets." msgstr "" "Vis »uuencoded« data som mærkede vedhæftninger. skifter og " "ændrer." -#: src/lang.c:1892 +#: src/lang.c:1895 msgid "Display uue data as an attachment" msgstr "Vis uue-data som en vedhæftning" -#: src/lang.c:1893 +#: src/lang.c:1896 msgid "" "# Handling of uuencoded data in the pager\n" "# Possible values are (the default is marked with *):\n" @@ -6193,18 +6192,18 @@ msgstr "" "vil\n" "# blive foldet til en mærkelinje.\n" -#: src/lang.c:1903 +#: src/lang.c:1906 msgid "" "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "" "Afkod tysk udformning af TeX-umlautkoder til ISO. skifter og " " ændrer." -#: src/lang.c:1904 +#: src/lang.c:1907 msgid "Display \"a as Umlaut-a" msgstr "Vis \"a som umlaut-a" -#: src/lang.c:1905 +#: src/lang.c:1908 msgid "" "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" @@ -6212,15 +6211,15 @@ msgstr "" "# Hvis slÃ¥et til, sÃ¥ afkod TeX-umlautkoder i tysk stil til ISO\n" "# og vis \"a som Umlaut-a, etc.\n" -#: src/lang.c:1910 src/lang.c:1920 +#: src/lang.c:1913 src/lang.c:1923 msgid "Space separated list of header fields" msgstr "Mellemrumsadskilt liste med teksthovedfelter" -#: src/lang.c:1911 +#: src/lang.c:1914 msgid "Display these header fields (or *)" msgstr "Vis disse teksthovedfelter (eller *)" -#: src/lang.c:1912 +#: src/lang.c:1915 msgid "" "# Which news headers you wish to see. If you want to see _all_ the headers,\n" "# place an '*' as this value. This is the only way a wildcard can be used.\n" @@ -6230,11 +6229,11 @@ msgid "" "# spaces. Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1921 +#: src/lang.c:1924 msgid "Do not display these header fields" msgstr "Vis ikke disse teksthovedfelter" -#: src/lang.c:1922 +#: src/lang.c:1925 msgid "" "# Same as 'news_headers_to_display' except it denotes the opposite.\n" "# An example of using both options might be if you thought X- headers were\n" @@ -6246,79 +6245,79 @@ msgid "" "# Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1932 +#: src/lang.c:1935 msgid "" "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "" "Ønsker du at aktivere automatisk hÃ¥ndtering af flerdels-/alternative " "artikler?" -#: src/lang.c:1933 +#: src/lang.c:1936 msgid "Skip multipart/alternative parts" msgstr "Udelad multipart/alternative dele" -#: src/lang.c:1934 +#: src/lang.c:1937 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "# Hvis slÃ¥et til, sÃ¥ fjern multipart/alternative beskeder automatisk\n" -#: src/lang.c:1938 +#: src/lang.c:1941 msgid "Enable detection of verbatim blocks? toggles & sets." msgstr "" "Aktiver detektion af verbatimblokke? skifter og ændrer." -#: src/lang.c:1939 +#: src/lang.c:1942 msgid "Detection of verbatim blocks" msgstr "Detektering af verbatimblokke" -#: src/lang.c:1940 +#: src/lang.c:1943 msgid "# If ON detect verbatim blocks in articles\n" msgstr "# Hvis slÃ¥et til, sÃ¥ detekter verbatimblokke i artikler\n" -#: src/lang.c:1945 +#: src/lang.c:1948 msgid "A regex used to decide which lines to show in col_quote." msgstr "" "Et regulært udtryk som bruges til at bestemme hvilke linjer der skal vises i " "col_quote." -#: src/lang.c:1946 +#: src/lang.c:1949 msgid "Regex used to show quoted lines" msgstr "Regulært udtryk som bruges til at vise citerede linjer" -#: src/lang.c:1947 +#: src/lang.c:1950 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# quoted when viewing articles. Quoted lines are shown in col_quote.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1953 +#: src/lang.c:1956 msgid "A regex used to decide which lines to show in col_quote2." msgstr "" "Et regulært udtryk som bruges til at bestemme hvilke linjer der vises i " "col_quote2." -#: src/lang.c:1954 +#: src/lang.c:1957 msgid "Regex used to show twice quoted l." msgstr "Regulært udtryk som bruges til at vise dobbeltciterede l." -#: src/lang.c:1955 +#: src/lang.c:1958 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# quoted twice. Twice quoted lines are shown in col_quote2.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1961 +#: src/lang.c:1964 msgid "A regex used to decide which lines to show in col_quote3." msgstr "" "Et regulært udtryk brugt til at beslutte hvilke linjer der vises i " "col_quota3." -#: src/lang.c:1962 +#: src/lang.c:1965 msgid "Regex used to show >= 3 times q.l." msgstr "Regulært udtryk som bruges til at vise >= 3 gange q.l." -#: src/lang.c:1963 +#: src/lang.c:1966 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" @@ -6328,33 +6327,33 @@ msgstr "" "# der er citerede >=3 gange. >=3 gange citerede linjer vises i col_quote3.\n" "# Hvis denne efterlades tom bruger tin en indbygget standard.\n" -#: src/lang.c:1969 +#: src/lang.c:1972 msgid "Enable detection of external quotes? toggles & sets." msgstr "" "Aktiver detektion af eksternt citationstegn? skifter og " "ændrer." -#: src/lang.c:1970 +#: src/lang.c:1973 msgid "Detection of external quotes" msgstr "Detektering af eksterne citationstegn" -#: src/lang.c:1971 +#: src/lang.c:1974 msgid "# If ON detect quoted text from external sources in articles\n" msgstr "" "# Hvis slÃ¥et til, sÃ¥ detekteres citeret tekst fra eksterne kilder i " "artikler\n" -#: src/lang.c:1975 +#: src/lang.c:1978 msgid "A regex used to decide which lines to show in col_extquote." msgstr "" "Et regulært udtryk som bruges til at bestemme hvilke linjer der skal vises i " "col_extquote." -#: src/lang.c:1976 +#: src/lang.c:1979 msgid "Regex used to show quotes from external sources" msgstr "Regulært udtryk som bruges til at vise citationer fra eksterne kilder" -#: src/lang.c:1977 +#: src/lang.c:1980 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# external quotes. Text from external quotes is shown in col_extquote.\n" @@ -6364,34 +6363,34 @@ msgstr "" "# der er eksterne citater. Tekst fra eksterne citater vises i col_extquote.\n" "# Hvis denne efterlades tom, bruger tin en indbygget standard.\n" -#: src/lang.c:1984 +#: src/lang.c:1987 msgid "A regex used to decide which words to show in col_markslashes." msgstr "" "Et regulært udtryk som bruges til at bestemme hvilke ord, der skal vises i " "col_markslashes." -#: src/lang.c:1985 +#: src/lang.c:1988 msgid "Regex used to highlight /slashes/" msgstr "Regulært udtryk som bruges til at fremhæve /slashes/" -#: src/lang.c:1986 +#: src/lang.c:1989 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '/' are to be shown in col_markslashes.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1992 +#: src/lang.c:1995 msgid "A regex used to decide which words to show in col_markstars." msgstr "" "Et regulært udtryk som bruges til at bestemme hvilke ord, der skal vises i " "col_markstars." -#: src/lang.c:1993 +#: src/lang.c:1996 msgid "Regex used to highlight *stars*" msgstr "Regulært udtryk som bruges til at fremhæve *stjerner*" -#: src/lang.c:1994 +#: src/lang.c:1997 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '*' are to be shown in col_markstars.\n" @@ -6401,17 +6400,17 @@ msgstr "" "# omgrænset af '*', der skal vises i col_markstars.\n" "# Hvis efterladt blank, sÃ¥ vil tin bruge en indbygget standard.\n" -#: src/lang.c:2000 +#: src/lang.c:2003 msgid "A regex used to decide which words to show in col_markstroke." msgstr "" "Et regulært udtryk som bruges til at beslutte hvilke ord, der skal vises i " "col_markstroke." -#: src/lang.c:2001 +#: src/lang.c:2004 msgid "Regex used to highlight -strokes-" msgstr "Regulært udtryk som bruges til at fremhæve -strokes-" -#: src/lang.c:2002 +#: src/lang.c:2005 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '-' are to be shown in col_markstroke.\n" @@ -6421,17 +6420,17 @@ msgstr "" "# omgrænset af '-', der skal vises i col_markstroke.\n" "# Hvis efterladt blank, sÃ¥ vil tin bruge en indbygget standard.\n" -#: src/lang.c:2008 +#: src/lang.c:2011 msgid "A regex used to decide which words to show in col_markdash." msgstr "" "Et regulært udtryk som bruges til at beslutte hvilke ord, der skal vises i " "col_markdash." -#: src/lang.c:2009 +#: src/lang.c:2012 msgid "Regex used to highlight _underline_" msgstr "Regulært udtryk som bruges til at fremhæve _underline_" -#: src/lang.c:2010 +#: src/lang.c:2013 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '_' are to be shown in col_markdash.\n" @@ -6441,17 +6440,17 @@ msgstr "" "# omgrænset af '_', der skal vises i col_markdash.\n" "# Hvis efterladt blank, sÃ¥ vil tin bruge en indbygget standard.\n" -#: src/lang.c:2016 +#: src/lang.c:2019 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "" "Et regulært udtryk som bruges til at finde emnepræfikser, der skal fjernes. " "Brug »|« som adskillelsestegn." -#: src/lang.c:2017 +#: src/lang.c:2020 msgid "Regex with Subject prefixes" msgstr "Regulært udtryk med emnepræfikser" -#: src/lang.c:2018 +#: src/lang.c:2021 msgid "" "# A regular expression that tin will use to find Subject prefixes\n" "# which will be removed before showing the header.\n" @@ -6459,17 +6458,17 @@ msgstr "" "# Et regulært udtryk som tin vil bruge til at finde emnepræfikser\n" "# som vil blive fjernet før teksthovedet vises.\n" -#: src/lang.c:2023 +#: src/lang.c:2026 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "" "Et regulært udtryk som bruges til at finde emnesuffikser, der skal fjernes. " "Brug »|« som adskillelsestegn." -#: src/lang.c:2024 +#: src/lang.c:2027 msgid "Regex with Subject suffixes" msgstr "Regulært udtryk med emnesuffikser" -#: src/lang.c:2025 +#: src/lang.c:2028 msgid "" "# A regular expression that tin will use to find Subject suffixes\n" "# which will be removed when replying or posting followup.\n" @@ -6477,16 +6476,16 @@ msgstr "" "# Et regulært udtryk som tin vil bruge til at finde emnesuffikser,\n" "# som vil blive fjernet, nÃ¥r der svares eller sendes opfølgninger.\n" -#: src/lang.c:2030 +#: src/lang.c:2033 msgid "A regex used to find the begin of a verbatim block." msgstr "" "Et regulært udtryk som bruges til at finde begyndelsen af en verbatimblok." -#: src/lang.c:2031 +#: src/lang.c:2034 msgid "Regex for begin of a verbatim block" msgstr "Regulært udtryk for begyndelsen pÃ¥ en verbatimblok" -#: src/lang.c:2032 +#: src/lang.c:2035 msgid "" "# A regular expression that tin will use to find the begin of\n" "# a verbatim block.\n" @@ -6494,16 +6493,16 @@ msgstr "" "# Et regulært udtryk som tin vil bruge til at finde begyndelsen\n" "# af en verbatimblok.\n" -#: src/lang.c:2037 +#: src/lang.c:2040 msgid "A regex used to find the end of a verbatim block." msgstr "" "Et regulært udtryk som bruges til at finde slutningen af en verbatimblok." -#: src/lang.c:2038 +#: src/lang.c:2041 msgid "Regex for end of a verbatim block" msgstr "Regulært udtryk for slutningen pÃ¥ en verbatimblok" -#: src/lang.c:2039 +#: src/lang.c:2042 msgid "" "# A regular expression that tin will use to find the end of\n" "# a verbatim block.\n" @@ -6511,7 +6510,7 @@ msgstr "" "# Et regulært udtryk som tin vil bruge til at finde slutningen\n" "# af en verbatimblok.\n" -#: src/lang.c:2044 +#: src/lang.c:2047 msgid "" "Enter name and options for external MIME viewer, --internal for built-in " "viewer" @@ -6519,15 +6518,16 @@ msgstr "" "Indtast navn og tilvalg for ekstern MIME-fremviser, --internal for indbygget " "fremviser" -#: src/lang.c:2045 +#: src/lang.c:2048 msgid "MIME binary content viewer" msgstr "Fremviser for MIME-binært indhold" -#: src/lang.c:2046 +#: src/lang.c:2049 +#, fuzzy 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 " +"# Otherwise specify an external viewer program (eg. metamail) or leave " "blank\n" "# for no automatic viewing\n" msgstr "" @@ -6538,15 +6538,15 @@ msgstr "" "efterlades tom\n" "# for ingen automatisk visning\n" -#: src/lang.c:2053 +#: src/lang.c:2056 msgid "Confirm before starting non-text viewing program" msgstr "Bekræft før start af visningsprogram for ikke-tekst" -#: src/lang.c:2054 +#: src/lang.c:2057 msgid "Ask before using MIME viewer" msgstr "Spørg før brug af MIME-fremviser" -#: src/lang.c:2055 +#: src/lang.c:2058 msgid "" "# If ON tin will ask before using metamail to display MIME messages\n" "# this only happens if metamail_prog is set to something\n" @@ -6555,122 +6555,122 @@ msgstr "" "vise MIME-beskeder\n" "# dette sker kun hvis metamail_prog har en værdi\n" -#: src/lang.c:2060 +#: src/lang.c:2063 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "" "Spørg om at markere grupper som læst nÃ¥r der afsluttes. skifter " "& ændrer." -#: src/lang.c:2061 +#: src/lang.c:2064 msgid "Catchup read groups when quitting" msgstr "Opsaml læste grupper ved afslutning" -#: src/lang.c:2062 +#: src/lang.c:2065 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "" "# Hvis slÃ¥et til, sÃ¥ spørg brugeren om læste grupper skal markeres læst\n" -#: src/lang.c:2067 +#: src/lang.c:2070 msgid "Catchup group using left key" msgstr "Opsaml gruppe med venstre tast" -#: src/lang.c:2068 +#: src/lang.c:2071 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "" "# Hvis slÃ¥et til, sÃ¥ opsaml gruppe/trÃ¥d hvis omrÃ¥det forlades med venstre " "piletast.\n" -#: src/lang.c:2073 +#: src/lang.c:2076 msgid "Catchup thread by using left key" msgstr "Opsaml trÃ¥de med venstre tast" -#: src/lang.c:2079 +#: src/lang.c:2082 msgid "Which actions require confirmation" msgstr "Hvilke-handliger kræver bekræftelse" -#: src/lang.c:2080 +#: src/lang.c:2083 msgid "# What should we ask confirmation for.\n" msgstr "# Hvad skal vi spørge efter bekræftelse pÃ¥.\n" -#: src/lang.c:2085 +#: src/lang.c:2088 msgid "'Mark as (un)read' ignores tags" msgstr "»Marker som (u)læst« ignorerer mærker" -#: src/lang.c:2086 +#: src/lang.c:2089 msgid "" "# If ON the 'Mark as (un)read' function marks only the current article.\n" msgstr "" "# Hvis slÃ¥et til, sÃ¥ markerer funktionen »Marker som (u)læst« kun den\n" "# nuværende artikel.\n" -#: src/lang.c:2090 +#: src/lang.c:2093 msgid "Program to run to open URLs, sets, cancels." msgstr "Program der køres ved Ã¥bning af adresser. ændrer, afbryder." -#: src/lang.c:2091 +#: src/lang.c:2094 msgid "Program that opens URLs" msgstr "Program som Ã¥bner adresser (URL'er)" -#: src/lang.c:2092 +#: src/lang.c:2095 msgid "# The program used to open URLs. The actual URL will be appended\n" msgstr "" "# Programmet brugt til at Ã¥bne URL'er. Den aktuelle URL vil blive tilføjet\n" -#: src/lang.c:2097 +#: src/lang.c:2100 msgid "Use mouse in xterm" msgstr "Anvend mus i xterm" -#: src/lang.c:2098 +#: src/lang.c:2101 msgid "# If ON enable mouse button support on xterm terminals\n" msgstr "" "# Hvis slÃ¥et til, sÃ¥ aktiver understøttelse af museknap pÃ¥ xterm-terminaler\n" -#: src/lang.c:2104 +#: src/lang.c:2107 msgid "Use scroll keys on keypad" msgstr "Brug rultaster pÃ¥ numerisk tastatur" -#: src/lang.c:2105 +#: src/lang.c:2108 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "" "# Hvis slÃ¥et til, sÃ¥ aktiver rulletaster pÃ¥ terminaler som understøtter " "dette\n" -#: src/lang.c:2110 +#: src/lang.c:2113 msgid "Enter maximum number of article to get. sets." msgstr "Indtast maksimalt antal artikler at hente. ændrer." -#: src/lang.c:2111 +#: src/lang.c:2114 msgid "Number of articles to get" msgstr "Antal artikler til hentning" -#: src/lang.c:2112 +#: src/lang.c:2115 msgid "" "# Number of articles to get (0=no limit), if negative sets maximum number\n" "# of already read articles to be read before first unread one\n" msgstr "" -#: src/lang.c:2117 +#: src/lang.c:2120 msgid "Enter number of days article is considered recent. sets." msgstr "Indtast antallet af dage som en artikel ses som ny. ændrer." -#: src/lang.c:2118 +#: src/lang.c:2121 msgid "Article recentness time limit" msgstr "Tidsbegrænsning for nye artikler" -#: src/lang.c:2119 +#: src/lang.c:2122 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "# Antallet af dage som en artikel ses som ny, (0=OFF)\n" -#: src/lang.c:2123 +#: src/lang.c:2126 msgid "" "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "WILDMAT for normale jokertegn, REGEX for fuld regulær udtryksmatch." -#: src/lang.c:2124 +#: src/lang.c:2127 msgid "Wildcard matching" msgstr "Jokertegnmatch" -#: src/lang.c:2125 +#: src/lang.c:2128 msgid "" "# Wildcard matching\n" "# Possible values are (the default is marked with *):\n" @@ -6682,60 +6682,60 @@ msgstr "" "# * 0 = wildmat\n" "# 1 = regex\n" -#: src/lang.c:2132 +#: src/lang.c:2135 msgid "Enter minimal score before an article is marked killed. sets." msgstr "Indtast minimumspoint før en artikel markeres som dræbt. ændrer." -#: src/lang.c:2133 +#: src/lang.c:2136 msgid "Score limit (kill)" msgstr "Pointbegrænsning (dræb)" -#: src/lang.c:2134 +#: src/lang.c:2137 msgid "# Score limit before an article is marked killed\n" msgstr "# Pointbegrænsning før en artikel markeres som dræbt\n" -#: src/lang.c:2138 +#: src/lang.c:2141 msgid "Enter default score to kill articles. sets." msgstr "Indtast pointtal for at dræbe artikler. ændrer." -#: src/lang.c:2139 +#: src/lang.c:2142 msgid "Default score to kill articles" msgstr "Pointtal for at dræbe artikler" -#: src/lang.c:2140 +#: src/lang.c:2143 msgid "# Default score to kill articles\n" msgstr "# Pointtal for at dræbe artikler\n" -#: src/lang.c:2144 +#: src/lang.c:2147 msgid "Enter minimal score before an article is marked hot. sets." msgstr "" "Indtast minimumspoint før en artikel markeres som populær. ændrer." -#: src/lang.c:2145 +#: src/lang.c:2148 msgid "Score limit (select)" msgstr "Pointbegrænsning (vælg)" -#: src/lang.c:2146 +#: src/lang.c:2149 msgid "# Score limit before an article is marked hot\n" msgstr "# Pointbegrænsning før en artikel er markeret som populær\n" -#: src/lang.c:2150 +#: src/lang.c:2153 msgid "Enter default score to select articles. sets." msgstr "Indtast pointtal for at vælge artikler. ændrer." -#: src/lang.c:2151 +#: src/lang.c:2154 msgid "Default score to select articles" msgstr "Pointtal for at vælge artikler" -#: src/lang.c:2152 +#: src/lang.c:2155 msgid "# Default score to select articles\n" msgstr "# Pointtal for at vælge artikler\n" -#: src/lang.c:2158 +#: src/lang.c:2161 msgid "Use slrnface to show ''X-Face:''s" msgstr "Brug slmface for at vise ''X-face:''s" -#: src/lang.c:2159 +#: src/lang.c:2162 msgid "" "# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n" "# Only useful when running in an xterm.\n" @@ -6743,19 +6743,19 @@ msgstr "" "# Hvis slÃ¥et til, sÃ¥ brug slrnface(1) til at fortolke ''X-Face:''-\n" "# -teksthoved. Kun nyttig under afvikling i en xterm.\n" -#: src/lang.c:2167 +#: src/lang.c:2170 msgid "Use ANSI color" msgstr "Brug ANSI-farve" -#: src/lang.c:2168 +#: src/lang.c:2171 msgid "# If ON using ANSI-color\n" msgstr "# Hvis slÃ¥et til, sÃ¥ brug ANSI-farve\n" -#: src/lang.c:2173 +#: src/lang.c:2176 msgid "Standard foreground color" msgstr "Standardforgrundsfarve" -#: src/lang.c:2174 +#: src/lang.c:2177 msgid "" "# Standard foreground color\n" "# Default: -1 (default color)\n" @@ -6763,11 +6763,11 @@ msgstr "" "# Standardforgrundsfarve\n" "# Standard: -1 (standardfarve)\n" -#: src/lang.c:2180 +#: src/lang.c:2183 msgid "Standard background color" msgstr "Standardbaggrundsfarve" -#: src/lang.c:2181 +#: src/lang.c:2184 msgid "" "# Standard background color\n" "# Default: -1 (default color)\n" @@ -6775,11 +6775,11 @@ msgstr "" "# Standardbaggrundsfarve\n" "# Standard: -1 (standardfarve)\n" -#: src/lang.c:2187 +#: src/lang.c:2190 msgid "Color for inverse text (background)" msgstr "Farve for inverteret tekst (baggrund)" -#: src/lang.c:2188 +#: src/lang.c:2191 msgid "" "# Color of background for inverse text\n" "# Default: 4 (blue)\n" @@ -6787,11 +6787,11 @@ msgstr "" "# Farve pÃ¥ baggrund for inverteret tekst\n" "# Standard: 4 (blÃ¥)\n" -#: src/lang.c:2194 +#: src/lang.c:2197 msgid "Color for inverse text (foreground)" msgstr "Farve pÃ¥ inverteret tekst (forgrund)" -#: src/lang.c:2195 +#: src/lang.c:2198 msgid "" "# Color of foreground for inverse text\n" "# Default: 7 (white)\n" @@ -6799,11 +6799,11 @@ msgstr "" "# Farve pÃ¥ forgrund for inverteret tekst\n" "# Standard: 7 (hvid)\n" -#: src/lang.c:2201 +#: src/lang.c:2204 msgid "Color of text lines" msgstr "Farve pÃ¥ tekstlinjer" -#: src/lang.c:2202 +#: src/lang.c:2205 msgid "" "# Color of text lines\n" "# Default: -1 (default color)\n" @@ -6811,11 +6811,11 @@ msgstr "" "# Farve pÃ¥ tekstlinjer\n" "# Standard: -1 (standardfarve)\n" -#: src/lang.c:2208 +#: src/lang.c:2211 msgid "Color of mini help menu" msgstr "Farve pÃ¥ minihjælpemenu" -#: src/lang.c:2209 +#: src/lang.c:2212 msgid "" "# Color of mini help menu\n" "# Default: 3 (brown)\n" @@ -6823,11 +6823,11 @@ msgstr "" "# Farve pÃ¥ minihjælpemenu\n" "# Standard: 3 (brun)\n" -#: src/lang.c:2215 +#: src/lang.c:2218 msgid "Color of help text" msgstr "Farve pÃ¥ hjælpetekst" -#: src/lang.c:2216 +#: src/lang.c:2219 msgid "" "# Color of help pages\n" "# Default: -1 (default color)\n" @@ -6835,11 +6835,11 @@ msgstr "" "# Farve pÃ¥ hjælpesider\n" "# Standard: -1 (standardfarve)\n" -#: src/lang.c:2222 +#: src/lang.c:2225 msgid "Color of status messages" msgstr "Farve pÃ¥ statusbeskeder" -#: src/lang.c:2223 +#: src/lang.c:2226 msgid "" "# Color of messages in last line\n" "# Default: 6 (cyan)\n" @@ -6847,11 +6847,11 @@ msgstr "" "# Farve pÃ¥ beskeder i sidste linje\n" "# Standard: 6 (cyan)\n" -#: src/lang.c:2229 +#: src/lang.c:2232 msgid "Color of quoted lines" msgstr "Farve pÃ¥ citerede linjer" -#: src/lang.c:2230 +#: src/lang.c:2233 msgid "" "# Color of quote-lines\n" "# Default: 2 (green)\n" @@ -6859,21 +6859,21 @@ msgstr "" "# Farve pÃ¥ citeringslinjer\n" "# Standard: 2 (grøn)\n" -#: src/lang.c:2236 +#: src/lang.c:2239 msgid "Color of twice quoted line" msgstr "Farve pÃ¥ dobbelt citerede linjer" -#: src/lang.c:2237 +#: src/lang.c:2240 msgid "" "# Color of twice quoted lines\n" "# Default: 3 (brown)\n" msgstr "# Farve pÃ¥ dobbelt citerede linjer# Standard: 3 (brun)\n" -#: src/lang.c:2243 +#: src/lang.c:2246 msgid "Color of =>3 times quoted line" msgstr "Farve pÃ¥ =>3 gange citerede linje" -#: src/lang.c:2244 +#: src/lang.c:2247 msgid "" "# Color of >=3 times quoted lines\n" "# Default: 4 (blue)\n" @@ -6881,11 +6881,11 @@ msgstr "" "# Farve pÃ¥ >=3 gange citerede linjer\n" "# Standard: 4 (blÃ¥)\n" -#: src/lang.c:2250 +#: src/lang.c:2253 msgid "Color of article header lines" msgstr "Farve pÃ¥ artikelhovedlinjer" -#: src/lang.c:2251 +#: src/lang.c:2254 msgid "" "# Color of header-lines\n" "# Default: 2 (green)\n" @@ -6894,11 +6894,11 @@ msgstr "" "# Standard: 2 (grøn)\n" # actual, er det sÃ¥dan noget som "faktiske" eller "rigtige" her, jeg er i tvivl -#: src/lang.c:2257 +#: src/lang.c:2260 msgid "Color of actual news header fields" msgstr "Farve pÃ¥ aktuelle nyhedshovedfelter" -#: src/lang.c:2258 +#: src/lang.c:2261 msgid "" "# Color of actual news header fields\n" "# Default: 9 (light red)\n" @@ -6906,11 +6906,11 @@ msgstr "" "# Farve pÃ¥ aktuelle nyhedshovedfelter\n" "# Standard: 9 (lyserød)\n" -#: src/lang.c:2264 +#: src/lang.c:2267 msgid "Color of article subject lines" msgstr "Farve pÃ¥ artikelemnelinjer" -#: src/lang.c:2265 +#: src/lang.c:2268 msgid "" "# Color of article subject\n" "# Default: 6 (cyan)\n" @@ -6918,11 +6918,11 @@ msgstr "" "# Farve pÃ¥ artikelemne\n" "# Standard: 6 (cyan)\n" -#: src/lang.c:2271 +#: src/lang.c:2274 msgid "Color of external quotes" msgstr "Farve pÃ¥ eksterne citater" -#: src/lang.c:2272 +#: src/lang.c:2275 msgid "" "# Color of quoted text from external sources\n" "# Default: 5 (pink)\n" @@ -6930,11 +6930,11 @@ msgstr "" "# Farve pÃ¥ citeret tekst fra eksterne kilder\n" "# Standard: 5 (lyserød)\n" -#: src/lang.c:2278 +#: src/lang.c:2281 msgid "Color of response counter" msgstr "Farve pÃ¥ svartæller" -#: src/lang.c:2279 +#: src/lang.c:2282 msgid "" "# Color of response counter\n" "# Default: 2 (green)\n" @@ -6942,11 +6942,11 @@ msgstr "" "# Farve pÃ¥ svartæller\n" "# Standard: 2 (grøn)\n" -#: src/lang.c:2285 +#: src/lang.c:2288 msgid "Color of sender (From:)" msgstr "Farver pÃ¥ afsender (From:)" -#: src/lang.c:2286 +#: src/lang.c:2289 msgid "" "# Color of sender (From:)\n" "# Default: 2 (green)\n" @@ -6954,11 +6954,11 @@ msgstr "" "# Farve pÃ¥ afsender (From:)\n" "# Standard: 2 (grøn)\n" -#: src/lang.c:2292 +#: src/lang.c:2295 msgid "Color of help/mail sign" msgstr "Farve pÃ¥ hjælp-/posttegn" -#: src/lang.c:2293 +#: src/lang.c:2296 msgid "" "# Color of Help/Mail-Sign\n" "# Default: 4 (blue)\n" @@ -6966,11 +6966,11 @@ msgstr "" "# Farve pÃ¥ hjælp-/posttegn\n" "# Standard: 4 (blÃ¥)\n" -#: src/lang.c:2299 +#: src/lang.c:2302 msgid "Color of signatures" msgstr "Farve pÃ¥ underskrifter" -#: src/lang.c:2300 +#: src/lang.c:2303 msgid "" "# Color of signature\n" "# Default: 4 (blue)\n" @@ -6978,11 +6978,11 @@ msgstr "" "# Farve pÃ¥ underskrift\n" "# Standard: 4 (blÃ¥)\n" -#: src/lang.c:2306 +#: src/lang.c:2309 msgid "Color of highlighted URLs" msgstr "Farve pÃ¥ fremhævede URL'er" -#: src/lang.c:2307 +#: src/lang.c:2310 msgid "" "# Color of highlighted URLs\n" "# Default: -1 (default color)\n" @@ -6990,11 +6990,11 @@ msgstr "" "# Farve pÃ¥ fremhævede URL'er\n" "# Standard: -1 (standardfarve)\n" -#: src/lang.c:2313 +#: src/lang.c:2316 msgid "Color of verbatim blocks" msgstr "Farve pÃ¥ verbatimblokke" -#: src/lang.c:2314 +#: src/lang.c:2317 msgid "" "# Color of verbatim blocks\n" "# Default: 5 (pink)\n" @@ -7002,11 +7002,11 @@ msgstr "" "# Farve pÃ¥ verbatimblokke\n" "# Standard: 5 (lyserød)\n" -#: src/lang.c:2320 +#: src/lang.c:2323 msgid "Color of highlighting with *stars*" msgstr "Farve pÃ¥ fremhævninger med *stjerner*" -#: src/lang.c:2321 +#: src/lang.c:2324 msgid "" "# Color of word highlighting with *stars*\n" "# Default: 11 (yellow)\n" @@ -7014,11 +7014,11 @@ msgstr "" "# Farve pÃ¥ ordfremhævninger med *stjerner*\n" "# Standard: 11 (gul)\n" -#: src/lang.c:2327 +#: src/lang.c:2330 msgid "Color of highlighting with _dash_" msgstr "Farve pÃ¥ fremhævning med _streg_" -#: src/lang.c:2328 +#: src/lang.c:2331 msgid "" "# Color of word highlighting with _dash_\n" "# Default: 13 (light pink)\n" @@ -7026,11 +7026,11 @@ msgstr "" "# Farve pÃ¥ ordfremhævning med _streg_\n" "# Standard: 13 (lyselilla)\n" -#: src/lang.c:2334 +#: src/lang.c:2337 msgid "Color of highlighting with /slash/" msgstr "Farve pÃ¥ fremhævninger med /skrÃ¥streg/" -#: src/lang.c:2335 +#: src/lang.c:2338 msgid "" "# Color of word highlighting with /slash/\n" "# Default: 14 (light cyan)\n" @@ -7040,11 +7040,11 @@ msgstr "" # Er det ikke stroke der er skrÃ¥skreg? # nej den er god nok med at slahs er skrÃ¥streg ligesom der stÃ¥r før -#: src/lang.c:2341 +#: src/lang.c:2344 msgid "Color of highlighting with -stroke-" msgstr "Farve pÃ¥ fremhævning med -bindestreg-" -#: src/lang.c:2342 +#: src/lang.c:2345 msgid "" "# Color of word highlighting with -stroke-\n" "# Default: 12 (light blue)\n" @@ -7052,11 +7052,11 @@ msgstr "" "# Farve pÃ¥ ordfremhævning med -bindestreg-\n" "# Standard: 12 (lysblÃ¥)\n" -#: src/lang.c:2349 +#: src/lang.c:2352 msgid "Attr. of highlighting with *stars*" msgstr "Attr. pÃ¥ fremhævninger med *stjerner*" -#: src/lang.c:2350 +#: src/lang.c:2353 msgid "" "# Attributes of word highlighting on mono terminals\n" "# Possible values are:\n" @@ -7084,57 +7084,57 @@ msgstr "" "# Attribut pÃ¥ ordfremhævning med *stjerner*\n" "# Standard: 6 (fed)\n" -#: src/lang.c:2365 +#: src/lang.c:2368 msgid "Attr. of highlighting with _dash_" msgstr "" -#: src/lang.c:2366 +#: src/lang.c:2369 msgid "" "# Attribute of word highlighting with _dash_\n" "# Default: 2 (best highlighting)\n" msgstr "" -#: src/lang.c:2372 +#: src/lang.c:2375 msgid "Attr. of highlighting with /slash/" msgstr "Attr. for fremhævelse med /slash/" -#: src/lang.c:2373 +#: src/lang.c:2376 msgid "" "# Attribute of word highlighting with /slash/\n" "# Default: 5 (half bright)\n" msgstr "" -#: src/lang.c:2379 +#: src/lang.c:2382 msgid "Attr. of highlighting with -stroke-" msgstr "" -#: src/lang.c:2380 +#: src/lang.c:2383 msgid "" "# Attribute of word highlighting with -stroke-\n" "# Default: 3 (reverse video)\n" msgstr "" -#: src/lang.c:2386 +#: src/lang.c:2389 msgid "URL highlighting in message body" msgstr "Adressefremhævelse i beskedens tekstomrÃ¥de" -#: src/lang.c:2387 +#: src/lang.c:2390 msgid "# Enable URL highlighting?\n" msgstr "# Aktiver adressefremhævelse?\n" -#: src/lang.c:2392 +#: src/lang.c:2395 msgid "Word highlighting in message body" msgstr "Ordfremhævelse i beskedens tekstomrÃ¥de" -#: src/lang.c:2393 +#: src/lang.c:2396 msgid "# Enable word highlighting?\n" msgstr "# Aktiver ordfremhævelse?\n" -#: src/lang.c:2398 +#: src/lang.c:2401 msgid "What to display instead of mark" msgstr "" -#: src/lang.c:2399 +#: src/lang.c:2402 msgid "" "# Should the leading and ending stars and dashes also be displayed,\n" "# even when they are highlighting marks?\n" @@ -7144,63 +7144,63 @@ msgid "" "# * 2 = print a space instead\n" msgstr "" -#: src/lang.c:2408 +#: src/lang.c:2411 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "" "Indtast kolonnenummer at ombryde artikellinjer i artikelsøgeren. ændrer." -#: src/lang.c:2409 +#: src/lang.c:2412 msgid "Page line wrap column" msgstr "Sidelinjens ombrydningskolonne" -#: src/lang.c:2410 +#: src/lang.c:2413 msgid "# Wrap article lines at column\n" msgstr "# Ombryd artikellinjer ved kolonne\n" -#: src/lang.c:2415 +#: src/lang.c:2418 msgid "Wrap around threads on next unread" msgstr "Medtag trÃ¥de i næste ulæste" -#: src/lang.c:2416 +#: src/lang.c:2419 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "" "# Hvis slÃ¥et til, sÃ¥ medtag trÃ¥de ved søgning efter næste ulæste artikel\n" -#: src/lang.c:2420 +#: src/lang.c:2423 msgid "Enter default mail address (and fullname). sets." msgstr "Indtast standardpostadresse (og fulde navn). ændrer." -#: src/lang.c:2421 src/lang.c:2931 +#: src/lang.c:2424 src/lang.c:2939 msgid "Mail address (and fullname)" msgstr "Postadresse (og fulde navn)" -#: src/lang.c:2422 +#: src/lang.c:2425 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "" "# Brugers postadresse (og fulde navn), hvis ikke username@host (fulde navn)\n" -#: src/lang.c:2427 +#: src/lang.c:2430 msgid "Show empty Followup-To in editor" msgstr "Vis tomme Followup-To i redigeringsprogrammet" -#: src/lang.c:2428 +#: src/lang.c:2431 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "" "# Hvis slÃ¥et til, sÃ¥ vis tomme Followup-To-teksthoveder nÃ¥r en artikel " "redigeres\n" -#: src/lang.c:2432 +#: src/lang.c:2435 msgid "" "Enter path/! command/--none to create your default signature. sets." msgstr "" "Indtast path/! command/--none for at oprette din standardunderskrift. " "ændrer." -#: src/lang.c:2433 +#: src/lang.c:2436 msgid "Create signature from path/command" msgstr "Opret underskrift fra path/command (sti/kommando)" -#: src/lang.c:2434 +#: src/lang.c:2437 #, c-format msgid "" "# Signature path (random sigs)/file to be used when posting/replying\n" @@ -7210,44 +7210,44 @@ msgid "" "# sigfile=--none don't append a signature\n" msgstr "" -#: src/lang.c:2442 +#: src/lang.c:2445 msgid "" "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "" "Foranstil underskrift med \"-- \" pÃ¥ egen linje. skifter & " "ændrer." -#: src/lang.c:2443 +#: src/lang.c:2446 msgid "Prepend signature with \"-- \"" msgstr "Foranstil underskrift med \"-- \"" -#: src/lang.c:2444 +#: src/lang.c:2447 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "# Hvis slÃ¥et til, sÃ¥ foranstil signaturen med streger »\\n-- \\n«\n" -#: src/lang.c:2448 +#: src/lang.c:2451 msgid "Add signature when reposting articles. toggles & sets." msgstr "" "Tilføj underskrift nÃ¥r artikler gensendes. SKIFTER & ændrer." -#: src/lang.c:2449 +#: src/lang.c:2452 msgid "Add signature when reposting" msgstr "Tilføj signatur ved genindsendelse" -#: src/lang.c:2450 +#: src/lang.c:2453 msgid "# If ON add signature to reposted articles\n" msgstr "# Hvis slÃ¥et til, sÃ¥ tilføj signatur til genindsendte artikler\n" -#: src/lang.c:2454 +#: src/lang.c:2457 #, c-format msgid "Enter quotation marks, %s or %S for author's initials." msgstr "Indtast anførselstegn, %s eller %S for forfatters initialer." -#: src/lang.c:2455 +#: src/lang.c:2458 msgid "Characters used as quote-marks" msgstr "Tegn brugt som anførselstegn" -#: src/lang.c:2456 +#: src/lang.c:2459 #, c-format msgid "" "# Characters used in quoting to followups and replies.\n" @@ -7256,11 +7256,11 @@ msgstr "" "# Tegn brugt i citering til opfølgninger og svar.\n" "# '_' erstattes af ' ', %s, %S erstattes af forfatterens initialer.\n" -#: src/lang.c:2462 +#: src/lang.c:2465 msgid "Quoting behavior" msgstr "Citeringsopførsel" -#: src/lang.c:2463 +#: src/lang.c:2466 msgid "" "# How quoting should be handled when following up or replying.\n" "# Possible values are (the default is marked with *):\n" @@ -7284,17 +7284,17 @@ msgstr "" "# 6 = Citer signaturer, citer tomme linjer\n" "# 7 = Komprimer citeringer, citer signaturer, citer tomme linjer\n" -#: src/lang.c:2476 src/lang.c:2484 src/lang.c:2490 +#: src/lang.c:2479 src/lang.c:2487 src/lang.c:2493 msgid "" "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "" "%A Adr %D Dato %F Adr+Navn %G Gruppenavn %M Besked-id %N Navn %C Fornavn" -#: src/lang.c:2477 +#: src/lang.c:2480 msgid "Quote line when following up" msgstr "Citer linje ved opfølgning" -#: src/lang.c:2478 +#: src/lang.c:2481 msgid "" "# Format of quote line when mailing/posting/following-up an article\n" "# %A Address %D Date %F Addr+Name %G Groupname %M Message-ID\n" @@ -7304,29 +7304,29 @@ msgstr "" "# %A Adresse %D Dato %F Adr+Navn %G Gruppenavn %M Besked-id\n" "# %N Fulde navn %C Fornavn %I Initialer\n" -#: src/lang.c:2485 +#: src/lang.c:2488 msgid "Quote line when cross-posting" msgstr "Citer linje ved krydsindsendelse" -#: src/lang.c:2491 +#: src/lang.c:2494 msgid "Quote line when mailing" msgstr "Citer linje ved postleverance" -#: src/lang.c:2496 +#: src/lang.c:2499 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "" "Hvis slÃ¥et til, sÃ¥ inkluder User-Agent:-teksthoved. skifter og " " ændrer" -#: src/lang.c:2497 +#: src/lang.c:2500 msgid "Insert 'User-Agent:' header" msgstr "Indsæt »User-Agent:«-teksthoved" -#: src/lang.c:2498 +#: src/lang.c:2501 msgid "# If ON include advertising User-Agent: header\n" msgstr "# Hvis slÃ¥et til, sÃ¥ inkluder reklameteksthoved for User-Agent:\n" -#: src/lang.c:2503 +#: src/lang.c:2506 msgid "" "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" @@ -7334,11 +7334,11 @@ msgstr "" "ændrer." # skal vist ikke oversættes til tegnsæt -#: src/lang.c:2504 +#: src/lang.c:2507 msgid "MM_CHARSET" msgstr "MM_CHARSET" -#: src/lang.c:2505 +#: src/lang.c:2508 msgid "" "# Charset supported locally which is also used for MIME header and\n" "# Content-Type header.\n" @@ -7355,42 +7355,42 @@ msgstr "" "# Hvis MIME_STRICT_CHARSET er defineret pÃ¥ kompileringstidspunktet, kan\n" "# tegnsæt udover mm_charset ikke vises og repræsenteres ved '?'.\n" -#: src/lang.c:2515 +#: src/lang.c:2518 msgid "MM_NETWORK_CHARSET" msgstr "MM_NETWORK_CHARSET" -#: src/lang.c:2516 +#: src/lang.c:2519 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "# Tegnsæt brugt for MIME-teksthoved i indsendelser (Content-Type).\n" -#: src/lang.c:2520 +#: src/lang.c:2523 msgid "" "Enter local charset name (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" "Indtast lokalt tegnsætnavn (f.ek.s US-ASCII, ISO-8859-1, EUC-KR), " "ændrer." -#: src/lang.c:2521 +#: src/lang.c:2524 msgid "MM_LOCAL_CHARSET" msgstr "MM_LOCAL_CHARSET" -#: src/lang.c:2522 +#: src/lang.c:2525 msgid "# Charset supported locally.\n" msgstr "# Tegnsæt understøttet lokalt.\n" -#: src/lang.c:2529 +#: src/lang.c:2532 msgid "Mailbox format" msgstr "Postkasseformat" -#: src/lang.c:2530 +#: src/lang.c:2533 msgid "# Format of the mailbox.\n" msgstr "# Format pÃ¥ postkassen.\n" -#: src/lang.c:2535 +#: src/lang.c:2538 msgid "MIME encoding in news messages" msgstr "MIME-kodning i nye beskeder" -#: src/lang.c:2536 +#: src/lang.c:2539 msgid "" "# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n" "# for mails and posts, if necessary. QP is efficient for most European\n" @@ -7404,16 +7404,16 @@ msgstr "" "# mens Base64 er mere effektiv for de fleste 8-bit østasiatiske, græske og\n" "# russiske tegnsæt med en masse 8-bit tegn.\n" -#: src/lang.c:2544 src/lang.c:2565 +#: src/lang.c:2547 src/lang.c:2568 msgid "Don't change unless you know what you are doing. cancels." msgstr "Ændr ikke med mindre du ved hvad du laver. afbryder." -#: src/lang.c:2545 +#: src/lang.c:2548 msgid "Use 8bit characters in news headers" msgstr "Brug 8-bit tegn i nyhedshoveder" # engelsk fejl d med stort -#: src/lang.c:2546 +#: src/lang.c:2549 msgid "" "# If ON, 8bit characters in news headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -7425,28 +7425,28 @@ msgstr "" "# 8-bit tegn i teksthoved kodes uanset værdien af denne parameter\n" "# med mindre post_mime_encoding ogsÃ¥ er 8-bit.\n" -#: src/lang.c:2553 +#: src/lang.c:2556 msgid "" "Auto-view post-processed files toggles, sets, cancels." msgstr "" -#: src/lang.c:2554 +#: src/lang.c:2557 msgid "View post-processed files" msgstr "Vis efterbehandlede filer" -#: src/lang.c:2555 +#: src/lang.c:2558 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "" -#: src/lang.c:2560 +#: src/lang.c:2563 msgid "MIME encoding in mail messages" msgstr "MIME-kodning i postbeskeder" -#: src/lang.c:2566 +#: src/lang.c:2569 msgid "Use 8bit characters in mail headers" msgstr "Brug 8-bit tegn i posthoveder" -#: src/lang.c:2567 +#: src/lang.c:2570 msgid "" "# If ON, 8bit characters in mail headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -7457,11 +7457,11 @@ msgid "" "# turn it ON unless you have some compelling reason.\n" msgstr "" -#: src/lang.c:2578 +#: src/lang.c:2581 msgid "Strip blanks from ends of lines" msgstr "Fjern tomme tegn fra linjeslutninger" -#: src/lang.c:2579 +#: src/lang.c:2582 msgid "" "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" @@ -7469,16 +7469,16 @@ msgstr "" "# Hvis slÃ¥et til, sÃ¥ fjern tomme felter fra linjeafslutninger for hurtigere\n" "# visning pÃ¥ langsomme terminaler.\n" -#: src/lang.c:2585 +#: src/lang.c:2588 msgid "If ON, use transliteration. toggles & sets." msgstr "" "Hvis slÃ¥et til, sÃ¥ brug transliteration. skifter & ændrer." -#: src/lang.c:2586 +#: src/lang.c:2589 msgid "Transliteration" msgstr "Transliteration" -#: src/lang.c:2587 +#: src/lang.c:2590 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" @@ -7489,11 +7489,11 @@ msgstr "" "# ikke kan repræsenteres i mÃ¥ltegnsættet, sÃ¥ kan det tilnærmes via et eller\n" "# flere lignende tegn.\n" -#: src/lang.c:2595 +#: src/lang.c:2598 msgid "Send you a Cc/Bcc automatically" msgstr "Send dig en Cc/Bcc automatisk" -#: src/lang.c:2596 +#: src/lang.c:2599 msgid "" "# Put your name in the Cc: and/or Bcc: field when mailing an article.\n" "# Possible values are (the default is marked with *):\n" @@ -7509,26 +7509,26 @@ msgstr "" "# 2 = Bcc\n" "# 3 = Cc og Bcc\n" -#: src/lang.c:2607 +#: src/lang.c:2610 msgid "Hash algorithm for Cancel-Lock/Cancel-Key" msgstr "" -#: src/lang.c:2608 +#: src/lang.c:2611 msgid "" "# Hash algorithm for Cancel-Lock/Cancel-Key (default 'sha1')\n" "# Use 'none' to not generate Cancel-Lock headers.\n" msgstr "" -#: src/lang.c:2614 +#: src/lang.c:2617 msgid "Enter address elements about which you want to be warned. sets." msgstr "" "Indtast adresseelementer som du ønsker at blive advaret om. ændrer." -#: src/lang.c:2615 +#: src/lang.c:2618 msgid "Spamtrap warning address parts" msgstr "Spamtrap-advarsel for adressedele" -#: src/lang.c:2616 +#: src/lang.c:2619 msgid "" "# A comma-delimited list of address-parts you want to be warned\n" "# about when trying to reply by email.\n" @@ -7536,28 +7536,28 @@ msgstr "" "# En kommaafgrænset liste med adressedele du ønsker at blive advaret om,\n" "# nÃ¥r du svarer pÃ¥ e-post.\n" -#: src/lang.c:2621 +#: src/lang.c:2624 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "Indtast antal dage en filterpost vil være gyldig. toggles & sets." msgstr "Tilføj sendte artikler til filter. skifter & ændrer." -#: src/lang.c:2628 +#: src/lang.c:2631 msgid "Add posted articles to filter" msgstr "Tilføj indsendte artikler til filter" # engelsk fejl, mangler . -#: src/lang.c:2629 +#: src/lang.c:2632 msgid "" "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" @@ -7565,24 +7565,24 @@ msgstr "" "# Hvis slÃ¥et til, sÃ¥ tilføj indsendte artikler, som starter en ny trÃ¥d\n" "# at filtrere efter, som fremhævede opfølgninger.\n" -#: src/lang.c:2633 +#: src/lang.c:2636 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "" "Mappen hvor artikler/trÃ¥de skal gemmes i mailbox-format (postkasseformat)." -#: src/lang.c:2634 +#: src/lang.c:2637 msgid "Mail directory" msgstr "Postmappe" -#: src/lang.c:2635 +#: src/lang.c:2638 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "# (-m) mappe hvor artikler/trÃ¥de gemmes i mailbox-format\n" -#: src/lang.c:2640 +#: src/lang.c:2643 msgid "Save articles in batch mode (-S)" msgstr "Gem artikler i jobtilstand (-S)" -#: src/lang.c:2641 +#: src/lang.c:2644 msgid "" "# If ON articles/threads will be saved in batch mode when save -S\n" "# or mail (-M/-N) is specified on the command line\n" @@ -7590,29 +7590,29 @@ msgstr "" "# Hvis slÃ¥et til, sÃ¥ vil artikler/trÃ¥de blive gemt i jobtilstand\n" "# nÃ¥r -S eller post (-M/-N) er angivet pÃ¥ kommandolinjen\n" -#: src/lang.c:2646 +#: src/lang.c:2649 msgid "The directory where you want articles/threads saved." msgstr "Mappen hvor du ønsker at artikler/trÃ¥de gemmes." -#: src/lang.c:2647 +#: src/lang.c:2650 msgid "Directory to save arts/threads in" msgstr "Mappe til at gemme artikler/trÃ¥de i" -#: src/lang.c:2648 +#: src/lang.c:2651 msgid "# Directory where articles/threads are saved\n" msgstr "# Mappe hvor artikler/trÃ¥de gemmes\n" -#: src/lang.c:2652 +#: src/lang.c:2655 msgid "" "Auto save article/thread by Archive-name: header. toggles & " "sets." msgstr "" -#: src/lang.c:2653 +#: src/lang.c:2656 msgid "Use Archive-name: header for save" msgstr "Brug arkivnavn: teksthoveder for gem" -#: src/lang.c:2654 +#: src/lang.c:2657 msgid "" "# If ON articles/threads with Archive-name: in mail header will\n" "# be automatically saved with the Archive-name & part/patch no.\n" @@ -7620,7 +7620,7 @@ msgstr "" "# Hvis slÃ¥et til, sÃ¥ vil artikler/trÃ¥de med Archive-name: i\n" "# teksthovedet blive gemt med Archive-name og part/patch-nr.\n" -#: src/lang.c:2659 +#: src/lang.c:2662 msgid "" "Mark saved articles/threads as read. toggles, sets, " "cancels." @@ -7628,24 +7628,24 @@ msgstr "" "Marker gemte artikler/trÃ¥de som læst. skifter, ændrer, " " afbryder." -#: src/lang.c:2660 +#: src/lang.c:2663 msgid "Mark saved articles/threads as read" msgstr "Marker gemte artikler/trÃ¥de som læst" -#: src/lang.c:2661 +#: src/lang.c:2664 msgid "# If ON mark articles that are saved as read\n" msgstr "# Hvis slÃ¥et til, sÃ¥ markeres artikler som gemmes som læst\n" -#: src/lang.c:2665 +#: src/lang.c:2668 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "" "Udfør ikke efterbehandling (f.eks. udtræk vedhæftninger) for gemte artikler." -#: src/lang.c:2666 +#: src/lang.c:2669 msgid "Post process saved articles" msgstr "Efterbehandl gemte artikler" -#: src/lang.c:2667 +#: src/lang.c:2670 msgid "" "# Perform post processing (saving binary attachments) from saved articles.\n" "# Possible values are (the default is marked with *):\n" @@ -7654,11 +7654,11 @@ msgid "" "# 2 = yes\n" msgstr "" -#: src/lang.c:2676 +#: src/lang.c:2679 msgid "Process only unread articles" msgstr "Behandl kun ulæste artikler" -#: src/lang.c:2677 +#: src/lang.c:2680 msgid "" "# If ON only save/print/pipe/mail unread articles (tagged articles " "excepted)\n" @@ -7667,15 +7667,15 @@ msgstr "" "artikler\n" "# (mærkede artikler forventes)\n" -#: src/lang.c:2682 +#: src/lang.c:2685 msgid "Print all or just part of header. toggles & sets." msgstr "" -#: src/lang.c:2683 +#: src/lang.c:2686 msgid "Print all headers when printing" msgstr "Udskriv alle teksthoveder under udskrivning" -#: src/lang.c:2684 +#: src/lang.c:2687 msgid "" "# If ON print all of article header otherwise just the important lines\n" msgstr "" @@ -7683,7 +7683,7 @@ msgstr "" "vigtige\n" "# linjer\n" -#: src/lang.c:2688 +#: src/lang.c:2691 msgid "" "The printer program with options that is to be used to print articles/" "threads." @@ -7691,37 +7691,37 @@ msgstr "" "Printerprogrammet med indstillinger som vil blive brugt til at udskrive " "artikler/trÃ¥de." -#: src/lang.c:2689 +#: src/lang.c:2692 msgid "Printer program with options" msgstr "Printerprogram med indstillinger" -#: src/lang.c:2690 +#: src/lang.c:2693 msgid "# Print program with parameters used to print articles/threads\n" msgstr "# Udskriv program med parametre brugt til at udskrive artikler/trÃ¥de\n" -#: src/lang.c:2696 +#: src/lang.c:2699 msgid "Force redraw after certain commands" msgstr "Fremtving skærmopdatering efter bestemte kommandoer" -#: src/lang.c:2697 +#: src/lang.c:2700 msgid "" "# If ON a screen redraw will always be done after certain external commands\n" msgstr "" "% Hvis slÃ¥et til, sÃ¥ vil en skærmopdatering altid blive udført efter " "bestemte eksterne kommandoer\n" -#: src/lang.c:2701 +#: src/lang.c:2704 msgid "" "Start editor with line offset. toggles, sets, cancels." msgstr "" "Start redigeringsprogram med linjeforskydning. skifter, " "ændrer, afbryder." -#: src/lang.c:2702 +#: src/lang.c:2705 msgid "Start editor with line offset" msgstr "Start redigeringsprogram med linjeforskydning" -#: src/lang.c:2703 +#: src/lang.c:2706 msgid "" "# If ON editor will be started with cursor offset into the file\n" "# otherwise the cursor will be positioned at the first line\n" @@ -7730,17 +7730,17 @@ msgstr "" "# markørforskydning i filen, ellers vil markøren blive placeret pÃ¥ den\n" "# første linje\n" -#: src/lang.c:2708 +#: src/lang.c:2711 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "" "Indtast %E for redigeringsprogram, %F for filnavn, %N for linjenummer. " "ændrer" -#: src/lang.c:2709 +#: src/lang.c:2712 msgid "Invocation of your editor" msgstr "Igangsættelse af dit redigeringsprogram" -#: src/lang.c:2710 +#: src/lang.c:2713 msgid "" "# Format of editor line including parameters\n" "# %E Editor %F Filename %N Linenumber\n" @@ -7748,18 +7748,18 @@ msgstr "" "# Format for redigeringsprogrammets parametre for linjeinkludering\n" "# %E Redigeringsprogram %F Filnavn %N Linjenummer\n" -#: src/lang.c:2715 +#: src/lang.c:2718 msgid "" "Enter name and options for external-inews, --internal for internal inews" msgstr "" "Indtast navn og indstillinger for external-inews, --internal for interne " "inews" -#: src/lang.c:2716 +#: src/lang.c:2719 msgid "External inews" msgstr "Eksterne inews" -#: src/lang.c:2717 +#: src/lang.c:2720 msgid "" "# If --internal use the built in mini inews for posting via NNTP\n" "# otherwise use an external inews program\n" @@ -7768,18 +7768,18 @@ msgstr "" "NNTP\n" "# ellers brug et eksternt inews-program\n" -#: src/lang.c:2721 +#: src/lang.c:2724 msgid "" "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" "Indtast %M for postprogram, %S for emne, %T for til, %F for filnavn, " "ændrer." -#: src/lang.c:2722 +#: src/lang.c:2725 msgid "Invocation of your mail command" msgstr "Igangsættelse af din postkommando" -#: src/lang.c:2723 +#: src/lang.c:2726 msgid "" "# Format of mailer line including parameters\n" "# %M Mailer %S Subject %T To %F Filename\n" @@ -7787,11 +7787,11 @@ msgid "" "# ie. elm interactive : elm -i %F -s \"%S\" \"%T\"\n" msgstr "" -#: src/lang.c:2731 +#: src/lang.c:2734 msgid "Use interactive mail reader" msgstr "Brug interaktiv postlæser" -#: src/lang.c:2732 +#: src/lang.c:2735 msgid "" "# Interactive mailreader\n" "# Possible values are (the default is marked with *):\n" @@ -7805,35 +7805,35 @@ msgstr "" "# 1 = brug interaktiv postlæser med teksthoveder i fil\n" "# 2 = brug interaktiv postlæser uden teksthoveder i fil\n" -#: src/lang.c:2741 +#: src/lang.c:2744 msgid "Remove ~/.article after posting" msgstr "Fjern ~/.article efter indsendelse" -#: src/lang.c:2742 +#: src/lang.c:2745 msgid "# If ON remove ~/.article after posting.\n" msgstr "# Hvis slÃ¥et til, sÃ¥ fjern ~/.article efter indsendelse.\n" -#: src/lang.c:2748 +#: src/lang.c:2751 msgid "Use UTF-8 graphics (thread tree etc.)" msgstr "Brug UTF-8-grafik (trÃ¥dtræ etc.)" -#: src/lang.c:2749 +#: src/lang.c:2752 msgid "" "# If ON use UTF-8 characters for indicator '->', tree and ellipsis '...'.\n" msgstr "" "# Hvis slÃ¥et til, sÃ¥ brug UTF-8-tegn for indikator »->«, træ og ellipse " "»...«\n" -#: src/lang.c:2754 +#: src/lang.c:2757 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "" "Filnavn for alle indsendte artikler, ændrer, intet filnavn=gem ikke." -#: src/lang.c:2755 +#: src/lang.c:2758 msgid "Filename for posted articles" msgstr "Filnavn for indsendte artikler" -#: src/lang.c:2756 +#: src/lang.c:2759 msgid "" "# Filename where to keep all postings (default posted)\n" "# If no filename is set then postings will not be saved\n" @@ -7841,39 +7841,39 @@ msgstr "" "# Filnavn hvor alle indlæg opbevares (standardindlæg)\n" "# Hvis intet filnavn er angivet, sÃ¥ vil indlæg ikke blive gemt\n" -#: src/lang.c:2761 +#: src/lang.c:2764 msgid "" "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "" "Bevar alle mislykkedes artikler i ~/dead.articles. skifter & " " ændrer." -#: src/lang.c:2762 +#: src/lang.c:2765 msgid "Keep failed arts in ~/dead.articles" msgstr "Bevar mislykkede artikler i ~/dead.articles" -#: src/lang.c:2763 +#: src/lang.c:2766 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "" "# Hvis slÃ¥et til, sÃ¥ bevar alle mislykkedes indsendelser i ~/dead.articles\n" -#: src/lang.c:2767 +#: src/lang.c:2770 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "Ønsker du at fjerne grupper med fjernet abonnement fra .newsrc" -#: src/lang.c:2768 +#: src/lang.c:2771 msgid "No unsubscribed groups in newsrc" msgstr "Ingen grupper med fjernet abonnement i newsrc" -#: src/lang.c:2769 +#: src/lang.c:2772 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "# Hvis slÃ¥et til sÃ¥ fjern grupper uden abonnement fra newsrc\n" -#: src/lang.c:2774 +#: src/lang.c:2777 msgid "Remove bogus groups from newsrc" msgstr "Fjern fejlramte grupper fra newsrc" -#: src/lang.c:2775 +#: src/lang.c:2778 msgid "" "# What to do with bogus groups in newsrc file\n" "# Possible values are (the default is marked with *):\n" @@ -7882,71 +7882,71 @@ msgid "" "# 2 = highlight with D on selection screen\n" msgstr "" -#: src/lang.c:2784 +#: src/lang.c:2787 msgid "" "Enter number of seconds to wait for a response from the server. sets." msgstr "" "Indtast antallet af sekunder at vente pÃ¥ svar fra serveren. ændrer." -#: src/lang.c:2785 +#: src/lang.c:2788 msgid "NNTP read timeout in seconds" msgstr "Tidsudløb i sekunder for NNTP-læs" -#: src/lang.c:2786 +#: src/lang.c:2789 msgid "" "# Time in seconds to wait for a response from the server (0=no timeout)\n" msgstr "# Ventetid i sekunder efter svar fra en server (0=intet tidsudløb)\n" -#: src/lang.c:2791 +#: src/lang.c:2794 msgid "Enter number of seconds until active file will be reread. sets." msgstr "" "Indtast antallet af sekunder før aktiv fil vil blive genlæst. ændrer." -#: src/lang.c:2792 +#: src/lang.c:2795 msgid "Interval in secs to reread active" msgstr "Interval i sekunder til at genlæse aktive" -#: src/lang.c:2793 +#: src/lang.c:2796 msgid "" "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "" "# Tidsinterval i sekunder mellem genlæsning af den aktive fil (0=aldrig)\n" -#: src/lang.c:2798 +#: src/lang.c:2801 msgid "Reconnect to server automatically" msgstr "Forbind til serveren igen automatisk" -#: src/lang.c:2799 +#: src/lang.c:2802 msgid "" "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "" "# Hvis slÃ¥et til, sÃ¥ forbind automatisk til NNTP-serveren hvis forbindelsen " "afbrydes\n" -#: src/lang.c:2803 +#: src/lang.c:2806 msgid "" "Create local copies of NNTP overview files. toggles & sets." msgstr "" "Opret lokale kopier af NNTP-overbliksfiler. skifter og " "ændrer." -#: src/lang.c:2804 +#: src/lang.c:2807 msgid "Cache NNTP overview files locally" msgstr "Lagr NNTP-overbliksfiler lokalt" -#: src/lang.c:2805 +#: src/lang.c:2808 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "# Hvis slÃ¥et til, sÃ¥ opret lokale kopier af NNTP-overbliksfiler.\n" -#: src/lang.c:2809 src/lang.c:2824 src/lang.c:2844 src/lang.c:2863 +#: src/lang.c:2812 src/lang.c:2827 src/lang.c:2847 src/lang.c:2866 msgid "Enter format string. sets, cancels." msgstr "Indtast formatstreng. ændrer, afbryder." -#: src/lang.c:2810 +#: src/lang.c:2813 msgid "Format string for selection level" msgstr "Formatstreng for udvælgelsesniveau" -#: src/lang.c:2811 +#: src/lang.c:2814 msgid "" "# Format string for selection level representation\n" "# Default: %f %n %U %G %d\n" @@ -7972,11 +7972,11 @@ msgstr "" "# %n Nummer, linjenummer pÃ¥ skærm\n" "# %U Ulæst antal\n" -#: src/lang.c:2825 +#: src/lang.c:2828 msgid "Format string for group level" msgstr "Formatstreng for gruppeniveau" -#: src/lang.c:2826 +#: src/lang.c:2829 msgid "" "# Format string for group level representation\n" "# Default: %n %m %R %L %s %F\n" @@ -8010,11 +8010,11 @@ msgstr "" "# %s Emne (kun gruppeniveau)\n" "# %S Bedømmelse\n" -#: src/lang.c:2845 +#: src/lang.c:2848 msgid "Format string for thread level" msgstr "Formatstreng for trÃ¥dniveau" -#: src/lang.c:2846 +#: src/lang.c:2849 msgid "" "# Format string for thread level representation\n" "# Default: %n %m [%L] %T %F\n" @@ -8046,19 +8046,20 @@ msgstr "" "# %S Bedømmelse\n" "# %T TrÃ¥dtræ (kun trÃ¥dniveau)\n" -#: src/lang.c:2864 +#: src/lang.c:2867 msgid "Format string for display of dates" msgstr "Formatstreng for visning af datoer" -#: src/lang.c:2865 +#: src/lang.c:2868 msgid "# Format string for date representation\n" msgstr "# Formatstreng for datorepræsentation\n" -#: src/lang.c:2871 +#: src/lang.c:2878 msgid "Unicode normalization form" msgstr "Form for Unicodenormalisering" -#: src/lang.c:2872 +#: src/lang.c:2879 +#, fuzzy msgid "" "# Unicode normalization form\n" "# Possible values are:\n" @@ -8067,6 +8068,7 @@ msgid "" "# 2 = NFKD\n" "# 3 = NFC\n" "# 4 = NFD\n" +"# 5 = NFKC_CF\n" msgstr "" "# Form for Unicodenormalisering\n" "# Mulige værdier er:\n" @@ -8076,19 +8078,19 @@ msgstr "" "# 3 = NFC\n" "# 4 = NFD\n" -#: src/lang.c:2885 +#: src/lang.c:2893 msgid "Render BiDi" msgstr "Optegn BiDi" -#: src/lang.c:2886 +#: src/lang.c:2894 msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "# Hvis slÃ¥et til, sÃ¥ optegnes modsatrettet tekst af tin\n" -#: src/lang.c:2893 +#: src/lang.c:2901 msgid "Function for sorting articles" msgstr "Funktion for sortering af artikler" -#: src/lang.c:2894 +#: src/lang.c:2902 msgid "" "# Function for sorting articles\n" "# Possible values are (the default is marked with *):\n" @@ -8096,192 +8098,192 @@ msgid "" "# 1 = heapsort\n" msgstr "" -#: src/lang.c:2907 +#: src/lang.c:2915 msgid "Automatically GroupMarkUnselArtRead" msgstr "Automatisk GroupMarkUnselArtRead" -#: src/lang.c:2913 +#: src/lang.c:2921 msgid "Delete post-process files" msgstr "Slet efterbrænderens filer" -#: src/lang.c:2918 +#: src/lang.c:2926 msgid "Filename for all mailed articles, sets, no filename=do not save." msgstr "" "Filnavn for alle indsendte artikler, ændrer, intet filnavn=gem ikke." -#: src/lang.c:2919 +#: src/lang.c:2927 msgid "Mailbox to save sent mails" msgstr "Postkasse hvor sendt post gemmes" -#: src/lang.c:2924 +#: src/lang.c:2932 msgid "Set Followup-To: header to this group(s). sets, cancels." msgstr "" "Sæt Followup-To:-tekshoved for disse grupper. ændrer, afbryder." -#: src/lang.c:2925 +#: src/lang.c:2933 msgid "Followup-To: header" msgstr "Followup-To:-teksthoved" -#: src/lang.c:2930 +#: src/lang.c:2938 msgid "Enter default mail address (and fullname). sets, cancels." msgstr "Indtast e-postadresse (og fulde navn). ændrer, >ESC> afbryder." -#: src/lang.c:2937 +#: src/lang.c:2945 msgid "" "Path and options for ispell-like spell-checker. sets, cancels." msgstr "" "Sti og tilvalg for ispell-lignende stavekontrol. ændrer, afbryder." -#: src/lang.c:2938 +#: src/lang.c:2946 msgid "Ispell program" msgstr "Ispellprogram" -#: src/lang.c:2944 +#: src/lang.c:2952 msgid "When group is a mailing list, send responses to this email address." msgstr "NÃ¥r gruppe er en postliste, sÃ¥ send svar til denne e-postadresse." -#: src/lang.c:2945 +#: src/lang.c:2953 msgid "Mailing list address" msgstr "Adresse pÃ¥ postliste" -#: src/lang.c:2951 +#: src/lang.c:2959 msgid "Forward articles as attachment" msgstr "Videresend artikler som vedhæftninger" -#: src/lang.c:2956 +#: src/lang.c:2964 msgid "" "A comma separated list of MIME major/minor Content-Types. cancels." msgstr "En kommaadskilt liste af MIME store/smÃ¥ Content-typer. afbryder." -#: src/lang.c:2957 +#: src/lang.c:2965 msgid "Which MIME types will be saved" msgstr "Hvilke MIME-typer vil blive gemt" -#: src/lang.c:2962 +#: src/lang.c:2970 msgid "Value of the Organization: header. sets, cancels." msgstr "Værdi for Organisation:-teksthoved. ændrer, afbryder." -#: src/lang.c:2963 +#: src/lang.c:2971 msgid "Organization: header" msgstr "Organisation:-teksthoved" -#: src/lang.c:2968 +#: src/lang.c:2976 msgid "Filename for saved articles. sets, cancels." msgstr "Filnavn for gemte artikler. ændrer, afbryder." -#: src/lang.c:2969 +#: src/lang.c:2977 msgid "savefile" msgstr "gemt fil" -#: src/lang.c:2974 src/lang.c:2998 +#: src/lang.c:2982 src/lang.c:3006 msgid "Scope for the filter rule. sets, cancels." msgstr "Virkefelt for filterregel. ændrer, afbryder." -#: src/lang.c:2975 +#: src/lang.c:2983 msgid "Quick (1 key) select filter scope" msgstr "Hurtigvælg (1 tast) filteromfang" -#: src/lang.c:2980 src/lang.c:3004 +#: src/lang.c:2988 src/lang.c:3012 msgid "Header for filter rule. sets, cancels." msgstr "Teksthoved for filterregel. ændrer, afbryder." -#: src/lang.c:2981 +#: src/lang.c:2989 msgid "Quick (1 key) select filter header" msgstr "Hurtigvælg (1 tast) filterteksthoved" -#: src/lang.c:2986 src/lang.c:3010 +#: src/lang.c:2994 src/lang.c:3018 msgid "ON = case sensitive, OFF = ignore case. sets, cancels." msgstr "" "Tændt (ON) = versalfølsom, Slukket (OFF) = ignorer versaler. ændrer\n" " afbryder." -#: src/lang.c:2987 +#: src/lang.c:2995 msgid "Quick (1 key) select filter case" msgstr "Hurtigvælg (1 tast) versaler for filter" -#: src/lang.c:2992 src/lang.c:3016 +#: src/lang.c:3000 src/lang.c:3024 msgid "ON = expire, OFF = don't ever expire. sets, cancels." msgstr "ON = udløb, OFF = udløb aldrig. ændrer, afbryder." -#: src/lang.c:2993 +#: src/lang.c:3001 msgid "Quick (1 key) select filter expire" msgstr "Hurtigvælg (1 tast) filterudløb" -#: src/lang.c:2999 +#: src/lang.c:3007 msgid "Quick (1 key) kill filter scope" msgstr "Hurtigdræb (1 tast) filteromfang" -#: src/lang.c:3005 +#: src/lang.c:3013 msgid "Quick (1 key) kill filter header" msgstr "Hurtigdræb (1 tast) filterteksthoved" -#: src/lang.c:3011 +#: src/lang.c:3019 msgid "Quick (1 key) kill filter case" msgstr "Hurtigdræb (1 tast) versaler for filter" -#: src/lang.c:3017 +#: src/lang.c:3025 msgid "Quick (1 key) kill filter expire" msgstr "Hurtigdræb (1 tast) filterudløb" -#: src/lang.c:3023 +#: src/lang.c:3031 msgid "Assume this charset if no charset declaration is present, to set." msgstr "" "Antag dette tegnsæt hvis ingen tegnsætdeklaration er til stede, ændrer." -#: src/lang.c:3024 +#: src/lang.c:3032 msgid "UNDECLARED_CHARSET" msgstr "UNDECLARED_CHARSET" -#: src/lang.c:3030 +#: src/lang.c:3038 msgid "" "Add this text at the start of the message body. sets, cancels." msgstr "" "Tilføj denne tekst i begyndelsen af beskeden. ændrer, afbryder." -#: src/lang.c:3031 +#: src/lang.c:3039 msgid "X_Body" msgstr "X_Body" -#: src/lang.c:3036 +#: src/lang.c:3044 msgid "Insert this header when posting. sets, cancels." msgstr "" "Indsæt dette teksthoved under indsendelse. ændrer, afbryder." -#: src/lang.c:3037 +#: src/lang.c:3045 msgid "X_Headers" msgstr "X_Headers" -#: src/lang.c:3042 +#: src/lang.c:3050 msgid "" "Automatically insert an X-Comment-To: header? toggles & sets." msgstr "" "Indsæt automatisk et X-Comment-To:-teksthoved? skifter og " "ændrer." -#: src/lang.c:3043 +#: src/lang.c:3051 msgid "Insert 'X-Comment-To:' header" msgstr "Indsæt »X-Comment-To:«-teksthoved" #. TODO: lang.c -#: src/main.c:801 +#: src/main.c:812 msgid "reading from local spool" msgstr "læser fra lokal kø" -#: src/misc.c:3868 +#: src/misc.c:3878 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "Version: %s %s udgave %s (»%s«) %s %s\n" -#: src/misc.c:3871 +#: src/misc.c:3881 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Version: %s %s udgave %s (»%s«)\n" -#: src/newsrc.c:453 +#: src/newsrc.c:457 msgid "Unreachable?\n" msgstr "Kan ikke nÃ¥s?\n" -#: src/nntplib.c:817 +#: src/nntplib.c:822 #, c-format msgid "" "\n" @@ -8290,30 +8292,30 @@ msgstr "" "\n" "Server fik tidsudløb, prøver at forbinde igen # %d\n" -#: src/nntplib.c:844 +#: src/nntplib.c:849 msgid "NNTP connection error. Exiting..." msgstr "NNTP-forbindelsesfejl. Afslutter ..." -#: src/nntplib.c:856 src/nntplib.c:1835 +#: src/nntplib.c:861 src/nntplib.c:1852 msgid "Rejoin current group\n" msgstr "Tilslut igen til nuværende gruppe\n" -#: src/nntplib.c:864 src/nntplib.c:1843 +#: src/nntplib.c:869 src/nntplib.c:1860 #, c-format msgid "Read (%s)\n" msgstr "Læst (%s)\n" -#: src/nntplib.c:866 +#: src/nntplib.c:871 #, c-format msgid "Resend last command (%s)\n" msgstr "Send sidste kommando igen (%s)\n" -#: src/nntplib.c:1482 +#: src/nntplib.c:1500 msgid "CAPABILITIES did not announce READER" msgstr "FUNKTIONER annoncerede ikke LÆSER" # noget bud? -#: src/nntplib.c:1989 +#: src/nntplib.c:2006 msgid "MOTD: " msgstr "MOTD: " @@ -8382,7 +8384,7 @@ msgstr "[- Utilgængelig -]" #. * preamble #. * TODO: -> lang.c #. -#: src/rfc2047.c:1308 +#: src/rfc2047.c:1322 #, c-format msgid "" "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" @@ -8467,3 +8469,17 @@ msgstr "Slrnface blev unormalt afbrudt, #, c-format msgid "Slrnface failed: %s." msgstr "Slrnface mislykkedes: %s." + +#~ msgid "Active file corrupt - %s" +#~ msgstr "Aktiv fil korrupt - %s" + +#~ msgid "Invalid response to GROUP command, %s" +#~ msgstr "Ugyldigt svar pÃ¥ kommanoden GROUP, %s" + +#~ msgid "unparseable \"LIST COUNTS\" line: \"%s\"" +#~ msgstr "linjen »LIST COUNTS« kan ikke fortolkes: »%s«" + +#~ msgid "" +#~ "Wrong newsgroup name (\"%s\") in response of \"GROUP %s\" command: \"%s\"" +#~ msgstr "" +#~ "Forkert nyhedsgruppenavn (»%s«) som svar til »GROUP %s«-kommando: »%s«" Binary files tin-2.4.2/po/de.gmo and tin-2.4.3/po/de.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.2/po/de.po tin-2.4.3/po/de.po --- tin-2.4.2/po/de.po 2017-12-08 09:39:45.000000000 +0100 +++ tin-2.4.3/po/de.po 2018-12-24 10:02:26.635827531 +0100 @@ -8,10 +8,10 @@ # msgid "" msgstr "" -"Project-Id-Version: tin 2.4.2\n" +"Project-Id-Version: tin 2.4.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-08 09:39+0100\n" -"PO-Revision-Date: 2017-08-13 23:12+0200\n" +"POT-Creation-Date: 2018-12-24 10:02+0100\n" +"PO-Revision-Date: 2018-12-24 10:05+0100\n" "Last-Translator: Urs Janssen \n" "Language-Team: German \n" "Language: de\n" @@ -19,11 +19,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/attrib.c:954 +#: src/attrib.c:964 msgid "Processing attributes... " msgstr "Verarbeite Attribute... " -#: src/attrib.c:1176 +#: src/attrib.c:1186 #, c-format msgid "" "# Do not edit this comment block\n" @@ -32,52 +32,52 @@ msgstr "" "# Diesen Kommentarabschnitt nicht verändern\n" "#\n" -#: src/attrib.c:1177 +#: src/attrib.c:1187 #, c-format msgid "# scope=STRING (eg. alt.*,!alt.bin*) [mandatory]\n" msgstr "" "# scope=ZEICHENKETTE [notwendig]\n" "# Gültigkeitsbereich, z.B. alt.*,!alt.bin*\n" -#: src/attrib.c:1178 +#: src/attrib.c:1188 #, c-format msgid "# add_posted_to_filter=ON/OFF\n" msgstr "" "# add_posted_to_filter=ON/OFF\n" "# Filtereintrag erzeugen für eigene Postings\n" -#: src/attrib.c:1179 +#: src/attrib.c:1189 #, c-format msgid "# advertising=ON/OFF\n" msgstr "" "# advertising=ON/OFF\n" "# User-Agent:-Header einfügen\n" -#: src/attrib.c:1180 +#: src/attrib.c:1190 #, c-format msgid "# alternative_handling=ON/OFF\n" msgstr "" "# alternative_handling=ON/OFF\n" "# MIME multipart/alternative-Teile ausblenden\n" -#: src/attrib.c:1181 +#: src/attrib.c:1191 #, c-format msgid "# ask_for_metamail=ON/OFF\n" msgstr "" "# ask_for_metamail=ON/OFF\n" "# Start des MIME-Viewers erst nach Bestätigung\n" -#: src/attrib.c:1182 +#: src/attrib.c:1192 #, c-format msgid "# auto_cc_bcc=NUM\n" msgstr "# auto_cc_bcc=ZAHL\n" -#: src/attrib.c:1183 +#: src/attrib.c:1193 #, c-format msgid "# 0=No, 1=Cc, 2=Bcc, 3=Cc and Bcc\n" msgstr "# 0=Nein, 1=Cc, 2=Bcc, 3=Cc und Bcc\n" -#: src/attrib.c:1184 +#: src/attrib.c:1194 #, c-format msgid "# auto_list_thread=ON/OFF\n" msgstr "" @@ -85,7 +85,7 @@ msgstr "" "# Thread beim Betreten mit der rechten Cursortaste automatisch\n" "# anzeigen\n" -#: src/attrib.c:1185 +#: src/attrib.c:1195 #, c-format msgid "# auto_save=ON/OFF\n" msgstr "" @@ -93,7 +93,7 @@ msgstr "" "# Artikel mit Archive-name:-Header automatisch in die darin\n" "# angegebene Datei speichern\n" -#: src/attrib.c:1186 +#: src/attrib.c:1196 #, c-format msgid "# auto_select=ON/OFF\n" msgstr "" @@ -101,21 +101,21 @@ msgstr "" "# Führe GroupMarkUnselArtRead Kommando automatisch beim Betreten\n" "# der Gruppe aus\n" -#: src/attrib.c:1187 +#: src/attrib.c:1197 #, c-format msgid "# batch_save=ON/OFF\n" msgstr "" "# batch_save=ON/OFF\n" "# Im Batch-Modus werden die Artikel beachtet\n" -#: src/attrib.c:1188 +#: src/attrib.c:1198 #, c-format msgid "# date_format=STRING (eg. %%a, %%d %%b %%Y %%H:%%M:%%S)\n" msgstr "" "# date_format=ZEICHENKETTE\n" "# z.B. %%a, %%d %%b %%Y %%H:%%M:%%S\n" -#: src/attrib.c:1189 +#: src/attrib.c:1199 #, c-format msgid "# delete_tmp_files=ON/OFF\n" msgstr "" @@ -123,14 +123,14 @@ msgstr "" "# Gespeicherte, zur Nachbearbeitung weitergegebene Artikel ohne\n" "# Nachfrage löschen\n" -#: src/attrib.c:1190 +#: src/attrib.c:1200 #, c-format msgid "# editor_format=STRING (eg. %%E +%%N %%F)\n" msgstr "" "# editor_format=ZEICHENKETTE\n" "# z.B. %%E +%%N %%F\n" -#: src/attrib.c:1191 +#: src/attrib.c:1201 #, c-format msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "" @@ -138,14 +138,14 @@ msgstr "" "# Datei in der eine Kopie der Mail abgelegt werden soll,\n" "# z.B. =mailbox\n" -#: src/attrib.c:1192 +#: src/attrib.c:1202 #, c-format msgid "# followup_to=STRING\n" msgstr "" "# followup_to=ZEICHENKETTE\n" "# Voreinstellung für den Followup-To:-Header\n" -#: src/attrib.c:1193 +#: src/attrib.c:1203 #, c-format msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "" @@ -153,7 +153,7 @@ msgstr "" "# Absender, einfach den gewünschten Wert eintragen,\n" "# keine Anführungszeichen verwenden\n" -#: src/attrib.c:1194 +#: src/attrib.c:1204 #, c-format msgid "# group_catchup_on_exit=ON/OFF\n" msgstr "" @@ -161,14 +161,14 @@ msgstr "" "# Catchup (als gelesen markieren) der Gruppe beim Verlassen\n" "# mit der linken Cursortaste\n" -#: src/attrib.c:1195 +#: src/attrib.c:1205 #, c-format msgid "# group_format=STRING (eg. %%n %%m %%R %%L %%s %%F)\n" msgstr "" "# group_format=ZEICHENKETTE\n" "# z.B. %%n %%m %%R %%L %%s %%F\n" -#: src/attrib.c:1196 +#: src/attrib.c:1206 #, c-format msgid "# mail_8bit_header=ON/OFF\n" msgstr "" @@ -176,12 +176,12 @@ msgstr "" "# 8-Bit-Zeichen (wie z.B. Umlaute) im Header von E-Mails\n" "# unkodiert senden\n" -#: src/attrib.c:1197 +#: src/attrib.c:1207 #, c-format msgid "# mail_mime_encoding=supported_encoding" msgstr "# mail_mime_encoding=ZEICHENKETTE" -#: src/attrib.c:1205 +#: src/attrib.c:1215 #, c-format msgid "# ispell=STRING\n" msgstr "" @@ -189,59 +189,59 @@ msgstr "" "# Aufruf der Rechtschreibprüfung,\n" "# z.B. ispell -C -ddeutsch -w äöüÄÖÜß@ -Tlatin1\n" -#: src/attrib.c:1207 +#: src/attrib.c:1217 #, c-format msgid "# maildir=STRING (eg. ~/Mail)\n" msgstr "" "# maildir=ZEICHENKETTE\n" "# Verzeichnis der Mail-Ordner, z.B. ~/Mail\n" -#: src/attrib.c:1208 +#: src/attrib.c:1218 #, c-format msgid "# mailing_list=STRING (eg. majordomo@example.org)\n" msgstr "" "# mailing_list=ZEICHENKETTE\n" "# Gruppe ist eine gegatete Mailingliste, z.B. majordomo@example.org\n" -#: src/attrib.c:1209 +#: src/attrib.c:1219 #, c-format msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "" "# mime_types_to_save=ZEICHENKETTE\n" "# z.B. image/*,!image/bmp\n" -#: src/attrib.c:1210 +#: src/attrib.c:1220 #, c-format msgid "# mark_ignore_tags=ON/OFF\n" msgstr "# mark_ignore_tags=ON/OFF\n" -#: src/attrib.c:1211 +#: src/attrib.c:1221 #, c-format msgid "# mark_saved_read=ON/OFF\n" msgstr "# mark_saved_read=ON/OFF\n" -#: src/attrib.c:1212 +#: src/attrib.c:1222 #, c-format msgid "# mime_forward=ON/OFF\n" msgstr "" "# mime_forward=ON/OFF\n" "# Weitergeleitete Artikel als MIME-Anhang senden\n" -#: src/attrib.c:1214 +#: src/attrib.c:1224 #, c-format msgid "# mm_network_charset=supported_charset" msgstr "" "# mm_network_charset=Zeichensatz\n" "# Erlaubt sind folgende:" -#: src/attrib.c:1221 +#: src/attrib.c:1231 #, c-format msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "" "# undeclared_charset=Zeichensatz\n" "# Voreinstellung ist US-ASCII\n" -#: src/attrib.c:1223 +#: src/attrib.c:1233 #, c-format msgid "# news_headers_to_display=STRING\n" msgstr "" @@ -249,19 +249,19 @@ msgstr "" "# Voreinstellung ist: Newsgroups Followup-To Summary Keywords X-Comment-" "To\n" -#: src/attrib.c:1224 +#: src/attrib.c:1234 #, c-format msgid "# news_headers_to_not_display=STRING\n" msgstr "# news_headers_to_not_display=ZEICHENKETTE\n" -#: src/attrib.c:1225 +#: src/attrib.c:1235 #, c-format msgid "# news_quote_format=STRING\n" msgstr "" "# news_quote_format=ZEICHENKETTE\n" "# Einleitungszeile, z.B. news_quote_format=In %%M, %%F wrote:\n" -#: src/attrib.c:1226 +#: src/attrib.c:1236 #, c-format msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "" @@ -269,12 +269,12 @@ msgstr "" "# Organization:-Header; ist das erste Zeichen ein '/', wird der\n" "# Wert aus dieser Datei gelesen.\n" -#: src/attrib.c:1227 +#: src/attrib.c:1237 #, c-format msgid "# pos_first_unread=ON/OFF\n" msgstr "# pos_first_unread=ON/OFF\n" -#: src/attrib.c:1228 +#: src/attrib.c:1238 #, c-format msgid "# post_8bit_header=ON/OFF\n" msgstr "" @@ -282,26 +282,26 @@ msgstr "" "# 8-Bit-Zeichen (wie z.B. Umlaute) im Header von Newsartikeln\n" "# unkodiert senden\n" -#: src/attrib.c:1229 +#: src/attrib.c:1239 #, c-format msgid "# post_mime_encoding=supported_encoding" msgstr "# post_mime_encoding=ZEICHENKETTE" -#: src/attrib.c:1236 +#: src/attrib.c:1246 #, c-format msgid "# post_process_type=NUM\n" msgstr "" "# post_process_type=ZAHL\n" "# Nachbearbeitung\n" -#: src/attrib.c:1241 +#: src/attrib.c:1251 #, c-format msgid "# post_process_view=ON/OFF\n" msgstr "" "# post_process_view=ON/OFF\n" "# Nachbearbeitete Artikel anzeigen\n" -#: src/attrib.c:1242 +#: src/attrib.c:1252 #, c-format msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "" @@ -309,247 +309,247 @@ msgstr "" "# Voreinstellung für Gültigkeitsbereich neuer Kill-Einträge,\n" "# z.B. talk.*\n" -#: src/attrib.c:1243 +#: src/attrib.c:1253 #, c-format msgid "# quick_kill_expire=ON/OFF\n" msgstr "" "# quick_kill_expire=ON/OFF\n" "# Kill verfällt automatisch\n" -#: src/attrib.c:1244 +#: src/attrib.c:1254 #, c-format msgid "# quick_kill_case=ON/OFF\n" msgstr "" "# quick_kill_case=ON/OFF\n" "# Kill beachtet Groß/Kleinschreibung\n" -#: src/attrib.c:1245 +#: src/attrib.c:1255 #, c-format msgid "# quick_kill_header=NUM\n" msgstr "" "# quick_kill_header=ZAHL\n" "# Killen nach:\n" -#: src/attrib.c:1246 src/attrib.c:1255 +#: src/attrib.c:1256 src/attrib.c:1265 #, c-format msgid "# 0=Subject: (case sensitive) 1=Subject: (ignore case)\n" msgstr "" "# 0=Subject: (Groß/Kleinschreibung beachten), 1=Subject: (G/K " "ignorieren)\n" -#: src/attrib.c:1247 src/attrib.c:1256 +#: src/attrib.c:1257 src/attrib.c:1266 #, c-format 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:1248 src/attrib.c:1257 +#: src/attrib.c:1258 src/attrib.c:1267 #, c-format msgid "# 4=Message-ID: & full References: line\n" msgstr "# 4=Message-ID: & alle References: Einträge\n" -#: src/attrib.c:1249 src/attrib.c:1258 +#: src/attrib.c:1259 src/attrib.c:1268 #, c-format msgid "# 5=Message-ID: & last References: entry only\n" msgstr "# 5=Message-ID: & letzter References: Eintrag\n" -#: src/attrib.c:1250 src/attrib.c:1259 +#: src/attrib.c:1260 src/attrib.c:1269 #, c-format msgid "# 6=Message-ID: entry only 7=Lines:\n" msgstr "# 6=Message-ID: allein, 7=Lines:\n" -#: src/attrib.c:1251 +#: src/attrib.c:1261 #, c-format msgid "# quick_select_scope=STRING\n" msgstr "" "# quick_select_scope=ZEICHENKETTE\n" "# Voreinstellung für Gültigkeitsbereich neuer Auswahlregeln (Hochscoren)\n" -#: src/attrib.c:1252 +#: src/attrib.c:1262 #, c-format msgid "# quick_select_expire=ON/OFF\n" msgstr "" "# quick_select_expire=ON/OFF\n" "# Regel verfällt automatisch\n" -#: src/attrib.c:1253 +#: src/attrib.c:1263 #, c-format msgid "# quick_select_case=ON/OFF\n" msgstr "" "# quick_select_case=ON/OFF\n" "# Regel beachtet Groß/Kleinschreibung\n" -#: src/attrib.c:1254 +#: src/attrib.c:1264 #, c-format msgid "# quick_select_header=NUM\n" msgstr "" "# quick_select_header=NUM\n" "# Auswählen (Hochscoren) nach:\n" -#: src/attrib.c:1260 +#: src/attrib.c:1270 #, c-format msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "" "# quote_chars=ZEICHENKETTE\n" "# Zeichen für Zitate in Antworten, %%s oder %%S ergibt Autoreninitialen\n" -#: src/attrib.c:1262 +#: src/attrib.c:1272 #, c-format msgid "# print_header=ON/OFF\n" msgstr "" "# print_header=ON/OFF\n" "# Alle Header beim Drucken ausgeben\n" -#: src/attrib.c:1264 +#: src/attrib.c:1274 #, c-format msgid "# process_only_unread=ON/OFF\n" msgstr "# process_only_unread=ON/OFF\n" -#: src/attrib.c:1265 +#: src/attrib.c:1275 #, c-format msgid "# prompt_followupto=ON/OFF\n" msgstr "" "# prompt_followupto=ON/OFF\n" "# Leeren Followup-To:-Header anzeigen beim Erstellen eines Artikels\n" -#: src/attrib.c:1266 +#: src/attrib.c:1276 #, c-format msgid "# savedir=STRING (eg. ~user/News)\n" msgstr "" "# savedir=ZEICHENKETTE\n" "# Verzeichnis zum Speichern, z.B. ~user/News\n" -#: src/attrib.c:1267 +#: src/attrib.c:1277 #, c-format msgid "# savefile=STRING (eg. =linux)\n" msgstr "" "# savefile=ZEICHENKETTE\n" "# Datei zum Speichern, z.B. =linux\n" -#: src/attrib.c:1268 +#: src/attrib.c:1278 #, c-format msgid "# sigfile=STRING (eg. $var/sig)\n" msgstr "" "# sigfile=ZEICHENKETTE\n" "# Signatur, z.B. $var/sig\n" -#: src/attrib.c:1269 +#: src/attrib.c:1279 #, c-format msgid "# show_author=NUM\n" msgstr "" "# show_author=ZAHL\n" "# Anzeige des From-Felds\n" -#: src/attrib.c:1275 +#: src/attrib.c:1285 #, c-format msgid "# show_signatures=ON/OFF\n" msgstr "" "# show_signatures=ON/OFF\n" "# Signaturen anzeigen\n" -#: src/attrib.c:1276 +#: src/attrib.c:1286 #, c-format msgid "# show_only_unread_arts=ON/OFF\n" msgstr "" "# show_only_unread_arts=ON/OFF\n" "# nur ungelesene Artikel anzeigen\n" -#: src/attrib.c:1277 +#: src/attrib.c:1287 #, c-format msgid "# sigdashes=ON/OFF\n" msgstr "" "# sigdashes=ON/OFF\n" "# Signatur mit '\\n-- \\n' abtrennen\n" -#: src/attrib.c:1278 +#: src/attrib.c:1288 #, c-format msgid "# signature_repost=ON/OFF\n" msgstr "" "# signature_repost=ON/OFF\n" "# Signatur beim Reposten anhängen\n" -#: src/attrib.c:1279 +#: src/attrib.c:1289 #, c-format msgid "# sort_article_type=NUM\n" msgstr "" "# sort_article_type=ZAHL\n" "# Artikel sortieren nach:\n" -#: src/attrib.c:1297 +#: src/attrib.c:1307 #, c-format msgid "# sort_threads_type=NUM\n" msgstr "" "# sort_threads_type=ZAHL\n" "# Threads sortieren nach:\n" -#: src/attrib.c:1306 +#: src/attrib.c:1316 #, c-format msgid "# start_editor_offset=ON/OFF\n" msgstr "# start_editor_offset=ON/OFF\n" -#: src/attrib.c:1307 +#: src/attrib.c:1317 #, c-format msgid "# tex2iso_conv=ON/OFF\n" msgstr "" "# tex2iso_conv=ON/OFF\n" "# Automatische Umwandlung von TeX-Umlauten\n" -#: src/attrib.c:1308 +#: src/attrib.c:1318 #, c-format msgid "# thread_catchup_on_exit=ON/OFF\n" msgstr "# thread_catchup_on_exit=ON/OFF\n" -#: src/attrib.c:1309 +#: src/attrib.c:1319 #, c-format msgid "# thread_articles=NUM" msgstr "" "# thread_articles=ZAHL\n" "# Threading nach:" -#: src/attrib.c:1316 +#: src/attrib.c:1326 #, c-format msgid "# thread_format=STRING (eg. %%n %%m [%%L] %%T %%F)\n" msgstr "" "# thread_format=ZEICHENKETTE\n" "# z.B. %%n %%m [%%L] %%T %%F\n" -#: src/attrib.c:1317 +#: src/attrib.c:1327 #, c-format msgid "# thread_perc=NUM\n" msgstr "" "# thread_perc=ZAHL\n" "# Wie viel Prozent des Subjects müssen gleich sein?\n" -#: src/attrib.c:1318 +#: src/attrib.c:1328 #, c-format msgid "# trim_article_body=NUM\n" msgstr "# trim_article_body=ZAHL\n" -#: src/attrib.c:1319 +#: src/attrib.c:1329 #, c-format msgid "# 0 = Don't trim article body\n" msgstr "# 0 = Artikelrumpf nicht anpassen\n" -#: src/attrib.c:1320 +#: src/attrib.c:1330 #, c-format msgid "# 1 = Skip leading blank lines\n" msgstr "# 1 = Führende Leerzeilen überspringen\n" -#: src/attrib.c:1321 +#: src/attrib.c:1331 #, c-format msgid "# 2 = Skip trailing blank lines\n" msgstr "# 2 = Abschließende Leerzeilen überspringen\n" -#: src/attrib.c:1322 +#: src/attrib.c:1332 #, c-format msgid "# 3 = Skip leading and trailing blank lines\n" msgstr "# 3 = Führende und abschließende Leerzeilen überspringen\n" -#: src/attrib.c:1323 +#: src/attrib.c:1333 #, c-format msgid "# 4 = Compact multiple blank lines between text blocks\n" msgstr "# 4 = Leerzeilen zwischen Textblöcken zusammenfassen\n" -#: src/attrib.c:1324 +#: src/attrib.c:1334 #, c-format msgid "" "# 5 = Compact multiple blank lines between text blocks and skip\n" @@ -558,7 +558,7 @@ msgstr "" "# 5 = Leerzeilen zwischen Textblöcken zusammenfassen und\n" "# führende Leerzeilen überspringen\n" -#: src/attrib.c:1325 +#: src/attrib.c:1335 #, c-format msgid "" "# 6 = Compact multiple blank lines between text blocks and skip\n" @@ -567,7 +567,7 @@ msgstr "" "# 6 = Leerzeilen zwischen Textblöcken zusammenfassen und\n" "# abschließende Leerzeilen überspringen\n" -#: src/attrib.c:1326 +#: src/attrib.c:1336 #, c-format msgid "" "# 7 = Compact multiple blank lines between text blocks and skip\n" @@ -576,26 +576,26 @@ msgstr "" "# 7 = Leerzeilen zwischen Textblöcken zusammenfassen und\n" "# führende sowie abschließende Leerzeilen überspringen\n" -#: src/attrib.c:1327 +#: src/attrib.c:1337 #, c-format msgid "# verbatim_handling=ON/OFF\n" msgstr "" "# verbatim_handling=ON/OFF\n" "# Wortgetreue Textblöcke erkennen\n" -#: src/attrib.c:1329 +#: src/attrib.c:1339 #, c-format msgid "# extquote_handling=ON/OFF\n" msgstr "" "# extquote_handling=ON/OFF\n" "# Fremdzitate erkennen\n" -#: src/attrib.c:1331 +#: src/attrib.c:1341 #, c-format msgid "# wrap_on_next_unread=ON/OFF\n" msgstr "# wrap_on_next_unread=ON/OFF\n" -#: src/attrib.c:1332 +#: src/attrib.c:1342 #, c-format msgid "# x_body=STRING (eg. ~/.tin/extra-body-text)\n" msgstr "" @@ -603,7 +603,7 @@ msgstr "" "# Text wird automatisch zu Beginn des Artikels eingefügt,\n" "# z.B. ~/.tin/extra-body-text\n" -#: src/attrib.c:1333 +#: src/attrib.c:1343 #, c-format msgid "# x_comment_to=ON/OFF\n" msgstr "" @@ -611,14 +611,14 @@ msgstr "" "# X-Comment-To:-Header einfügen.\n" "# (Nur sinnvoll in nach Fido Technology Network gegateten Gruppen.)\n" -#: src/attrib.c:1334 +#: src/attrib.c:1344 #, c-format msgid "# x_headers=STRING (eg. ~/.tin/extra-headers)\n" msgstr "" "# x_headers=ZEICHENKETTE\n" "# Zusätzliche Header, z.B. ~/.tin/extra-headers\n" -#: src/attrib.c:1335 +#: src/attrib.c:1345 #, c-format msgid "" "#\n" @@ -627,7 +627,7 @@ msgstr "" "#\n" "# Es empfiehlt sich, zuerst allgemein gültige und danach spezielle,\n" -#: src/attrib.c:1336 +#: src/attrib.c:1346 #, c-format msgid "" "# entries first followed by group specific entries.\n" @@ -636,7 +636,7 @@ msgstr "" "# nur für bestimmte Newsgruppen gültige Einträge aufzuführen.\n" "#\n" -#: src/attrib.c:1337 +#: src/attrib.c:1347 #, c-format msgid "############################################################################\n" msgstr "############################################################################\n" @@ -929,59 +929,54 @@ msgstr "Automatische Artikelauswahl ('%s #: src/lang.c:107 #, c-format -msgid "Active file corrupt - %s" -msgstr "Die Datei 'active' ist beschädigt - %s" - -#: src/lang.c:108 -#, c-format msgid "" "Article to be posted resulted in errors/warnings. %s=quit, %s=Menu, %s=edit: " msgstr "" "Artikel verursachte Fehler/Warnungen. %s=beenden, %s=Menü, %s=editieren: " -#: src/lang.c:109 +#: src/lang.c:108 #, c-format msgid "Unrecognized attribute: %s" msgstr "Unbekannte Attribute: %s" -#: src/lang.c:110 +#: src/lang.c:109 #, c-format msgid "Bad command. Type '%s' for help." msgstr "Ungültiger Befehl. Drücken Sie '%s' für Hilfe." -#: src/lang.c:112 +#: src/lang.c:111 msgid "Base article" msgstr "Ursprungsartikel" -#: src/lang.c:113 +#: src/lang.c:112 msgid "Base article range" msgstr "Bereich für Ursprungsartikel" -#: src/lang.c:114 +#: src/lang.c:113 #, c-format msgid "%s: Updating of index files not supported: cache_overview_files=%s" msgstr "" "%s: Aktualisieren der Index-Dateien nicht unterstützt: cache_overview_files=" "%s" -#: src/lang.c:115 +#: src/lang.c:114 msgid "*** Beginning of article ***" msgstr "*** Anfang des Artikels ***" -#: src/lang.c:116 +#: src/lang.c:115 msgid "*** Beginning of page ***" msgstr "*** Seitenanfang ***" -#: src/lang.c:118 +#: src/lang.c:117 #, c-format msgid "Cancel (delete) or supersede (overwrite) article [%%s]? (%s/%s/%s): " msgstr "[%%s] canceln (löschen) oder superseden (überschreiben)? (%s/%s/%s): " -#: src/lang.c:119 +#: src/lang.c:118 msgid "Cancelling article..." msgstr "Lösche Artikel..." -#: src/lang.c:121 +#: src/lang.c:120 #, c-format msgid "Cannot create %s" msgstr "Kann %s nicht erstellen" @@ -1516,21 +1511,16 @@ msgstr "" msgid "Insecure permissions of %s (%o)" msgstr "Unsichere Dateiberechtigungen auf %s (%o)" -#: src/lang.c:242 -#, c-format -msgid "Invalid response to GROUP command, %s" -msgstr "Ungültige Antwort auf GROUP-Befehl, %s" - -#: src/lang.c:247 +#: src/lang.c:244 #, c-format msgid "MIME parse error: Unexpected end of %s/%s article" msgstr "MIME-Fehler: Unerwartetes Ende des %s/%s-Artikels" -#: src/lang.c:248 +#: src/lang.c:245 msgid "MIME parse error: Start boundary whilst reading headers" msgstr "MIME-Fehler: Anfangsgrenze in Hadern" -#: src/lang.c:249 +#: src/lang.c:246 msgid "" "\n" "Error: \"poster\" is not allowed in Newsgroups!\n" @@ -1538,16 +1528,16 @@ msgstr "" "\n" "Fehler: \"poster\" ist nicht erlaubt in Newsgroups!\n" -#: src/lang.c:250 +#: src/lang.c:247 msgid "Can't get a (fully-qualified) domain-name!" msgstr "Kann keinen (voll qualifizierten) Domainnamen finden!" -#: src/lang.c:251 +#: src/lang.c:248 #, c-format msgid "No permissions to go into %s\n" msgstr "Keine Berechtigung um %s zu betreten\n" -#: src/lang.c:253 +#: src/lang.c:250 msgid "" "\n" "Error: From: line missing.\n" @@ -1555,30 +1545,30 @@ msgstr "" "\n" "Fehler: Die From: Zeile fehlt.\n" -#: src/lang.c:255 +#: src/lang.c:252 #, c-format msgid "No read permissions for %s\n" msgstr "Keine Leseberechtigung für %s\n" -#: src/lang.c:256 +#: src/lang.c:253 #, c-format msgid "File %s does not exist\n" msgstr "Datei %s existiert nicht\n" -#: src/lang.c:257 +#: src/lang.c:254 #, c-format msgid "No write permissions for %s\n" msgstr "Keine Schreibberechtigung für %s\n" -#: src/lang.c:258 +#: src/lang.c:255 msgid "Can't get user information (/etc/passwd missing?)" msgstr "Kann Benutzer-Infos nicht finden (/etc/passwd fehlt?)" -#: src/lang.c:259 +#: src/lang.c:256 msgid "errors" msgstr "Fehler" -#: src/lang.c:261 +#: src/lang.c:258 #, c-format msgid "" "\n" @@ -1587,61 +1577,61 @@ msgstr "" "\n" "Fehler in Zeile %d: \"Sender:\"-Header ist nicht erlaubt (wird hinzugefügt)\n" -#: src/lang.c:263 +#: src/lang.c:260 #, c-format msgid "Server has non of the groups listed in %s" msgstr "Server führt keine der Gruppen aus %s" -#: src/lang.c:264 +#: src/lang.c:261 msgid "error" msgstr "Fehler" -#: src/lang.c:265 +#: src/lang.c:262 msgid "Unknown display level" msgstr "Unbekannter Level" -#: src/lang.c:266 +#: src/lang.c:263 msgid "" msgstr "" -#: src/lang.c:267 +#: src/lang.c:264 msgid "Exiting..." msgstr "Beenden..." -#: src/lang.c:268 +#: src/lang.c:265 msgid "leaving external mail-reader" msgstr "Verlasse externen Mailreader" -#: src/lang.c:269 +#: src/lang.c:266 #, c-format msgid "Extracting %s..." msgstr "Entpacke %s..." -#: src/lang.c:271 +#: src/lang.c:268 #, c-format msgid "Error writing %s file. Filesystem full? File reset to previous state." msgstr "Fehler beim Schreiben von %s. Dateisystem voll? Datei zurückgesetzt." -#: src/lang.c:272 +#: src/lang.c:269 #, c-format msgid "Error making backup of %s file. Filesystem full?" msgstr "Fehler beim Erzeugen der Sicherung von %s. Dateisystem voll?" -#: src/lang.c:273 +#: src/lang.c:270 #, c-format msgid "Filtering global rules (%d/%d)..." msgstr "Filtern nach den globalen Regeln (%d/%d)..." -#: src/lang.c:274 +#: src/lang.c:271 msgid "Rule created by: " msgstr "Regel erstellt von: " -#: src/lang.c:275 +#: src/lang.c:272 #, c-format msgid "Enter pattern [%s]> " msgstr "Muster eingeben [%s]> " -#: src/lang.c:276 +#: src/lang.c:273 #, c-format msgid "" "\n" @@ -1650,20 +1640,20 @@ msgstr "" "\n" "Antworten auf Ihre Artikel sollen in folgenden %s erscheinen:\n" -#: src/lang.c:277 +#: src/lang.c:274 #, c-format msgid " %s\t Answers will be directed to you by mail.\n" msgstr " %s\t Antworten erhalten Sie direkt per Mail.\n" -#: src/lang.c:278 +#: src/lang.c:275 msgid "-- forwarded message --\n" msgstr "-- weitergeleitete Nachricht --\n" -#: src/lang.c:279 +#: src/lang.c:276 msgid "-- end of forwarded message --\n" msgstr "-- Ende der weitergeleiteten Nachricht --\n" -#: src/lang.c:280 +#: src/lang.c:277 msgid "" "# Format:\n" "# comment=STRING Optional. Multiple lines allowed. Comments must be " @@ -1690,6 +1680,10 @@ msgid "" "# gnksa=[<>]?NUM Optional. GNKSA parse_from() return code. '<' or '>' " "opt.\n" "# xref=PATTERN Optional. Kill pattern (e.g. alt.flame*)\n" +"# path=PATTERN Optional. Kill pattern (e.g. news.example.org)\n" +"# Be aware that filtering on Path: may significantly " +"slow\n" +"# down the process.\n" "# time=NUM Optional. time_t value when rule expires\n" "#\n" msgstr "" @@ -1723,6 +1717,8 @@ msgstr "" "# lines=[<>]?ZAHL Zeilenzahl (Lines-Header)\n" "# gnksa=[<>]?ZAHL Rückgabewert der Funktion GNKSA parse_from()\n" "# xref=MUSTER Muster passt auf Xref-Header (z.B. alt.flame*)\n" +"# path=MUSTER Muster passt auf Path-Header (z.B. !news.example." +"org!)\n" "# time=ZAHL Ablaufdatum der Regel als time_t Wert\n" "# (Anzahl der Sekunden seit 1970-01-01 00:00:00 UTC)\n" "#\n" @@ -2740,7 +2736,7 @@ msgstr "Kein vorhergehender Ausdruck" msgid "Operation disabled in no-overwrite mode" msgstr "Ausführung nicht möglich im nicht-überschreiben Modus" -#. TODO: replace hardcoded key-name in txt_info_postponed +#. TODO: replace hard coded key-name in txt_info_postponed #: src/lang.c:547 #, c-format msgid "%d postponed %s, reuse with ^O...\n" @@ -2769,7 +2765,7 @@ msgstr "TeX2Iso kodierter Artikel" msgid "incomplete " msgstr "unvollständige " -#. TODO: replace hardcoded key-names +#. TODO: replace hard coded key-names #: src/lang.c:554 #, c-format msgid "" @@ -2890,8 +2886,8 @@ msgstr "Filter Menü (Kill, Bewertung/Sc #: src/lang.c:587 #, c-format -msgid "Kill Msg-Id: [%s] (f/l/o/n): " -msgstr "Filter Msg-Id: [%s] (v/l/n/n): " +msgid "Kill Msg-ID: [%s] (f/l/o/n): " +msgstr "Filter Msg-ID: [%s] (v/l/n/n): " #: src/lang.c:588 msgid "Kill pattern scope : " @@ -3409,7 +3405,7 @@ msgstr "Fehler im regulären Ausdruck: p msgid "Post a followup..." msgstr "Schreibe eine Antwort..." -#. TODO: replace hardcoded key-name in txt_post_error_ask_postpone +#. TODO: replace hard coded key-name in txt_post_error_ask_postpone #: src/lang.c:716 msgid "" "An error has occurred while posting the article. If you think that this\n" @@ -3473,225 +3469,230 @@ msgstr "%s markiert" msgid "Untagged %s" msgstr "%s Markierung entfernt" -#: src/lang.c:730 +#: src/lang.c:731 +#, c-format +msgid "Preparing for filtering on Path header (%d/%d)..." +msgstr "Bereite Path-Filter (%d/%d) vor..." + +#: src/lang.c:733 msgid "Processing mail messages marked for deletion." msgstr "Bearbeite zum Löschen markierte EMails." -#: src/lang.c:731 +#: src/lang.c:734 msgid "Processing saved articles marked for deletion." msgstr "Bearbeite zum Löschen markierte gespeicherte Artikel." -#: src/lang.c:732 +#: src/lang.c:735 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "Followup-To akzeptieren? %s=posten, %s=ignorieren, %s=Ende: " -#: src/lang.c:733 +#: src/lang.c:736 msgid "Article unchanged, abort mailing?" msgstr "Mail unverändert, Versand abbrechen?" -#: src/lang.c:734 +#: src/lang.c:737 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "Wollen Sie die zurückgestellten Artikel sehen (%d)?" -#: src/lang.c:736 +#: src/lang.c:739 msgid "Add quick kill filter?" msgstr "Artikel schnell (laut Voreinstellungen) killen?" -#: src/lang.c:737 +#: src/lang.c:740 msgid "Add quick selection filter?" msgstr "Filterregel (hochscoren) (laut Voreinstellungen) hinzufügen?" -#: src/lang.c:738 +#: src/lang.c:741 msgid "Do you really want to quit?" msgstr "Möchten Sie das Programm wirklich beenden?" -#: src/lang.c:739 +#: src/lang.c:742 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "%s=cancel-Nachricht editieren, %s=Ende, %s=löschen [%%s]: " -#: src/lang.c:740 +#: src/lang.c:743 msgid "You have tagged articles in this group - quit anyway?" msgstr "Es befinden sich markierte Artikel in der Gruppe, trotzdem beenden?" -#: src/lang.c:741 +#: src/lang.c:744 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=Ende, %s=bearbeiten, %s=zurücklegen: " -#: src/lang.c:742 +#: src/lang.c:745 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=Abbrechen %s=Editieren %s=Kill-Filter speichern: " -#: src/lang.c:743 +#: src/lang.c:746 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "%s=Abbrechen %s=Editieren %s=Filter (hot) speichern: " -#: src/lang.c:744 +#: src/lang.c:747 msgid "Do you really want to quit without saving your configuration?" msgstr "Wirklich ohne Speichern der Konfiguration beenden?" -#: src/lang.c:747 +#: src/lang.c:750 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "Ungültige Bereichsangabe - Gültig wäre '0-9.$' z.B. 1-$" -#: src/lang.c:749 +#: src/lang.c:752 msgid "Do you want to abort this operation?" msgstr "Wollen Sie diese Operation abbrechen?" -#: src/lang.c:750 +#: src/lang.c:753 msgid "Do you want to exit tin immediately?" msgstr "Wollen Sie tin augenblicklich verlassen?" -#: src/lang.c:752 +#: src/lang.c:755 msgid "Reading ('q' to quit)..." msgstr "Lesen ('q' zum Beenden)..." -#: src/lang.c:753 +#: src/lang.c:756 #, c-format msgid "Reading %sarticles..." msgstr "Lese %sArtikel..." -#: src/lang.c:754 +#: src/lang.c:757 #, c-format msgid "Reading %sattributes file...\n" msgstr "Lese %sAttribute-Datei...\n" -#: src/lang.c:755 +#: src/lang.c:758 #, c-format msgid "Reading %sconfig file...\n" msgstr "Lese %sKonfigurations-Datei...\n" -#: src/lang.c:756 +#: src/lang.c:759 msgid "Reading filter file...\n" msgstr "Lese Filter-Datei...\n" -#: src/lang.c:757 +#: src/lang.c:760 #, c-format msgid "Reading %s groups..." msgstr "Lese %s Gruppen..." -#: src/lang.c:758 +#: src/lang.c:761 msgid "Reading input history file...\n" msgstr "Lese Eingabe-History...\n" -#: src/lang.c:759 +#: src/lang.c:762 msgid "Reading keymap file...\n" msgstr "Lese Tastenbelegungen...\n" -#: src/lang.c:760 +#: src/lang.c:763 msgid "Reading groups from active file... " msgstr "Lese Gruppen aus dem Active... " -#: src/lang.c:761 +#: src/lang.c:764 msgid "Reading groups from newsrc file... " msgstr "Lese Gruppen aus der newsrc-Datei... " -#: src/lang.c:762 +#: src/lang.c:765 msgid "Reading newsgroups file... " msgstr "Lese Newsgroups-Datei... " -#: src/lang.c:763 +#: src/lang.c:766 msgid "Reading newsrc file..." msgstr "Lese newsrc-Datei..." -#: src/lang.c:764 +#: src/lang.c:767 msgid "References: line " msgstr "References: Zeile " -#: src/lang.c:766 +#: src/lang.c:769 #, c-format msgid "(%d:%02d remaining)" msgstr "(noch %d:%02d benötigt)" -#: src/lang.c:768 +#: src/lang.c:771 #, c-format msgid "Bogus group %s removed." msgstr "Nicht vorhandene Gruppe %s entfernt." -#: src/lang.c:769 +#: src/lang.c:772 msgid "Removed from the previous rule: " msgstr "Aus der vorigen Regel gelöscht: " -#: src/lang.c:770 +#: src/lang.c:773 #, c-format msgid "Error: rename %s to %s" msgstr "Fehler: Benenne %s in %s" -#: src/lang.c:771 +#: src/lang.c:774 msgid "Reply to author..." msgstr "Mailantwort an Autor..." -#: src/lang.c:772 +#: src/lang.c:775 msgid "Repost" msgstr "Reposte" -#: src/lang.c:773 +#: src/lang.c:776 msgid "Reposting article..." msgstr "Wiederholtes posten des Artikels..." -#: src/lang.c:774 +#: src/lang.c:777 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "Wiederholtes posten de(s|r) Artikel(s) in [%s]> " -#: src/lang.c:775 +#: src/lang.c:778 msgid "Reset newsrc?" msgstr "newsrc zurücksetzen?" -#: src/lang.c:776 +#: src/lang.c:779 msgid "Responses have been directed to the following newsgroups" msgstr "Antworten werden in folgende Gruppen gepostet" -#: src/lang.c:777 +#: src/lang.c:780 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " msgstr "Antwort per Mail wurde angefordert. %s=Mail, %s=post, %s=beenden: " -#: src/lang.c:779 +#: src/lang.c:782 msgid "Press to continue..." msgstr "Drücken Sie um fortzufahren..." -#: src/lang.c:781 +#: src/lang.c:784 #, c-format msgid "Select From [%s] (y/n): " msgstr "Wähle From [%s] (j/n): " -#: src/lang.c:782 +#: src/lang.c:785 msgid "Select Lines: (num): " msgstr "Wähle Zeilen: (num): " -#: src/lang.c:783 +#: src/lang.c:786 msgid "Auto-select Article Menu" msgstr "Filter Menü (Bewertung/Score erhöhen)" -#: src/lang.c:784 +#: src/lang.c:787 #, c-format -msgid "Select Msg-Id [%s] (f/l/o/n): " -msgstr "Wähle Msg-Id [%s] (v/l/n/n): " +msgid "Select Msg-ID [%s] (f/l/o/n): " +msgstr "Wähle Msg-ID [%s] (v/l/n/n): " -#: src/lang.c:785 +#: src/lang.c:788 msgid "Select pattern scope: " msgstr "Wähle Muster : " -#: src/lang.c:786 +#: src/lang.c:789 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "Wähle Subject [%s] (j/n): " -#: src/lang.c:787 +#: src/lang.c:790 msgid "Select text pattern : " msgstr "Wähle Textmuster : " -#: src/lang.c:788 +#: src/lang.c:791 msgid "Select time in days : " msgstr "Wähle Zeit in Tagen : " -#: src/lang.c:789 +#: src/lang.c:792 #, c-format msgid "" "# %s server configuration file\n" @@ -3713,54 +3714,54 @@ msgstr "" "############################################################################\n" "\n" -#: src/lang.c:795 +#: src/lang.c:798 msgid "Showing unread groups only" msgstr "Zeige nur Gruppen mit ungelesenen Artikeln" -#: src/lang.c:796 +#: src/lang.c:799 msgid "Subject: line (ignore case) " msgstr "Subject: Zeile (Groß-Kl. ignorieren) " -#: src/lang.c:797 +#: src/lang.c:800 msgid "Subject: line (case sensitive)" msgstr "Subject: Zeile (Groß-Kl. beachten) " -#: src/lang.c:798 +#: src/lang.c:801 msgid "Save" msgstr "Speichern" -#: src/lang.c:799 +#: src/lang.c:802 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "'%s' (%s/%s) speichern?" -#: src/lang.c:800 +#: src/lang.c:803 msgid "Save configuration before continuing?" msgstr "Zuerst Konfiguration speichern und danach fortfahren?" -#: src/lang.c:801 +#: src/lang.c:804 msgid "Save filename> " msgstr "Name der zu speichernden Datei> " -#: src/lang.c:802 +#: src/lang.c:805 msgid "Saved" msgstr "Gespeichert" -#: src/lang.c:803 +#: src/lang.c:806 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "%4d ungelesene (%4d 'hot') %s in %s\n" -#: src/lang.c:804 +#: src/lang.c:807 #, c-format msgid "Saved %s...\n" msgstr "%s gespeichert...\n" -#: src/lang.c:805 +#: src/lang.c:808 msgid "Nothing was saved" msgstr "Nichts gespeichert" -#: src/lang.c:806 +#: src/lang.c:809 #, c-format msgid "" "\n" @@ -3769,186 +3770,186 @@ msgstr "" "\n" "%s %d %s aus %d %s\n" -#: src/lang.c:807 +#: src/lang.c:810 #, c-format msgid "-- %s saved to %s%s --" msgstr "-- %s nach %s%s gespeichert --" -#: src/lang.c:808 +#: src/lang.c:811 #, c-format msgid "-- %s saved to %s - %s --" msgstr "-- %s gespeichert als %s - %s --" -#: src/lang.c:809 +#: src/lang.c:812 msgid "Saving..." msgstr "Speichere..." -#: src/lang.c:810 +#: src/lang.c:813 #, c-format msgid "%s: Screen initialization failed" msgstr "%s: Initialisierung des Bildschirms fehlgeschlagen" -#: src/lang.c:812 +#: src/lang.c:815 #, c-format msgid "%s: screen is too small\n" msgstr "%s: Anzeige ist zu klein\n" -#: src/lang.c:814 +#: src/lang.c:817 #, c-format msgid "screen is too small, %s is exiting" msgstr "Anzeige zu klein, %s beendet sich" -#: src/lang.c:815 +#: src/lang.c:818 msgid "Delete scope?" msgstr "Gültigkeitsbereich löschen? " -#: src/lang.c:816 +#: src/lang.c:819 msgid "Enter scope> " msgstr "Gültigkeitsbereich angeben> " -#: src/lang.c:817 +#: src/lang.c:820 msgid "Select new position> " msgstr "Neue Position auswählen> " -#: src/lang.c:818 +#: src/lang.c:821 msgid "New position cannot be a global scope" msgstr "Neue Position darf kein globaler Gültigkeitsbereich sein" -#: src/lang.c:819 +#: src/lang.c:822 msgid "Global scope, operation not allowed" msgstr "Globaler Gültigkeitsbereich, Einsatz nicht erlaubt" -#: src/lang.c:820 +#: src/lang.c:823 msgid "Rename scope> " msgstr "Gültigkeitsbereich umbenennen> " -#: src/lang.c:821 +#: src/lang.c:824 msgid "Select scope> " msgstr "Gültigkeitsbereich auswählen> " -#: src/lang.c:822 +#: src/lang.c:825 msgid "Scopes Menu" msgstr "Gültigkeitsbereichmenü" -#: src/lang.c:823 +#: src/lang.c:826 msgid "Scopes Menu Commands" msgstr "Gültigkeitsbereichmenü Befehle" -#: src/lang.c:824 +#: src/lang.c:827 #, c-format msgid "Search backwards [%s]> " msgstr "Suche rückwärts [%s]> " -#: src/lang.c:825 +#: src/lang.c:828 #, c-format msgid "Search body [%s]> " msgstr "Durchsuche Artikelinhalt [%s]> " -#: src/lang.c:826 +#: src/lang.c:829 #, c-format msgid "Search forwards [%s]> " msgstr "Suche vorwärts [%s]> " -#: src/lang.c:827 +#: src/lang.c:830 msgid "Searching..." msgstr "Suche..." -#: src/lang.c:828 +#: src/lang.c:831 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "Suche Artikel %d von %d ('q' zum abbrechen)..." -#: src/lang.c:829 +#: src/lang.c:832 msgid "Select article> " msgstr "Wähle Artikel> " -#: src/lang.c:830 +#: src/lang.c:833 msgid "" "Select option number before text or use arrow keys and . 'q' to quit." msgstr "" "Wähle Optionsnummer, oder benutze die Cursor Tasten und . 'q' zum " "beenden." -#: src/lang.c:831 +#: src/lang.c:834 msgid "Select group> " msgstr "Wähle Gruppe> " -#: src/lang.c:832 +#: src/lang.c:835 #, c-format msgid "Enter selection pattern [%s]> " msgstr "Nenne das Auswahlmuster [%s]> " -#: src/lang.c:833 +#: src/lang.c:836 msgid "Select thread> " msgstr "Wähle thread> " -#: src/lang.c:834 +#: src/lang.c:837 #, c-format msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" msgstr "" "%s %s %s (\"%s\") [%s]: schicken Sie einen DETAILLIERTEN Fehlerbericht an " "%s\n" -#: src/lang.c:835 +#: src/lang.c:838 msgid "servers active-file" msgstr "Die 'active' Datei des Servers" -#: src/lang.c:836 +#: src/lang.c:839 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "Kann die Newsgruppe nicht öffnen. Sie muss erst abonniert werden..." -#: src/lang.c:837 +#: src/lang.c:840 msgid "" msgstr "" -#: src/lang.c:838 +#: src/lang.c:841 #, c-format msgid "Starting: (%s)" msgstr "Starte: (%s)" -#: src/lang.c:839 +#: src/lang.c:842 #, c-format msgid "List Thread (%d of %d)" msgstr "Zeige Thread (%d von %d)" -#: src/lang.c:840 +#: src/lang.c:843 #, c-format msgid "Thread (%.*s)" msgstr "Thread (%.*s)" -#: src/lang.c:841 +#: src/lang.c:844 msgid "Enter wildcard subscribe pattern> " msgstr "Wildcardmuster für zu abonnierende Gruppen> " -#: src/lang.c:842 +#: src/lang.c:845 #, c-format msgid "subscribed to %d groups" msgstr "%d Gruppen sind abonniert" -#: src/lang.c:843 +#: src/lang.c:846 #, c-format msgid "Subscribed to %s" msgstr "%s wurde abonniert" -#: src/lang.c:844 +#: src/lang.c:847 msgid "Subscribing... " msgstr "Abonniere... " -#: src/lang.c:845 +#: src/lang.c:848 #, c-format msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " msgstr "Artikel erneut posten oder überschreiben [%%s]? (%s/%s/%s): " -#: src/lang.c:846 +#: src/lang.c:849 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "Supersede (überschreibe) Artikel in den Gruppen [%s]> " -#: src/lang.c:847 +#: src/lang.c:850 msgid "Superseding article ..." msgstr "Ãœberschreibe Artikel ..." -#: src/lang.c:848 +#: src/lang.c:851 #, c-format msgid "" "\n" @@ -3957,24 +3958,24 @@ msgstr "" "\n" "Angehalten. Geben Sie 'fg' ein um %s wieder zu starten\n" -#: src/lang.c:850 +#: src/lang.c:853 #, c-format msgid "%d days" msgstr "%d Tage" -#: src/lang.c:851 +#: src/lang.c:854 msgid "" msgstr "" -#: src/lang.c:852 +#: src/lang.c:855 msgid "TeX " msgstr "TeX " -#: src/lang.c:853 +#: src/lang.c:856 msgid "# Default action/prompt strings\n" msgstr "# Voreingestellte Aktion/zeige Zeichenkette\n" -#: src/lang.c:854 +#: src/lang.c:857 msgid "" "# Defaults for quick (1 key) kill & auto-selection filters\n" "# header=NUM 0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n" @@ -3993,110 +3994,110 @@ msgstr "" "# case=ON/OFF ON=Filter case sensitive OFF=ignoriere case\n" "# expire=ON/OFF ON=Verfallen nach default_filter_days OFF=verfällt nie\n" -#: src/lang.c:867 +#: src/lang.c:870 msgid "" "# If ON use print current subject or newsgroup description in the last line\n" msgstr "" "# Falls ON anzeige des Subject oder des Gruppennamens in der letzten Zeile.\n" -#: src/lang.c:868 +#: src/lang.c:871 msgid "# Host & time info used for detecting new groups (don't touch)\n" msgstr "" "# Benutzte Host- & Zeit-Info um neue Gruppen zu finden (nicht ändern)\n" -#: src/lang.c:869 +#: src/lang.c:872 msgid "There is no news\n" msgstr "Es gibt keine neuen Artikel\n" -#: src/lang.c:870 +#: src/lang.c:873 msgid "Thread" msgstr "Thread" -#: src/lang.c:871 +#: src/lang.c:874 msgid "Thread Level Commands" msgstr "Thread Level Kommandos" -#: src/lang.c:872 +#: src/lang.c:875 msgid "Thread deselected" msgstr "Thread nicht mehr ausgewählt" -#: src/lang.c:873 +#: src/lang.c:876 msgid "Thread selected" msgstr "Thread ausgewählt" -#: src/lang.c:875 +#: src/lang.c:878 msgid "threads" msgstr "Threads" -#: src/lang.c:877 +#: src/lang.c:880 msgid "thread" msgstr "Thread" -#: src/lang.c:878 +#: src/lang.c:881 #, c-format msgid "Thread %4s of %4s" msgstr "Thread %4s v. %4s" -#: src/lang.c:879 +#: src/lang.c:882 msgid "Threading articles..." msgstr "Sortiere Artikel..." -#: src/lang.c:880 +#: src/lang.c:883 #, c-format msgid "Toggled word highlighting %s" msgstr "Wort-Hervorhebung: %s" -#: src/lang.c:881 +#: src/lang.c:884 msgid "Toggled rot13 encoding" msgstr "ROT13-Kodierung (de)aktiviert" -#: src/lang.c:882 +#: src/lang.c:885 #, c-format msgid "Toggled german TeX encoding %s" msgstr "Deutsche TeX-Dekodierung: %s" -#: src/lang.c:883 +#: src/lang.c:886 #, c-format msgid "Toggled tab-width to %d" msgstr "Tabulatorweite zu %d gewechselt" -#: src/lang.c:885 +#: src/lang.c:888 #, c-format msgid "%d Trying to dotlock %s" msgstr "%d Versuche %s zu dotlocken" -#: src/lang.c:886 +#: src/lang.c:889 #, c-format msgid "%d Trying to lock %s" msgstr "%d Versuche %s zu locken" -#: src/lang.c:888 +#: src/lang.c:891 msgid " h=help" msgstr " h=Hilfe" -#: src/lang.c:890 +#: src/lang.c:893 msgid "Unlimited" msgstr "Unbegrenzt" -#: src/lang.c:891 +#: src/lang.c:894 msgid "Enter wildcard unsubscribe pattern> " msgstr "Wildcardmuster für abzubestellende Gruppen> " -#: src/lang.c:892 +#: src/lang.c:895 #, c-format msgid "Error decoding %s : %s" msgstr "Fehler beim Dekodieren von %s : %s" -#: src/lang.c:893 +#: src/lang.c:896 msgid "No end." msgstr "Kein Ende." -#: src/lang.c:894 +#: src/lang.c:897 #, c-format msgid "%s successfully decoded." msgstr "%s erfolgreich dekodiert." -#: src/lang.c:895 +#: src/lang.c:898 #, c-format msgid "" "%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" @@ -4105,37 +4106,32 @@ msgstr "" "%*s[-- %s/%s, %suukodierte Datei, %d Zeilen, Name: %s --]\n" "\n" -#: src/lang.c:896 +#: src/lang.c:899 msgid "unread " msgstr "ungelesen " -#: src/lang.c:897 +#: src/lang.c:900 #, c-format msgid "unsubscribed from %d groups" msgstr "%d Gruppen abbestellt" -#: src/lang.c:898 +#: src/lang.c:901 #, c-format msgid "Unsubscribed from %s" msgstr "%s wurde abbestellt" -#: src/lang.c:899 +#: src/lang.c:902 msgid "Unsubscribing... " msgstr "Abbestellen... " -#: src/lang.c:900 +#: src/lang.c:903 msgid "Unthreading articles..." msgstr "Aktuelle Sortierung der Artikel aufheben..." -#: src/lang.c:901 +#: src/lang.c:904 msgid "Updated" msgstr "Aktualisiert" -#: src/lang.c:903 -#, c-format -msgid "unparseable \"LIST COUNTS\" line: \"%s\"" -msgstr "Nicht auswertbare \"LIST COUNTS\" Zeile: \"%s\"" - #: src/lang.c:905 msgid "Updating" msgstr "Aktualisiere" @@ -4296,10 +4292,15 @@ msgstr "%s ist nur sinnvoll für Batchmo #: src/lang.c:939 #, c-format +msgid "%s only useful for batch or debug mode operations\n" +msgstr "%s ist nur sinnvoll für Batchmode- oder Debugoperationen\n" + +#: src/lang.c:940 +#, c-format msgid "Useless combination %s and %s. Ignoring %s.\n" msgstr "Unsinnige Kombination von %s und %s. Ignoriere %s.\n" -#: src/lang.c:941 +#: src/lang.c:942 #, c-format msgid "" "\n" @@ -4308,12 +4309,12 @@ msgstr "" "\n" "%s%d ist außerhalb der Grenzen (0 - %d). Zurücksetzen auf 0" -#: src/lang.c:942 +#: src/lang.c:943 #, c-format msgid "View '%s' (%s/%s)?" msgstr "'%s' (%s/%s) anzeigen?" -#: src/lang.c:944 +#: src/lang.c:945 #, c-format msgid "" "\n" @@ -4324,7 +4325,7 @@ msgstr "" "Warnung: Artikel überschreitet %d Spalten. Zeile %d ist die erste lange:\n" "%-100s\n" -#: src/lang.c:945 +#: src/lang.c:946 msgid "" "\n" "Warning: article unchanged after editing\n" @@ -4332,7 +4333,7 @@ msgstr "" "\n" "Warnung: Artikel wurde im Editor nicht verändert\n" -#: src/lang.c:946 +#: src/lang.c:947 msgid "" "\n" "Warning: \"Subject:\" contains only whitespaces.\n" @@ -4340,7 +4341,7 @@ msgstr "" "\n" "Warnung: \"Subject:\" enthält nur Leerzeichen.\n" -#: src/lang.c:947 +#: src/lang.c:948 msgid "" "\n" "Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:" @@ -4350,7 +4351,7 @@ msgstr "" "Warnung: \"Subject:\" beginnt mit \"Re: \", aber es gibt keine \"References:" "\".\n" -#: src/lang.c:949 +#: src/lang.c:950 msgid "" "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" @@ -4360,7 +4361,7 @@ msgstr "" "Warnung: Artikel hat \"References:\" aber \"Subject:\" beginnt nicht\n" " mit \"Re: \" and enthält auch kein \"(was:\".\n" -#: src/lang.c:952 +#: src/lang.c:953 msgid "" "Read carefully!\n" "\n" @@ -4382,7 +4383,7 @@ msgstr "" "Das ist der Artikel, den Sie canceln (löschen) wollen:\n" "\n" -#: src/lang.c:956 +#: src/lang.c:957 msgid "" "\n" "Warning: You are using a non-plain transfer encoding (such as base64 or\n" @@ -4396,7 +4397,7 @@ msgstr "" " Artikel zu übertragen. Falls durch diesen inews eine Signatur\n" " angehängt wird, so kann diese nicht korrekt kodiert werden.\n" -#: src/lang.c:961 +#: src/lang.c:962 msgid "" "\n" "Warning: \"example\" is a reserved hierarchy!\n" @@ -4404,7 +4405,7 @@ msgstr "" "\n" "Warnung: \"example\" ist eine reserviert Hierarchie!\n" -#: src/lang.c:962 +#: src/lang.c:963 #, c-format msgid "" "\n" @@ -4419,7 +4420,7 @@ msgstr "" "Einige Einstellungen in Ihrer %s-Datei haben sich geändert!\n" "Lesen Sie \"WHATSNEW\", usw....\n" -#: src/lang.c:964 +#: src/lang.c:965 #, c-format msgid "" "\n" @@ -4433,7 +4434,7 @@ msgstr "" "Evtl. werden Einstellungen in Ihrer %s-Datei\n" "nicht erkannt oder ändern sich!\n" -#: src/lang.c:967 +#: src/lang.c:968 #, c-format msgid "" "Warning: tin wrote fewer groups to your\n" @@ -4448,7 +4449,7 @@ msgstr "" "währenddessen abbestellt haben, ist ein Fehler aufgetreten und Sie sollten\n" "Ihre %s wiederherstellen, bevor Sie tin nochmal starten!\n" -#: src/lang.c:971 +#: src/lang.c:972 #, c-format msgid "" "\n" @@ -4457,12 +4458,12 @@ msgstr "" "\n" "Warnung: Es gibt %d '-- \\n' Zeilen. Das könnte einige Leute verwirren.\n" -#: src/lang.c:972 +#: src/lang.c:973 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "Warnung: Nur %d von %d Artikeln gespeichert" -#: src/lang.c:973 +#: src/lang.c:974 #, c-format msgid "" "\n" @@ -4479,14 +4480,14 @@ msgstr "" "möglich\n" " gehalten werden.\n" -#: src/lang.c:977 +#: src/lang.c:978 #, c-format msgid "" "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " msgstr "" "Warnung: E-Mailadr. evtl. verfälscht (Spamfalle). %s=weiter, %s=Abbruch? " -#: src/lang.c:978 +#: src/lang.c:979 msgid "" "\n" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" @@ -4494,37 +4495,37 @@ msgstr "" "\n" "Warnung: Signaturen sollten mit '-- \\n' und nicht mit '--\\n' beginnen.\n" -#: src/lang.c:979 +#: src/lang.c:980 msgid "Writing attributes file..." msgstr "Schreibe Datei mit den Eigenschaften der Newsgruppen..." -#: src/lang.c:981 +#: src/lang.c:982 #, c-format msgid "%d Responses" msgstr "%d Antworten" -#: src/lang.c:983 +#: src/lang.c:984 #, c-format msgid "Added %d %s" msgstr "%d %s hinzugefügt" -#: src/lang.c:984 +#: src/lang.c:985 msgid "No unsubscribed groups to show" msgstr "Keine nicht abonnierte Gruppen gefunden" -#: src/lang.c:985 +#: src/lang.c:986 msgid "Showing subscribed to groups only" msgstr "Zeige nur abonnierte Gruppen" -#: src/lang.c:986 +#: src/lang.c:987 msgid "Yes " msgstr "Ja " -#: src/lang.c:987 +#: src/lang.c:988 msgid " You have mail" msgstr " Sie haben Mail" -#: src/lang.c:992 +#: src/lang.c:993 #, c-format msgid "" "\n" @@ -4545,11 +4546,11 @@ msgstr "" " entfernen oder MM_NETWORK_CHARSET im M)neu auf einen\n" " passenderen Wert setzen.\n" -#: src/lang.c:1003 +#: src/lang.c:1004 msgid " -D mode debug mode" msgstr " -D Modus Debug-Modus" -#: src/lang.c:1007 +#: src/lang.c:1008 msgid "" "Read carefully!\n" "\n" @@ -4577,11 +4578,11 @@ msgstr "" "Dies ist der Artikel, den Sie canceln (löschen) wollen:\n" "\n" -#: src/lang.c:1016 +#: src/lang.c:1017 msgid "toggle color" msgstr "Farben ein/aus" -#: src/lang.c:1017 +#: src/lang.c:1018 msgid "" "# Changing colors of several screen parts\n" "# Possible values are:\n" @@ -4627,11 +4628,11 @@ msgstr "" "# 15 = hellweiß\n" "\n" -#: src/lang.c:1037 +#: src/lang.c:1038 msgid " -a toggle color flag" msgstr " -a Farbe ein- oder ausschalten" -#: src/lang.c:1041 +#: src/lang.c:1042 msgid "" "\n" "Error: Followup-To set to more than one newsgroup!\n" @@ -4639,7 +4640,7 @@ msgstr "" "\n" "Fehler: Followup-To auf mehr als eine Newsgruppe gesetzt!\n" -#: src/lang.c:1042 +#: src/lang.c:1043 #, c-format msgid "" "\n" @@ -4648,7 +4649,7 @@ msgstr "" "\n" "Fehler: \"%s\" wurde umbenannt, \"%s\" stattdessen benutzen!\n" -#: src/lang.c:1043 +#: src/lang.c:1044 #, c-format msgid "" "\n" @@ -4657,7 +4658,7 @@ msgstr "" "\n" "Fehler: Crossposting in %d Newsgruppen und kein Followup-To gesetzt!\n" -#: src/lang.c:1044 +#: src/lang.c:1045 #, c-format msgid "" "\n" @@ -4666,7 +4667,7 @@ msgstr "" "\n" "Fehler: \"%s\" ist keine gültige Newsgruppe!\n" -#: src/lang.c:1046 +#: src/lang.c:1047 msgid "" "\n" "Warning: Followup-To set to more than one newsgroup!\n" @@ -4674,7 +4675,7 @@ msgstr "" "\n" "Warnung: Followup-To in mehr als eine Newsgruppe gesetzt!\n" -#: src/lang.c:1047 +#: src/lang.c:1048 #, c-format msgid "" "\n" @@ -4683,7 +4684,7 @@ msgstr "" "\n" "Warnung: \"%s\" wurde umbenannt, bitte \"%s\" stattdessen benutzen!\n" -#: src/lang.c:1048 +#: src/lang.c:1049 #, c-format msgid "" "\n" @@ -4692,7 +4693,7 @@ msgstr "" "\n" "Warnung: Crossposting in %d Newsgruppen und kein Followup-To gesetzt!\n" -#: src/lang.c:1049 +#: src/lang.c:1050 #, c-format msgid "" "\n" @@ -4701,7 +4702,7 @@ msgstr "" "\n" "Warnung: \"%s\" ist nicht in Ihrer newsrc, sie könnte ungültig sein!\n" -#: src/lang.c:1050 +#: src/lang.c:1051 #, c-format msgid "" "\n" @@ -4710,81 +4711,81 @@ msgstr "" "\n" "Warnung: \"%s\" ist keine gültige Newsgruppe auf diesem Server!\n" -#: src/lang.c:1054 +#: src/lang.c:1055 #, c-format msgid "%d files successfully written from %d articles. %d %s occurred." msgstr "" "%d Dateien aus %d Artikeln erfolgreich geschrieben. %d %s trat(en) auf." -#: src/lang.c:1055 +#: src/lang.c:1056 msgid "Missing parts." msgstr "Teile fehlen." -#: src/lang.c:1056 +#: src/lang.c:1057 msgid "No beginning." msgstr "Kein Anfang." -#: src/lang.c:1057 +#: src/lang.c:1058 msgid "No data." msgstr "Keine Daten." -#: src/lang.c:1058 +#: src/lang.c:1059 msgid "Unknown error." msgstr "Unbekannter Fehler." -#: src/lang.c:1061 +#: src/lang.c:1062 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "\tPrüfsumme für %s (%ld %s)" -#: src/lang.c:1066 +#: src/lang.c:1067 msgid "Reading mail active file... " msgstr "Lese EMail-Active-Datei... " -#: src/lang.c:1067 +#: src/lang.c:1068 msgid "Reading mailgroups file... " msgstr "Lese Mailgruppen-Datei... " -#: src/lang.c:1071 +#: src/lang.c:1072 msgid "perform PGP operations on article" msgstr "wendet PGP auf den Artikel an" -#: src/lang.c:1072 +#: src/lang.c:1073 msgid "Add key(s) to public keyring?" msgstr "Schlüssel dem Öffentlichen Schlüsselring hinzufügen?" -#: src/lang.c:1073 +#: src/lang.c:1074 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "%s=verschlüsseln, %s=signieren, %s=beides, %s=Ende: " -#: src/lang.c:1074 +#: src/lang.c:1075 #, c-format msgid "%s=sign, %s=sign & include public key, %s=quit: " msgstr "%s=signiere, %s=signiere & füge öffentl. Schlüssel hinzu, %s=Ende: " -#: src/lang.c:1075 +#: src/lang.c:1076 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "PGP Wurde nicht konfiguriert (kann %s nicht öffnen)" -#: src/lang.c:1076 +#: src/lang.c:1077 msgid "Article not signed and no public keys found" msgstr "Artikel ist nicht signiert; keine öffentlichen Schlüssel gefunden" -#: src/lang.c:1078 +#: src/lang.c:1079 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" "%s=Ende, %s=bearbeiten, %s=ispell, %s=pgp, %s=Menü, %s=posten, " "%s=zurücklegen: " -#: src/lang.c:1079 +#: src/lang.c:1080 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " msgstr "%s=Ende, %s=bearbeiten, %s=ispell, %s=pgp, %s=verschicken [%%s]: " -#: src/lang.c:1080 +#: src/lang.c:1081 #, c-format msgid "" "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " @@ -4792,80 +4793,74 @@ msgstr "" "%s=Ende, %s=bearbeiten, %s=ispell, %s=pgp, %s=Menü, %s=posten, " "%s=zurücklegen [%%s]: " -#: src/lang.c:1082 +#: src/lang.c:1083 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "%s=Ende, %s=bearbeiten, %s=pgp, %s=Menü, %s=posten, %s=zurücklegen: " -#: src/lang.c:1083 +#: src/lang.c:1084 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "%s=Ende, %s=bearbeiten, %s=pgp, %s=verschicken [%%s]: " -#: src/lang.c:1084 +#: src/lang.c:1085 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" "%s=Ende, %s=bearbeiten, %s=pgp, %s=Menü, %s=posten, %s=zurücklegen [%%s]: " -#: src/lang.c:1088 +#: src/lang.c:1089 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " msgstr "" "%s=Ende, %s=bearbeiten, %s=ispell, %s=Menü, %s=posten, %s=zurücklegen: " -#: src/lang.c:1089 +#: src/lang.c:1090 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "%s=Ende, %s=bearbeiten, %s=ispell, %s=verschicken [%%s]: " -#: src/lang.c:1090 +#: src/lang.c:1091 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" "%s=Ende, %s=bearbeiten, %s=ispell, %s=Menü, %s=post, %s=Zurückl. [%%s]: " -#: src/lang.c:1092 +#: src/lang.c:1093 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "%s=Ende, %s=bearbeiten, %s=Menü, %s=posten, %s=zurücklegen: " -#: src/lang.c:1093 +#: src/lang.c:1094 #, c-format msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "%s=Ende, %s=bearbeiten, %s=verschicken [%%s]: " -#: src/lang.c:1094 +#: src/lang.c:1095 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=Ende, %s=bearbeiten, %s=Menü, %s=posten, %s=zurücklegen [%%s]: " -#: src/lang.c:1103 +#: src/lang.c:1104 msgid "Try cache_overview_files to speed up things.\n" msgstr "Setze cache_overview_files um das lesen zu beschleunigen.\n" -#: src/lang.c:1104 +#: src/lang.c:1105 msgid "Tin will use local index files instead.\n" msgstr "Tin wird lokale index files benutzen.\n" -#: src/lang.c:1105 +#: src/lang.c:1106 msgid "Cannot find NNTP server name" msgstr "Kann den Namen des NNTP Servers nicht finden" -#: src/lang.c:1106 +#: src/lang.c:1107 #, c-format msgid "Connecting to %s:%u..." msgstr "Verbinde mit %s:%u..." -#: src/lang.c:1107 -msgid "Disconnecting from server...\n" -msgstr "Trenne Verbindung zum Server...\n" - #: src/lang.c:1108 -#, c-format -msgid "" -"Wrong newsgroup name (\"%s\") in response of \"GROUP %s\" command: \"%s\"" -msgstr "Falsche Newsgruppe (\"%s\") in Antwort auf \"GROUP%s\"-Befehl: \"%s\"" +msgid "Disconnecting from server..." +msgstr "Trenne Verbindung zum Server..." #: src/lang.c:1109 #, c-format @@ -5653,65 +5648,69 @@ msgstr "NFC" msgid "NFD" msgstr "NFD" -#: src/lang.c:1586 +#: src/lang.c:1580 +msgid "NFKC case fold" +msgstr "NFKC Groß-/Kleinschreibung Zusammenlegen" + +#: src/lang.c:1589 msgid "Display Options" msgstr "Darstellungseinstellungen" -#: src/lang.c:1593 +#: src/lang.c:1596 msgid "Color Options" msgstr "Farbeinstellungen" -#: src/lang.c:1599 +#: src/lang.c:1602 msgid "Highlight Options" msgstr "Hervorhebungseinstellungen" -#: src/lang.c:1606 +#: src/lang.c:1609 msgid "Article-Limiting Options" msgstr "Artikel-Begrenzungseinstellungen" -#: src/lang.c:1612 +#: src/lang.c:1615 msgid "Posting/Mailing Options" msgstr "Versandeinstellungen für Mail und News" -#: src/lang.c:1618 +#: src/lang.c:1621 msgid "Saving/Printing Options" msgstr "Speicher- und Druckereinstellungen" -#: src/lang.c:1624 +#: src/lang.c:1627 msgid "Expert Options" msgstr "Experteneinstellungen" -#: src/lang.c:1630 +#: src/lang.c:1633 msgid "Filtering Options" msgstr "Filtereinstellungen" -#: src/lang.c:1635 src/lang.c:1666 src/lang.c:1672 src/lang.c:1699 -#: src/lang.c:1751 src/lang.c:1757 src/lang.c:1767 src/lang.c:1778 -#: src/lang.c:1796 src/lang.c:1865 src/lang.c:2066 src/lang.c:2072 -#: src/lang.c:2078 src/lang.c:2084 src/lang.c:2096 src/lang.c:2103 -#: src/lang.c:2157 src/lang.c:2166 src/lang.c:2172 src/lang.c:2179 -#: src/lang.c:2186 src/lang.c:2193 src/lang.c:2200 src/lang.c:2207 -#: src/lang.c:2214 src/lang.c:2221 src/lang.c:2228 src/lang.c:2235 -#: src/lang.c:2242 src/lang.c:2249 src/lang.c:2256 src/lang.c:2263 -#: src/lang.c:2270 src/lang.c:2277 src/lang.c:2284 src/lang.c:2291 -#: src/lang.c:2298 src/lang.c:2305 src/lang.c:2312 src/lang.c:2319 -#: src/lang.c:2326 src/lang.c:2333 src/lang.c:2340 src/lang.c:2348 -#: src/lang.c:2364 src/lang.c:2371 src/lang.c:2378 src/lang.c:2385 -#: src/lang.c:2391 src/lang.c:2397 src/lang.c:2414 src/lang.c:2426 -#: src/lang.c:2461 src/lang.c:2514 src/lang.c:2528 src/lang.c:2534 -#: src/lang.c:2559 src/lang.c:2577 src/lang.c:2594 src/lang.c:2606 -#: src/lang.c:2639 src/lang.c:2675 src/lang.c:2695 src/lang.c:2730 -#: src/lang.c:2740 src/lang.c:2747 src/lang.c:2773 src/lang.c:2797 -#: src/lang.c:2870 src/lang.c:2884 src/lang.c:2892 src/lang.c:2906 -#: src/lang.c:2912 src/lang.c:2950 +#: src/lang.c:1638 src/lang.c:1669 src/lang.c:1675 src/lang.c:1702 +#: src/lang.c:1754 src/lang.c:1760 src/lang.c:1770 src/lang.c:1781 +#: src/lang.c:1799 src/lang.c:1868 src/lang.c:2069 src/lang.c:2075 +#: src/lang.c:2081 src/lang.c:2087 src/lang.c:2099 src/lang.c:2106 +#: src/lang.c:2160 src/lang.c:2169 src/lang.c:2175 src/lang.c:2182 +#: src/lang.c:2189 src/lang.c:2196 src/lang.c:2203 src/lang.c:2210 +#: src/lang.c:2217 src/lang.c:2224 src/lang.c:2231 src/lang.c:2238 +#: src/lang.c:2245 src/lang.c:2252 src/lang.c:2259 src/lang.c:2266 +#: src/lang.c:2273 src/lang.c:2280 src/lang.c:2287 src/lang.c:2294 +#: src/lang.c:2301 src/lang.c:2308 src/lang.c:2315 src/lang.c:2322 +#: src/lang.c:2329 src/lang.c:2336 src/lang.c:2343 src/lang.c:2351 +#: src/lang.c:2367 src/lang.c:2374 src/lang.c:2381 src/lang.c:2388 +#: src/lang.c:2394 src/lang.c:2400 src/lang.c:2417 src/lang.c:2429 +#: src/lang.c:2464 src/lang.c:2517 src/lang.c:2531 src/lang.c:2537 +#: src/lang.c:2562 src/lang.c:2580 src/lang.c:2597 src/lang.c:2609 +#: src/lang.c:2642 src/lang.c:2678 src/lang.c:2698 src/lang.c:2733 +#: src/lang.c:2743 src/lang.c:2750 src/lang.c:2776 src/lang.c:2800 +#: src/lang.c:2877 src/lang.c:2892 src/lang.c:2900 src/lang.c:2914 +#: src/lang.c:2920 src/lang.c:2958 msgid " toggles, sets, cancels." msgstr " wechselt, setzt, bricht ab." -#: src/lang.c:1636 +#: src/lang.c:1639 msgid "Show mini menu & posting etiquette" msgstr "Zeigt Minimenü & Posting Etikette" -#: src/lang.c:1637 +#: src/lang.c:1640 msgid "" "# If ON show a mini menu of useful commands at each level\n" "# and posting etiquette after composing an article\n" @@ -5719,15 +5718,15 @@ msgstr "" "# Falls ON wird ein kleines Menü mit nützlichen Kommandos in jedem Level\n" "# angezeigt. Nach dem Erstellen eines Artikels wird die Etikette angezeigt\n" -#: src/lang.c:1642 +#: src/lang.c:1645 msgid "Show short description for each newsgroup. toggles & sets." msgstr "Zeige Kurzbeschreibung für Gruppe. wechselt & setzt." -#: src/lang.c:1643 +#: src/lang.c:1646 msgid "Show description of each newsgroup" msgstr "Zeige Beschreibung der Newsgruppen" -#: src/lang.c:1644 +#: src/lang.c:1647 msgid "" "# If ON show group description text after newsgroup name at\n" "# group selection level\n" @@ -5735,7 +5734,7 @@ msgstr "" "# Falls ON wird die Newsgruppenbeschreibung im Gruppenauswahlmenü\n" "# nach dem Gruppennamen angezeigt\n" -#: src/lang.c:1649 +#: src/lang.c:1652 msgid "" "Show From (author) fields in group & thread level. toggles & " "sets." @@ -5743,11 +5742,11 @@ msgstr "" "Zeigt From (Autor) Feld im Gruppen- und Threadlevel. wechselt & " "setzt." -#: src/lang.c:1650 +#: src/lang.c:1653 msgid "In group and thread level, show author by" msgstr "Im Gruppen und Threadlevel, zeige Autor an mit" -#: src/lang.c:1651 +#: src/lang.c:1654 msgid "" "# Part of From field to display in group and thread level\n" "# Possible values are (the default is marked with *):\n" @@ -5763,33 +5762,33 @@ msgstr "" "# * 2 = Voller Name\n" "# 3 = beides (Adresse und Name)\n" -#: src/lang.c:1660 +#: src/lang.c:1663 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "Zeige -> oder Hervorhebung für Auswahl. wechselt & setzt." -#: src/lang.c:1661 +#: src/lang.c:1664 msgid "Draw -> instead of highlighted bar" msgstr "Zeige -> anstatt einer Markierung" -#: src/lang.c:1662 +#: src/lang.c:1665 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "" "# Falls ON benutze -> andernfalls benutze eine Markierung zur Auswahl\n" -#: src/lang.c:1667 +#: src/lang.c:1670 msgid "Use inverse video for page headers" msgstr "Inverse Darstellung für die Header" -#: src/lang.c:1668 +#: src/lang.c:1671 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:1673 +#: src/lang.c:1676 msgid "Thread articles by" msgstr "Threade Artikel anhand" -#: src/lang.c:1674 +#: src/lang.c:1677 msgid "" "# Thread articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5809,15 +5808,15 @@ msgstr "" "# 4 = Mehrteilige Artikel\n" "# 5 = prozentualer Subject Vergleich\n" -#: src/lang.c:1685 +#: src/lang.c:1688 msgid "Enter percentage match required to thread together. sets." msgstr "Prozent des Subject das gleich sein muss. setzt." -#: src/lang.c:1686 +#: src/lang.c:1689 msgid "Thread percentage match" msgstr "Prozentualer Subject Vergleich" -#: src/lang.c:1688 +#: src/lang.c:1691 #, no-c-format msgid "" "# Thread percentage match...\n" @@ -5841,11 +5840,11 @@ msgstr "" "um\n" "# in den gleichen Thread sortiert zu werden.\n" -#: src/lang.c:1700 +#: src/lang.c:1703 msgid "Score of a thread" msgstr "Bewertung eines Threads" -#: src/lang.c:1701 +#: src/lang.c:1704 msgid "" "# Thread score\n" "# Possible values are (the default is marked with *):\n" @@ -5859,16 +5858,16 @@ msgstr "" "# 1 = Summe\n" "# 2 = Durchschnitt\n" -#: src/lang.c:1709 +#: src/lang.c:1712 msgid "" "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "Sortiere Artikel nach Subject, From, Datum oder Bewertung." -#: src/lang.c:1710 +#: src/lang.c:1713 msgid "Sort articles by" msgstr "Sortiere Artikel nach" -#: src/lang.c:1711 +#: src/lang.c:1714 msgid "" "# Sort articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5898,15 +5897,15 @@ msgstr "" "# 9 = Lines absteigend\n" "# 10 = Lines aufsteigend\n" -#: src/lang.c:1727 +#: src/lang.c:1730 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "Threads nach Bewertung (Score) ordnen? wechselt & setzt." -#: src/lang.c:1728 +#: src/lang.c:1731 msgid "Sort threads by" msgstr "Sortiere Threads nach" -#: src/lang.c:1729 +#: src/lang.c:1732 msgid "" "# Sort thread by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5924,46 +5923,46 @@ msgstr "" "# 3 = Datum des letzten Artikels (absteigend)\n" "# 4 = Datum des letzten Artikels (aufsteigend)\n" -#: src/lang.c:1739 +#: src/lang.c:1742 msgid "" "Put cursor at first/last unread art in groups. toggles & sets." msgstr "" "Setze Cursor an ersten/letzten ungel. Artikel. wechselt & setzt." -#: src/lang.c:1740 +#: src/lang.c:1743 msgid "Go to first unread article in group" msgstr "Setze Cursor auf ersten ungel. Art." -#: src/lang.c:1741 +#: src/lang.c:1744 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "" "# Falls ON setze Cursor auf ersten ungelesenen Artikel, sonst auf letzten\n" -#: src/lang.c:1745 +#: src/lang.c:1748 msgid "Show all articles or only unread articles. toggles & sets." msgstr "Zeige alle oder nur ungelesene Artikel. wechselt & setzt." -#: src/lang.c:1746 +#: src/lang.c:1749 msgid "Show only unread articles" msgstr "Zeige nur ungelesene Artikel" -#: src/lang.c:1747 +#: src/lang.c:1750 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:1752 +#: src/lang.c:1755 msgid "Show only groups with unread arts" msgstr "Zeige nur Gruppen mit ungel. Art." -#: src/lang.c:1753 +#: src/lang.c:1756 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:1758 +#: src/lang.c:1761 msgid "Filter which articles" msgstr "Filter (kill) anwenden auf" -#: src/lang.c:1759 +#: src/lang.c:1762 msgid "" "# Filter which articles\n" "# Possible values are (the default is marked with *):\n" @@ -5977,11 +5976,11 @@ msgstr "" "# 1 = Filtert alle Artikel und markiert sie mit K\n" "# 2 = Filtert alle Artikel und zeigt gekillte niemals an\n" -#: src/lang.c:1768 +#: src/lang.c:1771 msgid "Go to the next unread article with" msgstr "Zum nächsten ungelesenen Artikel springen mit" -#: src/lang.c:1769 +#: src/lang.c:1772 msgid "" "# Go to the unread article with following key(s)\n" "# Possible values are (the default is marked with *):\n" @@ -5997,11 +5996,11 @@ msgstr "" "# * 2 = TAB\n" "# 3 = PAGE DOWN oder TAB\n" -#: src/lang.c:1779 +#: src/lang.c:1782 msgid "How to treat blank lines" msgstr "Wie mit Leerzeilen umgegangen werden soll" -#: src/lang.c:1780 +#: src/lang.c:1783 msgid "" "# Trim the article body, remove unnecessary blank lines.\n" "# Possible values are (the default is marked with *):\n" @@ -6031,26 +6030,26 @@ msgstr "" "# 7 = Leerzeilen zwischen Textblöcken zusammenfassen und\n" "# führende sowie abschließende Leerzeilen überspringen\n" -#: src/lang.c:1797 +#: src/lang.c:1800 msgid "List thread using right arrow key" msgstr "Zeige Thread mit rechter Pfeilt. an" -#: src/lang.c:1798 +#: src/lang.c:1801 msgid "" "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "" "# Falls ON: Thread beim Betreten mit der rechten Cursortaste automatisch\n" "# anzeigen?\n" -#: src/lang.c:1802 +#: src/lang.c:1805 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "Definiere Zeichen für gelöschte Artikel. setzt, bricht ab." -#: src/lang.c:1803 +#: src/lang.c:1806 msgid "Character to show deleted articles" msgstr "Zeichen für gelöschte Artikel" -#: src/lang.c:1804 +#: src/lang.c:1807 msgid "" "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" @@ -6058,18 +6057,18 @@ msgstr "" "# Zeichen für einen Artikel, der gelöscht wurde (Voreinstellung 'D')\n" "# _ wird in ' ' umgewandelt\n" -#: src/lang.c:1809 +#: src/lang.c:1812 msgid "" "Enter character to indicate articles in a range. sets, cancels." msgstr "" "Definiere Zeichen, das Artikel im Bereich anzeigt. setzt, bricht " "ab." -#: src/lang.c:1810 +#: src/lang.c:1813 msgid "Character to show inrange articles" msgstr "Zeichen für Artikel im Bereich" -#: src/lang.c:1811 +#: src/lang.c:1814 msgid "" "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" @@ -6077,17 +6076,17 @@ msgstr "" "# Zeichen für Artikel die im Bereich sind (Voreinstellung '#')\n" "# _ wird in ' ' umgewandelt\n" -#: src/lang.c:1816 +#: src/lang.c:1819 msgid "" "Enter character to indicate that article will return. sets, " "cancels." msgstr "Definiere Zeichen für wiederkehrende Art. setzt. bricht ab." -#: src/lang.c:1817 +#: src/lang.c:1820 msgid "Character to show returning arts" msgstr "Zeichen für wiederkehrende Artikel" -#: src/lang.c:1818 +#: src/lang.c:1821 msgid "" "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" @@ -6095,17 +6094,17 @@ msgstr "" "# Zeichen, dass ein Artikel wiederkommen wird (Voreinstellung '-')\n" "# _ wird in ' ' umgewandelt\n" -#: src/lang.c:1823 +#: src/lang.c:1826 msgid "" "Enter character to indicate selected articles. sets, cancels." msgstr "" "Zeichen für Artikel mit Markierung wichtig/'hot' setzt, bricht ab." -#: src/lang.c:1824 +#: src/lang.c:1827 msgid "Character to show selected articles" msgstr "Zeichen für wichtige Artikel" -#: src/lang.c:1825 +#: src/lang.c:1828 msgid "" "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" @@ -6113,15 +6112,15 @@ msgstr "" "# Zeichen für Artikel mit Markierung wichtig/'hot' (Voreinstellung '*')\n" "# _ wird in ' ' umgewandelt\n" -#: src/lang.c:1830 +#: src/lang.c:1833 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "Definiere Zeichen für aktuelle Artikel. setzt, bricht ab." -#: src/lang.c:1831 +#: src/lang.c:1834 msgid "Character to show recent articles" msgstr "Zeichen für aktuelle Artikel" -#: src/lang.c:1832 +#: src/lang.c:1835 msgid "" "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" @@ -6129,15 +6128,15 @@ msgstr "" "# Zeichen für einen aktuellen Artikel (Voreinstellung ist 'o')\n" "# _ wird in ' ' umgewandelt\n" -#: src/lang.c:1837 +#: src/lang.c:1840 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "Zeichen für ungelesene Artikel. setzt, bricht ab." -#: src/lang.c:1838 +#: src/lang.c:1841 msgid "Character to show unread articles" msgstr "Zeichen für ungelesene Artikel" -#: src/lang.c:1839 +#: src/lang.c:1842 msgid "" "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" @@ -6145,15 +6144,15 @@ msgstr "" "# Zeichen für ungelesene Artikel (Voreinstellung '+')\n" "# _ wird in ' ' umgewandelt\n" -#: src/lang.c:1844 +#: src/lang.c:1847 msgid "Enter character to indicate read articles. sets, cancels." msgstr "Zeichen für gelesene Artikel. setzt, bricht ab." -#: src/lang.c:1845 +#: src/lang.c:1848 msgid "Character to show read articles" msgstr "Zeichen für gelesene Artikel" -#: src/lang.c:1846 +#: src/lang.c:1849 msgid "" "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" @@ -6161,15 +6160,15 @@ msgstr "" "# Zeichen für gelesene Artikel (Voreinstellung ' ')\n" "# _ wird in ' ' umgewandelt\n" -#: src/lang.c:1851 +#: src/lang.c:1854 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "Zeichen für gekillte Artikel. setzt, bricht ab." -#: src/lang.c:1852 +#: src/lang.c:1855 msgid "Character to show killed articles" msgstr "Zeichen für gekillte Artikel" -#: src/lang.c:1853 +#: src/lang.c:1856 msgid "" "# Character used to show that an art was killed (default 'K')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" @@ -6177,17 +6176,17 @@ msgstr "" "# Zeichen für gekillte Artikel (Voreinstellung 'K')\n" "# _ wird in ' ' umgewandelt, kill_level muss passend gesetzt sein.\n" -#: src/lang.c:1858 +#: src/lang.c:1861 msgid "" "Enter character to indicate read selected articles. sets, cancels." msgstr "" "Zeichen für gelesene wichtige/'hot' Artikel. setzt, bricht ab." -#: src/lang.c:1859 +#: src/lang.c:1862 msgid "Character to show readselected arts" msgstr "Zeichen für gelesene wichtige Art." -#: src/lang.c:1860 +#: src/lang.c:1863 msgid "" "# Character used to show that an art was selected before read (default ':')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" @@ -6196,11 +6195,11 @@ msgstr "" "# (Voreinstellung ':')\n" "# _ wird in ' ' umgewandelt, kill_level muss passend gesetzt sein.\n" -#: src/lang.c:1866 +#: src/lang.c:1869 msgid "Abbreviate long newsgroup names" msgstr "Lange Newsgruppennamen abkürzen" -#: src/lang.c:1867 +#: src/lang.c:1870 msgid "" "# If ON abbreviate (if necessary) long newsgroup names at group selection\n" "# level and article level like this:\n" @@ -6209,7 +6208,7 @@ msgstr "" "# Falls ON: lange Newsgruppennamen in der Anzeige wie folgt kürzen:\n" "# news.software.readers -> n.software.readers -> n.s.readers -> n.s.r.\n" -#: src/lang.c:1873 +#: src/lang.c:1876 msgid "" "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" @@ -6217,11 +6216,11 @@ msgstr "" "0 = seitenweise, -1 = zeige zusätzlich letzte Zeile der vorigen Seite, -2 = " "halbe Seite" -#: src/lang.c:1874 +#: src/lang.c:1877 msgid "Number of lines to scroll in pager" msgstr "Blättere Artikel um ... Zeilen" -#: src/lang.c:1875 +#: src/lang.c:1878 msgid "" "# Number of lines that cursor-up/down will scroll in article pager\n" "# Possible values are (the default is marked with *):\n" @@ -6240,28 +6239,28 @@ msgstr "" "# * 1 = zeilenweise\n" "# 2 oder mehr = um 2 oder mehr Zeilen\n" -#: src/lang.c:1885 +#: src/lang.c:1888 msgid "Display signatures. toggles & sets." msgstr "Zeige Signaturen an. wechselt & setzt." -#: src/lang.c:1886 +#: src/lang.c:1889 msgid "Display signatures" msgstr "Zeige Signaturen an" -#: src/lang.c:1887 +#: src/lang.c:1890 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "# Falls OFF zeige keine Signaturen an\n" -#: src/lang.c:1891 +#: src/lang.c:1894 msgid "" "Display uuencoded data as tagged attachments. toggles & sets." msgstr "Uu-kodierte Teile als Anhang anzeigen. wechselt & setzt." -#: src/lang.c:1892 +#: src/lang.c:1895 msgid "Display uue data as an attachment" msgstr "Zeige uue-Teile als Anhang an" -#: src/lang.c:1893 +#: src/lang.c:1896 msgid "" "# Handling of uuencoded data in the pager\n" "# Possible values are (the default is marked with *):\n" @@ -6279,17 +6278,17 @@ msgstr "" "# ähnlich der von MIME-Anhängen\n" "# 2 = Einzeilige Zusammenfassung auch für unvollständige Daten\n" -#: src/lang.c:1903 +#: src/lang.c:1906 msgid "" "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "" "TeX german.sty Umlautkodierung auswerten. wechselt & setzt." -#: src/lang.c:1904 +#: src/lang.c:1907 msgid "Display \"a as Umlaut-a" msgstr "Wandle TeX-Umlaute automatisch um" -#: src/lang.c:1905 +#: src/lang.c:1908 msgid "" "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" @@ -6297,15 +6296,15 @@ msgstr "" "# Falls ON dekodiere laut german.sty (TeX) kodierte Umlaute und stelle\n" "# \"a als ä, usw. dar\n" -#: src/lang.c:1910 src/lang.c:1920 +#: src/lang.c:1913 src/lang.c:1923 msgid "Space separated list of header fields" msgstr "Durch Leerzeichen getrennte Liste der Header-Felder" -#: src/lang.c:1911 +#: src/lang.c:1914 msgid "Display these header fields (or *)" msgstr "Zeige diese Header-Felder (oder *)" -#: src/lang.c:1912 +#: src/lang.c:1915 msgid "" "# Which news headers you wish to see. If you want to see _all_ the headers,\n" "# place an '*' as this value. This is the only way a wildcard can be used.\n" @@ -6321,11 +6320,11 @@ msgstr "" "# Leerzeichen getrennte Werte angeben. Wenn Sie hier nichts definieren\n" "# wird diese Option deaktiviert.\n" -#: src/lang.c:1921 +#: src/lang.c:1924 msgid "Do not display these header fields" msgstr "Zeige folgende Header nicht an" -#: src/lang.c:1922 +#: src/lang.c:1925 msgid "" "# Same as 'news_headers_to_display' except it denotes the opposite.\n" "# An example of using both options might be if you thought X- headers were\n" @@ -6344,44 +6343,44 @@ msgstr "" "# news_headers_to_not_display=X-Alan X-Pape\n" "# Wenn Sie hier nichts angeben, wird diese Option deaktiviert.\n" -#: src/lang.c:1932 +#: src/lang.c:1935 msgid "" "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "" "Automatische Bearbeitung von Art. mit multipart/alternative-Teilen " "aktivieren?" -#: src/lang.c:1933 +#: src/lang.c:1936 msgid "Skip multipart/alternative parts" msgstr "Ãœbersp. multipart/alternative-Teile" -#: src/lang.c:1934 +#: src/lang.c:1937 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "" "# Falls ON entsorge multipart/alternative Teile des Artikels automatisch\n" -#: src/lang.c:1938 +#: src/lang.c:1941 msgid "Enable detection of verbatim blocks? toggles & sets." msgstr "" "Wortgetreue Textblöcke erkennen einschalten? wechselt & setzt." -#: src/lang.c:1939 +#: src/lang.c:1942 msgid "Detection of verbatim blocks" msgstr "Wortgetreue Textblöcke erkennen" -#: src/lang.c:1940 +#: src/lang.c:1943 msgid "# If ON detect verbatim blocks in articles\n" msgstr "# Falls ON werden wortgetreue Textblöcke in Artikeln erkannt\n" -#: src/lang.c:1945 +#: src/lang.c:1948 msgid "A regex used to decide which lines to show in col_quote." msgstr "Regulärer Ausdruck für Zeilen, die mit col_quote dargestellt werden." -#: src/lang.c:1946 +#: src/lang.c:1949 msgid "Regex used to show quoted lines" msgstr "Regulärer Ausd. für zit. Zeilen" -#: src/lang.c:1947 +#: src/lang.c:1950 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" @@ -6392,15 +6391,15 @@ msgstr "" "# Farbe angezeigt, die in col_quote definiert sind.\n" "# Wenn Sie hier nichts angeben, werden die Voreinstellungen benutzt.\n" -#: src/lang.c:1953 +#: src/lang.c:1956 msgid "A regex used to decide which lines to show in col_quote2." msgstr "Regulärer Ausdruck für Zeilen, die mit col_quote2 dargestellt werden." -#: src/lang.c:1954 +#: src/lang.c:1957 msgid "Regex used to show twice quoted l." msgstr "Reg. Ausd. für zweifach zitierte Z." -#: src/lang.c:1955 +#: src/lang.c:1958 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" @@ -6411,15 +6410,15 @@ msgstr "" "# Farbe dargestellt, die in col_quote2 definiert ist.\n" "# Wenn Sie hier nichts eingeben, werden die Voreinstellungen benutzt.\n" -#: src/lang.c:1961 +#: src/lang.c:1964 msgid "A regex used to decide which lines to show in col_quote3." msgstr "Regulärer Ausdruck für Zeilen, die mit col_quote3 dargestellt werden." -#: src/lang.c:1962 +#: src/lang.c:1965 msgid "Regex used to show >= 3 times q.l." msgstr "Reg. Ausd. für >=3-fach zitierte Z." -#: src/lang.c:1963 +#: src/lang.c:1966 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" @@ -6430,28 +6429,28 @@ msgstr "" "# dargestellt, die in col_quote3 definiert sind.\n" "# Wenn Sie hier nichts eingeben, werden die Voreinstellungen benutzt.\n" -#: src/lang.c:1969 +#: src/lang.c:1972 msgid "Enable detection of external quotes? toggles & sets." msgstr "Fremdzitate erkennen einschalten? wechselt & setzt." -#: src/lang.c:1970 +#: src/lang.c:1973 msgid "Detection of external quotes" msgstr "Fremdzitate erkennen" -#: src/lang.c:1971 +#: src/lang.c:1974 msgid "# If ON detect quoted text from external sources in articles\n" msgstr "# Falls ON werden Fremdzitate in Artikeln erkannt\n" -#: src/lang.c:1975 +#: src/lang.c:1978 msgid "A regex used to decide which lines to show in col_extquote." msgstr "" "Regulärer Ausdruck für Zeilen, die mit col_extquote dargestellt werden." -#: src/lang.c:1976 +#: src/lang.c:1979 msgid "Regex used to show quotes from external sources" msgstr "Regulärer Ausd. für Zeilen mit Fremdzitaten" -#: src/lang.c:1977 +#: src/lang.c:1980 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# external quotes. Text from external quotes is shown in col_extquote.\n" @@ -6462,16 +6461,16 @@ msgstr "" "# Farbe dargestellt, die in col_extquote definiert ist.\n" "# Wenn Sie hier nichts eingeben, werden die Voreinstellungen benutzt.\n" -#: src/lang.c:1984 +#: src/lang.c:1987 msgid "A regex used to decide which words to show in col_markslashes." msgstr "" "Regulärer Ausdruck für Zeilen, die mit col_markslashes dargestellt werden." -#: src/lang.c:1985 +#: src/lang.c:1988 msgid "Regex used to highlight /slashes/" msgstr "Reg. für /Schrägst./ Hervorhebungen" -#: src/lang.c:1986 +#: src/lang.c:1989 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '/' are to be shown in col_markslashes.\n" @@ -6481,16 +6480,16 @@ msgstr "" "# zwischen '/' in col_markslashes angezeigt werden.\n" "# Wenn Sie hier nichts eingeben, werden die Voreinstellungen benutzt.\n" -#: src/lang.c:1992 +#: src/lang.c:1995 msgid "A regex used to decide which words to show in col_markstars." msgstr "" "Regulärer Ausdruck für Zeilen, die mit col_markstars dargestellt werden." -#: src/lang.c:1993 +#: src/lang.c:1996 msgid "Regex used to highlight *stars*" msgstr "Regu. A. für *Stern* Hervorhebungen" -#: src/lang.c:1994 +#: src/lang.c:1997 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '*' are to be shown in col_markstars.\n" @@ -6500,16 +6499,16 @@ msgstr "" "# zwischen '*' in col_markstars angezeigt werden.\n" "# Wenn Sie hier nichts eingeben, werden die Voreinstellungen benutzt.\n" -#: src/lang.c:2000 +#: src/lang.c:2003 msgid "A regex used to decide which words to show in col_markstroke." msgstr "" "Regulärer Ausdruck für Zeilen, die mit col_markstroke dargestellt werden." -#: src/lang.c:2001 +#: src/lang.c:2004 msgid "Regex used to highlight -strokes-" msgstr "Reg. für -Durchstr.- Hervorhebungen" -#: src/lang.c:2002 +#: src/lang.c:2005 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '-' are to be shown in col_markstroke.\n" @@ -6519,16 +6518,16 @@ msgstr "" "# zwischen '-' in col_markstroke angezeigt werden.\n" "# Wenn Sie hier nichts eingeben, werden die Voreinstellungen benutzt.\n" -#: src/lang.c:2008 +#: src/lang.c:2011 msgid "A regex used to decide which words to show in col_markdash." msgstr "" "Regulärer Ausdruck für Zeilen, die mit col_markdash dargestellt werden." -#: src/lang.c:2009 +#: src/lang.c:2012 msgid "Regex used to highlight _underline_" msgstr "Reg. für _Unterstr._ Hervorhebungen" -#: src/lang.c:2010 +#: src/lang.c:2013 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '_' are to be shown in col_markdash.\n" @@ -6538,16 +6537,16 @@ msgstr "" "# zwischen '_' in col_markdash angezeigt werden.\n" "# Wenn Sie hier nichts eingeben, werden die Voreinstellungen benutzt.\n" -#: src/lang.c:2016 +#: src/lang.c:2019 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "" "Reg. Ausd., um Teile im Subjectanfang zu entfernen. '|' trennt die Ausd.." -#: src/lang.c:2017 +#: src/lang.c:2020 msgid "Regex with Subject prefixes" msgstr "Reg. Ausd. für den Subjectanfang" -#: src/lang.c:2018 +#: src/lang.c:2021 msgid "" "# A regular expression that tin will use to find Subject prefixes\n" "# which will be removed before showing the header.\n" @@ -6555,16 +6554,16 @@ msgstr "" "# Ein regulärer Ausdruck, mit dem tin Worte im Anfang des Subjects findet,\n" "# die dann entfernt werden.\n" -#: src/lang.c:2023 +#: src/lang.c:2026 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "" "Reg. Ausd., um Teile am Subjectanfang zu entfernen. '|' trennt die Ausd.." -#: src/lang.c:2024 +#: src/lang.c:2027 msgid "Regex with Subject suffixes" msgstr "Reg. Ausd. für das Subjectende" -#: src/lang.c:2025 +#: src/lang.c:2028 msgid "" "# A regular expression that tin will use to find Subject suffixes\n" "# which will be removed when replying or posting followup.\n" @@ -6572,16 +6571,16 @@ msgstr "" "# Ein regulärer Ausdruck, der beim Antworten zum Abschneiden von\n" "# unerwünschten Teilen am Ende des Subjects verwendet wird.\n" -#: src/lang.c:2030 +#: src/lang.c:2033 msgid "A regex used to find the begin of a verbatim block." msgstr "" "Reg. Ausd., um den Beginn eines wortgetreu wiederzugebenden Absatz zu finden." -#: src/lang.c:2031 +#: src/lang.c:2034 msgid "Regex for begin of a verbatim block" msgstr "Reg. Ausd. für den Anfang eines wortgetreu wiederzugebenden Absatzes" -#: src/lang.c:2032 +#: src/lang.c:2035 msgid "" "# A regular expression that tin will use to find the begin of\n" "# a verbatim block.\n" @@ -6589,16 +6588,16 @@ msgstr "" "# Ein regulärer Ausdruck, der den Beginn eines wortgetreu wiederzugebenden\n" "# Absatzes findet.\n" -#: src/lang.c:2037 +#: src/lang.c:2040 msgid "A regex used to find the end of a verbatim block." msgstr "" "Reg. Ausd., um das Ende eines wortgetreu wiederzugebenden Absatz zu finden." -#: src/lang.c:2038 +#: src/lang.c:2041 msgid "Regex for end of a verbatim block" msgstr "Reg. Ausd. für das Ende eines wortgetreu wiederzugebenden Absatzes" -#: src/lang.c:2039 +#: src/lang.c:2042 msgid "" "# A regular expression that tin will use to find the end of\n" "# a verbatim block.\n" @@ -6606,22 +6605,22 @@ msgstr "" "# Ein regulärer Ausdruck, der das Ende eines wortgetreu wiederzugebenden\n" "# Absatzes findet.\n" -#: src/lang.c:2044 +#: src/lang.c:2047 msgid "" "Enter name and options for external MIME viewer, --internal for built-in " "viewer" msgstr "" "Name und Optionen für ext. MIME-Viewer, --internal für eingebaute Version" -#: src/lang.c:2045 +#: src/lang.c:2048 msgid "MIME binary content viewer" msgstr "MIME-Viewer" -#: src/lang.c:2046 +#: src/lang.c:2049 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 " +"# Otherwise specify an external viewer program (eg. metamail) or leave " "blank\n" "# for no automatic viewing\n" msgstr "" @@ -6629,15 +6628,15 @@ msgstr "" "# nicht Text teilen benutzt. Andernfalls das angegebene Programm\n" "# (z.B. metamail). Keine Angabe schaltet die automatische Anzeige aus.\n" -#: src/lang.c:2053 +#: src/lang.c:2056 msgid "Confirm before starting non-text viewing program" msgstr "Start des MIME-Viewers bestätigen" -#: src/lang.c:2054 +#: src/lang.c:2057 msgid "Ask before using MIME viewer" msgstr "Start des MIME-Viewers bestätigen" -#: src/lang.c:2055 +#: src/lang.c:2058 msgid "" "# If ON tin will ask before using metamail to display MIME messages\n" "# this only happens if metamail_prog is set to something\n" @@ -6645,40 +6644,40 @@ msgstr "" "# Falls ON fragt tin nach, bevor metamail zum Anzeigen von MIME-Artikeln\n" "# benutzt wird. Das passiert nur, wenn auch metamail_prog gesetzt ist.\n" -#: src/lang.c:2060 +#: src/lang.c:2063 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "" "Beim Beenden anbieten, alle betretenen Gruppen als gelesen zu markieren?" -#: src/lang.c:2061 +#: src/lang.c:2064 msgid "Catchup read groups when quitting" msgstr "Catchup der Gruppen beim Beenden" -#: src/lang.c:2062 +#: src/lang.c:2065 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "" "# Falls ON: Beim Beenden von tin anbieten, alle betretenen Gruppen\n" "# als gelesen zu markieren\n" -#: src/lang.c:2067 +#: src/lang.c:2070 msgid "Catchup group using left key" msgstr "Catchup der Gruppe mit l. Cursor" -#: src/lang.c:2068 +#: src/lang.c:2071 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "" "# Falls ON: Catchup (als gelesen markieren) der Gruppe/des Threads\n" "# beim Verlassen mit der linken Cursortaste\n" -#: src/lang.c:2073 +#: src/lang.c:2076 msgid "Catchup thread by using left key" msgstr "Catchup mit der linken Cursort." -#: src/lang.c:2079 +#: src/lang.c:2082 msgid "Which actions require confirmation" msgstr "Bestätigung erforderlich für" -#: src/lang.c:2080 +#: src/lang.c:2083 msgid "# What should we ask confirmation for.\n" msgstr "" "# Welche Operationen müssen explizit bestätigt werden.\n" @@ -6687,55 +6686,55 @@ msgstr "" "# gelesen (siehe 'X' Befehl im Manual).\n" # TRANSLATION TOO LONG -#: src/lang.c:2085 +#: src/lang.c:2088 msgid "'Mark as (un)read' ignores tags" msgstr "'Art. (un)gelesen markieren' ignoriert Markierte" -#: src/lang.c:2086 +#: src/lang.c:2089 msgid "" "# If ON the 'Mark as (un)read' function marks only the current article.\n" msgstr "" "# Falls ON wird mit der Funktion 'Art. (un)gelesen markieren' nur\n" "# der jeweilige Artikel markiert.\n" -#: src/lang.c:2090 +#: src/lang.c:2093 msgid "Program to run to open URLs, sets, cancels." msgstr "Öffne URLs mit ... setzt, bricht ab." -#: src/lang.c:2091 +#: src/lang.c:2094 msgid "Program that opens URLs" msgstr "Öffne URLs mit ..." -#: src/lang.c:2092 +#: src/lang.c:2095 msgid "# The program used to open URLs. The actual URL will be appended\n" msgstr "" "# Programm zum Öffnen von URLs, die jeweilige URL wird hinten angehängt.\n" -#: src/lang.c:2097 +#: src/lang.c:2100 msgid "Use mouse in xterm" msgstr "Maus in xterm nutzen" -#: src/lang.c:2098 +#: src/lang.c:2101 msgid "# If ON enable mouse button support on xterm terminals\n" msgstr "# Falls ON wird die Maustastenunterstützung für xterm aktiviert\n" -#: src/lang.c:2104 +#: src/lang.c:2107 msgid "Use scroll keys on keypad" msgstr "Scrollt. vom Nummernblock nutzen" -#: src/lang.c:2105 +#: src/lang.c:2108 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "# Falls ON werden die Scrolltasten genutzt (Terminal abhängig)\n" -#: src/lang.c:2110 +#: src/lang.c:2113 msgid "Enter maximum number of article to get. sets." msgstr "Maximale Anzahl der zu holenden Artikel eingeben. setzt." -#: src/lang.c:2111 +#: src/lang.c:2114 msgid "Number of articles to get" msgstr "Anzahl der zu holenden Artikel" -#: src/lang.c:2112 +#: src/lang.c:2115 msgid "" "# Number of articles to get (0=no limit), if negative sets maximum number\n" "# of already read articles to be read before first unread one\n" @@ -6744,30 +6743,30 @@ msgstr "" "# angegeben wird, holt tin alle ungelesenen plus die letzten n gelesenen\n" "# Artikel\n" -#: src/lang.c:2117 +#: src/lang.c:2120 msgid "Enter number of days article is considered recent. sets." msgstr "Anzahl der Tage, die ein Artikel als neu eingestuft wird. setzt." -#: src/lang.c:2118 +#: src/lang.c:2121 msgid "Article recentness time limit" msgstr "Artikel Neuheitszeit-Limit" -#: src/lang.c:2119 +#: src/lang.c:2122 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "# Anzahl der Tage, die ein Artikel als neu eingestuft wird, (0=Aus)\n" -#: src/lang.c:2123 +#: src/lang.c:2126 msgid "" "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "" "WILDMAT für normale Wildcards, REGEX für die Nutzung von regulären " "Ausdrücken." -#: src/lang.c:2124 +#: src/lang.c:2127 msgid "Wildcard matching" msgstr "Wildcardprüfung" -#: src/lang.c:2125 +#: src/lang.c:2128 msgid "" "# Wildcard matching\n" "# Possible values are (the default is marked with *):\n" @@ -6779,66 +6778,66 @@ msgstr "" "# * 0 = wildmat\n" "# 1 = Regulärer Ausdruck\n" -#: src/lang.c:2132 +#: src/lang.c:2135 msgid "Enter minimal score before an article is marked killed. sets." msgstr "" "Artikel mit weniger Bewertung (Score) werden als `gekillt' markiert. " "setzt." -#: src/lang.c:2133 +#: src/lang.c:2136 msgid "Score limit (kill)" msgstr "Bewertungsgrenze (kill)" -#: src/lang.c:2134 +#: src/lang.c:2137 msgid "# Score limit before an article is marked killed\n" msgstr "" "# Jeder Artikel mit einer niedrigeren Bewertung (Score) wird als\n" "# gekillt markiert\n" -#: src/lang.c:2138 +#: src/lang.c:2141 msgid "Enter default score to kill articles. sets." msgstr "Bewertung für gekillte Artikel. setzt." -#: src/lang.c:2139 +#: src/lang.c:2142 msgid "Default score to kill articles" msgstr "Bewertung für gekillte Artikel" -#: src/lang.c:2140 +#: src/lang.c:2143 msgid "# Default score to kill articles\n" msgstr "# Bewertung für gekillte Artikel\n" -#: src/lang.c:2144 +#: src/lang.c:2147 msgid "Enter minimal score before an article is marked hot. sets." msgstr "" "Artikel mit einer höheren Bewertung (Score) werd. als wichtig/hot markiert." -#: src/lang.c:2145 +#: src/lang.c:2148 msgid "Score limit (select)" msgstr "Bewertungsgrenze (select)" -#: src/lang.c:2146 +#: src/lang.c:2149 msgid "# Score limit before an article is marked hot\n" msgstr "" "# Artikel mit einer höheren Bewertung (Score) werden als\n" "# wichtig (hot) markiert\n" -#: src/lang.c:2150 +#: src/lang.c:2153 msgid "Enter default score to select articles. sets." msgstr "Bewertung für wichtige Artikel (hot). setzt." -#: src/lang.c:2151 +#: src/lang.c:2154 msgid "Default score to select articles" msgstr "Bewertung für wichtige Artikel" -#: src/lang.c:2152 +#: src/lang.c:2155 msgid "# Default score to select articles\n" msgstr "# Bewertung für wichtige Artikel (hot)\n" -#: src/lang.c:2158 +#: src/lang.c:2161 msgid "Use slrnface to show ''X-Face:''s" msgstr "''X-Face:''s mit slrnface Anzeigen" -#: src/lang.c:2159 +#: src/lang.c:2162 msgid "" "# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n" "# Only useful when running in an xterm.\n" @@ -6846,19 +6845,19 @@ msgstr "" "# Falls ON benutze slrnface(1) um ''X-Face:'' anzuzeigen.\n" "# Funktioniert nur wenn tin in einem xterm läuft.\n" -#: src/lang.c:2167 +#: src/lang.c:2170 msgid "Use ANSI color" msgstr "Benutze ANSI-Farben" -#: src/lang.c:2168 +#: src/lang.c:2171 msgid "# If ON using ANSI-color\n" msgstr "# Falls ON benutze ANSI-Farben\n" -#: src/lang.c:2173 +#: src/lang.c:2176 msgid "Standard foreground color" msgstr "Standard Vordergrundfarbe" -#: src/lang.c:2174 +#: src/lang.c:2177 msgid "" "# Standard foreground color\n" "# Default: -1 (default color)\n" @@ -6866,11 +6865,11 @@ msgstr "" "# Standard Vordergrundfarbe\n" "# Voreinstellung: -1 (Standard Farbe)\n" -#: src/lang.c:2180 +#: src/lang.c:2183 msgid "Standard background color" msgstr "Standard Hintergrundfarbe" -#: src/lang.c:2181 +#: src/lang.c:2184 msgid "" "# Standard background color\n" "# Default: -1 (default color)\n" @@ -6878,11 +6877,11 @@ msgstr "" "# Standard Hintergrundfarbe\n" "# Voreinstellung: -1 (Standard Farbe)\n" -#: src/lang.c:2187 +#: src/lang.c:2190 msgid "Color for inverse text (background)" msgstr "Farbe des inversen Text (Hinterg.)" -#: src/lang.c:2188 +#: src/lang.c:2191 msgid "" "# Color of background for inverse text\n" "# Default: 4 (blue)\n" @@ -6890,11 +6889,11 @@ msgstr "" "# Farbe des Hintergrunds für inversen Text\n" "# Voreinstellung: 4 (blau)\n" -#: src/lang.c:2194 +#: src/lang.c:2197 msgid "Color for inverse text (foreground)" msgstr "Farbe des inversen Text (Vordergr.)" -#: src/lang.c:2195 +#: src/lang.c:2198 msgid "" "# Color of foreground for inverse text\n" "# Default: 7 (white)\n" @@ -6902,11 +6901,11 @@ msgstr "" "# Farbe des Vordergrunds für inversen Text\n" "# Voreinstellung: 7 (weiß)\n" -#: src/lang.c:2201 +#: src/lang.c:2204 msgid "Color of text lines" msgstr "Farbe der Textzeilen" -#: src/lang.c:2202 +#: src/lang.c:2205 msgid "" "# Color of text lines\n" "# Default: -1 (default color)\n" @@ -6914,11 +6913,11 @@ msgstr "" "# Farbe der Textzeilen\n" "# Voreinstellung: -1 (Standard Farbe)\n" -#: src/lang.c:2208 +#: src/lang.c:2211 msgid "Color of mini help menu" msgstr "Farbe des Minihilfemenü" -#: src/lang.c:2209 +#: src/lang.c:2212 msgid "" "# Color of mini help menu\n" "# Default: 3 (brown)\n" @@ -6926,11 +6925,11 @@ msgstr "" "# Farbe des Minihilfemenü\n" "# Voreinstellung: 3 (braun)\n" -#: src/lang.c:2215 +#: src/lang.c:2218 msgid "Color of help text" msgstr "Farbe des Hilfstext" -#: src/lang.c:2216 +#: src/lang.c:2219 msgid "" "# Color of help pages\n" "# Default: -1 (default color)\n" @@ -6938,11 +6937,11 @@ msgstr "" "# Farbe der Hilfeseiten\n" "# Voreinstellung: -1 (Standard Farbe)\n" -#: src/lang.c:2222 +#: src/lang.c:2225 msgid "Color of status messages" msgstr "Farbe der Statusmeldungen" -#: src/lang.c:2223 +#: src/lang.c:2226 msgid "" "# Color of messages in last line\n" "# Default: 6 (cyan)\n" @@ -6950,11 +6949,11 @@ msgstr "" "# Farbe der letzten Zeile im Artikel\n" "# Voreinstellung: 6 (cyan)\n" -#: src/lang.c:2229 +#: src/lang.c:2232 msgid "Color of quoted lines" msgstr "Farbe der zitierten Zeilen" -#: src/lang.c:2230 +#: src/lang.c:2233 msgid "" "# Color of quote-lines\n" "# Default: 2 (green)\n" @@ -6962,11 +6961,11 @@ msgstr "" "# Farbe der zitierten Zeilen\n" "# Voreinstellung: 2 (grün)\n" -#: src/lang.c:2236 +#: src/lang.c:2239 msgid "Color of twice quoted line" msgstr "Farbe von zweifach zitierten Zeilen" -#: src/lang.c:2237 +#: src/lang.c:2240 msgid "" "# Color of twice quoted lines\n" "# Default: 3 (brown)\n" @@ -6974,11 +6973,11 @@ msgstr "" "# Farbe von zweifach zitierten Zeilen\n" "# Voreinstellung: 3 (braun)\n" -#: src/lang.c:2243 +#: src/lang.c:2246 msgid "Color of =>3 times quoted line" msgstr "Farbe von =>3-fach zitierten Zeilen" -#: src/lang.c:2244 +#: src/lang.c:2247 msgid "" "# Color of >=3 times quoted lines\n" "# Default: 4 (blue)\n" @@ -6986,11 +6985,11 @@ msgstr "" "# Farbe von =>3-fach zitierten Zeilen\n" "# Voreinstellung: 4 (blau)\n" -#: src/lang.c:2250 +#: src/lang.c:2253 msgid "Color of article header lines" msgstr "Farbe der Artikelheaderzeilen" -#: src/lang.c:2251 +#: src/lang.c:2254 msgid "" "# Color of header-lines\n" "# Default: 2 (green)\n" @@ -6998,11 +6997,11 @@ msgstr "" "# Farbe der Artikelheaderzeilen\n" "# Voreinstellung: 2 (grün)\n" -#: src/lang.c:2257 +#: src/lang.c:2260 msgid "Color of actual news header fields" msgstr "Farbe des angezeigten Headers" -#: src/lang.c:2258 +#: src/lang.c:2261 msgid "" "# Color of actual news header fields\n" "# Default: 9 (light red)\n" @@ -7010,11 +7009,11 @@ msgstr "" "# Farbe des angezeigten Headers\n" "# Voreinstellung: 9 (hellrot)\n" -#: src/lang.c:2264 +#: src/lang.c:2267 msgid "Color of article subject lines" msgstr "Farbe der Subjectzeile" -#: src/lang.c:2265 +#: src/lang.c:2268 msgid "" "# Color of article subject\n" "# Default: 6 (cyan)\n" @@ -7022,11 +7021,11 @@ msgstr "" "# Farbe der Subjectzeile\n" "# Voreinstellung: 6 (cyan)\n" -#: src/lang.c:2271 +#: src/lang.c:2274 msgid "Color of external quotes" msgstr "Farbe der Fremdzitate" -#: src/lang.c:2272 +#: src/lang.c:2275 msgid "" "# Color of quoted text from external sources\n" "# Default: 5 (pink)\n" @@ -7034,11 +7033,11 @@ msgstr "" "# Farbe des Fremdzitat-Textes\n" "# Voreinstellung: 5 (rosa)\n" -#: src/lang.c:2278 +#: src/lang.c:2281 msgid "Color of response counter" msgstr "Farbe des Antwortzählers" -#: src/lang.c:2279 +#: src/lang.c:2282 msgid "" "# Color of response counter\n" "# Default: 2 (green)\n" @@ -7046,11 +7045,11 @@ msgstr "" "# Farbe des Antwortzählers\n" "# Voreinstellung: 2 (grün)\n" -#: src/lang.c:2285 +#: src/lang.c:2288 msgid "Color of sender (From:)" msgstr "Farbe des Autors (From:)" -#: src/lang.c:2286 +#: src/lang.c:2289 msgid "" "# Color of sender (From:)\n" "# Default: 2 (green)\n" @@ -7058,11 +7057,11 @@ msgstr "" "# Farbe des Autors (From:)\n" "# Voreinstellung: 2 (grün)\n" -#: src/lang.c:2292 +#: src/lang.c:2295 msgid "Color of help/mail sign" msgstr "Farbe des Hilfe/Mail-Zeichens" -#: src/lang.c:2293 +#: src/lang.c:2296 msgid "" "# Color of Help/Mail-Sign\n" "# Default: 4 (blue)\n" @@ -7070,11 +7069,11 @@ msgstr "" "# Farbe des Hilfe/Mail-Zeichens\n" "# Voreinstellung: 4 (blau)\n" -#: src/lang.c:2299 +#: src/lang.c:2302 msgid "Color of signatures" msgstr "Farbe von Signaturen" -#: src/lang.c:2300 +#: src/lang.c:2303 msgid "" "# Color of signature\n" "# Default: 4 (blue)\n" @@ -7082,11 +7081,11 @@ msgstr "" "# Farbe von Signaturen\n" "# Voreinstellung: 4 (blau)\n" -#: src/lang.c:2306 +#: src/lang.c:2309 msgid "Color of highlighted URLs" msgstr "Farbe der hervorgehobenen URLs" -#: src/lang.c:2307 +#: src/lang.c:2310 msgid "" "# Color of highlighted URLs\n" "# Default: -1 (default color)\n" @@ -7094,11 +7093,11 @@ msgstr "" "# Farbe der hervorgehobenen URLs\n" "# Voreinstellung: -1 (Standard Farbe)\n" -#: src/lang.c:2313 +#: src/lang.c:2316 msgid "Color of verbatim blocks" msgstr "Farbe des wortgetreu darzustellenden Textes" -#: src/lang.c:2314 +#: src/lang.c:2317 msgid "" "# Color of verbatim blocks\n" "# Default: 5 (pink)\n" @@ -7106,11 +7105,11 @@ msgstr "" "# Farbe des wortgetreu darzustellenden Textes\n" "# Voreinstellung: 5 (rosa)\n" -#: src/lang.c:2320 +#: src/lang.c:2323 msgid "Color of highlighting with *stars*" msgstr "Farbe der Hervorhebung *Sterne*" -#: src/lang.c:2321 +#: src/lang.c:2324 msgid "" "# Color of word highlighting with *stars*\n" "# Default: 11 (yellow)\n" @@ -7118,11 +7117,11 @@ msgstr "" "# Farbe der Hervorhebung durch *Sterne*\n" "# Voreinstellung: 11 (gelb)\n" -#: src/lang.c:2327 +#: src/lang.c:2330 msgid "Color of highlighting with _dash_" msgstr "Farbe der Hervorhebung _Striche_" -#: src/lang.c:2328 +#: src/lang.c:2331 msgid "" "# Color of word highlighting with _dash_\n" "# Default: 13 (light pink)\n" @@ -7130,11 +7129,11 @@ msgstr "" "# Farbe der Hervorhebung durch _Striche_\n" "# Voreinstellung: 13 (hellrosa)\n" -#: src/lang.c:2334 +#: src/lang.c:2337 msgid "Color of highlighting with /slash/" msgstr "Farbe der Hervorhebung /Schrägstr./" -#: src/lang.c:2335 +#: src/lang.c:2338 msgid "" "# Color of word highlighting with /slash/\n" "# Default: 14 (light cyan)\n" @@ -7142,11 +7141,11 @@ msgstr "" "# Farbe der Hervorhebung durch /Schrägstriche/\n" "# Voreinstellung: 14 (hellcyan)\n" -#: src/lang.c:2341 +#: src/lang.c:2344 msgid "Color of highlighting with -stroke-" msgstr "Farbe der Hervorhebung -Durchstr.-" -#: src/lang.c:2342 +#: src/lang.c:2345 msgid "" "# Color of word highlighting with -stroke-\n" "# Default: 12 (light blue)\n" @@ -7154,11 +7153,11 @@ msgstr "" "# Farbe der Hervorhebung durch -Durchstreichen-\n" "# Voreinstellung: 12 (hellblau)\n" -#: src/lang.c:2349 +#: src/lang.c:2352 msgid "Attr. of highlighting with *stars*" msgstr "Hervorhebungsattribute *Sterne*" -#: src/lang.c:2350 +#: src/lang.c:2353 msgid "" "# Attributes of word highlighting on mono terminals\n" "# Possible values are:\n" @@ -7186,11 +7185,11 @@ msgstr "" "# Hervorhebungsattribut für *Sterne*\n" "# Voreinstellung: 6 (fett)\n" -#: src/lang.c:2365 +#: src/lang.c:2368 msgid "Attr. of highlighting with _dash_" msgstr "Hervorhebungsattr. _Unterstriche_" -#: src/lang.c:2366 +#: src/lang.c:2369 msgid "" "# Attribute of word highlighting with _dash_\n" "# Default: 2 (best highlighting)\n" @@ -7198,11 +7197,11 @@ msgstr "" "# Hervorhebungsattribut für _Unterstriche_\n" "# Voreinstellung: 2 (beste Hervorhebung)\n" -#: src/lang.c:2372 +#: src/lang.c:2375 msgid "Attr. of highlighting with /slash/" msgstr "Hervorhebungsattr. /Schrägstriche/" -#: src/lang.c:2373 +#: src/lang.c:2376 msgid "" "# Attribute of word highlighting with /slash/\n" "# Default: 5 (half bright)\n" @@ -7210,11 +7209,11 @@ msgstr "" "# Hervorhebungsattribut für /Schrägstriche/\n" "# Voreinstellung: 5 (halbe Helligkeit)\n" -#: src/lang.c:2379 +#: src/lang.c:2382 msgid "Attr. of highlighting with -stroke-" msgstr "Hervorhebungsattr. -Durchstreich.-" -#: src/lang.c:2380 +#: src/lang.c:2383 msgid "" "# Attribute of word highlighting with -stroke-\n" "# Default: 3 (reverse video)\n" @@ -7222,27 +7221,27 @@ msgstr "" "# Hervorhebungsattribut für -Durchstreichen-\n" "# Voreinstellung: 3 (Invers)\n" -#: src/lang.c:2386 +#: src/lang.c:2389 msgid "URL highlighting in message body" msgstr "URL-Hervorhebung im Artikel" -#: src/lang.c:2387 +#: src/lang.c:2390 msgid "# Enable URL highlighting?\n" msgstr "# URL-Hervorhebung aktivieren?\n" -#: src/lang.c:2392 +#: src/lang.c:2395 msgid "Word highlighting in message body" msgstr "Wort-Hervorhebung im Artikel" -#: src/lang.c:2393 +#: src/lang.c:2396 msgid "# Enable word highlighting?\n" msgstr "# Wort-Hervorhebung aktivieren?\n" -#: src/lang.c:2398 +#: src/lang.c:2401 msgid "What to display instead of mark" msgstr "Anstelle der Markierung anzeigen" -#: src/lang.c:2399 +#: src/lang.c:2402 msgid "" "# Should the leading and ending stars and dashes also be displayed,\n" "# even when they are highlighting marks?\n" @@ -7258,23 +7257,23 @@ msgstr "" "# 1 = ja, anzeigen\n" "# * 2 = Leerzeichen anstelle darstellen\n" -#: src/lang.c:2408 +#: src/lang.c:2411 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "Nach wie vielen Zeichen soll im Pager umgebrochen werden? setzt." -#: src/lang.c:2409 +#: src/lang.c:2412 msgid "Page line wrap column" msgstr "Zeilen umbrechen nach" -#: src/lang.c:2410 +#: src/lang.c:2413 msgid "# Wrap article lines at column\n" msgstr "# In der Artikelanzeige Zeilen umbrechen bei Spalte\n" -#: src/lang.c:2415 +#: src/lang.c:2418 msgid "Wrap around threads on next unread" msgstr "Nä.ungel.-kein Abbr. am Listenende?" -#: src/lang.c:2416 +#: src/lang.c:2419 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "" "# Diverse Funktionen in tin wechseln zum \"nächsten\" ungelesenen\n" @@ -7282,38 +7281,38 @@ msgstr "" "# Artikel/Threadliste abbricht (OFF) oder zum Beginn derselben springt und\n" "# von dort aus den nächsten ungelesenen Artikel sucht. (ON)\n" -#: src/lang.c:2420 +#: src/lang.c:2423 msgid "Enter default mail address (and fullname). sets." msgstr "Standard Mail-Adresse (und Name) eingeben. setzt." -#: src/lang.c:2421 src/lang.c:2931 +#: src/lang.c:2424 src/lang.c:2939 msgid "Mail address (and fullname)" msgstr "Mailadresse (und Name)" -#: src/lang.c:2422 +#: src/lang.c:2425 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "" "# EMail-Adresse und vollständiger Name des Benutzers, wenn sie nicht\n" "# benutzername@host (Vollständiger Name) lautet\n" -#: src/lang.c:2427 +#: src/lang.c:2430 msgid "Show empty Followup-To in editor" msgstr "Leeres Fup-To im Editor anzeigen" -#: src/lang.c:2428 +#: src/lang.c:2431 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "# Falls ON zeige leeren Followup-To:-Header im Editor\n" -#: src/lang.c:2432 +#: src/lang.c:2435 msgid "" "Enter path/! command/--none to create your default signature. sets." msgstr "Setze Pfad/! Kommando/--none um Ihre Signatur festzulegen. setzt." -#: src/lang.c:2433 +#: src/lang.c:2436 msgid "Create signature from path/command" msgstr "Erzeuge Signatur aus Pfad/Kommando" -#: src/lang.c:2434 +#: src/lang.c:2437 #, c-format msgid "" "# Signature path (random sigs)/file to be used when posting/replying\n" @@ -7328,43 +7327,43 @@ msgstr "" "# (%G um den Namen der aktuellen Newsgroup zu übergeben)\n" "# sigfile=--none hängt keine Signatur an\n" -#: src/lang.c:2442 +#: src/lang.c:2445 msgid "" "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "" "Trenne Sig mit \"-- \" in eigener Zeile ab. wechselt & setzt." -#: src/lang.c:2443 +#: src/lang.c:2446 msgid "Prepend signature with \"-- \"" msgstr "Trenne Sig mit \"-- \" ab" -#: src/lang.c:2444 +#: src/lang.c:2447 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "# Falls ON trenne Signatur mit '\\n-- \\n' ab\n" -#: src/lang.c:2448 +#: src/lang.c:2451 msgid "Add signature when reposting articles. toggles & sets." msgstr "" "Sig. beim Reposten eines Artikels hinzufügen? wechselt & setzt." -#: src/lang.c:2449 +#: src/lang.c:2452 msgid "Add signature when reposting" msgstr "Signatur beim Reposten anhängen" -#: src/lang.c:2450 +#: src/lang.c:2453 msgid "# If ON add signature to reposted articles\n" msgstr "# Falls ON wird die Signatur auch an repostete Artikel angehängt.\n" -#: src/lang.c:2454 +#: src/lang.c:2457 #, c-format msgid "Enter quotation marks, %s or %S for author's initials." msgstr "Zitatzeichen eingeben, %s oder %S für die Initialen des Verfassers." -#: src/lang.c:2455 +#: src/lang.c:2458 msgid "Characters used as quote-marks" msgstr "Zitatzeichen" -#: src/lang.c:2456 +#: src/lang.c:2459 #, c-format msgid "" "# Characters used in quoting to followups and replies.\n" @@ -7373,11 +7372,11 @@ msgstr "" "# Zeichen für Zitate in Antworten.\n" "# '_' wird durch ' ' ersetzt. %s, %S wird ersetzt durch Autoreninitialen.\n" -#: src/lang.c:2462 +#: src/lang.c:2465 msgid "Quoting behavior" msgstr "Zitierverhalten" -#: src/lang.c:2463 +#: src/lang.c:2466 msgid "" "# How quoting should be handled when following up or replying.\n" "# Possible values are (the default is marked with *):\n" @@ -7402,17 +7401,17 @@ msgstr "" "# 7 = Zitatzeichen zusammenziehen & Signaturen zitieren & Leerzeilen " "zitieren\n" -#: src/lang.c:2476 src/lang.c:2484 src/lang.c:2490 +#: src/lang.c:2479 src/lang.c:2487 src/lang.c:2493 msgid "" "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "" "%A Adr %D Datum %F Adr+Name %G Gruppenname %M Message-ID %N Name %C Vorname" -#: src/lang.c:2477 +#: src/lang.c:2480 msgid "Quote line when following up" msgstr "Einleitungszeile beim Antworten" -#: src/lang.c:2478 +#: src/lang.c:2481 msgid "" "# Format of quote line when mailing/posting/following-up an article\n" "# %A Address %D Date %F Addr+Name %G Groupname %M Message-ID\n" @@ -7422,36 +7421,36 @@ msgstr "" "# %A Adresse %D Datum %F Adr+Name %G Gruppenname %M Message-ID\n" "# %N Voller Name %C Vorname %I Initialen\n" -#: src/lang.c:2485 +#: src/lang.c:2488 msgid "Quote line when cross-posting" msgstr "Einleitungszeile beim Crossposten" -#: src/lang.c:2491 +#: src/lang.c:2494 msgid "Quote line when mailing" msgstr "Einleitungszeile bei Mailantwort" -#: src/lang.c:2496 +#: src/lang.c:2499 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "Falls ON, füge User-Agent:-Header ein. wechselt & setzt." -#: src/lang.c:2497 +#: src/lang.c:2500 msgid "Insert 'User-Agent:' header" msgstr "Füge 'User-Agent:'-Header ein" -#: src/lang.c:2498 +#: src/lang.c:2501 msgid "# If ON include advertising User-Agent: header\n" msgstr "# Falls ON füge User-Agent:-Header ein\n" -#: src/lang.c:2503 +#: src/lang.c:2506 msgid "" "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "Zeichensatz für MIME (z.B. US-ASCII, ISO-8859-1, EUC-KR), setzt." -#: src/lang.c:2504 +#: src/lang.c:2507 msgid "MM_CHARSET" msgstr "MM_CHARSET" -#: src/lang.c:2505 +#: src/lang.c:2508 msgid "" "# Charset supported locally which is also used for MIME header and\n" "# Content-Type header.\n" @@ -7470,40 +7469,40 @@ msgstr "" "# definiert, werden andere Zeichensätze als mm_charset nicht dargestellt\n" "# und die jeweiligen Zeichen durch ein '?' ersetzt.\n" -#: src/lang.c:2515 +#: src/lang.c:2518 msgid "MM_NETWORK_CHARSET" msgstr "MM_NETWORK_CHARSET" -#: src/lang.c:2516 +#: src/lang.c:2519 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:2520 +#: src/lang.c:2523 msgid "" "Enter local charset name (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "Lokaler Zeichensatz (z.B. US-ASCII, ISO-8859-1, EUC-KR), setzt." -#: src/lang.c:2521 +#: src/lang.c:2524 msgid "MM_LOCAL_CHARSET" msgstr "MM_LOCAL_CHARSET" -#: src/lang.c:2522 +#: src/lang.c:2525 msgid "# Charset supported locally.\n" msgstr "# Lokaler Zeichensatz.\n" -#: src/lang.c:2529 +#: src/lang.c:2532 msgid "Mailbox format" msgstr "Mailbox-Format" -#: src/lang.c:2530 +#: src/lang.c:2533 msgid "# Format of the mailbox.\n" msgstr "# Format der Mailbox.\n" -#: src/lang.c:2535 +#: src/lang.c:2538 msgid "MIME encoding in news messages" msgstr "MIME-Kodierung in Newsartikeln" -#: src/lang.c:2536 +#: src/lang.c:2539 msgid "" "# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n" "# for mails and posts, if necessary. QP is efficient for most European\n" @@ -7518,15 +7517,15 @@ msgstr "" "# für die meisten 8Bit Zeichensätze aus Ostasien, Griechenland und Russland\n" "# ist, da dort gehäuft 8Bit Zeichen vorkommen.\n" -#: src/lang.c:2544 src/lang.c:2565 +#: src/lang.c:2547 src/lang.c:2568 msgid "Don't change unless you know what you are doing. cancels." msgstr "Nur ändern, wenn Sie genau wissen, was Sie machen. bricht ab." -#: src/lang.c:2545 +#: src/lang.c:2548 msgid "Use 8bit characters in news headers" msgstr "Benutze 8bit-Zeichen im Newsheader" -#: src/lang.c:2546 +#: src/lang.c:2549 msgid "" "# If ON, 8bit characters in news headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -7540,29 +7539,29 @@ msgstr "" "# kodiert, wenn post_mime_encoding nicht auch auf 8bit eingestellt\n" "# ist.\n" -#: src/lang.c:2553 +#: src/lang.c:2556 msgid "" "Auto-view post-processed files toggles, sets, cancels." msgstr "" "Nachbearbeitete Artikel autom. anz. wechselt, setzt, Ende." -#: src/lang.c:2554 +#: src/lang.c:2557 msgid "View post-processed files" msgstr "Nachbearbeitete Artikel anzeigen" -#: src/lang.c:2555 +#: src/lang.c:2558 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "# Falls ON werden nachbearbeitete Artikel automatisch angezeigt.\n" -#: src/lang.c:2560 +#: src/lang.c:2563 msgid "MIME encoding in mail messages" msgstr "MIME-Kodierung für E-Mails" -#: src/lang.c:2566 +#: src/lang.c:2569 msgid "Use 8bit characters in mail headers" msgstr "Benutze 8bit Zeichen im Mail Header" -#: src/lang.c:2567 +#: src/lang.c:2570 msgid "" "# If ON, 8bit characters in mail headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -7581,26 +7580,26 @@ msgstr "" "# E-Mailheadern verbieten, daher sollte diese Einstellung NICHT auf ON\n" "# geändert werden, wenn es keine zwingende Gründe dafür gibt.\n" -#: src/lang.c:2578 +#: src/lang.c:2581 msgid "Strip blanks from ends of lines" msgstr "Leerzeichen am Zeilenende entfernen" -#: src/lang.c:2579 +#: src/lang.c:2582 msgid "" "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" msgstr "" "# Falls ON lösche Leerzeichen am Zeilenende; verbessert die Geschwindigkeit\n" -#: src/lang.c:2585 +#: src/lang.c:2588 msgid "If ON, use transliteration. toggles & sets." msgstr "Falls ON verwende Umschreibungen. wechselt & setzt." -#: src/lang.c:2586 +#: src/lang.c:2589 msgid "Transliteration" msgstr "Verwende Umschreibungen" -#: src/lang.c:2587 +#: src/lang.c:2590 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" @@ -7612,11 +7611,11 @@ msgstr "" "# Terminal als EUR umschrieben, ohne //TRANSLIT würde tin ein\n" "# Fragezeichen verwenden.\n" -#: src/lang.c:2595 +#: src/lang.c:2598 msgid "Send you a Cc/Bcc automatically" msgstr "Sendet Ihnen automatisch ein Cc/Bbc" -#: src/lang.c:2596 +#: src/lang.c:2599 msgid "" "# Put your name in the Cc: and/or Bcc: field when mailing an article.\n" "# Possible values are (the default is marked with *):\n" @@ -7633,11 +7632,11 @@ msgstr "" "# 2 = Bcc\n" "# 3 = Cc und Bcc\n" -#: src/lang.c:2607 +#: src/lang.c:2610 msgid "Hash algorithm for Cancel-Lock/Cancel-Key" msgstr "Hash-Algorithmus für Cancel-Lock/Cancel-Key" -#: src/lang.c:2608 +#: src/lang.c:2611 msgid "" "# Hash algorithm for Cancel-Lock/Cancel-Key (default 'sha1')\n" "# Use 'none' to not generate Cancel-Lock headers.\n" @@ -7645,15 +7644,15 @@ msgstr "" "# Hash-Algorithmus für Cancel-Lock/Cancel-Key (Voreinstellung 'sha1')\n" "# 'keiner' verwenden um Cancel-Lock-Header zu deaktivieren.\n" -#: src/lang.c:2614 +#: src/lang.c:2617 msgid "Enter address elements about which you want to be warned. sets." msgstr "Geben Sie den Adressenteil an, vor dem Sie gewarnt werden. setzt." -#: src/lang.c:2615 +#: src/lang.c:2618 msgid "Spamtrap warning address parts" msgstr "Spamfallenwarnung in Adresse" -#: src/lang.c:2616 +#: src/lang.c:2619 msgid "" "# A comma-delimited list of address-parts you want to be warned\n" "# about when trying to reply by email.\n" @@ -7662,28 +7661,28 @@ msgstr "" "wenn\n" "# Sie via Mail antworten wollen.\n" -#: src/lang.c:2621 +#: src/lang.c:2624 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "Gültigkeit eines Filtereintrags in Tagen. setzt." -#: src/lang.c:2622 +#: src/lang.c:2625 msgid "No. of days a filter entry is valid" msgstr "Tage, die ein Filter gültig ist" -#: src/lang.c:2623 +#: src/lang.c:2626 msgid "# Number of days a short term filter will be active\n" msgstr "# Anzahl der Tage die ein temporärer Filter aktiv ist\n" -#: src/lang.c:2627 +#: src/lang.c:2630 msgid "Add posted articles to filter. toggles & sets." msgstr "" "Gepostete Artikel zum Filter hinzufügen. wechselt & setzt." -#: src/lang.c:2628 +#: src/lang.c:2631 msgid "Add posted articles to filter" msgstr "Füge gepostete Artikel zum Filter" -#: src/lang.c:2629 +#: src/lang.c:2632 msgid "" "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" @@ -7691,25 +7690,25 @@ msgstr "" "# Falls ON füge gepostete Artikel die einen neuen Thread einleiten\n" "# zum Filter hinzu um evtl. Antworten hervorzuheben\n" -#: src/lang.c:2633 +#: src/lang.c:2636 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "" "Verzeichnis, in dem Artikel/Threads im mailbox-Format gespeichert werden." -#: src/lang.c:2634 +#: src/lang.c:2637 msgid "Mail directory" msgstr "Mail Verzeichnis" -#: src/lang.c:2635 +#: src/lang.c:2638 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:2640 +#: src/lang.c:2643 msgid "Save articles in batch mode (-S)" msgstr "Speicher Artikel im Batchmode (-S)" -#: src/lang.c:2641 +#: src/lang.c:2644 msgid "" "# If ON articles/threads will be saved in batch mode when save -S\n" "# or mail (-M/-N) is specified on the command line\n" @@ -7717,19 +7716,19 @@ msgstr "" "# Falls ON werden Artikel/Threads im Batchmode gespeichert wenn -S,\n" "# oder gemailt, wenn -M bzw. -N in der Kommandozeile angegeben wurde.\n" -#: src/lang.c:2646 +#: src/lang.c:2649 msgid "The directory where you want articles/threads saved." msgstr "Das Verzeichnis, in dem Artikel/Threads gespeichert werden sollen." -#: src/lang.c:2647 +#: src/lang.c:2650 msgid "Directory to save arts/threads in" msgstr "Verz. um Art/Threads zu speichern" -#: src/lang.c:2648 +#: src/lang.c:2651 msgid "# Directory where articles/threads are saved\n" msgstr "# Verzeichnis in dem Artikel/Threads gespeichert werden\n" -#: src/lang.c:2652 +#: src/lang.c:2655 msgid "" "Auto save article/thread by Archive-name: header. toggles & " "sets." @@ -7737,11 +7736,11 @@ msgstr "" "Autom. sp. von Art/Thread anhand Archive-name:-Header. wechselt & " " setzt." -#: src/lang.c:2653 +#: src/lang.c:2656 msgid "Use Archive-name: header for save" msgstr "Nutze Archive-name: zum Speichern" -#: src/lang.c:2654 +#: src/lang.c:2657 msgid "" "# If ON articles/threads with Archive-name: in mail header will\n" "# be automatically saved with the Archive-name & part/patch no.\n" @@ -7749,31 +7748,31 @@ msgstr "" "# Falls ON werden Artikel mit gesetztem Archive-name:-Header unter\n" "# diesem abgespeichert\n" -#: src/lang.c:2659 +#: src/lang.c:2662 msgid "" "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "" "Gesp. Art. gelesen markieren. wechselt, setzt, bricht ab." -#: src/lang.c:2660 +#: src/lang.c:2663 msgid "Mark saved articles/threads as read" msgstr "Mark. gesp. Artikel/Threads gelesen" -#: src/lang.c:2661 +#: src/lang.c:2664 msgid "# If ON mark articles that are saved as read\n" msgstr "# Falls ON werden gespeicherte Artikel als gelesen markiert\n" -#: src/lang.c:2665 +#: src/lang.c:2668 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "" "Bearbeite (z.B. unshar) gesp. Art/Threads. wechselt, setzt." -#: src/lang.c:2666 +#: src/lang.c:2669 msgid "Post process saved articles" msgstr "Nachbearbeiten gespeichert. Artikel" -#: src/lang.c:2667 +#: src/lang.c:2670 msgid "" "# Perform post processing (saving binary attachments) from saved articles.\n" "# Possible values are (the default is marked with *):\n" @@ -7787,11 +7786,11 @@ msgstr "" "# 1 = nur Shell Archive (shar) auspacken\n" "# 2 = ja\n" -#: src/lang.c:2676 +#: src/lang.c:2679 msgid "Process only unread articles" msgstr "Bearbeite nur ungelesene Artikel" -#: src/lang.c:2677 +#: src/lang.c:2680 msgid "" "# If ON only save/print/pipe/mail unread articles (tagged articles " "excepted)\n" @@ -7799,56 +7798,56 @@ msgstr "" "# Falls ON speichere/drucke/pipe/maile nur ungelesene Artikel\n" "# (markierte Artikel ausgenommen)\n" -#: src/lang.c:2682 +#: src/lang.c:2685 msgid "Print all or just part of header. toggles & sets." msgstr "Drucke alles oder nur Teile des Headers wechselt & setzt." -#: src/lang.c:2683 +#: src/lang.c:2686 msgid "Print all headers when printing" msgstr "Alle Header beim Drucken ausgeben" -#: src/lang.c:2684 +#: src/lang.c:2687 msgid "" "# If ON print all of article header otherwise just the important lines\n" msgstr "" "# Falls ON drucke alle Header des Artikels aus. Ansonsten nur die " "wichtigsten\n" -#: src/lang.c:2688 +#: src/lang.c:2691 msgid "" "The printer program with options that is to be used to print articles/" "threads." msgstr "Das Druckprogramm, das zum drucken von Artikeln/Threads benutzt wird." -#: src/lang.c:2689 +#: src/lang.c:2692 msgid "Printer program with options" msgstr "Druckprogramm mit Optionen" -#: src/lang.c:2690 +#: src/lang.c:2693 msgid "# Print program with parameters used to print articles/threads\n" msgstr "# Druckprogramm mit Optionen zum drucken der Artikel/Threads\n" -#: src/lang.c:2696 +#: src/lang.c:2699 msgid "Force redraw after certain commands" msgstr "Anzeigeauffrischung nach Kommandos" -#: src/lang.c:2697 +#: src/lang.c:2700 msgid "" "# If ON a screen redraw will always be done after certain external commands\n" msgstr "" "# Falls ON wird die Anzeige nach einigen externen Kommandos aufgefrischt\n" -#: src/lang.c:2701 +#: src/lang.c:2704 msgid "" "Start editor with line offset. toggles, sets, cancels." msgstr "" "Starte Editor mit Einrückung. wechselt, setzt, bricht ab." -#: src/lang.c:2702 +#: src/lang.c:2705 msgid "Start editor with line offset" msgstr "Starte Editor mit Einrückung" -#: src/lang.c:2703 +#: src/lang.c:2706 msgid "" "# If ON editor will be started with cursor offset into the file\n" "# otherwise the cursor will be positioned at the first line\n" @@ -7856,15 +7855,15 @@ msgstr "" "# Falls ON wird der Cursor im Editor an die definierte Position gesetzt.\n" "# Anderenfalls wird der Cursor in die erste Zeile gesetzt\n" -#: src/lang.c:2708 +#: src/lang.c:2711 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "%E für Editor, %F für Dateiname, %N für Zeilennummer, setzt." -#: src/lang.c:2709 +#: src/lang.c:2712 msgid "Invocation of your editor" msgstr "Aufruf Ihres Editors" -#: src/lang.c:2710 +#: src/lang.c:2713 msgid "" "# Format of editor line including parameters\n" "# %E Editor %F Filename %N Linenumber\n" @@ -7872,16 +7871,16 @@ msgstr "" "# Format der Editorzeile mit den Parametern für den Aufruf\n" "# %E Editor %F Dateiname %N Zeilennummer\n" -#: src/lang.c:2715 +#: src/lang.c:2718 msgid "" "Enter name and options for external-inews, --internal for internal inews" msgstr "Name und Optionen für ext. inews, --internal für eingebaute Version" -#: src/lang.c:2716 +#: src/lang.c:2719 msgid "External inews" msgstr "Externes inews-Programm" -#: src/lang.c:2717 +#: src/lang.c:2720 msgid "" "# If --internal use the built in mini inews for posting via NNTP\n" "# otherwise use an external inews program\n" @@ -7890,17 +7889,17 @@ msgstr "" "# benutzt, sonst wird das hier angegebene Programm mit den angegebenen\n" "# Optionen verwendet. z.B. 'inews -h'\n" -#: src/lang.c:2721 +#: src/lang.c:2724 msgid "" "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" "%M für den Mailer, %S für Subject, %T für to, %F für Dateinamen, setzt." -#: src/lang.c:2722 +#: src/lang.c:2725 msgid "Invocation of your mail command" msgstr "Aufruf Ihres Mailkommandos" -#: src/lang.c:2723 +#: src/lang.c:2726 msgid "" "# Format of mailer line including parameters\n" "# %M Mailer %S Subject %T To %F Filename\n" @@ -7912,11 +7911,11 @@ msgstr "" "# Ein Beispiel für elm : elm -s \"%S\" \"%T\" < %F\n" "# Ein Beispiel für elm interaktiv: elm -i %F -s \"%S\" \"%T\"\n" -#: src/lang.c:2731 +#: src/lang.c:2734 msgid "Use interactive mail reader" msgstr "Benutze interaktives Mailprogramm" -#: src/lang.c:2732 +#: src/lang.c:2735 msgid "" "# Interactive mailreader\n" "# Possible values are (the default is marked with *):\n" @@ -7932,35 +7931,35 @@ msgstr "" "# 2 = interaktives Mailprogramm, Mailheader werden als Argumente " "übergeben\n" -#: src/lang.c:2741 +#: src/lang.c:2744 msgid "Remove ~/.article after posting" msgstr "Entferne ~/.article nach dem posten" -#: src/lang.c:2742 +#: src/lang.c:2745 msgid "# If ON remove ~/.article after posting.\n" msgstr "# Falls ON entferne ~/.article nach dem posten.\n" -#: src/lang.c:2748 +#: src/lang.c:2751 msgid "Use UTF-8 graphics (thread tree etc.)" msgstr "UTF-8-Grafik benutzten (Baumdarstellung etc.)" -#: src/lang.c:2749 +#: src/lang.c:2752 msgid "" "# If ON use UTF-8 characters for indicator '->', tree and ellipsis '...'.\n" msgstr "" "# Falls ON werden UTF-8-Zeichen für die Anzeige '->', Baumdarstellung und " "Auslassungspunkten '...' benutzt.\n" -#: src/lang.c:2754 +#: src/lang.c:2757 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "" "Dateiname für Kopie geposteter Artikel. setzt, kein Name=keine Kopie." -#: src/lang.c:2755 +#: src/lang.c:2758 msgid "Filename for posted articles" msgstr "Gepostete Artikel speichern in" -#: src/lang.c:2756 +#: src/lang.c:2759 msgid "" "# Filename where to keep all postings (default posted)\n" "# If no filename is set then postings will not be saved\n" @@ -7968,38 +7967,38 @@ msgstr "" "# Dateiname für die Kopie aller Postings (Voreinstellung posted)\n" "# Ist kein Name angegeben wird keine Kopie gespeichert\n" -#: src/lang.c:2761 +#: src/lang.c:2764 msgid "" "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "" "Behalte alle Fehlschläge in ~/dead.articles. wechselt & setzt." -#: src/lang.c:2762 +#: src/lang.c:2765 msgid "Keep failed arts in ~/dead.articles" msgstr "Halte Fehlschl. in ~/dead.articles" -#: src/lang.c:2763 +#: src/lang.c:2766 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "" "# Falls ON werden Fehlgeschlagene Artikel in ~/dead.articles verwahrt\n" -#: src/lang.c:2767 +#: src/lang.c:2770 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "Wollen Sie nicht-abonnierte Gruppen aus der .newsrc entfernen?" -#: src/lang.c:2768 +#: src/lang.c:2771 msgid "No unsubscribed groups in newsrc" msgstr "Nur abonnierte Gruppen in newsrc" -#: src/lang.c:2769 +#: src/lang.c:2772 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "# Falls ON entferne nicht-abonnierte Gruppen aus der newsrc\n" -#: src/lang.c:2774 +#: src/lang.c:2777 msgid "Remove bogus groups from newsrc" msgstr "Lösche nicht vorhan. G. aus newsrc" -#: src/lang.c:2775 +#: src/lang.c:2778 msgid "" "# What to do with bogus groups in newsrc file\n" "# Possible values are (the default is marked with *):\n" @@ -8013,72 +8012,72 @@ msgstr "" "# 1 = entfernen\n" "# 2 = Mit D in der Auswahl markieren.\n" -#: src/lang.c:2784 +#: src/lang.c:2787 msgid "" "Enter number of seconds to wait for a response from the server. sets." msgstr "" "Sekunden die auf eine Antwort vom Server gewartet werden soll. setzt." -#: src/lang.c:2785 +#: src/lang.c:2788 msgid "NNTP read timeout in seconds" msgstr "NNTP-lese Zeitlimit in Sekunden" -#: src/lang.c:2786 +#: src/lang.c:2789 msgid "" "# Time in seconds to wait for a response from the server (0=no timeout)\n" msgstr "" "# Maximal n Sekunden auf eine Antwort vom Server warten (0 = kein " "Zeitlimit)\n" -#: src/lang.c:2791 +#: src/lang.c:2794 msgid "Enter number of seconds until active file will be reread. sets." msgstr "Sekunden, nach denen die active-Datei wieder gelesen wird. setzt." -#: src/lang.c:2792 +#: src/lang.c:2795 msgid "Interval in secs to reread active" msgstr "Active alle ... Sekunden neu lesen" -#: src/lang.c:2793 +#: src/lang.c:2796 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:2798 +#: src/lang.c:2801 msgid "Reconnect to server automatically" msgstr "Autom. Wiederverbindung zum Server" -#: src/lang.c:2799 +#: src/lang.c:2802 msgid "" "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "" "# Falls ON wird eine unterbrochene Verbindung zum NNTP Server\n" "# automatisch wiederhergestellt.\n" -#: src/lang.c:2803 +#: src/lang.c:2806 msgid "" "Create local copies of NNTP overview files. toggles & sets." msgstr "" "Erzeuge lokale Kopien der NNTP Overview Dateien. wechselt & " "setzt." -#: src/lang.c:2804 +#: src/lang.c:2807 msgid "Cache NNTP overview files locally" msgstr "Speichere NNTP Overview Daten lokal" -#: src/lang.c:2805 +#: src/lang.c:2808 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "# Falls ON, erzeuge lokale Kopien der NNTP Overview Dateien.\n" -#: src/lang.c:2809 src/lang.c:2824 src/lang.c:2844 src/lang.c:2863 +#: src/lang.c:2812 src/lang.c:2827 src/lang.c:2847 src/lang.c:2866 msgid "Enter format string. sets, cancels." msgstr "Format-Zeichenkette eingeben. setzt, bricht ab." -#: src/lang.c:2810 +#: src/lang.c:2813 msgid "Format string for selection level" msgstr "Formatanweisung für die Auswahlebene" -#: src/lang.c:2811 +#: src/lang.c:2814 msgid "" "# Format string for selection level representation\n" "# Default: %f %n %U %G %d\n" @@ -8104,11 +8103,11 @@ msgstr "" "# %n aktuelle Gruppennummer\n" "# %U Anzahl ungelesener Artikel\n" -#: src/lang.c:2825 +#: src/lang.c:2828 msgid "Format string for group level" msgstr "Formatanweisung für die Gruppenebene" -#: src/lang.c:2826 +#: src/lang.c:2829 msgid "" "# Format string for group level representation\n" "# Default: %n %m %R %L %s %F\n" @@ -8142,11 +8141,11 @@ msgstr "" "# %s Subject\n" "# %S Score\n" -#: src/lang.c:2845 +#: src/lang.c:2848 msgid "Format string for thread level" msgstr "Formatanweisung für die Threadebene" -#: src/lang.c:2846 +#: src/lang.c:2849 msgid "" "# Format string for thread level representation\n" "# Default: %n %m [%L] %T %F\n" @@ -8178,19 +8177,19 @@ msgstr "" "# %S Score\n" "# %T Subject und/oder Baumdarstellung des Thread\n" -#: src/lang.c:2864 +#: src/lang.c:2867 msgid "Format string for display of dates" msgstr "Datums Format-Zeichenkette" -#: src/lang.c:2865 +#: src/lang.c:2868 msgid "# Format string for date representation\n" msgstr "# Zeichenkette die die Datumsanzeige beschreibt.\n" -#: src/lang.c:2871 +#: src/lang.c:2878 msgid "Unicode normalization form" msgstr "Unicode Normalisierungsart" -#: src/lang.c:2872 +#: src/lang.c:2879 msgid "" "# Unicode normalization form\n" "# Possible values are:\n" @@ -8199,6 +8198,7 @@ msgid "" "# 2 = NFKD\n" "# 3 = NFC\n" "# 4 = NFD\n" +"# 5 = NFKC_CF\n" msgstr "" "# Unicode Normalisierungsart\n" "# Mögliche Werte sind:\n" @@ -8207,20 +8207,21 @@ msgstr "" "# 2 = NFKD\n" "# 3 = NFC\n" "# 4 = NFD\n" +"# 5 = NFKC_CF\n" -#: src/lang.c:2885 +#: src/lang.c:2893 msgid "Render BiDi" msgstr "BiDi wiedergeben" -#: src/lang.c:2886 +#: src/lang.c:2894 msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "# Falls ON, wird bi-direktionaler Text von tin wiedergeben.\n" -#: src/lang.c:2893 +#: src/lang.c:2901 msgid "Function for sorting articles" msgstr "Sortierfunktion" -#: src/lang.c:2894 +#: src/lang.c:2902 msgid "" "# Function for sorting articles\n" "# Possible values are (the default is marked with *):\n" @@ -8232,195 +8233,195 @@ msgstr "" "# * 0 = qsort\n" "# 1 = heapsort\n" -#: src/lang.c:2907 +#: src/lang.c:2915 msgid "Automatically GroupMarkUnselArtRead" msgstr "GroupMarkUnselArtRead Kommando automatisch ausführen" -#: src/lang.c:2913 +#: src/lang.c:2921 msgid "Delete post-process files" msgstr "Nachbearbeitete Artikel löschen" -#: src/lang.c:2918 +#: src/lang.c:2926 msgid "Filename for all mailed articles, sets, no filename=do not save." msgstr "" "Dateiname für Kopie der Mailantworten. setzt, kein Name=keine Kopie." -#: src/lang.c:2919 +#: src/lang.c:2927 msgid "Mailbox to save sent mails" msgstr "Mailbox für Kopie der Mailantworten" -#: src/lang.c:2924 +#: src/lang.c:2932 msgid "Set Followup-To: header to this group(s). sets, cancels." msgstr "" "Followup-To:-Header auf folgende Gruppe(n) setzten. setzt, bricht " "ab." -#: src/lang.c:2925 +#: src/lang.c:2933 msgid "Followup-To: header" msgstr "Followup-To:-Header" -#: src/lang.c:2930 +#: src/lang.c:2938 msgid "Enter default mail address (and fullname). sets, cancels." msgstr "" "Standard Mail-Adresse (und Name) eingeben. setzt, bricht ab." -#: src/lang.c:2937 +#: src/lang.c:2945 msgid "" "Path and options for ispell-like spell-checker. sets, cancels." msgstr "" "Pfad & Optionen f. ispell komp. Rechtschreibprüfer. setzt, bricht " "ab." -#: src/lang.c:2938 +#: src/lang.c:2946 msgid "Ispell program" msgstr "ispell Programm" -#: src/lang.c:2944 +#: src/lang.c:2952 msgid "When group is a mailing list, send responses to this email address." msgstr "" "Falls die Gruppe eine Mailingliste ist gehen Antworten an diese " "Listenadresse." -#: src/lang.c:2945 +#: src/lang.c:2953 msgid "Mailing list address" msgstr "Adresse der Mailingliste" -#: src/lang.c:2951 +#: src/lang.c:2959 msgid "Forward articles as attachment" msgstr "Artikel als Anhang weiterleiten" -#: src/lang.c:2956 +#: src/lang.c:2964 msgid "" "A comma separated list of MIME major/minor Content-Types. cancels." msgstr "" "Kommata getrennte Liste von MIME-Haupt/Neben Content-Typen. bricht ab." -#: src/lang.c:2957 +#: src/lang.c:2965 msgid "Which MIME types will be saved" msgstr "Welche MIME-Typen werden gespeichert" -#: src/lang.c:2962 +#: src/lang.c:2970 msgid "Value of the Organization: header. sets, cancels." msgstr "Wert des Organization:-Headers. setzt, bricht ab." -#: src/lang.c:2963 +#: src/lang.c:2971 msgid "Organization: header" msgstr "Organization:-Header" -#: src/lang.c:2968 +#: src/lang.c:2976 msgid "Filename for saved articles. sets, cancels." msgstr "Dateiname für gespeicherte Artikel. setzt, bricht ab." -#: src/lang.c:2969 +#: src/lang.c:2977 msgid "savefile" msgstr "Dateiname" -#: src/lang.c:2974 src/lang.c:2998 +#: src/lang.c:2982 src/lang.c:3006 msgid "Scope for the filter rule. sets, cancels." msgstr "Gültigkeitsbereich für die Filterregel. setzt, bricht ab." -#: src/lang.c:2975 +#: src/lang.c:2983 msgid "Quick (1 key) select filter scope" msgstr "Schnell (1 Tasten) Auswahlfilter Gültigkeitsbereich" -#: src/lang.c:2980 src/lang.c:3004 +#: src/lang.c:2988 src/lang.c:3012 msgid "Header for filter rule. sets, cancels." msgstr "Header für Filterregel. setzt, bricht ab." -#: src/lang.c:2981 +#: src/lang.c:2989 msgid "Quick (1 key) select filter header" msgstr "Schnell (1 Tasten) Auswahlfilter Header" -#: src/lang.c:2986 src/lang.c:3010 +#: src/lang.c:2994 src/lang.c:3018 msgid "ON = case sensitive, OFF = ignore case. sets, cancels." msgstr "Groß-/Kleinschreibung beachten (ON) oder ignorieren (OFF)." -#: src/lang.c:2987 +#: src/lang.c:2995 msgid "Quick (1 key) select filter case" msgstr "Schnell (1 Tasten) Auswahlfilter Groß-/Kleinschreibung" -#: src/lang.c:2992 src/lang.c:3016 +#: src/lang.c:3000 src/lang.c:3024 msgid "ON = expire, OFF = don't ever expire. sets, cancels." msgstr "" "ON = kann verfallen, OFF = niemals verfallen lassen. setzt, " "bricht ab." -#: src/lang.c:2993 +#: src/lang.c:3001 msgid "Quick (1 key) select filter expire" msgstr "Schnell (1 Tasten) Auswahlfilter Ablaufdatum" -#: src/lang.c:2999 +#: src/lang.c:3007 msgid "Quick (1 key) kill filter scope" msgstr "Schnell (1 Tasten) Killfilter Gültigkeitsbereich" -#: src/lang.c:3005 +#: src/lang.c:3013 msgid "Quick (1 key) kill filter header" msgstr "Schnell (1 Tasten) Killfilter Header" -#: src/lang.c:3011 +#: src/lang.c:3019 msgid "Quick (1 key) kill filter case" msgstr "Schnell (1 Tasten) Killfilter Groß-/Kleinschreibung" -#: src/lang.c:3017 +#: src/lang.c:3025 msgid "Quick (1 key) kill filter expire" msgstr "Schnell (1 Tasten) Killfilter Ablaufdatum" -#: src/lang.c:3023 +#: src/lang.c:3031 msgid "Assume this charset if no charset declaration is present, to set." msgstr "Diesen Zeichensatz annehmen falls kleiner deklariert ist. setzt." -#: src/lang.c:3024 +#: src/lang.c:3032 msgid "UNDECLARED_CHARSET" msgstr "UNDECLARED_CHARSET" -#: src/lang.c:3030 +#: src/lang.c:3038 msgid "" "Add this text at the start of the message body. sets, cancels." msgstr "" "Diesen Text am Anfang des Artikels einfügen. setzt, bricht ab." -#: src/lang.c:3031 +#: src/lang.c:3039 msgid "X_Body" msgstr "X_Body" -#: src/lang.c:3036 +#: src/lang.c:3044 msgid "Insert this header when posting. sets, cancels." msgstr "Diesen Header beim Posten einfügen. setzt, bricht ab." -#: src/lang.c:3037 +#: src/lang.c:3045 msgid "X_Headers" msgstr "X_Headers" -#: src/lang.c:3042 +#: src/lang.c:3050 msgid "" "Automatically insert an X-Comment-To: header? toggles & sets." msgstr "" "X-Comment-To:-Header automatische einfügen? wechselt & setzt." -#: src/lang.c:3043 +#: src/lang.c:3051 msgid "Insert 'X-Comment-To:' header" msgstr "Füge 'X-Comment-To:'-Header ein" #. TODO: lang.c -#: src/main.c:801 +#: src/main.c:812 msgid "reading from local spool" msgstr "Lese aus dem lokalen Spool" -#: src/misc.c:3868 +#: src/misc.c:3878 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "Version: %s %s Ausgabe %s (\"%s\") %s %s\n" -#: src/misc.c:3871 +#: src/misc.c:3881 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Version: %s %s Ausgabe %s (\"%s\")\n" -#: src/newsrc.c:453 +#: src/newsrc.c:457 msgid "Unreachable?\n" msgstr "Unerreichbar?\n" -#: src/nntplib.c:817 +#: src/nntplib.c:822 #, c-format msgid "" "\n" @@ -8429,29 +8430,29 @@ msgstr "" "\n" "Server reagierte nicht, Wiederholung Nummer # %d\n" -#: src/nntplib.c:844 +#: src/nntplib.c:849 msgid "NNTP connection error. Exiting..." msgstr "NNTP Verbindungsfehler. Beende..." -#: src/nntplib.c:856 src/nntplib.c:1835 +#: src/nntplib.c:861 src/nntplib.c:1852 msgid "Rejoin current group\n" msgstr "Betrete aktuelle Gruppe neu\n" -#: src/nntplib.c:864 src/nntplib.c:1843 +#: src/nntplib.c:869 src/nntplib.c:1860 #, c-format msgid "Read (%s)\n" msgstr "Lese (%s)\n" -#: src/nntplib.c:866 +#: src/nntplib.c:871 #, c-format msgid "Resend last command (%s)\n" msgstr "Sende letztes Kommando (%s) neu\n" -#: src/nntplib.c:1482 +#: src/nntplib.c:1500 msgid "CAPABILITIES did not announce READER" msgstr "CAPABILITIES hat READER nicht bekannt geben" -#: src/nntplib.c:1989 +#: src/nntplib.c:2006 msgid "MOTD: " msgstr "MOTD: " @@ -8520,7 +8521,7 @@ msgstr "[- Nicht Verfügbar -]" #. * preamble #. * TODO: -> lang.c #. -#: src/rfc2047.c:1308 +#: src/rfc2047.c:1322 #, c-format msgid "" "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" Binary files tin-2.4.2/po/en_GB.gmo and tin-2.4.3/po/en_GB.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.2/po/en_GB.po tin-2.4.3/po/en_GB.po --- tin-2.4.2/po/en_GB.po 2017-12-08 09:39:45.000000000 +0100 +++ tin-2.4.3/po/en_GB.po 2018-12-24 10:02:04.190939231 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 2.3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-08 09:39+0100\n" +"POT-Creation-Date: 2018-12-24 10:02+0100\n" "PO-Revision-Date: 2013-12-24 01:00+0000\n" "Last-Translator: Urs Janssen \n" "Language-Team: \n" @@ -16,473 +16,473 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/attrib.c:954 +#: src/attrib.c:964 msgid "Processing attributes... " msgstr "" -#: src/attrib.c:1176 +#: src/attrib.c:1186 #, c-format msgid "" "# Do not edit this comment block\n" "#\n" msgstr "" -#: src/attrib.c:1177 +#: src/attrib.c:1187 #, c-format msgid "# scope=STRING (eg. alt.*,!alt.bin*) [mandatory]\n" msgstr "" -#: src/attrib.c:1178 +#: src/attrib.c:1188 #, c-format msgid "# add_posted_to_filter=ON/OFF\n" msgstr "" -#: src/attrib.c:1179 +#: src/attrib.c:1189 #, c-format msgid "# advertising=ON/OFF\n" msgstr "" -#: src/attrib.c:1180 +#: src/attrib.c:1190 #, c-format msgid "# alternative_handling=ON/OFF\n" msgstr "" -#: src/attrib.c:1181 +#: src/attrib.c:1191 #, c-format msgid "# ask_for_metamail=ON/OFF\n" msgstr "" -#: src/attrib.c:1182 +#: src/attrib.c:1192 #, c-format msgid "# auto_cc_bcc=NUM\n" msgstr "" -#: src/attrib.c:1183 +#: src/attrib.c:1193 #, c-format msgid "# 0=No, 1=Cc, 2=Bcc, 3=Cc and Bcc\n" msgstr "" -#: src/attrib.c:1184 +#: src/attrib.c:1194 #, c-format msgid "# auto_list_thread=ON/OFF\n" msgstr "" -#: src/attrib.c:1185 +#: src/attrib.c:1195 #, c-format msgid "# auto_save=ON/OFF\n" msgstr "" -#: src/attrib.c:1186 +#: src/attrib.c:1196 #, c-format msgid "# auto_select=ON/OFF\n" msgstr "" -#: src/attrib.c:1187 +#: src/attrib.c:1197 #, c-format msgid "# batch_save=ON/OFF\n" msgstr "" -#: src/attrib.c:1188 +#: src/attrib.c:1198 #, c-format msgid "# date_format=STRING (eg. %%a, %%d %%b %%Y %%H:%%M:%%S)\n" msgstr "" -#: src/attrib.c:1189 +#: src/attrib.c:1199 #, c-format msgid "# delete_tmp_files=ON/OFF\n" msgstr "" -#: src/attrib.c:1190 +#: src/attrib.c:1200 #, c-format msgid "# editor_format=STRING (eg. %%E +%%N %%F)\n" msgstr "" -#: src/attrib.c:1191 +#: src/attrib.c:1201 #, c-format msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "" -#: src/attrib.c:1192 +#: src/attrib.c:1202 #, c-format msgid "# followup_to=STRING\n" msgstr "" -#: src/attrib.c:1193 +#: src/attrib.c:1203 #, c-format msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "" -#: src/attrib.c:1194 +#: src/attrib.c:1204 #, c-format msgid "# group_catchup_on_exit=ON/OFF\n" msgstr "" -#: src/attrib.c:1195 +#: src/attrib.c:1205 #, c-format msgid "# group_format=STRING (eg. %%n %%m %%R %%L %%s %%F)\n" msgstr "" -#: src/attrib.c:1196 +#: src/attrib.c:1206 #, c-format msgid "# mail_8bit_header=ON/OFF\n" msgstr "" -#: src/attrib.c:1197 +#: src/attrib.c:1207 #, c-format msgid "# mail_mime_encoding=supported_encoding" msgstr "" -#: src/attrib.c:1205 +#: src/attrib.c:1215 #, c-format msgid "# ispell=STRING\n" msgstr "" -#: src/attrib.c:1207 +#: src/attrib.c:1217 #, c-format msgid "# maildir=STRING (eg. ~/Mail)\n" msgstr "" -#: src/attrib.c:1208 +#: src/attrib.c:1218 #, c-format msgid "# mailing_list=STRING (eg. majordomo@example.org)\n" msgstr "" -#: src/attrib.c:1209 +#: src/attrib.c:1219 #, c-format msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "" -#: src/attrib.c:1210 +#: src/attrib.c:1220 #, c-format msgid "# mark_ignore_tags=ON/OFF\n" msgstr "" -#: src/attrib.c:1211 +#: src/attrib.c:1221 #, c-format msgid "# mark_saved_read=ON/OFF\n" msgstr "" -#: src/attrib.c:1212 +#: src/attrib.c:1222 #, c-format msgid "# mime_forward=ON/OFF\n" msgstr "" -#: src/attrib.c:1214 +#: src/attrib.c:1224 #, c-format msgid "# mm_network_charset=supported_charset" msgstr "" -#: src/attrib.c:1221 +#: src/attrib.c:1231 #, c-format msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "" -#: src/attrib.c:1223 +#: src/attrib.c:1233 #, c-format msgid "# news_headers_to_display=STRING\n" msgstr "" -#: src/attrib.c:1224 +#: src/attrib.c:1234 #, c-format msgid "# news_headers_to_not_display=STRING\n" msgstr "" -#: src/attrib.c:1225 +#: src/attrib.c:1235 #, c-format msgid "# news_quote_format=STRING\n" msgstr "" -#: src/attrib.c:1226 +#: src/attrib.c:1236 #, c-format msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "" -#: src/attrib.c:1227 +#: src/attrib.c:1237 #, c-format msgid "# pos_first_unread=ON/OFF\n" msgstr "" -#: src/attrib.c:1228 +#: src/attrib.c:1238 #, c-format msgid "# post_8bit_header=ON/OFF\n" msgstr "" -#: src/attrib.c:1229 +#: src/attrib.c:1239 #, c-format msgid "# post_mime_encoding=supported_encoding" msgstr "" -#: src/attrib.c:1236 +#: src/attrib.c:1246 #, c-format msgid "# post_process_type=NUM\n" msgstr "" -#: src/attrib.c:1241 +#: src/attrib.c:1251 #, c-format msgid "# post_process_view=ON/OFF\n" msgstr "" -#: src/attrib.c:1242 +#: src/attrib.c:1252 #, c-format msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "" -#: src/attrib.c:1243 +#: src/attrib.c:1253 #, c-format msgid "# quick_kill_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:1244 +#: src/attrib.c:1254 #, c-format msgid "# quick_kill_case=ON/OFF\n" msgstr "" -#: src/attrib.c:1245 +#: src/attrib.c:1255 #, c-format msgid "# quick_kill_header=NUM\n" msgstr "" -#: src/attrib.c:1246 src/attrib.c:1255 +#: src/attrib.c:1256 src/attrib.c:1265 #, c-format msgid "# 0=Subject: (case sensitive) 1=Subject: (ignore case)\n" msgstr "" -#: src/attrib.c:1247 src/attrib.c:1256 +#: src/attrib.c:1257 src/attrib.c:1266 #, c-format msgid "# 2=From: (case sensitive) 3=From: (ignore case)\n" msgstr "" -#: src/attrib.c:1248 src/attrib.c:1257 +#: src/attrib.c:1258 src/attrib.c:1267 #, c-format msgid "# 4=Message-ID: & full References: line\n" msgstr "" -#: src/attrib.c:1249 src/attrib.c:1258 +#: src/attrib.c:1259 src/attrib.c:1268 #, c-format msgid "# 5=Message-ID: & last References: entry only\n" msgstr "" -#: src/attrib.c:1250 src/attrib.c:1259 +#: src/attrib.c:1260 src/attrib.c:1269 #, c-format msgid "# 6=Message-ID: entry only 7=Lines:\n" msgstr "" -#: src/attrib.c:1251 +#: src/attrib.c:1261 #, c-format msgid "# quick_select_scope=STRING\n" msgstr "" -#: src/attrib.c:1252 +#: src/attrib.c:1262 #, c-format msgid "# quick_select_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:1253 +#: src/attrib.c:1263 #, c-format msgid "# quick_select_case=ON/OFF\n" msgstr "" -#: src/attrib.c:1254 +#: src/attrib.c:1264 #, c-format msgid "# quick_select_header=NUM\n" msgstr "" -#: src/attrib.c:1260 +#: src/attrib.c:1270 #, c-format msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "" -#: src/attrib.c:1262 +#: src/attrib.c:1272 #, c-format msgid "# print_header=ON/OFF\n" msgstr "" -#: src/attrib.c:1264 +#: src/attrib.c:1274 #, c-format msgid "# process_only_unread=ON/OFF\n" msgstr "" -#: src/attrib.c:1265 +#: src/attrib.c:1275 #, c-format msgid "# prompt_followupto=ON/OFF\n" msgstr "" -#: src/attrib.c:1266 +#: src/attrib.c:1276 #, c-format msgid "# savedir=STRING (eg. ~user/News)\n" msgstr "" -#: src/attrib.c:1267 +#: src/attrib.c:1277 #, c-format msgid "# savefile=STRING (eg. =linux)\n" msgstr "" -#: src/attrib.c:1268 +#: src/attrib.c:1278 #, c-format msgid "# sigfile=STRING (eg. $var/sig)\n" msgstr "" -#: src/attrib.c:1269 +#: src/attrib.c:1279 #, c-format msgid "# show_author=NUM\n" msgstr "" -#: src/attrib.c:1275 +#: src/attrib.c:1285 #, c-format msgid "# show_signatures=ON/OFF\n" msgstr "" -#: src/attrib.c:1276 +#: src/attrib.c:1286 #, c-format msgid "# show_only_unread_arts=ON/OFF\n" msgstr "" -#: src/attrib.c:1277 +#: src/attrib.c:1287 #, c-format msgid "# sigdashes=ON/OFF\n" msgstr "" -#: src/attrib.c:1278 +#: src/attrib.c:1288 #, c-format msgid "# signature_repost=ON/OFF\n" msgstr "" -#: src/attrib.c:1279 +#: src/attrib.c:1289 #, c-format msgid "# sort_article_type=NUM\n" msgstr "" -#: src/attrib.c:1297 +#: src/attrib.c:1307 #, c-format msgid "# sort_threads_type=NUM\n" msgstr "" -#: src/attrib.c:1306 +#: src/attrib.c:1316 #, c-format msgid "# start_editor_offset=ON/OFF\n" msgstr "" -#: src/attrib.c:1307 +#: src/attrib.c:1317 #, c-format msgid "# tex2iso_conv=ON/OFF\n" msgstr "" -#: src/attrib.c:1308 +#: src/attrib.c:1318 #, c-format msgid "# thread_catchup_on_exit=ON/OFF\n" msgstr "" -#: src/attrib.c:1309 +#: src/attrib.c:1319 #, c-format msgid "# thread_articles=NUM" msgstr "" -#: src/attrib.c:1316 +#: src/attrib.c:1326 #, c-format msgid "# thread_format=STRING (eg. %%n %%m [%%L] %%T %%F)\n" msgstr "" -#: src/attrib.c:1317 +#: src/attrib.c:1327 #, c-format msgid "# thread_perc=NUM\n" msgstr "" -#: src/attrib.c:1318 +#: src/attrib.c:1328 #, c-format msgid "# trim_article_body=NUM\n" msgstr "" -#: src/attrib.c:1319 +#: src/attrib.c:1329 #, c-format msgid "# 0 = Don't trim article body\n" msgstr "" -#: src/attrib.c:1320 +#: src/attrib.c:1330 #, c-format msgid "# 1 = Skip leading blank lines\n" msgstr "" -#: src/attrib.c:1321 +#: src/attrib.c:1331 #, c-format msgid "# 2 = Skip trailing blank lines\n" msgstr "" -#: src/attrib.c:1322 +#: src/attrib.c:1332 #, c-format msgid "# 3 = Skip leading and trailing blank lines\n" msgstr "" -#: src/attrib.c:1323 +#: src/attrib.c:1333 #, c-format msgid "# 4 = Compact multiple blank lines between text blocks\n" msgstr "" -#: src/attrib.c:1324 +#: src/attrib.c:1334 #, c-format msgid "" "# 5 = Compact multiple blank lines between text blocks and skip\n" "# leading blank lines\n" msgstr "" -#: src/attrib.c:1325 +#: src/attrib.c:1335 #, c-format msgid "" "# 6 = Compact multiple blank lines between text blocks and skip\n" "# trailing blank lines\n" msgstr "" -#: src/attrib.c:1326 +#: src/attrib.c:1336 #, c-format msgid "" "# 7 = Compact multiple blank lines between text blocks and skip\n" "# leading and trailing blank lines\n" msgstr "" -#: src/attrib.c:1327 +#: src/attrib.c:1337 #, c-format msgid "# verbatim_handling=ON/OFF\n" msgstr "" -#: src/attrib.c:1329 +#: src/attrib.c:1339 #, c-format msgid "# extquote_handling=ON/OFF\n" msgstr "" -#: src/attrib.c:1331 +#: src/attrib.c:1341 #, c-format msgid "# wrap_on_next_unread=ON/OFF\n" msgstr "" -#: src/attrib.c:1332 +#: src/attrib.c:1342 #, c-format msgid "# x_body=STRING (eg. ~/.tin/extra-body-text)\n" msgstr "" -#: src/attrib.c:1333 +#: src/attrib.c:1343 #, c-format msgid "# x_comment_to=ON/OFF\n" msgstr "" -#: src/attrib.c:1334 +#: src/attrib.c:1344 #, c-format msgid "# x_headers=STRING (eg. ~/.tin/extra-headers)\n" msgstr "" -#: src/attrib.c:1335 +#: src/attrib.c:1345 #, c-format msgid "" "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "" -#: src/attrib.c:1336 +#: src/attrib.c:1346 #, c-format msgid "" "# entries first followed by group specific entries.\n" "#\n" msgstr "" -#: src/attrib.c:1337 +#: src/attrib.c:1347 #, c-format msgid "############################################################################\n" msgstr "" @@ -761,56 +761,51 @@ msgstr "" #: src/lang.c:107 #, c-format -msgid "Active file corrupt - %s" -msgstr "" - -#: src/lang.c:108 -#, c-format msgid "" "Article to be posted resulted in errors/warnings. %s=quit, %s=Menu, %s=edit: " msgstr "" -#: src/lang.c:109 +#: src/lang.c:108 #, c-format msgid "Unrecognized attribute: %s" msgstr "Unrecognised attribute: %s" -#: src/lang.c:110 +#: src/lang.c:109 #, c-format msgid "Bad command. Type '%s' for help." msgstr "" -#: src/lang.c:112 +#: src/lang.c:111 msgid "Base article" msgstr "" -#: src/lang.c:113 +#: src/lang.c:112 msgid "Base article range" msgstr "" -#: src/lang.c:114 +#: src/lang.c:113 #, c-format msgid "%s: Updating of index files not supported: cache_overview_files=%s" msgstr "" -#: src/lang.c:115 +#: src/lang.c:114 msgid "*** Beginning of article ***" msgstr "" -#: src/lang.c:116 +#: src/lang.c:115 msgid "*** Beginning of page ***" msgstr "" -#: src/lang.c:118 +#: src/lang.c:117 #, c-format msgid "Cancel (delete) or supersede (overwrite) article [%%s]? (%s/%s/%s): " msgstr "" -#: src/lang.c:119 +#: src/lang.c:118 msgid "Cancelling article..." msgstr "" -#: src/lang.c:121 +#: src/lang.c:120 #, c-format msgid "Cannot create %s" msgstr "" @@ -1280,146 +1275,141 @@ msgstr "" msgid "Insecure permissions of %s (%o)" msgstr "" -#: src/lang.c:242 -#, c-format -msgid "Invalid response to GROUP command, %s" -msgstr "" - -#: src/lang.c:247 +#: src/lang.c:244 #, c-format msgid "MIME parse error: Unexpected end of %s/%s article" msgstr "" -#: src/lang.c:248 +#: src/lang.c:245 msgid "MIME parse error: Start boundary whilst reading headers" msgstr "" -#: src/lang.c:249 +#: src/lang.c:246 msgid "" "\n" "Error: \"poster\" is not allowed in Newsgroups!\n" msgstr "" -#: src/lang.c:250 +#: src/lang.c:247 msgid "Can't get a (fully-qualified) domain-name!" msgstr "" -#: src/lang.c:251 +#: src/lang.c:248 #, c-format msgid "No permissions to go into %s\n" msgstr "" -#: src/lang.c:253 +#: src/lang.c:250 msgid "" "\n" "Error: From: line missing.\n" msgstr "" -#: src/lang.c:255 +#: src/lang.c:252 #, c-format msgid "No read permissions for %s\n" msgstr "" -#: src/lang.c:256 +#: src/lang.c:253 #, c-format msgid "File %s does not exist\n" msgstr "" -#: src/lang.c:257 +#: src/lang.c:254 #, c-format msgid "No write permissions for %s\n" msgstr "" -#: src/lang.c:258 +#: src/lang.c:255 msgid "Can't get user information (/etc/passwd missing?)" msgstr "" -#: src/lang.c:259 +#: src/lang.c:256 msgid "errors" msgstr "" -#: src/lang.c:261 +#: src/lang.c:258 #, c-format msgid "" "\n" "Error on line %d: \"Sender:\" header not allowed (it will be added for you)\n" msgstr "" -#: src/lang.c:263 +#: src/lang.c:260 #, c-format msgid "Server has non of the groups listed in %s" msgstr "" -#: src/lang.c:264 +#: src/lang.c:261 msgid "error" msgstr "" -#: src/lang.c:265 +#: src/lang.c:262 msgid "Unknown display level" msgstr "" -#: src/lang.c:266 +#: src/lang.c:263 msgid "" msgstr "" -#: src/lang.c:267 +#: src/lang.c:264 msgid "Exiting..." msgstr "" -#: src/lang.c:268 +#: src/lang.c:265 msgid "leaving external mail-reader" msgstr "" -#: src/lang.c:269 +#: src/lang.c:266 #, c-format msgid "Extracting %s..." msgstr "" -#: src/lang.c:271 +#: src/lang.c:268 #, c-format msgid "Error writing %s file. Filesystem full? File reset to previous state." msgstr "" -#: src/lang.c:272 +#: src/lang.c:269 #, c-format msgid "Error making backup of %s file. Filesystem full?" msgstr "" -#: src/lang.c:273 +#: src/lang.c:270 #, c-format msgid "Filtering global rules (%d/%d)..." msgstr "" -#: src/lang.c:274 +#: src/lang.c:271 msgid "Rule created by: " msgstr "" -#: src/lang.c:275 +#: src/lang.c:272 #, c-format msgid "Enter pattern [%s]> " msgstr "" -#: src/lang.c:276 +#: src/lang.c:273 #, c-format msgid "" "\n" "You requested followups to your article to go to the following %s:\n" msgstr "" -#: src/lang.c:277 +#: src/lang.c:274 #, c-format msgid " %s\t Answers will be directed to you by mail.\n" msgstr "" -#: src/lang.c:278 +#: src/lang.c:275 msgid "-- forwarded message --\n" msgstr "" -#: src/lang.c:279 +#: src/lang.c:276 msgid "-- end of forwarded message --\n" msgstr "" -#: src/lang.c:280 +#: src/lang.c:277 msgid "" "# Format:\n" "# comment=STRING Optional. Multiple lines allowed. Comments must be " @@ -1446,6 +1436,10 @@ msgid "" "# gnksa=[<>]?NUM Optional. GNKSA parse_from() return code. '<' or '>' " "opt.\n" "# xref=PATTERN Optional. Kill pattern (e.g. alt.flame*)\n" +"# path=PATTERN Optional. Kill pattern (e.g. news.example.org)\n" +"# Be aware that filtering on Path: may significantly " +"slow\n" +"# down the process.\n" "# time=NUM Optional. time_t value when rule expires\n" "#\n" msgstr "" @@ -2418,7 +2412,7 @@ msgstr "" msgid "Operation disabled in no-overwrite mode" msgstr "" -#. TODO: replace hardcoded key-name in txt_info_postponed +#. TODO: replace hard coded key-name in txt_info_postponed #: src/lang.c:547 #, c-format msgid "%d postponed %s, reuse with ^O...\n" @@ -2444,7 +2438,7 @@ msgstr "" msgid "incomplete " msgstr "" -#. TODO: replace hardcoded key-names +#. TODO: replace hard coded key-names #: src/lang.c:554 #, c-format msgid "" @@ -2540,7 +2534,7 @@ msgstr "" #: src/lang.c:587 #, c-format -msgid "Kill Msg-Id: [%s] (f/l/o/n): " +msgid "Kill Msg-ID: [%s] (f/l/o/n): " msgstr "" #: src/lang.c:588 @@ -3026,7 +3020,7 @@ msgstr "" msgid "Post a followup..." msgstr "" -#. TODO: replace hardcoded key-name in txt_post_error_ask_postpone +#. TODO: replace hard coded key-name in txt_post_error_ask_postpone #: src/lang.c:716 msgid "" "An error has occurred while posting the article. If you think that this\n" @@ -3086,225 +3080,230 @@ msgstr "" msgid "Untagged %s" msgstr "" -#: src/lang.c:730 +#: src/lang.c:731 +#, c-format +msgid "Preparing for filtering on Path header (%d/%d)..." +msgstr "" + +#: src/lang.c:733 msgid "Processing mail messages marked for deletion." msgstr "" -#: src/lang.c:731 +#: src/lang.c:734 msgid "Processing saved articles marked for deletion." msgstr "" -#: src/lang.c:732 +#: src/lang.c:735 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "" -#: src/lang.c:733 +#: src/lang.c:736 msgid "Article unchanged, abort mailing?" msgstr "" -#: src/lang.c:734 +#: src/lang.c:737 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "" -#: src/lang.c:736 +#: src/lang.c:739 msgid "Add quick kill filter?" msgstr "" -#: src/lang.c:737 +#: src/lang.c:740 msgid "Add quick selection filter?" msgstr "" -#: src/lang.c:738 +#: src/lang.c:741 msgid "Do you really want to quit?" msgstr "" -#: src/lang.c:739 +#: src/lang.c:742 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "" -#: src/lang.c:740 +#: src/lang.c:743 msgid "You have tagged articles in this group - quit anyway?" msgstr "" -#: src/lang.c:741 +#: src/lang.c:744 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "" -#: src/lang.c:742 +#: src/lang.c:745 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "" -#: src/lang.c:743 +#: src/lang.c:746 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "" -#: src/lang.c:744 +#: src/lang.c:747 msgid "Do you really want to quit without saving your configuration?" msgstr "" -#: src/lang.c:747 +#: src/lang.c:750 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "" -#: src/lang.c:749 +#: src/lang.c:752 msgid "Do you want to abort this operation?" msgstr "" -#: src/lang.c:750 +#: src/lang.c:753 msgid "Do you want to exit tin immediately?" msgstr "" -#: src/lang.c:752 +#: src/lang.c:755 msgid "Reading ('q' to quit)..." msgstr "" -#: src/lang.c:753 +#: src/lang.c:756 #, c-format msgid "Reading %sarticles..." msgstr "" -#: src/lang.c:754 +#: src/lang.c:757 #, c-format msgid "Reading %sattributes file...\n" msgstr "" -#: src/lang.c:755 +#: src/lang.c:758 #, c-format msgid "Reading %sconfig file...\n" msgstr "" -#: src/lang.c:756 +#: src/lang.c:759 msgid "Reading filter file...\n" msgstr "" -#: src/lang.c:757 +#: src/lang.c:760 #, c-format msgid "Reading %s groups..." msgstr "" -#: src/lang.c:758 +#: src/lang.c:761 msgid "Reading input history file...\n" msgstr "" -#: src/lang.c:759 +#: src/lang.c:762 msgid "Reading keymap file...\n" msgstr "" -#: src/lang.c:760 +#: src/lang.c:763 msgid "Reading groups from active file... " msgstr "" -#: src/lang.c:761 +#: src/lang.c:764 msgid "Reading groups from newsrc file... " msgstr "" -#: src/lang.c:762 +#: src/lang.c:765 msgid "Reading newsgroups file... " msgstr "" -#: src/lang.c:763 +#: src/lang.c:766 msgid "Reading newsrc file..." msgstr "" -#: src/lang.c:764 +#: src/lang.c:767 msgid "References: line " msgstr "" -#: src/lang.c:766 +#: src/lang.c:769 #, c-format msgid "(%d:%02d remaining)" msgstr "" -#: src/lang.c:768 +#: src/lang.c:771 #, c-format msgid "Bogus group %s removed." msgstr "" -#: src/lang.c:769 +#: src/lang.c:772 msgid "Removed from the previous rule: " msgstr "" -#: src/lang.c:770 +#: src/lang.c:773 #, c-format msgid "Error: rename %s to %s" msgstr "" -#: src/lang.c:771 +#: src/lang.c:774 msgid "Reply to author..." msgstr "" -#: src/lang.c:772 +#: src/lang.c:775 msgid "Repost" msgstr "" -#: src/lang.c:773 +#: src/lang.c:776 msgid "Reposting article..." msgstr "" -#: src/lang.c:774 +#: src/lang.c:777 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "" -#: src/lang.c:775 +#: src/lang.c:778 msgid "Reset newsrc?" msgstr "" -#: src/lang.c:776 +#: src/lang.c:779 msgid "Responses have been directed to the following newsgroups" msgstr "" -#: src/lang.c:777 +#: src/lang.c:780 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " msgstr "" -#: src/lang.c:779 +#: src/lang.c:782 msgid "Press to continue..." msgstr "" -#: src/lang.c:781 +#: src/lang.c:784 #, c-format msgid "Select From [%s] (y/n): " msgstr "" -#: src/lang.c:782 +#: src/lang.c:785 msgid "Select Lines: (num): " msgstr "" -#: src/lang.c:783 +#: src/lang.c:786 msgid "Auto-select Article Menu" msgstr "" -#: src/lang.c:784 +#: src/lang.c:787 #, c-format -msgid "Select Msg-Id [%s] (f/l/o/n): " +msgid "Select Msg-ID [%s] (f/l/o/n): " msgstr "" -#: src/lang.c:785 +#: src/lang.c:788 msgid "Select pattern scope: " msgstr "" -#: src/lang.c:786 +#: src/lang.c:789 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "" -#: src/lang.c:787 +#: src/lang.c:790 msgid "Select text pattern : " msgstr "" -#: src/lang.c:788 +#: src/lang.c:791 msgid "Select time in days : " msgstr "" -#: src/lang.c:789 +#: src/lang.c:792 #, c-format msgid "" "# %s server configuration file\n" @@ -3317,260 +3316,260 @@ msgid "" "\n" msgstr "" -#: src/lang.c:795 +#: src/lang.c:798 msgid "Showing unread groups only" msgstr "" -#: src/lang.c:796 +#: src/lang.c:799 msgid "Subject: line (ignore case) " msgstr "" -#: src/lang.c:797 +#: src/lang.c:800 msgid "Subject: line (case sensitive)" msgstr "" -#: src/lang.c:798 +#: src/lang.c:801 msgid "Save" msgstr "" -#: src/lang.c:799 +#: src/lang.c:802 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "" -#: src/lang.c:800 +#: src/lang.c:803 msgid "Save configuration before continuing?" msgstr "" -#: src/lang.c:801 +#: src/lang.c:804 msgid "Save filename> " msgstr "" -#: src/lang.c:802 +#: src/lang.c:805 msgid "Saved" msgstr "" -#: src/lang.c:803 +#: src/lang.c:806 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "" -#: src/lang.c:804 +#: src/lang.c:807 #, c-format msgid "Saved %s...\n" msgstr "" -#: src/lang.c:805 +#: src/lang.c:808 msgid "Nothing was saved" msgstr "" -#: src/lang.c:806 +#: src/lang.c:809 #, c-format msgid "" "\n" "%s %d %s from %d %s\n" msgstr "" -#: src/lang.c:807 +#: src/lang.c:810 #, c-format msgid "-- %s saved to %s%s --" msgstr "" -#: src/lang.c:808 +#: src/lang.c:811 #, c-format msgid "-- %s saved to %s - %s --" msgstr "" -#: src/lang.c:809 +#: src/lang.c:812 msgid "Saving..." msgstr "" -#: src/lang.c:810 +#: src/lang.c:813 #, c-format msgid "%s: Screen initialization failed" msgstr "%s: Screen initialisation failed" -#: src/lang.c:812 +#: src/lang.c:815 #, c-format msgid "%s: screen is too small\n" msgstr "" -#: src/lang.c:814 +#: src/lang.c:817 #, c-format msgid "screen is too small, %s is exiting" msgstr "" -#: src/lang.c:815 +#: src/lang.c:818 msgid "Delete scope?" msgstr "" -#: src/lang.c:816 +#: src/lang.c:819 msgid "Enter scope> " msgstr "" -#: src/lang.c:817 +#: src/lang.c:820 msgid "Select new position> " msgstr "" -#: src/lang.c:818 +#: src/lang.c:821 msgid "New position cannot be a global scope" msgstr "" -#: src/lang.c:819 +#: src/lang.c:822 msgid "Global scope, operation not allowed" msgstr "" -#: src/lang.c:820 +#: src/lang.c:823 msgid "Rename scope> " msgstr "" -#: src/lang.c:821 +#: src/lang.c:824 msgid "Select scope> " msgstr "" -#: src/lang.c:822 +#: src/lang.c:825 msgid "Scopes Menu" msgstr "" -#: src/lang.c:823 +#: src/lang.c:826 msgid "Scopes Menu Commands" msgstr "" -#: src/lang.c:824 +#: src/lang.c:827 #, c-format msgid "Search backwards [%s]> " msgstr "" -#: src/lang.c:825 +#: src/lang.c:828 #, c-format msgid "Search body [%s]> " msgstr "" -#: src/lang.c:826 +#: src/lang.c:829 #, c-format msgid "Search forwards [%s]> " msgstr "" -#: src/lang.c:827 +#: src/lang.c:830 msgid "Searching..." msgstr "" -#: src/lang.c:828 +#: src/lang.c:831 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "" -#: src/lang.c:829 +#: src/lang.c:832 msgid "Select article> " msgstr "" -#: src/lang.c:830 +#: src/lang.c:833 msgid "" "Select option number before text or use arrow keys and . 'q' to quit." msgstr "" -#: src/lang.c:831 +#: src/lang.c:834 msgid "Select group> " msgstr "" -#: src/lang.c:832 +#: src/lang.c:835 #, c-format msgid "Enter selection pattern [%s]> " msgstr "" -#: src/lang.c:833 +#: src/lang.c:836 msgid "Select thread> " msgstr "" -#: src/lang.c:834 +#: src/lang.c:837 #, c-format msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" msgstr "" -#: src/lang.c:835 +#: src/lang.c:838 msgid "servers active-file" msgstr "" -#: src/lang.c:836 +#: src/lang.c:839 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "" -#: src/lang.c:837 +#: src/lang.c:840 msgid "" msgstr "" -#: src/lang.c:838 +#: src/lang.c:841 #, c-format msgid "Starting: (%s)" msgstr "" -#: src/lang.c:839 +#: src/lang.c:842 #, c-format msgid "List Thread (%d of %d)" msgstr "" -#: src/lang.c:840 +#: src/lang.c:843 #, c-format msgid "Thread (%.*s)" msgstr "" -#: src/lang.c:841 +#: src/lang.c:844 msgid "Enter wildcard subscribe pattern> " msgstr "" -#: src/lang.c:842 +#: src/lang.c:845 #, c-format msgid "subscribed to %d groups" msgstr "" -#: src/lang.c:843 +#: src/lang.c:846 #, c-format msgid "Subscribed to %s" msgstr "" -#: src/lang.c:844 +#: src/lang.c:847 msgid "Subscribing... " msgstr "" -#: src/lang.c:845 +#: src/lang.c:848 #, c-format msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " msgstr "" -#: src/lang.c:846 +#: src/lang.c:849 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "" -#: src/lang.c:847 +#: src/lang.c:850 msgid "Superseding article ..." msgstr "" -#: src/lang.c:848 +#: src/lang.c:851 #, c-format msgid "" "\n" "Stopped. Type 'fg' to restart %s\n" msgstr "" -#: src/lang.c:850 +#: src/lang.c:853 #, c-format msgid "%d days" msgstr "" -#: src/lang.c:851 +#: src/lang.c:854 msgid "" msgstr "" -#: src/lang.c:852 +#: src/lang.c:855 msgid "TeX " msgstr "" -#: src/lang.c:853 +#: src/lang.c:856 msgid "# Default action/prompt strings\n" msgstr "" -#: src/lang.c:854 +#: src/lang.c:857 msgid "" "# Defaults for quick (1 key) kill & auto-selection filters\n" "# header=NUM 0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n" @@ -3581,145 +3580,140 @@ msgid "" "# expire=ON/OFF ON=limit to default_filter_days OFF=don't ever expire\n" msgstr "" -#: src/lang.c:867 +#: src/lang.c:870 msgid "" "# If ON use print current subject or newsgroup description in the last line\n" msgstr "" -#: src/lang.c:868 +#: src/lang.c:871 msgid "# Host & time info used for detecting new groups (don't touch)\n" msgstr "" -#: src/lang.c:869 +#: src/lang.c:872 msgid "There is no news\n" msgstr "" -#: src/lang.c:870 +#: src/lang.c:873 msgid "Thread" msgstr "" -#: src/lang.c:871 +#: src/lang.c:874 msgid "Thread Level Commands" msgstr "" -#: src/lang.c:872 +#: src/lang.c:875 msgid "Thread deselected" msgstr "" -#: src/lang.c:873 +#: src/lang.c:876 msgid "Thread selected" msgstr "" -#: src/lang.c:875 +#: src/lang.c:878 msgid "threads" msgstr "" -#: src/lang.c:877 +#: src/lang.c:880 msgid "thread" msgstr "" -#: src/lang.c:878 +#: src/lang.c:881 #, c-format msgid "Thread %4s of %4s" msgstr "" -#: src/lang.c:879 +#: src/lang.c:882 msgid "Threading articles..." msgstr "" -#: src/lang.c:880 +#: src/lang.c:883 #, c-format msgid "Toggled word highlighting %s" msgstr "" -#: src/lang.c:881 +#: src/lang.c:884 msgid "Toggled rot13 encoding" msgstr "" -#: src/lang.c:882 +#: src/lang.c:885 #, c-format msgid "Toggled german TeX encoding %s" msgstr "" -#: src/lang.c:883 +#: src/lang.c:886 #, c-format msgid "Toggled tab-width to %d" msgstr "" -#: src/lang.c:885 +#: src/lang.c:888 #, c-format msgid "%d Trying to dotlock %s" msgstr "" -#: src/lang.c:886 +#: src/lang.c:889 #, c-format msgid "%d Trying to lock %s" msgstr "" -#: src/lang.c:888 +#: src/lang.c:891 msgid " h=help" msgstr "" -#: src/lang.c:890 +#: src/lang.c:893 msgid "Unlimited" msgstr "" -#: src/lang.c:891 +#: src/lang.c:894 msgid "Enter wildcard unsubscribe pattern> " msgstr "" -#: src/lang.c:892 +#: src/lang.c:895 #, c-format msgid "Error decoding %s : %s" msgstr "" -#: src/lang.c:893 +#: src/lang.c:896 msgid "No end." msgstr "" -#: src/lang.c:894 +#: src/lang.c:897 #, c-format msgid "%s successfully decoded." msgstr "" -#: src/lang.c:895 +#: src/lang.c:898 #, c-format msgid "" "%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" "\n" msgstr "" -#: src/lang.c:896 +#: src/lang.c:899 msgid "unread " msgstr "" -#: src/lang.c:897 +#: src/lang.c:900 #, c-format msgid "unsubscribed from %d groups" msgstr "" -#: src/lang.c:898 +#: src/lang.c:901 #, c-format msgid "Unsubscribed from %s" msgstr "" -#: src/lang.c:899 +#: src/lang.c:902 msgid "Unsubscribing... " msgstr "" -#: src/lang.c:900 +#: src/lang.c:903 msgid "Unthreading articles..." msgstr "" -#: src/lang.c:901 +#: src/lang.c:904 msgid "Updated" msgstr "" -#: src/lang.c:903 -#, c-format -msgid "unparseable \"LIST COUNTS\" line: \"%s\"" -msgstr "" - #: src/lang.c:905 msgid "Updating" msgstr "" @@ -3873,22 +3867,27 @@ msgstr "" #: src/lang.c:939 #, c-format +msgid "%s only useful for batch or debug mode operations\n" +msgstr "" + +#: src/lang.c:940 +#, c-format msgid "Useless combination %s and %s. Ignoring %s.\n" msgstr "" -#: src/lang.c:941 +#: src/lang.c:942 #, c-format msgid "" "\n" "%s%d out of range (0 - %d). Reset to 0" msgstr "" -#: src/lang.c:942 +#: src/lang.c:943 #, c-format msgid "View '%s' (%s/%s)?" msgstr "" -#: src/lang.c:944 +#: src/lang.c:945 #, c-format msgid "" "\n" @@ -3896,33 +3895,33 @@ msgid "" "%-100s\n" msgstr "" -#: src/lang.c:945 +#: src/lang.c:946 msgid "" "\n" "Warning: article unchanged after editing\n" msgstr "" -#: src/lang.c:946 +#: src/lang.c:947 msgid "" "\n" "Warning: \"Subject:\" contains only whitespaces.\n" msgstr "" -#: src/lang.c:947 +#: src/lang.c:948 msgid "" "\n" "Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:" "\".\n" msgstr "" -#: src/lang.c:949 +#: src/lang.c:950 msgid "" "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" " with \"Re: \" and does not contain \"(was:\".\n" msgstr "" -#: src/lang.c:952 +#: src/lang.c:953 msgid "" "Read carefully!\n" "\n" @@ -3936,7 +3935,7 @@ msgid "" "\n" msgstr "" -#: src/lang.c:956 +#: src/lang.c:957 msgid "" "\n" "Warning: You are using a non-plain transfer encoding (such as base64 or\n" @@ -3945,13 +3944,13 @@ msgid "" " not be encoded properly.\n" msgstr "" -#: src/lang.c:961 +#: src/lang.c:962 msgid "" "\n" "Warning: \"example\" is a reserved hierarchy!\n" msgstr "" -#: src/lang.c:962 +#: src/lang.c:963 #, c-format msgid "" "\n" @@ -3961,7 +3960,7 @@ msgid "" "Read WHATSNEW, etc...\n" msgstr "" -#: src/lang.c:964 +#: src/lang.c:965 #, c-format msgid "" "\n" @@ -3970,7 +3969,7 @@ msgid "" "Some values in your %s file may be ignored, others might have changed!\n" msgstr "" -#: src/lang.c:967 +#: src/lang.c:968 #, c-format msgid "" "Warning: tin wrote fewer groups to your\n" @@ -3980,19 +3979,19 @@ msgid "" "before you start tin once again!\n" msgstr "" -#: src/lang.c:971 +#: src/lang.c:972 #, c-format msgid "" "\n" "Warning: Found %d '-- \\n' lines, this may confuse some people.\n" msgstr "" -#: src/lang.c:972 +#: src/lang.c:973 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "" -#: src/lang.c:973 +#: src/lang.c:974 #, c-format msgid "" "\n" @@ -4003,49 +4002,49 @@ msgid "" " possible.\n" msgstr "" -#: src/lang.c:977 +#: src/lang.c:978 #, c-format msgid "" "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " msgstr "" -#: src/lang.c:978 +#: src/lang.c:979 msgid "" "\n" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" msgstr "" -#: src/lang.c:979 +#: src/lang.c:980 msgid "Writing attributes file..." msgstr "" -#: src/lang.c:981 +#: src/lang.c:982 #, c-format msgid "%d Responses" msgstr "" -#: src/lang.c:983 +#: src/lang.c:984 #, c-format msgid "Added %d %s" msgstr "" -#: src/lang.c:984 +#: src/lang.c:985 msgid "No unsubscribed groups to show" msgstr "" -#: src/lang.c:985 +#: src/lang.c:986 msgid "Showing subscribed to groups only" msgstr "" -#: src/lang.c:986 +#: src/lang.c:987 msgid "Yes " msgstr "" -#: src/lang.c:987 +#: src/lang.c:988 msgid " You have mail" msgstr "" -#: src/lang.c:992 +#: src/lang.c:993 #, c-format msgid "" "\n" @@ -4058,11 +4057,11 @@ msgid "" " M)enu option.\n" msgstr "" -#: src/lang.c:1003 +#: src/lang.c:1004 msgid " -D mode debug mode" msgstr "" -#: src/lang.c:1007 +#: src/lang.c:1008 msgid "" "Read carefully!\n" "\n" @@ -4079,11 +4078,11 @@ msgid "" "\n" msgstr "" -#: src/lang.c:1016 +#: src/lang.c:1017 msgid "toggle color" msgstr "toggle colour" -#: src/lang.c:1017 +#: src/lang.c:1018 msgid "" "# Changing colors of several screen parts\n" "# Possible values are:\n" @@ -4129,218 +4128,212 @@ msgstr "" "# 15 = light white\n" "\n" -#: src/lang.c:1037 +#: src/lang.c:1038 msgid " -a toggle color flag" msgstr " -a toggle colour flag" -#: src/lang.c:1041 +#: src/lang.c:1042 msgid "" "\n" "Error: Followup-To set to more than one newsgroup!\n" msgstr "" -#: src/lang.c:1042 +#: src/lang.c:1043 #, c-format msgid "" "\n" "Error: \"%s\" is renamed, use \"%s\" instead!\n" msgstr "" -#: src/lang.c:1043 +#: src/lang.c:1044 #, c-format msgid "" "\n" "Error: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "" -#: src/lang.c:1044 +#: src/lang.c:1045 #, c-format msgid "" "\n" "Error: \"%s\" is not a valid newsgroup!\n" msgstr "" -#: src/lang.c:1046 +#: src/lang.c:1047 msgid "" "\n" "Warning: Followup-To set to more than one newsgroup!\n" msgstr "" -#: src/lang.c:1047 +#: src/lang.c:1048 #, c-format msgid "" "\n" "Warning: \"%s\" is renamed, you should use \"%s\" instead!\n" msgstr "" -#: src/lang.c:1048 +#: src/lang.c:1049 #, c-format msgid "" "\n" "Warning: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "" -#: src/lang.c:1049 +#: src/lang.c:1050 #, c-format msgid "" "\n" "Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n" msgstr "" -#: src/lang.c:1050 +#: src/lang.c:1051 #, c-format msgid "" "\n" "Warning: \"%s\" is not a valid newsgroup at this site!\n" msgstr "" -#: src/lang.c:1054 +#: src/lang.c:1055 #, c-format msgid "%d files successfully written from %d articles. %d %s occurred." msgstr "" -#: src/lang.c:1055 +#: src/lang.c:1056 msgid "Missing parts." msgstr "" -#: src/lang.c:1056 +#: src/lang.c:1057 msgid "No beginning." msgstr "" -#: src/lang.c:1057 +#: src/lang.c:1058 msgid "No data." msgstr "" -#: src/lang.c:1058 +#: src/lang.c:1059 msgid "Unknown error." msgstr "" -#: src/lang.c:1061 +#: src/lang.c:1062 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "" -#: src/lang.c:1066 +#: src/lang.c:1067 msgid "Reading mail active file... " msgstr "" -#: src/lang.c:1067 +#: src/lang.c:1068 msgid "Reading mailgroups file... " msgstr "" -#: src/lang.c:1071 +#: src/lang.c:1072 msgid "perform PGP operations on article" msgstr "" -#: src/lang.c:1072 +#: src/lang.c:1073 msgid "Add key(s) to public keyring?" msgstr "" -#: src/lang.c:1073 +#: src/lang.c:1074 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "" -#: src/lang.c:1074 +#: src/lang.c:1075 #, c-format msgid "%s=sign, %s=sign & include public key, %s=quit: " msgstr "" -#: src/lang.c:1075 +#: src/lang.c:1076 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "" -#: src/lang.c:1076 +#: src/lang.c:1077 msgid "Article not signed and no public keys found" msgstr "" -#: src/lang.c:1078 +#: src/lang.c:1079 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:1079 +#: src/lang.c:1080 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " msgstr "" -#: src/lang.c:1080 +#: src/lang.c:1081 #, c-format msgid "" "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:1082 +#: src/lang.c:1083 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:1083 +#: src/lang.c:1084 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "" -#: src/lang.c:1084 +#: src/lang.c:1085 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:1088 +#: src/lang.c:1089 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:1089 +#: src/lang.c:1090 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "" -#: src/lang.c:1090 +#: src/lang.c:1091 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:1092 +#: src/lang.c:1093 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:1093 +#: src/lang.c:1094 #, c-format msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "" -#: src/lang.c:1094 +#: src/lang.c:1095 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:1103 +#: src/lang.c:1104 msgid "Try cache_overview_files to speed up things.\n" msgstr "" -#: src/lang.c:1104 +#: src/lang.c:1105 msgid "Tin will use local index files instead.\n" msgstr "" -#: src/lang.c:1105 +#: src/lang.c:1106 msgid "Cannot find NNTP server name" msgstr "" -#: src/lang.c:1106 +#: src/lang.c:1107 #, c-format msgid "Connecting to %s:%u..." msgstr "" -#: src/lang.c:1107 -msgid "Disconnecting from server...\n" -msgstr "" - #: src/lang.c:1108 -#, c-format -msgid "" -"Wrong newsgroup name (\"%s\") in response of \"GROUP %s\" command: \"%s\"" +msgid "Disconnecting from server..." msgstr "" #: src/lang.c:1109 @@ -5078,95 +5071,99 @@ msgstr "" msgid "NFD" msgstr "" -#: src/lang.c:1586 +#: src/lang.c:1580 +msgid "NFKC case fold" +msgstr "" + +#: src/lang.c:1589 msgid "Display Options" msgstr "" -#: src/lang.c:1593 +#: src/lang.c:1596 msgid "Color Options" msgstr "Colour Options" -#: src/lang.c:1599 +#: src/lang.c:1602 msgid "Highlight Options" msgstr "" -#: src/lang.c:1606 +#: src/lang.c:1609 msgid "Article-Limiting Options" msgstr "" -#: src/lang.c:1612 +#: src/lang.c:1615 msgid "Posting/Mailing Options" msgstr "" -#: src/lang.c:1618 +#: src/lang.c:1621 msgid "Saving/Printing Options" msgstr "" -#: src/lang.c:1624 +#: src/lang.c:1627 msgid "Expert Options" msgstr "" -#: src/lang.c:1630 +#: src/lang.c:1633 msgid "Filtering Options" msgstr "" -#: src/lang.c:1635 src/lang.c:1666 src/lang.c:1672 src/lang.c:1699 -#: src/lang.c:1751 src/lang.c:1757 src/lang.c:1767 src/lang.c:1778 -#: src/lang.c:1796 src/lang.c:1865 src/lang.c:2066 src/lang.c:2072 -#: src/lang.c:2078 src/lang.c:2084 src/lang.c:2096 src/lang.c:2103 -#: src/lang.c:2157 src/lang.c:2166 src/lang.c:2172 src/lang.c:2179 -#: src/lang.c:2186 src/lang.c:2193 src/lang.c:2200 src/lang.c:2207 -#: src/lang.c:2214 src/lang.c:2221 src/lang.c:2228 src/lang.c:2235 -#: src/lang.c:2242 src/lang.c:2249 src/lang.c:2256 src/lang.c:2263 -#: src/lang.c:2270 src/lang.c:2277 src/lang.c:2284 src/lang.c:2291 -#: src/lang.c:2298 src/lang.c:2305 src/lang.c:2312 src/lang.c:2319 -#: src/lang.c:2326 src/lang.c:2333 src/lang.c:2340 src/lang.c:2348 -#: src/lang.c:2364 src/lang.c:2371 src/lang.c:2378 src/lang.c:2385 -#: src/lang.c:2391 src/lang.c:2397 src/lang.c:2414 src/lang.c:2426 -#: src/lang.c:2461 src/lang.c:2514 src/lang.c:2528 src/lang.c:2534 -#: src/lang.c:2559 src/lang.c:2577 src/lang.c:2594 src/lang.c:2606 -#: src/lang.c:2639 src/lang.c:2675 src/lang.c:2695 src/lang.c:2730 -#: src/lang.c:2740 src/lang.c:2747 src/lang.c:2773 src/lang.c:2797 -#: src/lang.c:2870 src/lang.c:2884 src/lang.c:2892 src/lang.c:2906 -#: src/lang.c:2912 src/lang.c:2950 +#: src/lang.c:1638 src/lang.c:1669 src/lang.c:1675 src/lang.c:1702 +#: src/lang.c:1754 src/lang.c:1760 src/lang.c:1770 src/lang.c:1781 +#: src/lang.c:1799 src/lang.c:1868 src/lang.c:2069 src/lang.c:2075 +#: src/lang.c:2081 src/lang.c:2087 src/lang.c:2099 src/lang.c:2106 +#: src/lang.c:2160 src/lang.c:2169 src/lang.c:2175 src/lang.c:2182 +#: src/lang.c:2189 src/lang.c:2196 src/lang.c:2203 src/lang.c:2210 +#: src/lang.c:2217 src/lang.c:2224 src/lang.c:2231 src/lang.c:2238 +#: src/lang.c:2245 src/lang.c:2252 src/lang.c:2259 src/lang.c:2266 +#: src/lang.c:2273 src/lang.c:2280 src/lang.c:2287 src/lang.c:2294 +#: src/lang.c:2301 src/lang.c:2308 src/lang.c:2315 src/lang.c:2322 +#: src/lang.c:2329 src/lang.c:2336 src/lang.c:2343 src/lang.c:2351 +#: src/lang.c:2367 src/lang.c:2374 src/lang.c:2381 src/lang.c:2388 +#: src/lang.c:2394 src/lang.c:2400 src/lang.c:2417 src/lang.c:2429 +#: src/lang.c:2464 src/lang.c:2517 src/lang.c:2531 src/lang.c:2537 +#: src/lang.c:2562 src/lang.c:2580 src/lang.c:2597 src/lang.c:2609 +#: src/lang.c:2642 src/lang.c:2678 src/lang.c:2698 src/lang.c:2733 +#: src/lang.c:2743 src/lang.c:2750 src/lang.c:2776 src/lang.c:2800 +#: src/lang.c:2877 src/lang.c:2892 src/lang.c:2900 src/lang.c:2914 +#: src/lang.c:2920 src/lang.c:2958 msgid " toggles, sets, cancels." msgstr "" -#: src/lang.c:1636 +#: src/lang.c:1639 msgid "Show mini menu & posting etiquette" msgstr "" -#: src/lang.c:1637 +#: src/lang.c:1640 msgid "" "# If ON show a mini menu of useful commands at each level\n" "# and posting etiquette after composing an article\n" msgstr "" -#: src/lang.c:1642 +#: src/lang.c:1645 msgid "Show short description for each newsgroup. toggles & sets." msgstr "" -#: src/lang.c:1643 +#: src/lang.c:1646 msgid "Show description of each newsgroup" msgstr "" -#: src/lang.c:1644 +#: src/lang.c:1647 msgid "" "# If ON show group description text after newsgroup name at\n" "# group selection level\n" msgstr "" -#: src/lang.c:1649 +#: src/lang.c:1652 msgid "" "Show From (author) fields in group & thread level. toggles & " "sets." msgstr "" -#: src/lang.c:1650 +#: src/lang.c:1653 msgid "In group and thread level, show author by" msgstr "" -#: src/lang.c:1651 +#: src/lang.c:1654 msgid "" "# Part of From field to display in group and thread level\n" "# Possible values are (the default is marked with *):\n" @@ -5176,31 +5173,31 @@ msgid "" "# 3 = both\n" msgstr "" -#: src/lang.c:1660 +#: src/lang.c:1663 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "" -#: src/lang.c:1661 +#: src/lang.c:1664 msgid "Draw -> instead of highlighted bar" msgstr "" -#: src/lang.c:1662 +#: src/lang.c:1665 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "" -#: src/lang.c:1667 +#: src/lang.c:1670 msgid "Use inverse video for page headers" msgstr "" -#: src/lang.c:1668 +#: src/lang.c:1671 msgid "# If ON use inverse video for page headers at different levels\n" msgstr "" -#: src/lang.c:1673 +#: src/lang.c:1676 msgid "Thread articles by" msgstr "" -#: src/lang.c:1674 +#: src/lang.c:1677 msgid "" "# Thread articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5212,15 +5209,15 @@ msgid "" "# 5 = Percentage Match\n" msgstr "" -#: src/lang.c:1685 +#: src/lang.c:1688 msgid "Enter percentage match required to thread together. sets." msgstr "" -#: src/lang.c:1686 +#: src/lang.c:1689 msgid "Thread percentage match" msgstr "" -#: src/lang.c:1688 +#: src/lang.c:1691 #, no-c-format msgid "" "# Thread percentage match...\n" @@ -5235,11 +5232,11 @@ msgid "" "# 'harppy' would be threaded separately from 'happy'\n" msgstr "" -#: src/lang.c:1700 +#: src/lang.c:1703 msgid "Score of a thread" msgstr "" -#: src/lang.c:1701 +#: src/lang.c:1704 msgid "" "# Thread score\n" "# Possible values are (the default is marked with *):\n" @@ -5248,16 +5245,16 @@ msgid "" "# 2 = average\n" msgstr "" -#: src/lang.c:1709 +#: src/lang.c:1712 msgid "" "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "" -#: src/lang.c:1710 +#: src/lang.c:1713 msgid "Sort articles by" msgstr "" -#: src/lang.c:1711 +#: src/lang.c:1714 msgid "" "# Sort articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5274,15 +5271,15 @@ msgid "" "# 10 = Lines ascending\n" msgstr "" -#: src/lang.c:1727 +#: src/lang.c:1730 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "" -#: src/lang.c:1728 +#: src/lang.c:1731 msgid "Sort threads by" msgstr "" -#: src/lang.c:1729 +#: src/lang.c:1732 msgid "" "# Sort thread by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5293,44 +5290,44 @@ msgid "" "# 4 = Last posting date ascending\n" msgstr "" -#: src/lang.c:1739 +#: src/lang.c:1742 msgid "" "Put cursor at first/last unread art in groups. toggles & sets." msgstr "" -#: src/lang.c:1740 +#: src/lang.c:1743 msgid "Go to first unread article in group" msgstr "" -#: src/lang.c:1741 +#: src/lang.c:1744 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "" -#: src/lang.c:1745 +#: src/lang.c:1748 msgid "Show all articles or only unread articles. toggles & sets." msgstr "" -#: src/lang.c:1746 +#: src/lang.c:1749 msgid "Show only unread articles" msgstr "" -#: src/lang.c:1747 +#: src/lang.c:1750 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "" -#: src/lang.c:1752 +#: src/lang.c:1755 msgid "Show only groups with unread arts" msgstr "" -#: src/lang.c:1753 +#: src/lang.c:1756 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "" -#: src/lang.c:1758 +#: src/lang.c:1761 msgid "Filter which articles" msgstr "" -#: src/lang.c:1759 +#: src/lang.c:1762 msgid "" "# Filter which articles\n" "# Possible values are (the default is marked with *):\n" @@ -5339,11 +5336,11 @@ msgid "" "# 2 = kill all articles and never show them\n" msgstr "" -#: src/lang.c:1768 +#: src/lang.c:1771 msgid "Go to the next unread article with" msgstr "" -#: src/lang.c:1769 +#: src/lang.c:1772 msgid "" "# Go to the unread article with following key(s)\n" "# Possible values are (the default is marked with *):\n" @@ -5353,11 +5350,11 @@ msgid "" "# 3 = PAGE DOWN or TAB\n" msgstr "" -#: src/lang.c:1779 +#: src/lang.c:1782 msgid "How to treat blank lines" msgstr "" -#: src/lang.c:1780 +#: src/lang.c:1783 msgid "" "# Trim the article body, remove unnecessary blank lines.\n" "# Possible values are (the default is marked with *):\n" @@ -5374,168 +5371,168 @@ msgid "" "# leading and trailing blank lines\n" msgstr "" -#: src/lang.c:1797 +#: src/lang.c:1800 msgid "List thread using right arrow key" msgstr "" -#: src/lang.c:1798 +#: src/lang.c:1801 msgid "" "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "" -#: src/lang.c:1802 +#: src/lang.c:1805 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "" -#: src/lang.c:1803 +#: src/lang.c:1806 msgid "Character to show deleted articles" msgstr "" -#: src/lang.c:1804 +#: src/lang.c:1807 msgid "" "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1809 +#: src/lang.c:1812 msgid "" "Enter character to indicate articles in a range. sets, cancels." msgstr "" -#: src/lang.c:1810 +#: src/lang.c:1813 msgid "Character to show inrange articles" msgstr "" -#: src/lang.c:1811 +#: src/lang.c:1814 msgid "" "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1816 +#: src/lang.c:1819 msgid "" "Enter character to indicate that article will return. sets, " "cancels." msgstr "" -#: src/lang.c:1817 +#: src/lang.c:1820 msgid "Character to show returning arts" msgstr "" -#: src/lang.c:1818 +#: src/lang.c:1821 msgid "" "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1823 +#: src/lang.c:1826 msgid "" "Enter character to indicate selected articles. sets, cancels." msgstr "" -#: src/lang.c:1824 +#: src/lang.c:1827 msgid "Character to show selected articles" msgstr "" -#: src/lang.c:1825 +#: src/lang.c:1828 msgid "" "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1830 +#: src/lang.c:1833 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "" -#: src/lang.c:1831 +#: src/lang.c:1834 msgid "Character to show recent articles" msgstr "" -#: src/lang.c:1832 +#: src/lang.c:1835 msgid "" "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1837 +#: src/lang.c:1840 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "" -#: src/lang.c:1838 +#: src/lang.c:1841 msgid "Character to show unread articles" msgstr "" -#: src/lang.c:1839 +#: src/lang.c:1842 msgid "" "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1844 +#: src/lang.c:1847 msgid "Enter character to indicate read articles. sets, cancels." msgstr "" -#: src/lang.c:1845 +#: src/lang.c:1848 msgid "Character to show read articles" msgstr "" -#: src/lang.c:1846 +#: src/lang.c:1849 msgid "" "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1851 +#: src/lang.c:1854 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "" -#: src/lang.c:1852 +#: src/lang.c:1855 msgid "Character to show killed articles" msgstr "" -#: src/lang.c:1853 +#: src/lang.c:1856 msgid "" "# Character used to show that an art was killed (default 'K')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" msgstr "" -#: src/lang.c:1858 +#: src/lang.c:1861 msgid "" "Enter character to indicate read selected articles. sets, cancels." msgstr "" -#: src/lang.c:1859 +#: src/lang.c:1862 msgid "Character to show readselected arts" msgstr "" -#: src/lang.c:1860 +#: src/lang.c:1863 msgid "" "# Character used to show that an art was selected before read (default ':')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" msgstr "" -#: src/lang.c:1866 +#: src/lang.c:1869 msgid "Abbreviate long newsgroup names" msgstr "" -#: src/lang.c:1867 +#: src/lang.c:1870 msgid "" "# If ON abbreviate (if necessary) long newsgroup names at group selection\n" "# level and article level like this:\n" "# news.software.readers -> n.software.readers -> n.s.readers -> n.s.r.\n" msgstr "" -#: src/lang.c:1873 +#: src/lang.c:1876 msgid "" "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" msgstr "" -#: src/lang.c:1874 +#: src/lang.c:1877 msgid "Number of lines to scroll in pager" msgstr "" -#: src/lang.c:1875 +#: src/lang.c:1878 msgid "" "# Number of lines that cursor-up/down will scroll in article pager\n" "# Possible values are (the default is marked with *):\n" @@ -5553,28 +5550,28 @@ msgstr "" "# * 1 = line-by-line\n" "# 2 or greater = scroll by 2 or more lines (only in the pager)\n" -#: src/lang.c:1885 +#: src/lang.c:1888 msgid "Display signatures. toggles & sets." msgstr "" -#: src/lang.c:1886 +#: src/lang.c:1889 msgid "Display signatures" msgstr "" -#: src/lang.c:1887 +#: src/lang.c:1890 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "" -#: src/lang.c:1891 +#: src/lang.c:1894 msgid "" "Display uuencoded data as tagged attachments. toggles & sets." msgstr "" -#: src/lang.c:1892 +#: src/lang.c:1895 msgid "Display uue data as an attachment" msgstr "" -#: src/lang.c:1893 +#: src/lang.c:1896 msgid "" "# Handling of uuencoded data in the pager\n" "# Possible values are (the default is marked with *):\n" @@ -5586,30 +5583,30 @@ msgid "" "# be folded into a tag line.\n" msgstr "" -#: src/lang.c:1903 +#: src/lang.c:1906 msgid "" "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "" -#: src/lang.c:1904 +#: src/lang.c:1907 msgid "Display \"a as Umlaut-a" msgstr "" -#: src/lang.c:1905 +#: src/lang.c:1908 msgid "" "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" msgstr "" -#: src/lang.c:1910 src/lang.c:1920 +#: src/lang.c:1913 src/lang.c:1923 msgid "Space separated list of header fields" msgstr "" -#: src/lang.c:1911 +#: src/lang.c:1914 msgid "Display these header fields (or *)" msgstr "" -#: src/lang.c:1912 +#: src/lang.c:1915 msgid "" "# Which news headers you wish to see. If you want to see _all_ the headers,\n" "# place an '*' as this value. This is the only way a wildcard can be used.\n" @@ -5619,11 +5616,11 @@ msgid "" "# spaces. Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1921 +#: src/lang.c:1924 msgid "Do not display these header fields" msgstr "" -#: src/lang.c:1922 +#: src/lang.c:1925 msgid "" "# Same as 'news_headers_to_display' except it denotes the opposite.\n" "# An example of using both options might be if you thought X- headers were\n" @@ -5635,357 +5632,357 @@ msgid "" "# Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1932 +#: src/lang.c:1935 msgid "" "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "" -#: src/lang.c:1933 +#: src/lang.c:1936 msgid "Skip multipart/alternative parts" msgstr "" -#: src/lang.c:1934 +#: src/lang.c:1937 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "" -#: src/lang.c:1938 +#: src/lang.c:1941 msgid "Enable detection of verbatim blocks? toggles & sets." msgstr "" -#: src/lang.c:1939 +#: src/lang.c:1942 msgid "Detection of verbatim blocks" msgstr "" -#: src/lang.c:1940 +#: src/lang.c:1943 msgid "# If ON detect verbatim blocks in articles\n" msgstr "" -#: src/lang.c:1945 +#: src/lang.c:1948 msgid "A regex used to decide which lines to show in col_quote." msgstr "" -#: src/lang.c:1946 +#: src/lang.c:1949 msgid "Regex used to show quoted lines" msgstr "" -#: src/lang.c:1947 +#: src/lang.c:1950 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# quoted when viewing articles. Quoted lines are shown in col_quote.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1953 +#: src/lang.c:1956 msgid "A regex used to decide which lines to show in col_quote2." msgstr "" -#: src/lang.c:1954 +#: src/lang.c:1957 msgid "Regex used to show twice quoted l." msgstr "" -#: src/lang.c:1955 +#: src/lang.c:1958 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# quoted twice. Twice quoted lines are shown in col_quote2.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1961 +#: src/lang.c:1964 msgid "A regex used to decide which lines to show in col_quote3." msgstr "" -#: src/lang.c:1962 +#: src/lang.c:1965 msgid "Regex used to show >= 3 times q.l." msgstr "" -#: src/lang.c:1963 +#: src/lang.c:1966 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# quoted >=3 times. >=3 times quoted lines are shown in col_quote3.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1969 +#: src/lang.c:1972 msgid "Enable detection of external quotes? toggles & sets." msgstr "" -#: src/lang.c:1970 +#: src/lang.c:1973 msgid "Detection of external quotes" msgstr "" -#: src/lang.c:1971 +#: src/lang.c:1974 msgid "# If ON detect quoted text from external sources in articles\n" msgstr "" -#: src/lang.c:1975 +#: src/lang.c:1978 msgid "A regex used to decide which lines to show in col_extquote." msgstr "" -#: src/lang.c:1976 +#: src/lang.c:1979 msgid "Regex used to show quotes from external sources" msgstr "" -#: src/lang.c:1977 +#: src/lang.c:1980 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# external quotes. Text from external quotes is shown in col_extquote.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1984 +#: src/lang.c:1987 msgid "A regex used to decide which words to show in col_markslashes." msgstr "" -#: src/lang.c:1985 +#: src/lang.c:1988 msgid "Regex used to highlight /slashes/" msgstr "" -#: src/lang.c:1986 +#: src/lang.c:1989 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '/' are to be shown in col_markslashes.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1992 +#: src/lang.c:1995 msgid "A regex used to decide which words to show in col_markstars." msgstr "" -#: src/lang.c:1993 +#: src/lang.c:1996 msgid "Regex used to highlight *stars*" msgstr "" -#: src/lang.c:1994 +#: src/lang.c:1997 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '*' are to be shown in col_markstars.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:2000 +#: src/lang.c:2003 msgid "A regex used to decide which words to show in col_markstroke." msgstr "" -#: src/lang.c:2001 +#: src/lang.c:2004 msgid "Regex used to highlight -strokes-" msgstr "" -#: src/lang.c:2002 +#: src/lang.c:2005 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '-' are to be shown in col_markstroke.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:2008 +#: src/lang.c:2011 msgid "A regex used to decide which words to show in col_markdash." msgstr "" -#: src/lang.c:2009 +#: src/lang.c:2012 msgid "Regex used to highlight _underline_" msgstr "" -#: src/lang.c:2010 +#: src/lang.c:2013 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '_' are to be shown in col_markdash.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:2016 +#: src/lang.c:2019 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:2017 +#: src/lang.c:2020 msgid "Regex with Subject prefixes" msgstr "" -#: src/lang.c:2018 +#: src/lang.c:2021 msgid "" "# A regular expression that tin will use to find Subject prefixes\n" "# which will be removed before showing the header.\n" msgstr "" -#: src/lang.c:2023 +#: src/lang.c:2026 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:2024 +#: src/lang.c:2027 msgid "Regex with Subject suffixes" msgstr "" -#: src/lang.c:2025 +#: src/lang.c:2028 msgid "" "# A regular expression that tin will use to find Subject suffixes\n" "# which will be removed when replying or posting followup.\n" msgstr "" -#: src/lang.c:2030 +#: src/lang.c:2033 msgid "A regex used to find the begin of a verbatim block." msgstr "" -#: src/lang.c:2031 +#: src/lang.c:2034 msgid "Regex for begin of a verbatim block" msgstr "" -#: src/lang.c:2032 +#: src/lang.c:2035 msgid "" "# A regular expression that tin will use to find the begin of\n" "# a verbatim block.\n" msgstr "" -#: src/lang.c:2037 +#: src/lang.c:2040 msgid "A regex used to find the end of a verbatim block." msgstr "" -#: src/lang.c:2038 +#: src/lang.c:2041 msgid "Regex for end of a verbatim block" msgstr "" -#: src/lang.c:2039 +#: src/lang.c:2042 msgid "" "# A regular expression that tin will use to find the end of\n" "# a verbatim block.\n" msgstr "" -#: src/lang.c:2044 +#: src/lang.c:2047 msgid "" "Enter name and options for external MIME viewer, --internal for built-in " "viewer" msgstr "" -#: src/lang.c:2045 +#: src/lang.c:2048 msgid "MIME binary content viewer" msgstr "" -#: src/lang.c:2046 +#: src/lang.c:2049 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 " +"# Otherwise specify an external viewer program (eg. metamail) or leave " "blank\n" "# for no automatic viewing\n" msgstr "" -#: src/lang.c:2053 +#: src/lang.c:2056 msgid "Confirm before starting non-text viewing program" msgstr "" -#: src/lang.c:2054 +#: src/lang.c:2057 msgid "Ask before using MIME viewer" msgstr "" -#: src/lang.c:2055 +#: src/lang.c:2058 msgid "" "# If ON tin will ask before using metamail to display MIME messages\n" "# this only happens if metamail_prog is set to something\n" msgstr "" -#: src/lang.c:2060 +#: src/lang.c:2063 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "" -#: src/lang.c:2061 +#: src/lang.c:2064 msgid "Catchup read groups when quitting" msgstr "" -#: src/lang.c:2062 +#: src/lang.c:2065 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "" -#: src/lang.c:2067 +#: src/lang.c:2070 msgid "Catchup group using left key" msgstr "" -#: src/lang.c:2068 +#: src/lang.c:2071 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "" -#: src/lang.c:2073 +#: src/lang.c:2076 msgid "Catchup thread by using left key" msgstr "" -#: src/lang.c:2079 +#: src/lang.c:2082 msgid "Which actions require confirmation" msgstr "" -#: src/lang.c:2080 +#: src/lang.c:2083 msgid "# What should we ask confirmation for.\n" msgstr "" -#: src/lang.c:2085 +#: src/lang.c:2088 msgid "'Mark as (un)read' ignores tags" msgstr "" -#: src/lang.c:2086 +#: src/lang.c:2089 msgid "" "# If ON the 'Mark as (un)read' function marks only the current article.\n" msgstr "" -#: src/lang.c:2090 +#: src/lang.c:2093 msgid "Program to run to open URLs, sets, cancels." msgstr "" -#: src/lang.c:2091 +#: src/lang.c:2094 msgid "Program that opens URLs" msgstr "" -#: src/lang.c:2092 +#: src/lang.c:2095 msgid "# The program used to open URLs. The actual URL will be appended\n" msgstr "" -#: src/lang.c:2097 +#: src/lang.c:2100 msgid "Use mouse in xterm" msgstr "" -#: src/lang.c:2098 +#: src/lang.c:2101 msgid "# If ON enable mouse button support on xterm terminals\n" msgstr "" -#: src/lang.c:2104 +#: src/lang.c:2107 msgid "Use scroll keys on keypad" msgstr "" -#: src/lang.c:2105 +#: src/lang.c:2108 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "" -#: src/lang.c:2110 +#: src/lang.c:2113 msgid "Enter maximum number of article to get. sets." msgstr "" -#: src/lang.c:2111 +#: src/lang.c:2114 msgid "Number of articles to get" msgstr "" -#: src/lang.c:2112 +#: src/lang.c:2115 msgid "" "# Number of articles to get (0=no limit), if negative sets maximum number\n" "# of already read articles to be read before first unread one\n" msgstr "" -#: src/lang.c:2117 +#: src/lang.c:2120 msgid "Enter number of days article is considered recent. sets." msgstr "" -#: src/lang.c:2118 +#: src/lang.c:2121 msgid "Article recentness time limit" msgstr "" -#: src/lang.c:2119 +#: src/lang.c:2122 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "" -#: src/lang.c:2123 +#: src/lang.c:2126 msgid "" "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "" -#: src/lang.c:2124 +#: src/lang.c:2127 msgid "Wildcard matching" msgstr "" -#: src/lang.c:2125 +#: src/lang.c:2128 msgid "" "# Wildcard matching\n" "# Possible values are (the default is marked with *):\n" @@ -5993,77 +5990,77 @@ msgid "" "# 1 = regex\n" msgstr "" -#: src/lang.c:2132 +#: src/lang.c:2135 msgid "Enter minimal score before an article is marked killed. sets." msgstr "" -#: src/lang.c:2133 +#: src/lang.c:2136 msgid "Score limit (kill)" msgstr "" -#: src/lang.c:2134 +#: src/lang.c:2137 msgid "# Score limit before an article is marked killed\n" msgstr "" -#: src/lang.c:2138 +#: src/lang.c:2141 msgid "Enter default score to kill articles. sets." msgstr "" -#: src/lang.c:2139 +#: src/lang.c:2142 msgid "Default score to kill articles" msgstr "" -#: src/lang.c:2140 +#: src/lang.c:2143 msgid "# Default score to kill articles\n" msgstr "" -#: src/lang.c:2144 +#: src/lang.c:2147 msgid "Enter minimal score before an article is marked hot. sets." msgstr "" -#: src/lang.c:2145 +#: src/lang.c:2148 msgid "Score limit (select)" msgstr "" -#: src/lang.c:2146 +#: src/lang.c:2149 msgid "# Score limit before an article is marked hot\n" msgstr "" -#: src/lang.c:2150 +#: src/lang.c:2153 msgid "Enter default score to select articles. sets." msgstr "" -#: src/lang.c:2151 +#: src/lang.c:2154 msgid "Default score to select articles" msgstr "" -#: src/lang.c:2152 +#: src/lang.c:2155 msgid "# Default score to select articles\n" msgstr "" -#: src/lang.c:2158 +#: src/lang.c:2161 msgid "Use slrnface to show ''X-Face:''s" msgstr "" -#: src/lang.c:2159 +#: src/lang.c:2162 msgid "" "# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n" "# Only useful when running in an xterm.\n" msgstr "" -#: src/lang.c:2167 +#: src/lang.c:2170 msgid "Use ANSI color" msgstr "Use ANSI colour" -#: src/lang.c:2168 +#: src/lang.c:2171 msgid "# If ON using ANSI-color\n" msgstr "# If ON using ANSI-colour\n" -#: src/lang.c:2173 +#: src/lang.c:2176 msgid "Standard foreground color" msgstr "Standard foreground colour" -#: src/lang.c:2174 +#: src/lang.c:2177 msgid "" "# Standard foreground color\n" "# Default: -1 (default color)\n" @@ -6071,11 +6068,11 @@ msgstr "" "# Standard foreground colour\n" "# Default: -1 (default colour)\n" -#: src/lang.c:2180 +#: src/lang.c:2183 msgid "Standard background color" msgstr "Standard background colour" -#: src/lang.c:2181 +#: src/lang.c:2184 msgid "" "# Standard background color\n" "# Default: -1 (default color)\n" @@ -6083,11 +6080,11 @@ msgstr "" "# Standard background colour\n" "# Default: -1 (default colour)\n" -#: src/lang.c:2187 +#: src/lang.c:2190 msgid "Color for inverse text (background)" msgstr "Colour for inverse text (bg)" -#: src/lang.c:2188 +#: src/lang.c:2191 msgid "" "# Color of background for inverse text\n" "# Default: 4 (blue)\n" @@ -6095,11 +6092,11 @@ msgstr "" "# Colour of background for inverse text\n" "# Default: 4 (blue)\n" -#: src/lang.c:2194 +#: src/lang.c:2197 msgid "Color for inverse text (foreground)" msgstr "Colour for inverse text (fg)" -#: src/lang.c:2195 +#: src/lang.c:2198 msgid "" "# Color of foreground for inverse text\n" "# Default: 7 (white)\n" @@ -6107,11 +6104,11 @@ msgstr "" "# Colour of foreground for inverse text\n" "# Default: 7 (white)\n" -#: src/lang.c:2201 +#: src/lang.c:2204 msgid "Color of text lines" msgstr "Colour of text lines" -#: src/lang.c:2202 +#: src/lang.c:2205 msgid "" "# Color of text lines\n" "# Default: -1 (default color)\n" @@ -6119,11 +6116,11 @@ msgstr "" "# Colour of text lines\n" "# Default: -1 (default colour)\n" -#: src/lang.c:2208 +#: src/lang.c:2211 msgid "Color of mini help menu" msgstr "Colour of mini help menu" -#: src/lang.c:2209 +#: src/lang.c:2212 msgid "" "# Color of mini help menu\n" "# Default: 3 (brown)\n" @@ -6131,11 +6128,11 @@ msgstr "" "# Colour of mini help menu\n" "# Default: 3 (brown)\n" -#: src/lang.c:2215 +#: src/lang.c:2218 msgid "Color of help text" msgstr "Colour of help text" -#: src/lang.c:2216 +#: src/lang.c:2219 msgid "" "# Color of help pages\n" "# Default: -1 (default color)\n" @@ -6143,11 +6140,11 @@ msgstr "" "# Colour of help pages\n" "# Default: -1 (default colour)\n" -#: src/lang.c:2222 +#: src/lang.c:2225 msgid "Color of status messages" msgstr "Colour of status messages" -#: src/lang.c:2223 +#: src/lang.c:2226 msgid "" "# Color of messages in last line\n" "# Default: 6 (cyan)\n" @@ -6155,11 +6152,11 @@ msgstr "" "# Colour of messages in last line\n" "# Default: 6 (cyan)\n" -#: src/lang.c:2229 +#: src/lang.c:2232 msgid "Color of quoted lines" msgstr "Colour of quoted lines" -#: src/lang.c:2230 +#: src/lang.c:2233 msgid "" "# Color of quote-lines\n" "# Default: 2 (green)\n" @@ -6167,11 +6164,11 @@ msgstr "" "# Colour of quote-lines\n" "# Default: 2 (green)\n" -#: src/lang.c:2236 +#: src/lang.c:2239 msgid "Color of twice quoted line" msgstr "Colour of twice quoted line" -#: src/lang.c:2237 +#: src/lang.c:2240 msgid "" "# Color of twice quoted lines\n" "# Default: 3 (brown)\n" @@ -6179,11 +6176,11 @@ msgstr "" "# Colour of twice quoted lines\n" "# Default: 3 (brown)\n" -#: src/lang.c:2243 +#: src/lang.c:2246 msgid "Color of =>3 times quoted line" msgstr "Colour of =>3 times quoted line" -#: src/lang.c:2244 +#: src/lang.c:2247 msgid "" "# Color of >=3 times quoted lines\n" "# Default: 4 (blue)\n" @@ -6191,11 +6188,11 @@ msgstr "" "# Colour of >=3 times quoted lines\n" "# Default: 4 (blue)\n" -#: src/lang.c:2250 +#: src/lang.c:2253 msgid "Color of article header lines" msgstr "Colour of article header lines" -#: src/lang.c:2251 +#: src/lang.c:2254 msgid "" "# Color of header-lines\n" "# Default: 2 (green)\n" @@ -6203,11 +6200,11 @@ msgstr "" "# Colour of header-lines\n" "# Default: 2 (green)\n" -#: src/lang.c:2257 +#: src/lang.c:2260 msgid "Color of actual news header fields" msgstr "Colour of actual news header fields" -#: src/lang.c:2258 +#: src/lang.c:2261 msgid "" "# Color of actual news header fields\n" "# Default: 9 (light red)\n" @@ -6215,11 +6212,11 @@ msgstr "" "# Colour of actual news header fields\n" "# Default: 9 (light red)\n" -#: src/lang.c:2264 +#: src/lang.c:2267 msgid "Color of article subject lines" msgstr "Colour of article subject lines" -#: src/lang.c:2265 +#: src/lang.c:2268 msgid "" "# Color of article subject\n" "# Default: 6 (cyan)\n" @@ -6227,11 +6224,11 @@ msgstr "" "# Colour of article subject\n" "# Default: 6 (cyan)\n" -#: src/lang.c:2271 +#: src/lang.c:2274 msgid "Color of external quotes" msgstr "Colour of external quotes" -#: src/lang.c:2272 +#: src/lang.c:2275 msgid "" "# Color of quoted text from external sources\n" "# Default: 5 (pink)\n" @@ -6239,11 +6236,11 @@ msgstr "" "# Colour of quoted text from external sources\n" "# Default: 5 (pink)\n" -#: src/lang.c:2278 +#: src/lang.c:2281 msgid "Color of response counter" msgstr "Colour of response counter" -#: src/lang.c:2279 +#: src/lang.c:2282 msgid "" "# Color of response counter\n" "# Default: 2 (green)\n" @@ -6251,11 +6248,11 @@ msgstr "" "# Colour of response counter\n" "# Default: 2 (green)\n" -#: src/lang.c:2285 +#: src/lang.c:2288 msgid "Color of sender (From:)" msgstr "Colour of sender (From:)" -#: src/lang.c:2286 +#: src/lang.c:2289 msgid "" "# Color of sender (From:)\n" "# Default: 2 (green)\n" @@ -6263,11 +6260,11 @@ msgstr "" "# Colour of sender (From:)\n" "# Default: 2 (green)\n" -#: src/lang.c:2292 +#: src/lang.c:2295 msgid "Color of help/mail sign" msgstr "Colour of help/mail sign" -#: src/lang.c:2293 +#: src/lang.c:2296 msgid "" "# Color of Help/Mail-Sign\n" "# Default: 4 (blue)\n" @@ -6275,11 +6272,11 @@ msgstr "" "# Colour of Help/Mail-Sign\n" "# Default: 4 (blue)\n" -#: src/lang.c:2299 +#: src/lang.c:2302 msgid "Color of signatures" msgstr "Colour of signatures" -#: src/lang.c:2300 +#: src/lang.c:2303 msgid "" "# Color of signature\n" "# Default: 4 (blue)\n" @@ -6287,11 +6284,11 @@ msgstr "" "# Colour of signature\n" "# Default: 4 (blue)\n" -#: src/lang.c:2306 +#: src/lang.c:2309 msgid "Color of highlighted URLs" msgstr "Colour of highlighted URLs" -#: src/lang.c:2307 +#: src/lang.c:2310 msgid "" "# Color of highlighted URLs\n" "# Default: -1 (default color)\n" @@ -6299,11 +6296,11 @@ msgstr "" "# Colour of highlighted URLs\n" "# Default: -1 (default colour)\n" -#: src/lang.c:2313 +#: src/lang.c:2316 msgid "Color of verbatim blocks" msgstr "Colour of verbatim blocks" -#: src/lang.c:2314 +#: src/lang.c:2317 msgid "" "# Color of verbatim blocks\n" "# Default: 5 (pink)\n" @@ -6311,11 +6308,11 @@ msgstr "" "# Colour of verbatim blocks\n" "# Default: 5 (pink)\n" -#: src/lang.c:2320 +#: src/lang.c:2323 msgid "Color of highlighting with *stars*" msgstr "Colour of highlighting with *stars*" -#: src/lang.c:2321 +#: src/lang.c:2324 msgid "" "# Color of word highlighting with *stars*\n" "# Default: 11 (yellow)\n" @@ -6323,11 +6320,11 @@ msgstr "" "# Colour of word highlighting with *stars*\n" "# Default: 11 (yellow)\n" -#: src/lang.c:2327 +#: src/lang.c:2330 msgid "Color of highlighting with _dash_" msgstr "Colour of highlighting with _dash_" -#: src/lang.c:2328 +#: src/lang.c:2331 msgid "" "# Color of word highlighting with _dash_\n" "# Default: 13 (light pink)\n" @@ -6335,11 +6332,11 @@ msgstr "" "# Colour of word highlighting with _dash_\n" "# Default: 13 (light pink)\n" -#: src/lang.c:2334 +#: src/lang.c:2337 msgid "Color of highlighting with /slash/" msgstr "Colour of highlighting with /slash/" -#: src/lang.c:2335 +#: src/lang.c:2338 msgid "" "# Color of word highlighting with /slash/\n" "# Default: 14 (light cyan)\n" @@ -6347,11 +6344,11 @@ msgstr "" "# Colour of word highlighting with /slash/\n" "# Default: 14 (light cyan)\n" -#: src/lang.c:2341 +#: src/lang.c:2344 msgid "Color of highlighting with -stroke-" msgstr "Colour of highlighting w. -stroke-" -#: src/lang.c:2342 +#: src/lang.c:2345 msgid "" "# Color of word highlighting with -stroke-\n" "# Default: 12 (light blue)\n" @@ -6359,11 +6356,11 @@ msgstr "" "# Colour of word highlighting with -stroke-\n" "# Default: 12 (light blue)\n" -#: src/lang.c:2349 +#: src/lang.c:2352 msgid "Attr. of highlighting with *stars*" msgstr "" -#: src/lang.c:2350 +#: src/lang.c:2353 msgid "" "# Attributes of word highlighting on mono terminals\n" "# Possible values are:\n" @@ -6379,57 +6376,57 @@ msgid "" "# Default: 6 (bold)\n" msgstr "" -#: src/lang.c:2365 +#: src/lang.c:2368 msgid "Attr. of highlighting with _dash_" msgstr "" -#: src/lang.c:2366 +#: src/lang.c:2369 msgid "" "# Attribute of word highlighting with _dash_\n" "# Default: 2 (best highlighting)\n" msgstr "" -#: src/lang.c:2372 +#: src/lang.c:2375 msgid "Attr. of highlighting with /slash/" msgstr "" -#: src/lang.c:2373 +#: src/lang.c:2376 msgid "" "# Attribute of word highlighting with /slash/\n" "# Default: 5 (half bright)\n" msgstr "" -#: src/lang.c:2379 +#: src/lang.c:2382 msgid "Attr. of highlighting with -stroke-" msgstr "" -#: src/lang.c:2380 +#: src/lang.c:2383 msgid "" "# Attribute of word highlighting with -stroke-\n" "# Default: 3 (reverse video)\n" msgstr "" -#: src/lang.c:2386 +#: src/lang.c:2389 msgid "URL highlighting in message body" msgstr "" -#: src/lang.c:2387 +#: src/lang.c:2390 msgid "# Enable URL highlighting?\n" msgstr "" -#: src/lang.c:2392 +#: src/lang.c:2395 msgid "Word highlighting in message body" msgstr "" -#: src/lang.c:2393 +#: src/lang.c:2396 msgid "# Enable word highlighting?\n" msgstr "" -#: src/lang.c:2398 +#: src/lang.c:2401 msgid "What to display instead of mark" msgstr "" -#: src/lang.c:2399 +#: src/lang.c:2402 msgid "" "# Should the leading and ending stars and dashes also be displayed,\n" "# even when they are highlighting marks?\n" @@ -6439,56 +6436,56 @@ msgid "" "# * 2 = print a space instead\n" msgstr "" -#: src/lang.c:2408 +#: src/lang.c:2411 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "" -#: src/lang.c:2409 +#: src/lang.c:2412 msgid "Page line wrap column" msgstr "" -#: src/lang.c:2410 +#: src/lang.c:2413 msgid "# Wrap article lines at column\n" msgstr "" -#: src/lang.c:2415 +#: src/lang.c:2418 msgid "Wrap around threads on next unread" msgstr "" -#: src/lang.c:2416 +#: src/lang.c:2419 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "" -#: src/lang.c:2420 +#: src/lang.c:2423 msgid "Enter default mail address (and fullname). sets." msgstr "" -#: src/lang.c:2421 src/lang.c:2931 +#: src/lang.c:2424 src/lang.c:2939 msgid "Mail address (and fullname)" msgstr "" -#: src/lang.c:2422 +#: src/lang.c:2425 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "" -#: src/lang.c:2427 +#: src/lang.c:2430 msgid "Show empty Followup-To in editor" msgstr "" -#: src/lang.c:2428 +#: src/lang.c:2431 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "" -#: src/lang.c:2432 +#: src/lang.c:2435 msgid "" "Enter path/! command/--none to create your default signature. sets." msgstr "" -#: src/lang.c:2433 +#: src/lang.c:2436 msgid "Create signature from path/command" msgstr "" -#: src/lang.c:2434 +#: src/lang.c:2437 #, c-format msgid "" "# Signature path (random sigs)/file to be used when posting/replying\n" @@ -6498,52 +6495,52 @@ msgid "" "# sigfile=--none don't append a signature\n" msgstr "" -#: src/lang.c:2442 +#: src/lang.c:2445 msgid "" "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "" -#: src/lang.c:2443 +#: src/lang.c:2446 msgid "Prepend signature with \"-- \"" msgstr "" -#: src/lang.c:2444 +#: src/lang.c:2447 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "" -#: src/lang.c:2448 +#: src/lang.c:2451 msgid "Add signature when reposting articles. toggles & sets." msgstr "" -#: src/lang.c:2449 +#: src/lang.c:2452 msgid "Add signature when reposting" msgstr "" -#: src/lang.c:2450 +#: src/lang.c:2453 msgid "# If ON add signature to reposted articles\n" msgstr "" -#: src/lang.c:2454 +#: src/lang.c:2457 #, c-format msgid "Enter quotation marks, %s or %S for author's initials." msgstr "" -#: src/lang.c:2455 +#: src/lang.c:2458 msgid "Characters used as quote-marks" msgstr "" -#: src/lang.c:2456 +#: src/lang.c:2459 #, c-format msgid "" "# Characters used in quoting to followups and replies.\n" "# '_' is replaced by ' ', %s, %S are replaced by author's initials.\n" msgstr "" -#: src/lang.c:2462 +#: src/lang.c:2465 msgid "Quoting behavior" msgstr "Quoting behaviour" -#: src/lang.c:2463 +#: src/lang.c:2466 msgid "" "# How quoting should be handled when following up or replying.\n" "# Possible values are (the default is marked with *):\n" @@ -6557,52 +6554,52 @@ msgid "" "# 7 = Compress quotes, quote signatures, quote empty lines\n" msgstr "" -#: src/lang.c:2476 src/lang.c:2484 src/lang.c:2490 +#: src/lang.c:2479 src/lang.c:2487 src/lang.c:2493 msgid "" "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "" -#: src/lang.c:2477 +#: src/lang.c:2480 msgid "Quote line when following up" msgstr "" -#: src/lang.c:2478 +#: src/lang.c:2481 msgid "" "# Format of quote line when mailing/posting/following-up an article\n" "# %A Address %D Date %F Addr+Name %G Groupname %M Message-ID\n" "# %N Full Name %C First Name %I Initials\n" msgstr "" -#: src/lang.c:2485 +#: src/lang.c:2488 msgid "Quote line when cross-posting" msgstr "" -#: src/lang.c:2491 +#: src/lang.c:2494 msgid "Quote line when mailing" msgstr "" -#: src/lang.c:2496 +#: src/lang.c:2499 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "" -#: src/lang.c:2497 +#: src/lang.c:2500 msgid "Insert 'User-Agent:' header" msgstr "" -#: src/lang.c:2498 +#: src/lang.c:2501 msgid "# If ON include advertising User-Agent: header\n" msgstr "" -#: src/lang.c:2503 +#: src/lang.c:2506 msgid "" "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" -#: src/lang.c:2504 +#: src/lang.c:2507 msgid "MM_CHARSET" msgstr "" -#: src/lang.c:2505 +#: src/lang.c:2508 msgid "" "# Charset supported locally which is also used for MIME header and\n" "# Content-Type header.\n" @@ -6612,40 +6609,40 @@ msgid "" "# mm_charset is considered not displayable and represented as '?'.\n" msgstr "" -#: src/lang.c:2515 +#: src/lang.c:2518 msgid "MM_NETWORK_CHARSET" msgstr "" -#: src/lang.c:2516 +#: src/lang.c:2519 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "" -#: src/lang.c:2520 +#: src/lang.c:2523 msgid "" "Enter local charset name (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" -#: src/lang.c:2521 +#: src/lang.c:2524 msgid "MM_LOCAL_CHARSET" msgstr "" -#: src/lang.c:2522 +#: src/lang.c:2525 msgid "# Charset supported locally.\n" msgstr "" -#: src/lang.c:2529 +#: src/lang.c:2532 msgid "Mailbox format" msgstr "" -#: src/lang.c:2530 +#: src/lang.c:2533 msgid "# Format of the mailbox.\n" msgstr "" -#: src/lang.c:2535 +#: src/lang.c:2538 msgid "MIME encoding in news messages" msgstr "" -#: src/lang.c:2536 +#: src/lang.c:2539 msgid "" "# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n" "# for mails and posts, if necessary. QP is efficient for most European\n" @@ -6654,15 +6651,15 @@ msgid "" "# Russian charsets with a lot of 8bit characters.\n" msgstr "" -#: src/lang.c:2544 src/lang.c:2565 +#: src/lang.c:2547 src/lang.c:2568 msgid "Don't change unless you know what you are doing. cancels." msgstr "" -#: src/lang.c:2545 +#: src/lang.c:2548 msgid "Use 8bit characters in news headers" msgstr "" -#: src/lang.c:2546 +#: src/lang.c:2549 msgid "" "# If ON, 8bit characters in news headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -6670,28 +6667,28 @@ msgid "" "# parameter unless post_mime_encoding is 8bit as well.\n" msgstr "" -#: src/lang.c:2553 +#: src/lang.c:2556 msgid "" "Auto-view post-processed files toggles, sets, cancels." msgstr "" -#: src/lang.c:2554 +#: src/lang.c:2557 msgid "View post-processed files" msgstr "" -#: src/lang.c:2555 +#: src/lang.c:2558 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "" -#: src/lang.c:2560 +#: src/lang.c:2563 msgid "MIME encoding in mail messages" msgstr "" -#: src/lang.c:2566 +#: src/lang.c:2569 msgid "Use 8bit characters in mail headers" msgstr "" -#: src/lang.c:2567 +#: src/lang.c:2570 msgid "" "# If ON, 8bit characters in mail headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -6702,36 +6699,36 @@ msgid "" "# turn it ON unless you have some compelling reason.\n" msgstr "" -#: src/lang.c:2578 +#: src/lang.c:2581 msgid "Strip blanks from ends of lines" msgstr "" -#: src/lang.c:2579 +#: src/lang.c:2582 msgid "" "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" msgstr "" -#: src/lang.c:2585 +#: src/lang.c:2588 msgid "If ON, use transliteration. toggles & sets." msgstr "" -#: src/lang.c:2586 +#: src/lang.c:2589 msgid "Transliteration" msgstr "" -#: src/lang.c:2587 +#: src/lang.c:2590 msgid "" "# If ON, use //TRANSLIT extension. This means that when a character cannot\n" "# be represented in the in the target character set, it can be approximated\n" "# through one or several similarly looking characters.\n" msgstr "" -#: src/lang.c:2595 +#: src/lang.c:2598 msgid "Send you a Cc/Bcc automatically" msgstr "" -#: src/lang.c:2596 +#: src/lang.c:2599 msgid "" "# Put your name in the Cc: and/or Bcc: field when mailing an article.\n" "# Possible values are (the default is marked with *):\n" @@ -6741,129 +6738,129 @@ msgid "" "# 3 = Cc and Bcc\n" msgstr "" -#: src/lang.c:2607 +#: src/lang.c:2610 msgid "Hash algorithm for Cancel-Lock/Cancel-Key" msgstr "" -#: src/lang.c:2608 +#: src/lang.c:2611 msgid "" "# Hash algorithm for Cancel-Lock/Cancel-Key (default 'sha1')\n" "# Use 'none' to not generate Cancel-Lock headers.\n" msgstr "" -#: src/lang.c:2614 +#: src/lang.c:2617 msgid "Enter address elements about which you want to be warned. sets." msgstr "" -#: src/lang.c:2615 +#: src/lang.c:2618 msgid "Spamtrap warning address parts" msgstr "" -#: src/lang.c:2616 +#: src/lang.c:2619 msgid "" "# A comma-delimited list of address-parts you want to be warned\n" "# about when trying to reply by email.\n" msgstr "" -#: src/lang.c:2621 +#: src/lang.c:2624 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "" -#: src/lang.c:2622 +#: src/lang.c:2625 msgid "No. of days a filter entry is valid" msgstr "" -#: src/lang.c:2623 +#: src/lang.c:2626 msgid "# Number of days a short term filter will be active\n" msgstr "" -#: src/lang.c:2627 +#: src/lang.c:2630 msgid "Add posted articles to filter. toggles & sets." msgstr "" -#: src/lang.c:2628 +#: src/lang.c:2631 msgid "Add posted articles to filter" msgstr "" -#: src/lang.c:2629 +#: src/lang.c:2632 msgid "" "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" msgstr "" -#: src/lang.c:2633 +#: src/lang.c:2636 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "" -#: src/lang.c:2634 +#: src/lang.c:2637 msgid "Mail directory" msgstr "" -#: src/lang.c:2635 +#: src/lang.c:2638 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "" -#: src/lang.c:2640 +#: src/lang.c:2643 msgid "Save articles in batch mode (-S)" msgstr "" -#: src/lang.c:2641 +#: src/lang.c:2644 msgid "" "# If ON articles/threads will be saved in batch mode when save -S\n" "# or mail (-M/-N) is specified on the command line\n" msgstr "" -#: src/lang.c:2646 +#: src/lang.c:2649 msgid "The directory where you want articles/threads saved." msgstr "" -#: src/lang.c:2647 +#: src/lang.c:2650 msgid "Directory to save arts/threads in" msgstr "" -#: src/lang.c:2648 +#: src/lang.c:2651 msgid "# Directory where articles/threads are saved\n" msgstr "" -#: src/lang.c:2652 +#: src/lang.c:2655 msgid "" "Auto save article/thread by Archive-name: header. toggles & " "sets." msgstr "" -#: src/lang.c:2653 +#: src/lang.c:2656 msgid "Use Archive-name: header for save" msgstr "" -#: src/lang.c:2654 +#: src/lang.c:2657 msgid "" "# If ON articles/threads with Archive-name: in mail header will\n" "# be automatically saved with the Archive-name & part/patch no.\n" msgstr "" -#: src/lang.c:2659 +#: src/lang.c:2662 msgid "" "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "" -#: src/lang.c:2660 +#: src/lang.c:2663 msgid "Mark saved articles/threads as read" msgstr "" -#: src/lang.c:2661 +#: src/lang.c:2664 msgid "# If ON mark articles that are saved as read\n" msgstr "" -#: src/lang.c:2665 +#: src/lang.c:2668 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "" -#: src/lang.c:2666 +#: src/lang.c:2669 msgid "Post process saved articles" msgstr "" -#: src/lang.c:2667 +#: src/lang.c:2670 msgid "" "# Perform post processing (saving binary attachments) from saved articles.\n" "# Possible values are (the default is marked with *):\n" @@ -6872,106 +6869,106 @@ msgid "" "# 2 = yes\n" msgstr "" -#: src/lang.c:2676 +#: src/lang.c:2679 msgid "Process only unread articles" msgstr "" -#: src/lang.c:2677 +#: src/lang.c:2680 msgid "" "# If ON only save/print/pipe/mail unread articles (tagged articles " "excepted)\n" msgstr "" -#: src/lang.c:2682 +#: src/lang.c:2685 msgid "Print all or just part of header. toggles & sets." msgstr "" -#: src/lang.c:2683 +#: src/lang.c:2686 msgid "Print all headers when printing" msgstr "" -#: src/lang.c:2684 +#: src/lang.c:2687 msgid "" "# If ON print all of article header otherwise just the important lines\n" msgstr "" -#: src/lang.c:2688 +#: src/lang.c:2691 msgid "" "The printer program with options that is to be used to print articles/" "threads." msgstr "" -#: src/lang.c:2689 +#: src/lang.c:2692 msgid "Printer program with options" msgstr "" -#: src/lang.c:2690 +#: src/lang.c:2693 msgid "# Print program with parameters used to print articles/threads\n" msgstr "" -#: src/lang.c:2696 +#: src/lang.c:2699 msgid "Force redraw after certain commands" msgstr "" -#: src/lang.c:2697 +#: src/lang.c:2700 msgid "" "# If ON a screen redraw will always be done after certain external commands\n" msgstr "" -#: src/lang.c:2701 +#: src/lang.c:2704 msgid "" "Start editor with line offset. toggles, sets, cancels." msgstr "" -#: src/lang.c:2702 +#: src/lang.c:2705 msgid "Start editor with line offset" msgstr "" -#: src/lang.c:2703 +#: src/lang.c:2706 msgid "" "# If ON editor will be started with cursor offset into the file\n" "# otherwise the cursor will be positioned at the first line\n" msgstr "" -#: src/lang.c:2708 +#: src/lang.c:2711 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "" -#: src/lang.c:2709 +#: src/lang.c:2712 msgid "Invocation of your editor" msgstr "" -#: src/lang.c:2710 +#: src/lang.c:2713 msgid "" "# Format of editor line including parameters\n" "# %E Editor %F Filename %N Linenumber\n" msgstr "" -#: src/lang.c:2715 +#: src/lang.c:2718 msgid "" "Enter name and options for external-inews, --internal for internal inews" msgstr "" -#: src/lang.c:2716 +#: src/lang.c:2719 msgid "External inews" msgstr "" -#: src/lang.c:2717 +#: src/lang.c:2720 msgid "" "# If --internal use the built in mini inews for posting via NNTP\n" "# otherwise use an external inews program\n" msgstr "" -#: src/lang.c:2721 +#: src/lang.c:2724 msgid "" "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" -#: src/lang.c:2722 +#: src/lang.c:2725 msgid "Invocation of your mail command" msgstr "" -#: src/lang.c:2723 +#: src/lang.c:2726 msgid "" "# Format of mailer line including parameters\n" "# %M Mailer %S Subject %T To %F Filename\n" @@ -6979,11 +6976,11 @@ msgid "" "# ie. elm interactive : elm -i %F -s \"%S\" \"%T\"\n" msgstr "" -#: src/lang.c:2731 +#: src/lang.c:2734 msgid "Use interactive mail reader" msgstr "" -#: src/lang.c:2732 +#: src/lang.c:2735 msgid "" "# Interactive mailreader\n" "# Possible values are (the default is marked with *):\n" @@ -6992,67 +6989,67 @@ msgid "" "# 2 = use interactive mailreader without headers in file\n" msgstr "" -#: src/lang.c:2741 +#: src/lang.c:2744 msgid "Remove ~/.article after posting" msgstr "" -#: src/lang.c:2742 +#: src/lang.c:2745 msgid "# If ON remove ~/.article after posting.\n" msgstr "" -#: src/lang.c:2748 +#: src/lang.c:2751 msgid "Use UTF-8 graphics (thread tree etc.)" msgstr "" -#: src/lang.c:2749 +#: src/lang.c:2752 msgid "" "# If ON use UTF-8 characters for indicator '->', tree and ellipsis '...'.\n" msgstr "" -#: src/lang.c:2754 +#: src/lang.c:2757 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "" -#: src/lang.c:2755 +#: src/lang.c:2758 msgid "Filename for posted articles" msgstr "" -#: src/lang.c:2756 +#: src/lang.c:2759 msgid "" "# Filename where to keep all postings (default posted)\n" "# If no filename is set then postings will not be saved\n" msgstr "" -#: src/lang.c:2761 +#: src/lang.c:2764 msgid "" "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "" -#: src/lang.c:2762 +#: src/lang.c:2765 msgid "Keep failed arts in ~/dead.articles" msgstr "" -#: src/lang.c:2763 +#: src/lang.c:2766 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "" -#: src/lang.c:2767 +#: src/lang.c:2770 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "" -#: src/lang.c:2768 +#: src/lang.c:2771 msgid "No unsubscribed groups in newsrc" msgstr "" -#: src/lang.c:2769 +#: src/lang.c:2772 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "" -#: src/lang.c:2774 +#: src/lang.c:2777 msgid "Remove bogus groups from newsrc" msgstr "" -#: src/lang.c:2775 +#: src/lang.c:2778 msgid "" "# What to do with bogus groups in newsrc file\n" "# Possible values are (the default is marked with *):\n" @@ -7061,64 +7058,64 @@ msgid "" "# 2 = highlight with D on selection screen\n" msgstr "" -#: src/lang.c:2784 +#: src/lang.c:2787 msgid "" "Enter number of seconds to wait for a response from the server. sets." msgstr "" -#: src/lang.c:2785 +#: src/lang.c:2788 msgid "NNTP read timeout in seconds" msgstr "" -#: src/lang.c:2786 +#: src/lang.c:2789 msgid "" "# Time in seconds to wait for a response from the server (0=no timeout)\n" msgstr "" -#: src/lang.c:2791 +#: src/lang.c:2794 msgid "Enter number of seconds until active file will be reread. sets." msgstr "" -#: src/lang.c:2792 +#: src/lang.c:2795 msgid "Interval in secs to reread active" msgstr "" -#: src/lang.c:2793 +#: src/lang.c:2796 msgid "" "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "" -#: src/lang.c:2798 +#: src/lang.c:2801 msgid "Reconnect to server automatically" msgstr "" -#: src/lang.c:2799 +#: src/lang.c:2802 msgid "" "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "" -#: src/lang.c:2803 +#: src/lang.c:2806 msgid "" "Create local copies of NNTP overview files. toggles & sets." msgstr "" -#: src/lang.c:2804 +#: src/lang.c:2807 msgid "Cache NNTP overview files locally" msgstr "" -#: src/lang.c:2805 +#: src/lang.c:2808 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "" -#: src/lang.c:2809 src/lang.c:2824 src/lang.c:2844 src/lang.c:2863 +#: src/lang.c:2812 src/lang.c:2827 src/lang.c:2847 src/lang.c:2866 msgid "Enter format string. sets, cancels." msgstr "" -#: src/lang.c:2810 +#: src/lang.c:2813 msgid "Format string for selection level" msgstr "" -#: src/lang.c:2811 +#: src/lang.c:2814 msgid "" "# Format string for selection level representation\n" "# Default: %f %n %U %G %d\n" @@ -7132,11 +7129,11 @@ msgid "" "# %U Unread count\n" msgstr "" -#: src/lang.c:2825 +#: src/lang.c:2828 msgid "Format string for group level" msgstr "" -#: src/lang.c:2826 +#: src/lang.c:2829 msgid "" "# Format string for group level representation\n" "# Default: %n %m %R %L %s %F\n" @@ -7155,11 +7152,11 @@ msgid "" "# %S Score\n" msgstr "" -#: src/lang.c:2845 +#: src/lang.c:2848 msgid "Format string for thread level" msgstr "" -#: src/lang.c:2846 +#: src/lang.c:2849 msgid "" "# Format string for thread level representation\n" "# Default: %n %m [%L] %T %F\n" @@ -7177,19 +7174,19 @@ msgid "" "# %T Thread tree (only thread level)\n" msgstr "" -#: src/lang.c:2864 +#: src/lang.c:2867 msgid "Format string for display of dates" msgstr "" -#: src/lang.c:2865 +#: src/lang.c:2868 msgid "# Format string for date representation\n" msgstr "" -#: src/lang.c:2871 +#: src/lang.c:2878 msgid "Unicode normalization form" msgstr "Unicode normalisation form" -#: src/lang.c:2872 +#: src/lang.c:2879 msgid "" "# Unicode normalization form\n" "# Possible values are:\n" @@ -7198,6 +7195,7 @@ msgid "" "# 2 = NFKD\n" "# 3 = NFC\n" "# 4 = NFD\n" +"# 5 = NFKC_CF\n" msgstr "" "# Unicode normalisation form\n" "# Possible values are:\n" @@ -7206,20 +7204,21 @@ msgstr "" "# 2 = NFKD\n" "# 3 = NFC\n" "# 4 = NFD\n" +"# 5 = NFKC_CF\n" -#: src/lang.c:2885 +#: src/lang.c:2893 msgid "Render BiDi" msgstr "" -#: src/lang.c:2886 +#: src/lang.c:2894 msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "" -#: src/lang.c:2893 +#: src/lang.c:2901 msgid "Function for sorting articles" msgstr "" -#: src/lang.c:2894 +#: src/lang.c:2902 msgid "" "# Function for sorting articles\n" "# Possible values are (the default is marked with *):\n" @@ -7227,211 +7226,211 @@ msgid "" "# 1 = heapsort\n" msgstr "" -#: src/lang.c:2907 +#: src/lang.c:2915 msgid "Automatically GroupMarkUnselArtRead" msgstr "" -#: src/lang.c:2913 +#: src/lang.c:2921 msgid "Delete post-process files" msgstr "" -#: src/lang.c:2918 +#: src/lang.c:2926 msgid "Filename for all mailed articles, sets, no filename=do not save." msgstr "" -#: src/lang.c:2919 +#: src/lang.c:2927 msgid "Mailbox to save sent mails" msgstr "" -#: src/lang.c:2924 +#: src/lang.c:2932 msgid "Set Followup-To: header to this group(s). sets, cancels." msgstr "" -#: src/lang.c:2925 +#: src/lang.c:2933 msgid "Followup-To: header" msgstr "" -#: src/lang.c:2930 +#: src/lang.c:2938 msgid "Enter default mail address (and fullname). sets, cancels." msgstr "" -#: src/lang.c:2937 +#: src/lang.c:2945 msgid "" "Path and options for ispell-like spell-checker. sets, cancels." msgstr "" -#: src/lang.c:2938 +#: src/lang.c:2946 msgid "Ispell program" msgstr "" -#: src/lang.c:2944 +#: src/lang.c:2952 msgid "When group is a mailing list, send responses to this email address." msgstr "" -#: src/lang.c:2945 +#: src/lang.c:2953 msgid "Mailing list address" msgstr "" -#: src/lang.c:2951 +#: src/lang.c:2959 msgid "Forward articles as attachment" msgstr "" -#: src/lang.c:2956 +#: src/lang.c:2964 msgid "" "A comma separated list of MIME major/minor Content-Types. cancels." msgstr "" -#: src/lang.c:2957 +#: src/lang.c:2965 msgid "Which MIME types will be saved" msgstr "" -#: src/lang.c:2962 +#: src/lang.c:2970 msgid "Value of the Organization: header. sets, cancels." msgstr "" -#: src/lang.c:2963 +#: src/lang.c:2971 msgid "Organization: header" msgstr "" -#: src/lang.c:2968 +#: src/lang.c:2976 msgid "Filename for saved articles. sets, cancels." msgstr "" -#: src/lang.c:2969 +#: src/lang.c:2977 msgid "savefile" msgstr "" -#: src/lang.c:2974 src/lang.c:2998 +#: src/lang.c:2982 src/lang.c:3006 msgid "Scope for the filter rule. sets, cancels." msgstr "" -#: src/lang.c:2975 +#: src/lang.c:2983 msgid "Quick (1 key) select filter scope" msgstr "" -#: src/lang.c:2980 src/lang.c:3004 +#: src/lang.c:2988 src/lang.c:3012 msgid "Header for filter rule. sets, cancels." msgstr "" -#: src/lang.c:2981 +#: src/lang.c:2989 msgid "Quick (1 key) select filter header" msgstr "" -#: src/lang.c:2986 src/lang.c:3010 +#: src/lang.c:2994 src/lang.c:3018 msgid "ON = case sensitive, OFF = ignore case. sets, cancels." msgstr "" -#: src/lang.c:2987 +#: src/lang.c:2995 msgid "Quick (1 key) select filter case" msgstr "" -#: src/lang.c:2992 src/lang.c:3016 +#: src/lang.c:3000 src/lang.c:3024 msgid "ON = expire, OFF = don't ever expire. sets, cancels." msgstr "" -#: src/lang.c:2993 +#: src/lang.c:3001 msgid "Quick (1 key) select filter expire" msgstr "" -#: src/lang.c:2999 +#: src/lang.c:3007 msgid "Quick (1 key) kill filter scope" msgstr "" -#: src/lang.c:3005 +#: src/lang.c:3013 msgid "Quick (1 key) kill filter header" msgstr "" -#: src/lang.c:3011 +#: src/lang.c:3019 msgid "Quick (1 key) kill filter case" msgstr "" -#: src/lang.c:3017 +#: src/lang.c:3025 msgid "Quick (1 key) kill filter expire" msgstr "" -#: src/lang.c:3023 +#: src/lang.c:3031 msgid "Assume this charset if no charset declaration is present, to set." msgstr "" -#: src/lang.c:3024 +#: src/lang.c:3032 msgid "UNDECLARED_CHARSET" msgstr "" -#: src/lang.c:3030 +#: src/lang.c:3038 msgid "" "Add this text at the start of the message body. sets, cancels." msgstr "" -#: src/lang.c:3031 +#: src/lang.c:3039 msgid "X_Body" msgstr "" -#: src/lang.c:3036 +#: src/lang.c:3044 msgid "Insert this header when posting. sets, cancels." msgstr "" -#: src/lang.c:3037 +#: src/lang.c:3045 msgid "X_Headers" msgstr "" -#: src/lang.c:3042 +#: src/lang.c:3050 msgid "" "Automatically insert an X-Comment-To: header? toggles & sets." msgstr "" -#: src/lang.c:3043 +#: src/lang.c:3051 msgid "Insert 'X-Comment-To:' header" msgstr "" #. TODO: lang.c -#: src/main.c:801 +#: src/main.c:812 msgid "reading from local spool" msgstr "" -#: src/misc.c:3868 +#: src/misc.c:3878 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "" -#: src/misc.c:3871 +#: src/misc.c:3881 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "" -#: src/newsrc.c:453 +#: src/newsrc.c:457 msgid "Unreachable?\n" msgstr "" -#: src/nntplib.c:817 +#: src/nntplib.c:822 #, c-format msgid "" "\n" "Server timed out, trying reconnect # %d\n" msgstr "" -#: src/nntplib.c:844 +#: src/nntplib.c:849 msgid "NNTP connection error. Exiting..." msgstr "" -#: src/nntplib.c:856 src/nntplib.c:1835 +#: src/nntplib.c:861 src/nntplib.c:1852 msgid "Rejoin current group\n" msgstr "" -#: src/nntplib.c:864 src/nntplib.c:1843 +#: src/nntplib.c:869 src/nntplib.c:1860 #, c-format msgid "Read (%s)\n" msgstr "" -#: src/nntplib.c:866 +#: src/nntplib.c:871 #, c-format msgid "Resend last command (%s)\n" msgstr "" -#: src/nntplib.c:1482 +#: src/nntplib.c:1500 msgid "CAPABILITIES did not announce READER" msgstr "" -#: src/nntplib.c:1989 +#: src/nntplib.c:2006 msgid "MOTD: " msgstr "" @@ -7492,7 +7491,7 @@ msgstr "" #. * preamble #. * TODO: -> lang.c #. -#: src/rfc2047.c:1308 +#: src/rfc2047.c:1322 #, c-format msgid "" "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" Binary files tin-2.4.2/po/es.gmo and tin-2.4.3/po/es.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.2/po/es.po tin-2.4.3/po/es.po --- tin-2.4.2/po/es.po 1970-01-01 01:00:00.000000000 +0100 +++ tin-2.4.3/po/es.po 2018-12-24 10:02:04.414948098 +0100 @@ -0,0 +1,8148 @@ +# Spanish translation for tin +# Copyright (C) 2018 Free Software Foundation, Inc. +# This file is distributed under the same license as the tin package. +# Francisco Javier Serrador , 2018. +# +msgid "" +msgstr "" +"Project-Id-Version: tin 2.4.2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-12-24 10:02+0100\n" +"PO-Revision-Date: 2018-04-19 13:04+0200\n" +"Last-Translator: Francisco Javier Serrador \n" +"Language-Team: Spanish \n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" +"X-Generator: Poedit 2.0.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/attrib.c:964 +#, fuzzy +msgid "Processing attributes... " +msgstr "** atributos" + +#: src/attrib.c:1186 +#, c-format +msgid "" +"# Do not edit this comment block\n" +"#\n" +msgstr "" + +#: src/attrib.c:1187 +#, c-format +msgid "# scope=STRING (eg. alt.*,!alt.bin*) [mandatory]\n" +msgstr "" + +#: src/attrib.c:1188 +#, c-format +msgid "# add_posted_to_filter=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1189 +#, c-format +msgid "# advertising=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1190 +#, c-format +msgid "# alternative_handling=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1191 +#, c-format +msgid "# ask_for_metamail=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1192 +#, c-format +msgid "# auto_cc_bcc=NUM\n" +msgstr "" + +#: src/attrib.c:1193 +#, c-format +msgid "# 0=No, 1=Cc, 2=Bcc, 3=Cc and Bcc\n" +msgstr "" + +#: src/attrib.c:1194 +#, c-format +msgid "# auto_list_thread=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1195 +#, c-format +msgid "# auto_save=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1196 +#, c-format +msgid "# auto_select=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1197 +#, c-format +msgid "# batch_save=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1198 +#, c-format +msgid "# date_format=STRING (eg. %%a, %%d %%b %%Y %%H:%%M:%%S)\n" +msgstr "" + +#: src/attrib.c:1199 +#, c-format +msgid "# delete_tmp_files=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1200 +#, c-format +msgid "# editor_format=STRING (eg. %%E +%%N %%F)\n" +msgstr "" + +#: src/attrib.c:1201 +#, c-format +msgid "# fcc=STRING (eg. =mailbox)\n" +msgstr "" + +#: src/attrib.c:1202 +#, c-format +msgid "# followup_to=STRING\n" +msgstr "" + +#: src/attrib.c:1203 +#, c-format +msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" +msgstr "" + +#: src/attrib.c:1204 +#, c-format +msgid "# group_catchup_on_exit=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1205 +#, c-format +msgid "# group_format=STRING (eg. %%n %%m %%R %%L %%s %%F)\n" +msgstr "" + +#: src/attrib.c:1206 +#, c-format +msgid "# mail_8bit_header=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1207 +#, c-format +msgid "# mail_mime_encoding=supported_encoding" +msgstr "" + +#: src/attrib.c:1215 +#, c-format +msgid "# ispell=STRING\n" +msgstr "" + +#: src/attrib.c:1217 +#, c-format +msgid "# maildir=STRING (eg. ~/Mail)\n" +msgstr "" + +#: src/attrib.c:1218 +#, c-format +msgid "# mailing_list=STRING (eg. majordomo@example.org)\n" +msgstr "" + +#: src/attrib.c:1219 +#, c-format +msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" +msgstr "" + +#: src/attrib.c:1220 +#, c-format +msgid "# mark_ignore_tags=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1221 +#, c-format +msgid "# mark_saved_read=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1222 +#, c-format +msgid "# mime_forward=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1224 +#, c-format +msgid "# mm_network_charset=supported_charset" +msgstr "" + +#: src/attrib.c:1231 +#, c-format +msgid "# undeclared_charset=STRING (default is US-ASCII)\n" +msgstr "" + +#: src/attrib.c:1233 +#, c-format +msgid "# news_headers_to_display=STRING\n" +msgstr "" + +#: src/attrib.c:1234 +#, c-format +msgid "# news_headers_to_not_display=STRING\n" +msgstr "" + +#: src/attrib.c:1235 +#, c-format +msgid "# news_quote_format=STRING\n" +msgstr "" + +#: src/attrib.c:1236 +#, c-format +msgid "# organization=STRING (if beginning with '/' read from file)\n" +msgstr "" + +#: src/attrib.c:1237 +#, c-format +msgid "# pos_first_unread=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1238 +#, c-format +msgid "# post_8bit_header=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1239 +#, c-format +msgid "# post_mime_encoding=supported_encoding" +msgstr "" + +#: src/attrib.c:1246 +#, c-format +msgid "# post_process_type=NUM\n" +msgstr "" + +#: src/attrib.c:1251 +#, c-format +msgid "# post_process_view=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1252 +#, c-format +msgid "# quick_kill_scope=STRING (ie. talk.*)\n" +msgstr "" + +#: src/attrib.c:1253 +#, c-format +msgid "# quick_kill_expire=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1254 +#, c-format +msgid "# quick_kill_case=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1255 +#, c-format +msgid "# quick_kill_header=NUM\n" +msgstr "" + +#: src/attrib.c:1256 src/attrib.c:1265 +#, c-format +msgid "# 0=Subject: (case sensitive) 1=Subject: (ignore case)\n" +msgstr "" + +#: src/attrib.c:1257 src/attrib.c:1266 +#, c-format +msgid "# 2=From: (case sensitive) 3=From: (ignore case)\n" +msgstr "" + +#: src/attrib.c:1258 src/attrib.c:1267 +#, c-format +msgid "# 4=Message-ID: & full References: line\n" +msgstr "" + +#: src/attrib.c:1259 src/attrib.c:1268 +#, c-format +msgid "# 5=Message-ID: & last References: entry only\n" +msgstr "" + +#: src/attrib.c:1260 src/attrib.c:1269 +#, c-format +msgid "# 6=Message-ID: entry only 7=Lines:\n" +msgstr "" + +#: src/attrib.c:1261 +#, c-format +msgid "# quick_select_scope=STRING\n" +msgstr "" + +#: src/attrib.c:1262 +#, c-format +msgid "# quick_select_expire=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1263 +#, c-format +msgid "# quick_select_case=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1264 +#, c-format +msgid "# quick_select_header=NUM\n" +msgstr "" + +#: src/attrib.c:1270 +#, c-format +msgid "# quote_chars=STRING (%%s, %%S for initials)\n" +msgstr "" + +#: src/attrib.c:1272 +#, c-format +msgid "# print_header=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1274 +#, c-format +msgid "# process_only_unread=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1275 +#, c-format +msgid "# prompt_followupto=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1276 +#, c-format +msgid "# savedir=STRING (eg. ~user/News)\n" +msgstr "" + +#: src/attrib.c:1277 +#, c-format +msgid "# savefile=STRING (eg. =linux)\n" +msgstr "" + +#: src/attrib.c:1278 +#, c-format +msgid "# sigfile=STRING (eg. $var/sig)\n" +msgstr "" + +#: src/attrib.c:1279 +#, c-format +msgid "# show_author=NUM\n" +msgstr "" + +#: src/attrib.c:1285 +#, c-format +msgid "# show_signatures=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1286 +#, c-format +msgid "# show_only_unread_arts=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1287 +#, c-format +msgid "# sigdashes=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1288 +#, c-format +msgid "# signature_repost=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1289 +#, c-format +msgid "# sort_article_type=NUM\n" +msgstr "" + +#: src/attrib.c:1307 +#, c-format +msgid "# sort_threads_type=NUM\n" +msgstr "" + +#: src/attrib.c:1316 +#, c-format +msgid "# start_editor_offset=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1317 +#, c-format +msgid "# tex2iso_conv=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1318 +#, c-format +msgid "# thread_catchup_on_exit=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1319 +#, c-format +msgid "# thread_articles=NUM" +msgstr "" + +#: src/attrib.c:1326 +#, c-format +msgid "# thread_format=STRING (eg. %%n %%m [%%L] %%T %%F)\n" +msgstr "" + +#: src/attrib.c:1327 +#, c-format +msgid "# thread_perc=NUM\n" +msgstr "" + +#: src/attrib.c:1328 +#, c-format +msgid "# trim_article_body=NUM\n" +msgstr "" + +#: src/attrib.c:1329 +#, c-format +msgid "# 0 = Don't trim article body\n" +msgstr "" + +#: src/attrib.c:1330 +#, c-format +msgid "# 1 = Skip leading blank lines\n" +msgstr "" + +#: src/attrib.c:1331 +#, c-format +msgid "# 2 = Skip trailing blank lines\n" +msgstr "" + +#: src/attrib.c:1332 +#, c-format +msgid "# 3 = Skip leading and trailing blank lines\n" +msgstr "" + +#: src/attrib.c:1333 +#, c-format +msgid "# 4 = Compact multiple blank lines between text blocks\n" +msgstr "" + +#: src/attrib.c:1334 +#, c-format +msgid "" +"# 5 = Compact multiple blank lines between text blocks and skip\n" +"# leading blank lines\n" +msgstr "" + +#: src/attrib.c:1335 +#, c-format +msgid "" +"# 6 = Compact multiple blank lines between text blocks and skip\n" +"# trailing blank lines\n" +msgstr "" + +#: src/attrib.c:1336 +#, c-format +msgid "" +"# 7 = Compact multiple blank lines between text blocks and skip\n" +"# leading and trailing blank lines\n" +msgstr "" + +#: src/attrib.c:1337 +#, c-format +msgid "# verbatim_handling=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1339 +#, c-format +msgid "# extquote_handling=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1341 +#, c-format +msgid "# wrap_on_next_unread=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1342 +#, c-format +msgid "# x_body=STRING (eg. ~/.tin/extra-body-text)\n" +msgstr "" + +#: src/attrib.c:1343 +#, c-format +msgid "# x_comment_to=ON/OFF\n" +msgstr "" + +#: src/attrib.c:1344 +#, c-format +msgid "# x_headers=STRING (eg. ~/.tin/extra-headers)\n" +msgstr "" + +#: src/attrib.c:1345 +#, c-format +msgid "" +"#\n" +"# Note that it is best to put general (global scoping)\n" +msgstr "" + +#: src/attrib.c:1346 +#, c-format +msgid "" +"# entries first followed by group specific entries.\n" +"#\n" +msgstr "" + +#: src/attrib.c:1347 +#, c-format +msgid "############################################################################\n" +msgstr "" + +#: src/cook.c:624 +#, fuzzy +msgid "(unknown)" +msgstr "_Desconocido:" + +#: src/keymap.c:277 +#, fuzzy +msgid "NULL" +msgstr "(NULO)" + +#: src/lang.c:42 +#, fuzzy +msgid "1 Response" +msgstr "Respuesta" + +#: src/lang.c:46 +#, fuzzy, c-format +msgid "" +"\n" +"%s contains no newsgroups. Exiting." +msgstr "El fichero `%s' (versión %d) contiene:\n" + +#: src/lang.c:47 +#, fuzzy +msgid "all " +msgstr "_Todo" + +#: src/lang.c:48 +#, fuzzy +msgid "All groups" +msgstr "Retiene todos los grupos suplementarios de cual usuario es un miembro." + +#: src/lang.c:49 +#, fuzzy, c-format +msgid "File %s exists. %s=append, %s=overwrite, %s=quit: " +msgstr "El fichero %s ya existe. ¿Seguro que desea sobrescribirlo?" + +#: src/lang.c:50 +#, fuzzy +msgid "Article cancelled (deleted)." +msgstr "¡¡¡Cancelada!!!" + +#: src/lang.c:52 +#, fuzzy +msgid "Article cannot be cancelled (deleted)." +msgstr "Una vez que añade una destreza, no podrá borrarla" + +#: src/lang.c:54 +#, fuzzy +msgid "Article deleted." +msgstr "[BORRADO]" + +#: src/lang.c:55 +#, c-format +msgid "" +"\n" +"Your article:\n" +" \"%s\"\n" +"will be mailed to the following address:\n" +" %s" +msgstr "" + +#: src/lang.c:56 +#, c-format +msgid "" +"\n" +"Your article:\n" +" \"%s\"\n" +"will be posted to the following %s:\n" +msgstr "" + +#: src/lang.c:57 +#, fuzzy +msgid "Article not posted!" +msgstr "Publicado en " + +#: src/lang.c:58 +#, fuzzy +msgid "Article not saved" +msgstr "guardado" + +#: src/lang.c:59 +#, fuzzy +msgid "Article Level Commands" +msgstr " órdenes:\n" + +#: src/lang.c:60 +#, fuzzy +msgid "Article has no parent" +msgstr "Artefacto $s ya tiene un superior" + +#: src/lang.c:61 +msgid "Parent article has been killed" +msgstr "" + +#: src/lang.c:62 +#, fuzzy +msgid "Parent article is unavailable" +msgstr "Artículo definido requerido" + +#: src/lang.c:63 +#, fuzzy, c-format +msgid "Article posted: %s" +msgstr "Factura %s contabilizada.\n" + +#: src/lang.c:64 +#, fuzzy, c-format +msgid "Article rejected (saved to %s)" +msgstr "Mantener %s en la versión %s es rechazado." + +#: src/lang.c:65 +#, c-format +msgid "" +"%s=article, %s=thread, %s=range, %s=hot, %s=pattern, %s=tagged, %s=quit: " +msgstr "" + +#: src/lang.c:66 +#, fuzzy +msgid "Article unavailable" +msgstr "NO DISPONIBLE" + +#: src/lang.c:67 +#, fuzzy +msgid "Article undeleted." +msgstr "Artículo definido requerido" + +#: src/lang.c:68 +#, fuzzy, c-format +msgid "Article %4d of %4d" +msgstr "estado # %4d\t" + +#: src/lang.c:70 +#, fuzzy +msgid "articles" +msgstr "Artículos" + +#: src/lang.c:71 +#, fuzzy +msgid "This is a repost of the following article:" +msgstr "No necesita utilizar el artículo definido" + +#: src/lang.c:72 +#, fuzzy +msgid "article" +msgstr "Artículo definido requerido" + +#: src/lang.c:73 +#, fuzzy +msgid "Article" +msgstr "Artículo definido requerido" + +#: src/lang.c:74 +#, fuzzy, c-format +msgid "-- %d %s mailed --" +msgstr "Último correo de id_usuario" + +#: src/lang.c:75 +#, fuzzy, c-format +msgid " at %s" +msgstr "" +"\n" +" %s: " + +#: src/lang.c:76 +#, fuzzy, c-format +msgid "%*s[-- %s/%s, encoding %s%s%s, %d lines%s%s --]\n" +msgstr "" +"Codificando %s%s%s a \n" +" %s%s%s \n" +"con calidad %2.2f\n" + +#: src/lang.c:77 +#, fuzzy +msgid ", charset: " +msgstr "Conjunto de caracteres:" + +#: src/lang.c:78 +#, fuzzy, c-format +msgid "%*s[-- charset %s not supported --]\n" +msgstr "«%s» no se admite en `%s%s'" + +#: src/lang.c:79 +#, fuzzy, c-format +msgid "%*s[-- Description: %s --]\n" +msgstr "descripción no válida: ~s" + +#: src/lang.c:80 +#, fuzzy, c-format +msgid "%d lines" +msgstr "" +"\n" +"\n" +"%d Líneas Principales:\n" +"\n" +" Línea Cuenta\n" +"\n" + +#: src/lang.c:81 +#, fuzzy +msgid "Attachment Menu" +msgstr "Adjuntos" + +#: src/lang.c:82 +#, fuzzy +msgid "Attachment Menu Commands" +msgstr "Adjuntos" + +#: src/lang.c:83 +#, fuzzy +msgid "" +msgstr "" + +#: src/lang.c:84 +#, fuzzy, c-format +msgid "Attachment saved successfully. (%s)" +msgstr "Adjunto borrado correctamente." + +#: src/lang.c:85 +#, fuzzy, c-format +msgid "%d of %d attachments saved successfully." +msgstr "D-Mod desinstalado exitosamente" + +#: src/lang.c:86 +#, fuzzy +msgid "Select attachment> " +msgstr "Adjuntos" + +#: src/lang.c:87 +#, fuzzy +msgid "Tagged attachment" +msgstr "Adjuntos" + +#: src/lang.c:88 +#, fuzzy, c-format +msgid "%d attachments tagged" +msgstr "Adjuntos" + +#: src/lang.c:89 +#, fuzzy +msgid "Untagged attachment" +msgstr "Adjuntos" + +#: src/lang.c:90 +#, fuzzy +msgid "Attributes Menu Commands" +msgstr "menú" + +#: src/lang.c:91 +#, fuzzy, c-format +msgid "attribute with no scope: %s" +msgstr " Atributo desconocido GNU: %s\n" + +#: src/lang.c:93 +#, fuzzy, c-format +msgid "%d Authentication failed" +msgstr "Autenticación fallada" + +#: src/lang.c:94 +#, c-format +msgid "NNTP authorization password not found for %s" +msgstr "" + +#: src/lang.c:95 +#, fuzzy +msgid "Server expects authentication.\n" +msgstr "Autenticación servidor finalizada (cliente confiado)…\n" + +#: src/lang.c:96 +#, fuzzy +msgid " Please enter password: " +msgstr "Introducir Contraseña" + +#: src/lang.c:97 +#, fuzzy +msgid " Please enter username: " +msgstr "" +"Por favor, introduzca su nombre de usuario y contraseña para el buzón '%s'" + +#: src/lang.c:98 +#, fuzzy, c-format +msgid "Authorized for user: %s\n" +msgstr "Autorizado el" + +#: src/lang.c:99 +#, fuzzy, c-format +msgid "Authorization failed for user: %s\n" +msgstr "Autorización fallada. ¿Reintento?" + +#: src/lang.c:101 +#, fuzzy, c-format +msgid "Author search backwards [%s]> " +msgstr "Buscar hacia atrás: " + +#: src/lang.c:102 +#, fuzzy, c-format +msgid "Author search forwards [%s]> " +msgstr "Buscar hacia adelante" + +#: src/lang.c:103 +#, fuzzy, c-format +msgid "" +"\n" +"Autosubscribed to %s" +msgstr "" +"\n" +" %s: " + +#: src/lang.c:104 +#, fuzzy +msgid "Autosubscribing groups...\n" +msgstr " grupos=" + +#: src/lang.c:105 +#, c-format +msgid "Autoselecting articles (use '%s' to see all unread) ..." +msgstr "" + +#: src/lang.c:107 +#, c-format +msgid "" +"Article to be posted resulted in errors/warnings. %s=quit, %s=Menu, %s=edit: " +msgstr "" + +#: src/lang.c:108 +#, fuzzy, c-format +msgid "Unrecognized attribute: %s" +msgstr "Atributo «%s» no reconocido" + +#: src/lang.c:109 +#, fuzzy, c-format +msgid "Bad command. Type '%s' for help." +msgstr "orden desconocidoa - «%.*s», intente ayuda" + +#: src/lang.c:111 +#, fuzzy +msgid "Base article" +msgstr ", Base: " + +#: src/lang.c:112 +#, fuzzy +msgid "Base article range" +msgstr "bit,base está fuera de límite para el símbolo" + +#: src/lang.c:113 +#, c-format +msgid "%s: Updating of index files not supported: cache_overview_files=%s" +msgstr "" + +#: src/lang.c:114 +#, fuzzy +msgid "*** Beginning of article ***" +msgstr "ningún periodo permitido al principio de la sinopsis" + +#: src/lang.c:115 +#, fuzzy +msgid "*** Beginning of page ***" +msgstr "empezando el: " + +#: src/lang.c:117 +#, c-format +msgid "Cancel (delete) or supersede (overwrite) article [%%s]? (%s/%s/%s): " +msgstr "" + +#: src/lang.c:118 +#, fuzzy +msgid "Cancelling article..." +msgstr "" +"\n" +"Cancelando...\n" + +#: src/lang.c:120 +#, fuzzy, c-format +msgid "Cannot create %s" +msgstr "no se puede crear %s: %s\n" + +#: src/lang.c:123 +#, fuzzy, c-format +msgid "Can't find base article %d" +msgstr "error: no puede encontrar símbolo: __SDA_BASE_." + +#: src/lang.c:125 +#, fuzzy, c-format +msgid "Can't open %s" +msgstr "no se puede abrir %s" + +#: src/lang.c:126 +#, fuzzy, c-format +msgid "Couldn't open %s for saving" +msgstr "No se puede abrir %s para escritura\n" + +#: src/lang.c:127 +#, fuzzy +msgid "*** Posting not allowed ***" +msgstr "Estará publicando a:" + +#: src/lang.c:128 +#, fuzzy, c-format +msgid "Posting is not allowed to %s" +msgstr "Publicación Fallida" + +#: src/lang.c:130 +#, fuzzy, c-format +msgid "Can't retrieve %s" +msgstr "no puedo consultar %s: %s\n" + +#: src/lang.c:132 +#, fuzzy, c-format +msgid "%s is a directory" +msgstr "%s: es un directorio" + +#: src/lang.c:133 +msgid "Catchup" +msgstr "" + +#: src/lang.c:134 +#, fuzzy, c-format +msgid "Catchup %s..." +msgstr "" +"\n" +" %s: " + +#: src/lang.c:135 +msgid "Catchup all groups entered during this session?" +msgstr "" + +#: src/lang.c:136 +msgid "You have tagged articles in this group - catchup anyway?" +msgstr "" + +#: src/lang.c:137 +#, fuzzy, c-format +msgid "%s %d %s in %lu seconds\n" +msgstr "durmiendo en %s por %d segundos\n" + +#: src/lang.c:138 +msgid "Caughtup" +msgstr "" + +#: src/lang.c:139 +#, fuzzy +msgid "Check Prepared Article" +msgstr "Preparado para: " + +#: src/lang.c:140 +#, fuzzy +msgid "Checking for new groups... " +msgstr "Comprobando un nuevo disco\n" + +#: src/lang.c:141 +#, fuzzy +msgid "Checking for news..." +msgstr " comprobando..." + +#: src/lang.c:142 +#, c-format +msgid "Post-process %s=no, %s=yes, %s=shar, %s=quit: " +msgstr "" + +#: src/lang.c:144 +#, fuzzy +msgid "ANSI color disabled" +msgstr "Color" + +#: src/lang.c:145 +#, fuzzy +msgid "ANSI color enabled" +msgstr "Activado" + +#: src/lang.c:147 +#, fuzzy, c-format +msgid "Command failed: %s" +msgstr "Orden fallada: %s\n" + +#: src/lang.c:148 +#, c-format +msgid "Cook article failed, %s is exiting" +msgstr "" + +#: src/lang.c:149 +#, fuzzy +msgid "Mark not selected articles read?" +msgstr "Marca buzones leídos" + +#: src/lang.c:151 +#, fuzzy, c-format +msgid "Connecting to %s..." +msgstr "conectando a %s" + +#: src/lang.c:153 +#, fuzzy +msgid "" +msgstr "CR o DB" + +#: src/lang.c:154 +msgid "Creating active file for saved groups...\n" +msgstr "" + +#: src/lang.c:155 +#, fuzzy +msgid "Creating newsrc file...\n" +msgstr "Se crea el fichero de biblioteca: %s" + +#: src/lang.c:157 src/lang.c:1313 src/lang.c:1333 +msgid "Default" +msgstr "Predeterminado" + +#: src/lang.c:158 +msgid "Delete saved files that have been post processed?" +msgstr "" + +#: src/lang.c:159 +#, fuzzy +msgid "Deleting temporary files..." +msgstr "Se borra el fichero base temporal %s" + +#: src/lang.c:161 +#, fuzzy +msgid "*** End of article ***" +msgstr "Artículo definido requerido" + +#: src/lang.c:162 +#, fuzzy +msgid "*** End of articles ***" +msgstr "" +"\n" +"Ningún artículo dentro de este grupo.\n" + +#: src/lang.c:163 +#, fuzzy +msgid "*** End of attachments ***" +msgstr "Adjuntos" + +#: src/lang.c:164 +#, fuzzy +msgid "*** End of groups ***" +msgstr " grupos=" + +#: src/lang.c:165 +#, fuzzy +msgid "*** End of page ***" +msgstr "NO A FIN-DE-PÃGINA antes que A FIN-DE-PÃGINA" + +#: src/lang.c:166 +#, fuzzy +msgid "*** End of scopes ***" +msgstr "¿Es éste el final?" + +#: src/lang.c:167 +#, fuzzy +msgid "*** End of thread ***" +msgstr "Hilo" + +#: src/lang.c:168 +#, fuzzy +msgid "*** End of URLs ***" +msgstr "URLS" + +#: src/lang.c:169 +#, fuzzy +msgid "Enter limit of articles to get> " +msgstr "Introduzca el nuevo límite de árbol de paquetes:" + +#: src/lang.c:170 +#, fuzzy +msgid "Enter Message-ID to go to> " +msgstr "No se pudo obtener el id del mensaje" + +#: src/lang.c:171 +#, fuzzy +msgid " and enter next unread thread" +msgstr "La obtención del siguiente thread_id falló" + +#: src/lang.c:172 +msgid " and enter next unread article" +msgstr "" + +#: src/lang.c:173 +msgid " and enter next unread group" +msgstr "" + +#: src/lang.c:174 +#, fuzzy +msgid "Enter option number> " +msgstr "Introduzca el número de transacción, como el número de comprobación" + +#: src/lang.c:175 +#, fuzzy, c-format +msgid "Enter range [%s]> " +msgstr "Introduzca contraseña para %s@%s: " + +#: src/lang.c:176 +#, fuzzy +msgid "" +"\n" +"Warning: Approved: header used.\n" +msgstr "" +"advertencia: el remiendo para \"$filename\" no podra ser utilizado, as que " +"la fuente entrante completa para este fichero se ha utilizado; usted puede " +"necesitar resolver conflictos manualmente" + +#: src/lang.c:178 +msgid "" +"\n" +"Error: Bad address in Approved: header.\n" +msgstr "" + +#: src/lang.c:179 +#, fuzzy +msgid "" +"\n" +"Error: Bad address in From: header.\n" +msgstr "error al leer cabecera de paquete\n" + +#: src/lang.c:180 +msgid "" +"\n" +"Error: Bad FQDN in Message-ID: header.\n" +msgstr "" + +#: src/lang.c:181 +msgid "" +"\n" +"Error: Bad address in Reply-To: header.\n" +msgstr "" + +#: src/lang.c:182 +#, fuzzy +msgid "" +"\n" +"Error: Bad address in To: header.\n" +msgstr "Cabecera equivocada/ilegible" + +#: src/lang.c:184 +#, fuzzy, c-format +msgid "Can't unlock %s" +msgstr "pthread_mutex_unlock fallado: %s" + +#: src/lang.c:185 +#, c-format +msgid "Couldn't dotlock %s - article not appended!" +msgstr "" + +#: src/lang.c:186 +#, c-format +msgid "Couldn't lock %s - article not appended!" +msgstr "" + +#: src/lang.c:189 +#, fuzzy, c-format +msgid "Corrupted file %s" +msgstr "fichero «%s» indexado está corrompido" + +#: src/lang.c:191 +msgid "" +"\n" +"Error: Followup-To \"poster\" and a newsgroup is not allowed!\n" +msgstr "" + +#: src/lang.c:192 +#, c-format +msgid "Error: Custom format exceeds screen width. Using default \"%s\"." +msgstr "" + +#: src/lang.c:193 +msgid "Internal error in GNKSA routine - send bug report.\n" +msgstr "" + +#: src/lang.c:194 +msgid "Left angle bracket missing in route address.\n" +msgstr "" + +#: src/lang.c:195 +msgid "Left parenthesis missing in old-style address.\n" +msgstr "" + +#: src/lang.c:196 +msgid "Right parenthesis missing in old-style address.\n" +msgstr "" + +#: src/lang.c:197 +#, fuzzy +msgid "At-sign missing in mail address.\n" +msgstr "Dirección personal para correo" + +#: src/lang.c:198 +msgid "Single component FQDN is not allowed. Add your domain.\n" +msgstr "" + +#: src/lang.c:199 +msgid "" +"Invalid domain. Send bug report if your top level domain really exists.\n" +"Use .invalid as top level domain for munged addresses.\n" +msgstr "" + +#: src/lang.c:200 +msgid "" +"Illegal domain. Send bug report if your top level domain really exists.\n" +"Use .invalid as top level domain for munged addresses.\n" +msgstr "" + +#: src/lang.c:201 +msgid "" +"Unknown domain. Send bug report if your top level domain really exists.\n" +"Use .invalid as top level domain for munged addresses.\n" +msgstr "" + +#: src/lang.c:202 +#, fuzzy +msgid "Illegal character in FQDN.\n" +msgstr "Hay un carácter ilegal en el nombre." + +#: src/lang.c:203 +msgid "Zero length FQDN component not allowed.\n" +msgstr "" + +#: src/lang.c:204 +msgid "FQDN component exceeds maximum allowed length (63 chars).\n" +msgstr "" + +#: src/lang.c:205 +msgid "FQDN component may not start or end with hyphen.\n" +msgstr "" + +#: src/lang.c:206 +msgid "FQDN component may not start with digit.\n" +msgstr "" + +#: src/lang.c:207 +msgid "Domain literal has impossible numeric value.\n" +msgstr "" + +#: src/lang.c:208 +msgid "" +"Domain literal is for private use only and not allowed for global use.\n" +msgstr "" + +#: src/lang.c:209 +msgid "Right bracket missing in domain literal.\n" +msgstr "" + +#: src/lang.c:210 +#, fuzzy +msgid "Missing localpart of mail address.\n" +msgstr "Dirección personal para correo" + +#: src/lang.c:211 +msgid "Illegal character in localpart of mail address.\n" +msgstr "" + +#: src/lang.c:212 +msgid "Zero length localpart component not allowed.\n" +msgstr "" + +#: src/lang.c:213 +msgid "" +"Illegal character in realname.\n" +"Unquoted words may not contain '!()<>@,;:\\.[]' in route addresses.\n" +msgstr "" + +#: src/lang.c:214 +msgid "" +"Illegal character in realname.\n" +"Quoted words may not contain '()<>\\'.\n" +msgstr "" + +#: src/lang.c:215 +msgid "" +"Illegal character in realname.\n" +"Encoded words may not contain '!()<>@,;:\"\\.[]/=' in parameter.\n" +msgstr "" + +#: src/lang.c:216 +msgid "Bad syntax in encoded word used in realname.\n" +msgstr "" + +#: src/lang.c:217 +msgid "" +"Illegal character in realname.\n" +"Unquoted words may not contain '()<>\\' in old-style addresses.\n" +msgstr "" + +#: src/lang.c:218 +msgid "" +"Illegal character in realname.\n" +"Control characters and unencoded 8bit characters > 127 are not allowed.\n" +msgstr "" + +#: src/lang.c:219 +msgid "" +"\n" +"Error: No blank line found after header.\n" +msgstr "" + +#: src/lang.c:220 +#, fuzzy, c-format +msgid "" +"\n" +"Error: Illegal formatted %s.\n" +msgstr "La opción de número formateado como moneda es %s." + +#. TODO: fixme, US-ASCII is not the only 7bit charset we know about +#: src/lang.c:222 +msgid "" +"\n" +"Error: Posting contains non-ASCII characters but MM_CHARSET is set to\n" +" US-ASCII - please change this setting to a suitable value for\n" +" your language using the M)enu of configurable options or by\n" +" editing tinrc.\n" +msgstr "" + +#: src/lang.c:227 +msgid "" +"\n" +"Error: Posting contains non-ASCII characters but the MIME encoding\n" +" for news messages is set to \"7bit\" - please change this\n" +" setting to \"8bit\" or \"quoted-printable\" depending on what\n" +" is more common in your part of the world. This can be done\n" +" using the M)enu of configurable options or by editing tinrc.\n" +msgstr "" + +#: src/lang.c:233 +msgid "" +"\n" +"Error: Article starts with blank line instead of header\n" +msgstr "" + +#: src/lang.c:234 +#, c-format +msgid "" +"\n" +"Error: Header on line %d does not have a colon after the header name:\n" +"%s\n" +msgstr "" + +#: src/lang.c:235 +#, fuzzy, c-format +msgid "" +"\n" +"Error: The \"%s:\" line is empty.\n" +msgstr "error: el fichero de entrada '%s' está vacío" + +#: src/lang.c:236 +#, c-format +msgid "" +"\n" +"Error: The \"%s:\" line is missing from the article header.\n" +msgstr "" + +#: src/lang.c:237 +#, c-format +msgid "" +"\n" +"Error: %s contains non 7bit chars.\n" +msgstr "" + +#: src/lang.c:238 +#, c-format +msgid "" +"\n" +"Error: Header on line %d does not have a space after the colon:\n" +"%s\n" +msgstr "" + +#: src/lang.c:239 +#, fuzzy, c-format +msgid "" +"\n" +"Error: There are multiple (%d) \"%s:\" lines in the header.\n" +msgstr "error(%d) obteniendo cabecera #%d registra para %s desinstalar\n" + +#: src/lang.c:240 +#, fuzzy, c-format +msgid "Insecure permissions of %s (%o)" +msgstr "NT_386_IOPERM (permisos E/S x86)" + +#: src/lang.c:244 +#, c-format +msgid "MIME parse error: Unexpected end of %s/%s article" +msgstr "" + +#: src/lang.c:245 +msgid "MIME parse error: Start boundary whilst reading headers" +msgstr "" + +#: src/lang.c:246 +#, fuzzy +msgid "" +"\n" +"Error: \"poster\" is not allowed in Newsgroups!\n" +msgstr "error: no puede reiniciar, operación no permitida\n" + +#: src/lang.c:247 +msgid "Can't get a (fully-qualified) domain-name!" +msgstr "" + +#: src/lang.c:248 +#, fuzzy, c-format +msgid "No permissions to go into %s\n" +msgstr "se conservan los permisos de %s" + +#: src/lang.c:250 +#, fuzzy +msgid "" +"\n" +"Error: From: line missing.\n" +msgstr "DSO faltante desde línea de orden" + +#: src/lang.c:252 +#, fuzzy, c-format +msgid "No read permissions for %s\n" +msgstr "se conservan los permisos de %s" + +#: src/lang.c:253 +#, fuzzy, c-format +msgid "File %s does not exist\n" +msgstr "Fichero %s no existe" + +#: src/lang.c:254 +#, fuzzy, c-format +msgid "No write permissions for %s\n" +msgstr "%s: permisos no establecidos: %s\n" + +#: src/lang.c:255 +msgid "Can't get user information (/etc/passwd missing?)" +msgstr "" + +#: src/lang.c:256 +#, fuzzy +msgid "errors" +msgstr "Errores" + +#: src/lang.c:258 +#, c-format +msgid "" +"\n" +"Error on line %d: \"Sender:\" header not allowed (it will be added for you)\n" +msgstr "" + +#: src/lang.c:260 +#, c-format +msgid "Server has non of the groups listed in %s" +msgstr "" + +#: src/lang.c:261 +#, fuzzy +msgid "error" +msgstr "ERROR" + +#: src/lang.c:262 +#, fuzzy +msgid "Unknown display level" +msgstr "desconoce nivel %s ISA" + +#: src/lang.c:263 +#, fuzzy +msgid "" +msgstr " o CTRL-x Abortar MODO BUSQUEDA" + +#: src/lang.c:264 +#, fuzzy +msgid "Exiting..." +msgstr "Saliendo" + +#: src/lang.c:265 +msgid "leaving external mail-reader" +msgstr "" + +#: src/lang.c:266 +#, fuzzy, c-format +msgid "Extracting %s..." +msgstr "x - extrayendo< %s %s" + +#: src/lang.c:268 +#, c-format +msgid "Error writing %s file. Filesystem full? File reset to previous state." +msgstr "" + +#: src/lang.c:269 +#, c-format +msgid "Error making backup of %s file. Filesystem full?" +msgstr "" + +#: src/lang.c:270 +#, fuzzy, c-format +msgid "Filtering global rules (%d/%d)..." +msgstr "demasiadas reglas (> %d)!" + +#: src/lang.c:271 +#, fuzzy +msgid "Rule created by: " +msgstr "creado" + +#: src/lang.c:272 +#, fuzzy, c-format +msgid "Enter pattern [%s]> " +msgstr "glob PATTERN(s) a excluir" + +#: src/lang.c:273 +#, c-format +msgid "" +"\n" +"You requested followups to your article to go to the following %s:\n" +msgstr "" + +#: src/lang.c:274 +#, c-format +msgid " %s\t Answers will be directed to you by mail.\n" +msgstr "" + +#: src/lang.c:275 +#, fuzzy +msgid "-- forwarded message --\n" +msgstr " Los mensajes se reenviarán con %cMTP a:" + +#: src/lang.c:276 +#, fuzzy +msgid "-- end of forwarded message --\n" +msgstr " Los mensajes se reenviarán con %cMTP a:" + +#: src/lang.c:277 +msgid "" +"# Format:\n" +"# comment=STRING Optional. Multiple lines allowed. Comments must be " +"placed\n" +"# at the beginning of a rule, or they will be moved to " +"the\n" +"# next rule. '#' is not a valid keyword for a comment!\n" +"# group=STRING Mandatory. Newsgroups list (e.g. comp.*,!*sources*).\n" +"# case=NUM Mandatory. Compare=0 / ignore=1 case when filtering.\n" +"# score=NUM|STRING Mandatory. Score to give. Either:\n" +"# score=NUM A number (e.g. 70). Or:\n" +"# score=STRING One of the two keywords: 'hot' or 'kill'.\n" +"# subj=STRING Optional. Subject: line (e.g. How to be a wizard).\n" +"# from=STRING Optional. From: line (e.g. *Craig Shergold*).\n" +"# msgid=STRING Optional. Message-ID: line (e.g. <123@ether.net>) " +"with\n" +"# full references.\n" +"# msgid_last=STRING Optional. Like above, but with last reference only.\n" +"# msgid_only=STRING Optional. Like above, but without references.\n" +"# refs_only=STRING Optional. References: line (e.g. <123@ether.net>) " +"without\n" +"# Message-ID:\n" +"# lines=[<>]?NUM Optional. Lines: line. '<' or '>' are optional.\n" +"# gnksa=[<>]?NUM Optional. GNKSA parse_from() return code. '<' or '>' " +"opt.\n" +"# xref=PATTERN Optional. Kill pattern (e.g. alt.flame*)\n" +"# path=PATTERN Optional. Kill pattern (e.g. news.example.org)\n" +"# Be aware that filtering on Path: may significantly " +"slow\n" +"# down the process.\n" +"# time=NUM Optional. time_t value when rule expires\n" +"#\n" +msgstr "" + +#: src/lang.c:301 +#, c-format +msgid "Enter score for rule (default=%d): " +msgstr "" + +#: src/lang.c:302 +#, c-format +msgid "Enter the score weight (range 0 < score <= %d)" +msgstr "" + +#. SCORE_MAX +#: src/lang.c:303 +msgid "Full" +msgstr "Llena" + +#: src/lang.c:304 +#, fuzzy +msgid "Comment (optional) : " +msgstr "opcional" + +#: src/lang.c:305 +#, fuzzy +msgid "Apply pattern to : " +msgstr "Patrón" + +#: src/lang.c:306 +#, fuzzy +msgid "From: line (ignore case) " +msgstr "" +" -i, --ignore-case ignora las diferencias entre mayúsculas y " +"minúsculas\n" + +#: src/lang.c:307 +#, fuzzy +msgid "From: line (case sensitive) " +msgstr "distinguir mayúsculas" + +#: src/lang.c:309 +#, fuzzy, c-format +msgid "%s%s: Unknown host.\n" +msgstr "nombre hospedante desconocido %s" + +#: src/lang.c:311 +#, fuzzy +msgid "global " +msgstr "Global:\n" + +#: src/lang.c:312 +#, fuzzy, c-format +msgid "Please use %.100s instead" +msgstr "utilice la comando \"aegis -dbu\" en lugar de otro" + +#: src/lang.c:313 +#, fuzzy, c-format +msgid "%s is bogus" +msgstr "aviso: %s: ignorando nombre espurio de fichero" + +#: src/lang.c:314 +#, fuzzy, c-format +msgid "Group %s is moderated. Continue?" +msgstr "Ningún foro es moderado en este grupo" + +#: src/lang.c:315 +#, fuzzy +msgid "groups" +msgstr "GRUPOS" + +#: src/lang.c:316 +#, fuzzy, c-format +msgid "Rereading %s..." +msgstr "" +"\n" +" %s: " + +#: src/lang.c:317 +#, fuzzy +msgid "Top Level Commands" +msgstr "directorio raíz" + +#: src/lang.c:318 +#, fuzzy +msgid "Group Selection" +msgstr "Selección de género" + +#: src/lang.c:319 +#, fuzzy +msgid "group" +msgstr "Grupo" + +#: src/lang.c:320 +msgid "" +"*** Group descriptions are disabled according to current select_format ***" +msgstr "" + +#: src/lang.c:322 +msgid "" +"One or more lines of comment. to add a line or proceed if line is empty." +msgstr "" + +#: src/lang.c:323 +msgid "From: line to add to filter file. toggles & sets." +msgstr "" + +#: src/lang.c:324 +msgid "" +"Linecount of articles to be filtered. < for less, > for more, = for equal." +msgstr "" + +#: src/lang.c:325 +msgid "Message-ID: line to add to filter file. toggles & sets." +msgstr "" + +#: src/lang.c:326 +msgid "Subject: line to add to filter file. toggles & sets." +msgstr "" + +#: src/lang.c:327 +msgid "" +"Enter text pattern to filter if Subject: & From: lines are not what you want." +msgstr "" + +#: src/lang.c:328 +msgid "" +"Select where text pattern should be applied. toggles & sets." +msgstr "" + +#: src/lang.c:329 +msgid "" +"Expiration time in days for the entered filter. toggles & sets." +msgstr "" + +#: src/lang.c:330 +msgid "" +"Apply kill only to current group or all groups. toggles & sets." +msgstr "" + +#: src/lang.c:331 +msgid "" +"Apply select to current group or all groups. toggles & sets." +msgstr "" + +#: src/lang.c:332 +msgid "kill an article via a menu" +msgstr "" + +#: src/lang.c:333 +msgid "auto-select (hot) an article via a menu" +msgstr "" + +#: src/lang.c:334 +#, fuzzy +msgid "Browse URLs in article" +msgstr "Examinar por" + +#: src/lang.c:335 +msgid "0 - 9\t display article by number in current thread" +msgstr "" + +#: src/lang.c:337 +msgid "cancel (delete) or supersede (overwrite) current article" +msgstr "" + +#: src/lang.c:338 +msgid "post followup to current article" +msgstr "" + +#: src/lang.c:339 +msgid "post followup (don't copy text) to current article" +msgstr "" + +#: src/lang.c:340 +msgid "post followup to current article quoting complete headers" +msgstr "" + +#: src/lang.c:341 +msgid "repost chosen article to another group" +msgstr "" + +#: src/lang.c:343 +msgid "edit article (mail-groups only)" +msgstr "" + +#: src/lang.c:344 +msgid "display first article in current thread" +msgstr "" + +#: src/lang.c:345 +#, fuzzy +msgid "display first page of article" +msgstr "No necesita para el primer artículo definido" + +#: src/lang.c:346 +msgid "display last article in current thread" +msgstr "" + +#: src/lang.c:347 +#, fuzzy +msgid "display last page of article" +msgstr "Vista página: ningún gráfico a enseñar." + +#: src/lang.c:348 +msgid "mark rest of thread as read and advance to next unread" +msgstr "" + +#: src/lang.c:349 +#, fuzzy +msgid "display next article" +msgstr "Ver siguiente pantalla" + +#: src/lang.c:350 +msgid "display first article in next thread" +msgstr "" + +#: src/lang.c:351 +#, fuzzy +msgid "display next unread article" +msgstr "Ver siguiente pantalla" + +#: src/lang.c:352 +msgid "go to the article that this one followed up" +msgstr "" + +#: src/lang.c:353 +#, fuzzy +msgid "display previous article" +msgstr "Ver pantalla anterior" + +#: src/lang.c:354 +#, fuzzy +msgid "display previous unread article" +msgstr "Ver pantalla anterior" + +#: src/lang.c:355 +msgid "quickly kill an article using defaults" +msgstr "" + +#: src/lang.c:356 +msgid "quickly auto-select (hot) an article using defaults" +msgstr "" + +#: src/lang.c:357 +msgid "return to group selection level" +msgstr "" + +#: src/lang.c:358 +msgid "reply through mail to author" +msgstr "" + +#: src/lang.c:359 +msgid "reply through mail (don't copy text) to author" +msgstr "" + +#: src/lang.c:360 +msgid "reply through mail to author quoting complete headers" +msgstr "" + +#: src/lang.c:361 +#, fuzzy +msgid "search backwards within this article" +msgstr "Buscar hacia atrás: " + +#: src/lang.c:362 +#, fuzzy +msgid "search forwards within this article" +msgstr "Buscar hacia adelante" + +#: src/lang.c:363 +msgid "show article in raw-mode (including all headers)" +msgstr "" + +#: src/lang.c:364 +msgid "skip next block of included text" +msgstr "" + +#: src/lang.c:365 +msgid "toggle display of sections hidden by a form-feed (^L) on/off" +msgstr "" + +#: src/lang.c:366 +#, fuzzy +msgid "toggle display of all headers" +msgstr "conmuta enseñar modificaciones de los tamaños del paquete" + +#: src/lang.c:367 +msgid "toggle word highlighting on/off" +msgstr "" + +#: src/lang.c:368 +msgid "toggle ROT-13 (basic decode) for current article" +msgstr "" + +#: src/lang.c:369 +msgid "toggle tabwidth 4 <-> 8" +msgstr "" + +#: src/lang.c:370 +msgid "toggle german TeX style decoding for current article" +msgstr "" + +#: src/lang.c:371 +#, fuzzy +msgid "toggle display of uuencoded sections" +msgstr "conmuta enseñar los números de versiones" + +#: src/lang.c:372 +msgid "View/pipe/save multimedia attachments" +msgstr "" + +#: src/lang.c:373 +#, fuzzy +msgid "choose first attachment in list" +msgstr "Primero Debe Elegir Un Mensaje" + +#: src/lang.c:374 +msgid "0 - 9\t choose attachment by number" +msgstr "" + +#: src/lang.c:375 +#, fuzzy +msgid "choose last attachment in list" +msgstr "Elija una lista para examinar, buscar y publicar mensajes." + +#: src/lang.c:377 +#, fuzzy +msgid "pipe attachment into command" +msgstr "Adjuntos" + +#: src/lang.c:378 +#, fuzzy +msgid "pipe raw attachment into command" +msgstr "No puede abrir una tubería a orden «%s»" + +#: src/lang.c:380 +#, fuzzy +msgid "save attachment to disk" +msgstr "Guarda opciones al disco" + +#: src/lang.c:381 +#, fuzzy +msgid "search for attachments forwards" +msgstr "Buscar hacia adelante" + +#: src/lang.c:382 +#, fuzzy +msgid "search for attachments backwards" +msgstr "Adjuntos" + +#: src/lang.c:383 +#, fuzzy +msgid "view attachment" +msgstr "Adjuntos" + +#: src/lang.c:384 +#, fuzzy +msgid "tag attachment" +msgstr "Adjuntos" + +#: src/lang.c:385 +msgid "tag attachments that match user specified pattern" +msgstr "" + +#: src/lang.c:386 +msgid "reverse tagging on all attachments (toggle)" +msgstr "" + +#: src/lang.c:387 +msgid "untag all tagged attachments" +msgstr "" + +#: src/lang.c:388 +msgid "toggle info message in last line (name/description of attachment)" +msgstr "" + +#: src/lang.c:389 +#, fuzzy +msgid "choose first attribute in list" +msgstr "Primero Debe Elegir Un Mensaje" + +#: src/lang.c:390 +msgid "0 - 9\t choose attribute by number" +msgstr "" + +#: src/lang.c:391 +#, fuzzy +msgid "choose last attribute in list" +msgstr "Elija una lista para examinar, buscar y publicar mensajes." + +#: src/lang.c:392 +#, fuzzy +msgid "reset attribute to a default value" +msgstr "restablece todas las opciones a sus valores predeterminados" + +#: src/lang.c:393 +#, fuzzy +msgid "search forwards for an attribute" +msgstr "Buscar hacia adelante" + +#: src/lang.c:394 +#, fuzzy +msgid "search backwards for an attribute" +msgstr "Buscar hacia atrás: " + +#: src/lang.c:395 +#, fuzzy +msgid "select attribute" +msgstr "Atributo" + +#: src/lang.c:396 +msgid "toggle back to options menu when invoked from there" +msgstr "" + +#: src/lang.c:397 +#, c-format +msgid "report bug or comment via mail to %s" +msgstr "" + +#: src/lang.c:398 +#, fuzzy +msgid "choose first option in list" +msgstr "Primera Opción" + +#: src/lang.c:399 +msgid "0 - 9\t choose option by number" +msgstr "" + +#: src/lang.c:400 +#, fuzzy +msgid "choose last option in list" +msgstr "Una opción de listado" + +#: src/lang.c:401 +#, fuzzy +msgid "start scopes menu" +msgstr "inicio" + +#: src/lang.c:402 +#, fuzzy +msgid "search forwards for an option" +msgstr "Buscar hacia adelante" + +#: src/lang.c:403 +#, fuzzy +msgid "search backwards for an option" +msgstr "Buscar hacia atrás: " + +#: src/lang.c:404 +#, fuzzy +msgid "select option" +msgstr "Seleccionar…" + +#: src/lang.c:405 +#, fuzzy +msgid "toggle to attributes menu" +msgstr "Atributos" + +#: src/lang.c:406 +msgid "choose range of articles to be affected by next command" +msgstr "" + +#: src/lang.c:407 +#, fuzzy +msgid "escape from command prompt" +msgstr "Modifica petición de línea de orden." + +#: src/lang.c:408 +#, fuzzy +msgid "edit filter file" +msgstr "Edite el contenido de su fichero" + +#: src/lang.c:409 +#, fuzzy +msgid "get help" +msgstr "Obtener Ayuda" + +#: src/lang.c:410 +#, fuzzy +msgid "display last article viewed" +msgstr "Enseña ñas últimas 5 encuestas de su proyecto." + +#: src/lang.c:411 +#, fuzzy +msgid "down one line" +msgstr "Bajar" + +#: src/lang.c:412 +#, fuzzy +msgid "up one line" +msgstr "Dos ficheros en una línea: %s\n" + +#: src/lang.c:413 +msgid "go to article chosen by Message-ID" +msgstr "" + +#: src/lang.c:414 +msgid "mail article/thread/hot/pattern/tagged articles to someone" +msgstr "" + +#: src/lang.c:415 +#, fuzzy +msgid "menu of configurable options" +msgstr "El menú de opciones" + +#: src/lang.c:416 +#, fuzzy +msgid "down one page" +msgstr "d retroceder media página" + +#: src/lang.c:417 +#, fuzzy +msgid "up one page" +msgstr "w o avanza página" + +#: src/lang.c:419 +msgid "post (write) article to current group" +msgstr "" + +#: src/lang.c:420 +#, fuzzy +msgid "post postponed articles" +msgstr "Pospuesto" + +#: src/lang.c:422 +msgid "list articles posted by you (from posted file)" +msgstr "" + +#: src/lang.c:423 +#, fuzzy +msgid "return to previous menu" +msgstr "ninguna sección anterior para devolver, ignorada." + +#: src/lang.c:424 +#, fuzzy +msgid "quit tin immediately" +msgstr "sale inmediatamente" + +#: src/lang.c:425 +#, fuzzy +msgid "redraw page" +msgstr "Página" + +#: src/lang.c:426 +msgid "save article/thread/hot/pattern/tagged articles to file" +msgstr "" + +#: src/lang.c:427 +msgid "save marked articles automatically without user prompts" +msgstr "" + +#: src/lang.c:428 +msgid "scroll the screen one line down" +msgstr "" + +#: src/lang.c:429 +msgid "scroll the screen one line up" +msgstr "" + +#: src/lang.c:430 +#, fuzzy +msgid "search for articles by author backwards" +msgstr "Buscar hacia atrás: " + +#: src/lang.c:431 +#, fuzzy +msgid "search for articles by author forwards" +msgstr "Buscar hacia adelante" + +#: src/lang.c:432 +msgid "search all articles for a given string (this may take some time)" +msgstr "" + +#: src/lang.c:433 +msgid " \t (searches are case-insensitive and wrap around to all articles)" +msgstr "" + +#: src/lang.c:434 +msgid "search for articles by Subject line backwards" +msgstr "" + +#: src/lang.c:435 +msgid "search for articles by Subject line forwards" +msgstr "" + +#: src/lang.c:436 +#, fuzzy +msgid "repeat last search" +msgstr "Repetir la última búsqueda" + +#: src/lang.c:437 +msgid "tag current article for reposting/mailing/piping/printing/saving" +msgstr "" + +#: src/lang.c:438 +msgid "toggle info message in last line (subject/description)" +msgstr "" + +#: src/lang.c:439 +#, fuzzy +msgid "toggle inverse video" +msgstr "_Invertir" + +#: src/lang.c:440 +msgid "toggle mini help menu display" +msgstr "" + +#: src/lang.c:441 +msgid "cycle the display of authors email address, real name, both or neither" +msgstr "" + +#: src/lang.c:442 +#, fuzzy +msgid "show version information" +msgstr " -V, --version muestra información sobre versión\n" + +#: src/lang.c:443 +msgid "mark all articles as read and return to group selection menu" +msgstr "" + +#: src/lang.c:444 +msgid "mark all articles as read and enter next group with unread articles" +msgstr "" + +#: src/lang.c:445 +#, fuzzy +msgid "choose first thread in list" +msgstr "Primero Debe Elegir Un Mensaje" + +#: src/lang.c:446 +#, fuzzy +msgid "choose last thread in list" +msgstr "Elija una lista para examinar, buscar y publicar mensajes." + +#: src/lang.c:447 +msgid "list articles within current thread (bring up Thread sub-menu)" +msgstr "" + +#: src/lang.c:448 +#, fuzzy +msgid "mark article as unread" +msgstr "*** Tiene correo no leído. ***" + +#: src/lang.c:449 +msgid "mark current thread, range or tagged threads as read" +msgstr "" + +#: src/lang.c:450 +msgid "mark current thread, range or tagged threads as unread" +msgstr "" + +#: src/lang.c:451 +msgid "mark current/range/selected/pattern/tagged as read after prompting" +msgstr "" + +#: src/lang.c:452 +msgid "mark current/range/selected/pattern/tagged as unread after prompting" +msgstr "" + +#: src/lang.c:453 +msgid "toggle display of all/selected articles" +msgstr "" + +#: src/lang.c:454 +#, fuzzy +msgid "display next group" +msgstr "Ver siguiente pantalla" + +#: src/lang.c:455 +#, fuzzy +msgid "display previous group" +msgstr "Ver pantalla anterior" + +#: src/lang.c:456 +#, fuzzy +msgid "toggle all selections (all articles)" +msgstr "Todos artículos disponibles en " + +#: src/lang.c:457 +msgid "select group (make \"hot\")" +msgstr "" + +#: src/lang.c:458 +#, fuzzy +msgid "select thread" +msgstr "Hilo" + +#: src/lang.c:459 +msgid "select threads if at least one unread article is selected" +msgstr "" + +#: src/lang.c:460 +msgid "select threads that match user specified pattern" +msgstr "" + +#: src/lang.c:461 +msgid "tag all parts of current multipart-message in order" +msgstr "" + +#: src/lang.c:462 +msgid "0 - 9\t choose thread by number" +msgstr "" + +#: src/lang.c:463 +msgid "toggle limit number of articles to get, and reload" +msgstr "" + +#: src/lang.c:464 +msgid "toggle display of all/unread articles" +msgstr "" + +#: src/lang.c:465 +#, fuzzy +msgid "toggle selection of thread" +msgstr "Hilo" + +#: src/lang.c:466 +msgid "cycle through threading options available" +msgstr "" + +#: src/lang.c:467 +#, fuzzy +msgid "undo all selections (all articles)" +msgstr "Todos artículos disponibles en " + +#: src/lang.c:468 +msgid "untag all tagged threads" +msgstr "" + +#: src/lang.c:469 +#, fuzzy +msgid "add new scope" +msgstr "Añade nueva revisión" + +#: src/lang.c:470 +#, fuzzy +msgid "delete scope" +msgstr "borrar" + +#: src/lang.c:471 +#, fuzzy +msgid "edit attributes file" +msgstr "Atributos de Fichero\n" + +#: src/lang.c:472 +#, fuzzy +msgid "choose first scope in list" +msgstr "Primero Debe Elegir Un Mensaje" + +#: src/lang.c:473 +msgid "0 - 9\t choose scope by number" +msgstr "" + +#: src/lang.c:474 +#, fuzzy +msgid "choose last scope in list" +msgstr "Elija una lista para examinar, buscar y publicar mensajes." + +#: src/lang.c:475 +#, fuzzy +msgid "move scope" +msgstr "_Mover a:" + +#: src/lang.c:476 +#, fuzzy +msgid "rename scope" +msgstr "Renombrar…" + +#: src/lang.c:477 +#, fuzzy +msgid "select scope" +msgstr "_Seleccionar…" + +#: src/lang.c:478 +msgid "mark all articles in group as read" +msgstr "" + +#: src/lang.c:479 +msgid "mark all articles in group as read and move to next unread group" +msgstr "" + +#: src/lang.c:480 +#, fuzzy +msgid "choose first group in list" +msgstr "Primero Debe Elegir Un Mensaje" + +#: src/lang.c:481 +#, fuzzy +msgid "choose group by name" +msgstr "no se especificó el tamaño de entidad para SHF_GROUP" + +#: src/lang.c:482 +msgid "0 - 9\t choose group by number" +msgstr "" + +#: src/lang.c:483 +msgid "choose range of groups to be affected by next command" +msgstr "" + +#: src/lang.c:484 +#, fuzzy +msgid "choose last group in list" +msgstr "«%s» debe ser el último en el grupo de instrucciones" + +#: src/lang.c:486 +msgid "list groups which an article has been posted to (by Message-ID)" +msgstr "" + +#: src/lang.c:487 +msgid " \t (go to article if at least one of the groups is available)" +msgstr "" + +#: src/lang.c:489 +msgid "mark all articles in chosen group unread" +msgstr "" + +#: src/lang.c:490 +msgid "move chosen group within list" +msgstr "" + +#: src/lang.c:491 +msgid "choose next group with unread news" +msgstr "" + +#: src/lang.c:492 src/lang.c:1395 +msgid "quit" +msgstr "salir" + +#: src/lang.c:493 +msgid "quit without saving configuration changes" +msgstr "" + +#: src/lang.c:494 +#, fuzzy +msgid "read chosen group" +msgstr "No ha elegido un foro" + +#: src/lang.c:495 +msgid "reset .newsrc (all available articles in groups marked unread)" +msgstr "" + +#: src/lang.c:496 +#, fuzzy +msgid "search backwards for a group name" +msgstr "Buscar hacia atrás: " + +#: src/lang.c:497 +msgid " \t (all searches are case-insensitive and wrap around)" +msgstr "" + +#: src/lang.c:498 +#, fuzzy +msgid "search forwards for a group name" +msgstr "Buscar hacia adelante" + +#: src/lang.c:499 +#, fuzzy +msgid "subscribe to chosen group" +msgstr "Subscribir" + +#: src/lang.c:500 +#, fuzzy +msgid "subscribe to groups that match pattern" +msgstr "Campo %s no coincide con el patrón." + +#: src/lang.c:501 +msgid "reread active file to check for any new news" +msgstr "" + +#: src/lang.c:502 +msgid "toggle display of group name only or group name plus description" +msgstr "" + +#: src/lang.c:503 +msgid "toggle display to show all/unread subscribed groups" +msgstr "" + +#: src/lang.c:504 +#, fuzzy +msgid "unsubscribe from chosen group" +msgstr "Error Creando lista de correos." + +#: src/lang.c:505 +msgid "unsubscribe from groups that match pattern" +msgstr "" + +#: src/lang.c:506 +#, fuzzy +msgid "sort the list of groups" +msgstr "GRUPOS" + +#: src/lang.c:507 +msgid "toggle display to show all/subscribed groups" +msgstr "" + +#: src/lang.c:508 +msgid "0 - 9\t choose article by number" +msgstr "" + +#: src/lang.c:509 +msgid "mark thread as read and return to group index page" +msgstr "" + +#: src/lang.c:510 +msgid "mark thread as read and enter next unread thread or group" +msgstr "" + +#: src/lang.c:511 +#, fuzzy +msgid "choose first article in list" +msgstr "No necesita para el primer artículo definido" + +#: src/lang.c:512 +#, fuzzy +msgid "choose last article in list" +msgstr "Elija una lista para examinar, buscar y publicar mensajes." + +#: src/lang.c:513 +msgid "mark art, range or tagged arts as read; move crsr to next unread art" +msgstr "" + +#: src/lang.c:514 +msgid "mark article, range or tagged articles as unread" +msgstr "" + +#: src/lang.c:515 +#, fuzzy +msgid "mark current thread as unread" +msgstr "x marca la versión actual" + +#: src/lang.c:516 +#, fuzzy +msgid "read chosen article" +msgstr "No ha elegido un foro" + +#: src/lang.c:517 +#, fuzzy +msgid "" +"Display properties\n" +"------------------" +msgstr " Propiedades: " + +#: src/lang.c:518 +#, fuzzy +msgid "" +"Miscellaneous\n" +"-------------" +msgstr "^Miscelánea" + +#: src/lang.c:519 +#, fuzzy +msgid "" +"Moving around\n" +"-------------" +msgstr "Se .. se mueve..." + +#: src/lang.c:520 +#, fuzzy +msgid "" +"Group/thread/article operations\n" +"-------------------------------" +msgstr "Deshacer la última operación o grupo de operaciones sobre los paquetes" + +#: src/lang.c:521 +#, fuzzy +msgid "" +"Attachment operations\n" +"---------------------" +msgstr "Operaciones" + +#: src/lang.c:522 +#, fuzzy +msgid "" +"Attribute operations\n" +"--------------------" +msgstr "Atributo" + +#: src/lang.c:523 +#, fuzzy +msgid "" +"Option operations\n" +"-----------------" +msgstr "Operaciones" + +#: src/lang.c:524 +#, fuzzy +msgid "" +"Scope operations\n" +"----------------" +msgstr "Operaciones" + +#: src/lang.c:525 +#, fuzzy +msgid "" +"URL operations\n" +"--------------" +msgstr "URL" + +#: src/lang.c:526 +#, fuzzy +msgid "choose first URL in list" +msgstr "Primero Debe Elegir Un Mensaje" + +#: src/lang.c:527 +msgid "0 - 9\t choose URL by number" +msgstr "" + +#: src/lang.c:528 +#, fuzzy +msgid "choose last URL in list" +msgstr "Elija una lista para examinar, buscar y publicar mensajes." + +#: src/lang.c:529 +#, fuzzy +msgid "search for URLs forwards" +msgstr "Buscar hacia adelante" + +#: src/lang.c:530 +#, fuzzy +msgid "search for URLs backwards" +msgstr "Buscar hacia atrás: " + +#: src/lang.c:531 +#, fuzzy +msgid "Open URL in browser" +msgstr "EXPLORADOR" + +#: src/lang.c:532 +msgid "toggle info message in last line (URL)" +msgstr "" + +#: src/lang.c:534 +#, fuzzy +msgid "Group Level Commands" +msgstr " órdenes:\n" + +#: src/lang.c:535 +#, fuzzy +msgid "Kill filter added" +msgstr "_Filtrar por…" + +#: src/lang.c:536 +msgid "Auto-selection filter added" +msgstr "" + +#: src/lang.c:537 +#, fuzzy +msgid "All parts tagged" +msgstr "Directorio de Importación [partes de .idata]" + +#: src/lang.c:538 +msgid "Storing article for later posting" +msgstr "" + +#: src/lang.c:539 +#, fuzzy +msgid "Please enter a valid character" +msgstr "Introduzca un URL válido" + +#: src/lang.c:540 +#, fuzzy, c-format +msgid "Missing part #%d" +msgstr "Fin de %s parte %d" + +#: src/lang.c:541 +#, fuzzy +msgid "*** No postponed articles ***" +msgstr "Pospuesto" + +#: src/lang.c:542 +#, fuzzy +msgid "Not a multi-part message" +msgstr ", parte de " + +#: src/lang.c:543 +#, fuzzy +msgid "You are not subscribed to this group" +msgstr "Grupo" + +#: src/lang.c:544 +#, fuzzy +msgid "No previous expression" +msgstr "Sin expresión regular previa" + +#: src/lang.c:545 +#, fuzzy +msgid "Operation disabled in no-overwrite mode" +msgstr "Modo operativo." + +#. TODO: replace hard coded key-name in txt_info_postponed +#: src/lang.c:547 +#, c-format +msgid "%d postponed %s, reuse with ^O...\n" +msgstr "" + +#: src/lang.c:548 +msgid "" +"X-Conversion-Note: multipart/alternative contents have been removed.\n" +" To get the whole article, turn alternative handling OFF in the Option " +"Menu\n" +msgstr "" + +#: src/lang.c:550 +#, c-format +msgid "Save filename for %s/%s is a mailbox. Attachment not saved" +msgstr "" + +#: src/lang.c:551 +#, fuzzy +msgid "TeX2Iso encoded article" +msgstr "Artículo definido requerido" + +#: src/lang.c:552 +#, fuzzy +msgid "incomplete " +msgstr "Incompleto" + +#. TODO: replace hard coded key-names +#: src/lang.c:554 +#, c-format +msgid "" +"\n" +"Welcome to %s, a full screen threaded Netnews reader. It can read news " +"locally\n" +"(ie. /news) or remotely (-r option) from a NNTP (Network News " +"Transport\n" +"Protocol) server. -h lists the available command line options.\n" +"\n" +"%s has four newsreading levels, the newsgroup selection page, the group " +"index\n" +"page, the thread listing page and the article viewer. Help is available at " +"each\n" +"level by pressing the 'h' command.\n" +"\n" +"Move up/down by using the terminal arrow keys or 'j' and 'k'. Use PgUp/PgDn " +"or\n" +"Ctrl-U and Ctrl-D to page up/down. Enter a newsgroup by pressing RETURN/" +"TAB.\n" +"\n" +"Articles, threads, tagged articles or articles matching a pattern can be " +"mailed\n" +"('m' command), printed ('o' command), saved ('s' command), piped ('|' " +"command).\n" +"Use the 'w' command to post a news article, the 'f'/'F' commands to " +"post a\n" +"follow-up to an existing news article and the 'r'/'R' commands to reply " +"via\n" +"mail to an existing news article author. The 'M' command allows the " +"operation\n" +"of %s to be configured via a menu.\n" +"\n" +"For more information read the manual page, README, INSTALL, TODO and FTP " +"files.\n" +"Please send bug-reports/comments to %s with the 'R' command.\n" +msgstr "" + +#: src/lang.c:570 +#, c-format +msgid "Invalid From: %s line. Read the INSTALL file again." +msgstr "" + +#: src/lang.c:572 +#, fuzzy +msgid "Invalid multibyte sequence found\n" +msgstr "Secuencia de carácter UTF-8" + +#: src/lang.c:575 +#, fuzzy, c-format +msgid "Invalid Sender:-header %s" +msgstr "valor de cabecera inválido %s" + +#: src/lang.c:577 +#, fuzzy +msgid "Inverse video disabled" +msgstr "_Invertir" + +#: src/lang.c:578 +#, fuzzy +msgid "Inverse video enabled" +msgstr "_Invertir" + +#: src/lang.c:580 +#, fuzzy, c-format +msgid "Missing definition for %s\n" +msgstr "\tsin definición de «%s»" + +#: src/lang.c:581 +#, fuzzy, c-format +msgid "Invalid key definition '%s'\n" +msgstr "definición no válida para la impresora «%s»: %s" + +#: src/lang.c:582 +#, fuzzy, c-format +msgid "Invalid keyname '%s'\n" +msgstr "%s: modo inválido (%s)" + +#: src/lang.c:583 +#, fuzzy, c-format +msgid "Keymap file was upgraded to version %s\n" +msgstr "El fichero `%s' (versión %d) contiene:\n" + +#: src/lang.c:584 +#, fuzzy, c-format +msgid "Kill From: [%s] (y/n): " +msgstr "Mato %s(%s%d) ? (s/N) " + +#: src/lang.c:585 +#, fuzzy +msgid "Kill Lines: (num): " +msgstr "Núm" + +#: src/lang.c:586 +#, fuzzy +msgid "Kill Article Menu" +msgstr "Artículo definido requerido" + +#: src/lang.c:587 +#, fuzzy, c-format +msgid "Kill Msg-ID: [%s] (f/l/o/n): " +msgstr "Mato %s(%s%d) ? (s/N) " + +#: src/lang.c:588 +#, fuzzy +msgid "Kill pattern scope : " +msgstr "..mátalo, Dink..mátalo..." + +#: src/lang.c:589 +#, fuzzy, c-format +msgid "Kill Subject: [%s] (y/n): " +msgstr "Mato %s(%s%d) ? (s/N) " + +#: src/lang.c:590 +#, fuzzy +msgid "Kill text pattern : " +msgstr "Patrón" + +#: src/lang.c:591 +#, fuzzy +msgid "Kill time in days : " +msgstr "Tiempo Medio Abierto (en días)" + +#: src/lang.c:593 +msgid "Last" +msgstr "Último" + +#: src/lang.c:594 +#, fuzzy +msgid "-- Last response --" +msgstr "Respuesta" + +#: src/lang.c:595 +#, fuzzy, c-format +msgid "Lines %s " +msgstr "Líneas leídas: %lu líneas en %.0lf segundos (%.0lf líneas/s)\n" + +#: src/lang.c:598 +#, fuzzy +msgid "Function not available." +msgstr "la función iconv no está disponible" + +#: src/lang.c:599 +#, fuzzy +msgid "Not reading via NNTP." +msgstr "No leído" + +#: src/lang.c:600 +#, fuzzy, c-format +msgid "Group: %s" +msgstr "no se puede crear un grupo: %s" + +#: src/lang.c:601 +#, fuzzy, c-format +msgid "Groups: %s" +msgstr "" +"El índice de coincidencia %ls es demasiado largo; los grupos disponibles son " +"(%s)" + +#: src/lang.c:604 +#, fuzzy +msgid "Mail" +msgstr "CORREO" + +#: src/lang.c:605 +#, fuzzy +msgid "mailbox " +msgstr "_Buzón:" + +#: src/lang.c:606 +#, fuzzy, c-format +msgid "Mail article(s) to [%.*s]> " +msgstr "Mensajes Masivos para subscriptores de %s" + +#: src/lang.c:607 +#, fuzzy, c-format +msgid "Mailing log to %s\n" +msgstr "Crear Lista de Correo %s" + +#: src/lang.c:608 +#, fuzzy +msgid "Mail bug report..." +msgstr "Por favor reporte este bicho.\n" + +#: src/lang.c:609 +#, fuzzy, c-format +msgid "Mail BUG REPORT to %s?" +msgstr "" +"Correo-e del boletín de defectos a: <%s>.\n" +" \n" + +#: src/lang.c:610 +#, fuzzy +msgid "Mailed" +msgstr "Último correo de id_usuario" + +#: src/lang.c:611 +#, fuzzy, c-format +msgid "Mailing to %s..." +msgstr "Actualizar Lista de Correo %s" + +#: src/lang.c:612 +msgid "" +"# [Mail/Save] active file. Format is like news active file:\n" +"# groupname max.artnum min.artnum /dir\n" +"# The 4th field is the basedir (ie. ~/Mail or ~/News)\n" +"#\n" +msgstr "" + +#: src/lang.c:615 +#, fuzzy, c-format +msgid "%s marked as read" +msgstr "Campos marcados con %s son obligatorios." + +#: src/lang.c:616 +#, fuzzy, c-format +msgid "%s marked as unread" +msgstr "*** Tiene correo no leído. ***" + +#: src/lang.c:617 +#, fuzzy, c-format +msgid "Marked %d of %d %s as read" +msgstr "[%d] Incapaz de leer desde %s en el puerto %d" + +#: src/lang.c:618 +#, fuzzy, c-format +msgid "Marked %d of %d %s as unread" +msgstr "%s:%d:%d: %s" + +#: src/lang.c:619 src/lang.c:1351 +msgid "Mark" +msgstr "Marcador" + +#: src/lang.c:620 +#, c-format +msgid "Mark all articles as read%s?" +msgstr "" + +#: src/lang.c:621 +#, fuzzy, c-format +msgid "Mark article as read%s?" +msgstr "Marca buzones leídos" + +#: src/lang.c:622 +#, fuzzy, c-format +msgid "Mark group %s as read?" +msgstr "Marca buzones leídos" + +#: src/lang.c:623 +#, fuzzy, c-format +msgid "Mark thread as read%s?" +msgstr "Hilo(s) encontrado(s)" + +#: src/lang.c:624 +#, fuzzy, c-format +msgid "Matching %s groups..." +msgstr "GRUPOS" + +#: src/lang.c:625 src/lang.c:639 src/lang.c:645 +#, c-format +msgid "=set current to n; %s=line down; %s=line up; %s=help; %s=quit" +msgstr "" + +#: src/lang.c:627 +#, c-format +msgid "" +"%s=view; %s=pipe; %s=pipe raw; %s=save; %s=tag; %s=tag pattern; %s=untag all" +msgstr "" + +#: src/lang.c:629 +#, c-format +msgid "%s=view; %s=save; %s=tag; %s=tag pattern; %s=untag all" +msgstr "" + +#: src/lang.c:631 +#, c-format +msgid "" +"%s=reverse tagging; %s=search forwards; %s=search backwards; %s=repeat search" +msgstr "" + +#: src/lang.c:632 src/lang.c:636 +#, c-format +msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" +msgstr "" + +#: src/lang.c:633 +#, c-format +msgid "" +"%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; " +"%s=list thread" +msgstr "" + +#: src/lang.c:634 +#, c-format +msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" +msgstr "" + +#: src/lang.c:635 +#, c-format +msgid "%s=search forwards; %s=search backwards; %s=quit" +msgstr "" + +#: src/lang.c:637 +#, c-format +msgid "%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read" +msgstr "" + +#: src/lang.c:638 +#, fuzzy, c-format +msgid "%s=add; %s=move; %s=rename; %s=delete" +msgstr "Renombra ORIGEN a DESTINO, o mueve ORIGEN(es) a DIRECTORIO.\n" + +#: src/lang.c:640 +#, c-format +msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" +msgstr "" + +#: src/lang.c:641 +#, c-format +msgid "" +"%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" +msgstr "" + +#: src/lang.c:642 +#, c-format +msgid "" +"%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/" +"out" +msgstr "" + +#: src/lang.c:643 +#, c-format +msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" +msgstr "" + +#: src/lang.c:644 +#, c-format +msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" +msgstr "" + +#: src/lang.c:646 +#, c-format +msgid "%s=search forwards; %s=search backwards; %s=repeat search" +msgstr "" + +#: src/lang.c:647 +#, fuzzy +msgid "--More--" +msgstr "Más…" + +#: src/lang.c:648 +#, fuzzy, c-format +msgid "Moving %s..." +msgstr "Error moviendo final %s a dir anterior %s" + +#: src/lang.c:649 +#, fuzzy +msgid "Message-ID: & last Reference " +msgstr "No se pudo obtener el id del mensaje" + +#: src/lang.c:650 +#, fuzzy +msgid "Message-ID: line " +msgstr "No se pudo obtener el id del mensaje" + +#: src/lang.c:651 +#, fuzzy +msgid "Message-ID: & References: line" +msgstr "No se pudo obtener el id del mensaje" + +#: src/lang.c:653 +#, fuzzy +msgid ", name: " +msgstr "" + +#: src/lang.c:654 +#, fuzzy, c-format +msgid "Go to newsgroup [%s]> " +msgstr "Ir" + +#: src/lang.c:655 +msgid "newsgroups" +msgstr "" + +#: src/lang.c:656 +#, c-format +msgid "Position %s in group list (1,2,..,$) [%d]> " +msgstr "" + +#: src/lang.c:657 +msgid "newsgroup" +msgstr "" + +#: src/lang.c:658 +msgid "Try and save newsrc file again?" +msgstr "" + +#: src/lang.c:659 +msgid "Warning: No newsgroups were written to your newsrc file. Save aborted." +msgstr "" + +#: src/lang.c:660 +#, fuzzy +msgid "newsrc file saved successfully.\n" +msgstr "Fichero subido con éxito" + +#: src/lang.c:661 +#, fuzzy +msgid "-- Next response --" +msgstr "Siguiente" + +#: src/lang.c:662 +msgid "No " +msgstr "" + +#: src/lang.c:663 +#, fuzzy +msgid "*** No articles ***" +msgstr "Artículos anteriores" + +#: src/lang.c:664 +#, fuzzy +msgid "No articles have been posted" +msgstr "No se han enviado Comentarios" + +#: src/lang.c:665 +#, fuzzy +msgid "*** No attachments ***" +msgstr "Adjuntos" + +#: src/lang.c:666 +#, fuzzy +msgid "*** No description ***" +msgstr "(sin descripción)" + +#: src/lang.c:667 +#, fuzzy +msgid "No filename" +msgstr "el fichero \"$filename\" es desconocido" + +#: src/lang.c:668 +#, fuzzy +msgid "No group" +msgstr "** grupo" + +#: src/lang.c:669 +#, fuzzy +msgid "*** No groups ***" +msgstr " grupos=" + +#: src/lang.c:670 +#, fuzzy +msgid "No more groups to read" +msgstr "GRUPOS" + +#: src/lang.c:671 +#, fuzzy +msgid "No last message" +msgstr "Último" + +#: src/lang.c:672 +#, fuzzy +msgid "No mail address" +msgstr "Dirección personal para correo" + +#: src/lang.c:673 +#, fuzzy +msgid "No articles marked for saving" +msgstr "" +"\n" +"Ningún artículo dentro de este grupo.\n" + +#: src/lang.c:674 +msgid "No match" +msgstr "Sin coincidencia" + +#: src/lang.c:675 +#, fuzzy +msgid "No more groups" +msgstr " grupos=" + +#: src/lang.c:676 +msgid "No newsgroups" +msgstr "" + +#: src/lang.c:677 +#, fuzzy +msgid "No next unread article" +msgstr "*** Tiene correo no leído. ***" + +#: src/lang.c:678 +#, fuzzy +msgid "No previous group" +msgstr "Grupo" + +#: src/lang.c:679 +#, fuzzy +msgid "No previous search, nothing to repeat" +msgstr "n repetir / o ? en la última búsqueda" + +#: src/lang.c:680 +#, fuzzy +msgid "No previous unread article" +msgstr "*** Tiene correo no leído. ***" + +#: src/lang.c:681 +#, fuzzy +msgid "No responses" +msgstr "Respuestas existentes" + +#: src/lang.c:682 +#, fuzzy +msgid "No responses to list in current thread" +msgstr "Lista el contenido del directorio actual" + +#: src/lang.c:683 +msgid "*** No scopes ***" +msgstr "" + +#: src/lang.c:684 +#, fuzzy +msgid "No search string" +msgstr "" +"Advertencia: búsqueda de cadena textual es más larga que %d caracteres, la " +"búsqueda quizá no funciona apropiadamente.\n" + +#: src/lang.c:685 +#, fuzzy +msgid "No subject" +msgstr "No hay Asunto" + +#: src/lang.c:687 +#, c-format +msgid "%s: Terminal must have clear to end-of-line (ce)\n" +msgstr "" + +#: src/lang.c:688 +#, c-format +msgid "%s: Terminal must have clear to end-of-screen (cd)\n" +msgstr "" + +#: src/lang.c:689 +#, c-format +msgid "%s: Terminal must have clearscreen (cl) capability\n" +msgstr "" + +#: src/lang.c:690 +#, c-format +msgid "%s: Terminal must have cursor motion (cm)\n" +msgstr "" + +#: src/lang.c:691 +#, c-format +msgid "%s: TERM variable must be set to use screen capabilities\n" +msgstr "" + +#: src/lang.c:693 +#, fuzzy, c-format +msgid "No viewer found for %s/%s\n" +msgstr "esperaba %s, pero encontré %s" + +#: src/lang.c:694 +#, fuzzy +msgid "Newsgroup does not exist on this server" +msgstr "" +"el fichero «$filename» no existe, pero es un fichero de fuente del " +"modificación" + +#: src/lang.c:695 +#, fuzzy, c-format +msgid "Group %s not found in active file" +msgstr "Fichero «%s» no encontrado\n" + +#: src/lang.c:696 +msgid "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: " +msgstr "" + +#: src/lang.c:697 +msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: " +msgstr "" + +#: src/lang.c:698 +#, c-format +msgid "" +"# NNTP-server -> newsrc translation table and NNTP-server\n" +"# shortname list for %s %s\n" +"#\n" +"# the format of this file is\n" +"# ...\n" +"#\n" +"# if is given without path, $HOME is assumed as its location\n" +"#\n" +"# examples:\n" +"# news.tin.org .newsrc-tin.org tinorg\n" +"# news.example.org /tmp/nrc-ex example ex\n" +"#\n" +msgstr "" + +#: src/lang.c:705 +#, fuzzy +msgid "Only" +msgstr "Sólo Extraer" + +#: src/lang.c:706 +#, fuzzy, c-format +msgid "Option not enabled. Recompile with %s." +msgstr "La opción --regex está activada por defecto." + +#: src/lang.c:707 +#, fuzzy +msgid "Options Menu" +msgstr "" +"Dink Smallwood ('%s') no fue encontrado en su ordenador. Por favor configure " +"el nombre del ejecutable del juego en las opciones del menú." + +#: src/lang.c:708 +#, fuzzy +msgid "Options Menu Commands" +msgstr "El menú de opciones" + +#: src/lang.c:711 +#, fuzzy, c-format +msgid "Error in regex: %s at pos. %d '%s'" +msgstr "" +" expreg en desplazamiento %d: %s\n" +"\n" + +#: src/lang.c:712 +#, fuzzy, c-format +msgid "Error in regex: pcre internal error %d" +msgstr "%s: pcre_exec() error %d mientras coincide " + +#: src/lang.c:713 +#, c-format +msgid "Error in regex: study - pcre internal error %s" +msgstr "" + +#: src/lang.c:714 +#, fuzzy +msgid "Post a followup..." +msgstr "Contabilizar a" + +#. TODO: replace hard coded key-name in txt_post_error_ask_postpone +#: src/lang.c:716 +msgid "" +"An error has occurred while posting the article. If you think that this\n" +"error is temporary or otherwise correctable, you can postpone the article\n" +"and pick it up again with ^O later.\n" +msgstr "" + +#: src/lang.c:719 +#, fuzzy +msgid "Posted articles history" +msgstr "" +"\n" +"Ningún artículo dentro de este grupo.\n" + +#: src/lang.c:720 +#, c-format +msgid "Post to newsgroup(s) [%s]> " +msgstr "" + +#: src/lang.c:721 +#, fuzzy +msgid "-- post processing started --" +msgstr "Contabilizar" + +#: src/lang.c:722 +#, fuzzy +msgid "-- post processing completed --" +msgstr "Contabilizar" + +#: src/lang.c:723 +#, fuzzy, c-format +msgid "Post subject [%s]> " +msgstr "Asunto" + +#: src/lang.c:724 +msgid "" +"# Summary of mailed/posted messages viewable by 'W' command from within " +"tin.\n" +msgstr "" + +#: src/lang.c:725 +#, fuzzy +msgid "Posting article..." +msgstr "Publicación Fallida" + +#: src/lang.c:726 +#, c-format +msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " +msgstr "" + +#: src/lang.c:727 +#, fuzzy, c-format +msgid "Hot %s" +msgstr "¡Está caliente!" + +#: src/lang.c:728 +#, c-format +msgid "Tagged %s" +msgstr "" + +#: src/lang.c:729 +#, fuzzy, c-format +msgid "Untagged %s" +msgstr "[%d] Servidor no envía respuesta inetiquetada «%s» o preguntada" + +#: src/lang.c:731 +#, c-format +msgid "Preparing for filtering on Path header (%d/%d)..." +msgstr "" + +#: src/lang.c:733 +msgid "Processing mail messages marked for deletion." +msgstr "" + +#: src/lang.c:734 +msgid "Processing saved articles marked for deletion." +msgstr "" + +#: src/lang.c:735 +#, c-format +msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " +msgstr "" + +#: src/lang.c:736 +msgid "Article unchanged, abort mailing?" +msgstr "" + +#: src/lang.c:737 +#, c-format +msgid "Do you want to see postponed articles (%d)?" +msgstr "" + +#: src/lang.c:739 +msgid "Add quick kill filter?" +msgstr "" + +#: src/lang.c:740 +msgid "Add quick selection filter?" +msgstr "" + +#: src/lang.c:741 +#, fuzzy +msgid "Do you really want to quit?" +msgstr "¿Realmente quiere terminar MUIbase?" + +#: src/lang.c:742 +#, c-format +msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " +msgstr "" + +#: src/lang.c:743 +msgid "You have tagged articles in this group - quit anyway?" +msgstr "" + +#: src/lang.c:744 +#, fuzzy, c-format +msgid "%s=quit, %s=edit, %s=postpone: " +msgstr "no se puede editar %s: es una terminal" + +#: src/lang.c:745 +#, c-format +msgid "%s=quit %s=edit %s=save kill description: " +msgstr "" + +#: src/lang.c:746 +#, c-format +msgid "%s=quit %s=edit %s=save select description: " +msgstr "" + +#: src/lang.c:747 +msgid "Do you really want to quit without saving your configuration?" +msgstr "" + +#: src/lang.c:750 +msgid "Invalid range - valid are '0-9.$' eg. 1-$" +msgstr "" + +#: src/lang.c:752 +#, fuzzy +msgid "Do you want to abort this operation?" +msgstr "¿Quiere realmente hacer eso?" + +#: src/lang.c:753 +msgid "Do you want to exit tin immediately?" +msgstr "" + +#: src/lang.c:755 +#, fuzzy +msgid "Reading ('q' to quit)..." +msgstr " -q, --quit terminar el proceso en segundo plano\n" + +#: src/lang.c:756 +#, fuzzy, c-format +msgid "Reading %sarticles..." +msgstr "No leído" + +#: src/lang.c:757 +#, fuzzy, c-format +msgid "Reading %sattributes file...\n" +msgstr "Error leyendo fichero intercambio" + +#: src/lang.c:758 +#, fuzzy, c-format +msgid "Reading %sconfig file...\n" +msgstr "Error leyendo fichero intercambio" + +#: src/lang.c:759 +#, fuzzy +msgid "Reading filter file...\n" +msgstr "Leyendo fichero…" + +#: src/lang.c:760 +#, fuzzy, c-format +msgid "Reading %s groups..." +msgstr "Memoria agotada al leer %lu grupos\n" + +#: src/lang.c:761 +#, fuzzy +msgid "Reading input history file...\n" +msgstr "error de entrada al leer el archivo de esquema %s" + +#: src/lang.c:762 +#, fuzzy +msgid "Reading keymap file...\n" +msgstr "Leyendo fichero…" + +#: src/lang.c:763 +#, fuzzy +msgid "Reading groups from active file... " +msgstr "Leyendo fichero boletinado de acceso: desde entrada estándar\n" + +#: src/lang.c:764 +#, fuzzy +msgid "Reading groups from newsrc file... " +msgstr "Leyendo fichero boletinado de acceso: desde entrada estándar\n" + +#: src/lang.c:765 +#, fuzzy +msgid "Reading newsgroups file... " +msgstr "Error leyendo fichero intercambio" + +#: src/lang.c:766 +#, fuzzy +msgid "Reading newsrc file..." +msgstr "Leyendo fichero…" + +#: src/lang.c:767 +#, fuzzy +msgid "References: line " +msgstr "" +"\n" +" --references listado de referencias de RUTAS" + +#: src/lang.c:769 +#, fuzzy, c-format +msgid "(%d:%02d remaining)" +msgstr "Ranura %d - %d:%02d - %s" + +#: src/lang.c:771 +#, fuzzy, c-format +msgid "Bogus group %s removed." +msgstr ", no eliminado: %s" + +#: src/lang.c:772 +#, fuzzy +msgid "Removed from the previous rule: " +msgstr ".. quitado desde entorno" + +#: src/lang.c:773 +#, fuzzy, c-format +msgid "Error: rename %s to %s" +msgstr "no se puede renombrar %s a %s" + +#: src/lang.c:774 +#, fuzzy +msgid "Reply to author..." +msgstr "Responder" + +#: src/lang.c:775 +msgid "Repost" +msgstr "" + +#: src/lang.c:776 +#, fuzzy +msgid "Reposting article..." +msgstr "Artículo definido requerido" + +#: src/lang.c:777 +#, fuzzy, c-format +msgid "Repost article(s) to group(s) [%s]> " +msgstr "el grupo de %s permanece como %s\n" + +#: src/lang.c:778 +#, fuzzy +msgid "Reset newsrc?" +msgstr " (restablecer)" + +#: src/lang.c:779 +msgid "Responses have been directed to the following newsgroups" +msgstr "" + +#: src/lang.c:780 +#, c-format +msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " +msgstr "" + +#: src/lang.c:782 +#, fuzzy +msgid "Press to continue..." +msgstr "" +"\n" +"Pulse RETORNO para continuar: " + +#: src/lang.c:784 +#, fuzzy, c-format +msgid "Select From [%s] (y/n): " +msgstr "El fichero %s existe. ¿Sobreescribir? [y|n] " + +#: src/lang.c:785 +#, fuzzy +msgid "Select Lines: (num): " +msgstr "seleccionar líneas no coincidentes" + +#: src/lang.c:786 +msgid "Auto-select Article Menu" +msgstr "" + +#: src/lang.c:787 +#, fuzzy, c-format +msgid "Select Msg-ID [%s] (f/l/o/n): " +msgstr "El fichero %s existe. ¿Sobreescribir? [y|n] " + +#: src/lang.c:788 +#, fuzzy +msgid "Select pattern scope: " +msgstr "Seleccionar…" + +#: src/lang.c:789 +#, fuzzy, c-format +msgid "Select Subject [%s] (y/n): " +msgstr "El fichero %s existe. ¿Sobreescribir? [y|n] " + +#: src/lang.c:790 +#, fuzzy +msgid "Select text pattern : " +msgstr "Patrón" + +#: src/lang.c:791 +#, fuzzy +msgid "Select time in days : " +msgstr "Tiempo Medio Abierto (en días)" + +#: src/lang.c:792 +#, c-format +msgid "" +"# %s server configuration file\n" +"# This file was automatically saved by %s %s %s (\"%s\")\n" +"#\n" +"# Do not edit while %s is running, since all your changes to this file\n" +"# will be overwritten when you leave %s.\n" +"# Do not edit at all if you don't know what you do.\n" +"############################################################################\n" +"\n" +msgstr "" + +#: src/lang.c:798 +msgid "Showing unread groups only" +msgstr "" + +#: src/lang.c:799 +#, fuzzy +msgid "Subject: line (ignore case) " +msgstr "" +" -i, --ignore-case ignora las diferencias entre mayúsculas y " +"minúsculas\n" + +#: src/lang.c:800 +#, fuzzy +msgid "Subject: line (case sensitive)" +msgstr "distinguir mayúsculas" + +#: src/lang.c:801 +#, fuzzy +msgid "Save" +msgstr "_Guardar" + +#: src/lang.c:802 +#, fuzzy, c-format +msgid "Save '%s' (%s/%s)?" +msgstr "Guardar «%s»…" + +#: src/lang.c:803 +#, fuzzy +msgid "Save configuration before continuing?" +msgstr "¿Guardar Transacciones antes de procesar?" + +#: src/lang.c:804 +#, fuzzy +msgid "Save filename> " +msgstr "save nombrefichero - guarda órdenes desde la sesión al fichero." + +#: src/lang.c:805 +#, fuzzy +msgid "Saved" +msgstr "guardado" + +#: src/lang.c:806 +#, fuzzy, c-format +msgid "%4d unread (%4d hot) %s in %s\n" +msgstr "\treubicación %4d desplazamiento %4x [%4lx] %s" + +#: src/lang.c:807 +#, fuzzy, c-format +msgid "Saved %s...\n" +msgstr "Boletín de interpretación sintáctica de Sarg guardado en %s\n" + +#: src/lang.c:808 +#, fuzzy +msgid "Nothing was saved" +msgstr "No hay nada que ser guardado." + +#: src/lang.c:809 +#, fuzzy, c-format +msgid "" +"\n" +"%s %d %s from %d %s\n" +msgstr "No se pudo establecer configuración alternativa %d a %d (%s)" + +#: src/lang.c:810 +#, fuzzy, c-format +msgid "-- %s saved to %s%s --" +msgstr "Diapositiva es guardado correctamente por %s" + +#: src/lang.c:811 +#, fuzzy, c-format +msgid "-- %s saved to %s - %s --" +msgstr "Diapositiva es guardado correctamente por %s" + +#: src/lang.c:812 +msgid "Saving..." +msgstr "Guardando..." + +#: src/lang.c:813 +#, fuzzy, c-format +msgid "%s: Screen initialization failed" +msgstr "GnuTLS fallado al inicializar: %s" + +#: src/lang.c:815 +#, fuzzy, c-format +msgid "%s: screen is too small\n" +msgstr "La sección %s es muy pequeña para grupo shndx\n" + +#: src/lang.c:817 +#, fuzzy, c-format +msgid "screen is too small, %s is exiting" +msgstr "La sección %s es muy pequeña para grupo shndx\n" + +#: src/lang.c:818 +#, fuzzy +msgid "Delete scope?" +msgstr "borrar" + +#: src/lang.c:819 +#, fuzzy +msgid "Enter scope> " +msgstr "_Introducir" + +#: src/lang.c:820 +#, fuzzy +msgid "Select new position> " +msgstr "Selecciona un fichero o subir uno nuevo" + +#: src/lang.c:821 +msgid "New position cannot be a global scope" +msgstr "" + +#: src/lang.c:822 +#, fuzzy +msgid "Global scope, operation not allowed" +msgstr "error: no puede reiniciar, operación no permitida\n" + +#: src/lang.c:823 +#, fuzzy +msgid "Rename scope> " +msgstr "Renombrar…" + +#: src/lang.c:824 +#, fuzzy +msgid "Select scope> " +msgstr "_Seleccionar…" + +#: src/lang.c:825 +#, fuzzy +msgid "Scopes Menu" +msgstr "menú" + +#: src/lang.c:826 +#, fuzzy +msgid "Scopes Menu Commands" +msgstr " órdenes:\n" + +#: src/lang.c:827 +#, fuzzy, c-format +msgid "Search backwards [%s]> " +msgstr "Buscar hacia atrás: " + +#: src/lang.c:828 +#, fuzzy, c-format +msgid "Search body [%s]> " +msgstr "La macro %%%s tiene cuerpo indeterminado\n" + +#: src/lang.c:829 +#, fuzzy, c-format +msgid "Search forwards [%s]> " +msgstr "Buscar hacia adelante" + +#: src/lang.c:830 +msgid "Searching..." +msgstr "Buscando…" + +#: src/lang.c:831 +#, c-format +msgid "Searching article %d of %d ('q' to abort)..." +msgstr "" + +#: src/lang.c:832 +#, fuzzy +msgid "Select article> " +msgstr "Artículo definido requerido" + +#: src/lang.c:833 +msgid "" +"Select option number before text or use arrow keys and . 'q' to quit." +msgstr "" + +#: src/lang.c:834 +#, fuzzy +msgid "Select group> " +msgstr "Seleccionar " + +#: src/lang.c:835 +#, fuzzy, c-format +msgid "Enter selection pattern [%s]> " +msgstr "Introduce sección [^{1^}-^{3^}]: " + +#: src/lang.c:836 +#, fuzzy +msgid "Select thread> " +msgstr "Hilo" + +#: src/lang.c:837 +#, c-format +msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" +msgstr "" + +#: src/lang.c:838 +#, fuzzy +msgid "servers active-file" +msgstr "Servidores" + +#: src/lang.c:839 +msgid "Cannot move into new newsgroups. Subscribe first..." +msgstr "" + +#: src/lang.c:840 +#, fuzzy +msgid "" +msgstr "_Espacio" + +#: src/lang.c:841 +#, fuzzy, c-format +msgid "Starting: (%s)" +msgstr "iniciando %s" + +#: src/lang.c:842 +#, fuzzy, c-format +msgid "List Thread (%d of %d)" +msgstr "[%d] incapaz de crear hilo: %s" + +#: src/lang.c:843 +#, fuzzy, c-format +msgid "Thread (%.*s)" +msgstr "Hilo(s) encontrado(s)" + +#: src/lang.c:844 +msgid "Enter wildcard subscribe pattern> " +msgstr "" + +#: src/lang.c:845 +#, fuzzy, c-format +msgid "subscribed to %d groups" +msgstr " grupos=" + +#: src/lang.c:846 +#, fuzzy, c-format +msgid "Subscribed to %s" +msgstr "" +"Ha recibido este mensaje por que ha sido suscrito a la lista de correos\n" +"%1$s . Puede darse de baja de ella accediendo a %1$s\n" +"y visitando su página de Gestión Cuenta (%2$s),\n" +"o desactivarlo también visitando el \n" +"siguiente enlace: <%3$s>\n" + +#: src/lang.c:847 +#, fuzzy +msgid "Subscribing... " +msgstr "" +"Para detalles sobre suscribirse a ese listado, vea <http://www.gnucash." +"org/>." + +#: src/lang.c:848 +#, c-format +msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " +msgstr "" + +#: src/lang.c:849 +#, fuzzy, c-format +msgid "Supersede article(s) to group(s) [%s]> " +msgstr "el grupo de %s permanece como %s\n" + +#: src/lang.c:850 +#, fuzzy +msgid "Superseding article ..." +msgstr "Artículo definido requerido" + +#: src/lang.c:851 +#, c-format +msgid "" +"\n" +"Stopped. Type 'fg' to restart %s\n" +msgstr "" + +#: src/lang.c:853 +#, fuzzy, c-format +msgid "%d days" +msgstr "Estadísticas para los últimos %d días" + +#: src/lang.c:854 +#, fuzzy +msgid "" +msgstr "Lengüeta" + +#: src/lang.c:855 +#, fuzzy +msgid "TeX " +msgstr "" +" -M, --macro-name=CADENA usa CADENA como nombre de macro en lugar\n" +" de 'xx'\n" +" -O, --format=roff genera el resultado con directivas roff\n" +" -R, --right-side-refs pone las referencias a la derecha,\n" +" sin contarlas en -w\n" +" -S, --sentence-regexp=EXPR-REG para finales de línea o frase\n" +" -T, --format=tex genera salida como directivas TeX\n" + +#: src/lang.c:856 +msgid "# Default action/prompt strings\n" +msgstr "" + +#: src/lang.c:857 +msgid "" +"# Defaults for quick (1 key) kill & auto-selection filters\n" +"# header=NUM 0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n" +"# 5=Message-ID: & last References: entry only\n" +"# 6=Message-ID: entry only 7=Lines:\n" +"# global=ON/OFF ON=apply to all groups OFF=apply to current group\n" +"# case=ON/OFF ON=filter case sensitive OFF=ignore case\n" +"# expire=ON/OFF ON=limit to default_filter_days OFF=don't ever expire\n" +msgstr "" + +#: src/lang.c:870 +msgid "" +"# If ON use print current subject or newsgroup description in the last line\n" +msgstr "" + +#: src/lang.c:871 +msgid "# Host & time info used for detecting new groups (don't touch)\n" +msgstr "" + +#: src/lang.c:872 +#, fuzzy +msgid "There is no news\n" +msgstr "^Novedades" + +#: src/lang.c:873 +msgid "Thread" +msgstr "Hilo" + +#: src/lang.c:874 +#, fuzzy +msgid "Thread Level Commands" +msgstr " órdenes:\n" + +#: src/lang.c:875 +#, fuzzy +msgid "Thread deselected" +msgstr "Hilo" + +#: src/lang.c:876 +#, fuzzy +msgid "Thread selected" +msgstr "Hilo" + +#: src/lang.c:878 +#, fuzzy +msgid "threads" +msgstr "Conversaciones" + +#: src/lang.c:880 +#, fuzzy +msgid "thread" +msgstr "Hilo" + +#: src/lang.c:881 +#, fuzzy, c-format +msgid "Thread %4s of %4s" +msgstr "4s" + +#: src/lang.c:882 +#, fuzzy +msgid "Threading articles..." +msgstr "Artículos anteriores" + +#: src/lang.c:883 +#, fuzzy, c-format +msgid "Toggled word highlighting %s" +msgstr "el registro tiene el tamaño equivocado para un word %s" + +#: src/lang.c:884 +#, fuzzy +msgid "Toggled rot13 encoding" +msgstr "Codificación" + +#: src/lang.c:885 +#, c-format +msgid "Toggled german TeX encoding %s" +msgstr "" + +#: src/lang.c:886 +#, fuzzy, c-format +msgid "Toggled tab-width to %d" +msgstr "una anchura de la lengeta de $number est fuera de gama" + +#: src/lang.c:888 +#, fuzzy, c-format +msgid "%d Trying to dotlock %s" +msgstr "Tratando de hacer 'bal' a %s" + +#: src/lang.c:889 +#, fuzzy, c-format +msgid "%d Trying to lock %s" +msgstr "Intentando conectar a %s/%s..." + +#: src/lang.c:891 +#, fuzzy +msgid " h=help" +msgstr "\t-h\t\t\t--help\n" + +#: src/lang.c:893 +msgid "Unlimited" +msgstr "Ilimitado" + +#: src/lang.c:894 +msgid "Enter wildcard unsubscribe pattern> " +msgstr "" + +#: src/lang.c:895 +#, fuzzy, c-format +msgid "Error decoding %s : %s" +msgstr "error decodificando cadena de texto: %s" + +#: src/lang.c:896 +#, fuzzy +msgid "No end." +msgstr "FIN" + +#: src/lang.c:897 +#, fuzzy, c-format +msgid "%s successfully decoded." +msgstr "Desafío decodificado: %s\n" + +#: src/lang.c:898 +#, fuzzy, c-format +msgid "" +"%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" +"\n" +msgstr "línea %d: nombre de fichero versionado no permitido: %s\n" + +#: src/lang.c:899 +#, fuzzy +msgid "unread " +msgstr "*** Tiene correo no leído. ***" + +#: src/lang.c:900 +#, fuzzy, c-format +msgid "unsubscribed from %d groups" +msgstr " o un entero de %d a %d\n" + +#: src/lang.c:901 +#, fuzzy, c-format +msgid "Unsubscribed from %s" +msgstr "" +"Ha sido borrado de %s lista de correo del sitio. En caso que desee re-" +"activar su subscripción en el futuro, accede y visite su página de " +"mantenimiento de la Cuenta." + +#: src/lang.c:902 +msgid "Unsubscribing... " +msgstr "" + +#: src/lang.c:903 +#, fuzzy +msgid "Unthreading articles..." +msgstr "" +"\n" +"Ningún artículo dentro de este grupo.\n" + +#: src/lang.c:904 +msgid "Updated" +msgstr "Actualizado" + +#: src/lang.c:905 +#, fuzzy +msgid "Updating" +msgstr "Error Actualizando Paquete" + +#: src/lang.c:906 +#, fuzzy +msgid "URL Menu" +msgstr "URL" + +#: src/lang.c:907 +#, fuzzy +msgid "URL Menu Commands" +msgstr " órdenes:\n" + +#: src/lang.c:908 +#, fuzzy, c-format +msgid "Opening %s" +msgstr "error al abrir %s" + +#: src/lang.c:909 +#, fuzzy +msgid "Select URL> " +msgstr "Seleccionar…" + +#: src/lang.c:910 +#, fuzzy +msgid "No URLs in this article" +msgstr "Artículo definido requerido" + +#: src/lang.c:911 +#, fuzzy +msgid "Use MIME display program for this message?" +msgstr "emplea paginador PAGER de programa para enseñar la salida" + +#: src/lang.c:912 +msgid " -c mark all news as read in subscribed newsgroups (batch mode)" +msgstr "" + +#: src/lang.c:913 +msgid " -Z return status indicating if any unread news (batch mode)" +msgstr "" + +#: src/lang.c:914 +msgid " -q don't check for new newsgroups" +msgstr "" + +#: src/lang.c:915 +msgid " -X don't save any files on quit" +msgstr "" + +#: src/lang.c:916 +msgid " -d don't show newsgroup descriptions" +msgstr "" + +#: src/lang.c:917 +msgid " -G limit get only limit articles/group" +msgstr "" + +#: src/lang.c:918 +#, fuzzy, c-format +msgid " -H help information about %s" +msgstr " -h --help Enseña esta información.\n" + +#: src/lang.c:919 +#, fuzzy +msgid " -h this help message" +msgstr " --help, -h produce este mensaje de ayuda.\n" + +#: src/lang.c:920 +#, c-format +msgid " -I dir news index file directory [default=%s]" +msgstr "" + +#: src/lang.c:921 +msgid " -u update index files (batch mode)" +msgstr "" + +#: src/lang.c:922 +#, c-format +msgid " -m dir mailbox directory [default=%s]" +msgstr "" + +#: src/lang.c:923 +#, fuzzy, c-format +msgid "" +"\n" +"Mail bug reports/comments to %s" +msgstr "" +"Correo-e del boletín de defectos a: <%s>.\n" +" \n" + +#: src/lang.c:924 +msgid " -N mail new news to your posts (batch mode)" +msgstr "" + +#: src/lang.c:925 +msgid " -M user mail new news to specified user (batch mode)" +msgstr "" + +#: src/lang.c:926 +#, fuzzy, c-format +msgid " -f file subscribed to newsgroups file [default=%s]" +msgstr "" +" -f FICHERO Fichero de configuración a leer (Por defecto es %s/sarg." +"conf)\n" + +#: src/lang.c:927 +#, fuzzy +msgid " -x no-posting mode" +msgstr "Estará publicando a:" + +#: src/lang.c:928 +msgid " -w post an article and exit" +msgstr "" + +#: src/lang.c:929 +msgid " -o post all postponed articles and exit" +msgstr "" + +#: src/lang.c:930 +msgid " -R read news saved by -S option" +msgstr "" + +#: src/lang.c:931 +#, c-format +msgid " -s dir save news directory [default=%s]" +msgstr "" + +#: src/lang.c:932 +msgid " -S save new news for later reading (batch mode)" +msgstr "" + +#: src/lang.c:933 +msgid " -z start if any unread news" +msgstr "" + +#: src/lang.c:934 +#, c-format +msgid "" +"A Usenet reader.\n" +"\n" +"Usage: %s [options] [newsgroup[,...]]" +msgstr "" + +#: src/lang.c:935 +msgid " -v verbose output for batch mode options" +msgstr "" + +#: src/lang.c:936 +#, fuzzy +msgid " -V print version & date information" +msgstr "Escribe la información de la versión" + +#: src/lang.c:937 +#, c-format +msgid "%s only useful without batch mode operations\n" +msgstr "" + +#: src/lang.c:938 +#, c-format +msgid "%s only useful for batch mode operations\n" +msgstr "" + +#: src/lang.c:939 +#, c-format +msgid "%s only useful for batch or debug mode operations\n" +msgstr "" + +#: src/lang.c:940 +#, fuzzy, c-format +msgid "Useless combination %s and %s. Ignoring %s.\n" +msgstr "combinación de operandos errónea para '%.*s'" + +#: src/lang.c:942 +#, c-format +msgid "" +"\n" +"%s%d out of range (0 - %d). Reset to 0" +msgstr "" + +#: src/lang.c:943 +#, fuzzy, c-format +msgid "View '%s' (%s/%s)?" +msgstr "Ver el/los %d miembro(s)" + +#: src/lang.c:945 +#, c-format +msgid "" +"\n" +"Warning: posting exceeds %d columns. Line %d is the first long one:\n" +"%-100s\n" +msgstr "" + +#: src/lang.c:946 +msgid "" +"\n" +"Warning: article unchanged after editing\n" +msgstr "" + +#: src/lang.c:947 +msgid "" +"\n" +"Warning: \"Subject:\" contains only whitespaces.\n" +msgstr "" + +#: src/lang.c:948 +msgid "" +"\n" +"Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:" +"\".\n" +msgstr "" + +#: src/lang.c:950 +msgid "" +"\n" +"Warning: Article has \"References:\" but \"Subject:\" does not begin\n" +" with \"Re: \" and does not contain \"(was:\".\n" +msgstr "" + +#: src/lang.c:953 +msgid "" +"Read carefully!\n" +"\n" +" You are about to cancel an article seemingly written by you. This will " +"wipe\n" +" the article from most news servers throughout the world, but there is " +"no\n" +" guarantee that it will work.\n" +"\n" +"This is the article you are about to cancel:\n" +"\n" +msgstr "" + +#: src/lang.c:957 +msgid "" +"\n" +"Warning: You are using a non-plain transfer encoding (such as base64 or\n" +" quoted-printable) and an external inews program to submit your\n" +" article. If a signature is appended by that inews program it will\n" +" not be encoded properly.\n" +msgstr "" + +#: src/lang.c:962 +msgid "" +"\n" +"Warning: \"example\" is a reserved hierarchy!\n" +msgstr "" + +#: src/lang.c:963 +#, c-format +msgid "" +"\n" +"\n" +"You are upgrading to tin %s from an earlier version.\n" +"Some values in your %s file have changed!\n" +"Read WHATSNEW, etc...\n" +msgstr "" + +#: src/lang.c:965 +#, c-format +msgid "" +"\n" +"\n" +"You are downgrading to tin %s from a more recent version!\n" +"Some values in your %s file may be ignored, others might have changed!\n" +msgstr "" + +#: src/lang.c:968 +#, c-format +msgid "" +"Warning: tin wrote fewer groups to your\n" +"\t%s\n" +"than it read at startup. If you didn't unsubscribe from %ld %s during\n" +"this session this indicates an error and you should backup your %s\n" +"before you start tin once again!\n" +msgstr "" + +#: src/lang.c:972 +#, c-format +msgid "" +"\n" +"Warning: Found %d '-- \\n' lines, this may confuse some people.\n" +msgstr "" + +#: src/lang.c:973 +#, c-format +msgid "Warning: Only %d out of %d articles were saved" +msgstr "" + +#: src/lang.c:974 +#, c-format +msgid "" +"\n" +"Warning: Your signature is longer than %d lines. Since signatures usually " +"do\n" +" not transport any useful information, they should be as short " +"as\n" +" possible.\n" +msgstr "" + +#: src/lang.c:978 +#, c-format +msgid "" +"Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " +msgstr "" + +#: src/lang.c:979 +msgid "" +"\n" +"Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" +msgstr "" + +#: src/lang.c:980 +#, fuzzy +msgid "Writing attributes file..." +msgstr "Escribiendo fichero…" + +#: src/lang.c:982 +#, fuzzy, c-format +msgid "%d Responses" +msgstr "Respuestas existentes" + +#: src/lang.c:984 +#, fuzzy, c-format +msgid "Added %d %s" +msgstr "Se añadió la pista %d a la lista %s\n" + +#: src/lang.c:985 +#, fuzzy +msgid "No unsubscribed groups to show" +msgstr "GRUPOS" + +#: src/lang.c:986 +msgid "Showing subscribed to groups only" +msgstr "" + +#: src/lang.c:987 +#, fuzzy +msgid "Yes " +msgstr "Si." + +#: src/lang.c:988 +#, fuzzy +msgid " You have mail" +msgstr "Tiene correo en $_" + +#: src/lang.c:993 +#, c-format +msgid "" +"\n" +"Warning: Posting is in %s and contains characters which are not\n" +" in your selected MM_NETWORK_CHARSET: %s.\n" +" These characters will be replaced by '?' if you post this\n" +" article unchanged. To avoid garbling your article please either\n" +" edit it and remove those characters or change the setting of\n" +" MM_NETWORK_CHARSET to a suitable value for your posting via the\n" +" M)enu option.\n" +msgstr "" + +#: src/lang.c:1004 +#, fuzzy +msgid " -D mode debug mode" +msgstr "ejecutar en modo depurado, no demonizado" + +#: src/lang.c:1008 +msgid "" +"Read carefully!\n" +"\n" +" You are about to cancel an article seemingly not written by you. This " +"will\n" +" wipe the article from lots of news servers throughout the world;\n" +" Usenet's majority considers this rather inappropriate, to say the " +"least.\n" +" Only press 'd' if you are absolutely positive that you are ready to " +"take\n" +" the rap.\n" +"\n" +"This is the article you are about to cancel:\n" +"\n" +msgstr "" + +#: src/lang.c:1017 +#, fuzzy +msgid "toggle color" +msgstr "detallar" + +#: src/lang.c:1018 +msgid "" +"# Changing colors of several screen parts\n" +"# Possible values are:\n" +"# -1 = default (white for foreground and black for background)\n" +"# 0 = black\n" +"# 1 = red\n" +"# 2 = green\n" +"# 3 = brown\n" +"# 4 = blue\n" +"# 5 = pink\n" +"# 6 = cyan\n" +"# 7 = white\n" +"# These are *only* for foreground:\n" +"# 8 = gray\n" +"# 9 = light red\n" +"# 10 = light green\n" +"# 11 = yellow\n" +"# 12 = light blue\n" +"# 13 = light pink\n" +"# 14 = light cyan\n" +"# 15 = light white\n" +"\n" +msgstr "" + +#: src/lang.c:1038 +#, fuzzy +msgid " -a toggle color flag" +msgstr "detallar" + +#: src/lang.c:1042 +msgid "" +"\n" +"Error: Followup-To set to more than one newsgroup!\n" +msgstr "" + +#: src/lang.c:1043 +#, fuzzy, c-format +msgid "" +"\n" +"Error: \"%s\" is renamed, use \"%s\" instead!\n" +msgstr "error sintáctico: esperando ')' en vez de %s" + +#: src/lang.c:1044 +#, c-format +msgid "" +"\n" +"Error: cross-posting to %d newsgroups and no Followup-To line!\n" +msgstr "" + +#: src/lang.c:1045 +#, fuzzy, c-format +msgid "" +"\n" +"Error: \"%s\" is not a valid newsgroup!\n" +msgstr "\"%s\" no es un nombre de fichero válido" + +#: src/lang.c:1047 +msgid "" +"\n" +"Warning: Followup-To set to more than one newsgroup!\n" +msgstr "" + +#: src/lang.c:1048 +#, c-format +msgid "" +"\n" +"Warning: \"%s\" is renamed, you should use \"%s\" instead!\n" +msgstr "" + +#: src/lang.c:1049 +#, c-format +msgid "" +"\n" +"Warning: cross-posting to %d newsgroups and no Followup-To line!\n" +msgstr "" + +#: src/lang.c:1050 +#, c-format +msgid "" +"\n" +"Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n" +msgstr "" + +#: src/lang.c:1051 +#, fuzzy, c-format +msgid "" +"\n" +"Warning: \"%s\" is not a valid newsgroup at this site!\n" +msgstr "CUIDADO; subtítulo %s no es UTF-8 válido\n" + +#: src/lang.c:1055 +#, c-format +msgid "%d files successfully written from %d articles. %d %s occurred." +msgstr "" + +#: src/lang.c:1056 +#, fuzzy +msgid "Missing parts." +msgstr "Directorio de Importación [partes de .idata]" + +#: src/lang.c:1057 +#, fuzzy +msgid "No beginning." +msgstr "empezando el: " + +#: src/lang.c:1058 +#, fuzzy +msgid "No data." +msgstr "Sin fecha" + +#: src/lang.c:1059 +msgid "Unknown error." +msgstr "Error desconocido." + +#: src/lang.c:1062 +#, fuzzy, c-format +msgid "\tChecksum of %s (%ld %s)" +msgstr "%s: %s checksum: %u\n" + +#: src/lang.c:1067 +#, fuzzy +msgid "Reading mail active file... " +msgstr "Error leyendo fichero intercambio" + +#: src/lang.c:1068 +#, fuzzy +msgid "Reading mailgroups file... " +msgstr "Error leyendo fichero intercambio" + +#: src/lang.c:1072 +#, fuzzy +msgid "perform PGP operations on article" +msgstr "%s: no se pudieron realizar todas las operaciones solicitadas" + +#: src/lang.c:1073 +#, fuzzy +msgid "Add key(s) to public keyring?" +msgstr "Añade una llave a un anillo" + +#: src/lang.c:1074 +#, c-format +msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " +msgstr "" + +#: src/lang.c:1075 +#, c-format +msgid "%s=sign, %s=sign & include public key, %s=quit: " +msgstr "" + +#: src/lang.c:1076 +#, c-format +msgid "PGP has not been set up (can't open %s)" +msgstr "" + +#: src/lang.c:1077 +msgid "Article not signed and no public keys found" +msgstr "" + +#: src/lang.c:1079 +#, c-format +msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " +msgstr "" + +#: src/lang.c:1080 +#, c-format +msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " +msgstr "" + +#: src/lang.c:1081 +#, c-format +msgid "" +"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " +msgstr "" + +#: src/lang.c:1083 +#, c-format +msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " +msgstr "" + +#: src/lang.c:1084 +#, c-format +msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " +msgstr "" + +#: src/lang.c:1085 +#, c-format +msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " +msgstr "" + +#: src/lang.c:1089 +#, c-format +msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " +msgstr "" + +#: src/lang.c:1090 +#, c-format +msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " +msgstr "" + +#: src/lang.c:1091 +#, c-format +msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " +msgstr "" + +#: src/lang.c:1093 +#, c-format +msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " +msgstr "" + +#: src/lang.c:1094 +#, c-format +msgid "%s=quit, %s=edit, %s=send [%%s]: " +msgstr "" + +#: src/lang.c:1095 +#, c-format +msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " +msgstr "" + +#: src/lang.c:1104 +msgid "Try cache_overview_files to speed up things.\n" +msgstr "" + +#: src/lang.c:1105 +msgid "Tin will use local index files instead.\n" +msgstr "" + +#: src/lang.c:1106 +#, fuzzy +msgid "Cannot find NNTP server name" +msgstr "no se puede encontrar el nombre para el usuario con ID %s" + +#: src/lang.c:1107 +#, fuzzy, c-format +msgid "Connecting to %s:%u..." +msgstr "conectando a %s" + +#: src/lang.c:1108 +#, fuzzy +msgid "Disconnecting from server..." +msgstr "" +"Error adesconectado desde fam.\n" +"\n" + +#: src/lang.c:1109 +#, c-format +msgid "Failed to connect to NNTP server %s. Exiting..." +msgstr "" + +#: src/lang.c:1110 +#, fuzzy +msgid "205 Closing connection" +msgstr "Cerrando" + +#: src/lang.c:1111 +msgid "Your server does not support the NNTP XOVER or OVER command.\n" +msgstr "" + +#: src/lang.c:1112 +msgid "Connection to news server has timed out. Reconnect?" +msgstr "" + +#: src/lang.c:1113 +#, c-format +msgid "" +"Put the server name in the file %s,\n" +"or set the environment variable NNTPSERVER" +msgstr "" + +#: src/lang.c:1114 +#, fuzzy +msgid " -A force authentication on connect" +msgstr "Autenticación" + +#: src/lang.c:1115 +#, c-format +msgid " -g serv read news from NNTP server serv [default=%s]" +msgstr "" + +#: src/lang.c:1116 +#, c-format +msgid " -p port use port as NNTP port [default=%d]" +msgstr "" + +#: src/lang.c:1117 +msgid " -Q quick start. Same as -nqd" +msgstr "" + +#: src/lang.c:1118 +msgid " -r read news remotely from default NNTP server" +msgstr "" + +#: src/lang.c:1119 +msgid " -l use only LIST instead of GROUP (-n) command" +msgstr "" + +#: src/lang.c:1120 +msgid " -n only read subscribed .newsrc groups from NNTP server" +msgstr "" + +#: src/lang.c:1122 +msgid " -4 force connecting via IPv4" +msgstr "" + +#: src/lang.c:1123 +msgid " -6 force connecting via IPv6" +msgstr "" + +#: src/lang.c:1124 +#, fuzzy +msgid "" +"\n" +"socket or connect problem\n" +msgstr "conectar a este socket" + +#: src/lang.c:1126 +#, fuzzy, c-format +msgid "" +"\n" +"Connection to %s: " +msgstr "Conexión verificada a %s (cert=%s)" + +#: src/lang.c:1127 +#, fuzzy +msgid "Giving up...\n" +msgstr "¡Incapaz de resolver las dependencias! Desistiendo..." + +#: src/lang.c:1129 +#, fuzzy, c-format +msgid "%s/tcp: Unknown service.\n" +msgstr "%s:%d: nombre de servicio desconocido" + +#: src/lang.c:1133 +msgid "" +"Your server does not have Xref: in its XOVER information.\n" +"Tin will try to use XHDR XREF instead (slows down things a bit).\n" +msgstr "" + +#: src/lang.c:1136 +msgid "Your server does not have Xref: in its XOVER information.\n" +msgstr "" + +#: src/lang.c:1139 +#, c-format +msgid "Can't open %s. Try %s -r to read news via NNTP." +msgstr "" + +#: src/lang.c:1142 +msgid " -Q quick start. Same as -qd" +msgstr "" + +#: src/lang.c:1143 +msgid " -l read only active file instead of scanning spool (-n) command" +msgstr "" + +#: src/lang.c:1144 +msgid " -n only read subscribed .newsrc groups from spool" +msgstr "" + +#: src/lang.c:1145 +msgid "Your server does not have Xref: in its NOV-files.\n" +msgstr "" + +#: src/lang.c:1149 +msgid "Posting using external inews failed. Use built in inews instead?" +msgstr "" + +#: src/lang.c:1150 +msgid "It worked! Should I always use my built in inews from now on?" +msgstr "" + +#: src/lang.c:1154 +#, fuzzy, c-format +msgid "%d %s printed" +msgstr "Impreso por %s" + +#: src/lang.c:1155 +msgid "output article/thread/hot/pattern/tagged articles to printer" +msgstr "" + +#: src/lang.c:1156 +msgid "Print" +msgstr "Imprimir" + +#: src/lang.c:1157 +#, fuzzy +msgid "Printing..." +msgstr "Escribiendo" + +#: src/lang.c:1161 +#, fuzzy, c-format +msgid "%d %s piped to \"%s\"" +msgstr " %d.%d.%d.%d/%d => %s\n" + +#: src/lang.c:1162 +msgid "pipe article/thread/hot/pattern/tagged articles into command" +msgstr "" + +#: src/lang.c:1163 +#, fuzzy +msgid "No command" +msgstr "[mandato]" + +#: src/lang.c:1164 +#, fuzzy +msgid "Pipe" +msgstr "creando una tubería para --pipe fallada: %m\n" + +#: src/lang.c:1165 +#, fuzzy, c-format +msgid "Pipe to command [%.*s]> " +msgstr "No puede abrir una tubería a orden «%s»" + +#: src/lang.c:1166 +#, fuzzy +msgid "Piping..." +msgstr "" +" -P, --no-piping utiliza ficheros temporales entre los " +"programas\n" + +#: src/lang.c:1168 +#, fuzzy +msgid "Piping not enabled." +msgstr "Activado" + +#: src/lang.c:1172 +#, c-format +msgid "" +"\n" +"Error: The \"%s:\" line has spaces in it that MUST be removed.\n" +" The only allowable space is the one separating the colon (:)\n" +" from the contents. Use a comma (,) to separate multiple\n" +" newsgroup names.\n" +msgstr "" + +#: src/lang.c:1177 +#, c-format +msgid "" +"\n" +"Error: The \"%s:\" line is continued in the next line. Since\n" +" the line may not contain whitespace, this is not allowed.\n" +" Please write all newsgroups into a single line.\n" +msgstr "" + +#: src/lang.c:1182 +#, c-format +msgid "" +"\n" +"Warning: The \"%s:\" line is continued in the next line.\n" +" This is a very new feature and may not be accepted by all servers.\n" +" To avoid trouble please write all newsgroups into a single line.\n" +msgstr "" + +#: src/lang.c:1186 +#, c-format +msgid "" +"\n" +"Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n" +msgstr "" + +#: src/lang.c:1191 +msgid "" +"\n" +" If your article contains quoted text please take some time to pare it " +"down\n" +" to just the key points to which you are responding, or people will " +"think\n" +" you are a dweeb! Many people have the habit of skipping any article " +"whose\n" +" first page is largely quoted material. Format your article to fit in " +"less\n" +" then 80 chars, since that's the conventional size (72 is a good choice " +"as\n" +" it allows quoting without exceeding the limit). If your lines are too " +"long\n" +" they'll wrap around ugly and people won't read what you write. If " +"you\n" +" aren't careful and considerate in formatting your posting, people " +"are\n" +" likely to ignore it completely. It's a crowded net out there.\n" +msgstr "" + +#: src/lang.c:1204 +#, fuzzy +msgid "shell escape" +msgstr "" +" -q, --hide-control-chars imprime ? en lugar de los caracteres no " +"gráficos\n" +" --show-control-chars muestra los caracteres no gráficos tal y como\n" +" son (predeterminado a menos que el programa " +"sea\n" +" 'ls' y la salida sea un terminal)\n" +" -Q, --quote-name encierra los nombres de las entradas entre\n" +" comillas\n" +" --quoting-style=PALABRA utiliza el estilo de cita PALABRA para los\n" +" nombres de las entradas:\n" +" literal, locale, shell, shell-always, c, " +"escape\n" + +#: src/lang.c:1205 +#, fuzzy, c-format +msgid "Shell Command (%s)" +msgstr "%s es una palabra clave del ‘shell’\n" + +#: src/lang.c:1206 +#, fuzzy, c-format +msgid "Enter shell command [%s]> " +msgstr "Para continuar, introduzca «%s»; para abortar, introduzca «%s»:" + +#: src/lang.c:1210 +#, fuzzy, c-format +msgid "%s: Can't get entry for TERM\n" +msgstr "" +"\n" +"No se puede obtener el contenido de la sección '%s'.\n" + +#: src/lang.c:1214 +#, fuzzy, c-format +msgid "Group %.*s ('q' to quit)..." +msgstr "B<(pulse h para ayuda o q para salir)>" + +#: src/lang.c:1216 +#, fuzzy, c-format +msgid "Group %.*s..." +msgstr "sin tal grupo: %s" + +#: src/lang.c:1220 +#, fuzzy +msgid "Server unavailable\n" +msgstr "NO DISPONIBLE" + +#: src/lang.c:1226 +#, c-format +msgid "" +"%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; " +"%s=post" +msgstr "" + +#: src/lang.c:1227 +#, c-format +msgid "" +"%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" +msgstr "" + +#: src/lang.c:1229 +#, c-format +msgid "" +"%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" +msgstr "" + +#: src/lang.c:1230 +#, c-format +msgid "%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" +msgstr "" + +#: src/lang.c:1234 +#, c-format +msgid "" +"%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" +msgstr "" + +#: src/lang.c:1235 +#, c-format +msgid "%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" +msgstr "" + +#: src/lang.c:1237 +#, c-format +msgid "%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" +msgstr "" + +#: src/lang.c:1238 +#, c-format +msgid "%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" +msgstr "" + +#: src/lang.c:1244 +#, fuzzy +msgid "Terminal does not support color" +msgstr "La instrucción no admite las =N direcciones" + +#: src/lang.c:1249 +#, fuzzy, c-format +msgid "Trying %s" +msgstr "Tratando de hacer 'bal' a %s" + +#: src/lang.c:1263 src/lang.c:1291 src/lang.c:1573 src/refs.c:289 +#, fuzzy +msgid "None" +msgstr "NINGUNO" + +#: src/lang.c:1264 +msgid "Subject" +msgstr "Asunto" + +#: src/lang.c:1265 +msgid "References" +msgstr "Referencias" + +#: src/lang.c:1266 +#, fuzzy +msgid "Both Subject and References" +msgstr "ambos asunto como cuerpo son requeridos." + +#: src/lang.c:1267 +#, fuzzy +msgid "Multipart Subject" +msgstr "" + +#: src/lang.c:1268 +#, fuzzy +msgid "Percentage Match" +msgstr "Porcentaje titulado: " + +#: src/lang.c:1281 src/lang.c:1372 src/lang.c:1462 +msgid "No" +msgstr "" + +#: src/lang.c:1282 src/lang.c:1464 +#, fuzzy +msgid "Yes" +msgstr "sí" + +#: src/lang.c:1283 +#, fuzzy +msgid "Hide All" +msgstr "_Mostrar/Ocultar" + +#: src/lang.c:1292 +msgid "Address" +msgstr "Dirección" + +#: src/lang.c:1293 +msgid "Full Name" +msgstr "Nombre completo" + +#: src/lang.c:1294 +#, fuzzy +msgid "Address and Name" +msgstr "Nombre de Dirección" + +#: src/lang.c:1302 +msgid "Max" +msgstr "Máx" + +#: src/lang.c:1303 +#, fuzzy +msgid "Sum" +msgstr "¿Calcular como total?" + +#: src/lang.c:1304 +#, fuzzy +msgid "Average" +msgstr "MEDIA" + +#: src/lang.c:1314 src/lang.c:1334 +#, fuzzy +msgid "Black" +msgstr "Pizarra negra" + +#: src/lang.c:1315 src/lang.c:1335 +msgid "Red" +msgstr "Rojo" + +#: src/lang.c:1316 src/lang.c:1336 +msgid "Green" +msgstr "Verde (G)" + +#: src/lang.c:1317 src/lang.c:1337 +msgid "Brown" +msgstr "" + +#: src/lang.c:1318 src/lang.c:1338 +msgid "Blue" +msgstr "Azul (B)" + +#: src/lang.c:1319 src/lang.c:1339 +msgid "Pink" +msgstr "" + +#: src/lang.c:1320 src/lang.c:1340 +msgid "Cyan" +msgstr "" + +#: src/lang.c:1321 src/lang.c:1341 +#, fuzzy +msgid "White" +msgstr "Nivel de blancos" + +#: src/lang.c:1322 +#, fuzzy +msgid "Gray" +msgstr "Escala grisácea" + +#: src/lang.c:1323 +#, fuzzy +msgid "Light Red" +msgstr "Rojo" + +#: src/lang.c:1324 +#, fuzzy +msgid "Light Green" +msgstr "Suave" + +#: src/lang.c:1325 +msgid "Yellow" +msgstr "Amarillo" + +#: src/lang.c:1326 +#, fuzzy +msgid "Light Blue" +msgstr "Azul (B)" + +#: src/lang.c:1327 +#, fuzzy +msgid "Light Pink" +msgstr "Suave" + +#: src/lang.c:1328 +#, fuzzy +msgid "Light Cyan" +msgstr "Suave" + +#: src/lang.c:1329 +#, fuzzy +msgid "Light White" +msgstr "Suave" + +#: src/lang.c:1350 src/lang.c:1469 src/lang.c:1484 +#, fuzzy +msgid "Nothing" +msgstr "Nada." + +#: src/lang.c:1352 +msgid "Space" +msgstr "Espacio" + +#: src/lang.c:1360 +msgid "Normal" +msgstr "Normal" + +#: src/lang.c:1361 +#, fuzzy +msgid "Best highlighting" +msgstr "Mejor" + +#: src/lang.c:1362 +#, fuzzy +msgid "Underline" +msgstr "Enlaces subrayados" + +#: src/lang.c:1363 +#, fuzzy +msgid "Reverse video" +msgstr "revertir" + +#: src/lang.c:1364 +msgid "Blinking" +msgstr "" + +#: src/lang.c:1365 +#, fuzzy +msgid "Half bright" +msgstr "Brillo+" + +#: src/lang.c:1366 +#, fuzzy +msgid "Bold" +msgstr "B" + +#: src/lang.c:1373 +msgid "Cc" +msgstr "Cc" + +#: src/lang.c:1374 +msgid "Bcc" +msgstr "" + +#: src/lang.c:1375 +#, fuzzy +msgid "Cc and Bcc" +msgstr "Cc:" + +#: src/lang.c:1392 src/lang.c:1405 +#, fuzzy +msgid "none" +msgstr "NINGUNO" + +#: src/lang.c:1393 +#, fuzzy +msgid "commands" +msgstr "Órdenes:" + +#: src/lang.c:1394 +msgid "select" +msgstr "select" + +#: src/lang.c:1396 +#, fuzzy +msgid "commands & quit" +msgstr "\tórdenes:\n" + +#: src/lang.c:1397 +#, fuzzy +msgid "commands & select" +msgstr " órdenes:\n" + +#: src/lang.c:1398 +#, fuzzy +msgid "quit & select" +msgstr "_Salir" + +#: src/lang.c:1399 +#, fuzzy +msgid "commands & quit & select" +msgstr "Órdenes:" + +#: src/lang.c:1406 +msgid "PageDown" +msgstr "" + +#: src/lang.c:1407 +msgid "PageNextUnread" +msgstr "" + +#: src/lang.c:1408 +msgid "PageDown or PageNextUnread" +msgstr "" + +#: src/lang.c:1414 +#, fuzzy +msgid "Subject: (case sensitive)" +msgstr "distinguir mayúsculas" + +#: src/lang.c:1415 +#, fuzzy +msgid "Subject: (ignore case)" +msgstr " +i, --no-ignore-case distingue entre mayúsculas y minúsculas\n" + +#: src/lang.c:1416 +#, fuzzy +msgid "From: (case sensitive)" +msgstr "distinguir mayúsculas" + +#: src/lang.c:1417 +#, fuzzy +msgid "From: (ignore case)" +msgstr " +i, --no-ignore-case distingue entre mayúsculas y minúsculas\n" + +#: src/lang.c:1418 +msgid "Msg-ID: & full References: line" +msgstr "" + +#: src/lang.c:1419 +msgid "Msg-ID: & last References: only" +msgstr "" + +#: src/lang.c:1420 +#, fuzzy +msgid "Message-ID: entry only" +msgstr "No se pudo obtener el id del mensaje" + +#: src/lang.c:1421 +#, fuzzy +msgid "Lines:" +msgstr "" + +#: src/lang.c:1427 +msgid "Don't trim article body" +msgstr "" + +#: src/lang.c:1428 +#, fuzzy +msgid "Skip leading blank lines" +msgstr "Líneas Destacadas a Omitir" + +#: src/lang.c:1429 +#, fuzzy +msgid "Skip trailing blank lines" +msgstr "Líneas de Separadoras a Omitir" + +#: src/lang.c:1430 +msgid "Skip leading and trailing blank l." +msgstr "" + +#: src/lang.c:1431 +#, fuzzy +msgid "Compact multiple between text" +msgstr "m selecciona entre árbol compacto y expandido" + +#: src/lang.c:1432 +#, fuzzy +msgid "Compact multiple and skip leading" +msgstr "omitir ficheros que empiecen por " + +#: src/lang.c:1433 +#, fuzzy +msgid "Compact multiple and skip trailing" +msgstr "Líneas de Separadoras a Omitir" + +#: src/lang.c:1434 +msgid "Compact mltpl., skip lead. & trai." +msgstr "" + +#: src/lang.c:1463 +#, fuzzy +msgid "Shell archive" +msgstr "Probablemente %s no es un archivo de shell" + +#: src/lang.c:1470 +#, fuzzy +msgid "Subject: (descending)" +msgstr "Asunto" + +#: src/lang.c:1471 +#, fuzzy +msgid "Subject: (ascending)" +msgstr "Asunto" + +#: src/lang.c:1472 +#, fuzzy +msgid "From: (descending)" +msgstr "Descendente" + +#: src/lang.c:1473 +#, fuzzy +msgid "From: (ascending)" +msgstr "Ascendente" + +#: src/lang.c:1474 +#, fuzzy +msgid "Date: (descending)" +msgstr "Descendente" + +#: src/lang.c:1475 +#, fuzzy +msgid "Date: (ascending)" +msgstr "Ascendente" + +#: src/lang.c:1476 src/lang.c:1485 +#, fuzzy +msgid "Score (descending)" +msgstr "Descendente" + +#: src/lang.c:1477 src/lang.c:1486 +#, fuzzy +msgid "Score (ascending)" +msgstr "Ascendente" + +#: src/lang.c:1478 +#, fuzzy +msgid "Lines: (descending)" +msgstr "Descendente" + +#: src/lang.c:1479 +#, fuzzy +msgid "Lines: (ascending)" +msgstr "Ascendente" + +#: src/lang.c:1487 +#, fuzzy +msgid "Last posting date (descending)" +msgstr " Última fecha de parche: %.17s\n" + +#: src/lang.c:1488 +#, fuzzy +msgid "Last posting date (ascending)" +msgstr " Última fecha de parche: %.17s\n" + +#: src/lang.c:1494 +#, fuzzy +msgid "Quick-sort" +msgstr "¿¡¿Tan rápido?!?" + +#: src/lang.c:1495 +#, fuzzy +msgid "Heap-sort" +msgstr "_Ordenar por…" + +#: src/lang.c:1502 +#, fuzzy +msgid "Always Keep" +msgstr "Siempre" + +#: src/lang.c:1503 +#, fuzzy +msgid "Always Remove" +msgstr "SIEMPRE ACTIVO" + +#: src/lang.c:1504 +#, fuzzy +msgid "Mark with D on selection screen" +msgstr " Seleccione Marcador (pantalla %d de %d)" + +#: src/lang.c:1510 +msgid "Kill only unread arts" +msgstr "" + +#: src/lang.c:1511 +msgid "Kill all arts & show with K" +msgstr "" + +#. TODO: s/K/art_marked_killed/ +#: src/lang.c:1512 +msgid "Kill all arts and never show" +msgstr "" + +#: src/lang.c:1518 +#, fuzzy +msgid "Nothing special" +msgstr "Nada." + +#: src/lang.c:1519 +#, fuzzy +msgid "Compress quotes" +msgstr "comprimir" + +#: src/lang.c:1520 +#, fuzzy +msgid "Quote signatures" +msgstr "eliminar firmas de paquetes" + +#: src/lang.c:1521 +msgid "Compress quotes, quote sigs" +msgstr "" + +#: src/lang.c:1522 +#, fuzzy +msgid "Quote empty lines" +msgstr "Vacía" + +#: src/lang.c:1523 +msgid "Compress quotes, quote empty lines" +msgstr "" + +#: src/lang.c:1524 +msgid "Quote sigs & empty lines" +msgstr "" + +#: src/lang.c:1525 +msgid "Comp. q., quote sigs & empty lines" +msgstr "" + +#: src/lang.c:1565 +msgid "no" +msgstr "" + +#: src/lang.c:1566 +#, fuzzy +msgid "with headers" +msgstr " con encabezados" + +#: src/lang.c:1567 +#, fuzzy +msgid "without headers" +msgstr " sin encabezados" + +#: src/lang.c:1574 +#, fuzzy +msgid "NFKC" +msgstr "`%.*s' no está en NFKC" + +#: src/lang.c:1576 +msgid "NFKD" +msgstr "" + +#: src/lang.c:1577 +#, fuzzy +msgid "NFC" +msgstr "`%.*s' no está en NFC" + +#: src/lang.c:1578 +msgid "NFD" +msgstr "" + +#: src/lang.c:1580 +msgid "NFKC case fold" +msgstr "" + +#: src/lang.c:1589 +#, fuzzy +msgid "Display Options" +msgstr "Enseñar opciones" + +#: src/lang.c:1596 +#, fuzzy +msgid "Color Options" +msgstr "Color" + +#: src/lang.c:1602 +#, fuzzy +msgid "Highlight Options" +msgstr "Opciones:" + +#: src/lang.c:1609 +#, fuzzy +msgid "Article-Limiting Options" +msgstr "Limitando Vista" + +#: src/lang.c:1615 +#, fuzzy +msgid "Posting/Mailing Options" +msgstr "Estará publicando a:" + +#: src/lang.c:1621 +#, fuzzy +msgid "Saving/Printing Options" +msgstr "Opciones de Escritura" + +#: src/lang.c:1627 +#, fuzzy +msgid "Expert Options" +msgstr "Expertos" + +#: src/lang.c:1633 +#, fuzzy +msgid "Filtering Options" +msgstr "(Ahora Filtrando)" + +#: src/lang.c:1638 src/lang.c:1669 src/lang.c:1675 src/lang.c:1702 +#: src/lang.c:1754 src/lang.c:1760 src/lang.c:1770 src/lang.c:1781 +#: src/lang.c:1799 src/lang.c:1868 src/lang.c:2069 src/lang.c:2075 +#: src/lang.c:2081 src/lang.c:2087 src/lang.c:2099 src/lang.c:2106 +#: src/lang.c:2160 src/lang.c:2169 src/lang.c:2175 src/lang.c:2182 +#: src/lang.c:2189 src/lang.c:2196 src/lang.c:2203 src/lang.c:2210 +#: src/lang.c:2217 src/lang.c:2224 src/lang.c:2231 src/lang.c:2238 +#: src/lang.c:2245 src/lang.c:2252 src/lang.c:2259 src/lang.c:2266 +#: src/lang.c:2273 src/lang.c:2280 src/lang.c:2287 src/lang.c:2294 +#: src/lang.c:2301 src/lang.c:2308 src/lang.c:2315 src/lang.c:2322 +#: src/lang.c:2329 src/lang.c:2336 src/lang.c:2343 src/lang.c:2351 +#: src/lang.c:2367 src/lang.c:2374 src/lang.c:2381 src/lang.c:2388 +#: src/lang.c:2394 src/lang.c:2400 src/lang.c:2417 src/lang.c:2429 +#: src/lang.c:2464 src/lang.c:2517 src/lang.c:2531 src/lang.c:2537 +#: src/lang.c:2562 src/lang.c:2580 src/lang.c:2597 src/lang.c:2609 +#: src/lang.c:2642 src/lang.c:2678 src/lang.c:2698 src/lang.c:2733 +#: src/lang.c:2743 src/lang.c:2750 src/lang.c:2776 src/lang.c:2800 +#: src/lang.c:2877 src/lang.c:2892 src/lang.c:2900 src/lang.c:2914 +#: src/lang.c:2920 src/lang.c:2958 +msgid " toggles, sets, cancels." +msgstr "" + +#: src/lang.c:1639 +msgid "Show mini menu & posting etiquette" +msgstr "" + +#: src/lang.c:1640 +msgid "" +"# If ON show a mini menu of useful commands at each level\n" +"# and posting etiquette after composing an article\n" +msgstr "" + +#: src/lang.c:1645 +msgid "Show short description for each newsgroup. toggles & sets." +msgstr "" + +#: src/lang.c:1646 +#, fuzzy +msgid "Show description of each newsgroup" +msgstr "Muestra una descripción de cuenta." + +#: src/lang.c:1647 +msgid "" +"# If ON show group description text after newsgroup name at\n" +"# group selection level\n" +msgstr "" + +#: src/lang.c:1652 +msgid "" +"Show From (author) fields in group & thread level. toggles & " +"sets." +msgstr "" + +#: src/lang.c:1653 +msgid "In group and thread level, show author by" +msgstr "" + +#: src/lang.c:1654 +msgid "" +"# Part of From field to display in group and thread level\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = none\n" +"# 1 = address\n" +"# * 2 = full name\n" +"# 3 = both\n" +msgstr "" + +#: src/lang.c:1663 +msgid "Draw -> or highlighted bar for selection. toggles & sets." +msgstr "" + +#: src/lang.c:1664 +msgid "Draw -> instead of highlighted bar" +msgstr "" + +#: src/lang.c:1665 +msgid "# If ON use -> otherwise highlighted bar for selection\n" +msgstr "" + +#: src/lang.c:1670 +msgid "Use inverse video for page headers" +msgstr "" + +#: src/lang.c:1671 +msgid "# If ON use inverse video for page headers at different levels\n" +msgstr "" + +#: src/lang.c:1676 +#, fuzzy +msgid "Thread articles by" +msgstr "" +"\n" +"Ningún artículo dentro de este grupo.\n" + +#: src/lang.c:1677 +msgid "" +"# Thread articles by ...\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = nothing\n" +"# 1 = Subject\n" +"# 2 = References\n" +"# * 3 = Both (Subject and References)\n" +"# 4 = Multipart Subject\n" +"# 5 = Percentage Match\n" +msgstr "" + +#: src/lang.c:1688 +msgid "Enter percentage match required to thread together. sets." +msgstr "" + +#: src/lang.c:1689 +#, fuzzy +msgid "Thread percentage match" +msgstr "Porcentaje de completación" + +#: src/lang.c:1691 +#, no-c-format +msgid "" +"# Thread percentage match...\n" +"# the percentage of characters in the subject of an article that must match\n" +"# a base article for both those articles to be considered to belong to the\n" +"# same thread. This option is an integer percentage, eg. 80, no decimals " +"may\n" +"# follow. If 80 is used here, then 80% of the characters must match " +"exactly,\n" +"# no insertion of a character, for the two articles to be put in the same\n" +"# thread. eg. 'happy' and 'harpy' would match, but 'harpie', 'happie' and\n" +"# 'harppy' would be threaded separately from 'happy'\n" +msgstr "" + +#: src/lang.c:1703 +#, fuzzy +msgid "Score of a thread" +msgstr "Hilo" + +#: src/lang.c:1704 +msgid "" +"# Thread score\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = max\n" +"# 1 = sum\n" +"# 2 = average\n" +msgstr "" + +#: src/lang.c:1712 +msgid "" +"Sort articles by Subject, From, Date or Score. toggles & sets." +msgstr "" + +#: src/lang.c:1713 +#, fuzzy +msgid "Sort articles by" +msgstr "Artículos anteriores" + +#: src/lang.c:1714 +msgid "" +"# Sort articles by ...\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = nothing\n" +"# 1 = Subject descending\n" +"# 2 = Subject ascending\n" +"# 3 = From descending\n" +"# 4 = From ascending\n" +"# 5 = Date descending\n" +"# * 6 = Date ascending\n" +"# 7 = Score descending\n" +"# 8 = Score ascending\n" +"# 9 = Lines descending\n" +"# 10 = Lines ascending\n" +msgstr "" + +#: src/lang.c:1730 +msgid "Sort threads by Nothing or Score. toggles & sets." +msgstr "" + +#: src/lang.c:1731 +#, fuzzy +msgid "Sort threads by" +msgstr "Conversaciones" + +#: src/lang.c:1732 +msgid "" +"# Sort thread by ...\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = nothing\n" +"# * 1 = Score descending\n" +"# 2 = Score ascending\n" +"# 3 = Last posting date descending\n" +"# 4 = Last posting date ascending\n" +msgstr "" + +#: src/lang.c:1742 +msgid "" +"Put cursor at first/last unread art in groups. toggles & sets." +msgstr "" + +#: src/lang.c:1743 +msgid "Go to first unread article in group" +msgstr "" + +#: src/lang.c:1744 +msgid "# If ON put cursor at first unread art in group otherwise last art\n" +msgstr "" + +#: src/lang.c:1748 +msgid "Show all articles or only unread articles. toggles & sets." +msgstr "" + +#: src/lang.c:1749 +#, fuzzy +msgid "Show only unread articles" +msgstr "Mostrar únicamente los titulares _activos" + +#: src/lang.c:1750 +msgid "# If ON show only new/unread articles otherwise show all.\n" +msgstr "" + +#: src/lang.c:1755 +msgid "Show only groups with unread arts" +msgstr "" + +#: src/lang.c:1756 +msgid "# If ON show only subscribed to groups that contain unread articles.\n" +msgstr "" + +#: src/lang.c:1761 +#, fuzzy +msgid "Filter which articles" +msgstr "_Filtrar por…" + +#: src/lang.c:1762 +msgid "" +"# Filter which articles\n" +"# Possible values are (the default is marked with *):\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" +msgstr "" + +#: src/lang.c:1771 +#, fuzzy +msgid "Go to the next unread article with" +msgstr "Ir a la pista siguiente" + +#: src/lang.c:1772 +msgid "" +"# Go to the unread article with following key(s)\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = nothing\n" +"# 1 = PAGE DOWN\n" +"# * 2 = TAB\n" +"# 3 = PAGE DOWN or TAB\n" +msgstr "" + +#: src/lang.c:1782 +#, fuzzy +msgid "How to treat blank lines" +msgstr "" +"$filename: encontrado número $number de línea línea${plural $number s} " +"vacías al final del fichero" + +#: src/lang.c:1783 +msgid "" +"# Trim the article body, remove unnecessary blank lines.\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = Nothing special\n" +"# 1 = Skip leading blank lines\n" +"# 2 = Skip trailing blank lines\n" +"# 3 = Skip leading and trailing blank lines\n" +"# 4 = Compact multiple blank lines between text blocks\n" +"# 5 = Compact multiple blank lines between text blocks and skip\n" +"# leading blank lines\n" +"# 6 = Compact multiple blank lines between text blocks and skip\n" +"# trailing blank lines\n" +"# 7 = Compact multiple blank lines between text blocks and skip\n" +"# leading and trailing blank lines\n" +msgstr "" + +#: src/lang.c:1800 +msgid "List thread using right arrow key" +msgstr "" + +#: src/lang.c:1801 +msgid "" +"# If ON automatically list thread when entering it using right arrow key.\n" +msgstr "" + +#: src/lang.c:1805 +msgid "Enter character to indicate deleted articles. sets, cancels." +msgstr "" + +#: src/lang.c:1806 +msgid "Character to show deleted articles" +msgstr "" + +#: src/lang.c:1807 +msgid "" +"# Character used to show that an art was deleted (default 'D')\n" +"# _ is turned into ' '\n" +msgstr "" + +#: src/lang.c:1812 +msgid "" +"Enter character to indicate articles in a range. sets, cancels." +msgstr "" + +#: src/lang.c:1813 +msgid "Character to show inrange articles" +msgstr "" + +#: src/lang.c:1814 +msgid "" +"# Character used to show that an art is in a range (default '#')\n" +"# _ is turned into ' '\n" +msgstr "" + +#: src/lang.c:1819 +msgid "" +"Enter character to indicate that article will return. sets, " +"cancels." +msgstr "" + +#: src/lang.c:1820 +msgid "Character to show returning arts" +msgstr "" + +#: src/lang.c:1821 +msgid "" +"# Character used to show that an art will return (default '-')\n" +"# _ is turned into ' '\n" +msgstr "" + +#: src/lang.c:1826 +msgid "" +"Enter character to indicate selected articles. sets, cancels." +msgstr "" + +#: src/lang.c:1827 +msgid "Character to show selected articles" +msgstr "" + +#: src/lang.c:1828 +msgid "" +"# Character used to show that an art was auto-selected (default '*')\n" +"# _ is turned into ' '\n" +msgstr "" + +#: src/lang.c:1833 +msgid "Enter character to indicate recent articles. sets, cancels." +msgstr "" + +#: src/lang.c:1834 +msgid "Character to show recent articles" +msgstr "" + +#: src/lang.c:1835 +msgid "" +"# Character used to show that an art is recent (default 'o')\n" +"# _ is turned into ' '\n" +msgstr "" + +#: src/lang.c:1840 +msgid "Enter character to indicate unread articles. sets, cancels." +msgstr "" + +#: src/lang.c:1841 +msgid "Character to show unread articles" +msgstr "" + +#: src/lang.c:1842 +msgid "" +"# Character used to show that an art is unread (default '+')\n" +"# _ is turned into ' '\n" +msgstr "" + +#: src/lang.c:1847 +msgid "Enter character to indicate read articles. sets, cancels." +msgstr "" + +#: src/lang.c:1848 +msgid "Character to show read articles" +msgstr "" + +#: src/lang.c:1849 +msgid "" +"# Character used to show that an art was read (default ' ')\n" +"# _ is turned into ' '\n" +msgstr "" + +#: src/lang.c:1854 +msgid "Enter character to indicate killed articles. sets, cancels." +msgstr "" + +#: src/lang.c:1855 +msgid "Character to show killed articles" +msgstr "" + +#: src/lang.c:1856 +msgid "" +"# Character used to show that an art was killed (default 'K')\n" +"# kill_level must be set accordingly, _ is turned into ' '\n" +msgstr "" + +#: src/lang.c:1861 +msgid "" +"Enter character to indicate read selected articles. sets, cancels." +msgstr "" + +#: src/lang.c:1862 +msgid "Character to show readselected arts" +msgstr "" + +#: src/lang.c:1863 +msgid "" +"# Character used to show that an art was selected before read (default ':')\n" +"# kill_level must be set accordingly, _ is turned into ' '\n" +msgstr "" + +#: src/lang.c:1869 +#, fuzzy +msgid "Abbreviate long newsgroup names" +msgstr "Mostrar nombres largos de cuentas" + +#: src/lang.c:1870 +msgid "" +"# If ON abbreviate (if necessary) long newsgroup names at group selection\n" +"# level and article level like this:\n" +"# news.software.readers -> n.software.readers -> n.s.readers -> n.s.r.\n" +msgstr "" + +#: src/lang.c:1876 +msgid "" +"0 = full page scrolling, -1 = show previous last line as first on next page, " +"-2 = half page" +msgstr "" + +#: src/lang.c:1877 +#, fuzzy +msgid "Number of lines to scroll in pager" +msgstr "Número de líneas: %d\n" + +#: src/lang.c:1878 +msgid "" +"# Number of lines that cursor-up/down will scroll in article pager\n" +"# Possible values are (the default is marked with *):\n" +"# -2 = half-page scrolling\n" +"# -1 = the top/bottom line is carried over onto the next page\n" +"# 0 = page-by-page (traditional behavior)\n" +"# * 1 = line-by-line\n" +"# 2 or greater = scroll by 2 or more lines (only in the pager)\n" +msgstr "" + +#: src/lang.c:1888 +msgid "Display signatures. toggles & sets." +msgstr "" + +#: src/lang.c:1889 +#, fuzzy +msgid "Display signatures" +msgstr "eliminar firmas de paquetes" + +#: src/lang.c:1890 +msgid "# If OFF don't show signatures when displaying articles\n" +msgstr "" + +#: src/lang.c:1894 +msgid "" +"Display uuencoded data as tagged attachments. toggles & sets." +msgstr "" + +#: src/lang.c:1895 +#, fuzzy +msgid "Display uue data as an attachment" +msgstr "Enseñar una lengüeta de los datos seleccionados." + +#: src/lang.c:1896 +msgid "" +"# Handling of uuencoded data in the pager\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = no, display raw uuencoded data\n" +"# 1 = yes, uuencoded data will be condensed to a single tag line showing\n" +"# size and filename, similar to how MIME attachments are displayed\n" +"# 2 = hide all, as for 1, but any line that looks like uuencoded data " +"will\n" +"# be folded into a tag line.\n" +msgstr "" + +#: src/lang.c:1906 +msgid "" +"Decode German style TeX umlaut codes to ISO. toggles & sets." +msgstr "" + +#: src/lang.c:1907 +#, fuzzy +msgid "Display \"a as Umlaut-a" +msgstr "_Enseñar para" + +#: src/lang.c:1908 +msgid "" +"# If ON decode German style TeX umlaut codes to ISO and\n" +"# show \"a as Umlaut-a, etc.\n" +msgstr "" + +#: src/lang.c:1913 src/lang.c:1923 +msgid "Space separated list of header fields" +msgstr "" + +#: src/lang.c:1914 +#, fuzzy +msgid "Display these header fields (or *)" +msgstr "No enseñar línea de cabecera." + +#: src/lang.c:1915 +msgid "" +"# Which news headers you wish to see. If you want to see _all_ the headers,\n" +"# place an '*' as this value. This is the only way a wildcard can be used.\n" +"# If you enter 'X-' as the value, you will see all headers beginning with\n" +"# '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 "" + +#: src/lang.c:1924 +#, fuzzy +msgid "Do not display these header fields" +msgstr "No enseñar línea de cabecera." + +#: src/lang.c:1925 +msgid "" +"# Same as 'news_headers_to_display' except it denotes the opposite.\n" +"# An example of using both options might be if you thought X- headers were\n" +"# A Good Thing(tm), but thought Alan and Pape were miscreants...well then " +"you\n" +"# would do something like this:\n" +"# 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 "" + +#: src/lang.c:1935 +msgid "" +"Do you want to enable automatic handling of multipart/alternative articles?" +msgstr "" + +#: src/lang.c:1936 +msgid "Skip multipart/alternative parts" +msgstr "" + +#: src/lang.c:1937 +msgid "# If ON strip multipart/alternative messages automatically\n" +msgstr "" + +#: src/lang.c:1941 +msgid "Enable detection of verbatim blocks? toggles & sets." +msgstr "" + +#: src/lang.c:1942 +#, fuzzy +msgid "Detection of verbatim blocks" +msgstr "detección" + +#: src/lang.c:1943 +msgid "# If ON detect verbatim blocks in articles\n" +msgstr "" + +#: src/lang.c:1948 +msgid "A regex used to decide which lines to show in col_quote." +msgstr "" + +#: src/lang.c:1949 +msgid "Regex used to show quoted lines" +msgstr "" + +#: src/lang.c:1950 +msgid "" +"# A regular expression that tin will use to decide which lines are\n" +"# quoted when viewing articles. Quoted lines are shown in col_quote.\n" +"# If you leave this blank, tin will use a built in default.\n" +msgstr "" + +#: src/lang.c:1956 +msgid "A regex used to decide which lines to show in col_quote2." +msgstr "" + +#: src/lang.c:1957 +msgid "Regex used to show twice quoted l." +msgstr "" + +#: src/lang.c:1958 +msgid "" +"# A regular expression that tin will use to decide which lines are\n" +"# quoted twice. Twice quoted lines are shown in col_quote2.\n" +"# If you leave this blank, tin will use a built in default.\n" +msgstr "" + +#: src/lang.c:1964 +msgid "A regex used to decide which lines to show in col_quote3." +msgstr "" + +#: src/lang.c:1965 +msgid "Regex used to show >= 3 times q.l." +msgstr "" + +#: src/lang.c:1966 +msgid "" +"# A regular expression that tin will use to decide which lines are\n" +"# quoted >=3 times. >=3 times quoted lines are shown in col_quote3.\n" +"# If you leave this blank, tin will use a built in default.\n" +msgstr "" + +#: src/lang.c:1972 +msgid "Enable detection of external quotes? toggles & sets." +msgstr "" + +#: src/lang.c:1973 +#, fuzzy +msgid "Detection of external quotes" +msgstr "detección" + +#: src/lang.c:1974 +msgid "# If ON detect quoted text from external sources in articles\n" +msgstr "" + +#: src/lang.c:1978 +msgid "A regex used to decide which lines to show in col_extquote." +msgstr "" + +#: src/lang.c:1979 +msgid "Regex used to show quotes from external sources" +msgstr "" + +#: src/lang.c:1980 +msgid "" +"# A regular expression that tin will use to decide which lines are\n" +"# external quotes. Text from external quotes is shown in col_extquote.\n" +"# If you leave this blank, tin will use a built in default.\n" +msgstr "" + +#: src/lang.c:1987 +msgid "A regex used to decide which words to show in col_markslashes." +msgstr "" + +#: src/lang.c:1988 +msgid "Regex used to highlight /slashes/" +msgstr "" + +#: src/lang.c:1989 +msgid "" +"# A regular expression that tin will use to decide which words\n" +"# bounded by '/' are to be shown in col_markslashes.\n" +"# If you leave this blank, tin will use a built in default.\n" +msgstr "" + +#: src/lang.c:1995 +msgid "A regex used to decide which words to show in col_markstars." +msgstr "" + +#: src/lang.c:1996 +msgid "Regex used to highlight *stars*" +msgstr "" + +#: src/lang.c:1997 +msgid "" +"# A regular expression that tin will use to decide which words\n" +"# bounded by '*' are to be shown in col_markstars.\n" +"# If you leave this blank, tin will use a built in default.\n" +msgstr "" + +#: src/lang.c:2003 +msgid "A regex used to decide which words to show in col_markstroke." +msgstr "" + +#: src/lang.c:2004 +msgid "Regex used to highlight -strokes-" +msgstr "" + +#: src/lang.c:2005 +msgid "" +"# A regular expression that tin will use to decide which words\n" +"# bounded by '-' are to be shown in col_markstroke.\n" +"# If you leave this blank, tin will use a built in default.\n" +msgstr "" + +#: src/lang.c:2011 +msgid "A regex used to decide which words to show in col_markdash." +msgstr "" + +#: src/lang.c:2012 +msgid "Regex used to highlight _underline_" +msgstr "" + +#: src/lang.c:2013 +msgid "" +"# A regular expression that tin will use to decide which words\n" +"# bounded by '_' are to be shown in col_markdash.\n" +"# If you leave this blank, tin will use a built in default.\n" +msgstr "" + +#: src/lang.c:2019 +msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." +msgstr "" + +#: src/lang.c:2020 +#, fuzzy +msgid "Regex with Subject prefixes" +msgstr "EXREG" + +#: src/lang.c:2021 +msgid "" +"# A regular expression that tin will use to find Subject prefixes\n" +"# which will be removed before showing the header.\n" +msgstr "" + +#: src/lang.c:2026 +msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." +msgstr "" + +#: src/lang.c:2027 +#, fuzzy +msgid "Regex with Subject suffixes" +msgstr "EXREG" + +#: src/lang.c:2028 +msgid "" +"# A regular expression that tin will use to find Subject suffixes\n" +"# which will be removed when replying or posting followup.\n" +msgstr "" + +#: src/lang.c:2033 +msgid "A regex used to find the begin of a verbatim block." +msgstr "" + +#: src/lang.c:2034 +#, fuzzy +msgid "Regex for begin of a verbatim block" +msgstr "Acción Sendmail no está permitida dentro de inicio de bloque" + +#: src/lang.c:2035 +msgid "" +"# A regular expression that tin will use to find the begin of\n" +"# a verbatim block.\n" +msgstr "" + +#: src/lang.c:2040 +msgid "A regex used to find the end of a verbatim block." +msgstr "" + +#: src/lang.c:2041 +#, fuzzy +msgid "Regex for end of a verbatim block" +msgstr "debug_end_block: no hay un bloque actual" + +#: src/lang.c:2042 +msgid "" +"# A regular expression that tin will use to find the end of\n" +"# a verbatim block.\n" +msgstr "" + +#: src/lang.c:2047 +msgid "" +"Enter name and options for external MIME viewer, --internal for built-in " +"viewer" +msgstr "" + +#: src/lang.c:2048 +msgid "MIME binary content viewer" +msgstr "" + +#: src/lang.c:2049 +msgid "" +"# If --internal automatically use the built in MIME viewer for non-text\n" +"# parts of articles.\n" +"# Otherwise specify an external viewer program (eg. metamail) or leave " +"blank\n" +"# for no automatic viewing\n" +msgstr "" + +#: src/lang.c:2056 +msgid "Confirm before starting non-text viewing program" +msgstr "" + +#: src/lang.c:2057 +msgid "Ask before using MIME viewer" +msgstr "" + +#: src/lang.c:2058 +msgid "" +"# If ON tin will ask before using metamail to display MIME messages\n" +"# this only happens if metamail_prog is set to something\n" +msgstr "" + +#: src/lang.c:2063 +msgid "Ask to mark groups read when quitting. toggles & sets." +msgstr "" + +#: src/lang.c:2064 +msgid "Catchup read groups when quitting" +msgstr "" + +#: src/lang.c:2065 +msgid "# If ON ask user if read groups should all be marked read\n" +msgstr "" + +#: src/lang.c:2070 +msgid "Catchup group using left key" +msgstr "" + +#: src/lang.c:2071 +msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" +msgstr "" + +#: src/lang.c:2076 +msgid "Catchup thread by using left key" +msgstr "" + +#: src/lang.c:2082 +#, fuzzy +msgid "Which actions require confirmation" +msgstr " -P Siempre pide confirmación de las operaciones.\n" + +#: src/lang.c:2083 +msgid "# What should we ask confirmation for.\n" +msgstr "" + +#: src/lang.c:2088 +msgid "'Mark as (un)read' ignores tags" +msgstr "" + +#: src/lang.c:2089 +msgid "" +"# If ON the 'Mark as (un)read' function marks only the current article.\n" +msgstr "" + +#: src/lang.c:2093 +msgid "Program to run to open URLs, sets, cancels." +msgstr "" + +#: src/lang.c:2094 +#, fuzzy +msgid "Program that opens URLs" +msgstr "El registro se abre en una _ventana nueva" + +#: src/lang.c:2095 +msgid "# The program used to open URLs. The actual URL will be appended\n" +msgstr "" + +#: src/lang.c:2100 +#, fuzzy +msgid "Use mouse in xterm" +msgstr "Empleado" + +#: src/lang.c:2101 +msgid "# If ON enable mouse button support on xterm terminals\n" +msgstr "" + +#: src/lang.c:2107 +msgid "Use scroll keys on keypad" +msgstr "" + +#: src/lang.c:2108 +msgid "# If ON enable scroll keys on terminals that support it\n" +msgstr "" + +#: src/lang.c:2113 +msgid "Enter maximum number of article to get. sets." +msgstr "" + +#: src/lang.c:2114 +#, fuzzy +msgid "Number of articles to get" +msgstr "Obtiene número de objetos" + +#: src/lang.c:2115 +msgid "" +"# Number of articles to get (0=no limit), if negative sets maximum number\n" +"# of already read articles to be read before first unread one\n" +msgstr "" + +#: src/lang.c:2120 +msgid "Enter number of days article is considered recent. sets." +msgstr "" + +#: src/lang.c:2121 +#, fuzzy +msgid "Article recentness time limit" +msgstr "Excedido el tiempo límite de CPU" + +#: src/lang.c:2122 +msgid "# Number of days in which article is considered recent, (0=OFF)\n" +msgstr "" + +#: src/lang.c:2126 +msgid "" +"WILDMAT for normal wildcards, REGEX for full regular expression matching." +msgstr "" + +#: src/lang.c:2127 +msgid "Wildcard matching" +msgstr "" + +#: src/lang.c:2128 +msgid "" +"# Wildcard matching\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = wildmat\n" +"# 1 = regex\n" +msgstr "" + +#: src/lang.c:2135 +msgid "Enter minimal score before an article is marked killed. sets." +msgstr "" + +#: src/lang.c:2136 +#, fuzzy +msgid "Score limit (kill)" +msgstr "Opciones de ensamblador específicas de Score:\n" + +#: src/lang.c:2137 +msgid "# Score limit before an article is marked killed\n" +msgstr "" + +#: src/lang.c:2141 +msgid "Enter default score to kill articles. sets." +msgstr "" + +#: src/lang.c:2142 +msgid "Default score to kill articles" +msgstr "" + +#: src/lang.c:2143 +msgid "# Default score to kill articles\n" +msgstr "" + +#: src/lang.c:2147 +msgid "Enter minimal score before an article is marked hot. sets." +msgstr "" + +#: src/lang.c:2148 +#, fuzzy +msgid "Score limit (select)" +msgstr "Opciones de ensamblador específicas de Score:\n" + +#: src/lang.c:2149 +msgid "# Score limit before an article is marked hot\n" +msgstr "" + +#: src/lang.c:2153 +msgid "Enter default score to select articles. sets." +msgstr "" + +#: src/lang.c:2154 +#, fuzzy +msgid "Default score to select articles" +msgstr "Seleccione la elección por omisión de cuentas." + +#: src/lang.c:2155 +#, fuzzy +msgid "# Default score to select articles\n" +msgstr "Seleccione la elección por omisión de cuentas." + +#: src/lang.c:2161 +msgid "Use slrnface to show ''X-Face:''s" +msgstr "" + +#: src/lang.c:2162 +msgid "" +"# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n" +"# Only useful when running in an xterm.\n" +msgstr "" + +#: src/lang.c:2170 +#, fuzzy +msgid "Use ANSI color" +msgstr "Color" + +#: src/lang.c:2171 +#, fuzzy +msgid "# If ON using ANSI-color\n" +msgstr "Color" + +#: src/lang.c:2176 +#, fuzzy +msgid "Standard foreground color" +msgstr "Color de primer plano estándar" + +#: src/lang.c:2177 +msgid "" +"# Standard foreground color\n" +"# Default: -1 (default color)\n" +msgstr "" + +#: src/lang.c:2183 +#, fuzzy +msgid "Standard background color" +msgstr "Color de fondo estándar" + +#: src/lang.c:2184 +#, fuzzy +msgid "" +"# Standard background color\n" +"# Default: -1 (default color)\n" +msgstr "El color predeterminado debería usarse sólo como fondo." + +#: src/lang.c:2190 +#, fuzzy +msgid "Color for inverse text (background)" +msgstr "Color de fondo del título" + +#: src/lang.c:2191 +msgid "" +"# Color of background for inverse text\n" +"# Default: 4 (blue)\n" +msgstr "" + +#: src/lang.c:2197 +#, fuzzy +msgid "Color for inverse text (foreground)" +msgstr "Color de texto común." + +#: src/lang.c:2198 +msgid "" +"# Color of foreground for inverse text\n" +"# Default: 7 (white)\n" +msgstr "" + +#: src/lang.c:2204 +#, fuzzy +msgid "Color of text lines" +msgstr "Color de fondo de líneas alternativas." + +#: src/lang.c:2205 +msgid "" +"# Color of text lines\n" +"# Default: -1 (default color)\n" +msgstr "" + +#: src/lang.c:2211 +msgid "Color of mini help menu" +msgstr "" + +#: src/lang.c:2212 +msgid "" +"# Color of mini help menu\n" +"# Default: 3 (brown)\n" +msgstr "" + +#: src/lang.c:2218 +#, fuzzy +msgid "Color of help text" +msgstr "Color de texto común." + +#: src/lang.c:2219 +msgid "" +"# Color of help pages\n" +"# Default: -1 (default color)\n" +msgstr "" + +#: src/lang.c:2225 +#, fuzzy +msgid "Color of status messages" +msgstr "Estado" + +#: src/lang.c:2226 +msgid "" +"# Color of messages in last line\n" +"# Default: 6 (cyan)\n" +msgstr "" + +#: src/lang.c:2232 +#, fuzzy +msgid "Color of quoted lines" +msgstr "Rellenar todas las líneas de una transacción con el mismo color" + +#: src/lang.c:2233 +msgid "" +"# Color of quote-lines\n" +"# Default: 2 (green)\n" +msgstr "" + +#: src/lang.c:2239 +msgid "Color of twice quoted line" +msgstr "" + +#: src/lang.c:2240 +msgid "" +"# Color of twice quoted lines\n" +"# Default: 3 (brown)\n" +msgstr "" + +#: src/lang.c:2246 +msgid "Color of =>3 times quoted line" +msgstr "" + +#: src/lang.c:2247 +msgid "" +"# Color of >=3 times quoted lines\n" +"# Default: 4 (blue)\n" +msgstr "" + +#: src/lang.c:2253 +#, fuzzy +msgid "Color of article header lines" +msgstr "lengüeta-cabecera-borde-color" + +#: src/lang.c:2254 +msgid "" +"# Color of header-lines\n" +"# Default: 2 (green)\n" +msgstr "" + +#: src/lang.c:2260 +msgid "Color of actual news header fields" +msgstr "" + +#: src/lang.c:2261 +msgid "" +"# Color of actual news header fields\n" +"# Default: 9 (light red)\n" +msgstr "" + +#: src/lang.c:2267 +#, fuzzy +msgid "Color of article subject lines" +msgstr "Rellenar todas las líneas de una transacción con el mismo color" + +#: src/lang.c:2268 +msgid "" +"# Color of article subject\n" +"# Default: 6 (cyan)\n" +msgstr "" + +#: src/lang.c:2274 +#, fuzzy +msgid "Color of external quotes" +msgstr "Color" + +#: src/lang.c:2275 +msgid "" +"# Color of quoted text from external sources\n" +"# Default: 5 (pink)\n" +msgstr "" + +#: src/lang.c:2281 +#, fuzzy +msgid "Color of response counter" +msgstr "Color" + +#: src/lang.c:2282 +msgid "" +"# Color of response counter\n" +"# Default: 2 (green)\n" +msgstr "" + +#: src/lang.c:2288 +#, fuzzy +msgid "Color of sender (From:)" +msgstr "" + +#: src/lang.c:2289 +msgid "" +"# Color of sender (From:)\n" +"# Default: 2 (green)\n" +msgstr "" + +#: src/lang.c:2295 +msgid "Color of help/mail sign" +msgstr "" + +#: src/lang.c:2296 +msgid "" +"# Color of Help/Mail-Sign\n" +"# Default: 4 (blue)\n" +msgstr "" + +#: src/lang.c:2302 +#, fuzzy +msgid "Color of signatures" +msgstr "Color" + +#: src/lang.c:2303 +msgid "" +"# Color of signature\n" +"# Default: 4 (blue)\n" +msgstr "" + +#: src/lang.c:2309 +#, fuzzy +msgid "Color of highlighted URLs" +msgstr "Color" + +#: src/lang.c:2310 +msgid "" +"# Color of highlighted URLs\n" +"# Default: -1 (default color)\n" +msgstr "" + +#: src/lang.c:2316 +#, fuzzy +msgid "Color of verbatim blocks" +msgstr "Bloques" + +#: src/lang.c:2317 +msgid "" +"# Color of verbatim blocks\n" +"# Default: 5 (pink)\n" +msgstr "" + +#: src/lang.c:2323 +#, fuzzy +msgid "Color of highlighting with *stars*" +msgstr "color incorrecto " + +#: src/lang.c:2324 +msgid "" +"# Color of word highlighting with *stars*\n" +"# Default: 11 (yellow)\n" +msgstr "" + +#: src/lang.c:2330 +#, fuzzy +msgid "Color of highlighting with _dash_" +msgstr "Guión" + +#: src/lang.c:2331 +msgid "" +"# Color of word highlighting with _dash_\n" +"# Default: 13 (light pink)\n" +msgstr "" + +#: src/lang.c:2337 +#, fuzzy +msgid "Color of highlighting with /slash/" +msgstr "color incorrecto " + +#: src/lang.c:2338 +msgid "" +"# Color of word highlighting with /slash/\n" +"# Default: 14 (light cyan)\n" +msgstr "" + +#: src/lang.c:2344 +#, fuzzy +msgid "Color of highlighting with -stroke-" +msgstr "Color Verdadero" + +#: src/lang.c:2345 +msgid "" +"# Color of word highlighting with -stroke-\n" +"# Default: 12 (light blue)\n" +msgstr "" + +#: src/lang.c:2352 +msgid "Attr. of highlighting with *stars*" +msgstr "" + +#: src/lang.c:2353 +msgid "" +"# Attributes of word highlighting on mono terminals\n" +"# Possible values are:\n" +"# 0 = Normal\n" +"# 1 = Underline\n" +"# 2 = Best highlighting\n" +"# 3 = Reverse video\n" +"# 4 = Blinking\n" +"# 5 = Half bright\n" +"# 6 = Bold\n" +"\n" +"# Attribute of word highlighting with *stars*\n" +"# Default: 6 (bold)\n" +msgstr "" + +#: src/lang.c:2368 +#, fuzzy +msgid "Attr. of highlighting with _dash_" +msgstr "Guión" + +#: src/lang.c:2369 +msgid "" +"# Attribute of word highlighting with _dash_\n" +"# Default: 2 (best highlighting)\n" +msgstr "" + +#: src/lang.c:2375 +msgid "Attr. of highlighting with /slash/" +msgstr "" + +#: src/lang.c:2376 +msgid "" +"# Attribute of word highlighting with /slash/\n" +"# Default: 5 (half bright)\n" +msgstr "" + +#: src/lang.c:2382 +msgid "Attr. of highlighting with -stroke-" +msgstr "" + +#: src/lang.c:2383 +msgid "" +"# Attribute of word highlighting with -stroke-\n" +"# Default: 3 (reverse video)\n" +msgstr "" + +#: src/lang.c:2389 +#, fuzzy +msgid "URL highlighting in message body" +msgstr "Titulo y Cuerpo de Mensaje necesarios" + +#: src/lang.c:2390 +#, fuzzy +msgid "# Enable URL highlighting?\n" +msgstr "Activar" + +#: src/lang.c:2395 +#, fuzzy +msgid "Word highlighting in message body" +msgstr "Titulo y Cuerpo de Mensaje necesarios" + +#: src/lang.c:2396 +#, fuzzy +msgid "# Enable word highlighting?\n" +msgstr "Activar" + +#: src/lang.c:2401 +#, fuzzy +msgid "What to display instead of mark" +msgstr "Enseña un marcaje por cada punto de datos." + +#: src/lang.c:2402 +msgid "" +"# Should the leading and ending stars and dashes also be displayed,\n" +"# even when they are highlighting marks?\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = no\n" +"# 1 = yes, display mark\n" +"# * 2 = print a space instead\n" +msgstr "" + +#: src/lang.c:2411 +msgid "Enter column number to wrap article lines to in the pager. sets." +msgstr "" + +#: src/lang.c:2412 +#, fuzzy +msgid "Page line wrap column" +msgstr "LÃNEA o COLUMNA" + +#: src/lang.c:2413 +msgid "# Wrap article lines at column\n" +msgstr "" + +#: src/lang.c:2418 +msgid "Wrap around threads on next unread" +msgstr "" + +#: src/lang.c:2419 +msgid "# If ON wrap around threads on searching next unread article\n" +msgstr "" + +#: src/lang.c:2423 +msgid "Enter default mail address (and fullname). sets." +msgstr "" + +#: src/lang.c:2424 src/lang.c:2939 +#, fuzzy +msgid "Mail address (and fullname)" +msgstr "Dirección personal para correo" + +#: src/lang.c:2425 +msgid "# User's mail address (and fullname), if not username@host (fullname)\n" +msgstr "" + +#: src/lang.c:2430 +msgid "Show empty Followup-To in editor" +msgstr "" + +#: src/lang.c:2431 +msgid "# If ON show empty Followup-To header when editing an article\n" +msgstr "" + +#: src/lang.c:2435 +msgid "" +"Enter path/! command/--none to create your default signature. sets." +msgstr "" + +#: src/lang.c:2436 +msgid "Create signature from path/command" +msgstr "" + +#: src/lang.c:2437 +#, c-format +msgid "" +"# Signature path (random sigs)/file to be used when posting/replying\n" +"# sigfile=file appends file as signature\n" +"# sigfile=!command executes external command to generate a signature\n" +"# (specify %G to pass name of current newsgroup)\n" +"# sigfile=--none don't append a signature\n" +msgstr "" + +#: src/lang.c:2445 +msgid "" +"Prepend signature with \"-- \" on own line. toggles & sets." +msgstr "" + +#: src/lang.c:2446 +#, fuzzy +msgid "Prepend signature with \"-- \"" +msgstr " firma: " + +#: src/lang.c:2447 +msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" +msgstr "" + +#: src/lang.c:2451 +msgid "Add signature when reposting articles. toggles & sets." +msgstr "" + +#: src/lang.c:2452 +msgid "Add signature when reposting" +msgstr "" + +#: src/lang.c:2453 +msgid "# If ON add signature to reposted articles\n" +msgstr "" + +#: src/lang.c:2457 +#, c-format +msgid "Enter quotation marks, %s or %S for author's initials." +msgstr "" + +#: src/lang.c:2458 +msgid "Characters used as quote-marks" +msgstr "" + +#: src/lang.c:2459 +#, c-format +msgid "" +"# Characters used in quoting to followups and replies.\n" +"# '_' is replaced by ' ', %s, %S are replaced by author's initials.\n" +msgstr "" + +#: src/lang.c:2465 +#, fuzzy +msgid "Quoting behavior" +msgstr "error en cita de parámetros" + +#: src/lang.c:2466 +msgid "" +"# How quoting should be handled when following up or replying.\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = Nothing special\n" +"# 1 = Compress quotes\n" +"# 2 = Quote signatures\n" +"# 3 = Compress quotes, quote signatures\n" +"# 4 = Quote empty lines\n" +"# * 5 = Compress quotes, quote empty lines\n" +"# 6 = Quote signatures, quote empty lines\n" +"# 7 = Compress quotes, quote signatures, quote empty lines\n" +msgstr "" + +#: src/lang.c:2479 src/lang.c:2487 src/lang.c:2493 +msgid "" +"%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" +msgstr "" + +#: src/lang.c:2480 +msgid "Quote line when following up" +msgstr "" + +#: src/lang.c:2481 +msgid "" +"# Format of quote line when mailing/posting/following-up an article\n" +"# %A Address %D Date %F Addr+Name %G Groupname %M Message-ID\n" +"# %N Full Name %C First Name %I Initials\n" +msgstr "" + +#: src/lang.c:2488 +msgid "Quote line when cross-posting" +msgstr "" + +#: src/lang.c:2494 +msgid "Quote line when mailing" +msgstr "" + +#: src/lang.c:2499 +msgid "If ON, include User-Agent: header. toggles & sets." +msgstr "" + +#: src/lang.c:2500 +#, fuzzy +msgid "Insert 'User-Agent:' header" +msgstr "Envía cabecera User-Agent" + +#: src/lang.c:2501 +#, fuzzy +msgid "# If ON include advertising User-Agent: header\n" +msgstr "Envía cabecera User-Agent" + +#: src/lang.c:2506 +msgid "" +"Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." +msgstr "" + +#: src/lang.c:2507 +#, fuzzy +msgid "MM_CHARSET" +msgstr "Conjunto de caracteres:" + +#: src/lang.c:2508 +msgid "" +"# Charset supported locally which is also used for MIME header and\n" +"# Content-Type header.\n" +"# If not set, the value of the environment variable MM_CHARSET is used.\n" +"# Set to US-ASCII or compile time default if neither of them is defined.\n" +"# If MIME_STRICT_CHARSET is defined at compile-time, charset other than\n" +"# mm_charset is considered not displayable and represented as '?'.\n" +msgstr "" + +#: src/lang.c:2518 +#, fuzzy +msgid "MM_NETWORK_CHARSET" +msgstr "Conjunto de caracteres:" + +#: src/lang.c:2519 +msgid "# Charset used for MIME (Content-Type) header in postings.\n" +msgstr "" + +#: src/lang.c:2523 +msgid "" +"Enter local charset name (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." +msgstr "" + +#: src/lang.c:2524 +#, fuzzy +msgid "MM_LOCAL_CHARSET" +msgstr "Conjunto de caracteres:" + +#: src/lang.c:2525 +#, fuzzy +msgid "# Charset supported locally.\n" +msgstr "Conjunto de caracteres:" + +#: src/lang.c:2532 +#, fuzzy +msgid "Mailbox format" +msgstr "_Buzón:" + +#: src/lang.c:2533 +#, fuzzy +msgid "# Format of the mailbox.\n" +msgstr "_Buzón:" + +#: src/lang.c:2538 +msgid "MIME encoding in news messages" +msgstr "" + +#: src/lang.c:2539 +msgid "" +"# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n" +"# for mails and posts, if necessary. QP is efficient for most European\n" +"# character sets (ISO-8859-X) with small fraction of non-US-ASCII chars,\n" +"# while Base64 is more efficient for most 8bit East Asian, Greek, and\n" +"# Russian charsets with a lot of 8bit characters.\n" +msgstr "" + +#: src/lang.c:2547 src/lang.c:2568 +msgid "Don't change unless you know what you are doing. cancels." +msgstr "" + +#: src/lang.c:2548 +msgid "Use 8bit characters in news headers" +msgstr "" + +#: src/lang.c:2549 +msgid "" +"# If ON, 8bit characters in news headers are NOT encoded.\n" +"# default is OFF. Thus 8bit characters are encoded by default.\n" +"# 8bit chars in header are encoded regardless of the value of this\n" +"# parameter unless post_mime_encoding is 8bit as well.\n" +msgstr "" + +#: src/lang.c:2556 +msgid "" +"Auto-view post-processed files toggles, sets, cancels." +msgstr "" + +#: src/lang.c:2557 +#, fuzzy +msgid "View post-processed files" +msgstr "Ver todos los Ficheros del Proyecto" + +#: src/lang.c:2558 +msgid "# If set, post processed files will be opened in a viewer\n" +msgstr "" + +#: src/lang.c:2563 +#, fuzzy +msgid "MIME encoding in mail messages" +msgstr "[La codificación de «%s» de este correo no puede ser descodificado]" + +#: src/lang.c:2569 +msgid "Use 8bit characters in mail headers" +msgstr "" + +#: src/lang.c:2570 +msgid "" +"# If ON, 8bit characters in mail headers are NOT encoded.\n" +"# default is OFF. Thus 8bit characters are encoded by default.\n" +"# 8bit chars in headers are encoded regardless of the value of this " +"parameter\n" +"# unless mail_mime_encoding is 8bit as well. Note that RFC 2822\n" +"# prohibits 8bit characters in mail headers so that you are advised NOT to\n" +"# turn it ON unless you have some compelling reason.\n" +msgstr "" + +#: src/lang.c:2581 +msgid "Strip blanks from ends of lines" +msgstr "" + +#: src/lang.c:2582 +msgid "" +"# If ON strip blanks from ends of lines for faster display on slow " +"terminals.\n" +msgstr "" + +#: src/lang.c:2588 +msgid "If ON, use transliteration. toggles & sets." +msgstr "" + +#: src/lang.c:2589 +msgid "Transliteration" +msgstr "" + +#: src/lang.c:2590 +msgid "" +"# If ON, use //TRANSLIT extension. This means that when a character cannot\n" +"# be represented in the in the target character set, it can be approximated\n" +"# through one or several similarly looking characters.\n" +msgstr "" + +#: src/lang.c:2598 +msgid "Send you a Cc/Bcc automatically" +msgstr "" + +#: src/lang.c:2599 +msgid "" +"# Put your name in the Cc: and/or Bcc: field when mailing an article.\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = No\n" +"# 1 = Cc\n" +"# 2 = Bcc\n" +"# 3 = Cc and Bcc\n" +msgstr "" + +#: src/lang.c:2610 +msgid "Hash algorithm for Cancel-Lock/Cancel-Key" +msgstr "" + +#: src/lang.c:2611 +msgid "" +"# Hash algorithm for Cancel-Lock/Cancel-Key (default 'sha1')\n" +"# Use 'none' to not generate Cancel-Lock headers.\n" +msgstr "" + +#: src/lang.c:2617 +msgid "Enter address elements about which you want to be warned. sets." +msgstr "" + +#: src/lang.c:2618 +msgid "Spamtrap warning address parts" +msgstr "" + +#: src/lang.c:2619 +msgid "" +"# A comma-delimited list of address-parts you want to be warned\n" +"# about when trying to reply by email.\n" +msgstr "" + +#: src/lang.c:2624 +msgid "Enter default number of days a filter entry will be valid. sets." +msgstr "" + +#: src/lang.c:2625 +msgid "No. of days a filter entry is valid" +msgstr "" + +#: src/lang.c:2626 +msgid "# Number of days a short term filter will be active\n" +msgstr "" + +#: src/lang.c:2630 +msgid "Add posted articles to filter. toggles & sets." +msgstr "" + +#: src/lang.c:2631 +msgid "Add posted articles to filter" +msgstr "" + +#: src/lang.c:2632 +msgid "" +"# If ON add posted articles which start a new thread to filter for\n" +"# highlighting follow-ups\n" +msgstr "" + +#: src/lang.c:2636 +msgid "The directory where articles/threads are to be saved in mailbox format." +msgstr "" + +#: src/lang.c:2637 +#, fuzzy +msgid "Mail directory" +msgstr "No se puede abrir el directorio de correo nuevo (%s)" + +#: src/lang.c:2638 +msgid "# (-m) directory where articles/threads are saved in mailbox format\n" +msgstr "" + +#: src/lang.c:2643 +msgid "Save articles in batch mode (-S)" +msgstr "" + +#: src/lang.c:2644 +msgid "" +"# If ON articles/threads will be saved in batch mode when save -S\n" +"# or mail (-M/-N) is specified on the command line\n" +msgstr "" + +#: src/lang.c:2649 +msgid "The directory where you want articles/threads saved." +msgstr "" + +#: src/lang.c:2650 +#, fuzzy +msgid "Directory to save arts/threads in" +msgstr "no puede guardar el directorio actual: %s" + +#: src/lang.c:2651 +msgid "# Directory where articles/threads are saved\n" +msgstr "" + +#: src/lang.c:2655 +msgid "" +"Auto save article/thread by Archive-name: header. toggles & " +"sets." +msgstr "" + +#: src/lang.c:2656 +#, fuzzy +msgid "Use Archive-name: header for save" +msgstr "%s: archivo de nombre de encabezado mal formado en %zu" + +#: src/lang.c:2657 +msgid "" +"# If ON articles/threads with Archive-name: in mail header will\n" +"# be automatically saved with the Archive-name & part/patch no.\n" +msgstr "" + +#: src/lang.c:2662 +msgid "" +"Mark saved articles/threads as read. toggles, sets, " +"cancels." +msgstr "" + +#: src/lang.c:2663 +msgid "Mark saved articles/threads as read" +msgstr "" + +#: src/lang.c:2664 +#, fuzzy +msgid "# If ON mark articles that are saved as read\n" +msgstr "Marca buzones leídos" + +#: src/lang.c:2668 +msgid "Do post processing (eg. extract attachments) for saved articles." +msgstr "" + +#: src/lang.c:2669 +msgid "Post process saved articles" +msgstr "" + +#: src/lang.c:2670 +msgid "" +"# Perform post processing (saving binary attachments) from saved articles.\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = no\n" +"# 1 = extract shell archives (shar) only\n" +"# 2 = yes\n" +msgstr "" + +#: src/lang.c:2679 +#, fuzzy +msgid "Process only unread articles" +msgstr "Procesa solo ficheros nuevos" + +#: src/lang.c:2680 +msgid "" +"# If ON only save/print/pipe/mail unread articles (tagged articles " +"excepted)\n" +msgstr "" + +#: src/lang.c:2685 +msgid "Print all or just part of header. toggles & sets." +msgstr "" + +#: src/lang.c:2686 +msgid "Print all headers when printing" +msgstr "" + +#: src/lang.c:2687 +msgid "" +"# If ON print all of article header otherwise just the important lines\n" +msgstr "" + +#: src/lang.c:2691 +msgid "" +"The printer program with options that is to be used to print articles/" +"threads." +msgstr "" + +#: src/lang.c:2692 +#, fuzzy +msgid "Printer program with options" +msgstr "Modo de empleo: %s [opciones] PROGRAMA [parámetro ...]" + +#: src/lang.c:2693 +msgid "# Print program with parameters used to print articles/threads\n" +msgstr "" + +#: src/lang.c:2699 +msgid "Force redraw after certain commands" +msgstr "" + +#: src/lang.c:2700 +msgid "" +"# If ON a screen redraw will always be done after certain external commands\n" +msgstr "" + +#: src/lang.c:2704 +msgid "" +"Start editor with line offset. toggles, sets, cancels." +msgstr "" + +#: src/lang.c:2705 +#, fuzzy +msgid "Start editor with line offset" +msgstr " Recursos inician en desplazamiento: %#03x\n" + +#: src/lang.c:2706 +msgid "" +"# If ON editor will be started with cursor offset into the file\n" +"# otherwise the cursor will be positioned at the first line\n" +msgstr "" + +#: src/lang.c:2711 +msgid "Enter %E for editor, %F for filename, %N for line-number, to set." +msgstr "" + +#: src/lang.c:2712 +#, fuzzy +msgid "Invocation of your editor" +msgstr "Editor" + +#: src/lang.c:2713 +msgid "" +"# Format of editor line including parameters\n" +"# %E Editor %F Filename %N Linenumber\n" +msgstr "" + +#: src/lang.c:2718 +msgid "" +"Enter name and options for external-inews, --internal for internal inews" +msgstr "" + +#: src/lang.c:2719 +#, fuzzy +msgid "External inews" +msgstr "¿Externo…?" + +#: src/lang.c:2720 +msgid "" +"# If --internal use the built in mini inews for posting via NNTP\n" +"# otherwise use an external inews program\n" +msgstr "" + +#: src/lang.c:2724 +msgid "" +"Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." +msgstr "" + +#: src/lang.c:2725 +#, fuzzy +msgid "Invocation of your mail command" +msgstr "Su contraseña en el servidor de correo" + +#: src/lang.c:2726 +msgid "" +"# Format of mailer line including parameters\n" +"# %M Mailer %S Subject %T To %F Filename\n" +"# ie. to use elm as your mailer: elm -s \"%S\" \"%T\" < %F\n" +"# ie. elm interactive : elm -i %F -s \"%S\" \"%T\"\n" +msgstr "" + +#: src/lang.c:2734 +msgid "Use interactive mail reader" +msgstr "" + +#: src/lang.c:2735 +msgid "" +"# Interactive mailreader\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = no interactive mailreader\n" +"# 1 = use interactive mailreader with headers in file\n" +"# 2 = use interactive mailreader without headers in file\n" +msgstr "" + +#: src/lang.c:2744 +msgid "Remove ~/.article after posting" +msgstr "" + +#: src/lang.c:2745 +msgid "# If ON remove ~/.article after posting.\n" +msgstr "" + +#: src/lang.c:2751 +msgid "Use UTF-8 graphics (thread tree etc.)" +msgstr "" + +#: src/lang.c:2752 +msgid "" +"# If ON use UTF-8 characters for indicator '->', tree and ellipsis '...'.\n" +msgstr "" + +#: src/lang.c:2757 +msgid "Filename for all posted articles, sets, no filename=do not save." +msgstr "" + +#: src/lang.c:2758 +#, fuzzy +msgid "Filename for posted articles" +msgstr "" +"\n" +"Ningún artículo dentro de este grupo.\n" + +#: src/lang.c:2759 +msgid "" +"# Filename where to keep all postings (default posted)\n" +"# If no filename is set then postings will not be saved\n" +msgstr "" + +#: src/lang.c:2764 +msgid "" +"Keep all failed articles in ~/dead.articles. toggles & sets." +msgstr "" + +#: src/lang.c:2765 +msgid "Keep failed arts in ~/dead.articles" +msgstr "" + +#: src/lang.c:2766 +msgid "# If ON keep all failed postings in ~/dead.articles\n" +msgstr "" + +#: src/lang.c:2770 +msgid "Do you want to strip unsubscribed groups from .newsrc" +msgstr "" + +#: src/lang.c:2771 +#, fuzzy +msgid "No unsubscribed groups in newsrc" +msgstr "GRUPOS" + +#: src/lang.c:2772 +msgid "# If ON strip unsubscribed groups from newsrc\n" +msgstr "" + +#: src/lang.c:2777 +msgid "Remove bogus groups from newsrc" +msgstr "" + +#: src/lang.c:2778 +msgid "" +"# What to do with bogus groups in newsrc file\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = keep\n" +"# 1 = remove\n" +"# 2 = highlight with D on selection screen\n" +msgstr "" + +#: src/lang.c:2787 +msgid "" +"Enter number of seconds to wait for a response from the server. sets." +msgstr "" + +#: src/lang.c:2788 +#, fuzzy +msgid "NNTP read timeout in seconds" +msgstr "tiempo agotado después de %d segundos.\n" + +#: src/lang.c:2789 +msgid "" +"# Time in seconds to wait for a response from the server (0=no timeout)\n" +msgstr "" + +#: src/lang.c:2794 +msgid "Enter number of seconds until active file will be reread. sets." +msgstr "" + +#: src/lang.c:2795 +msgid "Interval in secs to reread active" +msgstr "" + +#: src/lang.c:2796 +msgid "" +"# Time interval in seconds between rereading the active file (0=never)\n" +msgstr "" + +#: src/lang.c:2801 +#, fuzzy +msgid "Reconnect to server automatically" +msgstr "Crear automáticamente" + +#: src/lang.c:2802 +msgid "" +"# If ON automatically reconnect to NNTP server if the connection is broken\n" +msgstr "" + +#: src/lang.c:2806 +msgid "" +"Create local copies of NNTP overview files. toggles & sets." +msgstr "" + +#: src/lang.c:2807 +msgid "Cache NNTP overview files locally" +msgstr "" + +#: src/lang.c:2808 +msgid "# If ON, create local copies of NNTP overview files.\n" +msgstr "" + +#: src/lang.c:2812 src/lang.c:2827 src/lang.c:2847 src/lang.c:2866 +msgid "Enter format string. sets, cancels." +msgstr "" + +#: src/lang.c:2813 +#, fuzzy +msgid "Format string for selection level" +msgstr "error: %s al final de la cadena de formato" + +#: src/lang.c:2814 +msgid "" +"# Format string for selection level representation\n" +"# Default: %f %n %U %G %d\n" +"# Possible values are:\n" +"# %% '%'\n" +"# %d Description\n" +"# %f Newsgroup flag: 'D' bogus, 'X' not postable,\n" +"# 'M' moderated, '=' renamed, 'N' new, 'u' unsubscribed\n" +"# %G Group name\n" +"# %n Number, linenumber on screen\n" +"# %U Unread count\n" +msgstr "" + +#: src/lang.c:2828 +#, fuzzy +msgid "Format string for group level" +msgstr "grupo: cadena de texto" + +#: src/lang.c:2829 +msgid "" +"# Format string for group level representation\n" +"# Default: %n %m %R %L %s %F\n" +"# Possible values are:\n" +"# %% '%'\n" +"# %D Date, like date_format\n" +"# %(formatstr)D Date, formatstr gets passed to my_strftime()\n" +"# %F From, name and/or address according to show_author\n" +"# %I Initials\n" +"# %L Line count\n" +"# %M Message-ID\n" +"# %m Article marks\n" +"# %n Number, linenumber on screen\n" +"# %R Count, number of responses in thread\n" +"# %s Subject (only group level)\n" +"# %S Score\n" +msgstr "" + +#: src/lang.c:2848 +#, fuzzy +msgid "Format string for thread level" +msgstr "error: %s al final de la cadena de formato" + +#: src/lang.c:2849 +msgid "" +"# Format string for thread level representation\n" +"# Default: %n %m [%L] %T %F\n" +"# Possible values are:\n" +"# %% '%'\n" +"# %D Date, like date_format\n" +"# %(formatstr)D Date, formatstr gets passed to my_strftime()\n" +"# %F From, name and/or address according to show_author\n" +"# %I Initials\n" +"# %L Line count\n" +"# %M Message-ID\n" +"# %m Article marks\n" +"# %n Number, linenumber on screen\n" +"# %S Score\n" +"# %T Thread tree (only thread level)\n" +msgstr "" + +#: src/lang.c:2867 +#, fuzzy +msgid "Format string for display of dates" +msgstr "El formato de muestra para las vistas de paquetes" + +#: src/lang.c:2868 +#, fuzzy +msgid "# Format string for date representation\n" +msgstr "" +"Fallado al construir la representación de la cadena del rango de datos\n" + +#: src/lang.c:2878 +#, fuzzy +msgid "Unicode normalization form" +msgstr "Con normalización Unicode.\n" + +#: src/lang.c:2879 +msgid "" +"# Unicode normalization form\n" +"# Possible values are:\n" +"# 0 = None\n" +"# 1 = NFKC\n" +"# 2 = NFKD\n" +"# 3 = NFC\n" +"# 4 = NFD\n" +"# 5 = NFKC_CF\n" +msgstr "" + +#: src/lang.c:2893 +msgid "Render BiDi" +msgstr "" + +#: src/lang.c:2894 +msgid "# If ON, bi-directional text is rendered by tin\n" +msgstr "" + +#: src/lang.c:2901 +#, fuzzy +msgid "Function for sorting articles" +msgstr "" +"\n" +"Ningún artículo dentro de este grupo.\n" + +#: src/lang.c:2902 +msgid "" +"# Function for sorting articles\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = qsort\n" +"# 1 = heapsort\n" +msgstr "" + +#: src/lang.c:2915 +#, fuzzy +msgid "Automatically GroupMarkUnselArtRead" +msgstr "(rellenado automáticamente)" + +#: src/lang.c:2921 +#, fuzzy +msgid "Delete post-process files" +msgstr "Procesa solo ficheros nuevos" + +#: src/lang.c:2926 +msgid "Filename for all mailed articles, sets, no filename=do not save." +msgstr "" + +#: src/lang.c:2927 +msgid "Mailbox to save sent mails" +msgstr "" + +#: src/lang.c:2932 +msgid "Set Followup-To: header to this group(s). sets, cancels." +msgstr "" + +#: src/lang.c:2933 +#, fuzzy +msgid "Followup-To: header" +msgstr "Cabecera " + +#: src/lang.c:2938 +msgid "Enter default mail address (and fullname). sets, cancels." +msgstr "" + +#: src/lang.c:2945 +msgid "" +"Path and options for ispell-like spell-checker. sets, cancels." +msgstr "" + +#: src/lang.c:2946 +#, fuzzy +msgid "Ispell program" +msgstr "Programa" + +#: src/lang.c:2952 +msgid "When group is a mailing list, send responses to this email address." +msgstr "" + +#: src/lang.c:2953 +#, fuzzy +msgid "Mailing list address" +msgstr "Listados de Correo" + +#: src/lang.c:2959 +#, fuzzy +msgid "Forward articles as attachment" +msgstr "Reproducir" + +#: src/lang.c:2964 +msgid "" +"A comma separated list of MIME major/minor Content-Types. cancels." +msgstr "" + +#: src/lang.c:2965 +msgid "Which MIME types will be saved" +msgstr "" + +#: src/lang.c:2970 +msgid "Value of the Organization: header. sets, cancels." +msgstr "" + +#: src/lang.c:2971 +#, fuzzy +msgid "Organization: header" +msgstr "Organización" + +#: src/lang.c:2976 +msgid "Filename for saved articles. sets, cancels." +msgstr "" + +#: src/lang.c:2977 +msgid "savefile" +msgstr "" + +#: src/lang.c:2982 src/lang.c:3006 +msgid "Scope for the filter rule. sets, cancels." +msgstr "" + +#: src/lang.c:2983 +msgid "Quick (1 key) select filter scope" +msgstr "" + +#: src/lang.c:2988 src/lang.c:3012 +msgid "Header for filter rule. sets, cancels." +msgstr "" + +#: src/lang.c:2989 +msgid "Quick (1 key) select filter header" +msgstr "" + +#: src/lang.c:2994 src/lang.c:3018 +msgid "ON = case sensitive, OFF = ignore case. sets, cancels." +msgstr "" + +#: src/lang.c:2995 +msgid "Quick (1 key) select filter case" +msgstr "" + +#: src/lang.c:3000 src/lang.c:3024 +msgid "ON = expire, OFF = don't ever expire. sets, cancels." +msgstr "" + +#: src/lang.c:3001 +msgid "Quick (1 key) select filter expire" +msgstr "" + +#: src/lang.c:3007 +msgid "Quick (1 key) kill filter scope" +msgstr "" + +#: src/lang.c:3013 +msgid "Quick (1 key) kill filter header" +msgstr "" + +#: src/lang.c:3019 +msgid "Quick (1 key) kill filter case" +msgstr "" + +#: src/lang.c:3025 +msgid "Quick (1 key) kill filter expire" +msgstr "" + +#: src/lang.c:3031 +msgid "Assume this charset if no charset declaration is present, to set." +msgstr "" + +#: src/lang.c:3032 +#, fuzzy +msgid "UNDECLARED_CHARSET" +msgstr "Conjunto de caracteres:" + +#: src/lang.c:3038 +msgid "" +"Add this text at the start of the message body. sets, cancels." +msgstr "" + +#: src/lang.c:3039 +#, fuzzy +msgid "X_Body" +msgstr "Cuerpo" + +#: src/lang.c:3044 +msgid "Insert this header when posting. sets, cancels." +msgstr "" + +#: src/lang.c:3045 +#, fuzzy +msgid "X_Headers" +msgstr "" +" -a, --archive-headers Enseña información del encabezado del archivo\n" +" -f, --file-headers Enseña el contenido de todos los encabezados del\n" +" fichero\n" +" -P, --private=OPC,OPC... Enseña contenidos específicos del formato objeto\n" +" -h, --[section-]headers Enseña el contenido de los encabezados de " +"sección\n" +" -x, --all-headers Enseña el contenido de todos los encabezados\n" +" -d, --disassemble Enseña el contenido de ensamblador de las " +"secciones\n" +" ejecutables\n" +" -D, --disassemble-all Enseña el contenido de ensamblador de todas las\n" +" secciones\n" +" -S, --source Entremezcla código fuente con el desensamblado\n" +" -s, --full-contents Enseña el contenido completo de todas las " +"secciones\n" +" solicitadas\n" +" -g, --debugging Enseña la información de depuración en el " +"fichero\n" +" objeto\n" +" -e, --debugging-tags Enseña la información de depuración en estilo " +"ctags\n" +" -G, --stabs Enseña (sin formato) cualquier información de " +"STABS\n" +" en el fichero\n" +" -W[lLiaprmfFsoRt] o\n" +" --dwarf[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro," +"=frames,\n" +" =frames-interp,=str,=loc,=Ranges,=pubtypes,\n" +" =gdb_index,=trace_info,=trace_abbrev,=trace_aranges,\n" +" =addr,=cu_index,=links,=follow-links]\n" +" Enseña la información DWARF dentro del fichero\n" +" -t, --syms Enseña el contenido de la(s) tabla(s) simbólica\n" +" -T, --dynamic-syms Enseña el contenido dinámico del segmento " +"simbólico\n" +" -r, --reloc Enseña las entradas de reubicación en el fichero\n" +" -R, --dynamic-reloc Enseña las entradas de reubicación dinámica en el " +"fichero\n" +" @ Lee opciones del \n" +" -v, --version Muestra el número de versión de este programa\n" +" -i, --info Lista los formatos objeto y las arquitecturas\n" +" admitidos\n" +" -H, --help Enseña esta información\n" + +#: src/lang.c:3050 +msgid "" +"Automatically insert an X-Comment-To: header? toggles & sets." +msgstr "" + +#: src/lang.c:3051 +#, fuzzy +msgid "Insert 'X-Comment-To:' header" +msgstr " cabecera mágica = %x\n" + +#. TODO: lang.c +#: src/main.c:812 +#, fuzzy +msgid "reading from local spool" +msgstr "error leyendo desde `%s'" + +#: src/misc.c:3878 +#, c-format +msgid "Version: %s %s release %s (\"%s\") %s %s\n" +msgstr "" + +#: src/misc.c:3881 +#, fuzzy, c-format +msgid "Version: %s %s release %s (\"%s\")\n" +msgstr "Regresar a la última publicación(es)" + +#: src/newsrc.c:457 +#, fuzzy +msgid "Unreachable?\n" +msgstr "estado %s no alcanzable desde %s" + +#: src/nntplib.c:822 +#, c-format +msgid "" +"\n" +"Server timed out, trying reconnect # %d\n" +msgstr "" + +#: src/nntplib.c:849 +#, fuzzy +msgid "NNTP connection error. Exiting..." +msgstr "Error película capturada... Terminando." + +#: src/nntplib.c:861 src/nntplib.c:1852 +#, fuzzy +msgid "Rejoin current group\n" +msgstr "Grupo" + +#: src/nntplib.c:869 src/nntplib.c:1860 +#, fuzzy, c-format +msgid "Read (%s)\n" +msgstr "%s: leído: %s" + +#: src/nntplib.c:871 +#, fuzzy, c-format +msgid "Resend last command (%s)\n" +msgstr "última orden: %s\n" + +#: src/nntplib.c:1500 +msgid "CAPABILITIES did not announce READER" +msgstr "" + +#: src/nntplib.c:2006 +msgid "MOTD: " +msgstr "" + +#: src/nrctbl.c:175 +#, fuzzy, c-format +msgid "couldn't expand %s\n" +msgstr "Expandir" + +#: src/post.c:1341 +#, c-format +msgid "" +"Line %d is longer than %d octets and should be folded, but\n" +"encoding is neither set to %s nor to %s\n" +msgstr "" + +#: src/post.c:1346 +#, c-format +msgid "" +"Line %d is longer than %d octets and should be folded, but\n" +"encoding is set to %s without enabling MIME_BREAK_LONG_LINES or\n" +"posting doesn't contain any 8bit chars and thus folding won't happen\n" +msgstr "" + +#: src/post.c:1348 +#, c-format +msgid "" +"Line %d is longer than %d octets and should be folded, but\n" +"encoding is not set to %s\n" +msgstr "" + +#: src/post.c:2322 +#, fuzzy, c-format +msgid "Posting: %.*s ..." +msgstr "Publicación Fallida" + +#. Check if okay to read +#: src/read.c:202 +#, fuzzy +msgid "Aborting read, please wait..." +msgstr "Enviando fichero por correo. Por favor espere..." + +#: src/read.c:349 +#, fuzzy +msgid "Aborted read\n" +msgstr "Lectura abortada." + +#: src/read.c:404 +msgid "Draining\n" +msgstr "" + +#: src/refs.c:233 +#, fuzzy +msgid "unchanged" +msgstr "" +"el fichero «$filename» no ha sido modificado, no debería ser incluido en la " +"modificación " + +#: src/refs.c:600 +#, fuzzy +msgid "[- Unavailable -]" +msgstr "NO DISPONIBLE" + +#. +#. * preamble +#. * TODO: -> lang.c +#. +#: src/rfc2047.c:1322 +#, c-format +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:1065 +msgid "bytes" +msgstr "bytes" + +#: src/select.c:408 +#, fuzzy +msgid "unread" +msgstr "*** Tiene correo no leído. ***" + +#: src/select.c:408 +msgid "all" +msgstr "todo" + +#: src/select.c:591 src/select.c:593 +#, fuzzy +msgid " R" +msgstr "«C»" + +#: src/xface.c:70 +msgid "Can't run slrnface: Not running in a xterm." +msgstr "" + +#: src/xface.c:82 src/xface.c:93 src/xface.c:108 +#, c-format +msgid "Can't run slrnface: Environment variable %s not found." +msgstr "" + +#: src/xface.c:117 src/xface.c:149 +#, c-format +msgid "Can't run slrnface: failed to create %s" +msgstr "" + +#: src/xface.c:127 +msgid "" +"This directory is used to create named pipes for communication between\n" +"slrnface and its parent process. It should normally be empty because\n" +"the pipe is deleted right after it has been opened by both processes.\n" +"\n" +"File names generated by slrnface have the form \"hostname.pid\". It is\n" +"probably an error if they linger here longer than a fraction of a second.\n" +"\n" +"However, if the directory is mounted from an NFS server, you might see\n" +"special files created by your NFS server while slrnface is running.\n" +"Do not try to remove them.\n" +msgstr "" + +#: src/xface.c:141 +msgid "Can't run slrnface: couldn't construct fifo name." +msgstr "" + +#: src/xface.c:180 +#, fuzzy, c-format +msgid "Slrnface abnormally exited, code %d." +msgstr "Programa terminado abnormalmente con valor de salida: %d\n" + +#: src/xface.c:227 +#, fuzzy, c-format +msgid "Slrnface failed: %s." +msgstr "fallado %s a «%s» (%s)" Binary files tin-2.4.2/po/et.gmo and tin-2.4.3/po/et.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.2/po/et.po tin-2.4.3/po/et.po --- tin-2.4.2/po/et.po 2017-12-08 09:39:45.000000000 +0100 +++ tin-2.4.3/po/et.po 2018-12-24 10:02:04.638956968 +0100 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: tin 2.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-08 09:39+0100\n" -"PO-Revision-Date: 2016-08-10 16:15+0300\n" +"POT-Creation-Date: 2018-12-24 10:02+0100\n" +"PO-Revision-Date: 2018-11-16 14:30+0100\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" "Language: et\n" @@ -15,11 +15,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/attrib.c:954 +#: src/attrib.c:964 msgid "Processing attributes... " msgstr "Töötlen atribuute... " -#: src/attrib.c:1176 +#: src/attrib.c:1186 #, c-format msgid "" "# Do not edit this comment block\n" @@ -28,399 +28,399 @@ msgstr "" "# Ärge seda kommentaari blokki muutke\n" "#\n" -#: src/attrib.c:1177 +#: src/attrib.c:1187 #, c-format msgid "# scope=STRING (eg. alt.*,!alt.bin*) [mandatory]\n" msgstr "# scope=SÕNE (n. alt.*,!alt.bin*) [kohustuslik]\n" -#: src/attrib.c:1178 +#: src/attrib.c:1188 #, c-format msgid "# add_posted_to_filter=ON/OFF\n" msgstr "# add_posted_to_filter=ON/OFF\n" -#: src/attrib.c:1179 +#: src/attrib.c:1189 #, c-format msgid "# advertising=ON/OFF\n" msgstr "# advertising=ON/OFF\n" -#: src/attrib.c:1180 +#: src/attrib.c:1190 #, c-format msgid "# alternative_handling=ON/OFF\n" msgstr "# alternative_handling=ON/OFF\n" -#: src/attrib.c:1181 +#: src/attrib.c:1191 #, c-format msgid "# ask_for_metamail=ON/OFF\n" msgstr "# ask_for_metamail=ON/OFF\n" -#: src/attrib.c:1182 +#: src/attrib.c:1192 #, c-format msgid "# auto_cc_bcc=NUM\n" msgstr "# auto_cc_bcc=NUM\n" -#: src/attrib.c:1183 +#: src/attrib.c:1193 #, c-format msgid "# 0=No, 1=Cc, 2=Bcc, 3=Cc and Bcc\n" msgstr "# 0=Ei pane, 1=Cc, 2=Bcc, 3=Cc ja Bcc\n" -#: src/attrib.c:1184 +#: src/attrib.c:1194 #, c-format msgid "# auto_list_thread=ON/OFF\n" msgstr "# auto_list_thread=ON/OFF\n" -#: src/attrib.c:1185 +#: src/attrib.c:1195 #, c-format msgid "# auto_save=ON/OFF\n" msgstr "# auto_save=ON/OFF\n" -#: src/attrib.c:1186 +#: src/attrib.c:1196 #, c-format msgid "# auto_select=ON/OFF\n" msgstr "# auto_select=ON/OFF\n" -#: src/attrib.c:1187 +#: src/attrib.c:1197 #, c-format msgid "# batch_save=ON/OFF\n" msgstr "# batch_save=ON/OFF\n" -#: src/attrib.c:1188 +#: src/attrib.c:1198 #, c-format msgid "# date_format=STRING (eg. %%a, %%d %%b %%Y %%H:%%M:%%S)\n" msgstr "# date_format=SÕNE (n. %%a, %%d %%b %%Y %%H:%%M:%%S)\n" -#: src/attrib.c:1189 +#: src/attrib.c:1199 #, c-format msgid "# delete_tmp_files=ON/OFF\n" msgstr "# delete_tmp_files=ON/OFF\n" -#: src/attrib.c:1190 +#: src/attrib.c:1200 #, c-format msgid "# editor_format=STRING (eg. %%E +%%N %%F)\n" msgstr "# editor_format=SÕNE (n. %%E +%%N %%F)\n" -#: src/attrib.c:1191 +#: src/attrib.c:1201 #, c-format msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "# fcc=SÕNE (n. =postkast)\n" -#: src/attrib.c:1192 +#: src/attrib.c:1202 #, c-format msgid "# followup_to=STRING\n" msgstr "# followup_to=SÕNE\n" -#: src/attrib.c:1193 +#: src/attrib.c:1203 #, c-format 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:1194 +#: src/attrib.c:1204 #, c-format msgid "# group_catchup_on_exit=ON/OFF\n" msgstr "# group_catchup_on_exit=ON/OFF\n" -#: src/attrib.c:1195 +#: src/attrib.c:1205 #, c-format msgid "# group_format=STRING (eg. %%n %%m %%R %%L %%s %%F)\n" msgstr "# group_format=SÕNE (nt. %%n %%m %%R %%L %%s %%F)\n" -#: src/attrib.c:1196 +#: src/attrib.c:1206 #, c-format msgid "# mail_8bit_header=ON/OFF\n" msgstr "# mail_8bit_header=ON/OFF\n" -#: src/attrib.c:1197 +#: src/attrib.c:1207 #, c-format msgid "# mail_mime_encoding=supported_encoding" msgstr "# mail_mime_encoding=toetatud_kodeering" -#: src/attrib.c:1205 +#: src/attrib.c:1215 #, c-format msgid "# ispell=STRING\n" msgstr "# ispell=SÕNE\n" -#: src/attrib.c:1207 +#: src/attrib.c:1217 #, c-format msgid "# maildir=STRING (eg. ~/Mail)\n" msgstr "# maildir=SÕNE (n. ~/Mail)\n" -#: src/attrib.c:1208 +#: src/attrib.c:1218 #, c-format msgid "# mailing_list=STRING (eg. majordomo@example.org)\n" msgstr "# mailing_list=SÕNE (n. majordomo@example.org)\n" -#: src/attrib.c:1209 +#: src/attrib.c:1219 #, c-format 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:1210 +#: src/attrib.c:1220 #, c-format msgid "# mark_ignore_tags=ON/OFF\n" msgstr "# mark_ignore_tags=ON/OFF\n" -#: src/attrib.c:1211 +#: src/attrib.c:1221 #, c-format msgid "# mark_saved_read=ON/OFF\n" msgstr "# mark_saved_read=ON/OFF\n" -#: src/attrib.c:1212 +#: src/attrib.c:1222 #, c-format msgid "# mime_forward=ON/OFF\n" msgstr "# mime_forward=ON/OFF\n" -#: src/attrib.c:1214 +#: src/attrib.c:1224 #, c-format msgid "# mm_network_charset=supported_charset" msgstr "# mm_network_charset=toetatud_koodileht" -#: src/attrib.c:1221 +#: src/attrib.c:1231 #, c-format msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "# undeclared_charset=SÕNE (vaikimisi on US-ASCII)\n" -#: src/attrib.c:1223 +#: src/attrib.c:1233 #, c-format msgid "# news_headers_to_display=STRING\n" msgstr "# news_headers_to_display=SÕNE\n" -#: src/attrib.c:1224 +#: src/attrib.c:1234 #, c-format msgid "# news_headers_to_not_display=STRING\n" msgstr "# news_headers_to_not_display=SÕNE\n" -#: src/attrib.c:1225 +#: src/attrib.c:1235 #, c-format msgid "# news_quote_format=STRING\n" msgstr "# news_quote_format=SÕNE\n" -#: src/attrib.c:1226 +#: src/attrib.c:1236 #, c-format msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "# organization=SÕNE (kui algab sümboliga '/', loe failist)\n" -#: src/attrib.c:1227 +#: src/attrib.c:1237 #, c-format msgid "# pos_first_unread=ON/OFF\n" msgstr "# pos_first_unread=ON/OFF\n" -#: src/attrib.c:1228 +#: src/attrib.c:1238 #, c-format msgid "# post_8bit_header=ON/OFF\n" msgstr "# post_8bit_header=ON/OFF\n" -#: src/attrib.c:1229 +#: src/attrib.c:1239 #, c-format msgid "# post_mime_encoding=supported_encoding" msgstr "# post_mime_encoding=toetatud_kodeering" -#: src/attrib.c:1236 +#: src/attrib.c:1246 #, c-format msgid "# post_process_type=NUM\n" msgstr "# post_process_type=NUM\n" -#: src/attrib.c:1241 +#: src/attrib.c:1251 #, c-format msgid "# post_process_view=ON/OFF\n" msgstr "# post_process_view=ON/OFF\n" -#: src/attrib.c:1242 +#: src/attrib.c:1252 #, c-format msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "# quick_kill_scope=SÕNE (n. talk.*)\n" -#: src/attrib.c:1243 +#: src/attrib.c:1253 #, c-format msgid "# quick_kill_expire=ON/OFF\n" msgstr "# quick_kill_expire=ON/OFF\n" -#: src/attrib.c:1244 +#: src/attrib.c:1254 #, c-format msgid "# quick_kill_case=ON/OFF\n" msgstr "# quick_kill_case=ON/OFF\n" -#: src/attrib.c:1245 +#: src/attrib.c:1255 #, c-format msgid "# quick_kill_header=NUM\n" msgstr "# quick_kill_header=NUM\n" -#: src/attrib.c:1246 src/attrib.c:1255 +#: src/attrib.c:1256 src/attrib.c:1265 #, c-format msgid "# 0=Subject: (case sensitive) 1=Subject: (ignore case)\n" msgstr "# 0=Teema: (tõstutundlik) 1=Teema: (tõstutundetu)\n" -#: src/attrib.c:1247 src/attrib.c:1256 +#: src/attrib.c:1257 src/attrib.c:1266 #, c-format msgid "# 2=From: (case sensitive) 3=From: (ignore case)\n" msgstr "# 2=Saatja: (tõstutundlik) 3=Saatja: (tõstutundetu)\n" -#: src/attrib.c:1248 src/attrib.c:1257 +#: src/attrib.c:1258 src/attrib.c:1267 #, c-format msgid "# 4=Message-ID: & full References: line\n" msgstr "# 4=Message-ID: ja täielik References: rida\n" -#: src/attrib.c:1249 src/attrib.c:1258 +#: src/attrib.c:1259 src/attrib.c:1268 #, c-format msgid "# 5=Message-ID: & last References: entry only\n" msgstr "# 5=Message-ID: & ainult viimane viitamise kirje\n" -#: src/attrib.c:1250 src/attrib.c:1259 +#: src/attrib.c:1260 src/attrib.c:1269 #, c-format msgid "# 6=Message-ID: entry only 7=Lines:\n" msgstr "# 6=Message-ID: kirje ainult 7=Ridu:\n" -#: src/attrib.c:1251 +#: src/attrib.c:1261 #, c-format msgid "# quick_select_scope=STRING\n" msgstr "# quick_select_scope=SÕNE\n" -#: src/attrib.c:1252 +#: src/attrib.c:1262 #, c-format msgid "# quick_select_expire=ON/OFF\n" msgstr "# quick_select_expire=ON/OFF\n" -#: src/attrib.c:1253 +#: src/attrib.c:1263 #, c-format msgid "# quick_select_case=ON/OFF\n" msgstr "# quick_select_case=ON/OFF\n" -#: src/attrib.c:1254 +#: src/attrib.c:1264 #, c-format msgid "# quick_select_header=NUM\n" msgstr "# quick_select_header=NUM\n" -#: src/attrib.c:1260 +#: src/attrib.c:1270 #, c-format msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "# quote_chars=SÕNE (%%s, %%S annavad initsiaalid)\n" -#: src/attrib.c:1262 +#: src/attrib.c:1272 #, c-format msgid "# print_header=ON/OFF\n" msgstr "# print_header=ON/OFF\n" -#: src/attrib.c:1264 +#: src/attrib.c:1274 #, c-format msgid "# process_only_unread=ON/OFF\n" msgstr "# process_only_unread=ON/OFF\n" -#: src/attrib.c:1265 +#: src/attrib.c:1275 #, c-format msgid "# prompt_followupto=ON/OFF\n" msgstr "# prompt_followupto=ON/OFF\n" -#: src/attrib.c:1266 +#: src/attrib.c:1276 #, c-format msgid "# savedir=STRING (eg. ~user/News)\n" msgstr "# savedir=SÕNE (n. ~user/News)\n" -#: src/attrib.c:1267 +#: src/attrib.c:1277 #, c-format msgid "# savefile=STRING (eg. =linux)\n" msgstr "# savefile=SÕNE (n. =linux)\n" -#: src/attrib.c:1268 +#: src/attrib.c:1278 #, c-format msgid "# sigfile=STRING (eg. $var/sig)\n" msgstr "# sigfile=SÕNE (n. $var/sig)\n" -#: src/attrib.c:1269 +#: src/attrib.c:1279 #, c-format msgid "# show_author=NUM\n" msgstr "# show_author=NUM\n" -#: src/attrib.c:1275 +#: src/attrib.c:1285 #, c-format msgid "# show_signatures=ON/OFF\n" msgstr "# show_signatures=ON/OFF\n" -#: src/attrib.c:1276 +#: src/attrib.c:1286 #, c-format msgid "# show_only_unread_arts=ON/OFF\n" msgstr "# show_only_unread_arts=ON/OFF\n" -#: src/attrib.c:1277 +#: src/attrib.c:1287 #, c-format msgid "# sigdashes=ON/OFF\n" msgstr "# sigdashes=ON/OFF\n" -#: src/attrib.c:1278 +#: src/attrib.c:1288 #, c-format msgid "# signature_repost=ON/OFF\n" msgstr "# signature_repost=ON/OFF\n" -#: src/attrib.c:1279 +#: src/attrib.c:1289 #, c-format msgid "# sort_article_type=NUM\n" msgstr "# sort_article_type=NUM\n" -#: src/attrib.c:1297 +#: src/attrib.c:1307 #, c-format msgid "# sort_threads_type=NUM\n" msgstr "# sort_threads_type=NUM\n" -#: src/attrib.c:1306 +#: src/attrib.c:1316 #, c-format msgid "# start_editor_offset=ON/OFF\n" msgstr "# start_editor_offset=ON/OFF\n" # -#: src/attrib.c:1307 +#: src/attrib.c:1317 #, c-format msgid "# tex2iso_conv=ON/OFF\n" msgstr "# tex2iso_conv=ON/OFF\n" -#: src/attrib.c:1308 +#: src/attrib.c:1318 #, c-format msgid "# thread_catchup_on_exit=ON/OFF\n" msgstr "# thread_catchup_on_exit=ON/OFF\n" -#: src/attrib.c:1309 +#: src/attrib.c:1319 #, c-format msgid "# thread_articles=NUM" msgstr "# thread_articles=NUM" -#: src/attrib.c:1316 +#: src/attrib.c:1326 #, c-format msgid "# thread_format=STRING (eg. %%n %%m [%%L] %%T %%F)\n" msgstr "# thread_format=SÕNE (n. %%n %%m [%%L] %%T %%F)\n" -#: src/attrib.c:1317 +#: src/attrib.c:1327 #, c-format msgid "# thread_perc=NUM\n" msgstr "# thread_perc=NUM\n" -#: src/attrib.c:1318 +#: src/attrib.c:1328 #, c-format msgid "# trim_article_body=NUM\n" msgstr "# trim_article_body=NUM\n" -#: src/attrib.c:1319 +#: src/attrib.c:1329 #, c-format msgid "# 0 = Don't trim article body\n" msgstr "# 0 = Ära lühenda artikli keha\n" -#: src/attrib.c:1320 +#: src/attrib.c:1330 #, c-format msgid "# 1 = Skip leading blank lines\n" msgstr "# 1 = Jäta alles alguses olevad tühjad read\n" -#: src/attrib.c:1321 +#: src/attrib.c:1331 #, c-format msgid "# 2 = Skip trailing blank lines\n" msgstr "# 2 = Jäta alles lõpus olevad tühjad read\n" -#: src/attrib.c:1322 +#: src/attrib.c:1332 #, c-format msgid "# 3 = Skip leading and trailing blank lines\n" msgstr "# 3 = Jäta alles alguses ja lõpus olevad tühjad read\n" -#: src/attrib.c:1323 +#: src/attrib.c:1333 #, c-format msgid "# 4 = Compact multiple blank lines between text blocks\n" msgstr "# 4 = Tihenda teksti vahel olevad tühjad read\n" -#: src/attrib.c:1324 +#: src/attrib.c:1334 #, c-format msgid "" "# 5 = Compact multiple blank lines between text blocks and skip\n" @@ -429,7 +429,7 @@ msgstr "" "# 5 = Tihenda teksti vahel olevad tühjad read ja\n" "# jäta vahele alguses olevad tühjad read\n" -#: src/attrib.c:1325 +#: src/attrib.c:1335 #, c-format msgid "" "# 6 = Compact multiple blank lines between text blocks and skip\n" @@ -438,7 +438,7 @@ msgstr "" "# 6 = Tihenda teksti vahel olevad tühjad read ja\n" "# jäta vahele lõpus olevad tühjad read\n" -#: src/attrib.c:1326 +#: src/attrib.c:1336 #, c-format msgid "" "# 7 = Compact multiple blank lines between text blocks and skip\n" @@ -447,37 +447,37 @@ msgstr "" "# 7 = Tihenda teksti vahel olevad tühjad read ja\n" "# jäta vahele alguses ja lõpus olevad tühjad read\n" -#: src/attrib.c:1327 +#: src/attrib.c:1337 #, c-format msgid "# verbatim_handling=ON/OFF\n" msgstr "# verbatim_handling=ON/OFF\n" -#: src/attrib.c:1329 +#: src/attrib.c:1339 #, c-format msgid "# extquote_handling=ON/OFF\n" msgstr "# extquote_handling=ON/OFF\n" -#: src/attrib.c:1331 +#: src/attrib.c:1341 #, c-format msgid "# wrap_on_next_unread=ON/OFF\n" msgstr "# wrap_on_next_unread=ON/OFF\n" -#: src/attrib.c:1332 +#: src/attrib.c:1342 #, c-format msgid "# x_body=STRING (eg. ~/.tin/extra-body-text)\n" msgstr "# x_body=SÕNE (n. ~/.tin/extra-body-text)\n" -#: src/attrib.c:1333 +#: src/attrib.c:1343 #, c-format msgid "# x_comment_to=ON/OFF\n" msgstr "# x_comment_to=ON/OFF\n" -#: src/attrib.c:1334 +#: src/attrib.c:1344 #, c-format msgid "# x_headers=STRING (eg. ~/.tin/extra-headers)\n" msgstr "# x_headers=SÕNE (n. ~/.tin/extra-headers)\n" -#: src/attrib.c:1335 +#: src/attrib.c:1345 #, c-format msgid "" "#\n" @@ -486,7 +486,7 @@ msgstr "" "#\n" "# Märkus: parem on kõigepealt kirjeldada üldisemad (globaalse skoobiga)\n" -#: src/attrib.c:1336 +#: src/attrib.c:1346 #, c-format msgid "" "# entries first followed by group specific entries.\n" @@ -495,7 +495,7 @@ msgstr "" "# ning seejärel konkreetsemad, grupi spetsiifilised, reeglid.\n" "#\n" -#: src/attrib.c:1337 +#: src/attrib.c:1347 #, c-format msgid "############################################################################\n" msgstr "############################################################################\n" @@ -789,57 +789,52 @@ msgstr "Valin artiklid (kõikide lugemat #: src/lang.c:107 #, c-format -msgid "Active file corrupt - %s" -msgstr "Aktiivsete artiklite fail on vigane - %s" - -#: src/lang.c:108 -#, c-format msgid "" "Article to be posted resulted in errors/warnings. %s=quit, %s=Menu, %s=edit: " msgstr "" "Postitatav artikkel sai vigu või hoiatusi. %s=välju, %s=menüü, %s=toimeta: " -#: src/lang.c:109 +#: src/lang.c:108 #, c-format msgid "Unrecognized attribute: %s" msgstr "Tundmatu atribuut: %s" -#: src/lang.c:110 +#: src/lang.c:109 #, c-format msgid "Bad command. Type '%s' for help." msgstr "Vigane käsk. Abiinfo saamiseks vajutage '%s'." -#: src/lang.c:112 +#: src/lang.c:111 msgid "Base article" msgstr "Baasartikkel" -#: src/lang.c:113 +#: src/lang.c:112 msgid "Base article range" msgstr "Baasartiklite vahemik" -#: src/lang.c:114 +#: src/lang.c:113 #, c-format msgid "%s: Updating of index files not supported: cache_overview_files=%s" msgstr "%s: Indeks failide uuendamist ei toetata: cache_overview_files=%s" -#: src/lang.c:115 +#: src/lang.c:114 msgid "*** Beginning of article ***" msgstr "*** Artikli algus ***" -#: src/lang.c:116 +#: src/lang.c:115 msgid "*** Beginning of page ***" msgstr "*** Lehe algus ***" -#: src/lang.c:118 +#: src/lang.c:117 #, c-format msgid "Cancel (delete) or supersede (overwrite) article [%%s]? (%s/%s/%s): " msgstr "Katkestada (kustutada) või asendada artikkel [%%s]? (%s/%s/%s): " -#: src/lang.c:119 +#: src/lang.c:118 msgid "Cancelling article..." msgstr "Katkestan artiklit..." -#: src/lang.c:121 +#: src/lang.c:120 #, c-format msgid "Cannot create %s" msgstr "%s ei õnnestu luua" @@ -1370,21 +1365,16 @@ msgstr "" msgid "Insecure permissions of %s (%o)" msgstr "Ebaturvalised õigused failil %s (%o)" -#: src/lang.c:242 -#, c-format -msgid "Invalid response to GROUP command, %s" -msgstr "Vigane vastus GROUP käsule, %s" - -#: src/lang.c:247 +#: src/lang.c:244 #, c-format msgid "MIME parse error: Unexpected end of %s/%s article" msgstr "MIME parsimise viga: Ootamatu artikli %s/%s lõpp" -#: src/lang.c:248 +#: src/lang.c:245 msgid "MIME parse error: Start boundary whilst reading headers" msgstr "MIME parsimise viga: Algas eraldaja aga loen alles päiseid" -#: src/lang.c:249 +#: src/lang.c:246 msgid "" "\n" "Error: \"poster\" is not allowed in Newsgroups!\n" @@ -1392,16 +1382,16 @@ msgstr "" "\n" "Viga: \"poster\" ei ole lubatud gruppides!\n" -#: src/lang.c:250 +#: src/lang.c:247 msgid "Can't get a (fully-qualified) domain-name!" msgstr "Ei õnnestu saada (täis) doomeninime!" -#: src/lang.c:251 +#: src/lang.c:248 #, c-format msgid "No permissions to go into %s\n" msgstr "Puuduvad õigused siseneda %s\n" -#: src/lang.c:253 +#: src/lang.c:250 msgid "" "\n" "Error: From: line missing.\n" @@ -1409,30 +1399,30 @@ msgstr "" "\n" "Viga: From: rida puudub.\n" -#: src/lang.c:255 +#: src/lang.c:252 #, c-format msgid "No read permissions for %s\n" msgstr "%s lugemiseks pole õiguseid\n" -#: src/lang.c:256 +#: src/lang.c:253 #, c-format msgid "File %s does not exist\n" msgstr "Faili %s pole\n" -#: src/lang.c:257 +#: src/lang.c:254 #, c-format msgid "No write permissions for %s\n" msgstr "%s kirjutamiseks pole õiguseid\n" -#: src/lang.c:258 +#: src/lang.c:255 msgid "Can't get user information (/etc/passwd missing?)" msgstr "Ei leia kasutate kohta infot (/etc/passwd puudub?)" -#: src/lang.c:259 +#: src/lang.c:256 msgid "errors" msgstr "viga" -#: src/lang.c:261 +#: src/lang.c:258 #, c-format msgid "" "\n" @@ -1441,63 +1431,63 @@ msgstr "" "\n" "Viga real %d: \"Sender:\" päiserida pole lubatud (see lisatakse teie eest)\n" -#: src/lang.c:263 +#: src/lang.c:260 #, c-format msgid "Server has non of the groups listed in %s" msgstr "Serveril pole failis %s näidatud gruppe" -#: src/lang.c:264 +#: src/lang.c:261 msgid "error" msgstr "viga" -#: src/lang.c:265 +#: src/lang.c:262 msgid "Unknown display level" msgstr "Tundmatu ektaani tase" -#: src/lang.c:266 +#: src/lang.c:263 msgid "" msgstr "" -#: src/lang.c:267 +#: src/lang.c:264 msgid "Exiting..." msgstr "Lõpetan..." -#: src/lang.c:268 +#: src/lang.c:265 msgid "leaving external mail-reader" msgstr "jätan välise kirjade lugeja" -#: src/lang.c:269 +#: src/lang.c:266 #, c-format msgid "Extracting %s..." msgstr "Loon %s..." -#: src/lang.c:271 +#: src/lang.c:268 #, c-format msgid "Error writing %s file. Filesystem full? File reset to previous state." msgstr "" "Viga faili %s kirjutamisel. Failisüsteem on täis? Faili eelmine olek " "taastatud." -#: src/lang.c:272 +#: src/lang.c:269 #, c-format msgid "Error making backup of %s file. Filesystem full?" msgstr "Failist %s ei õnnestu varukoopiat luua. Failisüsteem on täis?" -#: src/lang.c:273 +#: src/lang.c:270 #, c-format msgid "Filtering global rules (%d/%d)..." msgstr "Filtreerin globaalseid reegleid (%d/%d)..." -#: src/lang.c:274 +#: src/lang.c:271 msgid "Rule created by: " msgstr "Reegli looja: " -#: src/lang.c:275 +#: src/lang.c:272 #, c-format msgid "Enter pattern [%s]> " msgstr "Sisestage muster [%s]> " -#: src/lang.c:276 +#: src/lang.c:273 #, c-format msgid "" "\n" @@ -1506,20 +1496,21 @@ msgstr "" "\n" "Te soovisite vastused artiklile %s:\n" -#: src/lang.c:277 +#: src/lang.c:274 #, c-format msgid " %s\t Answers will be directed to you by mail.\n" msgstr " %s\t Vastused saadetakse teile kirjaga.\n" -#: src/lang.c:278 +#: src/lang.c:275 msgid "-- forwarded message --\n" msgstr "-- edastatud teade --\n" -#: src/lang.c:279 +#: src/lang.c:276 msgid "-- end of forwarded message --\n" msgstr "-- edastatud teate lõpp --\n" -#: src/lang.c:280 +#: src/lang.c:277 +#, fuzzy msgid "" "# Format:\n" "# comment=STRING Optional. Multiple lines allowed. Comments must be " @@ -1546,6 +1537,10 @@ msgid "" "# gnksa=[<>]?NUM Optional. GNKSA parse_from() return code. '<' or '>' " "opt.\n" "# xref=PATTERN Optional. Kill pattern (e.g. alt.flame*)\n" +"# path=PATTERN Optional. Kill pattern (e.g. news.example.org)\n" +"# Be aware that filtering on Path: may significantly " +"slow\n" +"# down the process.\n" "# time=NUM Optional. time_t value when rule expires\n" "#\n" msgstr "" @@ -2571,7 +2566,7 @@ msgstr "Eelmist avaldist pole" msgid "Operation disabled in no-overwrite mode" msgstr "Operatsioon on ülekirjutamist keelavas moodis keelatud" -#. TODO: replace hardcoded key-name in txt_info_postponed +#. TODO: replace hard coded key-name in txt_info_postponed #: src/lang.c:547 #, c-format msgid "%d postponed %s, reuse with ^O...\n" @@ -2599,7 +2594,7 @@ msgstr "TeX2Iso kodeeritud artikkel" msgid "incomplete " msgstr "mittetäielik " -#. TODO: replace hardcoded key-names +#. TODO: replace hard coded key-names #: src/lang.c:554 #, c-format msgid "" @@ -2718,8 +2713,8 @@ msgstr "Artuklite surmamise menüü" #: src/lang.c:587 #, c-format -msgid "Kill Msg-Id: [%s] (f/l/o/n): " -msgstr "Surmake Msg-Id:[%s] (f/l/o/n): " +msgid "Kill Msg-ID: [%s] (f/l/o/n): " +msgstr "Surmake Msg-ID:[%s] (t/v/a/e): " #: src/lang.c:588 msgid "Kill pattern scope : " @@ -3229,7 +3224,7 @@ msgstr "Viga regulaaravaldises: uurimise msgid "Post a followup..." msgstr "Postita vastus..." -#. TODO: replace hardcoded key-name in txt_post_error_ask_postpone +#. TODO: replace hard coded key-name in txt_post_error_ask_postpone #: src/lang.c:716 msgid "" "An error has occurred while posting the article. If you think that this\n" @@ -3292,225 +3287,230 @@ msgstr "Märgitud %s" msgid "Untagged %s" msgstr "Märkimata %s" -#: src/lang.c:730 +#: src/lang.c:731 +#, c-format +msgid "Preparing for filtering on Path header (%d/%d)..." +msgstr "" + +#: src/lang.c:733 msgid "Processing mail messages marked for deletion." msgstr "Töötlen kirju, mis on kustutamiseks märgitud." -#: src/lang.c:731 +#: src/lang.c:734 msgid "Processing saved articles marked for deletion." msgstr "Töötlen salvestatud ja kustutamiseks märgitud artikleid." -#: src/lang.c:732 +#: src/lang.c:735 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "Aktsepteerin Followup-To? %s=postita, %s=ignoreeri, %s=välju: " -#: src/lang.c:733 +#: src/lang.c:736 msgid "Article unchanged, abort mailing?" msgstr "Artiklit ei ole muudetud, katkestan saatmise?" -#: src/lang.c:734 +#: src/lang.c:737 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "Kas soovite näha postitamisootel artikleid (%d)?" -#: src/lang.c:736 +#: src/lang.c:739 msgid "Add quick kill filter?" msgstr "Lisan kiirsurmamise filtri?" -#: src/lang.c:737 +#: src/lang.c:740 msgid "Add quick selection filter?" msgstr "Lisan kiirvaliku filtri?" -#: src/lang.c:738 +#: src/lang.c:741 msgid "Do you really want to quit?" msgstr "Kas te tõesti soovite väljuda?" -#: src/lang.c:739 +#: src/lang.c:742 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "%s=toimeta katkestamisteadet, %s=välju, %s=kustuta (katkesta) [%%s]: " -#: src/lang.c:740 +#: src/lang.c:743 msgid "You have tagged articles in this group - quit anyway?" msgstr "Teil on siin grupis märgitud artikleid - väljun siiski?" -#: src/lang.c:741 +#: src/lang.c:744 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=välju, %s=toimeta, %s=ootele: " -#: src/lang.c:742 +#: src/lang.c:745 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=välju %s=toimeta %s=salvesta surmamise kirjeldus: " -#: src/lang.c:743 +#: src/lang.c:746 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "%s=välju %s=toimeta %s=salvesta valiku kirjeldus: " -#: src/lang.c:744 +#: src/lang.c:747 msgid "Do you really want to quit without saving your configuration?" msgstr "Kas te tõesti soovite seadeid salvestamata väljuda?" -#: src/lang.c:747 +#: src/lang.c:750 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "Vigane vahemik - lubatud on '0-9.$' näiteks 1-$" -#: src/lang.c:749 +#: src/lang.c:752 msgid "Do you want to abort this operation?" msgstr "Kas soovite seda operatsiooni katkestada?" -#: src/lang.c:750 +#: src/lang.c:753 msgid "Do you want to exit tin immediately?" msgstr "Kas soovite viivitamata tinist väljuda?" -#: src/lang.c:752 +#: src/lang.c:755 msgid "Reading ('q' to quit)..." msgstr "Loen ('q' katkestamiseks)..." -#: src/lang.c:753 +#: src/lang.c:756 #, c-format msgid "Reading %sarticles..." msgstr "Loen %sartikleid..." -#: src/lang.c:754 +#: src/lang.c:757 #, c-format msgid "Reading %sattributes file...\n" msgstr "Loen %satribuutide faili...\n" -#: src/lang.c:755 +#: src/lang.c:758 #, c-format msgid "Reading %sconfig file...\n" msgstr "Loen %sseadete faili...\n" -#: src/lang.c:756 +#: src/lang.c:759 msgid "Reading filter file...\n" msgstr "Loen filtrite faili...\n" -#: src/lang.c:757 +#: src/lang.c:760 #, c-format msgid "Reading %s groups..." msgstr "Loen %s gruppe..." -#: src/lang.c:758 +#: src/lang.c:761 msgid "Reading input history file...\n" msgstr "Loen sisendi ajalugu...\n" -#: src/lang.c:759 +#: src/lang.c:762 msgid "Reading keymap file...\n" msgstr "Loen klahvitabeli faili...\n" -#: src/lang.c:760 +#: src/lang.c:763 msgid "Reading groups from active file... " msgstr "Loen aktiivseid gruppe... " -#: src/lang.c:761 +#: src/lang.c:764 msgid "Reading groups from newsrc file... " msgstr "Loen gruppe newsrc failist... " -#: src/lang.c:762 +#: src/lang.c:765 msgid "Reading newsgroups file... " msgstr "Loen gruppide kirjeldusi... " -#: src/lang.c:763 +#: src/lang.c:766 msgid "Reading newsrc file..." msgstr "Loen newsrc faili..." -#: src/lang.c:764 +#: src/lang.c:767 msgid "References: line " msgstr "References: rida " -#: src/lang.c:766 +#: src/lang.c:769 #, c-format msgid "(%d:%02d remaining)" msgstr "(%d:%02d järgneb)" -#: src/lang.c:768 +#: src/lang.c:771 #, c-format msgid "Bogus group %s removed." msgstr "Vigane grupp %s on eemaldatud." -#: src/lang.c:769 +#: src/lang.c:772 msgid "Removed from the previous rule: " msgstr "Eelmisest reeglist eemaldatud: " -#: src/lang.c:770 +#: src/lang.c:773 #, c-format msgid "Error: rename %s to %s" msgstr "Viga: %s uus nimi %s" -#: src/lang.c:771 +#: src/lang.c:774 msgid "Reply to author..." msgstr "Vastan autorile..." -#: src/lang.c:772 +#: src/lang.c:775 msgid "Repost" msgstr "Uuesti postitus" -#: src/lang.c:773 +#: src/lang.c:776 msgid "Reposting article..." msgstr "Postitan artikli uuesti..." -#: src/lang.c:774 +#: src/lang.c:777 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "Postitan artikli(d) gruppi(desse) [%s]> " -#: src/lang.c:775 +#: src/lang.c:778 msgid "Reset newsrc?" msgstr "Algväärtustan newsrc?" -#: src/lang.c:776 +#: src/lang.c:779 msgid "Responses have been directed to the following newsgroups" msgstr "Vastused edastatakse järgnevatesse gruppidesse" -#: src/lang.c:777 +#: src/lang.c:780 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " msgstr "Vastused edastatakse postitajale. %s=kirjuta, %s=postita, %s=välju: " -#: src/lang.c:779 +#: src/lang.c:782 msgid "Press to continue..." msgstr "Jätkamiseks vajutage ..." -#: src/lang.c:781 +#: src/lang.c:784 #, c-format msgid "Select From [%s] (y/n): " msgstr "Valige From [%s] (j/e): " -#: src/lang.c:782 +#: src/lang.c:785 msgid "Select Lines: (num): " msgstr "Valige read: (num): " -#: src/lang.c:783 +#: src/lang.c:786 msgid "Auto-select Article Menu" msgstr "Automaatselt valitavate artiklite menüü" -#: src/lang.c:784 +#: src/lang.c:787 #, c-format -msgid "Select Msg-Id [%s] (f/l/o/n): " -msgstr "Valige Msg-Id [%s] (f/l/o/n): " +msgid "Select Msg-ID [%s] (f/l/o/n): " +msgstr "Valige Msg-ID [%s] (t/v/a/e): " -#: src/lang.c:785 +#: src/lang.c:788 msgid "Select pattern scope: " msgstr "Valige mustri ulatus: " -#: src/lang.c:786 +#: src/lang.c:789 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "Valige teema [%s] (j/e): " -#: src/lang.c:787 +#: src/lang.c:790 msgid "Select text pattern : " msgstr "Valige tekstimuster : " -#: src/lang.c:788 +#: src/lang.c:791 msgid "Select time in days : " msgstr "Valige aeg päevades : " -#: src/lang.c:789 +#: src/lang.c:792 #, c-format msgid "" "# %s server configuration file\n" @@ -3531,54 +3531,54 @@ msgstr "" "############################################################################\n" "\n" -#: src/lang.c:795 +#: src/lang.c:798 msgid "Showing unread groups only" msgstr "Näitan ainult lugemata gruppe" -#: src/lang.c:796 +#: src/lang.c:799 msgid "Subject: line (ignore case) " msgstr "Subject: rida (tõstutundetu)" -#: src/lang.c:797 +#: src/lang.c:800 msgid "Subject: line (case sensitive)" msgstr "Subject: rida (tõstutundlik)" -#: src/lang.c:798 +#: src/lang.c:801 msgid "Save" msgstr "Salvesta" -#: src/lang.c:799 +#: src/lang.c:802 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "Salvestan '%s' (%s/%s)?" -#: src/lang.c:800 +#: src/lang.c:803 msgid "Save configuration before continuing?" msgstr "Salvestan seaded enne jätkamist?" -#: src/lang.c:801 +#: src/lang.c:804 msgid "Save filename> " msgstr "Fail salvestamiseks> " -#: src/lang.c:802 +#: src/lang.c:805 msgid "Saved" msgstr "Salvestatud" -#: src/lang.c:803 +#: src/lang.c:806 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "%4d lugemata (%4d kuuma) %s grupis %s\n" -#: src/lang.c:804 +#: src/lang.c:807 #, c-format msgid "Saved %s...\n" msgstr "Salvestatud %s...\n" -#: src/lang.c:805 +#: src/lang.c:808 msgid "Nothing was saved" msgstr "Midagi ei salvestatud" -#: src/lang.c:806 +#: src/lang.c:809 #, c-format msgid "" "\n" @@ -3587,185 +3587,185 @@ msgstr "" "\n" "%s %d %s %d grupist%s\n" -#: src/lang.c:807 +#: src/lang.c:810 #, c-format msgid "-- %s saved to %s%s --" msgstr "-- %s salvestati %s%s --" -#: src/lang.c:808 +#: src/lang.c:811 #, c-format msgid "-- %s saved to %s - %s --" msgstr "-- %s salvestati %s - %s --" -#: src/lang.c:809 +#: src/lang.c:812 msgid "Saving..." msgstr "Salvestan..." -#: src/lang.c:810 +#: src/lang.c:813 #, c-format msgid "%s: Screen initialization failed" msgstr "%s: Ekraani initsialiseerimine ebaõnnestus" -#: src/lang.c:812 +#: src/lang.c:815 #, c-format msgid "%s: screen is too small\n" msgstr "%s: ekraan on liiga väike\n" -#: src/lang.c:814 +#: src/lang.c:817 #, c-format msgid "screen is too small, %s is exiting" msgstr "ekraan on liiga väike, %s lõpetab töö" -#: src/lang.c:815 +#: src/lang.c:818 msgid "Delete scope?" msgstr "Kustutan skoobi?" -#: src/lang.c:816 +#: src/lang.c:819 msgid "Enter scope> " msgstr "Sisestage skoop> " -#: src/lang.c:817 +#: src/lang.c:820 msgid "Select new position> " msgstr "Valige uus positsioon> " -#: src/lang.c:818 +#: src/lang.c:821 msgid "New position cannot be a global scope" msgstr "Uus positsioon ei saa olla globaalne skoop" -#: src/lang.c:819 +#: src/lang.c:822 msgid "Global scope, operation not allowed" msgstr "Globaalne skoop, operatsioon ei ole lubatud" -#: src/lang.c:820 +#: src/lang.c:823 msgid "Rename scope> " msgstr "Skoobi uus nimi> " -#: src/lang.c:821 +#: src/lang.c:824 msgid "Select scope> " msgstr "Valige skoop> " -#: src/lang.c:822 +#: src/lang.c:825 msgid "Scopes Menu" msgstr "Skoopide menüü" -#: src/lang.c:823 +#: src/lang.c:826 msgid "Scopes Menu Commands" msgstr "Skoopide menüü käsud" -#: src/lang.c:824 +#: src/lang.c:827 #, c-format msgid "Search backwards [%s]> " msgstr "Otsin tagurpidi [%s]> " -#: src/lang.c:825 +#: src/lang.c:828 #, c-format msgid "Search body [%s]> " msgstr "Otsi kehast [%s]> " -#: src/lang.c:826 +#: src/lang.c:829 #, c-format msgid "Search forwards [%s]> " msgstr "Otsi edaspidi [%s]> " -#: src/lang.c:827 +#: src/lang.c:830 msgid "Searching..." msgstr "Otsin..." -#: src/lang.c:828 +#: src/lang.c:831 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "Otsin artiklit %d/%d ('q' katkestamiseks)..." -#: src/lang.c:829 +#: src/lang.c:832 msgid "Select article> " msgstr "Valige artikkel> " -#: src/lang.c:830 +#: src/lang.c:833 msgid "" "Select option number before text or use arrow keys and . 'q' to quit." msgstr "" "Valige teksti eest omaduse number või kasutage nooli ja . 'q' " "väljumiseks." -#: src/lang.c:831 +#: src/lang.c:834 msgid "Select group> " msgstr "Valige grupp> " -#: src/lang.c:832 +#: src/lang.c:835 #, c-format msgid "Enter selection pattern [%s]> " msgstr "Sisestage valiku muster [%s]> " -#: src/lang.c:833 +#: src/lang.c:836 msgid "Select thread> " msgstr "Valige teema> " -#: src/lang.c:834 +#: src/lang.c:837 #, c-format msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" msgstr "" "%s %s %s (\"%s\") [%s]: saatke palun DETAILNE vea raport aadressil %s\n" -#: src/lang.c:835 +#: src/lang.c:838 msgid "servers active-file" msgstr "serveri aktiivsete gruppide fail" -#: src/lang.c:836 +#: src/lang.c:839 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "Uutesse gruppidesse ei saa siseneda. Tellige kõigepealt..." -#: src/lang.c:837 +#: src/lang.c:840 msgid "" msgstr "" -#: src/lang.c:838 +#: src/lang.c:841 #, c-format msgid "Starting: (%s)" msgstr "Stardin: (%s)" -#: src/lang.c:839 +#: src/lang.c:842 #, c-format msgid "List Thread (%d of %d)" msgstr "Teemad (%d/%d)" -#: src/lang.c:840 +#: src/lang.c:843 #, c-format msgid "Thread (%.*s)" msgstr "Teema (%.*s)" -#: src/lang.c:841 +#: src/lang.c:844 msgid "Enter wildcard subscribe pattern> " msgstr "Sisestage tellimise muster> " -#: src/lang.c:842 +#: src/lang.c:845 #, c-format msgid "subscribed to %d groups" msgstr "%d gruppi on tellitud" -#: src/lang.c:843 +#: src/lang.c:846 #, c-format msgid "Subscribed to %s" msgstr "%s on tellitud" -#: src/lang.c:844 +#: src/lang.c:847 msgid "Subscribing... " msgstr "Tellin... " -#: src/lang.c:845 +#: src/lang.c:848 #, c-format msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " msgstr "Postitan uuesti või asendan artikli(d) [%%s]? (%s/%s/%s): " -#: src/lang.c:846 +#: src/lang.c:849 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "Asendan artikli(d) gruppides [%s]> " -#: src/lang.c:847 +#: src/lang.c:850 msgid "Superseding article ..." msgstr "Asendan artikli ..." -#: src/lang.c:848 +#: src/lang.c:851 #, c-format msgid "" "\n" @@ -3774,24 +3774,24 @@ msgstr "" "\n" "Peatatud. %s uuesti käivitamiseks kirjutage palun 'fg'\n" -#: src/lang.c:850 +#: src/lang.c:853 #, c-format msgid "%d days" msgstr "%d päeva" -#: src/lang.c:851 +#: src/lang.c:854 msgid "" msgstr "" -#: src/lang.c:852 +#: src/lang.c:855 msgid "TeX " msgstr "TeX " -#: src/lang.c:853 +#: src/lang.c:856 msgid "# Default action/prompt strings\n" msgstr "# Vaikimisi aktsioonide/viipade sõned\n" -#: src/lang.c:854 +#: src/lang.c:857 msgid "" "# Defaults for quick (1 key) kill & auto-selection filters\n" "# header=NUM 0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n" @@ -3810,108 +3810,108 @@ msgstr "" "# case=ON/OFF ON=filter on tõstutundlik OFF=tõstutundetu\n" "# expire=ON/OFF ON=kehtivusaeg default_filter_days OFF=ei aegu\n" -#: src/lang.c:867 +#: src/lang.c:870 msgid "" "# If ON use print current subject or newsgroup description in the last line\n" msgstr "# Kui on ON, trüki teema või grupikirjeldus viimasele reale\n" -#: src/lang.c:868 +#: src/lang.c:871 msgid "# Host & time info used for detecting new groups (don't touch)\n" msgstr "# Masin & aeg - kasutatakse uute gruppide leidmiseks (mitte muuta)\n" -#: src/lang.c:869 +#: src/lang.c:872 msgid "There is no news\n" msgstr "Uudiseid pole\n" -#: src/lang.c:870 +#: src/lang.c:873 msgid "Thread" msgstr "Teema" -#: src/lang.c:871 +#: src/lang.c:874 msgid "Thread Level Commands" msgstr "Teemataseme käsud" -#: src/lang.c:872 +#: src/lang.c:875 msgid "Thread deselected" msgstr "Teema pole valitud" -#: src/lang.c:873 +#: src/lang.c:876 msgid "Thread selected" msgstr "Teema on valitud" -#: src/lang.c:875 +#: src/lang.c:878 msgid "threads" msgstr "teemad" -#: src/lang.c:877 +#: src/lang.c:880 msgid "thread" msgstr "teema" -#: src/lang.c:878 +#: src/lang.c:881 #, c-format msgid "Thread %4s of %4s" msgstr "Teema %4s : %4s" -#: src/lang.c:879 +#: src/lang.c:882 msgid "Threading articles..." msgstr "Järjestan artiklid teemade kaupa..." -#: src/lang.c:880 +#: src/lang.c:883 #, c-format msgid "Toggled word highlighting %s" msgstr "Sõnade esiletõstmine lülitatud %s" -#: src/lang.c:881 +#: src/lang.c:884 msgid "Toggled rot13 encoding" msgstr "Lülitatud rot13 kodeerimine" -#: src/lang.c:882 +#: src/lang.c:885 #, c-format msgid "Toggled german TeX encoding %s" msgstr "Lülitatud saksa TeX kodeering %s" -#: src/lang.c:883 +#: src/lang.c:886 #, c-format msgid "Toggled tab-width to %d" msgstr "Lülitatud tab-width väärtus %d" -#: src/lang.c:885 +#: src/lang.c:888 #, c-format msgid "%d Trying to dotlock %s" msgstr "%d Ãœritan punkt-lukustada %s" -#: src/lang.c:886 +#: src/lang.c:889 #, c-format msgid "%d Trying to lock %s" msgstr "%d Ãœritan lukustada %s" -#: src/lang.c:888 +#: src/lang.c:891 msgid " h=help" msgstr " h=appi" -#: src/lang.c:890 +#: src/lang.c:893 msgid "Unlimited" msgstr "Piiramata" -#: src/lang.c:891 +#: src/lang.c:894 msgid "Enter wildcard unsubscribe pattern> " msgstr "Sisestage loobumise muster> " -#: src/lang.c:892 +#: src/lang.c:895 #, c-format msgid "Error decoding %s : %s" msgstr "Viga %s dekodeerimisel: %s" -#: src/lang.c:893 +#: src/lang.c:896 msgid "No end." msgstr "Lõpp puudub." -#: src/lang.c:894 +#: src/lang.c:897 #, c-format msgid "%s successfully decoded." msgstr "%s on edukalt dekodeeritud." -#: src/lang.c:895 +#: src/lang.c:898 #, c-format msgid "" "%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" @@ -3920,37 +3920,32 @@ msgstr "" "%*s[-- %s/%s, %suuenkodeeritud fail, %d rida, nimi: %s --]\n" "\n" -#: src/lang.c:896 +#: src/lang.c:899 msgid "unread " msgstr "lugemata " -#: src/lang.c:897 +#: src/lang.c:900 #, c-format msgid "unsubscribed from %d groups" msgstr "loobunud %d grupist" -#: src/lang.c:898 +#: src/lang.c:901 #, c-format msgid "Unsubscribed from %s" msgstr "Loobunud grupist %s" -#: src/lang.c:899 +#: src/lang.c:902 msgid "Unsubscribing... " msgstr "Loobun gruppidest... " -#: src/lang.c:900 +#: src/lang.c:903 msgid "Unthreading articles..." msgstr "Tükeldan teemad..." -#: src/lang.c:901 +#: src/lang.c:904 msgid "Updated" msgstr "Uuendatud" -#: src/lang.c:903 -#, c-format -msgid "unparseable \"LIST COUNTS\" line: \"%s\"" -msgstr "mitteparsitav \"LIST COUNTS\" rida: \"%s\"" - #: src/lang.c:905 msgid "Updating" msgstr "Uuendan" @@ -4110,11 +4105,16 @@ msgid "%s only useful for batch mode ope msgstr "%s on kasutatav ainult pakettmoodi käskudega\n" #: src/lang.c:939 +#, fuzzy, c-format +msgid "%s only useful for batch or debug mode operations\n" +msgstr "%s on kasutatav ainult pakettmoodi käskudega\n" + +#: src/lang.c:940 #, c-format msgid "Useless combination %s and %s. Ignoring %s.\n" msgstr "Kasutu %s ja %s kombinatsioon. Ignoreerin %s.\n" -#: src/lang.c:941 +#: src/lang.c:942 #, c-format msgid "" "\n" @@ -4123,12 +4123,12 @@ msgstr "" "\n" "%s%d piiridest väljas (0 - %d). Sean 0" -#: src/lang.c:942 +#: src/lang.c:943 #, c-format msgid "View '%s' (%s/%s)?" msgstr "Vaatan '%s' (%s/%s)?" -#: src/lang.c:944 +#: src/lang.c:945 #, c-format msgid "" "\n" @@ -4139,7 +4139,7 @@ msgstr "" "Hoiatus: postitus ületab %d veergu. Esimene pikk rida on rida %d:\n" "%-100s\n" -#: src/lang.c:945 +#: src/lang.c:946 msgid "" "\n" "Warning: article unchanged after editing\n" @@ -4147,7 +4147,7 @@ msgstr "" "\n" "Hoiatus: artiklit ei ole toimetamise käigus muudetud\n" -#: src/lang.c:946 +#: src/lang.c:947 msgid "" "\n" "Warning: \"Subject:\" contains only whitespaces.\n" @@ -4155,7 +4155,7 @@ msgstr "" "\n" "Hoiatus: \"Subject:\" real on ainult tühikud.\n" -#: src/lang.c:947 +#: src/lang.c:948 msgid "" "\n" "Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:" @@ -4165,7 +4165,7 @@ msgstr "" "Hoiatus: \"Subject:\" algab fraasiga \"Re: \", aga \"References:\" välju " "pole.\n" -#: src/lang.c:949 +#: src/lang.c:950 msgid "" "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" @@ -4176,7 +4176,7 @@ msgstr "" "fraasiga\n" " \"Re: \" ega sisalda \"(was:\".\n" -#: src/lang.c:952 +#: src/lang.c:953 msgid "" "Read carefully!\n" "\n" @@ -4198,7 +4198,7 @@ msgstr "" "Siin on artikkel, mida te hakkate kustutama:\n" "\n" -#: src/lang.c:956 +#: src/lang.c:957 msgid "" "\n" "Warning: You are using a non-plain transfer encoding (such as base64 or\n" @@ -4215,7 +4215,7 @@ msgstr "" "kodeerita\n" " korrektselt.\n" -#: src/lang.c:961 +#: src/lang.c:962 msgid "" "\n" "Warning: \"example\" is a reserved hierarchy!\n" @@ -4223,7 +4223,7 @@ msgstr "" "\n" "Hoiatus: \"näide\" on reserveeritud hierarhia!\n" -#: src/lang.c:962 +#: src/lang.c:963 #, c-format msgid "" "\n" @@ -4238,7 +4238,7 @@ msgstr "" "Väärtused failis %s on muutunud!\n" "Palun lugege faile WHATSNEW, jne...\n" -#: src/lang.c:964 +#: src/lang.c:965 #, c-format msgid "" "\n" @@ -4253,7 +4253,7 @@ msgstr "" "Mõningaid väärtusi failis %s võidakse ignoreerida, mõningaid võidakse " "muuta!\n" -#: src/lang.c:967 +#: src/lang.c:968 #, c-format msgid "" "Warning: tin wrote fewer groups to your\n" @@ -4268,7 +4268,7 @@ msgstr "" "grupist%s, tähendab see viga ja te peaksite varundama oma %s\n" "enne, kui te tini uuesti käivitate!\n" -#: src/lang.c:971 +#: src/lang.c:972 #, c-format msgid "" "\n" @@ -4278,12 +4278,12 @@ msgstr "" "Hoiatus: Leidsin %d '-- \\n' rida, mis võib tekitada osades inimestes " "segadust.\n" -#: src/lang.c:972 +#: src/lang.c:973 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "Hoiatus: Salvestati ainult %d artiklit %d artiklist" -#: src/lang.c:973 +#: src/lang.c:974 #, c-format msgid "" "\n" @@ -4300,7 +4300,7 @@ msgstr "" "võimalikult\n" " lühikesed.\n" -#: src/lang.c:977 +#: src/lang.c:978 #, c-format msgid "" "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " @@ -4308,7 +4308,7 @@ msgstr "" "Hoiatus: see aadress võib sisaldada rämpsposti lõksu. %s=jätkan, " "%s=katkestan?" -#: src/lang.c:978 +#: src/lang.c:979 msgid "" "\n" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" @@ -4316,37 +4316,37 @@ msgstr "" "\n" "Hoiatus: Signatuuride alguses peaks olema '-- \\n', mitte '--\\n'.\n" -#: src/lang.c:979 +#: src/lang.c:980 msgid "Writing attributes file..." msgstr "Kirjutan atribuutide faili..." -#: src/lang.c:981 +#: src/lang.c:982 #, c-format msgid "%d Responses" msgstr "%d Vastust" -#: src/lang.c:983 +#: src/lang.c:984 #, c-format msgid "Added %d %s" msgstr "Lisatud %d %s" -#: src/lang.c:984 +#: src/lang.c:985 msgid "No unsubscribed groups to show" msgstr "Tellimata gruppe pole" -#: src/lang.c:985 +#: src/lang.c:986 msgid "Showing subscribed to groups only" msgstr "Näitan ainult tellitud gruppe" -#: src/lang.c:986 +#: src/lang.c:987 msgid "Yes " msgstr "Jah " -#: src/lang.c:987 +#: src/lang.c:988 msgid " You have mail" msgstr " Teil on kiri" -#: src/lang.c:992 +#: src/lang.c:993 #, c-format msgid "" "\n" @@ -4367,11 +4367,11 @@ msgstr "" " MM_NETWORK_CHARSET. Viimast saate teostada kasutades valikut " "M)enüü.\n" -#: src/lang.c:1003 +#: src/lang.c:1004 msgid " -D mode debug mode" msgstr " -D mood silumismood" -#: src/lang.c:1007 +#: src/lang.c:1008 msgid "" "Read carefully!\n" "\n" @@ -4397,11 +4397,11 @@ msgstr "" "Siin on artikkel, mida te asute kustutama:\n" "\n" -#: src/lang.c:1016 +#: src/lang.c:1017 msgid "toggle color" msgstr "lülita värve" -#: src/lang.c:1017 +#: src/lang.c:1018 msgid "" "# Changing colors of several screen parts\n" "# Possible values are:\n" @@ -4447,11 +4447,11 @@ msgstr "" "# 15 = helevalge\n" "\n" -#: src/lang.c:1037 +#: src/lang.c:1038 msgid " -a toggle color flag" msgstr " -a lülita värvide kasutamist" -#: src/lang.c:1041 +#: src/lang.c:1042 msgid "" "\n" "Error: Followup-To set to more than one newsgroup!\n" @@ -4459,7 +4459,7 @@ msgstr "" "\n" "Viga: Followup-To real on rohkem kui üks grupp!\n" -#: src/lang.c:1042 +#: src/lang.c:1043 #, c-format msgid "" "\n" @@ -4468,7 +4468,7 @@ msgstr "" "\n" "Viga: \"%s\" on ümber nimetatud, kasutage selle asemel \"%s\"!\n" -#: src/lang.c:1043 +#: src/lang.c:1044 #, c-format msgid "" "\n" @@ -4477,7 +4477,7 @@ msgstr "" "\n" "Viga: ristpostitus %d gruppi ja Followup-To rida puudub!\n" -#: src/lang.c:1044 +#: src/lang.c:1045 #, c-format msgid "" "\n" @@ -4486,7 +4486,7 @@ msgstr "" "\n" "Viga: \"%s\" ei ole lubatud grupp!\n" -#: src/lang.c:1046 +#: src/lang.c:1047 msgid "" "\n" "Warning: Followup-To set to more than one newsgroup!\n" @@ -4494,7 +4494,7 @@ msgstr "" "\n" "Hoiatus: Followup-To on seatud rohkem, kui ühele grupile!\n" -#: src/lang.c:1047 +#: src/lang.c:1048 #, c-format msgid "" "\n" @@ -4503,7 +4503,7 @@ msgstr "" "\n" "Hoiatus: \"%s\" on ümber nimetatud, kasutage selle asemel \"%s\"!\n" -#: src/lang.c:1048 +#: src/lang.c:1049 #, c-format msgid "" "\n" @@ -4512,7 +4512,7 @@ msgstr "" "\n" "Hoiatus: ristpostitus %d uudisegruppi ja Followup-To rida puudub!\n" -#: src/lang.c:1049 +#: src/lang.c:1050 #, c-format msgid "" "\n" @@ -4522,7 +4522,7 @@ msgstr "" "Hoiatus: \"%s\" puudub teie newsrc failist, see võib olla selles serveris " "vigane!\n" -#: src/lang.c:1050 +#: src/lang.c:1051 #, c-format msgid "" "\n" @@ -4531,79 +4531,79 @@ msgstr "" "\n" "Hoiatus: \"%s\" ei ole selles serveris kehtiv grupp!\n" -#: src/lang.c:1054 +#: src/lang.c:1055 #, c-format msgid "%d files successfully written from %d articles. %d %s occurred." msgstr "Edukalt kirjutatud %d faili %d artiklist. Esines %d viga%s." -#: src/lang.c:1055 +#: src/lang.c:1056 msgid "Missing parts." msgstr "Osad puuduvad." -#: src/lang.c:1056 +#: src/lang.c:1057 msgid "No beginning." msgstr "Algus puudub." -#: src/lang.c:1057 +#: src/lang.c:1058 msgid "No data." msgstr "Andmeid pole." -#: src/lang.c:1058 +#: src/lang.c:1059 msgid "Unknown error." msgstr "Tundmatu viga." -#: src/lang.c:1061 +#: src/lang.c:1062 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "\t%s kontrollsumma (%ld %s)" -#: src/lang.c:1066 +#: src/lang.c:1067 msgid "Reading mail active file... " msgstr "Loen aktiivsete kirjade kausta... " -#: src/lang.c:1067 +#: src/lang.c:1068 msgid "Reading mailgroups file... " msgstr "Loen kirjagruppide faili... " -#: src/lang.c:1071 +#: src/lang.c:1072 msgid "perform PGP operations on article" msgstr "kasuta artiklil PGP operatsioone" -#: src/lang.c:1072 +#: src/lang.c:1073 msgid "Add key(s) to public keyring?" msgstr "Lisan võtmed avalike võtmete hoidlasse?" -#: src/lang.c:1073 +#: src/lang.c:1074 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "%s=krüpti, %s=allkirjasta, %s=mõlemad, %s=välju: " -#: src/lang.c:1074 +#: src/lang.c:1075 #, c-format msgid "%s=sign, %s=sign & include public key, %s=quit: " msgstr "%s=allkirjasta, %s=allkirjasta & lisa avalik võti, %s=välju: " -#: src/lang.c:1075 +#: src/lang.c:1076 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "PGP pole seadistatud (ei saa avada %s)" -#: src/lang.c:1076 +#: src/lang.c:1077 msgid "Article not signed and no public keys found" msgstr "Artikkel pole allkirjastatud ja avalikke võtmeid pole" -#: src/lang.c:1078 +#: src/lang.c:1079 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" "%s=välju, %s=toimeta, %s=ispell, %s=pgp, %s=menüü, %s=postita, %s=ootele: " -#: src/lang.c:1079 +#: src/lang.c:1080 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " msgstr "%s=välju, %s=toimeta, %s=ispell, %s=pgp, %s=saada [%%s]: " -#: src/lang.c:1080 +#: src/lang.c:1081 #, c-format msgid "" "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " @@ -4611,78 +4611,73 @@ msgstr "" "%s=välju, %s=toimeta, %s=ispell, %s=pgp, %s=menüü, %s=postita, %s=ootele " "[%%s]: " -#: src/lang.c:1082 +#: src/lang.c:1083 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "%s=välju, %s=toimeta, %s=pgp, %s=menüü, %s=postita, %s=ootele: " -#: src/lang.c:1083 +#: src/lang.c:1084 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "%s=välju, %s=toimeta, %s=pgp, %s=saada [%%s]: " -#: src/lang.c:1084 +#: src/lang.c:1085 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=välju, %s=toimeta, %s=pgp, %s=menüü, %s=postita, %s=ootele [%%s]: " -#: src/lang.c:1088 +#: src/lang.c:1089 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " msgstr "%s=välju, %s=toimeta, %s=ispell, %s=menüü, %s=postita, %s=ootele: " -#: src/lang.c:1089 +#: src/lang.c:1090 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "%s=välju, %s=toimeta, %s=ispell, %s=saada [%%s]: " -#: src/lang.c:1090 +#: src/lang.c:1091 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" "%s=välju, %s=toimeta, %s=ispell, %s=menüü, %s=postita, %s=ootele [%%s]: " -#: src/lang.c:1092 +#: src/lang.c:1093 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "%s=välju, %s=toimeta, %s=menüü, %s=postita, %s=ootele: " -#: src/lang.c:1093 +#: src/lang.c:1094 #, c-format msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "%s=välju, %s=toimeta, %s=saada [%%s]: " -#: src/lang.c:1094 +#: src/lang.c:1095 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=välju, %s=toimeta, %s=menüü, %s=postita, %s=ootele [%%s]: " -#: src/lang.c:1103 +#: src/lang.c:1104 msgid "Try cache_overview_files to speed up things.\n" msgstr "Proovige asjade kiirendamiseks cache_overview_files.\n" -#: src/lang.c:1104 +#: src/lang.c:1105 msgid "Tin will use local index files instead.\n" msgstr "Tin kasutab hoopis kohalikke indeksfaile.\n" -#: src/lang.c:1105 +#: src/lang.c:1106 msgid "Cannot find NNTP server name" msgstr "Ei leia NNTP serveri nime" -#: src/lang.c:1106 +#: src/lang.c:1107 #, c-format msgid "Connecting to %s:%u..." msgstr "Loon ühendust serveriga %s:%u..." -#: src/lang.c:1107 -msgid "Disconnecting from server...\n" -msgstr "Lõpetan ühenduse...\n" - #: src/lang.c:1108 -#, c-format -msgid "" -"Wrong newsgroup name (\"%s\") in response of \"GROUP %s\" command: \"%s\"" -msgstr "Vale grupi nimi (\"%s\") vastuseks \"GROUP %s\" käsule: \"%s\"" +#, fuzzy +msgid "Disconnecting from server..." +msgstr "Lõpetan ühenduse...\n" #: src/lang.c:1109 #, c-format @@ -5461,65 +5456,69 @@ msgstr "NFC" msgid "NFD" msgstr "NFD" -#: src/lang.c:1586 +#: src/lang.c:1580 +msgid "NFKC case fold" +msgstr "" + +#: src/lang.c:1589 msgid "Display Options" msgstr "Ekraani seaded" -#: src/lang.c:1593 +#: src/lang.c:1596 msgid "Color Options" msgstr "Värvide seaded" -#: src/lang.c:1599 +#: src/lang.c:1602 msgid "Highlight Options" msgstr "Märkimise seaded" -#: src/lang.c:1606 +#: src/lang.c:1609 msgid "Article-Limiting Options" msgstr "Artikli piirangute seaded" -#: src/lang.c:1612 +#: src/lang.c:1615 msgid "Posting/Mailing Options" msgstr "Postitamise/saatmise seaded" -#: src/lang.c:1618 +#: src/lang.c:1621 msgid "Saving/Printing Options" msgstr "Salvestamise/trükkimise seaded" -#: src/lang.c:1624 +#: src/lang.c:1627 msgid "Expert Options" msgstr "Ekspertseaded" -#: src/lang.c:1630 +#: src/lang.c:1633 msgid "Filtering Options" msgstr "Filtreerimise seaded" -#: src/lang.c:1635 src/lang.c:1666 src/lang.c:1672 src/lang.c:1699 -#: src/lang.c:1751 src/lang.c:1757 src/lang.c:1767 src/lang.c:1778 -#: src/lang.c:1796 src/lang.c:1865 src/lang.c:2066 src/lang.c:2072 -#: src/lang.c:2078 src/lang.c:2084 src/lang.c:2096 src/lang.c:2103 -#: src/lang.c:2157 src/lang.c:2166 src/lang.c:2172 src/lang.c:2179 -#: src/lang.c:2186 src/lang.c:2193 src/lang.c:2200 src/lang.c:2207 -#: src/lang.c:2214 src/lang.c:2221 src/lang.c:2228 src/lang.c:2235 -#: src/lang.c:2242 src/lang.c:2249 src/lang.c:2256 src/lang.c:2263 -#: src/lang.c:2270 src/lang.c:2277 src/lang.c:2284 src/lang.c:2291 -#: src/lang.c:2298 src/lang.c:2305 src/lang.c:2312 src/lang.c:2319 -#: src/lang.c:2326 src/lang.c:2333 src/lang.c:2340 src/lang.c:2348 -#: src/lang.c:2364 src/lang.c:2371 src/lang.c:2378 src/lang.c:2385 -#: src/lang.c:2391 src/lang.c:2397 src/lang.c:2414 src/lang.c:2426 -#: src/lang.c:2461 src/lang.c:2514 src/lang.c:2528 src/lang.c:2534 -#: src/lang.c:2559 src/lang.c:2577 src/lang.c:2594 src/lang.c:2606 -#: src/lang.c:2639 src/lang.c:2675 src/lang.c:2695 src/lang.c:2730 -#: src/lang.c:2740 src/lang.c:2747 src/lang.c:2773 src/lang.c:2797 -#: src/lang.c:2870 src/lang.c:2884 src/lang.c:2892 src/lang.c:2906 -#: src/lang.c:2912 src/lang.c:2950 +#: src/lang.c:1638 src/lang.c:1669 src/lang.c:1675 src/lang.c:1702 +#: src/lang.c:1754 src/lang.c:1760 src/lang.c:1770 src/lang.c:1781 +#: src/lang.c:1799 src/lang.c:1868 src/lang.c:2069 src/lang.c:2075 +#: src/lang.c:2081 src/lang.c:2087 src/lang.c:2099 src/lang.c:2106 +#: src/lang.c:2160 src/lang.c:2169 src/lang.c:2175 src/lang.c:2182 +#: src/lang.c:2189 src/lang.c:2196 src/lang.c:2203 src/lang.c:2210 +#: src/lang.c:2217 src/lang.c:2224 src/lang.c:2231 src/lang.c:2238 +#: src/lang.c:2245 src/lang.c:2252 src/lang.c:2259 src/lang.c:2266 +#: src/lang.c:2273 src/lang.c:2280 src/lang.c:2287 src/lang.c:2294 +#: src/lang.c:2301 src/lang.c:2308 src/lang.c:2315 src/lang.c:2322 +#: src/lang.c:2329 src/lang.c:2336 src/lang.c:2343 src/lang.c:2351 +#: src/lang.c:2367 src/lang.c:2374 src/lang.c:2381 src/lang.c:2388 +#: src/lang.c:2394 src/lang.c:2400 src/lang.c:2417 src/lang.c:2429 +#: src/lang.c:2464 src/lang.c:2517 src/lang.c:2531 src/lang.c:2537 +#: src/lang.c:2562 src/lang.c:2580 src/lang.c:2597 src/lang.c:2609 +#: src/lang.c:2642 src/lang.c:2678 src/lang.c:2698 src/lang.c:2733 +#: src/lang.c:2743 src/lang.c:2750 src/lang.c:2776 src/lang.c:2800 +#: src/lang.c:2877 src/lang.c:2892 src/lang.c:2900 src/lang.c:2914 +#: src/lang.c:2920 src/lang.c:2958 msgid " toggles, sets, cancels." msgstr " lülitab, seab, katkestab." -#: src/lang.c:1636 +#: src/lang.c:1639 msgid "Show mini menu & posting etiquette" msgstr "Näita minimenüüd & post. etiketti" -#: src/lang.c:1637 +#: src/lang.c:1640 msgid "" "# If ON show a mini menu of useful commands at each level\n" "# and posting etiquette after composing an article\n" @@ -5527,15 +5526,15 @@ msgstr "" "# Kui väärtus on ON, näita enimkasutatavate käskude minimenüüd\n" "# ja peale artikli kirjutamist postitamise etiketti.\n" -#: src/lang.c:1642 +#: src/lang.c:1645 msgid "Show short description for each newsgroup. toggles & sets." msgstr "Näita gruppide lühikirjeldusi. lülitab ja seab." -#: src/lang.c:1643 +#: src/lang.c:1646 msgid "Show description of each newsgroup" msgstr "Näita iga grupi lühikirjeldust" -#: src/lang.c:1644 +#: src/lang.c:1647 msgid "" "# If ON show group description text after newsgroup name at\n" "# group selection level\n" @@ -5543,18 +5542,18 @@ msgstr "" "# Kui väärtus on ON, näita gruppide tasemel iga grupi nime\n" "# järel grupi lühikirjeldust\n" -#: src/lang.c:1649 +#: src/lang.c:1652 msgid "" "Show From (author) fields in group & thread level. toggles & " "sets." msgstr "" "Näita grupi ja teema menüüs From (autor) välju. lülitab ja seab." -#: src/lang.c:1650 +#: src/lang.c:1653 msgid "In group and thread level, show author by" msgstr "Näita grupi ja teema menüüs autorit" -#: src/lang.c:1651 +#: src/lang.c:1654 msgid "" "# Part of From field to display in group and thread level\n" "# Possible values are (the default is marked with *):\n" @@ -5570,33 +5569,33 @@ msgstr "" "# * 2 = täisnimi\n" "# 3 = mõlemad\n" -#: src/lang.c:1660 +#: src/lang.c:1663 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "Märgi valik -> või heleda ribaga. lülitab, seab." -#: src/lang.c:1661 +#: src/lang.c:1664 msgid "Draw -> instead of highlighted bar" msgstr "Joonista -> heleda riba asemel" -#: src/lang.c:1662 +#: src/lang.c:1665 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:1667 +#: src/lang.c:1670 msgid "Use inverse video for page headers" msgstr "Kasuta päistel pööratud videot" -#: src/lang.c:1668 +#: src/lang.c:1671 msgid "# If ON use inverse video for page headers at different levels\n" msgstr "" "# Kui väärtus on ON, kasuta erinevatel tasemetel päiste näitamisel\n" "# pööratud videot\n" -#: src/lang.c:1673 +#: src/lang.c:1676 msgid "Thread articles by" msgstr "Artiklite teemadesse jagamine" -#: src/lang.c:1674 +#: src/lang.c:1677 msgid "" "# Thread articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5616,15 +5615,15 @@ msgstr "" "# 4 = Mitmeosaline teema\n" "# 5 = Protsentuaalne sobivus\n" -#: src/lang.c:1685 +#: src/lang.c:1688 msgid "Enter percentage match required to thread together. sets." msgstr "Sisestage teema loomiseks vajalik protsentuaalne sobivus. seab." -#: src/lang.c:1686 +#: src/lang.c:1689 msgid "Thread percentage match" msgstr "Teema protsentuaalne sobivus" -#: src/lang.c:1688 +#: src/lang.c:1691 #, no-c-format msgid "" "# Thread percentage match...\n" @@ -5645,11 +5644,11 @@ msgstr "" "# teemasse seotaks. Näiteks 'happy' ja 'harpy' sobiksid, aga 'harpie',\n" "# 'happie' ja 'harppy' samasse teemasse 'happy'-ga ei läheks\n" -#: src/lang.c:1700 +#: src/lang.c:1703 msgid "Score of a thread" msgstr "Teema kaal" -#: src/lang.c:1701 +#: src/lang.c:1704 msgid "" "# Thread score\n" "# Possible values are (the default is marked with *):\n" @@ -5663,18 +5662,18 @@ msgstr "" "# 1 = summa\n" "# 2 = keskmine\n" -#: src/lang.c:1709 +#: src/lang.c:1712 msgid "" "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "" "Järjesta artiklid Subject, From, Date, kaalu järgi. lülitab, " "seab." -#: src/lang.c:1710 +#: src/lang.c:1713 msgid "Sort articles by" msgstr "Artiklite järjestus" -#: src/lang.c:1711 +#: src/lang.c:1714 msgid "" "# Sort articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5704,16 +5703,16 @@ msgstr "" "# 9 = Ridu kahanev\n" "# 10 = Ridu kasvav\n" -#: src/lang.c:1727 +#: src/lang.c:1730 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "" "Järjesta teemad mitte millegi või kaalu järgi. lülitab, seab." -#: src/lang.c:1728 +#: src/lang.c:1731 msgid "Sort threads by" msgstr "Teemade järjestus" -#: src/lang.c:1729 +#: src/lang.c:1732 msgid "" "# Sort thread by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5731,49 +5730,49 @@ msgstr "" "# 3 = Viimane postitamise kuupäev kahanevalt\n" "# 4 = Viimane postitamise kuupäev kasvavalt\n" -#: src/lang.c:1739 +#: src/lang.c:1742 msgid "" "Put cursor at first/last unread art in groups. toggles & sets." msgstr "" "Vii kursor grupis esimesele/viimasele lugemata artiklile. lülitab, " " seab." -#: src/lang.c:1740 +#: src/lang.c:1743 msgid "Go to first unread article in group" msgstr "Mine grupis esimesele lugemata artiklile" -#: src/lang.c:1741 +#: src/lang.c:1744 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "" "# Kui väärtus on ON, vii kursor grupi esimesele lugemata artiklile,\n" "# muidu viimasele\n" -#: src/lang.c:1745 +#: src/lang.c:1748 msgid "Show all articles or only unread articles. toggles & sets." msgstr "Näita kõiki või ainult lugemata artikleid. lülitab, seab." -#: src/lang.c:1746 +#: src/lang.c:1749 msgid "Show only unread articles" msgstr "Näita ainult lugemata artikleid" -#: src/lang.c:1747 +#: src/lang.c:1750 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:1752 +#: src/lang.c:1755 msgid "Show only groups with unread arts" msgstr "Ainult lugemata artiklitega grupid" -#: src/lang.c:1753 +#: src/lang.c:1756 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:1758 +#: src/lang.c:1761 msgid "Filter which articles" msgstr "Filtreeri artikleid" -#: src/lang.c:1759 +#: src/lang.c:1762 msgid "" "# Filter which articles\n" "# Possible values are (the default is marked with *):\n" @@ -5787,11 +5786,11 @@ msgstr "" "# 1 = Surma kõik artiklid ja näita teemades märgiga K\n" "# 2 = Surma kõik artiklid ja ära näita neid\n" -#: src/lang.c:1768 +#: src/lang.c:1771 msgid "Go to the next unread article with" msgstr "Liigu järgmise lugemata artiklile klahviga" -#: src/lang.c:1769 +#: src/lang.c:1772 msgid "" "# Go to the unread article with following key(s)\n" "# Possible values are (the default is marked with *):\n" @@ -5807,11 +5806,11 @@ msgstr "" "# * 2 = TAB\n" "# 3 = LK alla või TAB\n" -#: src/lang.c:1779 +#: src/lang.c:1782 msgid "How to treat blank lines" msgstr "Kuidas käsitleda tühje ridasid" -#: src/lang.c:1780 +#: src/lang.c:1783 msgid "" "# Trim the article body, remove unnecessary blank lines.\n" "# Possible values are (the default is marked with *):\n" @@ -5838,28 +5837,28 @@ msgstr "" "# 6 = Tihenda read tekstiblokkide vahel ja eemalda lõpust\n" "# 7 = Tihenda read tekstiblokkide vahel ja eemalda algusest ja lõpust\n" -#: src/lang.c:1797 +#: src/lang.c:1800 msgid "List thread using right arrow key" msgstr "Nool paremale näitab teema loendit" -#: src/lang.c:1798 +#: src/lang.c:1801 msgid "" "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "" "# Kui väärtus on ON, näita nool paremale klahvi vajutamisel teema " "artikleid.\n" -#: src/lang.c:1802 +#: src/lang.c:1805 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "" "Sisestage sümbol kustutatud artiklite märkimiseks. seab, " "katkestab." -#: src/lang.c:1803 +#: src/lang.c:1806 msgid "Character to show deleted articles" msgstr "Kustutatud artiklite marker" -#: src/lang.c:1804 +#: src/lang.c:1807 msgid "" "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" @@ -5867,18 +5866,18 @@ msgstr "" "# Sümbol, mis tähistab kustutatud artiklit (vaikimisi 'D')\n" "# _ asendatakse tühikuga ' '\n" -#: src/lang.c:1809 +#: src/lang.c:1812 msgid "" "Enter character to indicate articles in a range. sets, cancels." msgstr "" "Sisestage sümbol, mis märgib vahemikku kuuluvaid artikleid. seab, " "katkestab." -#: src/lang.c:1810 +#: src/lang.c:1813 msgid "Character to show inrange articles" msgstr "Artiklite vahemiku marker" -#: src/lang.c:1811 +#: src/lang.c:1814 msgid "" "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" @@ -5886,17 +5885,17 @@ msgstr "" "# Sümbol, mis märgib vahemikku kuuluvaid artikleid (vaikimisi '#')\n" "# _ asendatakse tühikuga ' '\n" -#: src/lang.c:1816 +#: src/lang.c:1819 msgid "" "Enter character to indicate that article will return. sets, " "cancels." msgstr "Sisestage tagasituleva artikli marker. seab, katkestab." -#: src/lang.c:1817 +#: src/lang.c:1820 msgid "Character to show returning arts" msgstr "Tagasi tulnud artiklite marker" -#: src/lang.c:1818 +#: src/lang.c:1821 msgid "" "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" @@ -5904,16 +5903,16 @@ msgstr "" "# Sümbol, mis näitab, et artikkel tuleb tagasi (vaikimisi '-')\n" "# _ asendatakse tühikuga ' '\n" -#: src/lang.c:1823 +#: src/lang.c:1826 msgid "" "Enter character to indicate selected articles. sets, cancels." msgstr "Sisestage valitud artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1824 +#: src/lang.c:1827 msgid "Character to show selected articles" msgstr "Valitud artiklite marker" -#: src/lang.c:1825 +#: src/lang.c:1828 msgid "" "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" @@ -5921,16 +5920,16 @@ msgstr "" "# Sümbol, mis näitab, et artikkel on automaatselt valitud (vaikimisi '*')\n" "# _ asendatakse tühikuga ' '\n" -#: src/lang.c:1830 +#: src/lang.c:1833 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "" "Sisestage värskeid artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1831 +#: src/lang.c:1834 msgid "Character to show recent articles" msgstr "Värskete artiklite marker" -#: src/lang.c:1832 +#: src/lang.c:1835 msgid "" "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" @@ -5938,16 +5937,16 @@ msgstr "" "# Sümbol, mis näitab, et artikkel on värske (vaikimisi 'o')\n" "# _ asendatakse tühikuga ' '\n" -#: src/lang.c:1837 +#: src/lang.c:1840 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "" "Sisestage lugemata artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1838 +#: src/lang.c:1841 msgid "Character to show unread articles" msgstr "Lugemata artiklite marker" -#: src/lang.c:1839 +#: src/lang.c:1842 msgid "" "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" @@ -5955,15 +5954,15 @@ msgstr "" "# Sümbol, mis näitab, et artikkel on lugemata (vaikimisi '+')\n" "# _ asendatakse tühikuga ' '\n" -#: src/lang.c:1844 +#: src/lang.c:1847 msgid "Enter character to indicate read articles. sets, cancels." msgstr "Sisestage loetud artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1845 +#: src/lang.c:1848 msgid "Character to show read articles" msgstr "Loetud artiklite marker" -#: src/lang.c:1846 +#: src/lang.c:1849 msgid "" "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" @@ -5971,16 +5970,16 @@ msgstr "" "# Sümbol, mis näitab, et artikkel on loetud (vaikimisi ' ')\n" "# _ asendatakse tühikuga ' '\n" -#: src/lang.c:1851 +#: src/lang.c:1854 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "" "Sisestage surmatud artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1852 +#: src/lang.c:1855 msgid "Character to show killed articles" msgstr "Surmatud artiklite marker" -#: src/lang.c:1853 +#: src/lang.c:1856 msgid "" "# Character used to show that an art was killed (default 'K')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" @@ -5988,16 +5987,16 @@ msgstr "" "# Sümbol, mis näitab, et artikkel on surmatud (vaikimisi 'K')\n" "# _ asendatakse tühikuga ' '\n" -#: src/lang.c:1858 +#: src/lang.c:1861 msgid "" "Enter character to indicate read selected articles. sets, cancels." msgstr "Sisestage valitud artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1859 +#: src/lang.c:1862 msgid "Character to show readselected arts" msgstr "Lugemiseks valitud artiklite marker" -#: src/lang.c:1860 +#: src/lang.c:1863 msgid "" "# Character used to show that an art was selected before read (default ':')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" @@ -6005,11 +6004,11 @@ msgstr "" "# Sümbol, mis näitab, et artikkel on enne lugemist valitud (vaikimisi ':')\n" "# Surmamise tase peab samuti olema määratud, _ asendatakse tühikuga ' '\n" -#: src/lang.c:1866 +#: src/lang.c:1869 msgid "Abbreviate long newsgroup names" msgstr "Lühenda gruppide pikad nimed" -#: src/lang.c:1867 +#: src/lang.c:1870 msgid "" "# If ON abbreviate (if necessary) long newsgroup names at group selection\n" "# level and article level like this:\n" @@ -6019,7 +6018,7 @@ msgstr "" "# järgnevalt:\n" "# news.software.readers -> n.software.readers -> n.s.readers -> n.s.r.\n" -#: src/lang.c:1873 +#: src/lang.c:1876 msgid "" "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" @@ -6027,11 +6026,11 @@ msgstr "" "0 = kerida kogu leht, -1 = näita eelmist rida järgmise lehe esimese reana, " "-2 = pool lehte" -#: src/lang.c:1874 +#: src/lang.c:1877 msgid "Number of lines to scroll in pager" msgstr "Lehitsejas keritavate ridade arv" -#: src/lang.c:1875 +#: src/lang.c:1878 msgid "" "# Number of lines that cursor-up/down will scroll in article pager\n" "# Possible values are (the default is marked with *):\n" @@ -6049,29 +6048,29 @@ msgstr "" "# * 1 = rida haaval\n" "# 2 või suurem = keri 2 või enama rea haaval (ainult lehitsejas)\n" -#: src/lang.c:1885 +#: src/lang.c:1888 msgid "Display signatures. toggles & sets." msgstr "Näita signatuure, lülitab, seab." -#: src/lang.c:1886 +#: src/lang.c:1889 msgid "Display signatures" msgstr "Näita signatuure" -#: src/lang.c:1887 +#: src/lang.c:1890 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "# Kui väärtus on OFF, ei näita koos artiklitega signatuure\n" -#: src/lang.c:1891 +#: src/lang.c:1894 msgid "" "Display uuencoded data as tagged attachments. toggles & sets." msgstr "" "Näita uuenkodeeritud andmeid märgitud lisadena. lülitab ja seab." -#: src/lang.c:1892 +#: src/lang.c:1895 msgid "Display uue data as an attachment" msgstr "Näita uuenk. andmeid lisadena" -#: src/lang.c:1893 +#: src/lang.c:1896 msgid "" "# Handling of uuencoded data in the pager\n" "# Possible values are (the default is marked with *):\n" @@ -6091,18 +6090,18 @@ msgstr "" "# märgituna.\n" # -#: src/lang.c:1903 +#: src/lang.c:1906 msgid "" "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "" "Dekodeeri saksa TeX esituses tähed ISO koodideks. lülitab, seab." # -#: src/lang.c:1904 +#: src/lang.c:1907 msgid "Display \"a as Umlaut-a" msgstr "Näita \"a kui Umlaut-a" -#: src/lang.c:1905 +#: src/lang.c:1908 msgid "" "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" @@ -6110,15 +6109,15 @@ msgstr "" "# Kui väärtus on ON, teisenda saksa TeX esituses tähed ISO\n" "# koodideks ja näita \"a nagu Umlaut-a, jne.\n" -#: src/lang.c:1910 src/lang.c:1920 +#: src/lang.c:1913 src/lang.c:1923 msgid "Space separated list of header fields" msgstr "Tühikuga eraldatud päised" -#: src/lang.c:1911 +#: src/lang.c:1914 msgid "Display these header fields (or *)" msgstr "Näita neid päiseid (või *)" -#: src/lang.c:1912 +#: src/lang.c:1915 msgid "" "# Which news headers you wish to see. If you want to see _all_ the headers,\n" "# place an '*' as this value. This is the only way a wildcard can be used.\n" @@ -6135,11 +6134,11 @@ msgstr "" "tühikut.\n" "# Kui te väärtust ei määra, lülitatakse see omadus välja.\n" -#: src/lang.c:1921 +#: src/lang.c:1924 msgid "Do not display these header fields" msgstr "Ära näita neid päiseridu" -#: src/lang.c:1922 +#: src/lang.c:1925 msgid "" "# Same as 'news_headers_to_display' except it denotes the opposite.\n" "# An example of using both options might be if you thought X- headers were\n" @@ -6159,43 +6158,43 @@ msgstr "" "#\n" "# Kui te väärtust ei määra, lülitatakse see omadus välja.\n" -#: src/lang.c:1932 +#: src/lang.c:1935 msgid "" "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "" "Kas te soovite multipart/alternative artiklite automaatset käsitlemist?" -#: src/lang.c:1933 +#: src/lang.c:1936 msgid "Skip multipart/alternative parts" msgstr "Jäta multipart/alternative osad" -#: src/lang.c:1934 +#: src/lang.c:1937 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "" "# Kui väärtus on ON, loobu automaatselt multipart/alternative teadete " "lisadest\n" -#: src/lang.c:1938 +#: src/lang.c:1941 msgid "Enable detection of verbatim blocks? toggles & sets." msgstr "Luba identsete blokkide tuvastamine? lülitab, seab." -#: src/lang.c:1939 +#: src/lang.c:1942 msgid "Detection of verbatim blocks" msgstr "Identsete blokkide tuvastamine" -#: src/lang.c:1940 +#: src/lang.c:1943 msgid "# If ON detect verbatim blocks in articles\n" msgstr "# Kui väärtus on ON, tuvasta artiklis identsed blokid\n" -#: src/lang.c:1945 +#: src/lang.c:1948 msgid "A regex used to decide which lines to show in col_quote." msgstr "Regulaaravaldis otsustamaks, milliseid ridu tsitaatides näidata." -#: src/lang.c:1946 +#: src/lang.c:1949 msgid "Regex used to show quoted lines" msgstr "Tsiteeritud ridade näitamise regex" -#: src/lang.c:1947 +#: src/lang.c:1950 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" @@ -6205,15 +6204,15 @@ msgstr "" "# milliseid read on tsiteeritud. Tsiteeritud ridu näidatakse col_quote.\n" "# Kui te jätate selle tühjaks, kasutab tin sisseehitatud väärtust.\n" -#: src/lang.c:1953 +#: src/lang.c:1956 msgid "A regex used to decide which lines to show in col_quote2." msgstr "Regulaaravaldis otsustamaks, milliseid ridu näidata col_quote2." -#: src/lang.c:1954 +#: src/lang.c:1957 msgid "Regex used to show twice quoted l." msgstr "Topelt tsiteeritud ridu näitav reg" -#: src/lang.c:1955 +#: src/lang.c:1958 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" @@ -6224,15 +6223,15 @@ msgstr "" "# näidatakse col_quote2.\n" "# Kui te jätate selle tühjaks, kasutab tin sisseehitatud väärtust.\n" -#: src/lang.c:1961 +#: src/lang.c:1964 msgid "A regex used to decide which lines to show in col_quote3." msgstr "Regulaaravaldis otsustamaks, milliseid ridu näidata col_quote3." -#: src/lang.c:1962 +#: src/lang.c:1965 msgid "Regex used to show >= 3 times q.l." msgstr ">= 3 tsiteeritud ridu näitav reg" -#: src/lang.c:1963 +#: src/lang.c:1966 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" @@ -6243,27 +6242,27 @@ msgstr "" "# näidatakse col_quote3.\n" "# Kui te jätate selle tühjaks, kasutab tin sisseehitatud väärtust.\n" -#: src/lang.c:1969 +#: src/lang.c:1972 msgid "Enable detection of external quotes? toggles & sets." msgstr "Luba väliste tsitaatide tuvastamine? lülitab, seab." -#: src/lang.c:1970 +#: src/lang.c:1973 msgid "Detection of external quotes" msgstr "Väliste tsitaatide tuvastamine" -#: src/lang.c:1971 +#: src/lang.c:1974 msgid "# If ON detect quoted text from external sources in articles\n" msgstr "# Kui väärtus on ON, tuvasta artiklis välised tsitaadid\n" -#: src/lang.c:1975 +#: src/lang.c:1978 msgid "A regex used to decide which lines to show in col_extquote." msgstr "Regulaaravaldis otsustamaks, milliseid ridu col_extquote näitab." -#: src/lang.c:1976 +#: src/lang.c:1979 msgid "Regex used to show quotes from external sources" msgstr "Väliste tsitaatide ridade näitamise regex" -#: src/lang.c:1977 +#: src/lang.c:1980 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# external quotes. Text from external quotes is shown in col_extquote.\n" @@ -6273,15 +6272,15 @@ msgstr "" "# read on välised tsitaadid. Väliseid tsitaate näitab col_extquote.\n" "# Kui te jätate selle tühjaks, kasutab tin sisseehitatud väärtust.\n" -#: src/lang.c:1984 +#: src/lang.c:1987 msgid "A regex used to decide which words to show in col_markslashes." msgstr "Regex et otsustada, milliseid sõnu näidata col_markslashes abil." -#: src/lang.c:1985 +#: src/lang.c:1988 msgid "Regex used to highlight /slashes/" msgstr "Regex et esile tõsta /kaldkriipse/" -#: src/lang.c:1986 +#: src/lang.c:1989 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '/' are to be shown in col_markslashes.\n" @@ -6292,15 +6291,15 @@ msgstr "" "# sõnu näidata col_markslashes abil. Kui jätate selle tühjaks, kasutab\n" "# tin sisse ehitatud vaikeväärtust.\n" -#: src/lang.c:1992 +#: src/lang.c:1995 msgid "A regex used to decide which words to show in col_markstars." msgstr "Regex et otsustada, milliseid sõnu näidata col_markstars abil." -#: src/lang.c:1993 +#: src/lang.c:1996 msgid "Regex used to highlight *stars*" msgstr "Regex et esile tõsta *tärne*" -#: src/lang.c:1994 +#: src/lang.c:1997 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '*' are to be shown in col_markstars.\n" @@ -6311,15 +6310,15 @@ msgstr "" "# sõnu näidata col_markstars abil. Kui jätate selle tühjaks, kasutab\n" "# tin sisse ehitatud vaikeväärtust.\n" -#: src/lang.c:2000 +#: src/lang.c:2003 msgid "A regex used to decide which words to show in col_markstroke." msgstr "Regex et otsustada, milliseid sõnu näidata col_markstroke abil." -#: src/lang.c:2001 +#: src/lang.c:2004 msgid "Regex used to highlight -strokes-" msgstr "Regex et esile tõsta -kriipse-" -#: src/lang.c:2002 +#: src/lang.c:2005 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '-' are to be shown in col_markstroke.\n" @@ -6330,15 +6329,15 @@ msgstr "" "# sõnu näidata col_markstroke abil. Kui jätate selle tühjaks, kasutab\n" "# tin sisse ehitatud vaikeväärtust.\n" -#: src/lang.c:2008 +#: src/lang.c:2011 msgid "A regex used to decide which words to show in col_markdash." msgstr "Regex et otsustada, milliseid sõnu näidata col_markdash abil." -#: src/lang.c:2009 +#: src/lang.c:2012 msgid "Regex used to highlight _underline_" msgstr "Regex et esile tõsta _alakriipse_" -#: src/lang.c:2010 +#: src/lang.c:2013 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '_' are to be shown in col_markdash.\n" @@ -6349,16 +6348,16 @@ msgstr "" "# sõnu näidata col_markdash abil. Kui jätate selle tühjaks, kasutab\n" "# tin sisse ehitatud vaikeväärtust.\n" -#: src/lang.c:2016 +#: src/lang.c:2019 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "" "Regulaaravaldis eemaldatava teema prefiksi leidmiseks. Eraldajaks on '|'." -#: src/lang.c:2017 +#: src/lang.c:2020 msgid "Regex with Subject prefixes" msgstr "Regex teema prefiksi leidmiseks" -#: src/lang.c:2018 +#: src/lang.c:2021 msgid "" "# A regular expression that tin will use to find Subject prefixes\n" "# which will be removed before showing the header.\n" @@ -6366,16 +6365,16 @@ msgstr "" "# Regulaaravaldis, mida tin kasutab, et leida teema prefiksit, mida\n" "# enne päise näitamist eemaldada.\n" -#: src/lang.c:2023 +#: src/lang.c:2026 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "" "Regulaaravaldis eemaldatava teema sufiksi leidmiseks. Eraldajaks on '|'." -#: src/lang.c:2024 +#: src/lang.c:2027 msgid "Regex with Subject suffixes" msgstr "Regex teema sufiksi leidmiseks" -#: src/lang.c:2025 +#: src/lang.c:2028 msgid "" "# A regular expression that tin will use to find Subject suffixes\n" "# which will be removed when replying or posting followup.\n" @@ -6383,50 +6382,50 @@ msgstr "" "# Regulaaravaldis, mida tin kasutab teema sufiksi leidmiseks,\n" "# mis eemaldatakse vastuse saatmisel või postitamisel.\n" -#: src/lang.c:2030 +#: src/lang.c:2033 msgid "A regex used to find the begin of a verbatim block." msgstr "Regulaaravaldis identse bloki alguse tuvastamiseks." -#: src/lang.c:2031 +#: src/lang.c:2034 msgid "Regex for begin of a verbatim block" msgstr "Identse bloki alguse reg. avaldis" -#: src/lang.c:2032 +#: src/lang.c:2035 msgid "" "# A regular expression that tin will use to find the begin of\n" "# a verbatim block.\n" msgstr "# Regulaaravaldis, mida tin kasutab et leida identse bloki algust.\n" -#: src/lang.c:2037 +#: src/lang.c:2040 msgid "A regex used to find the end of a verbatim block." msgstr "Regulaaravaldis identse bloki lõpu tuvastamiseks." -#: src/lang.c:2038 +#: src/lang.c:2041 msgid "Regex for end of a verbatim block" msgstr "Identse bloki lõpu reg. avaldis" -#: src/lang.c:2039 +#: src/lang.c:2042 msgid "" "# A regular expression that tin will use to find the end of\n" "# a verbatim block.\n" msgstr "# Regulaaravaldis, mida tin kasutab et leida identse bloki lõppu.\n" -#: src/lang.c:2044 +#: src/lang.c:2047 msgid "" "Enter name and options for external MIME viewer, --internal for built-in " "viewer" msgstr "" "Sisestage välise MIME lehitseja nimi ja võtmed, sisemise valib --internal" -#: src/lang.c:2045 +#: src/lang.c:2048 msgid "MIME binary content viewer" msgstr "MIME kahendsisu lehitseja" -#: src/lang.c:2046 +#: src/lang.c:2049 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 " +"# Otherwise specify an external viewer program (eg. metamail) or leave " "blank\n" "# for no automatic viewing\n" msgstr "" @@ -6435,15 +6434,15 @@ msgstr "" "# Muidu määra automaatseks vaatamiseks väline programm (nt. metamail) või\n" "# jäta tühjaks\n" -#: src/lang.c:2053 +#: src/lang.c:2056 msgid "Confirm before starting non-text viewing program" msgstr "Küsi enne mitte-tekstiliste osade vaatamist kinnitust" -#: src/lang.c:2054 +#: src/lang.c:2057 msgid "Ask before using MIME viewer" msgstr "Küsi MIME lehitseja kasutamise luba" -#: src/lang.c:2055 +#: src/lang.c:2058 msgid "" "# If ON tin will ask before using metamail to display MIME messages\n" "# this only happens if metamail_prog is set to something\n" @@ -6451,48 +6450,48 @@ msgstr "" "# Kui väärtus on ON, küsi metamaili kasutamise luba\n" "# see juhtub ainult siis, kui metamail_prog on väärtustatud\n" -#: src/lang.c:2060 +#: src/lang.c:2063 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "" "Küsi, kas märkida väljumisel grupid loetuks. lülitab ja seab." -#: src/lang.c:2061 +#: src/lang.c:2064 msgid "Catchup read groups when quitting" msgstr "Väljumisel märkida grupid loetuks" -#: src/lang.c:2062 +#: src/lang.c:2065 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "" "# Kui väärtus on ON, küsi kasutajalt, kas märkida loetud gruppides kõik\n" "# artiklid loetuks\n" -#: src/lang.c:2067 +#: src/lang.c:2070 msgid "Catchup group using left key" msgstr "Nool vasakule märgib grupi loetuks" -#: src/lang.c:2068 +#: src/lang.c:2071 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "" "# Kui väärtus on ON, märgi grupp/teema loetuks, kui sellest väljutakse\n" "# nool vasakule klahviga.\n" -#: src/lang.c:2073 +#: src/lang.c:2076 msgid "Catchup thread by using left key" msgstr "Nool vasakule märgib teema loetuks" -#: src/lang.c:2079 +#: src/lang.c:2082 msgid "Which actions require confirmation" msgstr "Tegevused mis nõuavad kinnitust" -#: src/lang.c:2080 +#: src/lang.c:2083 msgid "# What should we ask confirmation for.\n" msgstr "# Millele me peaksime küsima kinnitust.\n" -#: src/lang.c:2085 +#: src/lang.c:2088 msgid "'Mark as (un)read' ignores tags" msgstr "'Märgi art. (mitte)loetuks' eirab märke" -#: src/lang.c:2086 +#: src/lang.c:2089 msgid "" "# If ON the 'Mark as (un)read' function marks only the current article.\n" msgstr "" @@ -6500,45 +6499,45 @@ msgstr "" "ainult\n" "# jooksva artikli.\n" -#: src/lang.c:2090 +#: src/lang.c:2093 msgid "Program to run to open URLs, sets, cancels." msgstr "Programm URLide avamiseks, seab, katkestab." -#: src/lang.c:2091 +#: src/lang.c:2094 msgid "Program that opens URLs" msgstr "Programm URLide avamiseks" -#: src/lang.c:2092 +#: src/lang.c:2095 msgid "# The program used to open URLs. The actual URL will be appended\n" msgstr "# Programm URLide avamiseks. URL lisatakse argumendiks\n" -#: src/lang.c:2097 +#: src/lang.c:2100 msgid "Use mouse in xterm" msgstr "Kasuta xterm aknas hiirt" -#: src/lang.c:2098 +#: src/lang.c:2101 msgid "# If ON enable mouse button support on xterm terminals\n" msgstr "# Kui väärtus on ON, luba xterm aknas hiire tugi\n" -#: src/lang.c:2104 +#: src/lang.c:2107 msgid "Use scroll keys on keypad" msgstr "Kasuta kerimisnuppe" -#: src/lang.c:2105 +#: src/lang.c:2108 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "" "# Kui väärtus on ON, luba kerimisnuppude kasutamist terminalidel, millel " "need on olemas\n" -#: src/lang.c:2110 +#: src/lang.c:2113 msgid "Enter maximum number of article to get. sets." msgstr "Sisestage suurim laetavate artiklite arv. seab." -#: src/lang.c:2111 +#: src/lang.c:2114 msgid "Number of articles to get" msgstr "Laetavate artiklite arv" -#: src/lang.c:2112 +#: src/lang.c:2115 msgid "" "# Number of articles to get (0=no limit), if negative sets maximum number\n" "# of already read articles to be read before first unread one\n" @@ -6546,29 +6545,29 @@ msgstr "" "# Laetavate artiklite arv (0=limiit puudub), negatiivne väärtus seab\n" "# maksimaalse arvu loetud artikleid, mida lugeda enne lugemata artiklit\n" -#: src/lang.c:2117 +#: src/lang.c:2120 msgid "Enter number of days article is considered recent. sets." msgstr "Sisestage artikli värskuse kestus. seab." -#: src/lang.c:2118 +#: src/lang.c:2121 msgid "Article recentness time limit" msgstr "Artikli värskuse ajapiir" -#: src/lang.c:2119 +#: src/lang.c:2122 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "# Päevad, mille jooksul loetakse artiklit värskeks, (0=OFF)\n" -#: src/lang.c:2123 +#: src/lang.c:2126 msgid "" "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "" "WILDMAT tavalistele jokkeritele, REGEX täisregulaaravaldistega otsimisele." -#: src/lang.c:2124 +#: src/lang.c:2127 msgid "Wildcard matching" msgstr "Jokkeritega otsimine" -#: src/lang.c:2125 +#: src/lang.c:2128 msgid "" "# Wildcard matching\n" "# Possible values are (the default is marked with *):\n" @@ -6580,60 +6579,60 @@ msgstr "" "# * 0 = wildmat\n" "# 1 = regex\n" -#: src/lang.c:2132 +#: src/lang.c:2135 msgid "Enter minimal score before an article is marked killed. sets." msgstr "Sisestage minimaalne kaal artikli surmamiseks. seab." -#: src/lang.c:2133 +#: src/lang.c:2136 msgid "Score limit (kill)" msgstr "Kaalu alampiir (surmamine)" -#: src/lang.c:2134 +#: src/lang.c:2137 msgid "# Score limit before an article is marked killed\n" msgstr "# Kaalu alampiir, enne kui artikkel märgitakse surmatuks\n" -#: src/lang.c:2138 +#: src/lang.c:2141 msgid "Enter default score to kill articles. sets." msgstr "Sisestage vaikimisi kaal artiklite surmamiseks. seab." -#: src/lang.c:2139 +#: src/lang.c:2142 msgid "Default score to kill articles" msgstr "Artiklite surmamise vaikimisi kaal" -#: src/lang.c:2140 +#: src/lang.c:2143 msgid "# Default score to kill articles\n" msgstr "# Vaikimisi kaal artiklite surmamiseks\n" -#: src/lang.c:2144 +#: src/lang.c:2147 msgid "Enter minimal score before an article is marked hot. sets." msgstr "" "Sisestage minimaalne kaal, enne kui artikkel märgitakse kuumaks. seab." -#: src/lang.c:2145 +#: src/lang.c:2148 msgid "Score limit (select)" msgstr "Kaalu alampiir (valik)" -#: src/lang.c:2146 +#: src/lang.c:2149 msgid "# Score limit before an article is marked hot\n" msgstr "# Kaalu alampiir, enne kui artikkel märgitakse muumaks\n" -#: src/lang.c:2150 +#: src/lang.c:2153 msgid "Enter default score to select articles. sets." msgstr "Sisestage vaikimisi kaal artiklite valimiseks. seab." -#: src/lang.c:2151 +#: src/lang.c:2154 msgid "Default score to select articles" msgstr "Vaikimisi kaal artiklite valimiseks" -#: src/lang.c:2152 +#: src/lang.c:2155 msgid "# Default score to select articles\n" msgstr "# Vaikimisi kaal artiklite valimiseks\n" -#: src/lang.c:2158 +#: src/lang.c:2161 msgid "Use slrnface to show ''X-Face:''s" msgstr "''X-Face:'' näitamiseks slrnface" -#: src/lang.c:2159 +#: src/lang.c:2162 msgid "" "# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n" "# Only useful when running in an xterm.\n" @@ -6641,19 +6640,19 @@ msgstr "" "# Kui väärtus on ON, kasutan ''X-Face:'' päiste käsitlemiseks slrnface(1).\n" "# Kasulik ainult xterm aknas.\n" -#: src/lang.c:2167 +#: src/lang.c:2170 msgid "Use ANSI color" msgstr "Kasuta ANSI värve" -#: src/lang.c:2168 +#: src/lang.c:2171 msgid "# If ON using ANSI-color\n" msgstr "# Kui väärtus on ON, kasuta ANSI värve\n" -#: src/lang.c:2173 +#: src/lang.c:2176 msgid "Standard foreground color" msgstr "Standardne esiplaani värv" -#: src/lang.c:2174 +#: src/lang.c:2177 msgid "" "# Standard foreground color\n" "# Default: -1 (default color)\n" @@ -6661,11 +6660,11 @@ msgstr "" "# Standardne esiplaani värv\n" "# Vaikimisi: -1 (vaikimisi värv)\n" -#: src/lang.c:2180 +#: src/lang.c:2183 msgid "Standard background color" msgstr "Standardne tagaplaani värv" -#: src/lang.c:2181 +#: src/lang.c:2184 msgid "" "# Standard background color\n" "# Default: -1 (default color)\n" @@ -6673,11 +6672,11 @@ msgstr "" "# Standardne tagaplaani värv\n" "# Vaikimisi: -1 (vaikimisi värv)\n" -#: src/lang.c:2187 +#: src/lang.c:2190 msgid "Color for inverse text (background)" msgstr "Pööratud teksti värv (tagaplaan)" -#: src/lang.c:2188 +#: src/lang.c:2191 msgid "" "# Color of background for inverse text\n" "# Default: 4 (blue)\n" @@ -6685,11 +6684,11 @@ msgstr "" "# Pööratud teksti tagaplaani värv\n" "# Vaikimisi: 4 (sinine)\n" -#: src/lang.c:2194 +#: src/lang.c:2197 msgid "Color for inverse text (foreground)" msgstr "Pööratud teksti värv (esiplaan)" -#: src/lang.c:2195 +#: src/lang.c:2198 msgid "" "# Color of foreground for inverse text\n" "# Default: 7 (white)\n" @@ -6697,11 +6696,11 @@ msgstr "" "# Pööratud teksti esiplaani värv\n" "# Vaikimisi: 7 (valge)\n" -#: src/lang.c:2201 +#: src/lang.c:2204 msgid "Color of text lines" msgstr "Tekstiridade värv" -#: src/lang.c:2202 +#: src/lang.c:2205 msgid "" "# Color of text lines\n" "# Default: -1 (default color)\n" @@ -6709,11 +6708,11 @@ msgstr "" "# Tekstiridade värv\n" "# Vaikimisi: -1 (vaikimisi värv)\n" -#: src/lang.c:2208 +#: src/lang.c:2211 msgid "Color of mini help menu" msgstr "Miniabiinfo värv" -#: src/lang.c:2209 +#: src/lang.c:2212 msgid "" "# Color of mini help menu\n" "# Default: 3 (brown)\n" @@ -6721,11 +6720,11 @@ msgstr "" "# Miniabiinfo värv\n" "# Vaikimisi: 3 (pruun)\n" -#: src/lang.c:2215 +#: src/lang.c:2218 msgid "Color of help text" msgstr "Abiinfo värv" -#: src/lang.c:2216 +#: src/lang.c:2219 msgid "" "# Color of help pages\n" "# Default: -1 (default color)\n" @@ -6733,11 +6732,11 @@ msgstr "" "# Abiinfo värv\n" "# Vaikimisi: -1 (vaikimisi värv)\n" -#: src/lang.c:2222 +#: src/lang.c:2225 msgid "Color of status messages" msgstr "Olekuteadete värv" -#: src/lang.c:2223 +#: src/lang.c:2226 msgid "" "# Color of messages in last line\n" "# Default: 6 (cyan)\n" @@ -6745,11 +6744,11 @@ msgstr "" "# Viimasel real olevate teadete värv\n" "# Default: 6 (lilla)\n" -#: src/lang.c:2229 +#: src/lang.c:2232 msgid "Color of quoted lines" msgstr "Tsitaadi värv" -#: src/lang.c:2230 +#: src/lang.c:2233 msgid "" "# Color of quote-lines\n" "# Default: 2 (green)\n" @@ -6757,11 +6756,11 @@ msgstr "" "# Tsitaadi värv\n" "# Vaikimisi: 2 (roheline)\n" -#: src/lang.c:2236 +#: src/lang.c:2239 msgid "Color of twice quoted line" msgstr "Topelt tsiteeritud rea värv" -#: src/lang.c:2237 +#: src/lang.c:2240 msgid "" "# Color of twice quoted lines\n" "# Default: 3 (brown)\n" @@ -6769,11 +6768,11 @@ msgstr "" "# Topelt tsiteeritud rea värv\n" "# Vaikimisi: 3 (pruun)\n" -#: src/lang.c:2243 +#: src/lang.c:2246 msgid "Color of =>3 times quoted line" msgstr "=>3 korda tsiteeritud rea värv" -#: src/lang.c:2244 +#: src/lang.c:2247 msgid "" "# Color of >=3 times quoted lines\n" "# Default: 4 (blue)\n" @@ -6781,11 +6780,11 @@ msgstr "" "# =>3 korda tsiteeritud rea värv\n" "# Vaikimisi: 4 (sinine)\n" -#: src/lang.c:2250 +#: src/lang.c:2253 msgid "Color of article header lines" msgstr "Artikli päiseridade värv" -#: src/lang.c:2251 +#: src/lang.c:2254 msgid "" "# Color of header-lines\n" "# Default: 2 (green)\n" @@ -6793,11 +6792,11 @@ msgstr "" "# Päiseridade värv\n" "# Vaikimisi: 2 (roheline)\n" -#: src/lang.c:2257 +#: src/lang.c:2260 msgid "Color of actual news header fields" msgstr "Artikli tegelike päiseridade värv" -#: src/lang.c:2258 +#: src/lang.c:2261 msgid "" "# Color of actual news header fields\n" "# Default: 9 (light red)\n" @@ -6805,11 +6804,11 @@ msgstr "" "# Artikli tegelike päiseridade värv\n" "# Vaikimisi: 9 (helepunane)\n" -#: src/lang.c:2264 +#: src/lang.c:2267 msgid "Color of article subject lines" msgstr "Artikli teemarea värv" -#: src/lang.c:2265 +#: src/lang.c:2268 msgid "" "# Color of article subject\n" "# Default: 6 (cyan)\n" @@ -6817,11 +6816,11 @@ msgstr "" "# Artikli teema värv\n" "# Vaikimisi: 6 (lilla)\n" -#: src/lang.c:2271 +#: src/lang.c:2274 msgid "Color of external quotes" msgstr "Väliste tsitaatide värv" -#: src/lang.c:2272 +#: src/lang.c:2275 msgid "" "# Color of quoted text from external sources\n" "# Default: 5 (pink)\n" @@ -6829,11 +6828,11 @@ msgstr "" "# Väliste tsitaatide värv\n" "# Vaikimisi: 5 (roosa)\n" -#: src/lang.c:2278 +#: src/lang.c:2281 msgid "Color of response counter" msgstr "Vastuste arvu loenduri värv" -#: src/lang.c:2279 +#: src/lang.c:2282 msgid "" "# Color of response counter\n" "# Default: 2 (green)\n" @@ -6841,11 +6840,11 @@ msgstr "" "# Vastuste arvu loenduri värv\n" "# Vaikimisi: 2 (roheline)\n" -#: src/lang.c:2285 +#: src/lang.c:2288 msgid "Color of sender (From:)" msgstr "Saatja värv (From:)" -#: src/lang.c:2286 +#: src/lang.c:2289 msgid "" "# Color of sender (From:)\n" "# Default: 2 (green)\n" @@ -6853,11 +6852,11 @@ msgstr "" "# Saatja värv (From:)\n" "# Vaikimisi: 2 (roheline)\n" -#: src/lang.c:2292 +#: src/lang.c:2295 msgid "Color of help/mail sign" msgstr "Abiinfo/kirja teate värv" -#: src/lang.c:2293 +#: src/lang.c:2296 msgid "" "# Color of Help/Mail-Sign\n" "# Default: 4 (blue)\n" @@ -6865,11 +6864,11 @@ msgstr "" "# Abiinfo/kirja teate värv\n" "# Vaikimisi: 4 (sinine)\n" -#: src/lang.c:2299 +#: src/lang.c:2302 msgid "Color of signatures" msgstr "Signatuuri värv" -#: src/lang.c:2300 +#: src/lang.c:2303 msgid "" "# Color of signature\n" "# Default: 4 (blue)\n" @@ -6877,11 +6876,11 @@ msgstr "" "# Signatuuri värv\n" "# Vaikimisi: 4 (sinine)\n" -#: src/lang.c:2306 +#: src/lang.c:2309 msgid "Color of highlighted URLs" msgstr "Esiletõstetud URLide värv" -#: src/lang.c:2307 +#: src/lang.c:2310 msgid "" "# Color of highlighted URLs\n" "# Default: -1 (default color)\n" @@ -6889,11 +6888,11 @@ msgstr "" "# Esiletõstetud URLide värv\n" "# Vaikimisi: -1 (vaikimisi värv)\n" -#: src/lang.c:2313 +#: src/lang.c:2316 msgid "Color of verbatim blocks" msgstr "Identsete blokkide värv" -#: src/lang.c:2314 +#: src/lang.c:2317 msgid "" "# Color of verbatim blocks\n" "# Default: 5 (pink)\n" @@ -6901,11 +6900,11 @@ msgstr "" "# Identsete blokkide värv\n" "# Vaikimisi: 5 (roosa)\n" -#: src/lang.c:2320 +#: src/lang.c:2323 msgid "Color of highlighting with *stars*" msgstr "*tärnidega* esiletõstmise värv" -#: src/lang.c:2321 +#: src/lang.c:2324 msgid "" "# Color of word highlighting with *stars*\n" "# Default: 11 (yellow)\n" @@ -6913,11 +6912,11 @@ msgstr "" "# *tärnidega* esiletõstmise värv\n" "# Vaikimisi: 11 (kollane)\n" -#: src/lang.c:2327 +#: src/lang.c:2330 msgid "Color of highlighting with _dash_" msgstr "_alakriipsudega_ esiletõstmise värv" -#: src/lang.c:2328 +#: src/lang.c:2331 msgid "" "# Color of word highlighting with _dash_\n" "# Default: 13 (light pink)\n" @@ -6925,11 +6924,11 @@ msgstr "" "# _alakriipsudega_ esiletõstmise värv\n" "# Vaikimisi: 13 (heleroosa)\n" -#: src/lang.c:2334 +#: src/lang.c:2337 msgid "Color of highlighting with /slash/" msgstr "/Kaldkriipsude/ esiletõstmise värv" -#: src/lang.c:2335 +#: src/lang.c:2338 msgid "" "# Color of word highlighting with /slash/\n" "# Default: 14 (light cyan)\n" @@ -6937,11 +6936,11 @@ msgstr "" "# /Kaldkriipsude/ esiletõstmise värv\n" "# Vaikimisi: 14 (helelilla)\n" -#: src/lang.c:2341 +#: src/lang.c:2344 msgid "Color of highlighting with -stroke-" msgstr "-Kriipsudega- esiletõstmise värv" -#: src/lang.c:2342 +#: src/lang.c:2345 msgid "" "# Color of word highlighting with -stroke-\n" "# Default: 12 (light blue)\n" @@ -6949,11 +6948,11 @@ msgstr "" "# -Kriipsudega- esiletõstmise värv\n" "# Vaikimisi: 12 (helesinine)\n" -#: src/lang.c:2349 +#: src/lang.c:2352 msgid "Attr. of highlighting with *stars*" msgstr "*tärnidega* esiletõstmise atribuut" -#: src/lang.c:2350 +#: src/lang.c:2353 msgid "" "# Attributes of word highlighting on mono terminals\n" "# Possible values are:\n" @@ -6981,11 +6980,11 @@ msgstr "" "# *tärnidega* esiletõstmise atribuut\n" "# Vaikimisi: 6 (paks)\n" -#: src/lang.c:2365 +#: src/lang.c:2368 msgid "Attr. of highlighting with _dash_" msgstr "_alakriipsudega_ esiletõstmise atr." -#: src/lang.c:2366 +#: src/lang.c:2369 msgid "" "# Attribute of word highlighting with _dash_\n" "# Default: 2 (best highlighting)\n" @@ -6993,11 +6992,11 @@ msgstr "" "# _alakriipsudega_ esiletõstmise atribuut\n" "# Vaikimisi: 2 (parim esiletõstmine)\n" -#: src/lang.c:2372 +#: src/lang.c:2375 msgid "Attr. of highlighting with /slash/" msgstr "/Kaldkriipsude/ esiletõstmise atr." -#: src/lang.c:2373 +#: src/lang.c:2376 msgid "" "# Attribute of word highlighting with /slash/\n" "# Default: 5 (half bright)\n" @@ -7005,37 +7004,37 @@ msgstr "" "# /Kaldkriipsude/ esiletõstmise atribuut\n" "# Vaikimisi: 5 (poolhele)\n" -#: src/lang.c:2379 +#: src/lang.c:2382 msgid "Attr. of highlighting with -stroke-" msgstr "-Kriipsudega- esiletõstmise atr." -#: src/lang.c:2380 +#: src/lang.c:2383 msgid "" "# Attribute of word highlighting with -stroke-\n" "# Default: 3 (reverse video)\n" msgstr "# Vaikimisi: 3 (pööratud video)\n" -#: src/lang.c:2386 +#: src/lang.c:2389 msgid "URL highlighting in message body" msgstr "Teate kehas URL esiletõstmine" -#: src/lang.c:2387 +#: src/lang.c:2390 msgid "# Enable URL highlighting?\n" msgstr "# Luba URLide esiletõstmine?\n" -#: src/lang.c:2392 +#: src/lang.c:2395 msgid "Word highlighting in message body" msgstr "Sõnade esiletõstmine teate kehas" -#: src/lang.c:2393 +#: src/lang.c:2396 msgid "# Enable word highlighting?\n" msgstr "# Lubada sõnade esiletõstmine?\n" -#: src/lang.c:2398 +#: src/lang.c:2401 msgid "What to display instead of mark" msgstr "Mida näidata märgi asemel" -#: src/lang.c:2399 +#: src/lang.c:2402 msgid "" "# Should the leading and ending stars and dashes also be displayed,\n" "# even when they are highlighting marks?\n" @@ -7051,59 +7050,59 @@ msgstr "" "# 1 - jah, näita märki\n" "# * 2 - trüki hoopis tühik\n" -#: src/lang.c:2408 +#: src/lang.c:2411 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "Sisestage veerg, millelt lehitseja hakkab ridu murdma. seab." -#: src/lang.c:2409 +#: src/lang.c:2412 msgid "Page line wrap column" msgstr "Rea murdmise veerg lehitsejas" -#: src/lang.c:2410 +#: src/lang.c:2413 msgid "# Wrap article lines at column\n" msgstr "# Murra artikli read antud veerus\n" -#: src/lang.c:2415 +#: src/lang.c:2418 msgid "Wrap around threads on next unread" msgstr "Liigu lugemata art-le ümber teemade" -#: src/lang.c:2416 +#: src/lang.c:2419 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "# Kui väärtus on ON, liigu lugemata artiklite otsingul ümber teemade\n" -#: src/lang.c:2420 +#: src/lang.c:2423 msgid "Enter default mail address (and fullname). sets." msgstr "Sisestage oma e-posti aadress (ja oma nimi). seab." -#: src/lang.c:2421 src/lang.c:2931 +#: src/lang.c:2424 src/lang.c:2939 msgid "Mail address (and fullname)" msgstr "E-posti aadress (ja teie nimi)" -#: src/lang.c:2422 +#: src/lang.c:2425 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:2427 +#: src/lang.c:2430 msgid "Show empty Followup-To in editor" msgstr "Näita toimetis tühja Followup-To" -#: src/lang.c:2428 +#: src/lang.c:2431 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "" "# Kui väärtus on ON, näita artikli toimetamisel tühja Followup-To rida\n" -#: src/lang.c:2432 +#: src/lang.c:2435 msgid "" "Enter path/! command/--none to create your default signature. sets." msgstr "" "Sisestage tee/! käsk/--none, et luua oma vaikimisi signatuur. seab." -#: src/lang.c:2433 +#: src/lang.c:2436 msgid "Create signature from path/command" msgstr "Signatuuri loomiseks tee/käsk" -#: src/lang.c:2434 +#: src/lang.c:2437 #, fuzzy, c-format msgid "" "# Signature path (random sigs)/file to be used when posting/replying\n" @@ -7117,41 +7116,41 @@ msgstr "" "# sigfile=!käsk käivitab käsu, mis genereerib signatuuri\n" "# sigfile=--none ära lisa signatuuri\n" -#: src/lang.c:2442 +#: src/lang.c:2445 msgid "" "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "Signatuurile eelnevale reale \"-- \". lülitab, seab." -#: src/lang.c:2443 +#: src/lang.c:2446 msgid "Prepend signature with \"-- \"" msgstr "Lisa signatuuri ette \"-- \"" -#: src/lang.c:2444 +#: src/lang.c:2447 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "# Kui väärtus on ON, lisa signatuuri ette '\\n-- \\n'\n" -#: src/lang.c:2448 +#: src/lang.c:2451 msgid "Add signature when reposting articles. toggles & sets." msgstr "Lisa artikli uuestipostitamisel signatuur. lülitab, seab." -#: src/lang.c:2449 +#: src/lang.c:2452 msgid "Add signature when reposting" msgstr "Lisa uuestipostitusel signatuur" -#: src/lang.c:2450 +#: src/lang.c:2453 msgid "# If ON add signature to reposted articles\n" msgstr "# Kui väärtus on ON, lisa uuestipostitatud artiklile signatuur\n" -#: src/lang.c:2454 +#: src/lang.c:2457 #, c-format msgid "Enter quotation marks, %s or %S for author's initials." msgstr "Sisestage tsitaadimärgid, %s või %S annab autori initsiaalid." -#: src/lang.c:2455 +#: src/lang.c:2458 msgid "Characters used as quote-marks" msgstr "Tsiteerimise märgid" -#: src/lang.c:2456 +#: src/lang.c:2459 #, c-format msgid "" "# Characters used in quoting to followups and replies.\n" @@ -7160,11 +7159,11 @@ msgstr "" "# Sümbolid, mida kasutada tsiteerimisel vastustes.\n" "# '_' asendatakse tühikuga ' ', %s, %S asendatakse autori initsiaalidega.\n" -#: src/lang.c:2462 +#: src/lang.c:2465 msgid "Quoting behavior" msgstr "Käitumine tsiteerimisel" -#: src/lang.c:2463 +#: src/lang.c:2466 msgid "" "# How quoting should be handled when following up or replying.\n" "# Possible values are (the default is marked with *):\n" @@ -7188,17 +7187,17 @@ msgstr "" "# 6 = Tsiteeri allkirju, tsiteeri tühje ridu\n" "# 7 = Tihenda tsitaadid, tsiteeri allkirju, tsiteeri tühje ridu\n" -#: src/lang.c:2476 src/lang.c:2484 src/lang.c:2490 +#: src/lang.c:2479 src/lang.c:2487 src/lang.c:2493 msgid "" "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "" "%A Aadr. %D Kuup. %F Aadr.+Nimi %G Grupp %M Message-ID %N Nimi %C Eesnimi" -#: src/lang.c:2477 +#: src/lang.c:2480 msgid "Quote line when following up" msgstr "Tsiteerimise rida vastamisel" -#: src/lang.c:2478 +#: src/lang.c:2481 msgid "" "# Format of quote line when mailing/posting/following-up an article\n" "# %A Address %D Date %F Addr+Name %G Groupname %M Message-ID\n" @@ -7208,38 +7207,38 @@ msgstr "" "# %A Aadress %D Kuup %F Aadr+Nimi %G Grupp %M Message-ID\n" "# %N Täielik nimi %C Eesnimi %I Initsiaalid\n" -#: src/lang.c:2485 +#: src/lang.c:2488 msgid "Quote line when cross-posting" msgstr "Tsiteerimise rida ristpostitusel" -#: src/lang.c:2491 +#: src/lang.c:2494 msgid "Quote line when mailing" msgstr "Tsiteerimise rida kirjutamisel" -#: src/lang.c:2496 +#: src/lang.c:2499 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "Kasuta User-Agent: päiserida. lülitab, seab." -#: src/lang.c:2497 +#: src/lang.c:2500 msgid "Insert 'User-Agent:' header" msgstr "Sisestage 'User-Agent:' päis" -#: src/lang.c:2498 +#: src/lang.c:2501 msgid "# If ON include advertising User-Agent: header\n" msgstr "# Kui väärtus on ON, lisa artikli päisesse User-Agent: rida\n" -#: src/lang.c:2503 +#: src/lang.c:2506 msgid "" "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" "Sisestage MIME kooditabeli nimi (n. US-ASCII, ISO-8859-15, EUC-KR), " "seab." -#: src/lang.c:2504 +#: src/lang.c:2507 msgid "MM_CHARSET" msgstr "MM_CHARSET" -#: src/lang.c:2505 +#: src/lang.c:2508 msgid "" "# Charset supported locally which is also used for MIME header and\n" "# Content-Type header.\n" @@ -7257,41 +7256,41 @@ msgstr "" "# loetakse mm_charset väärtusest erinev kooditabel mitte-näidatavaks\n" "# ja näitamisel kasutatakse '?'.\n" -#: src/lang.c:2515 +#: src/lang.c:2518 msgid "MM_NETWORK_CHARSET" msgstr "MM_NETWORK_CHARSET" -#: src/lang.c:2516 +#: src/lang.c:2519 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "# Postituste MIME (Content-Type) päises kasutatav kooditabel.\n" -#: src/lang.c:2520 +#: src/lang.c:2523 msgid "" "Enter local charset name (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" "Sisestage lokaalse kooditabeli nimi (n. UTF-8, ISO-8859-15), seab." -#: src/lang.c:2521 +#: src/lang.c:2524 msgid "MM_LOCAL_CHARSET" msgstr "MM_LOCAL_CHARSET" -#: src/lang.c:2522 +#: src/lang.c:2525 msgid "# Charset supported locally.\n" msgstr "# Lokaalne kooditabel.\n" -#: src/lang.c:2529 +#: src/lang.c:2532 msgid "Mailbox format" msgstr "Kirjade kataloog" -#: src/lang.c:2530 +#: src/lang.c:2533 msgid "# Format of the mailbox.\n" msgstr "# Kirjade kataloog.\n" -#: src/lang.c:2535 +#: src/lang.c:2538 msgid "MIME encoding in news messages" msgstr "Kasuta artiklites MIME kodeerimist" -#: src/lang.c:2536 +#: src/lang.c:2539 msgid "" "# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n" "# for mails and posts, if necessary. QP is efficient for most European\n" @@ -7305,15 +7304,15 @@ msgstr "" "# Base64 on kasulik enamuse 8 bitistele ida-aasia, kreeka ja vene\n" "# kooditabelitele, kus kasutatakse palju 8 bitiseid sümboleid.\n" -#: src/lang.c:2544 src/lang.c:2565 +#: src/lang.c:2547 src/lang.c:2568 msgid "Don't change unless you know what you are doing. cancels." msgstr "Ärge muutke, kui te ei tea, mida teete. katkestab." -#: src/lang.c:2545 +#: src/lang.c:2548 msgid "Use 8bit characters in news headers" msgstr "Kasuta artikli päises 8bit tähti" -#: src/lang.c:2546 +#: src/lang.c:2549 msgid "" "# If ON, 8bit characters in news headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -7325,30 +7324,30 @@ msgstr "" "# 8bit sümbolid päistes kodeeritakse sõltumata selle parameetri väärtusest,\n" "# v.a. juhul, kui post_mime_encoding väärtus on samuti 8bit.\n" -#: src/lang.c:2553 +#: src/lang.c:2556 msgid "" "Auto-view post-processed files toggles, sets, cancels." msgstr "" "Vaata töödeldud faile automaatselt lülitab, seab, " "katkestab." -#: src/lang.c:2554 +#: src/lang.c:2557 msgid "View post-processed files" msgstr "Vaata töödeldud faile" -#: src/lang.c:2555 +#: src/lang.c:2558 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:2560 +#: src/lang.c:2563 msgid "MIME encoding in mail messages" msgstr "Kasuta kirjades MIME kodeerimist" -#: src/lang.c:2566 +#: src/lang.c:2569 msgid "Use 8bit characters in mail headers" msgstr "Kasuta kirja päises 8bit tähti" -#: src/lang.c:2567 +#: src/lang.c:2570 msgid "" "# If ON, 8bit characters in mail headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -7365,11 +7364,11 @@ msgstr "" "# et RFC 2822 keelab 8bit sümbolid kirjade päistes, seega selle\n" "# parameetri väärtus ON ei ole soovitatav kasutada.\n" -#: src/lang.c:2578 +#: src/lang.c:2581 msgid "Strip blanks from ends of lines" msgstr "Eemalda tühikud realõppudest" -#: src/lang.c:2579 +#: src/lang.c:2582 msgid "" "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" @@ -7377,16 +7376,16 @@ msgstr "" "# Kui väärtus on ON, eemalda aeglaste terminalise töö kiirendamiseks\n" "# realõppudest tühikud.\n" -#: src/lang.c:2585 +#: src/lang.c:2588 msgid "If ON, use transliteration. toggles & sets." msgstr "" "Kui väärtus on ON, kasuta transliteratsiooni. lülitab, seab." -#: src/lang.c:2586 +#: src/lang.c:2589 msgid "Transliteration" msgstr "Transliteratsioon" -#: src/lang.c:2587 +#: src/lang.c:2590 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" @@ -7397,11 +7396,11 @@ msgstr "" "# ei saa esitada soovitavas kooditabelis, võib seda esitada kasutades\n" "# üht või enamat sarnast sümbolit.\n" -#: src/lang.c:2595 +#: src/lang.c:2598 msgid "Send you a Cc/Bcc automatically" msgstr "Saada automaatselt Cc/Bcc koopia" -#: src/lang.c:2596 +#: src/lang.c:2599 msgid "" "# Put your name in the Cc: and/or Bcc: field when mailing an article.\n" "# Possible values are (the default is marked with *):\n" @@ -7417,25 +7416,25 @@ msgstr "" "# 2 = Bcc\n" "# 3 = Cc ja Bcc\n" -#: src/lang.c:2607 +#: src/lang.c:2610 msgid "Hash algorithm for Cancel-Lock/Cancel-Key" msgstr "" -#: src/lang.c:2608 +#: src/lang.c:2611 msgid "" "# Hash algorithm for Cancel-Lock/Cancel-Key (default 'sha1')\n" "# Use 'none' to not generate Cancel-Lock headers.\n" msgstr "" -#: src/lang.c:2614 +#: src/lang.c:2617 msgid "Enter address elements about which you want to be warned. sets." msgstr "Sisestage aadressi komponendid, mille eest peaks hoiatama. seab." -#: src/lang.c:2615 +#: src/lang.c:2618 msgid "Spamtrap warning address parts" msgstr "Rämpsposti hoiatus aadressi osadele" -#: src/lang.c:2616 +#: src/lang.c:2619 msgid "" "# A comma-delimited list of address-parts you want to be warned\n" "# about when trying to reply by email.\n" @@ -7443,27 +7442,27 @@ msgstr "" "# Komaga eraldatud aadresside komponentide loend, mille kasutamisel\n" "# tuleks kasutajat hoiatada.\n" -#: src/lang.c:2621 +#: src/lang.c:2624 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "Sisestage kirje kehtivuse aeg päevades. seab." -#: src/lang.c:2622 +#: src/lang.c:2625 msgid "No. of days a filter entry is valid" msgstr "Filtri kehtivus päevades" -#: src/lang.c:2623 +#: src/lang.c:2626 msgid "# Number of days a short term filter will be active\n" msgstr "# lühiajalise filtri kehtivus päevades\n" -#: src/lang.c:2627 +#: src/lang.c:2630 msgid "Add posted articles to filter. toggles & sets." msgstr "Lisage postitatud artikkel filtrisse. lülitab, seab." -#: src/lang.c:2628 +#: src/lang.c:2631 msgid "Add posted articles to filter" msgstr "Lisage postitatud artikkel filtrile" -#: src/lang.c:2629 +#: src/lang.c:2632 msgid "" "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" @@ -7471,24 +7470,24 @@ msgstr "" "# Kui väärtus on ON, lisa postitatud artiklid, mis alustavad uut teemat,\n" "# filtrile, mis märgistab vastuseid\n" -#: src/lang.c:2633 +#: src/lang.c:2636 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "Kataloog, kuhu artikleid/teemasid salvestatakse kirjaformaadis." -#: src/lang.c:2634 +#: src/lang.c:2637 msgid "Mail directory" msgstr "Kirjade kataloog" -#: src/lang.c:2635 +#: src/lang.c:2638 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "" "# (-m) kataloog, kuhu artikleid/teemasid salvestatakse kirjaformaadis\n" -#: src/lang.c:2640 +#: src/lang.c:2643 msgid "Save articles in batch mode (-S)" msgstr "Salvesta artiklid pakettmoodis (-S)" -#: src/lang.c:2641 +#: src/lang.c:2644 msgid "" "# If ON articles/threads will be saved in batch mode when save -S\n" "# or mail (-M/-N) is specified on the command line\n" @@ -7496,30 +7495,30 @@ msgstr "" "# Kui väärtus on ON, artiklid salvestatakse pakettmoodis, kui käsureal\n" "# on kasutatud võtmeid salvestamiseks -S või saatmiseks -M, -N\n" -#: src/lang.c:2646 +#: src/lang.c:2649 msgid "The directory where you want articles/threads saved." msgstr "Kataloog, kuhu te soovite artikleid salvestada." -#: src/lang.c:2647 +#: src/lang.c:2650 msgid "Directory to save arts/threads in" msgstr "Kataloog artiklite salvestamiseks" -#: src/lang.c:2648 +#: src/lang.c:2651 msgid "# Directory where articles/threads are saved\n" msgstr "# Kataloog, kuhu salvestatakse artiklid/teemad\n" -#: src/lang.c:2652 +#: src/lang.c:2655 msgid "" "Auto save article/thread by Archive-name: header. toggles & " "sets." msgstr "" "Salvesta artiklid Archive-name: päiserea järgi. lülitab, seab." -#: src/lang.c:2653 +#: src/lang.c:2656 msgid "Use Archive-name: header for save" msgstr "Kasuta salvestamisel Archive-name:" -#: src/lang.c:2654 +#: src/lang.c:2657 msgid "" "# If ON articles/threads with Archive-name: in mail header will\n" "# be automatically saved with the Archive-name & part/patch no.\n" @@ -7527,7 +7526,7 @@ msgstr "" "# Kui väärtus on ON, salvestatakse artiklid/teemad, mis omavad päiserida\n" "# Archive-name:, automaatselt selle reaga määratud nime ja osa numbriga.\n" -#: src/lang.c:2659 +#: src/lang.c:2662 msgid "" "Mark saved articles/threads as read. toggles, sets, " "cancels." @@ -7535,23 +7534,23 @@ msgstr "" "Märgi salvestatud artiklid loetuks. lülitab, seab, " "katkestab." -#: src/lang.c:2660 +#: src/lang.c:2663 msgid "Mark saved articles/threads as read" msgstr "Märgi salvestatud artiklid loetuks" -#: src/lang.c:2661 +#: src/lang.c:2664 msgid "# If ON mark articles that are saved as read\n" msgstr "# Kui väärtus on ON, märgi salvestatud artiklid loetuks\n" -#: src/lang.c:2665 +#: src/lang.c:2668 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "Teosta salvestatud artiklitel järeltöötlemist (nt. lisade eraldamist)." -#: src/lang.c:2666 +#: src/lang.c:2669 msgid "Post process saved articles" msgstr "Salvestatud artikl. järeltöötlemine" -#: src/lang.c:2667 +#: src/lang.c:2670 msgid "" "# Perform post processing (saving binary attachments) from saved articles.\n" "# Possible values are (the default is marked with *):\n" @@ -7565,11 +7564,11 @@ msgstr "" "# 1 = jah\n" "# 2 = eralda ainult shelli arhiivid (shar)\n" -#: src/lang.c:2676 +#: src/lang.c:2679 msgid "Process only unread articles" msgstr "Töötle ainult lugemata artikleid" -#: src/lang.c:2677 +#: src/lang.c:2680 msgid "" "# If ON only save/print/pipe/mail unread articles (tagged articles " "excepted)\n" @@ -7577,60 +7576,60 @@ msgstr "" "# Kui väärtus on ON, salvesta/trüki/torusse/saada lugemata artikleid\n" "# (eeldatakse märgitud artikleid).\n" -#: src/lang.c:2682 +#: src/lang.c:2685 msgid "Print all or just part of header. toggles & sets." msgstr "Trüki kõik või ainult osa päisest. lülitab, seab." -#: src/lang.c:2683 +#: src/lang.c:2686 msgid "Print all headers when printing" msgstr "Trükkimisel trüki kõik päised" -#: src/lang.c:2684 +#: src/lang.c:2687 msgid "" "# If ON print all of article header otherwise just the important lines\n" msgstr "" "# Kui väärtus on ON, trüki kogu artikli päis, muidu ainult tähtsamad read\n" -#: src/lang.c:2688 +#: src/lang.c:2691 msgid "" "The printer program with options that is to be used to print articles/" "threads." msgstr "" "Programm koos argumentidega, mida kasutatakse artiklite/teemade trükkimiseks." -#: src/lang.c:2689 +#: src/lang.c:2692 msgid "Printer program with options" msgstr "Trükikäsk koos võtmetega" -#: src/lang.c:2690 +#: src/lang.c:2693 msgid "# Print program with parameters used to print articles/threads\n" msgstr "" "# Programm koos argumentidega, mida kasutatakse artiklite/teemade " "trükkimiseks\n" -#: src/lang.c:2696 +#: src/lang.c:2699 msgid "Force redraw after certain commands" msgstr "Värskenda ekraani peale käske" -#: src/lang.c:2697 +#: src/lang.c:2700 msgid "" "# If ON a screen redraw will always be done after certain external commands\n" msgstr "" "# Kui väärtus on ON, värskendatakse alati peale teatud väliseid käske " "ekraani\n" -#: src/lang.c:2701 +#: src/lang.c:2704 msgid "" "Start editor with line offset. toggles, sets, cancels." msgstr "" "Käivita tekstitoimeti etteantud real. lülitab, seab, " "katkestab." -#: src/lang.c:2702 +#: src/lang.c:2705 msgid "Start editor with line offset" msgstr "Käivita tekstitoimeti reanumbril" -#: src/lang.c:2703 +#: src/lang.c:2706 msgid "" "# If ON editor will be started with cursor offset into the file\n" "# otherwise the cursor will be positioned at the first line\n" @@ -7639,16 +7638,16 @@ msgstr "" "# vastavale reale. Vastasel korral positsioneeritakse kursor esimesele " "reale\n" -#: src/lang.c:2708 +#: src/lang.c:2711 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "" "Kasutage %E toimeti kohal, %F failinime kohal, %N reanumbrina, seab." -#: src/lang.c:2709 +#: src/lang.c:2712 msgid "Invocation of your editor" msgstr "Teie tekstitoimeti" -#: src/lang.c:2710 +#: src/lang.c:2713 msgid "" "# Format of editor line including parameters\n" "# %E Editor %F Filename %N Linenumber\n" @@ -7656,16 +7655,16 @@ msgstr "" "# Tekstitoimeti rea formaat koos parameetritega\n" "# %E Toimeti %F Failinimi %N Reanumber\n" -#: src/lang.c:2715 +#: src/lang.c:2718 msgid "" "Enter name and options for external-inews, --internal for internal inews" msgstr "Sisestage välise inews käsu nimi ja võtmed, sisemise valib --internal" -#: src/lang.c:2716 +#: src/lang.c:2719 msgid "External inews" msgstr "Väline inews" -#: src/lang.c:2717 +#: src/lang.c:2720 msgid "" "# If --internal use the built in mini inews for posting via NNTP\n" "# otherwise use an external inews program\n" @@ -7673,18 +7672,18 @@ msgstr "" "# Kui on --internal, kasuta NNTP postitustel sisseehitatud inews käsku\n" "# muidu kasuta välist inews programmi\n" -#: src/lang.c:2721 +#: src/lang.c:2724 msgid "" "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" "Kasutage %M programmi kohal, %S teema kohal, %T saaja kohal, %F failinime " "kohal, seab." -#: src/lang.c:2722 +#: src/lang.c:2725 msgid "Invocation of your mail command" msgstr "Teie e-posti käsk" -#: src/lang.c:2723 +#: src/lang.c:2726 msgid "" "# Format of mailer line including parameters\n" "# %M Mailer %S Subject %T To %F Filename\n" @@ -7696,11 +7695,11 @@ msgstr "" "# näiteks. kasutada saatjana elm programmi: elm -s \"%S\" \"%T\" < %F\n" "# näiteks. elm interaktiivses moodis : elm -i %F -s \"%S\" \"%T\"\n" -#: src/lang.c:2731 +#: src/lang.c:2734 msgid "Use interactive mail reader" msgstr "Kasuta interaktiivset e-posti" -#: src/lang.c:2732 +#: src/lang.c:2735 msgid "" "# Interactive mailreader\n" "# Possible values are (the default is marked with *):\n" @@ -7714,33 +7713,33 @@ msgstr "" "# 1 = kasuta interaktiivset e-posti programmi koos päistega\n" "# 2 = kasuta interaktiivset e-posti programmi päisteta\n" -#: src/lang.c:2741 +#: src/lang.c:2744 msgid "Remove ~/.article after posting" msgstr "Eemalda ~/.article peale postitust" -#: src/lang.c:2742 +#: src/lang.c:2745 msgid "# If ON remove ~/.article after posting.\n" msgstr "# Kui väärtus on ON, kustuta ~/.article peale postitust.\n" -#: src/lang.c:2748 +#: src/lang.c:2751 msgid "Use UTF-8 graphics (thread tree etc.)" msgstr "Kasuta UTF-8 graafikat (teema puu jne.)" -#: src/lang.c:2749 +#: src/lang.c:2752 msgid "" "# If ON use UTF-8 characters for indicator '->', tree and ellipsis '...'.\n" msgstr "# Kasuta UTF-8 sümboleid märkimaks '->', puud ja punkte '...'.\n" -#: src/lang.c:2754 +#: src/lang.c:2757 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "" "Failinimi postitatud artiklitele. seab. Nime puudumisel ei salvestata." -#: src/lang.c:2755 +#: src/lang.c:2758 msgid "Filename for posted articles" msgstr "Failinimi postitatud artiklitele" -#: src/lang.c:2756 +#: src/lang.c:2759 msgid "" "# Filename where to keep all postings (default posted)\n" "# If no filename is set then postings will not be saved\n" @@ -7748,39 +7747,39 @@ msgstr "" "# Failinimi, kus hoida kõiki postitusi (vaikimisi posted)\n" "# Kui nime pole, siis postitusi ei salvestata\n" -#: src/lang.c:2761 +#: src/lang.c:2764 msgid "" "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "" "Hoia ebaõnnestunud postitused failis ~/dead.articles. lülitab ja " " seab." -#: src/lang.c:2762 +#: src/lang.c:2765 msgid "Keep failed arts in ~/dead.articles" msgstr "Vigased artiklid ~/dead.articles" -#: src/lang.c:2763 +#: src/lang.c:2766 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "" "# Kui väärtus on ON, hoia ebaõnnestunud postitused failis ~/dead.articles\n" -#: src/lang.c:2767 +#: src/lang.c:2770 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "Kas te soovite eemaldada tellimata grupid .newsrc failist" -#: src/lang.c:2768 +#: src/lang.c:2771 msgid "No unsubscribed groups in newsrc" msgstr "newsrcs ainult tellitud grupid" -#: src/lang.c:2769 +#: src/lang.c:2772 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "# Kui väärtus on ON, eemalda tellimata grupid newsrc failist\n" -#: src/lang.c:2774 +#: src/lang.c:2777 msgid "Remove bogus groups from newsrc" msgstr "Eemalda olematud grupid" -#: src/lang.c:2775 +#: src/lang.c:2778 msgid "" "# What to do with bogus groups in newsrc file\n" "# Possible values are (the default is marked with *):\n" @@ -7794,67 +7793,67 @@ msgstr "" "# 1 = Eemalda\n" "# 2 = Märgi valikuekraanil lipuga D\n" -#: src/lang.c:2784 +#: src/lang.c:2787 msgid "" "Enter number of seconds to wait for a response from the server. sets." msgstr "Sisestage serverilt vastuse ootamise aeg sekundites. seab." -#: src/lang.c:2785 +#: src/lang.c:2788 msgid "NNTP read timeout in seconds" msgstr "NNTP lugemise taimout sekundites" -#: src/lang.c:2786 +#: src/lang.c:2789 msgid "" "# Time in seconds to wait for a response from the server (0=no timeout)\n" msgstr "# Serverilt vastuse ootamise aeg sekundites (0=piiramata)\n" -#: src/lang.c:2791 +#: src/lang.c:2794 msgid "Enter number of seconds until active file will be reread. sets." msgstr "Sisestage aktiivsete faili lugemise intervall sekundites. seab." -#: src/lang.c:2792 +#: src/lang.c:2795 msgid "Interval in secs to reread active" msgstr "Aktiivsete faili lugemise intervall" -#: src/lang.c:2793 +#: src/lang.c:2796 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:2798 +#: src/lang.c:2801 msgid "Reconnect to server automatically" msgstr "Taasta automaatselt NNTP ühendus" -#: src/lang.c:2799 +#: src/lang.c:2802 msgid "" "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "" "# Kui väärtus on ON, ürita NNTP serveriga ühenduse katkemisel ühendust\n" "# automaatselt taastada\n" -#: src/lang.c:2803 +#: src/lang.c:2806 msgid "" "Create local copies of NNTP overview files. toggles & sets." msgstr "" "Loo NNTP overview failidest lokaalne koopia. lülitab ja seab." -#: src/lang.c:2804 +#: src/lang.c:2807 msgid "Cache NNTP overview files locally" msgstr "Puhverda NNTP overview lokaalselt" -#: src/lang.c:2805 +#: src/lang.c:2808 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "# Kui väärtus on ON, loo NNTP overview failidest lokaalsed koopiad.\n" -#: src/lang.c:2809 src/lang.c:2824 src/lang.c:2844 src/lang.c:2863 +#: src/lang.c:2812 src/lang.c:2827 src/lang.c:2847 src/lang.c:2866 msgid "Enter format string. sets, cancels." msgstr "Sisestage vormingusõne. seab, katkestab." -#: src/lang.c:2810 +#: src/lang.c:2813 msgid "Format string for selection level" msgstr "Valiku taseme vormingusõne" -#: src/lang.c:2811 +#: src/lang.c:2814 msgid "" "# Format string for selection level representation\n" "# Default: %f %n %U %G %d\n" @@ -7879,11 +7878,11 @@ msgstr "" "# %n Number, rea number ekraanil\n" "# %U Lugemata\n" -#: src/lang.c:2825 +#: src/lang.c:2828 msgid "Format string for group level" msgstr "Gruppide taseme vormingusõne" -#: src/lang.c:2826 +#: src/lang.c:2829 msgid "" "# Format string for group level representation\n" "# Default: %n %m %R %L %s %F\n" @@ -7918,11 +7917,11 @@ msgstr "" "# %s Teema (ainult grupi tasemes)\n" "# %S Skoor\n" -#: src/lang.c:2845 +#: src/lang.c:2848 msgid "Format string for thread level" msgstr "Teema taseme vormingusõne" -#: src/lang.c:2846 +#: src/lang.c:2849 msgid "" "# Format string for thread level representation\n" "# Default: %n %m [%L] %T %F\n" @@ -7954,19 +7953,19 @@ msgstr "" "# %S Skoor\n" "# %T Teema puu (ainult teema tase)\n" -#: src/lang.c:2864 +#: src/lang.c:2867 msgid "Format string for display of dates" msgstr "Kuupäevade esitamise vormingusõne" -#: src/lang.c:2865 +#: src/lang.c:2868 msgid "# Format string for date representation\n" msgstr "# Vormingusõne kuupäevade esitamiseks\n" -#: src/lang.c:2871 +#: src/lang.c:2878 msgid "Unicode normalization form" msgstr "Unikoodi normaliseerimise kuju" -#: src/lang.c:2872 +#: src/lang.c:2879 msgid "" "# Unicode normalization form\n" "# Possible values are:\n" @@ -7975,6 +7974,7 @@ msgid "" "# 2 = NFKD\n" "# 3 = NFC\n" "# 4 = NFD\n" +"# 5 = NFKC_CF\n" msgstr "" "# Unikoodi normaliseerimine\n" "# Võimalikud väärtused on:\n" @@ -7983,20 +7983,21 @@ msgstr "" "# 2 = NFKD\n" "# 3 = NFC\n" "# 4 = NFD\n" +"# 5 = NFKC_CF\n" -#: src/lang.c:2885 +#: src/lang.c:2893 msgid "Render BiDi" msgstr "Renderda BiDi" -#: src/lang.c:2886 +#: src/lang.c:2894 msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "# Kui väärtus on ON, renderdab tin mitmesuunalist (BiDi) teksti\n" -#: src/lang.c:2893 +#: src/lang.c:2901 msgid "Function for sorting articles" msgstr "Failinimi järjestatud artiklitele" -#: src/lang.c:2894 +#: src/lang.c:2902 msgid "" "# Function for sorting articles\n" "# Possible values are (the default is marked with *):\n" @@ -8008,185 +8009,185 @@ msgstr "" "# * 0 = qsort\n" "# 1 = heapsort\n" -#: src/lang.c:2907 +#: src/lang.c:2915 msgid "Automatically GroupMarkUnselArtRead" msgstr "Automaatselt GroupMarkUnselArtRead" -#: src/lang.c:2913 +#: src/lang.c:2921 msgid "Delete post-process files" msgstr "Kustuta järel-töödeldud failid" -#: src/lang.c:2918 +#: src/lang.c:2926 msgid "Filename for all mailed articles, sets, no filename=do not save." msgstr "" "Failinimi mailitud artiklitele. seab. Nime puudumisel ei salvestata." -#: src/lang.c:2919 +#: src/lang.c:2927 msgid "Mailbox to save sent mails" msgstr "Saadetud e-mailide postkast" -#: src/lang.c:2924 +#: src/lang.c:2932 msgid "Set Followup-To: header to this group(s). sets, cancels." msgstr "Sea grup(p)i(de)le Followup-To: päis. seab, katkestab." -#: src/lang.c:2925 +#: src/lang.c:2933 msgid "Followup-To: header" msgstr "Followup-To: päis" -#: src/lang.c:2930 +#: src/lang.c:2938 msgid "Enter default mail address (and fullname). sets, cancels." msgstr "" "Sisestage oma e-posti aadress (ja oma nimi). seab, katkestab." -#: src/lang.c:2937 +#: src/lang.c:2945 msgid "" "Path and options for ispell-like spell-checker. sets, cancels." msgstr "" "ispell või selle analoogi tee ja argumendid, seab, katkestab." -#: src/lang.c:2938 +#: src/lang.c:2946 msgid "Ispell program" msgstr "Ispell programm" -#: src/lang.c:2944 +#: src/lang.c:2952 msgid "When group is a mailing list, send responses to this email address." msgstr "Kui grupp on postiloend, saada vastused sel aadressil." -#: src/lang.c:2945 +#: src/lang.c:2953 msgid "Mailing list address" msgstr "Postiloendi aadress" -#: src/lang.c:2951 +#: src/lang.c:2959 msgid "Forward articles as attachment" msgstr "Edasta artiklid manusena" -#: src/lang.c:2956 +#: src/lang.c:2964 msgid "" "A comma separated list of MIME major/minor Content-Types. cancels." msgstr "Komaga eraldatud loend MIME põhi/alam sisu tüüpidest. katkestab." -#: src/lang.c:2957 +#: src/lang.c:2965 msgid "Which MIME types will be saved" msgstr "Millised MIME tüübid salvestatakse" -#: src/lang.c:2962 +#: src/lang.c:2970 msgid "Value of the Organization: header. sets, cancels." msgstr "Organization: päise väärtus. seab, katkestab." -#: src/lang.c:2963 +#: src/lang.c:2971 msgid "Organization: header" msgstr "Organization: päis" -#: src/lang.c:2968 +#: src/lang.c:2976 msgid "Filename for saved articles. sets, cancels." msgstr "Salvestatud artiklite fail. seab, katkestab." -#: src/lang.c:2969 +#: src/lang.c:2977 msgid "savefile" msgstr "fail salvestamiseks" -#: src/lang.c:2974 src/lang.c:2998 +#: src/lang.c:2982 src/lang.c:3006 msgid "Scope for the filter rule. sets, cancels." msgstr "Filtri reegli skoop. seab, katkestab." -#: src/lang.c:2975 +#: src/lang.c:2983 msgid "Quick (1 key) select filter scope" msgstr "Kiirvaliku (1 klahv) filtri skoop" -#: src/lang.c:2980 src/lang.c:3004 +#: src/lang.c:2988 src/lang.c:3012 msgid "Header for filter rule. sets, cancels." msgstr "Filtri reegli päis. seab, katkestab." -#: src/lang.c:2981 +#: src/lang.c:2989 msgid "Quick (1 key) select filter header" msgstr "Kiire (1 klahvi) valik päiste filtreerimiseks" -#: src/lang.c:2986 src/lang.c:3010 +#: src/lang.c:2994 src/lang.c:3018 msgid "ON = case sensitive, OFF = ignore case. sets, cancels." msgstr "ON = tõstutundlik, OFF = tõstutundetu. seab, katkestab." -#: src/lang.c:2987 +#: src/lang.c:2995 msgid "Quick (1 key) select filter case" msgstr "Kiirvaliku (1 klahv) valiku filtri tõstutundlikkus" -#: src/lang.c:2992 src/lang.c:3016 +#: src/lang.c:3000 src/lang.c:3024 msgid "ON = expire, OFF = don't ever expire. sets, cancels." msgstr "ON = aegub, OFF = ei aegu. seab, katkestab." -#: src/lang.c:2993 +#: src/lang.c:3001 msgid "Quick (1 key) select filter expire" msgstr "Kiirvalikuga (1 klahv) aegumise filter" -#: src/lang.c:2999 +#: src/lang.c:3007 msgid "Quick (1 key) kill filter scope" msgstr "Kiirsurmamise (1 klahv) filtri skoop" -#: src/lang.c:3005 +#: src/lang.c:3013 msgid "Quick (1 key) kill filter header" msgstr "Kiirvalikuga (1 klahv) surmamise filtri päis" -#: src/lang.c:3011 +#: src/lang.c:3019 msgid "Quick (1 key) kill filter case" msgstr "Kiirsurmamise (1 klahv) filtri tõstutundlikkus" -#: src/lang.c:3017 +#: src/lang.c:3025 msgid "Quick (1 key) kill filter expire" msgstr "Kiirvalikuga (1 klahv) surmamise filtri aegumine" -#: src/lang.c:3023 +#: src/lang.c:3031 msgid "Assume this charset if no charset declaration is present, to set." msgstr "Kui kooditabelit pole määratud, kasuta seda kooditabelit, seab." -#: src/lang.c:3024 +#: src/lang.c:3032 msgid "UNDECLARED_CHARSET" msgstr "UNDECLARED_CHARSET" -#: src/lang.c:3030 +#: src/lang.c:3038 msgid "" "Add this text at the start of the message body. sets, cancels." msgstr "Lisa see tekst teate keha algusse. seab, katkestab." -#: src/lang.c:3031 +#: src/lang.c:3039 msgid "X_Body" msgstr "X_Body" -#: src/lang.c:3036 +#: src/lang.c:3044 msgid "Insert this header when posting. sets, cancels." msgstr "Lisa postitamisel see päis. seab, katkestab." -#: src/lang.c:3037 +#: src/lang.c:3045 msgid "X_Headers" msgstr "X_Headers" -#: src/lang.c:3042 +#: src/lang.c:3050 msgid "" "Automatically insert an X-Comment-To: header? toggles & sets." msgstr "Lisa automaatselt X-Comment-To: päis? lülitab, seab." -#: src/lang.c:3043 +#: src/lang.c:3051 msgid "Insert 'X-Comment-To:' header" msgstr "Sisestage 'X-Comment-To:' päis" #. TODO: lang.c -#: src/main.c:801 +#: src/main.c:812 msgid "reading from local spool" msgstr "loen lokaalsest spool kataloogist" -#: src/misc.c:3868 +#: src/misc.c:3878 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "Versioon: %s %s väljalase %s (\"%s\") %s %s\n" -#: src/misc.c:3871 +#: src/misc.c:3881 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Versioon: %s %s väljalase %s (\"%s\")\n" -#: src/newsrc.c:453 +#: src/newsrc.c:457 msgid "Unreachable?\n" msgstr "Kättesaamatu?\n" -#: src/nntplib.c:817 +#: src/nntplib.c:822 #, c-format msgid "" "\n" @@ -8195,29 +8196,29 @@ msgstr "" "\n" "Ãœhendus serveriga aegus, proovin taastada, katse %d\n" -#: src/nntplib.c:844 +#: src/nntplib.c:849 msgid "NNTP connection error. Exiting..." msgstr "NNTP ühenduse viga. Lõpetan..." -#: src/nntplib.c:856 src/nntplib.c:1835 +#: src/nntplib.c:861 src/nntplib.c:1852 msgid "Rejoin current group\n" msgstr "Taasühinen jooksva grupiga\n" -#: src/nntplib.c:864 src/nntplib.c:1843 +#: src/nntplib.c:869 src/nntplib.c:1860 #, c-format msgid "Read (%s)\n" msgstr "Lugesin (%s)\n" -#: src/nntplib.c:866 +#: src/nntplib.c:871 #, c-format msgid "Resend last command (%s)\n" msgstr "Saada viimane käsk uuesti (%s)\n" -#: src/nntplib.c:1482 +#: src/nntplib.c:1500 msgid "CAPABILITIES did not announce READER" msgstr "CAPABILITIES ei sisalda READER" -#: src/nntplib.c:1989 +#: src/nntplib.c:2006 msgid "MOTD: " msgstr "MOTD: " @@ -8285,7 +8286,7 @@ msgstr "[- Pole kasutatav -]" #. * preamble #. * TODO: -> lang.c #. -#: src/rfc2047.c:1308 +#: src/rfc2047.c:1322 #, c-format msgid "" "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" Binary files tin-2.4.2/po/fr.gmo and tin-2.4.3/po/fr.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.2/po/fr.po tin-2.4.3/po/fr.po --- tin-2.4.2/po/fr.po 2017-12-08 09:39:46.000000000 +0100 +++ tin-2.4.3/po/fr.po 2018-12-24 10:02:04.882966628 +0100 @@ -1,27 +1,28 @@ # French translation for tin. # This file is distributed under the same license as the tin package. -# Matt Anton , 2003-2014. +# Matt Anton , 2003-2018. # msgid "" msgstr "" -"Project-Id-Version: tin-2.4.0\n" +"Project-Id-Version: tin-2.4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-08 09:39+0100\n" -"PO-Revision-Date: 2016-08-10 16:57+0100\n" -"Last-Translator: Matt Anton \n" +"POT-Creation-Date: 2018-12-24 10:02+0100\n" +"PO-Revision-Date: 2018-11-16 14:30+0100\n" +"Last-Translator: Matt Anton \n" "Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.5\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" +"X-Generator: Poedit 2.0.6\n" "X-Poedit-SourceCharset: UTF-8\n" -#: src/attrib.c:954 +#: src/attrib.c:964 msgid "Processing attributes... " -msgstr "Traitement du fichier attributes..." +msgstr "Traitement du fichier attributes... " -#: src/attrib.c:1176 +#: src/attrib.c:1186 #, c-format msgid "" "# Do not edit this comment block\n" @@ -30,397 +31,397 @@ msgstr "" "# Ne pas éditer ce commentaire\n" "#\n" -#: src/attrib.c:1177 +#: src/attrib.c:1187 #, c-format msgid "# scope=STRING (eg. alt.*,!alt.bin*) [mandatory]\n" msgstr "# scope=TERME (pe. alt.*,!alt.bin*) [obligatoire]\n" -#: src/attrib.c:1178 +#: src/attrib.c:1188 #, c-format msgid "# add_posted_to_filter=ON/OFF\n" msgstr "# add_posted_to_filter=ON/OFF\n" -#: src/attrib.c:1179 +#: src/attrib.c:1189 #, c-format msgid "# advertising=ON/OFF\n" msgstr "# advertising=ON/OFF\n" -#: src/attrib.c:1180 +#: src/attrib.c:1190 #, c-format msgid "# alternative_handling=ON/OFF\n" msgstr "# alternative_handling=ON/OFF\n" -#: src/attrib.c:1181 +#: src/attrib.c:1191 #, c-format msgid "# ask_for_metamail=ON/OFF\n" msgstr "# ask_for_metamail=ON/OFF\n" -#: src/attrib.c:1182 +#: src/attrib.c:1192 #, c-format msgid "# auto_cc_bcc=NUM\n" msgstr "# auto_cc_bcc=NUM\n" -#: src/attrib.c:1183 +#: src/attrib.c:1193 #, c-format msgid "# 0=No, 1=Cc, 2=Bcc, 3=Cc and Bcc\n" msgstr "# 0=Non, 1=Cc, 2=Cci, 3=Cc et Cci\n" -#: src/attrib.c:1184 +#: src/attrib.c:1194 #, c-format msgid "# auto_list_thread=ON/OFF\n" msgstr "# auto_list_thread=ON/OFF\n" -#: src/attrib.c:1185 +#: src/attrib.c:1195 #, c-format msgid "# auto_save=ON/OFF\n" msgstr "# auto_save=ON/OFF\n" -#: src/attrib.c:1186 +#: src/attrib.c:1196 #, c-format msgid "# auto_select=ON/OFF\n" msgstr "# auto_select=ON/OFF\n" -#: src/attrib.c:1187 +#: src/attrib.c:1197 #, c-format msgid "# batch_save=ON/OFF\n" msgstr "# batch_save=ON/OFF\n" -#: src/attrib.c:1188 +#: src/attrib.c:1198 #, c-format msgid "# date_format=STRING (eg. %%a, %%d %%b %%Y %%H:%%M:%%S)\n" msgstr "# date_format=TERME (pe. %%a, %%d %%b %%Y %%H:%%M:%%S)\n" -#: src/attrib.c:1189 +#: src/attrib.c:1199 #, c-format msgid "# delete_tmp_files=ON/OFF\n" msgstr "# delete_tmp_files=ON/OFF\n" -#: src/attrib.c:1190 +#: src/attrib.c:1200 #, c-format msgid "# editor_format=STRING (eg. %%E +%%N %%F)\n" msgstr "# editor_format=TERME (pe. %%E +%%N %%F)\n" -#: src/attrib.c:1191 +#: src/attrib.c:1201 #, c-format msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "# fcc=TERME (pe. =mailbox)\n" -#: src/attrib.c:1192 +#: src/attrib.c:1202 #, c-format msgid "# followup_to=STRING\n" msgstr "# followup_to=TERME\n" -#: src/attrib.c:1193 +#: src/attrib.c:1203 #, c-format msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "# from=TERME (choix du 'From:', ne pas utiliser celui cité)\n" -#: src/attrib.c:1194 +#: src/attrib.c:1204 #, c-format msgid "# group_catchup_on_exit=ON/OFF\n" msgstr "# group_catchup_on_exit=ON/OFF\n" -#: src/attrib.c:1195 +#: src/attrib.c:1205 #, c-format msgid "# group_format=STRING (eg. %%n %%m %%R %%L %%s %%F)\n" msgstr "# group_format=TERME (pe. %%n %%m %%R %%L %%s %%F)\n" -#: src/attrib.c:1196 +#: src/attrib.c:1206 #, c-format msgid "# mail_8bit_header=ON/OFF\n" msgstr "# mail_8bit_header=ON/OFF\n" -#: src/attrib.c:1197 +#: src/attrib.c:1207 #, c-format msgid "# mail_mime_encoding=supported_encoding" msgstr "# mail_mime_encoding=encodage_supporté" -#: src/attrib.c:1205 +#: src/attrib.c:1215 #, c-format msgid "# ispell=STRING\n" msgstr "# ispell=TERME\n" -#: src/attrib.c:1207 +#: src/attrib.c:1217 #, c-format msgid "# maildir=STRING (eg. ~/Mail)\n" msgstr "# maildir=TERME (pe. ~/Mail)\n" -#: src/attrib.c:1208 +#: src/attrib.c:1218 #, c-format msgid "# mailing_list=STRING (eg. majordomo@example.org)\n" msgstr "# mailing_list=TERME (pe. majordomo@example.org)\n" -#: src/attrib.c:1209 +#: src/attrib.c:1219 #, c-format 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:1210 +#: src/attrib.c:1220 #, c-format msgid "# mark_ignore_tags=ON/OFF\n" msgstr "# mark_ignore_tags=ON/OFF\n" -#: src/attrib.c:1211 +#: src/attrib.c:1221 #, c-format msgid "# mark_saved_read=ON/OFF\n" msgstr "# mark_saved_read=ON/OFF\n" -#: src/attrib.c:1212 +#: src/attrib.c:1222 #, c-format msgid "# mime_forward=ON/OFF\n" msgstr "# mime_forward=ON/OFF\n" -#: src/attrib.c:1214 +#: src/attrib.c:1224 #, c-format msgid "# mm_network_charset=supported_charset" msgstr "# mm_network_charset=encodage_supporté" -#: src/attrib.c:1221 +#: src/attrib.c:1231 #, c-format msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "# undeclared_charset=TERME (défaut est US-ASCII)\n" -#: src/attrib.c:1223 +#: src/attrib.c:1233 #, c-format msgid "# news_headers_to_display=STRING\n" msgstr "# news_headers_to_display=TERME\n" -#: src/attrib.c:1224 +#: src/attrib.c:1234 #, c-format msgid "# news_headers_to_not_display=STRING\n" msgstr "# news_headers_to_not_display=TERME\n" -#: src/attrib.c:1225 +#: src/attrib.c:1235 #, c-format msgid "# news_quote_format=STRING\n" msgstr "# news_quote_format=TERME\n" -#: src/attrib.c:1226 +#: src/attrib.c:1236 #, c-format msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "# organization=TERME (si commence par '/' lire dans fichier)\n" -#: src/attrib.c:1227 +#: src/attrib.c:1237 #, c-format msgid "# pos_first_unread=ON/OFF\n" msgstr "# pos_first_unread=ON/OFF\n" -#: src/attrib.c:1228 +#: src/attrib.c:1238 #, c-format msgid "# post_8bit_header=ON/OFF\n" msgstr "# post_8bit_header=ON/OFF\n" -#: src/attrib.c:1229 +#: src/attrib.c:1239 #, c-format msgid "# post_mime_encoding=supported_encoding" msgstr "# post_mime_encoding=encodage_supporté" -#: src/attrib.c:1236 +#: src/attrib.c:1246 #, c-format msgid "# post_process_type=NUM\n" msgstr "# post_process_type=NUM\n" -#: src/attrib.c:1241 +#: src/attrib.c:1251 #, c-format msgid "# post_process_view=ON/OFF\n" msgstr "# post_process_view=ON/OFF\n" -#: src/attrib.c:1242 +#: src/attrib.c:1252 #, c-format msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "# quick_kill_scope=TERME (pe. talk.*)\n" -#: src/attrib.c:1243 +#: src/attrib.c:1253 #, c-format msgid "# quick_kill_expire=ON/OFF\n" msgstr "# quick_kill_expire=ON/OFF\n" -#: src/attrib.c:1244 +#: src/attrib.c:1254 #, c-format msgid "# quick_kill_case=ON/OFF\n" msgstr "# quick_kill_case=ON/OFF\n" -#: src/attrib.c:1245 +#: src/attrib.c:1255 #, c-format msgid "# quick_kill_header=NUM\n" msgstr "# quick_kill_header=NUM\n" -#: src/attrib.c:1246 src/attrib.c:1255 +#: src/attrib.c:1256 src/attrib.c:1265 #, c-format msgid "# 0=Subject: (case sensitive) 1=Subject: (ignore case)\n" msgstr "# 0=Subject: (casse sensible) 1=Subject: (ignore la casse)\n" -#: src/attrib.c:1247 src/attrib.c:1256 +#: src/attrib.c:1257 src/attrib.c:1266 #, c-format msgid "# 2=From: (case sensitive) 3=From: (ignore case)\n" msgstr "# 2=From: (casse sensible) 3=From: (ignore la casse)\n" -#: src/attrib.c:1248 src/attrib.c:1257 +#: src/attrib.c:1258 src/attrib.c:1267 #, c-format msgid "# 4=Message-ID: & full References: line\n" msgstr "# 4=Message-ID: & \"References:\" complètes : ligne\n" -#: src/attrib.c:1249 src/attrib.c:1258 +#: src/attrib.c:1259 src/attrib.c:1268 #, c-format msgid "# 5=Message-ID: & last References: entry only\n" msgstr "# 5=Message-ID: & dernières References: entrée uniquement\n" -#: src/attrib.c:1250 src/attrib.c:1259 +#: src/attrib.c:1260 src/attrib.c:1269 #, c-format msgid "# 6=Message-ID: entry only 7=Lines:\n" msgstr "# 6=Message-ID: entrée uniquement 7=Lignes:\n" -#: src/attrib.c:1251 +#: src/attrib.c:1261 #, c-format msgid "# quick_select_scope=STRING\n" msgstr "# quick_select_scope=TERME\n" -#: src/attrib.c:1252 +#: src/attrib.c:1262 #, c-format msgid "# quick_select_expire=ON/OFF\n" msgstr "# quick_select_expire=ON/OFF\n" -#: src/attrib.c:1253 +#: src/attrib.c:1263 #, c-format msgid "# quick_select_case=ON/OFF\n" msgstr "# quick_select_case=ON/OFF\n" -#: src/attrib.c:1254 +#: src/attrib.c:1264 #, c-format msgid "# quick_select_header=NUM\n" msgstr "# quick_select_header=NUM\n" -#: src/attrib.c:1260 +#: src/attrib.c:1270 #, c-format msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "# quote_chars=TERME (%%s, %%S pour les initiales)\n" -#: src/attrib.c:1262 +#: src/attrib.c:1272 #, c-format msgid "# print_header=ON/OFF\n" msgstr "# print_header=ON/OFF\n" -#: src/attrib.c:1264 +#: src/attrib.c:1274 #, c-format msgid "# process_only_unread=ON/OFF\n" msgstr "# process_only_unread=ON/OFF\n" -#: src/attrib.c:1265 +#: src/attrib.c:1275 #, c-format msgid "# prompt_followupto=ON/OFF\n" msgstr "# prompt_followupto=ON/OFF\n" -#: src/attrib.c:1266 +#: src/attrib.c:1276 #, c-format msgid "# savedir=STRING (eg. ~user/News)\n" msgstr "# savedir=TERME (pe. ~user/News)\n" -#: src/attrib.c:1267 +#: src/attrib.c:1277 #, c-format msgid "# savefile=STRING (eg. =linux)\n" msgstr "# savefile=TERME (pe. =linux)\n" -#: src/attrib.c:1268 +#: src/attrib.c:1278 #, c-format msgid "# sigfile=STRING (eg. $var/sig)\n" msgstr "# sigfile=TERME (pe. $var/sig)\n" -#: src/attrib.c:1269 +#: src/attrib.c:1279 #, c-format msgid "# show_author=NUM\n" msgstr "# show_author=NUM\n" -#: src/attrib.c:1275 +#: src/attrib.c:1285 #, c-format msgid "# show_signatures=ON/OFF\n" msgstr "# show_signatures=ON/OFF\n" -#: src/attrib.c:1276 +#: src/attrib.c:1286 #, c-format msgid "# show_only_unread_arts=ON/OFF\n" msgstr "# show_only_unread=ON/OFF\n" -#: src/attrib.c:1277 +#: src/attrib.c:1287 #, c-format msgid "# sigdashes=ON/OFF\n" msgstr "# sigdashes=ON/OFF\n" -#: src/attrib.c:1278 +#: src/attrib.c:1288 #, c-format msgid "# signature_repost=ON/OFF\n" msgstr "# signature_repost=ON/OFF\n" -#: src/attrib.c:1279 +#: src/attrib.c:1289 #, c-format msgid "# sort_article_type=NUM\n" msgstr "# sort_art_type=NUM\n" -#: src/attrib.c:1297 +#: src/attrib.c:1307 #, c-format msgid "# sort_threads_type=NUM\n" msgstr "# sort_threads_type=NUM\n" -#: src/attrib.c:1306 +#: src/attrib.c:1316 #, c-format msgid "# start_editor_offset=ON/OFF\n" msgstr "# start_editor_offset=ON/OFF\n" -#: src/attrib.c:1307 +#: src/attrib.c:1317 #, c-format msgid "# tex2iso_conv=ON/OFF\n" msgstr "# tex2iso_conv=ON/OFF\n" -#: src/attrib.c:1308 +#: src/attrib.c:1318 #, c-format msgid "# thread_catchup_on_exit=ON/OFF\n" msgstr "# batch_save=ON/OFF\n" -#: src/attrib.c:1309 +#: src/attrib.c:1319 #, c-format msgid "# thread_articles=NUM" msgstr "# thread_arts=NUM" -#: src/attrib.c:1316 +#: src/attrib.c:1326 #, c-format msgid "# thread_format=STRING (eg. %%n %%m [%%L] %%T %%F)\n" msgstr "# thread_format=TERME (pe. %%n %%m [%%L] %%T %%F)\n" -#: src/attrib.c:1317 +#: src/attrib.c:1327 #, c-format msgid "# thread_perc=NUM\n" msgstr "# thread_perc=NUM\n" -#: src/attrib.c:1318 +#: src/attrib.c:1328 #, c-format msgid "# trim_article_body=NUM\n" msgstr "# trim_article_body=NUM\n" -#: src/attrib.c:1319 +#: src/attrib.c:1329 #, c-format msgid "# 0 = Don't trim article body\n" msgstr "# 0 = Ne pas nettoyer le corps de l'article\n" -#: src/attrib.c:1320 +#: src/attrib.c:1330 #, c-format msgid "# 1 = Skip leading blank lines\n" msgstr "# 1 = Effacer les lignes vides du début\n" -#: src/attrib.c:1321 +#: src/attrib.c:1331 #, c-format msgid "# 2 = Skip trailing blank lines\n" msgstr "# 2 = Effacer les lignes vides de la fin\n" -#: src/attrib.c:1322 +#: src/attrib.c:1332 #, c-format msgid "# 3 = Skip leading and trailing blank lines\n" msgstr "# 3 = Effacer les lignes vides du début et de la fin\n" -#: src/attrib.c:1323 +#: src/attrib.c:1333 #, c-format msgid "# 4 = Compact multiple blank lines between text blocks\n" msgstr "# 4 = Regrouper plusieurs lignes vides entre les paragraphes\n" -#: src/attrib.c:1324 +#: src/attrib.c:1334 #, c-format msgid "" "# 5 = Compact multiple blank lines between text blocks and skip\n" @@ -429,7 +430,7 @@ msgstr "" "# 5 = Regrouper plusieurs lignes vides entre les paragraphes et\n" "# effacer les lignes vides du début\n" -#: src/attrib.c:1325 +#: src/attrib.c:1335 #, c-format msgid "" "# 6 = Compact multiple blank lines between text blocks and skip\n" @@ -438,7 +439,7 @@ msgstr "" "# 6 = Regrouper plusieurs lignes vides entre les paragraphes et\n" "# effacer les lignes vides de la fin\n" -#: src/attrib.c:1326 +#: src/attrib.c:1336 #, c-format msgid "" "# 7 = Compact multiple blank lines between text blocks and skip\n" @@ -447,37 +448,37 @@ msgstr "" "# 7 = Regrouper plusieurs lignes vides entre les paragraphes et\n" "# effacer les lignes vides du début et de la fin\n" -#: src/attrib.c:1327 +#: src/attrib.c:1337 #, c-format msgid "# verbatim_handling=ON/OFF\n" msgstr "# verbatim_handling=ON/OFF\n" -#: src/attrib.c:1329 +#: src/attrib.c:1339 #, c-format msgid "# extquote_handling=ON/OFF\n" msgstr "# extquote_handling=ON/OFF\n" -#: src/attrib.c:1331 +#: src/attrib.c:1341 #, c-format msgid "# wrap_on_next_unread=ON/OFF\n" msgstr "# wrap_on_next_unread=ON/OFF\n" -#: src/attrib.c:1332 +#: src/attrib.c:1342 #, c-format msgid "# x_body=STRING (eg. ~/.tin/extra-body-text)\n" msgstr "# x_body=TERME (pe. ~/.tin/extra-body-text)\n" -#: src/attrib.c:1333 +#: src/attrib.c:1343 #, c-format msgid "# x_comment_to=ON/OFF\n" msgstr "# x_comment_to=ON/OFF\n" -#: src/attrib.c:1334 +#: src/attrib.c:1344 #, c-format msgid "# x_headers=STRING (eg. ~/.tin/extra-headers)\n" msgstr "# x_headers=TERME (pe. ~/.tin/extra-headers)\n" -#: src/attrib.c:1335 +#: src/attrib.c:1345 #, c-format msgid "" "#\n" @@ -486,7 +487,7 @@ msgstr "" "#\n" "# Notez que placer les entrées générales (portée globale) en premier\n" -#: src/attrib.c:1336 +#: src/attrib.c:1346 #, c-format msgid "" "# entries first followed by group specific entries.\n" @@ -495,7 +496,7 @@ msgstr "" "# est préférable, suivies des entrées spécifiques aux groupes.\n" "#\n" -#: src/attrib.c:1337 +#: src/attrib.c:1347 #, c-format msgid "############################################################################\n" msgstr "############################################################################\n" @@ -789,58 +790,53 @@ msgstr "Sélection auto. des articles (v #: src/lang.c:107 #, c-format -msgid "Active file corrupt - %s" -msgstr "Fichier active corrompu - %s" - -#: src/lang.c:108 -#, c-format msgid "" "Article to be posted resulted in errors/warnings. %s=quit, %s=Menu, %s=edit: " msgstr "" "L'article à poster pose des problèmes. %s=quitter, %s=Menu, %s=éditer : " -#: src/lang.c:109 +#: src/lang.c:108 #, c-format msgid "Unrecognized attribute: %s" msgstr "Attribut non reconnu : %s" -#: src/lang.c:110 +#: src/lang.c:109 #, c-format msgid "Bad command. Type '%s' for help." msgstr "Mauvaise commande. Tapez '%s' pour l'aide." -#: src/lang.c:112 +#: src/lang.c:111 msgid "Base article" msgstr "Article initial" -#: src/lang.c:113 +#: src/lang.c:112 msgid "Base article range" msgstr "Champ article initial" -#: src/lang.c:114 +#: src/lang.c:113 #, c-format msgid "%s: Updating of index files not supported: cache_overview_files=%s" msgstr "%s : Màj des fichiers index non supportée : cache_overview_files=%s" -#: src/lang.c:115 +#: src/lang.c:114 msgid "*** Beginning of article ***" msgstr "*** Début de l'article ***" -#: src/lang.c:116 +#: src/lang.c:115 msgid "*** Beginning of page ***" msgstr "*** Début de l'article ***" -#: src/lang.c:118 +#: src/lang.c:117 #, c-format msgid "Cancel (delete) or supersede (overwrite) article [%%s]? (%s/%s/%s): " msgstr "" "Annuler (effacer) ou remplacer (écraser) l'article [%%s]? (%s/%s/%s) : " -#: src/lang.c:119 +#: src/lang.c:118 msgid "Cancelling article..." msgstr "Annulation de l'article..." -#: src/lang.c:121 +#: src/lang.c:120 #, c-format msgid "Cannot create %s" msgstr "Création de %s impossible" @@ -1384,21 +1380,16 @@ msgstr "" msgid "Insecure permissions of %s (%o)" msgstr "Permissions de %s non sûres (%o)" -#: src/lang.c:242 -#, c-format -msgid "Invalid response to GROUP command, %s" -msgstr "Réponse de la commande GROUP invalide, %s" - -#: src/lang.c:247 +#: src/lang.c:244 #, c-format msgid "MIME parse error: Unexpected end of %s/%s article" msgstr "Erreur MIME : Fin inattendue de l'article %s %s" -#: src/lang.c:248 +#: src/lang.c:245 msgid "MIME parse error: Start boundary whilst reading headers" msgstr "Erreur MIME : Début de la borne lors de la lecture des en-têtes" -#: src/lang.c:249 +#: src/lang.c:246 msgid "" "\n" "Error: \"poster\" is not allowed in Newsgroups!\n" @@ -1406,16 +1397,16 @@ msgstr "" "\n" "Erreur : \"poster\" n'est pas autorisé dans les Groupes !\n" -#: src/lang.c:250 +#: src/lang.c:247 msgid "Can't get a (fully-qualified) domain-name!" msgstr "Nom de domaine (qualifié) introuvable !" -#: src/lang.c:251 +#: src/lang.c:248 #, c-format msgid "No permissions to go into %s\n" msgstr "Pas la permission d'aller dans %s\n" -#: src/lang.c:253 +#: src/lang.c:250 msgid "" "\n" "Error: From: line missing.\n" @@ -1423,30 +1414,30 @@ msgstr "" "\n" "Erreur : En-tête 'From:' manquant.\n" -#: src/lang.c:255 +#: src/lang.c:252 #, c-format msgid "No read permissions for %s\n" msgstr "Pas la permission de lecture pour %s\n" -#: src/lang.c:256 +#: src/lang.c:253 #, c-format msgid "File %s does not exist\n" msgstr "Fichier %s inexistant\n" -#: src/lang.c:257 +#: src/lang.c:254 #, c-format msgid "No write permissions for %s\n" msgstr "Pas la permission d'écrire pour %s\n" -#: src/lang.c:258 +#: src/lang.c:255 msgid "Can't get user information (/etc/passwd missing?)" msgstr "Info sur l'utilisateur introuvable (/etc/passwd manquant ?)" -#: src/lang.c:259 +#: src/lang.c:256 msgid "errors" msgstr "erreurs" -#: src/lang.c:261 +#: src/lang.c:258 #, c-format msgid "" "\n" @@ -1456,61 +1447,61 @@ msgstr "" "Erreur sur la ligne %d : en-tête \"Sender:\" non autorisé (sera ajouté pour " "vous)\n" -#: src/lang.c:263 +#: src/lang.c:260 #, c-format msgid "Server has non of the groups listed in %s" msgstr "Le serveur n'a aucun groupe listé dans %s" -#: src/lang.c:264 +#: src/lang.c:261 msgid "error" msgstr "erreur" -#: src/lang.c:265 +#: src/lang.c:262 msgid "Unknown display level" msgstr "Vue affichée inconnue" -#: src/lang.c:266 +#: src/lang.c:263 msgid "" msgstr "" -#: src/lang.c:267 +#: src/lang.c:264 msgid "Exiting..." msgstr "Fermeture..." -#: src/lang.c:268 +#: src/lang.c:265 msgid "leaving external mail-reader" msgstr "fermeture du client mail externe" -#: src/lang.c:269 +#: src/lang.c:266 #, c-format msgid "Extracting %s..." msgstr "Extraction de %s..." -#: src/lang.c:271 +#: src/lang.c:268 #, c-format msgid "Error writing %s file. Filesystem full? File reset to previous state." msgstr "Écriture du fichier %s échouée. Disque plein ? Fichier non touché." -#: src/lang.c:272 +#: src/lang.c:269 #, c-format msgid "Error making backup of %s file. Filesystem full?" msgstr "Erreur lors de la sauvegarde du fichier %s. Disque plein ?" -#: src/lang.c:273 +#: src/lang.c:270 #, c-format msgid "Filtering global rules (%d/%d)..." msgstr "Filtrage selon les règles globales (%d/%d)..." -#: src/lang.c:274 +#: src/lang.c:271 msgid "Rule created by: " msgstr "Règle créée par : " -#: src/lang.c:275 +#: src/lang.c:272 #, c-format msgid "Enter pattern [%s]> " msgstr "Entrez le réglage [%s] > " -#: src/lang.c:276 +#: src/lang.c:273 #, c-format msgid "" "\n" @@ -1520,20 +1511,21 @@ msgstr "" "Vous avez souhaité que les réponses à votre article aillent au(x) %s " "suivant(s) :\n" -#: src/lang.c:277 +#: src/lang.c:274 #, c-format msgid " %s\t Answers will be directed to you by mail.\n" msgstr " %s\t Les réponses vous seront envoyées par email.\n" -#: src/lang.c:278 +#: src/lang.c:275 msgid "-- forwarded message --\n" msgstr "-- message redirigé --\n" -#: src/lang.c:279 +#: src/lang.c:276 msgid "-- end of forwarded message --\n" msgstr "-- fin du message redirigé --\n" -#: src/lang.c:280 +#: src/lang.c:277 +#, fuzzy msgid "" "# Format:\n" "# comment=STRING Optional. Multiple lines allowed. Comments must be " @@ -1560,6 +1552,10 @@ msgid "" "# gnksa=[<>]?NUM Optional. GNKSA parse_from() return code. '<' or '>' " "opt.\n" "# xref=PATTERN Optional. Kill pattern (e.g. alt.flame*)\n" +"# path=PATTERN Optional. Kill pattern (e.g. news.example.org)\n" +"# Be aware that filtering on Path: may significantly " +"slow\n" +"# down the process.\n" "# time=NUM Optional. time_t value when rule expires\n" "#\n" msgstr "" @@ -2595,7 +2591,7 @@ msgstr "Pas d'expression précédente" msgid "Operation disabled in no-overwrite mode" msgstr "Opération désactivée en mode lecture" -#. TODO: replace hardcoded key-name in txt_info_postponed +#. TODO: replace hard coded key-name in txt_info_postponed #: src/lang.c:547 #, c-format msgid "%d postponed %s, reuse with ^O...\n" @@ -2625,7 +2621,7 @@ msgstr "Article encodé en TeX2Iso" msgid "incomplete " msgstr "incomplet " -#. TODO: replace hardcoded key-names +#. TODO: replace hard coded key-names #: src/lang.c:554 #, c-format msgid "" @@ -2753,7 +2749,7 @@ msgstr "Créer un filtre" #: src/lang.c:587 #, c-format -msgid "Kill Msg-Id: [%s] (f/l/o/n): " +msgid "Kill Msg-ID: [%s] (f/l/o/n): " msgstr " MID : [%s] (t/d/a/n) : " #: src/lang.c:588 @@ -3268,7 +3264,7 @@ msgstr "Erreur dans la regex : study - e msgid "Post a followup..." msgstr "Postage du suivi..." -#. TODO: replace hardcoded key-name in txt_post_error_ask_postpone +#. TODO: replace hard coded key-name in txt_post_error_ask_postpone #: src/lang.c:716 msgid "" "An error has occurred while posting the article. If you think that this\n" @@ -3334,227 +3330,232 @@ msgstr "%s marqué" msgid "Untagged %s" msgstr "%s non marqué" -#: src/lang.c:730 +#: src/lang.c:731 +#, c-format +msgid "Preparing for filtering on Path header (%d/%d)..." +msgstr "" + +#: src/lang.c:733 msgid "Processing mail messages marked for deletion." msgstr "Traitement des emails enregistrés marqués pour effacement." -#: src/lang.c:731 +#: src/lang.c:734 msgid "Processing saved articles marked for deletion." msgstr "Traitement des articles enregistrés marqués pour effacement." -#: src/lang.c:732 +#: src/lang.c:735 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "Accepter le Suivi ? %s=poster, %s=ignorer, %s=quitter : " -#: src/lang.c:733 +#: src/lang.c:736 msgid "Article unchanged, abort mailing?" msgstr "Article inchangé, annuler l'envoi ?" -#: src/lang.c:734 +#: src/lang.c:737 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "Voulez-vous voir les brouillons (%d) ?" -#: src/lang.c:736 +#: src/lang.c:739 msgid "Add quick kill filter?" msgstr "Ajouter rapidement un filtre ?" -#: src/lang.c:737 +#: src/lang.c:740 msgid "Add quick selection filter?" msgstr "Ajouter rapidement une règle ?" -#: src/lang.c:738 +#: src/lang.c:741 msgid "Do you really want to quit?" msgstr "Voulez-vous réellement quitter ?" -#: src/lang.c:739 +#: src/lang.c:742 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "" "%s=éditer message d'annulation, %s=quitter, %s=effacer (annuler) [%%s] : " -#: src/lang.c:740 +#: src/lang.c:743 msgid "You have tagged articles in this group - quit anyway?" msgstr "Vous avez des articles marqués dans ce groupe - quitter quand même ?" -#: src/lang.c:741 +#: src/lang.c:744 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=quitter, %s=éditer, %s=brouillon : " -#: src/lang.c:742 +#: src/lang.c:745 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=quitter, %s=éditer, %s=enregistrer le filtre : " -#: src/lang.c:743 +#: src/lang.c:746 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "%s=quitter %s=éditer %s=enregistrer la règle : " -#: src/lang.c:744 +#: src/lang.c:747 msgid "Do you really want to quit without saving your configuration?" msgstr "Voulez-vous réellement quitter sans enregistrer votre configuration ?" -#: src/lang.c:747 +#: src/lang.c:750 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "Champ invalide - '0-9.$' pe. 1-$ est valide" -#: src/lang.c:749 +#: src/lang.c:752 msgid "Do you want to abort this operation?" msgstr "Voulez-vous annuler cette opération ?" -#: src/lang.c:750 +#: src/lang.c:753 msgid "Do you want to exit tin immediately?" msgstr "Voulez-vous quitter tin immédiatement ?" -#: src/lang.c:752 +#: src/lang.c:755 msgid "Reading ('q' to quit)..." msgstr "Lecture ('q' pour quitter)..." -#: src/lang.c:753 +#: src/lang.c:756 #, c-format msgid "Reading %sarticles..." msgstr "Lecture de %sarticles..." -#: src/lang.c:754 +#: src/lang.c:757 #, c-format msgid "Reading %sattributes file...\n" msgstr "Lecture du fichier %sattributes...\n" -#: src/lang.c:755 +#: src/lang.c:758 #, c-format msgid "Reading %sconfig file...\n" msgstr "Lecture du fichier %sconfig...\n" -#: src/lang.c:756 +#: src/lang.c:759 msgid "Reading filter file...\n" msgstr "Lecture du fichier filter...\n" -#: src/lang.c:757 +#: src/lang.c:760 #, c-format msgid "Reading %s groups..." msgstr "Lecture de %s groupes..." -#: src/lang.c:758 +#: src/lang.c:761 msgid "Reading input history file...\n" msgstr "Lecture du fichier d'historique...\n" -#: src/lang.c:759 +#: src/lang.c:762 msgid "Reading keymap file...\n" msgstr "Lecture du fichier keymap...\n" -#: src/lang.c:760 +#: src/lang.c:763 msgid "Reading groups from active file... " msgstr "Lecture des groupes depuis le fichier active... " -#: src/lang.c:761 +#: src/lang.c:764 msgid "Reading groups from newsrc file... " msgstr "Lecture des groupes depuis le fichier newsrc... " -#: src/lang.c:762 +#: src/lang.c:765 msgid "Reading newsgroups file... " msgstr "Lecture du fichier newsgroups... " -#: src/lang.c:763 +#: src/lang.c:766 msgid "Reading newsrc file..." msgstr "Lecture du fichier newsrc..." -#: src/lang.c:764 +#: src/lang.c:767 msgid "References: line " msgstr "l'en-tête 'References:'" -#: src/lang.c:766 +#: src/lang.c:769 #, c-format msgid "(%d:%02d remaining)" msgstr "(%d:%02d restant)" -#: src/lang.c:768 +#: src/lang.c:771 #, c-format msgid "Bogus group %s removed." msgstr "Effacement du groupe corrompu %s." -#: src/lang.c:769 +#: src/lang.c:772 msgid "Removed from the previous rule: " msgstr "Effacé de la règle précédente : " -#: src/lang.c:770 +#: src/lang.c:773 #, c-format msgid "Error: rename %s to %s" msgstr "Erreur : renommer %s à %s" -#: src/lang.c:771 +#: src/lang.c:774 msgid "Reply to author..." msgstr "Répondre à l'auteur..." -#: src/lang.c:772 +#: src/lang.c:775 msgid "Repost" msgstr "Reposter" -#: src/lang.c:773 +#: src/lang.c:776 msgid "Reposting article..." msgstr "Repostage de l'article..." -#: src/lang.c:774 +#: src/lang.c:777 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "Reposter article(s) dans groupe(s) [%s] > " -#: src/lang.c:775 +#: src/lang.c:778 msgid "Reset newsrc?" msgstr "Réinitialiser newsrc ?" -#: src/lang.c:776 +#: src/lang.c:779 msgid "Responses have been directed to the following newsgroups" msgstr "Les réponses ont été redirigées vers les groupes suivants" -#: src/lang.c:777 +#: src/lang.c:780 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " msgstr "" "Les réponses ont été redirigées à l'auteur. %s=mail, %s=poster, %s=quitter : " -#: src/lang.c:779 +#: src/lang.c:782 msgid "Press to continue..." msgstr "Appuyez sur pour continuer..." -#: src/lang.c:781 +#: src/lang.c:784 #, c-format msgid "Select From [%s] (y/n): " msgstr " De : [%s] (o/n) : " -#: src/lang.c:782 +#: src/lang.c:785 msgid "Select Lines: (num): " msgstr "Nombre de lignes (num) : " -#: src/lang.c:783 +#: src/lang.c:786 msgid "Auto-select Article Menu" msgstr "Créer une règle" -#: src/lang.c:784 +#: src/lang.c:787 #, c-format -msgid "Select Msg-Id [%s] (f/l/o/n): " +msgid "Select Msg-ID [%s] (f/l/o/n): " msgstr " MID : [%s] (t/d/a/n) : " -#: src/lang.c:785 +#: src/lang.c:788 msgid "Select pattern scope: " msgstr "Règle s'appliquant à : " -#: src/lang.c:786 +#: src/lang.c:789 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "Sujet : [%s] (o/n) : " -#: src/lang.c:787 +#: src/lang.c:790 msgid "Select text pattern : " msgstr "Texte ou terme : " -#: src/lang.c:788 +#: src/lang.c:791 msgid "Select time in days : " msgstr "Durée de la règle : " -#: src/lang.c:789 +#: src/lang.c:792 #, c-format msgid "" "# %s server configuration file\n" @@ -3575,54 +3576,54 @@ msgstr "" "# Enfin, ne touchez pas à ce fichier si vous ne savez pas quoi y faire.\n" "############################################################################\n" -#: src/lang.c:795 +#: src/lang.c:798 msgid "Showing unread groups only" msgstr "Afficher uniquement les groupes non lus" -#: src/lang.c:796 +#: src/lang.c:799 msgid "Subject: line (ignore case) " msgstr "l'en-tête 'Subject:' (ignorer la casse)" -#: src/lang.c:797 +#: src/lang.c:800 msgid "Subject: line (case sensitive)" msgstr "l'en-tête 'Subject:' (casse sensible)" -#: src/lang.c:798 +#: src/lang.c:801 msgid "Save" msgstr "Enregistrer" -#: src/lang.c:799 +#: src/lang.c:802 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "Enregistrer '%s' (%s/%s) ?" -#: src/lang.c:800 +#: src/lang.c:803 msgid "Save configuration before continuing?" msgstr "Enregistrer la configuration avant de continuer ?" -#: src/lang.c:801 +#: src/lang.c:804 msgid "Save filename> " msgstr "Enregistrer sous le nom de fichier > " -#: src/lang.c:802 +#: src/lang.c:805 msgid "Saved" msgstr "Enregistré" -#: src/lang.c:803 +#: src/lang.c:806 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "%4d non lu (%4d sél.) %s dans %s\n" -#: src/lang.c:804 +#: src/lang.c:807 #, c-format msgid "Saved %s...\n" msgstr "Enregistrement de %s...\n" -#: src/lang.c:805 +#: src/lang.c:808 msgid "Nothing was saved" msgstr "Rien n'a été enregistré" -#: src/lang.c:806 +#: src/lang.c:809 #, c-format msgid "" "\n" @@ -3631,183 +3632,183 @@ msgstr "" "\n" "%s %d %s de %d %s\n" -#: src/lang.c:807 +#: src/lang.c:810 #, c-format msgid "-- %s saved to %s%s --" msgstr "-- %s enregistré sous %s%s --" -#: src/lang.c:808 +#: src/lang.c:811 #, c-format msgid "-- %s saved to %s - %s --" msgstr "-- %s enregistré sous %s - %s --" -#: src/lang.c:809 +#: src/lang.c:812 msgid "Saving..." msgstr "Enregistrement..." -#: src/lang.c:810 +#: src/lang.c:813 #, c-format msgid "%s: Screen initialization failed" msgstr "%s : Échec de l'initialisation de l'écran" -#: src/lang.c:812 +#: src/lang.c:815 #, c-format msgid "%s: screen is too small\n" msgstr "%s : l'écran est trop petit\n" -#: src/lang.c:814 +#: src/lang.c:817 #, c-format msgid "screen is too small, %s is exiting" msgstr "l'écran est trop petit, %s quitte" -#: src/lang.c:815 +#: src/lang.c:818 msgid "Delete scope?" msgstr "Effacer la sélection ?" -#: src/lang.c:816 +#: src/lang.c:819 msgid "Enter scope> " msgstr "Entrez la sélection >" -#: src/lang.c:817 +#: src/lang.c:820 msgid "Select new position> " msgstr "Sélection de la nouvelle position >" -#: src/lang.c:818 +#: src/lang.c:821 msgid "New position cannot be a global scope" msgstr "Nouvelle position ne peut être une sélection globale" -#: src/lang.c:819 +#: src/lang.c:822 msgid "Global scope, operation not allowed" msgstr "Opération interdite, sélection globale" -#: src/lang.c:820 +#: src/lang.c:823 msgid "Rename scope> " msgstr "Renommer la sélection" -#: src/lang.c:821 +#: src/lang.c:824 msgid "Select scope> " msgstr "Sélectionner le groupe > " -#: src/lang.c:822 +#: src/lang.c:825 msgid "Scopes Menu" msgstr "Menu Options" -#: src/lang.c:823 +#: src/lang.c:826 msgid "Scopes Menu Commands" msgstr "Menu de sélection" -#: src/lang.c:824 +#: src/lang.c:827 #, c-format msgid "Search backwards [%s]> " msgstr "Recherche arrière [%s] > " -#: src/lang.c:825 +#: src/lang.c:828 #, c-format msgid "Search body [%s]> " msgstr "Rechercher dans le corps [%s] > " -#: src/lang.c:826 +#: src/lang.c:829 #, c-format msgid "Search forwards [%s]> " msgstr "Recherche avant [%s] > " -#: src/lang.c:827 +#: src/lang.c:830 msgid "Searching..." msgstr "Recherche..." -#: src/lang.c:828 +#: src/lang.c:831 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "Recherche article %d sur %d ('q' pour annuler)..." -#: src/lang.c:829 +#: src/lang.c:832 msgid "Select article> " msgstr "Sélectionner l'article > " -#: src/lang.c:830 +#: src/lang.c:833 msgid "" "Select option number before text or use arrow keys and . 'q' to quit." msgstr "" "Choisir un numéro ou utiliser les flèches puis . 'q' pour quitter." -#: src/lang.c:831 +#: src/lang.c:834 msgid "Select group> " msgstr "Sélectionner le groupe > " -#: src/lang.c:832 +#: src/lang.c:835 #, c-format msgid "Enter selection pattern [%s]> " msgstr "Entrez le critère de sélection [%s] > " -#: src/lang.c:833 +#: src/lang.c:836 msgid "Select thread> " msgstr "Sélectionner le fil > " -#: src/lang.c:834 +#: src/lang.c:837 #, c-format msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" msgstr "%s %s %s (\"%s\") [%s]: envoi d'un rapport de bogue DÉTAILLÉ à %s\n" -#: src/lang.c:835 +#: src/lang.c:838 msgid "servers active-file" msgstr "fichier active des serveurs" -#: src/lang.c:836 +#: src/lang.c:839 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "Déplacement dans nouveaux groupes impossible. Abonnez-vous d'abord..." -#: src/lang.c:837 +#: src/lang.c:840 msgid "" msgstr "" -#: src/lang.c:838 +#: src/lang.c:841 #, c-format msgid "Starting: (%s)" msgstr "Démarrage : (%s)" -#: src/lang.c:839 +#: src/lang.c:842 #, c-format msgid "List Thread (%d of %d)" msgstr "Visualisation du fil (%d sur %d)" -#: src/lang.c:840 +#: src/lang.c:843 #, c-format msgid "Thread (%.*s)" msgstr "Fil (%.*s)" -#: src/lang.c:841 +#: src/lang.c:844 msgid "Enter wildcard subscribe pattern> " msgstr "Entrer un caractère joker comme critère > " -#: src/lang.c:842 +#: src/lang.c:845 #, c-format msgid "subscribed to %d groups" msgstr "Abonné à %d groupes" -#: src/lang.c:843 +#: src/lang.c:846 #, c-format msgid "Subscribed to %s" msgstr "Abonné à %s" -#: src/lang.c:844 +#: src/lang.c:847 msgid "Subscribing... " msgstr "Abonnement... " -#: src/lang.c:845 +#: src/lang.c:848 #, c-format msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " msgstr "Reposter ou remplacer le(s) article(s) [%%s]? (%s/%s/%s) : " -#: src/lang.c:846 +#: src/lang.c:849 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "Remplacer le(s) article(s) du(es) groupe(s) [%s] > " -#: src/lang.c:847 +#: src/lang.c:850 msgid "Superseding article ..." msgstr "Remplacement de l'article..." -#: src/lang.c:848 +#: src/lang.c:851 #, c-format msgid "" "\n" @@ -3816,24 +3817,24 @@ msgstr "" "\n" "Arrêté. Tapez 'fg' pour relancer %s\n" -#: src/lang.c:850 +#: src/lang.c:853 #, c-format msgid "%d days" msgstr "%d jours" -#: src/lang.c:851 +#: src/lang.c:854 msgid "" msgstr "" -#: src/lang.c:852 +#: src/lang.c:855 msgid "TeX " msgstr "TeX " -#: src/lang.c:853 +#: src/lang.c:856 msgid "# Default action/prompt strings\n" msgstr "# Termes action/prompt par défaut\n" -#: src/lang.c:854 +#: src/lang.c:857 msgid "" "# Defaults for quick (1 key) kill & auto-selection filters\n" "# header=NUM 0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n" @@ -3853,7 +3854,7 @@ msgstr "" "# case=ON/OFF ON=filtre sensible à la casse OFF=filtre insensible\n" "# expire=ON/OFF ON=durée d'après default_filter_days OFF=n'expire jamais\n" -#: src/lang.c:867 +#: src/lang.c:870 msgid "" "# If ON use print current subject or newsgroup description in the last line\n" msgstr "" @@ -3861,105 +3862,105 @@ msgstr "" "dernière\n" "# ligne\n" -#: src/lang.c:868 +#: src/lang.c:871 msgid "# Host & time info used for detecting new groups (don't touch)\n" msgstr "" "# Info sur l'hôte & l'heure utilisées pour détecter les nouveaux groupes (ne " "pas toucher)\n" -#: src/lang.c:869 +#: src/lang.c:872 msgid "There is no news\n" msgstr "Rien de neuf\n" -#: src/lang.c:870 +#: src/lang.c:873 msgid "Thread" msgstr "Fil" -#: src/lang.c:871 +#: src/lang.c:874 msgid "Thread Level Commands" msgstr "Commandes pour fil" -#: src/lang.c:872 +#: src/lang.c:875 msgid "Thread deselected" msgstr "Fil désélectionné" -#: src/lang.c:873 +#: src/lang.c:876 msgid "Thread selected" msgstr "Fil sélectionné" -#: src/lang.c:875 +#: src/lang.c:878 msgid "threads" msgstr "fils" -#: src/lang.c:877 +#: src/lang.c:880 msgid "thread" msgstr "fil" -#: src/lang.c:878 +#: src/lang.c:881 #, c-format msgid "Thread %4s of %4s" msgstr " Fil %4s sur %4s" -#: src/lang.c:879 +#: src/lang.c:882 msgid "Threading articles..." msgstr "Regroupement des articles..." -#: src/lang.c:880 +#: src/lang.c:883 #, c-format msgid "Toggled word highlighting %s" msgstr "(Dés)activer surbrillance %s" -#: src/lang.c:881 +#: src/lang.c:884 msgid "Toggled rot13 encoding" msgstr "(Dés)activer codage rot13" -#: src/lang.c:882 +#: src/lang.c:885 #, c-format msgid "Toggled german TeX encoding %s" msgstr "(Dés)activer codage TeX Allemand %s" -#: src/lang.c:883 +#: src/lang.c:886 #, c-format msgid "Toggled tab-width to %d" msgstr "(Dés)activer largeur de tabulation à %d" -#: src/lang.c:885 +#: src/lang.c:888 #, c-format msgid "%d Trying to dotlock %s" msgstr "%d essaye de déverrouiller %s" -#: src/lang.c:886 +#: src/lang.c:889 #, c-format msgid "%d Trying to lock %s" msgstr "%d essaye de verrouiller %s" -#: src/lang.c:888 +#: src/lang.c:891 msgid " h=help" msgstr " h=aide" -#: src/lang.c:890 +#: src/lang.c:893 msgid "Unlimited" msgstr "Illimitée" -#: src/lang.c:891 +#: src/lang.c:894 msgid "Enter wildcard unsubscribe pattern> " msgstr "Terme joker pour se désabonner > " -#: src/lang.c:892 +#: src/lang.c:895 #, c-format msgid "Error decoding %s : %s" msgstr "Erreur lors du décodage de %s : %s" -#: src/lang.c:893 +#: src/lang.c:896 msgid "No end." msgstr "Pas de fin." -#: src/lang.c:894 +#: src/lang.c:897 #, c-format msgid "%s successfully decoded." msgstr "%s décodé avec succès." -#: src/lang.c:895 +#: src/lang.c:898 #, c-format msgid "" "%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" @@ -3968,37 +3969,32 @@ msgstr "" "%*s[-- %s/%s, %sfichier uuencodé, %d lignes, nom : %s --]\n" "\n" -#: src/lang.c:896 +#: src/lang.c:899 msgid "unread " msgstr "non lu" -#: src/lang.c:897 +#: src/lang.c:900 #, c-format msgid "unsubscribed from %d groups" msgstr "désabonné de %d groupes" -#: src/lang.c:898 +#: src/lang.c:901 #, c-format msgid "Unsubscribed from %s" msgstr "Désabonné de %s" -#: src/lang.c:899 +#: src/lang.c:902 msgid "Unsubscribing... " msgstr "Désabonnement... " -#: src/lang.c:900 +#: src/lang.c:903 msgid "Unthreading articles..." msgstr "Dégroupement des articles..." -#: src/lang.c:901 +#: src/lang.c:904 msgid "Updated" msgstr "Mis à jour" -#: src/lang.c:903 -#, c-format -msgid "unparseable \"LIST COUNTS\" line: \"%s\"" -msgstr "ligne \"LIST COUNTS\" intraitable : \"%s\"" - #: src/lang.c:905 msgid "Updating" msgstr "Mise à jour" @@ -4162,11 +4158,16 @@ msgid "%s only useful for batch mode ope msgstr "%s utile seulement pour opérations en tâche de fond\n" #: src/lang.c:939 +#, fuzzy, c-format +msgid "%s only useful for batch or debug mode operations\n" +msgstr "%s utile seulement pour opérations en tâche de fond\n" + +#: src/lang.c:940 #, c-format msgid "Useless combination %s and %s. Ignoring %s.\n" msgstr "Combinaison %s et %s inutile. %s ignorée.\n" -#: src/lang.c:941 +#: src/lang.c:942 #, c-format msgid "" "\n" @@ -4175,12 +4176,12 @@ msgstr "" "\n" "%s%d expiré (0 - %d). Remis à 0" -#: src/lang.c:942 +#: src/lang.c:943 #, c-format msgid "View '%s' (%s/%s)?" msgstr "Voir '%s' (%s/%s) ?" -#: src/lang.c:944 +#: src/lang.c:945 #, c-format msgid "" "\n" @@ -4192,7 +4193,7 @@ msgstr "" "dépassant :\n" "%-100s\n" -#: src/lang.c:945 +#: src/lang.c:946 msgid "" "\n" "Warning: article unchanged after editing\n" @@ -4200,7 +4201,7 @@ msgstr "" "\n" "Attention : article inchangé après son édition\n" -#: src/lang.c:946 +#: src/lang.c:947 msgid "" "\n" "Warning: \"Subject:\" contains only whitespaces.\n" @@ -4208,7 +4209,7 @@ msgstr "" "\n" "Attention : \"Subject:\" contient que des espaces.\n" -#: src/lang.c:947 +#: src/lang.c:948 msgid "" "\n" "Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:" @@ -4218,7 +4219,7 @@ msgstr "" "Attention : \"Subject:\" commence par \"Re: \" mais il n'y a pas de " "\"References:\".\n" -#: src/lang.c:949 +#: src/lang.c:950 msgid "" "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" @@ -4228,7 +4229,7 @@ msgstr "" "Attention : L'article a \"References:\" mais \"Subject:\" ne commence\n" " avec \"Re: \" et ne contient pas \"(was:\".\n" -#: src/lang.c:952 +#: src/lang.c:953 msgid "" "Read carefully!\n" "\n" @@ -4252,7 +4253,7 @@ msgstr "" "Voici l'article que vous vous apprêtez à effacer :\n" "\n" -#: src/lang.c:956 +#: src/lang.c:957 msgid "" "\n" "Warning: You are using a non-plain transfer encoding (such as base64 or\n" @@ -4266,7 +4267,7 @@ msgstr "" " votre article. Si une signature y est ajoutée par cet inews,\n" " elle ne sera pas encodée correctement.\n" -#: src/lang.c:961 +#: src/lang.c:962 msgid "" "\n" "Warning: \"example\" is a reserved hierarchy!\n" @@ -4274,7 +4275,7 @@ msgstr "" "\n" "Attention : \"exemple\" est une hiérarchie réservée !\n" -#: src/lang.c:962 +#: src/lang.c:963 #, c-format msgid "" "\n" @@ -4289,7 +4290,7 @@ msgstr "" "Certaines valeurs dans votre fichier %s ont changé !\n" "Lisez le fichier WHATSNEW, etc...\n" -#: src/lang.c:964 +#: src/lang.c:965 #, c-format msgid "" "\n" @@ -4303,7 +4304,7 @@ msgstr "" "Certaines valeurs dans votre fichier %s peuvent être ignorées, d'autres\n" "ont peut-être changées !\n" -#: src/lang.c:967 +#: src/lang.c:968 #, c-format msgid "" "Warning: tin wrote fewer groups to your\n" @@ -4318,7 +4319,7 @@ msgstr "" "lors de cette session, cela indique une erreur et vous devriez sauvegarder\n" "votre %s avant de relancer tin !\n" -#: src/lang.c:971 +#: src/lang.c:972 #, c-format msgid "" "\n" @@ -4327,12 +4328,12 @@ msgstr "" "\n" "Attention : %d lignes '-- \\n' trouvées, cela peut prêter à confusion.\n" -#: src/lang.c:972 +#: src/lang.c:973 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "Attention : Seul %d sur %d articles ont été enregistrés" -#: src/lang.c:973 +#: src/lang.c:974 #, c-format msgid "" "\n" @@ -4349,7 +4350,7 @@ msgstr "" "d'être\n" " le plus court possible.\n" -#: src/lang.c:977 +#: src/lang.c:978 #, c-format msgid "" "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " @@ -4357,7 +4358,7 @@ msgstr "" "Attention : cette email peut contenir un piège à spam. %s=continuer, " "%s=annuler ?" -#: src/lang.c:978 +#: src/lang.c:979 msgid "" "\n" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" @@ -4366,37 +4367,37 @@ msgstr "" "Attention : Les signatures doivent commencer avec '-- \\n' et non par '-- " "\\n'.\n" -#: src/lang.c:979 +#: src/lang.c:980 msgid "Writing attributes file..." msgstr "Écriture du fichier attributes..." -#: src/lang.c:981 +#: src/lang.c:982 #, c-format msgid "%d Responses" msgstr "%d Réponses" -#: src/lang.c:983 +#: src/lang.c:984 #, c-format msgid "Added %d %s" msgstr "%d %s ajouté(s)" -#: src/lang.c:984 +#: src/lang.c:985 msgid "No unsubscribed groups to show" msgstr "Aucuns groupes non abonnés à afficher" -#: src/lang.c:985 +#: src/lang.c:986 msgid "Showing subscribed to groups only" msgstr "Afficher uniquement les groupes abonnés" -#: src/lang.c:986 +#: src/lang.c:987 msgid "Yes " msgstr "Oui " -#: src/lang.c:987 +#: src/lang.c:988 msgid " You have mail" msgstr " Nouveau mail" -#: src/lang.c:992 +#: src/lang.c:993 #, c-format msgid "" "\n" @@ -4417,11 +4418,11 @@ msgstr "" " problème, ou bien changer la valeur de MM_NETWORK_CHARSET\n" " via le M)enu.\n" -#: src/lang.c:1003 +#: src/lang.c:1004 msgid " -D mode debug mode" msgstr " -D mode mode debug" -#: src/lang.c:1007 +#: src/lang.c:1008 msgid "" "Read carefully!\n" "\n" @@ -4450,11 +4451,11 @@ msgstr "" "Voici l'article que vous vous apprêtez a effacer :\n" "\n" -#: src/lang.c:1016 +#: src/lang.c:1017 msgid "toggle color" msgstr "(dés)activer la couleur" -#: src/lang.c:1017 +#: src/lang.c:1018 msgid "" "# Changing colors of several screen parts\n" "# Possible values are:\n" @@ -4500,11 +4501,11 @@ msgstr "" "# 15 = blanc gras\n" "\n" -#: src/lang.c:1037 +#: src/lang.c:1038 msgid " -a toggle color flag" msgstr " -a change la couleur" -#: src/lang.c:1041 +#: src/lang.c:1042 msgid "" "\n" "Error: Followup-To set to more than one newsgroup!\n" @@ -4512,7 +4513,7 @@ msgstr "" "\n" "Erreur : Suivi positionné sur plus d'un groupe !\n" -#: src/lang.c:1042 +#: src/lang.c:1043 #, c-format msgid "" "\n" @@ -4521,7 +4522,7 @@ msgstr "" "\n" "Erreur : \"%s\" est renommé, utilisez à la place \"%s\" !\n" -#: src/lang.c:1043 +#: src/lang.c:1044 #, c-format msgid "" "\n" @@ -4530,7 +4531,7 @@ msgstr "" "\n" "Erreur : multi-postage vers %d groupes et pas de ligne Followup-To !\n" -#: src/lang.c:1044 +#: src/lang.c:1045 #, c-format msgid "" "\n" @@ -4539,7 +4540,7 @@ msgstr "" "\n" "Erreur : \"%s\" n'est pas un groupe valide !\n" -#: src/lang.c:1046 +#: src/lang.c:1047 msgid "" "\n" "Warning: Followup-To set to more than one newsgroup!\n" @@ -4547,7 +4548,7 @@ msgstr "" "\n" "Attention : Suivi positionné sur plus d'un groupe !\n" -#: src/lang.c:1047 +#: src/lang.c:1048 #, c-format msgid "" "\n" @@ -4556,7 +4557,7 @@ msgstr "" "\n" "Attention : \"%s\" est renommé, vous devriez utiliser \"%s\" à la place !\n" -#: src/lang.c:1048 +#: src/lang.c:1049 #, c-format msgid "" "\n" @@ -4565,7 +4566,7 @@ msgstr "" "\n" "Attention : multi-postage vers %d groupes et aucun suivi !\n" -#: src/lang.c:1049 +#: src/lang.c:1050 #, c-format msgid "" "\n" @@ -4576,7 +4577,7 @@ msgstr "" " pas apparaître dans ce groupe !\n" "\n" -#: src/lang.c:1050 +#: src/lang.c:1051 #, c-format msgid "" "\n" @@ -4585,79 +4586,79 @@ msgstr "" "\n" "Attention : \"%s\" n'est pas un groupe valide !\n" -#: src/lang.c:1054 +#: src/lang.c:1055 #, c-format msgid "%d files successfully written from %d articles. %d %s occurred." msgstr "%d fichiers des %d articles écrits avec succès. %d %s est survenu." -#: src/lang.c:1055 +#: src/lang.c:1056 msgid "Missing parts." msgstr "Parties manquantes." -#: src/lang.c:1056 +#: src/lang.c:1057 msgid "No beginning." msgstr "Pas de début." -#: src/lang.c:1057 +#: src/lang.c:1058 msgid "No data." msgstr "Pas de données." -#: src/lang.c:1058 +#: src/lang.c:1059 msgid "Unknown error." msgstr "Erreur inconnue." -#: src/lang.c:1061 +#: src/lang.c:1062 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "\tSomme de contrôle de %s (%ld %s)" -#: src/lang.c:1066 +#: src/lang.c:1067 msgid "Reading mail active file... " msgstr "Lecture du fichier active mail... " -#: src/lang.c:1067 +#: src/lang.c:1068 msgid "Reading mailgroups file... " msgstr "Lecture du fichier mailgroups... " -#: src/lang.c:1071 +#: src/lang.c:1072 msgid "perform PGP operations on article" msgstr "effectuer des opérations PGP sur l'article" -#: src/lang.c:1072 +#: src/lang.c:1073 msgid "Add key(s) to public keyring?" msgstr "Ajouter les clé(s) au cercle public ?" -#: src/lang.c:1073 +#: src/lang.c:1074 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "%s=encoder, %s=signer, %s=les deux, %s=quitter : " -#: src/lang.c:1074 +#: src/lang.c:1075 #, c-format msgid "%s=sign, %s=sign & include public key, %s=quit: " msgstr "%s=signer, %s=sig. & inclure clé publique, %s=quitter : " -#: src/lang.c:1075 +#: src/lang.c:1076 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "PGP n'a pas été configuré (ouverture de %s impossible)" -#: src/lang.c:1076 +#: src/lang.c:1077 msgid "Article not signed and no public keys found" msgstr "Article non signé et pas de clés publiques trouvées" -#: src/lang.c:1078 +#: src/lang.c:1079 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" "%s=quitter, %s=éditer, %s=ispell, %s=pgp, %s=menu, %s=poster, %s=brouillon : " -#: src/lang.c:1079 +#: src/lang.c:1080 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " msgstr "%s=quitter, %s=éditer, %s=ispell, %s=pgp, %s=envoyer [%%s] : " -#: src/lang.c:1080 +#: src/lang.c:1081 #, c-format msgid "" "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " @@ -4665,81 +4666,73 @@ msgstr "" "%s=quitter, %s=éditer, %s=ispell, %s=pgp, %s=menu, %s=poster, %s=brouillon " "[%%s]: " -#: src/lang.c:1082 +#: src/lang.c:1083 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "%s=quitter, %s=éditer, %s=pgp, %s=menu, %s=poster, %s=brouillon : " -#: src/lang.c:1083 +#: src/lang.c:1084 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "%s=quitter, %s=éditer, %s=pgp, %s=envoyer [%%s] : " -#: src/lang.c:1084 +#: src/lang.c:1085 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" "%s=quitter, %s=éditer, %s=pgp, %s=menu, %s=poster, %s=brouillon [%%s] : " -#: src/lang.c:1088 +#: src/lang.c:1089 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " msgstr "%s=quitter, %s=éditer, %s=ispell, %s=menu, %s=poster, %s=brouillon : " -#: src/lang.c:1089 +#: src/lang.c:1090 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "%s=quitter, %s=éditer, %s=ispell, %s=envoyer [%%s] : " -#: src/lang.c:1090 +#: src/lang.c:1091 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" "%s=quitter, %s=éditer, %s=ispell, %s=menu, %s=poster, %s=brouillon [%%s] : " -#: src/lang.c:1092 +#: src/lang.c:1093 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "%s=quitter, %s=éditer, %s=menu, %s=poster, %s=brouillon : " -#: src/lang.c:1093 +#: src/lang.c:1094 #, c-format msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "%s=quitter, %s=éditer, %s=envoyer [%%s] : " -#: src/lang.c:1094 +#: src/lang.c:1095 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=quitter, %s=éditer, %s=menu, %s=poster, %s=brouillon [%%s]: " -#: src/lang.c:1103 +#: src/lang.c:1104 msgid "Try cache_overview_files to speed up things.\n" msgstr "Activez 'cache_overview_files' pour accélérer les choses.\n" -#: src/lang.c:1104 +#: src/lang.c:1105 msgid "Tin will use local index files instead.\n" msgstr "Tin utilisera à la place un index local.\n" -#: src/lang.c:1105 +#: src/lang.c:1106 msgid "Cannot find NNTP server name" msgstr "Nom du serveur NNTP introuvable" -#: src/lang.c:1106 +#: src/lang.c:1107 #, c-format msgid "Connecting to %s:%u..." msgstr "Connexion à %s:%u..." -#: src/lang.c:1107 -msgid "Disconnecting from server...\n" -msgstr "Déconnexion du serveur...\n" - #: src/lang.c:1108 -#, c-format -msgid "" -"Wrong newsgroup name (\"%s\") in response of \"GROUP %s\" command: \"%s\"" -msgstr "" -"Nom de groupe erroné (\"%s\") dans la réponse de la commande \"GROUP%s\" : " -"\"%s\"" +msgid "Disconnecting from server..." +msgstr "Déconnexion du serveur..." #: src/lang.c:1109 #, c-format @@ -5533,65 +5526,69 @@ msgstr "NFC" msgid "NFD" msgstr "NFD" -#: src/lang.c:1586 +#: src/lang.c:1580 +msgid "NFKC case fold" +msgstr "" + +#: src/lang.c:1589 msgid "Display Options" msgstr "Options d'affichage" -#: src/lang.c:1593 +#: src/lang.c:1596 msgid "Color Options" msgstr "Options des couleurs" -#: src/lang.c:1599 +#: src/lang.c:1602 msgid "Highlight Options" msgstr "Options de mise en évidence" -#: src/lang.c:1606 +#: src/lang.c:1609 msgid "Article-Limiting Options" msgstr "Options des articles" -#: src/lang.c:1612 +#: src/lang.c:1615 msgid "Posting/Mailing Options" msgstr "Options de postage/messagerie" -#: src/lang.c:1618 +#: src/lang.c:1621 msgid "Saving/Printing Options" msgstr "Options d'enregistrement/d'impression" -#: src/lang.c:1624 +#: src/lang.c:1627 msgid "Expert Options" msgstr "Options avancées" -#: src/lang.c:1630 +#: src/lang.c:1633 msgid "Filtering Options" msgstr "Options de filtrage" -#: src/lang.c:1635 src/lang.c:1666 src/lang.c:1672 src/lang.c:1699 -#: src/lang.c:1751 src/lang.c:1757 src/lang.c:1767 src/lang.c:1778 -#: src/lang.c:1796 src/lang.c:1865 src/lang.c:2066 src/lang.c:2072 -#: src/lang.c:2078 src/lang.c:2084 src/lang.c:2096 src/lang.c:2103 -#: src/lang.c:2157 src/lang.c:2166 src/lang.c:2172 src/lang.c:2179 -#: src/lang.c:2186 src/lang.c:2193 src/lang.c:2200 src/lang.c:2207 -#: src/lang.c:2214 src/lang.c:2221 src/lang.c:2228 src/lang.c:2235 -#: src/lang.c:2242 src/lang.c:2249 src/lang.c:2256 src/lang.c:2263 -#: src/lang.c:2270 src/lang.c:2277 src/lang.c:2284 src/lang.c:2291 -#: src/lang.c:2298 src/lang.c:2305 src/lang.c:2312 src/lang.c:2319 -#: src/lang.c:2326 src/lang.c:2333 src/lang.c:2340 src/lang.c:2348 -#: src/lang.c:2364 src/lang.c:2371 src/lang.c:2378 src/lang.c:2385 -#: src/lang.c:2391 src/lang.c:2397 src/lang.c:2414 src/lang.c:2426 -#: src/lang.c:2461 src/lang.c:2514 src/lang.c:2528 src/lang.c:2534 -#: src/lang.c:2559 src/lang.c:2577 src/lang.c:2594 src/lang.c:2606 -#: src/lang.c:2639 src/lang.c:2675 src/lang.c:2695 src/lang.c:2730 -#: src/lang.c:2740 src/lang.c:2747 src/lang.c:2773 src/lang.c:2797 -#: src/lang.c:2870 src/lang.c:2884 src/lang.c:2892 src/lang.c:2906 -#: src/lang.c:2912 src/lang.c:2950 +#: src/lang.c:1638 src/lang.c:1669 src/lang.c:1675 src/lang.c:1702 +#: src/lang.c:1754 src/lang.c:1760 src/lang.c:1770 src/lang.c:1781 +#: src/lang.c:1799 src/lang.c:1868 src/lang.c:2069 src/lang.c:2075 +#: src/lang.c:2081 src/lang.c:2087 src/lang.c:2099 src/lang.c:2106 +#: src/lang.c:2160 src/lang.c:2169 src/lang.c:2175 src/lang.c:2182 +#: src/lang.c:2189 src/lang.c:2196 src/lang.c:2203 src/lang.c:2210 +#: src/lang.c:2217 src/lang.c:2224 src/lang.c:2231 src/lang.c:2238 +#: src/lang.c:2245 src/lang.c:2252 src/lang.c:2259 src/lang.c:2266 +#: src/lang.c:2273 src/lang.c:2280 src/lang.c:2287 src/lang.c:2294 +#: src/lang.c:2301 src/lang.c:2308 src/lang.c:2315 src/lang.c:2322 +#: src/lang.c:2329 src/lang.c:2336 src/lang.c:2343 src/lang.c:2351 +#: src/lang.c:2367 src/lang.c:2374 src/lang.c:2381 src/lang.c:2388 +#: src/lang.c:2394 src/lang.c:2400 src/lang.c:2417 src/lang.c:2429 +#: src/lang.c:2464 src/lang.c:2517 src/lang.c:2531 src/lang.c:2537 +#: src/lang.c:2562 src/lang.c:2580 src/lang.c:2597 src/lang.c:2609 +#: src/lang.c:2642 src/lang.c:2678 src/lang.c:2698 src/lang.c:2733 +#: src/lang.c:2743 src/lang.c:2750 src/lang.c:2776 src/lang.c:2800 +#: src/lang.c:2877 src/lang.c:2892 src/lang.c:2900 src/lang.c:2914 +#: src/lang.c:2920 src/lang.c:2958 msgid " toggles, sets, cancels." msgstr " change, valide, annule." -#: src/lang.c:1636 +#: src/lang.c:1639 msgid "Show mini menu & posting etiquette" msgstr "Afficher le menu & l'intitulé du postage" -#: src/lang.c:1637 +#: src/lang.c:1640 msgid "" "# If ON show a mini menu of useful commands at each level\n" "# and posting etiquette after composing an article\n" @@ -5599,17 +5596,17 @@ msgstr "" "# Si ON, affiche un mini menu des commandes utiles pour chaque\n" "# niveaux et affiche les détails après la composition d'un article\n" -#: src/lang.c:1642 +#: src/lang.c:1645 msgid "Show short description for each newsgroup. toggles & sets." msgstr "" "Afficher une brève description pour chaque groupe. change & " " valide." -#: src/lang.c:1643 +#: src/lang.c:1646 msgid "Show description of each newsgroup" msgstr "Voir description de chaque groupe" -#: src/lang.c:1644 +#: src/lang.c:1647 msgid "" "# If ON show group description text after newsgroup name at\n" "# group selection level\n" @@ -5617,18 +5614,18 @@ msgstr "" "# Si ON, affiche une description du groupe après son nom dans\n" "# la vue de sélection des groupes\n" -#: src/lang.c:1649 +#: src/lang.c:1652 msgid "" "Show From (author) fields in group & thread level. toggles & " "sets." msgstr "" "Affiche l'auteur dans le menu groupe. change & valide." -#: src/lang.c:1650 +#: src/lang.c:1653 msgid "In group and thread level, show author by" msgstr "Dans la vue groupe et processus, voir auteur par" -#: src/lang.c:1651 +#: src/lang.c:1654 msgid "" "# Part of From field to display in group and thread level\n" "# Possible values are (the default is marked with *):\n" @@ -5644,34 +5641,34 @@ msgstr "" "# * 2 = nom complet\n" "# 3 = les deux\n" -#: src/lang.c:1660 +#: src/lang.c:1663 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "" "Affiche -> ou une barre de sélection. change & valide." -#: src/lang.c:1661 +#: src/lang.c:1664 msgid "Draw -> instead of highlighted bar" msgstr "Afficher -> plutôt qu'une barre" -#: src/lang.c:1662 +#: src/lang.c:1665 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:1667 +#: src/lang.c:1670 msgid "Use inverse video for page headers" msgstr "Vidéo inversée pour les en-têtes" -#: src/lang.c:1668 +#: src/lang.c:1671 msgid "# If ON use inverse video for page headers at different levels\n" msgstr "" "# Si ON, utilise la vidéo inversée pour les en-têtes dans les différentes\n" "# vues\n" -#: src/lang.c:1673 +#: src/lang.c:1676 msgid "Thread articles by" msgstr "Regrouper les articles par" -#: src/lang.c:1674 +#: src/lang.c:1677 msgid "" "# Thread articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5691,17 +5688,17 @@ msgstr "" "# 4 = Sujet multipartie\n" "# 5 = Pourcentage de concordance\n" -#: src/lang.c:1685 +#: src/lang.c:1688 msgid "Enter percentage match required to thread together. sets." msgstr "" "Entrer le pourcentage de concordance pour grouper les articles en un fil. " " valide." -#: src/lang.c:1686 +#: src/lang.c:1689 msgid "Thread percentage match" msgstr "Pourcentage de concordance pour grouper" -#: src/lang.c:1688 +#: src/lang.c:1691 #, no-c-format msgid "" "# Thread percentage match...\n" @@ -5730,11 +5727,11 @@ msgstr "" "'harpie',\n" "# 'happie' et 'harppy' seront regroupés à part de 'happy'\n" -#: src/lang.c:1700 +#: src/lang.c:1703 msgid "Score of a thread" msgstr "Score d'un fil" -#: src/lang.c:1701 +#: src/lang.c:1704 msgid "" "# Thread score\n" "# Possible values are (the default is marked with *):\n" @@ -5748,17 +5745,17 @@ msgstr "" "# 1 = somme\n" "# 2 = moyenne\n" -#: src/lang.c:1709 +#: src/lang.c:1712 msgid "" "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "" "Trie les articles d'après un en-tête. change & valide." -#: src/lang.c:1710 +#: src/lang.c:1713 msgid "Sort articles by" msgstr "Trier les articles par" -#: src/lang.c:1711 +#: src/lang.c:1714 msgid "" "# Sort articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5788,15 +5785,15 @@ msgstr "" "# 9 = Lignes descendant\n" "# 10 = Lignes ascendant)\n" -#: src/lang.c:1727 +#: src/lang.c:1730 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "Trier les fils par Rien ou Score. change & valide." -#: src/lang.c:1728 +#: src/lang.c:1731 msgid "Sort threads by" msgstr "Trier les fils par" -#: src/lang.c:1729 +#: src/lang.c:1732 msgid "" "# Sort thread by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5814,50 +5811,50 @@ msgstr "" "# 3 = Date la plus récente, descendant\n" "# 4 = Date la plus récente, ascendant\n" -#: src/lang.c:1739 +#: src/lang.c:1742 msgid "" "Put cursor at first/last unread art in groups. toggles & sets." msgstr "" "Place le curseur sur le 1er article non lu. change & " "valide." -#: src/lang.c:1740 +#: src/lang.c:1743 msgid "Go to first unread article in group" msgstr "Aller au 1er article non lu du groupe" -#: src/lang.c:1741 +#: src/lang.c:1744 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "" "# Si ON, place le curseur sur le 1er article non lu sinon sur le dernier\n" -#: src/lang.c:1745 +#: src/lang.c:1748 msgid "Show all articles or only unread articles. toggles & sets." msgstr "" "Affiche tous les articles ou seulement ceux non lus. change & " " valide." -#: src/lang.c:1746 +#: src/lang.c:1749 msgid "Show only unread articles" msgstr "Afficher articles non lus seulement" -#: src/lang.c:1747 +#: src/lang.c:1750 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:1752 +#: src/lang.c:1755 msgid "Show only groups with unread arts" msgstr "Voir groupes avec articles non lus" -#: src/lang.c:1753 +#: src/lang.c:1756 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:1758 +#: src/lang.c:1761 msgid "Filter which articles" msgstr "Filtrer quel article" -#: src/lang.c:1759 +#: src/lang.c:1762 msgid "" "# Filter which articles\n" "# Possible values are (the default is marked with *):\n" @@ -5871,11 +5868,11 @@ msgstr "" "# 1 = filtrer tous les articles et les marquer avec un K dans les fils\n" "# 2 = filtrer tous les articles et ne pas les afficher\n" -#: src/lang.c:1768 +#: src/lang.c:1771 msgid "Go to the next unread article with" msgstr "Aller au prochain article non lu avec" -#: src/lang.c:1769 +#: src/lang.c:1772 msgid "" "# Go to the unread article with following key(s)\n" "# Possible values are (the default is marked with *):\n" @@ -5891,11 +5888,11 @@ msgstr "" "# * 2 = TAB\n" "# 3 = PAGE DOWN ou TAB\n" -#: src/lang.c:1779 +#: src/lang.c:1782 msgid "How to treat blank lines" msgstr "Comment gérer les lignes vides" -#: src/lang.c:1780 +#: src/lang.c:1783 msgid "" "# Trim the article body, remove unnecessary blank lines.\n" "# Possible values are (the default is marked with *):\n" @@ -5925,27 +5922,27 @@ msgstr "" "# 7 = Regrouper plusieurs lignes vides entre les paragraphes et\n" "# effacer les lignes vides du début et de la fin\n" -#: src/lang.c:1797 +#: src/lang.c:1800 msgid "List thread using right arrow key" msgstr "Lister le fil via la flèche droite" -#: src/lang.c:1798 +#: src/lang.c:1801 msgid "" "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "" "# Si ON, listera automatiquement le fil lors de l'utilisation de la flèche\n" "# droite.\n" -#: src/lang.c:1802 +#: src/lang.c:1805 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "" "Caractère indiquant les articles effacés. valide, annule." -#: src/lang.c:1803 +#: src/lang.c:1806 msgid "Character to show deleted articles" msgstr "Caractère pour articles effacés" -#: src/lang.c:1804 +#: src/lang.c:1807 msgid "" "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" @@ -5953,17 +5950,17 @@ msgstr "" "# Caractère utilisé pour indiquer qu'un article a été supprimé (défaut 'D')\n" "# _ est transformé en ' '\n" -#: src/lang.c:1809 +#: src/lang.c:1812 msgid "" "Enter character to indicate articles in a range. sets, cancels." msgstr "" "Caractère indiquant les articles inclus. valide, annule." -#: src/lang.c:1810 +#: src/lang.c:1813 msgid "Character to show inrange articles" msgstr "Caractère pour articles non inclus" -#: src/lang.c:1811 +#: src/lang.c:1814 msgid "" "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" @@ -5971,7 +5968,7 @@ msgstr "" "# Caractère utilisé pour indiquer qu'un article est inclus (défaut '#')\n" "# _ est transformé en ' '\n" -#: src/lang.c:1816 +#: src/lang.c:1819 msgid "" "Enter character to indicate that article will return. sets, " "cancels." @@ -5979,11 +5976,11 @@ msgstr "" "Caractère indiquant que l'article sera retourné. valide, " "annule." -#: src/lang.c:1817 +#: src/lang.c:1820 msgid "Character to show returning arts" msgstr "Caractère pour articles retournés" -#: src/lang.c:1818 +#: src/lang.c:1821 msgid "" "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" @@ -5991,17 +5988,17 @@ msgstr "" "# Caractère utilisé pour indiquer qu'un article sera retourné (défaut '#')\n" "# _ est transformé en ' '\n" -#: src/lang.c:1823 +#: src/lang.c:1826 msgid "" "Enter character to indicate selected articles. sets, cancels." msgstr "" "Caractère indiquant les articles sélectionnés. valide, annule." -#: src/lang.c:1824 +#: src/lang.c:1827 msgid "Character to show selected articles" msgstr "Caractère pour articles sélect." -#: src/lang.c:1825 +#: src/lang.c:1828 msgid "" "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" @@ -6010,16 +6007,16 @@ msgstr "" "'*')\n" "# _ est transformé en ' '\n" -#: src/lang.c:1830 +#: src/lang.c:1833 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "" "Caractère indiquant les articles récents. valide, annule." -#: src/lang.c:1831 +#: src/lang.c:1834 msgid "Character to show recent articles" msgstr "Caractère pour articles récents" -#: src/lang.c:1832 +#: src/lang.c:1835 msgid "" "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" @@ -6027,16 +6024,16 @@ msgstr "" "# Caractère utilisé pour indiquer qu'un article est récent (defaut 'o')\n" "# _ est transformé en ' '\n" -#: src/lang.c:1837 +#: src/lang.c:1840 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "" "Caractère indiquant les articles non lus. valide, annule." -#: src/lang.c:1838 +#: src/lang.c:1841 msgid "Character to show unread articles" msgstr "Caractère pour articles non lus" -#: src/lang.c:1839 +#: src/lang.c:1842 msgid "" "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" @@ -6044,15 +6041,15 @@ msgstr "" "# Caractère utilisé pour indiquer qu'un article est non lu (defaut '+')\n" "# _ est transformé en ' '\n" -#: src/lang.c:1844 +#: src/lang.c:1847 msgid "Enter character to indicate read articles. sets, cancels." msgstr "Caractère indiquant les articles lus. valide, annule." -#: src/lang.c:1845 +#: src/lang.c:1848 msgid "Character to show read articles" msgstr "Caractère pour articles lus" -#: src/lang.c:1846 +#: src/lang.c:1849 msgid "" "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" @@ -6060,16 +6057,16 @@ msgstr "" "# Caractère utilisé pour indiquer qu'un article a été lu (defaut ' ')\n" "# _ est transformé en ' '\n" -#: src/lang.c:1851 +#: src/lang.c:1854 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "" "Caractère indiquant les articles filtrés. valide, annule." -#: src/lang.c:1852 +#: src/lang.c:1855 msgid "Character to show killed articles" msgstr "Caractère pour articles filtrés" -#: src/lang.c:1853 +#: src/lang.c:1856 msgid "" "# Character used to show that an art was killed (default 'K')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" @@ -6077,18 +6074,18 @@ 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:1858 +#: src/lang.c:1861 msgid "" "Enter character to indicate read selected articles. sets, cancels." msgstr "" "Caractère indiquant les articles lus et sélectionnés. valide, " "annule." -#: src/lang.c:1859 +#: src/lang.c:1862 msgid "Character to show readselected arts" msgstr "Caractère pour articles sélectionnés lus" -#: src/lang.c:1860 +#: src/lang.c:1863 msgid "" "# Character used to show that an art was selected before read (default ':')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" @@ -6097,11 +6094,11 @@ msgstr "" "# d'être lu (defaut ':')\n" "# kill_level doit être choisi en conséquence, _ est transformé en ' '\n" -#: src/lang.c:1866 +#: src/lang.c:1869 msgid "Abbreviate long newsgroup names" msgstr "Abréger les noms de groupes trop longs" -#: src/lang.c:1867 +#: src/lang.c:1870 msgid "" "# If ON abbreviate (if necessary) long newsgroup names at group selection\n" "# level and article level like this:\n" @@ -6111,7 +6108,7 @@ msgstr "" "# la vue de sélection de groupes et d'articles comme affiché ci-dessous :\n" "# news.software.readers -> n.software.readers -> n.s.readers -> n.s.r.\n" -#: src/lang.c:1873 +#: src/lang.c:1876 msgid "" "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" @@ -6119,11 +6116,11 @@ msgstr "" "0 = défilement page par page, -1 = afficher dernière ligne dans page " "suivante, -2 = demi-page" -#: src/lang.c:1874 +#: src/lang.c:1877 msgid "Number of lines to scroll in pager" msgstr "Vitesse de défilement dans le pager" -#: src/lang.c:1875 +#: src/lang.c:1878 msgid "" "# Number of lines that cursor-up/down will scroll in article pager\n" "# Possible values are (the default is marked with *):\n" @@ -6141,32 +6138,32 @@ msgstr "" "# * 1 = ligne par ligne\n" "# 2 ou plus = défiler 2 lignes par 2 ou plus (seulement dans le pager)\n" -#: src/lang.c:1885 +#: src/lang.c:1888 msgid "Display signatures. toggles & sets." msgstr "Affiche les signatures. change & valide." -#: src/lang.c:1886 +#: src/lang.c:1889 msgid "Display signatures" msgstr "Afficher les signatures" -#: src/lang.c:1887 +#: src/lang.c:1890 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "" "# Si OFF ne pas afficher les signatures lors de la visualisation des " "articles.\n" -#: src/lang.c:1891 +#: src/lang.c:1894 msgid "" "Display uuencoded data as tagged attachments. toggles & sets." msgstr "" "Afficher les archives uue comme PJ marquées. change & " "valide." -#: src/lang.c:1892 +#: src/lang.c:1895 msgid "Display uue data as an attachment" msgstr "Afficher donnée uue comme PJ" -#: src/lang.c:1893 +#: src/lang.c:1896 msgid "" "# Handling of uuencoded data in the pager\n" "# Possible values are (the default is marked with *):\n" @@ -6186,18 +6183,18 @@ msgstr "" "des\n" "# données uuencode sera condensée en une seule ligne.\n" -#: src/lang.c:1903 +#: src/lang.c:1906 msgid "" "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "" "Décode les umlauts Allemands de type TeX en ISO. change & " "valide." -#: src/lang.c:1904 +#: src/lang.c:1907 msgid "Display \"a as Umlaut-a" msgstr "Afficher \"a comme Umlaut-a" -#: src/lang.c:1905 +#: src/lang.c:1908 msgid "" "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" @@ -6205,15 +6202,15 @@ 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:1910 src/lang.c:1920 +#: src/lang.c:1913 src/lang.c:1923 msgid "Space separated list of header fields" msgstr "Liste des en-têtes, séparés par des espaces" -#: src/lang.c:1911 +#: src/lang.c:1914 msgid "Display these header fields (or *)" msgstr "Afficher ces en-têtes (ou *)" -#: src/lang.c:1912 +#: src/lang.c:1915 msgid "" "# Which news headers you wish to see. If you want to see _all_ the headers,\n" "# place an '*' as this value. This is the only way a wildcard can be used.\n" @@ -6232,11 +6229,11 @@ msgstr "" "# en-têtes en les délimitant avec des espaces. Ne rien définir, désactive\n" "# cette option.\n" -#: src/lang.c:1921 +#: src/lang.c:1924 msgid "Do not display these header fields" msgstr "Ne pas afficher ces en-têtes" -#: src/lang.c:1922 +#: src/lang.c:1925 msgid "" "# Same as 'news_headers_to_display' except it denotes the opposite.\n" "# An example of using both options might be if you thought X- headers were\n" @@ -6257,45 +6254,45 @@ msgstr "" "# news_headers_to_not_display=X-Alan X-Pape\n" "# Ne rien définir, désactive cette option.\n" -#: src/lang.c:1932 +#: src/lang.c:1935 msgid "" "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "" "Voulez-vous activer la prise en charge automatique des articles multipart/" "alternative ?" -#: src/lang.c:1933 +#: src/lang.c:1936 msgid "Skip multipart/alternative parts" msgstr "Ignorer parties multipart/alter." -#: src/lang.c:1934 +#: src/lang.c:1937 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "# Si ON, enlève automatiquement les messages multipart/alternative\n" -#: src/lang.c:1938 +#: src/lang.c:1941 msgid "Enable detection of verbatim blocks? toggles & sets." msgstr "" "Activer la détection des blocs à citer ? change & valide." -#: src/lang.c:1939 +#: src/lang.c:1942 msgid "Detection of verbatim blocks" msgstr "Détection des blocs textuels" -#: src/lang.c:1940 +#: src/lang.c:1943 msgid "# If ON detect verbatim blocks in articles\n" msgstr "# Si ON, détecte les blocs textuels dans les articles\n" -#: src/lang.c:1945 +#: src/lang.c:1948 msgid "A regex used to decide which lines to show in col_quote." msgstr "" "Une expression régulière pour déterminer quelles lignes afficher dans " "col_quote." -#: src/lang.c:1946 +#: src/lang.c:1949 msgid "Regex used to show quoted lines" msgstr "Regex pour afficher les citations" -#: src/lang.c:1947 +#: src/lang.c:1950 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" @@ -6305,17 +6302,17 @@ msgstr "" "# 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:1953 +#: src/lang.c:1956 msgid "A regex used to decide which lines to show in col_quote2." msgstr "" "Une expression régulière pour déterminer quelles lignes afficher dans " "col_quote2." -#: src/lang.c:1954 +#: src/lang.c:1957 msgid "Regex used to show twice quoted l." msgstr "Regex pour afficher le 2nd niveau" -#: src/lang.c:1955 +#: src/lang.c:1958 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" @@ -6325,17 +6322,17 @@ msgstr "" "# 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:1961 +#: src/lang.c:1964 msgid "A regex used to decide which lines to show in col_quote3." msgstr "" "Une expression régulière pour déterminer quelles lignes afficher dans " "col_quote3." -#: src/lang.c:1962 +#: src/lang.c:1965 msgid "Regex used to show >= 3 times q.l." msgstr "Regex pour afficher niveau >= 3" -#: src/lang.c:1963 +#: src/lang.c:1966 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" @@ -6347,33 +6344,33 @@ msgstr "" "# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " "défaut.\n" -#: src/lang.c:1969 +#: src/lang.c:1972 msgid "Enable detection of external quotes? toggles & sets." msgstr "" "Activer la détection des citations externes ? change & " "valide." -#: src/lang.c:1970 +#: src/lang.c:1973 msgid "Detection of external quotes" msgstr "Détection des citations externes" -#: src/lang.c:1971 +#: src/lang.c:1974 msgid "# If ON detect quoted text from external sources in articles\n" msgstr "" "# Si ON, détecte les citations textuelles de sources externes dans les " "articles\n" -#: src/lang.c:1975 +#: src/lang.c:1978 msgid "A regex used to decide which lines to show in col_extquote." msgstr "" "Une expression régulière pour déterminer quelles lignes afficher dans " "col_extquote." -#: src/lang.c:1976 +#: src/lang.c:1979 msgid "Regex used to show quotes from external sources" msgstr "Regex pour afficher les citations de sources externes" -#: src/lang.c:1977 +#: src/lang.c:1980 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# external quotes. Text from external quotes is shown in col_extquote.\n" @@ -6384,17 +6381,17 @@ msgstr "" "# second niveau. Ces citations sont affichées dans col_extquote. Si vous\n" "# laissez ce champ vide, tin utilisera une valeur incluse par défaut.\n" -#: src/lang.c:1984 +#: src/lang.c:1987 msgid "A regex used to decide which words to show in col_markslashes." msgstr "" "Une expression régulière pour déterminer quels mots afficher dans " "col_markslashes." -#: src/lang.c:1985 +#: src/lang.c:1988 msgid "Regex used to highlight /slashes/" msgstr "Regex pour les mots entre /slash/" -#: src/lang.c:1986 +#: src/lang.c:1989 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '/' are to be shown in col_markslashes.\n" @@ -6405,17 +6402,17 @@ msgstr "" "# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " "défaut.\n" -#: src/lang.c:1992 +#: src/lang.c:1995 msgid "A regex used to decide which words to show in col_markstars." msgstr "" "Une expression régulière pour déterminer quels mots afficher dans " "col_markstars." -#: src/lang.c:1993 +#: src/lang.c:1996 msgid "Regex used to highlight *stars*" msgstr "Regex pour les mots entre *astérisques*" -#: src/lang.c:1994 +#: src/lang.c:1997 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '*' are to be shown in col_markstars.\n" @@ -6426,17 +6423,17 @@ msgstr "" "# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " "défaut.\n" -#: src/lang.c:2000 +#: src/lang.c:2003 msgid "A regex used to decide which words to show in col_markstroke." msgstr "" "Une expression régulière pour déterminer quels mots afficher dans " "col_markstroke." -#: src/lang.c:2001 +#: src/lang.c:2004 msgid "Regex used to highlight -strokes-" msgstr "Regex pour les mots entre -tirets-" -#: src/lang.c:2002 +#: src/lang.c:2005 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '-' are to be shown in col_markstroke.\n" @@ -6447,17 +6444,17 @@ msgstr "" "# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " "défaut.\n" -#: src/lang.c:2008 +#: src/lang.c:2011 msgid "A regex used to decide which words to show in col_markdash." msgstr "" "Une expression régulière pour déterminer quels mots afficher dans " "col_markdash." -#: src/lang.c:2009 +#: src/lang.c:2012 msgid "Regex used to highlight _underline_" msgstr "Regex pour les mots entre _underscore_" -#: src/lang.c:2010 +#: src/lang.c:2013 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '_' are to be shown in col_markdash.\n" @@ -6468,17 +6465,17 @@ msgstr "" "# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " "défaut.\n" -#: src/lang.c:2016 +#: src/lang.c:2019 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "" "Une expression régulière pour trouver les préfixes dans le sujet. '|' est un " "séparateur." -#: src/lang.c:2017 +#: src/lang.c:2020 msgid "Regex with Subject prefixes" msgstr "Regex pour les préfixes dans le sujet" -#: src/lang.c:2018 +#: src/lang.c:2021 msgid "" "# A regular expression that tin will use to find Subject prefixes\n" "# which will be removed before showing the header.\n" @@ -6486,17 +6483,17 @@ 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:2023 +#: src/lang.c:2026 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "" "Une expression régulière pour trouver les suffixes dans le sujet. '|' est un " "séparateur." -#: src/lang.c:2024 +#: src/lang.c:2027 msgid "Regex with Subject suffixes" msgstr "Regex pour les suffixes dans le sujet" -#: src/lang.c:2025 +#: src/lang.c:2028 msgid "" "# A regular expression that tin will use to find Subject suffixes\n" "# which will be removed when replying or posting followup.\n" @@ -6504,15 +6501,15 @@ 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:2030 +#: src/lang.c:2033 msgid "A regex used to find the begin of a verbatim block." msgstr "Une expression régulière pour trouver le début d'un bloc textuel." -#: src/lang.c:2031 +#: src/lang.c:2034 msgid "Regex for begin of a verbatim block" msgstr "Regex pour le début d'un bloc textuel" -#: src/lang.c:2032 +#: src/lang.c:2035 msgid "" "# A regular expression that tin will use to find the begin of\n" "# a verbatim block.\n" @@ -6520,15 +6517,15 @@ msgstr "" "# Une expression régulière que tin utilisera pour trouver\n" "# le début d'un bloc textuel.\n" -#: src/lang.c:2037 +#: src/lang.c:2040 msgid "A regex used to find the end of a verbatim block." msgstr "Une expression régulière pour trouver la fin d'un bloc textuel." -#: src/lang.c:2038 +#: src/lang.c:2041 msgid "Regex for end of a verbatim block" msgstr "Regex pour la fin d'un bloc textuel" -#: src/lang.c:2039 +#: src/lang.c:2042 msgid "" "# A regular expression that tin will use to find the end of\n" "# a verbatim block.\n" @@ -6536,7 +6533,7 @@ msgstr "" "# Une expression régulière que tin utilisera pour trouver\n" "# la fin d'une bloc textuel.\n" -#: src/lang.c:2044 +#: src/lang.c:2047 msgid "" "Enter name and options for external MIME viewer, --internal for built-in " "viewer" @@ -6544,15 +6541,15 @@ msgstr "" "Nom et options pour le visualisateur MIME externe, --internal pour celui " "inclus" -#: src/lang.c:2045 +#: src/lang.c:2048 msgid "MIME binary content viewer" msgstr "Visualisateur de contenu MIME" -#: src/lang.c:2046 +#: src/lang.c:2049 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 " +"# Otherwise specify an external viewer program (eg. metamail) or leave " "blank\n" "# for no automatic viewing\n" msgstr "" @@ -6561,15 +6558,15 @@ msgstr "" "# 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:2053 +#: src/lang.c:2056 msgid "Confirm before starting non-text viewing program" msgstr "Confirmation avant le lancement d'un visualisateur externe" -#: src/lang.c:2054 +#: src/lang.c:2057 msgid "Ask before using MIME viewer" msgstr "Demander avant d'utiliser le visualisateur" -#: src/lang.c:2055 +#: src/lang.c:2058 msgid "" "# If ON tin will ask before using metamail to display MIME messages\n" "# this only happens if metamail_prog is set to something\n" @@ -6578,46 +6575,46 @@ msgstr "" "# messages MIME\n" "# Cela ne se produit que lorsque 'metamail_prog' contient une valeur\n" -#: src/lang.c:2060 +#: src/lang.c:2063 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "" "Marquer lu les groupes à la fermeture ? change & valide." -#: src/lang.c:2061 +#: src/lang.c:2064 msgid "Catchup read groups when quitting" msgstr "Marquer lu les groupes à la fermeture" -#: src/lang.c:2062 +#: src/lang.c:2065 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "" "# Si ON, demande à l'utilisateur si les groupes consultés\n" "# doivent être marqués lus\n" -#: src/lang.c:2067 +#: src/lang.c:2070 msgid "Catchup group using left key" msgstr "Marquer lu le groupe via la flèche gauche" -#: src/lang.c:2068 +#: src/lang.c:2071 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "# Si ON, marque lu avec <- le groupe/fil.\n" -#: src/lang.c:2073 +#: src/lang.c:2076 msgid "Catchup thread by using left key" msgstr "Marquer lu le fil via la flèche gauche" -#: src/lang.c:2079 +#: src/lang.c:2082 msgid "Which actions require confirmation" msgstr "Quelles actions requièrent confirmation" -#: src/lang.c:2080 +#: src/lang.c:2083 msgid "# What should we ask confirmation for.\n" msgstr "# Demande de confirmation pour...\n" -#: src/lang.c:2085 +#: src/lang.c:2088 msgid "'Mark as (un)read' ignores tags" msgstr "'Marquer (non)lu l'article' ignore les marques" -#: src/lang.c:2086 +#: src/lang.c:2089 msgid "" "# If ON the 'Mark as (un)read' function marks only the current article.\n" msgstr "" @@ -6625,45 +6622,45 @@ msgstr "" "l'article\n" "# actuel.\n" -#: src/lang.c:2090 +#: src/lang.c:2093 msgid "Program to run to open URLs, sets, cancels." msgstr "Logiciel utilisé pour lancer les URLs, valide, annule." -#: src/lang.c:2091 +#: src/lang.c:2094 msgid "Program that opens URLs" msgstr "Logiciel lançant les URLs" -#: src/lang.c:2092 +#: src/lang.c:2095 msgid "# The program used to open URLs. The actual URL will be appended\n" msgstr "# Commande ou script ouvrant les URLs. L'URL sera ajoutée\n" -#: src/lang.c:2097 +#: src/lang.c:2100 msgid "Use mouse in xterm" msgstr "Utiliser la souris dans l'xterm" -#: src/lang.c:2098 +#: src/lang.c:2101 msgid "# If ON enable mouse button support on xterm terminals\n" msgstr "# Si ON, active le support de la souris dans xterm\n" -#: src/lang.c:2104 +#: src/lang.c:2107 msgid "Use scroll keys on keypad" msgstr "Utiliser les flèches du pavé numérique" -#: src/lang.c:2105 +#: src/lang.c:2108 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "" "# Si ON, active les flèches de défilement pour les terminaux\n" "# les supportant\n" -#: src/lang.c:2110 +#: src/lang.c:2113 msgid "Enter maximum number of article to get. sets." msgstr "Nombre max d'articles à récupérer. valide." -#: src/lang.c:2111 +#: src/lang.c:2114 msgid "Number of articles to get" msgstr "Nombre d'articles à récupérer" -#: src/lang.c:2112 +#: src/lang.c:2115 msgid "" "# Number of articles to get (0=no limit), if negative sets maximum number\n" "# of already read articles to be read before first unread one\n" @@ -6672,29 +6669,29 @@ msgstr "" "# détermine le nombre max d'articles déjà lus à relire avant le premier non " "lu\n" -#: src/lang.c:2117 +#: src/lang.c:2120 msgid "Enter number of days article is considered recent. sets." msgstr "" "Nombre de jours un article est considéré comme récent. valide." -#: src/lang.c:2118 +#: src/lang.c:2121 msgid "Article recentness time limit" msgstr "Durée des articles considérés comme récents" -#: src/lang.c:2119 +#: src/lang.c:2122 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "# Nombre de jours un article est considéré comme récent; (0=OFF)\n" -#: src/lang.c:2123 +#: src/lang.c:2126 msgid "" "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "WILDMAT pour les wildcards normaux, REGEX pour expressions régulières." -#: src/lang.c:2124 +#: src/lang.c:2127 msgid "Wildcard matching" msgstr "Concordance wildcard" -#: src/lang.c:2125 +#: src/lang.c:2128 msgid "" "# Wildcard matching\n" "# Possible values are (the default is marked with *):\n" @@ -6706,59 +6703,59 @@ msgstr "" "# * 0 = wildmat\n" "# 1 = regex\n" -#: src/lang.c:2132 +#: src/lang.c:2135 msgid "Enter minimal score before an article is marked killed. sets." msgstr "Score minimal avant qu'un article soit filtré. valide." -#: src/lang.c:2133 +#: src/lang.c:2136 msgid "Score limit (kill)" msgstr "Score minimum (filtre)" -#: src/lang.c:2134 +#: src/lang.c:2137 msgid "# Score limit before an article is marked killed\n" msgstr "# Score minimal avant qu'un article soit filtré\n" -#: src/lang.c:2138 +#: src/lang.c:2141 msgid "Enter default score to kill articles. sets." msgstr "Score par défaut pour filtrer les articles. valide." -#: src/lang.c:2139 +#: src/lang.c:2142 msgid "Default score to kill articles" msgstr "Score par déf. pour filtrer les articles" -#: src/lang.c:2140 +#: src/lang.c:2143 msgid "# Default score to kill articles\n" msgstr "# Score par défaut pour filtrer les articles\n" -#: src/lang.c:2144 +#: src/lang.c:2147 msgid "Enter minimal score before an article is marked hot. sets." msgstr "Score minimal avant qu'un article soit sélectionné. valide." -#: src/lang.c:2145 +#: src/lang.c:2148 msgid "Score limit (select)" msgstr "Score minimum (sélection)" -#: src/lang.c:2146 +#: src/lang.c:2149 msgid "# Score limit before an article is marked hot\n" msgstr "# Score minimal avant qu'un article soit sélectionné\n" -#: src/lang.c:2150 +#: src/lang.c:2153 msgid "Enter default score to select articles. sets." msgstr "Score par défaut pour la sélection des articles. valide." -#: src/lang.c:2151 +#: src/lang.c:2154 msgid "Default score to select articles" msgstr "Score par défaut pour sél. les articles" -#: src/lang.c:2152 +#: src/lang.c:2155 msgid "# Default score to select articles\n" msgstr "# Score par défaut pour sélectionner les articles\n" -#: src/lang.c:2158 +#: src/lang.c:2161 msgid "Use slrnface to show ''X-Face:''s" msgstr "Utiliser slrnface pour afficher les 'X-Face:'" -#: src/lang.c:2159 +#: src/lang.c:2162 msgid "" "# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n" "# Only useful when running in an xterm.\n" @@ -6766,19 +6763,19 @@ msgstr "" "# Si ON, utiliser slrnface(1) pour interpréter l'en-tête 'X-Face:'\n" "# Seulement utile lors de l'utilisation de tin dans un xterm.\n" -#: src/lang.c:2167 +#: src/lang.c:2170 msgid "Use ANSI color" msgstr "Utiliser les couleurs ANSI" -#: src/lang.c:2168 +#: src/lang.c:2171 msgid "# If ON using ANSI-color\n" msgstr "# Si ON, utiliser les couleurs ANSI\n" -#: src/lang.c:2173 +#: src/lang.c:2176 msgid "Standard foreground color" msgstr "Couleur standard de l'avant-plan" -#: src/lang.c:2174 +#: src/lang.c:2177 msgid "" "# Standard foreground color\n" "# Default: -1 (default color)\n" @@ -6786,11 +6783,11 @@ msgstr "" "# Couleur standard de l'avant-plan\n" "# Défaut : -1 (défaut couleur)\n" -#: src/lang.c:2180 +#: src/lang.c:2183 msgid "Standard background color" msgstr "Couleur standard de l'arrière-plan" -#: src/lang.c:2181 +#: src/lang.c:2184 msgid "" "# Standard background color\n" "# Default: -1 (default color)\n" @@ -6798,11 +6795,11 @@ msgstr "" "# Couleur standard de l'arrière-plan\n" "# Défaut : -1 (défaut couleur)\n" -#: src/lang.c:2187 +#: src/lang.c:2190 msgid "Color for inverse text (background)" msgstr "Couleur du texte inversé (arrière-plan)" -#: src/lang.c:2188 +#: src/lang.c:2191 msgid "" "# Color of background for inverse text\n" "# Default: 4 (blue)\n" @@ -6810,11 +6807,11 @@ msgstr "" "# Couleur de l'arrière-plan pour le texte inversé\n" "# Défaut : 4 (bleu)\n" -#: src/lang.c:2194 +#: src/lang.c:2197 msgid "Color for inverse text (foreground)" msgstr "Couleur du texte inversé (avant-plan)" -#: src/lang.c:2195 +#: src/lang.c:2198 msgid "" "# Color of foreground for inverse text\n" "# Default: 7 (white)\n" @@ -6822,11 +6819,11 @@ msgstr "" "# Couleur de l'avant-plan du texte inversé\n" "# Défaut : 7 (blanc)\n" -#: src/lang.c:2201 +#: src/lang.c:2204 msgid "Color of text lines" msgstr "Couleur du texte" -#: src/lang.c:2202 +#: src/lang.c:2205 msgid "" "# Color of text lines\n" "# Default: -1 (default color)\n" @@ -6834,11 +6831,11 @@ msgstr "" "# Couleur du texte\n" "# Défaut : -1 (défaut couleur)\n" -#: src/lang.c:2208 +#: src/lang.c:2211 msgid "Color of mini help menu" msgstr "Couleur du petit menu d'aide" -#: src/lang.c:2209 +#: src/lang.c:2212 msgid "" "# Color of mini help menu\n" "# Default: 3 (brown)\n" @@ -6846,11 +6843,11 @@ msgstr "" "# Couleur du petit menu d'aide\n" "# Défaut : 3 (marron)\n" -#: src/lang.c:2215 +#: src/lang.c:2218 msgid "Color of help text" msgstr "Couleur de l'aide" -#: src/lang.c:2216 +#: src/lang.c:2219 msgid "" "# Color of help pages\n" "# Default: -1 (default color)\n" @@ -6858,11 +6855,11 @@ msgstr "" "# Couleur des pages d'aide\n" "# Défaut : -1 (couleur par défaut)\n" -#: src/lang.c:2222 +#: src/lang.c:2225 msgid "Color of status messages" msgstr "Couleur des messages de statut" -#: src/lang.c:2223 +#: src/lang.c:2226 msgid "" "# Color of messages in last line\n" "# Default: 6 (cyan)\n" @@ -6870,11 +6867,11 @@ msgstr "" "# Couleur des messages de statut\n" "# Défaut : 6 (cyan)\n" -#: src/lang.c:2229 +#: src/lang.c:2232 msgid "Color of quoted lines" msgstr "Couleur de citation de 1er niveau" -#: src/lang.c:2230 +#: src/lang.c:2233 msgid "" "# Color of quote-lines\n" "# Default: 2 (green)\n" @@ -6882,11 +6879,11 @@ msgstr "" "# Couleur de citation de premier niveau\n" "# Défaut : 2 (vert)\n" -#: src/lang.c:2236 +#: src/lang.c:2239 msgid "Color of twice quoted line" msgstr "Couleur de citation de 2nd niveau" -#: src/lang.c:2237 +#: src/lang.c:2240 msgid "" "# Color of twice quoted lines\n" "# Default: 3 (brown)\n" @@ -6894,11 +6891,11 @@ msgstr "" "# Couleur de citation de second niveau\n" "# Défaut : 3 (marron)\n" -#: src/lang.c:2243 +#: src/lang.c:2246 msgid "Color of =>3 times quoted line" msgstr "Couleur de citation de 3e niveau ou sup." -#: src/lang.c:2244 +#: src/lang.c:2247 msgid "" "# Color of >=3 times quoted lines\n" "# Default: 4 (blue)\n" @@ -6906,11 +6903,11 @@ msgstr "" "# Couleur de citation de 3e niveau ou supérieur\n" "# Défaut : 4 (bleu)\n" -#: src/lang.c:2250 +#: src/lang.c:2253 msgid "Color of article header lines" msgstr "Couleur des en-têtes de l'article" -#: src/lang.c:2251 +#: src/lang.c:2254 msgid "" "# Color of header-lines\n" "# Default: 2 (green)\n" @@ -6918,11 +6915,11 @@ msgstr "" "# Couleur des en-têtes de l'article\n" "# Défaut : 2 (vert)\n" -#: src/lang.c:2257 +#: src/lang.c:2260 msgid "Color of actual news header fields" msgstr "Couleur des champs d'en-tête actuels" -#: src/lang.c:2258 +#: src/lang.c:2261 msgid "" "# Color of actual news header fields\n" "# Default: 9 (light red)\n" @@ -6930,11 +6927,11 @@ msgstr "" "# Couleur des champs d'en-têtes actuels\n" "# Défaut : 9 (rouge gras)\n" -#: src/lang.c:2264 +#: src/lang.c:2267 msgid "Color of article subject lines" msgstr "Couleur du sujet" -#: src/lang.c:2265 +#: src/lang.c:2268 msgid "" "# Color of article subject\n" "# Default: 6 (cyan)\n" @@ -6942,11 +6939,11 @@ msgstr "" "# Couleur du sujet\n" "# Défaut : 6 (cyan)\n" -#: src/lang.c:2271 +#: src/lang.c:2274 msgid "Color of external quotes" msgstr "Couleur des citations externes" -#: src/lang.c:2272 +#: src/lang.c:2275 msgid "" "# Color of quoted text from external sources\n" "# Default: 5 (pink)\n" @@ -6954,11 +6951,11 @@ msgstr "" "# Couleur des citations textuelles de sources externes\n" "# Défaut : 5 (rose)\n" -#: src/lang.c:2278 +#: src/lang.c:2281 msgid "Color of response counter" msgstr "Couleur du compteur de réponse" -#: src/lang.c:2279 +#: src/lang.c:2282 msgid "" "# Color of response counter\n" "# Default: 2 (green)\n" @@ -6966,11 +6963,11 @@ msgstr "" "# Couleur du compteur de réponse\n" "# Défaut : 2 (vert)\n" -#: src/lang.c:2285 +#: src/lang.c:2288 msgid "Color of sender (From:)" msgstr "Couleur de l'expéditeur (From:)" -#: src/lang.c:2286 +#: src/lang.c:2289 msgid "" "# Color of sender (From:)\n" "# Default: 2 (green)\n" @@ -6978,11 +6975,11 @@ msgstr "" "# Couleur de l'expéditeur (From:)\n" "# Défaut : 2 (vert)\n" -#: src/lang.c:2292 +#: src/lang.c:2295 msgid "Color of help/mail sign" msgstr "Couleur de l'aide/signature email" -#: src/lang.c:2293 +#: src/lang.c:2296 msgid "" "# Color of Help/Mail-Sign\n" "# Default: 4 (blue)\n" @@ -6990,11 +6987,11 @@ msgstr "" "# Couleur de l'aide/signature email\n" "# Défaut : 4 (bleu)\n" -#: src/lang.c:2299 +#: src/lang.c:2302 msgid "Color of signatures" msgstr "Couleur des signatures" -#: src/lang.c:2300 +#: src/lang.c:2303 msgid "" "# Color of signature\n" "# Default: 4 (blue)\n" @@ -7002,11 +6999,11 @@ msgstr "" "# Couleur des signatures\n" "# Défaut : 4 (bleu)\n" -#: src/lang.c:2306 +#: src/lang.c:2309 msgid "Color of highlighted URLs" msgstr "Couleur des URLs en surbrillance" -#: src/lang.c:2307 +#: src/lang.c:2310 msgid "" "# Color of highlighted URLs\n" "# Default: -1 (default color)\n" @@ -7014,11 +7011,11 @@ msgstr "" "# Couleur des URLs en surbrillance\n" "# Défaut : -1 (défaut couleur)\n" -#: src/lang.c:2313 +#: src/lang.c:2316 msgid "Color of verbatim blocks" msgstr "Couleur des blocs textuels" -#: src/lang.c:2314 +#: src/lang.c:2317 msgid "" "# Color of verbatim blocks\n" "# Default: 5 (pink)\n" @@ -7026,11 +7023,11 @@ msgstr "" "# Couleur des blocs textuels\n" "# Défaut : 5 (rose)\n" -#: src/lang.c:2320 +#: src/lang.c:2323 msgid "Color of highlighting with *stars*" msgstr "Couleur des mots entre *astérisques*" -#: src/lang.c:2321 +#: src/lang.c:2324 msgid "" "# Color of word highlighting with *stars*\n" "# Default: 11 (yellow)\n" @@ -7038,11 +7035,11 @@ msgstr "" "# Couleur des mots entre *astérisques*\n" "# Défaut : 11 (jaune)\n" -#: src/lang.c:2327 +#: src/lang.c:2330 msgid "Color of highlighting with _dash_" msgstr "Couleur des mots entre _underscore_" -#: src/lang.c:2328 +#: src/lang.c:2331 msgid "" "# Color of word highlighting with _dash_\n" "# Default: 13 (light pink)\n" @@ -7050,11 +7047,11 @@ msgstr "" "# Couleur des mots entre _underscore_\n" "# Défaut : 13 (rose gras)\n" -#: src/lang.c:2334 +#: src/lang.c:2337 msgid "Color of highlighting with /slash/" msgstr "Couleur des mots entre /slash/" -#: src/lang.c:2335 +#: src/lang.c:2338 msgid "" "# Color of word highlighting with /slash/\n" "# Default: 14 (light cyan)\n" @@ -7062,11 +7059,11 @@ msgstr "" "# Couleur des mots entre /slash/\n" "# Défaut : 14 (cyan gras)\n" -#: src/lang.c:2341 +#: src/lang.c:2344 msgid "Color of highlighting with -stroke-" msgstr "Couleur des mots entre -tirets-" -#: src/lang.c:2342 +#: src/lang.c:2345 msgid "" "# Color of word highlighting with -stroke-\n" "# Default: 12 (light blue)\n" @@ -7074,11 +7071,11 @@ msgstr "" "# Couleur des mots entre -tirets-\n" "# Défaut : 12 (bleu gras)\n" -#: src/lang.c:2349 +#: src/lang.c:2352 msgid "Attr. of highlighting with *stars*" msgstr "Style des mots entre *astérisques*" -#: src/lang.c:2350 +#: src/lang.c:2353 msgid "" "# Attributes of word highlighting on mono terminals\n" "# Possible values are:\n" @@ -7106,11 +7103,11 @@ msgstr "" "# Style des mots entre *astérisques*\n" "# Défaut : 6 (gras)\n" -#: src/lang.c:2365 +#: src/lang.c:2368 msgid "Attr. of highlighting with _dash_" msgstr "Style des mots entre _underscore_" -#: src/lang.c:2366 +#: src/lang.c:2369 msgid "" "# Attribute of word highlighting with _dash_\n" "# Default: 2 (best highlighting)\n" @@ -7118,11 +7115,11 @@ msgstr "" "# Style des mots entre _tirets_\n" "# Défaut : 2 (mise en évidence accrue)\n" -#: src/lang.c:2372 +#: src/lang.c:2375 msgid "Attr. of highlighting with /slash/" msgstr "Style des mots entre /slash/" -#: src/lang.c:2373 +#: src/lang.c:2376 msgid "" "# Attribute of word highlighting with /slash/\n" "# Default: 5 (half bright)\n" @@ -7130,11 +7127,11 @@ msgstr "" "# Style des mots entre /slash/\n" "# Défaut : 5 (contrasté)\n" -#: src/lang.c:2379 +#: src/lang.c:2382 msgid "Attr. of highlighting with -stroke-" msgstr "Style des mots entre -tirets-" -#: src/lang.c:2380 +#: src/lang.c:2383 msgid "" "# Attribute of word highlighting with -stroke-\n" "# Default: 3 (reverse video)\n" @@ -7142,27 +7139,27 @@ msgstr "" "# Style des mots entre -tirets-\n" "# Défaut : 3 (vidéo inversée)\n" -#: src/lang.c:2386 +#: src/lang.c:2389 msgid "URL highlighting in message body" msgstr "Mise en évidence des URLs dans les articles" -#: src/lang.c:2387 +#: src/lang.c:2390 msgid "# Enable URL highlighting?\n" msgstr "# Mettre en évidence les URLs ?\n" -#: src/lang.c:2392 +#: src/lang.c:2395 msgid "Word highlighting in message body" msgstr "Mise en évidence des mots dans les articles" -#: src/lang.c:2393 +#: src/lang.c:2396 msgid "# Enable word highlighting?\n" msgstr "# Mettre en évidence les mots ?\n" -#: src/lang.c:2398 +#: src/lang.c:2401 msgid "What to display instead of mark" msgstr "Afficher ça plutôt qu'une marque" -#: src/lang.c:2399 +#: src/lang.c:2402 msgid "" "# Should the leading and ending stars and dashes also be displayed,\n" "# even when they are highlighting marks?\n" @@ -7178,64 +7175,64 @@ msgstr "" "# 1 = oui, afficher la marque\n" "# * 2 = plutôt afficher un espace\n" -#: src/lang.c:2408 +#: src/lang.c:2411 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "Largeur du pager. valide." -#: src/lang.c:2409 +#: src/lang.c:2412 msgid "Page line wrap column" msgstr "Largeur du pager" -#: src/lang.c:2410 +#: src/lang.c:2413 msgid "# Wrap article lines at column\n" msgstr "# Justifier les lignes des articles à la colonne indiquée\n" -#: src/lang.c:2415 +#: src/lang.c:2418 msgid "Wrap around threads on next unread" msgstr "Englober les fils pour le non lu suivant" -#: src/lang.c:2416 +#: src/lang.c:2419 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "" "# Si ON, englober les fils lors de la recherche de l'article suivant non lu\n" -#: src/lang.c:2420 +#: src/lang.c:2423 msgid "Enter default mail address (and fullname). sets." msgstr "Adresse mail par défaut (et nom complet). valide." -#: src/lang.c:2421 src/lang.c:2931 +#: src/lang.c:2424 src/lang.c:2939 msgid "Mail address (and fullname)" msgstr "Adresse mail (et nom complet)" -#: src/lang.c:2422 +#: src/lang.c:2425 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "" "# Adresse mail (et nom complet) si ce n'est pas utilisateur@hôte\n" "# (nom complet)\n" -#: src/lang.c:2427 +#: src/lang.c:2430 msgid "Show empty Followup-To in editor" msgstr "Inclure l'en-tête Followup-To dans l'éditeur" -#: src/lang.c:2428 +#: src/lang.c:2431 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "" "# Si ON, inclure l'en-tête Followup-To lors de la composition\n" "# des articles\n" -#: src/lang.c:2432 +#: src/lang.c:2435 msgid "" "Enter path/! command/--none to create your default signature. sets." msgstr "" "Chemin/! commande/--aucune pour la création de votre signature. " "valide." -#: src/lang.c:2433 +#: src/lang.c:2436 msgid "Create signature from path/command" msgstr "Signature depuis fichier/commande" -#: src/lang.c:2434 -#, fuzzy, c-format +#: src/lang.c:2437 +#, c-format msgid "" "# Signature path (random sigs)/file to be used when posting/replying\n" "# sigfile=file appends file as signature\n" @@ -7248,46 +7245,47 @@ msgstr "" "# sigfile=fichier utilise le contenu d'un fichier comme signature\n" "# sigfile=!commande exécute une commande externe pour générer la " "signature\n" +"# (%G pour indiquer le nom du groupe actuel)\n" "# sigfile=--aucun ne pas ajouter de signature\n" -#: src/lang.c:2442 +#: src/lang.c:2445 msgid "" "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "Précéder la signature avec \"-- \". change & valide." -#: src/lang.c:2443 +#: src/lang.c:2446 msgid "Prepend signature with \"-- \"" msgstr "Précéder la signature avec \"-- \"" -#: src/lang.c:2444 +#: src/lang.c:2447 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "" "# Si ON, précéde la signature avec le délimiteur standard\n" "# '\\n-- \\'\n" -#: src/lang.c:2448 +#: src/lang.c:2451 msgid "Add signature when reposting articles. toggles & sets." msgstr "" "Rajouter la signature lors du repostage. change & valide." -#: src/lang.c:2449 +#: src/lang.c:2452 msgid "Add signature when reposting" msgstr "Rajouter la signature lors du repostage" -#: src/lang.c:2450 +#: src/lang.c:2453 msgid "# If ON add signature to reposted articles\n" msgstr "# Si ON, rajoute la signature aux articles repostés\n" -#: src/lang.c:2454 +#: src/lang.c:2457 #, c-format msgid "Enter quotation marks, %s or %S for author's initials." msgstr "Caractère de citation, %s ou %S pour les initiales de l'auteur." -#: src/lang.c:2455 +#: src/lang.c:2458 msgid "Characters used as quote-marks" msgstr "Caractère de citation" -#: src/lang.c:2456 +#: src/lang.c:2459 #, c-format msgid "" "# Characters used in quoting to followups and replies.\n" @@ -7297,11 +7295,11 @@ msgstr "" "# '_' est remplacé par ' ', %s, %S sont remplacés par les intiales\n" "# de l'auteur auquel vous répondez.\n" -#: src/lang.c:2462 +#: src/lang.c:2465 msgid "Quoting behavior" msgstr "Type de citations" -#: src/lang.c:2463 +#: src/lang.c:2466 msgid "" "# How quoting should be handled when following up or replying.\n" "# Possible values are (the default is marked with *):\n" @@ -7325,17 +7323,17 @@ msgstr "" "# 6 = Citer les signatures, citer les lignes vides\n" "# 7 = Citations compr., signatures et lignes vides citées\n" -#: src/lang.c:2476 src/lang.c:2484 src/lang.c:2490 +#: src/lang.c:2479 src/lang.c:2487 src/lang.c:2493 msgid "" "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "" "%A Adresse %D Date %F Adresse+Nom %G groupe %M Message-ID %N Nom %C Prénom" -#: src/lang.c:2477 +#: src/lang.c:2480 msgid "Quote line when following up" msgstr "Citation lors d'un suivi" -#: src/lang.c:2478 +#: src/lang.c:2481 msgid "" "# Format of quote line when mailing/posting/following-up an article\n" "# %A Address %D Date %F Addr+Name %G Groupname %M Message-ID\n" @@ -7345,39 +7343,39 @@ msgstr "" "# %A Adresse\t\t%D Date\t%F Adresse+Nom\t%G groupe\n" "# %M Message-ID\t%N Nom complet\t%C Prénom\t%I Initiales\n" -#: src/lang.c:2485 +#: src/lang.c:2488 msgid "Quote line when cross-posting" msgstr "Citation lors d'un cross-post" -#: src/lang.c:2491 +#: src/lang.c:2494 msgid "Quote line when mailing" msgstr "Citation lors d'un envoi par mail" -#: src/lang.c:2496 +#: src/lang.c:2499 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "" "Si ON, inclus l'en-tête 'User-Agent:'. change & valide." -#: src/lang.c:2497 +#: src/lang.c:2500 msgid "Insert 'User-Agent:' header" msgstr "Insérer l'en-tête 'User-Agent:'" -#: src/lang.c:2498 +#: src/lang.c:2501 msgid "# If ON include advertising User-Agent: header\n" msgstr "# Si ON inclus l'en-tête 'User-Agent:'\n" -#: src/lang.c:2503 +#: src/lang.c:2506 msgid "" "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" "Jeu d'encodage pour MIME (p.e. US-ASCII, ISO_8859_1, EUC_KR), " "valide." -#: src/lang.c:2504 +#: src/lang.c:2507 msgid "MM_CHARSET" msgstr "MM_CHARSET" -#: src/lang.c:2505 +#: src/lang.c:2508 msgid "" "# Charset supported locally which is also used for MIME header and\n" "# Content-Type header.\n" @@ -7397,40 +7395,40 @@ msgstr "" "# d'encodage autre que mm_charset est considéré comme non disponible et\n" "# représenté par '?'.\n" -#: src/lang.c:2515 +#: src/lang.c:2518 msgid "MM_NETWORK_CHARSET" msgstr "MM_NETWORK_CHARSET" -#: src/lang.c:2516 +#: src/lang.c:2519 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "# Jeu d'encodage utilisé par l'en-tête MIME (Content-Type).\n" -#: src/lang.c:2520 +#: src/lang.c:2523 msgid "" "Enter local charset name (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "Encodage local (p.e. US-ASCII, ISO_8859_1, EUC_KR), valide." -#: src/lang.c:2521 +#: src/lang.c:2524 msgid "MM_LOCAL_CHARSET" msgstr "MM_LOCAL_CHARSET" -#: src/lang.c:2522 +#: src/lang.c:2525 msgid "# Charset supported locally.\n" msgstr "# Encodage de caractères local disponible.\n" -#: src/lang.c:2529 +#: src/lang.c:2532 msgid "Mailbox format" msgstr "Format de la boîte à lettres" -#: src/lang.c:2530 +#: src/lang.c:2533 msgid "# Format of the mailbox.\n" msgstr "# Format de la boîte à lettres\n" -#: src/lang.c:2535 +#: src/lang.c:2538 msgid "MIME encoding in news messages" msgstr "Encodage MIME dans les messages usenet" -#: src/lang.c:2536 +#: src/lang.c:2539 msgid "" "# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n" "# for mails and posts, if necessary. QP is efficient for most European\n" @@ -7445,15 +7443,15 @@ msgstr "" "# pour les jeux d'encodage 8bit Est Asiatique, Grec et Russe, car contenant\n" "# un plus grand nombre de caractères 8bit.\n" -#: src/lang.c:2544 src/lang.c:2565 +#: src/lang.c:2547 src/lang.c:2568 msgid "Don't change unless you know what you are doing. cancels." msgstr "Ne pas changer sauf si vous savez ce que vous faites. annule." -#: src/lang.c:2545 +#: src/lang.c:2548 msgid "Use 8bit characters in news headers" msgstr "Caractères 8bit dans les en-têtes usenet" -#: src/lang.c:2546 +#: src/lang.c:2549 msgid "" "# If ON, 8bit characters in news headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -7466,30 +7464,30 @@ msgstr "" "# de la valeur de cette option sauf si post_mime_encoding a comme\n" "# valeur 8bit.\n" -#: src/lang.c:2553 +#: src/lang.c:2556 msgid "" "Auto-view post-processed files toggles, sets, cancels." msgstr "" "Visualiser automatiquement les fichiers traités. change, " "valide, annule." -#: src/lang.c:2554 +#: src/lang.c:2557 msgid "View post-processed files" msgstr "Voir les fichiers traités" -#: src/lang.c:2555 +#: src/lang.c:2558 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "# Si ON, les fichiers traités seront ouverts\n" -#: src/lang.c:2560 +#: src/lang.c:2563 msgid "MIME encoding in mail messages" msgstr "Encodage MIME pour les mails" -#: src/lang.c:2566 +#: src/lang.c:2569 msgid "Use 8bit characters in mail headers" msgstr "Caractères 8bits dans en-têtes mail" -#: src/lang.c:2567 +#: src/lang.c:2570 msgid "" "# If ON, 8bit characters in mail headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -7509,11 +7507,11 @@ msgstr "" "# mails donc nous vous conseillons de ne PAS activer cette option sauf si\n" "# vous avez une bonne raison.\n" -#: src/lang.c:2578 +#: src/lang.c:2581 msgid "Strip blanks from ends of lines" msgstr "Nettoyer les fins de lignes" -#: src/lang.c:2579 +#: src/lang.c:2582 msgid "" "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" @@ -7521,17 +7519,17 @@ 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:2585 +#: src/lang.c:2588 msgid "If ON, use transliteration. toggles & sets." msgstr "" "Si ON, utilise 'translit' pour iconv_open(3). change & " "valide." -#: src/lang.c:2586 +#: src/lang.c:2589 msgid "Transliteration" msgstr "Translitération (conversion)" -#: src/lang.c:2587 +#: src/lang.c:2590 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" @@ -7541,11 +7539,11 @@ msgstr "" "# 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:2595 +#: src/lang.c:2598 msgid "Send you a Cc/Bcc automatically" msgstr "S'envoyer automatiquement une copie" -#: src/lang.c:2596 +#: src/lang.c:2599 msgid "" "# Put your name in the Cc: and/or Bcc: field when mailing an article.\n" "# Possible values are (the default is marked with *):\n" @@ -7562,25 +7560,27 @@ msgstr "" "# 2 = Cci\n" "# 3 = Cc et Cci\n" -#: src/lang.c:2607 +#: src/lang.c:2610 msgid "Hash algorithm for Cancel-Lock/Cancel-Key" -msgstr "" +msgstr "Type d’algorithme pour Cancel-Lock/Cancel-Key" -#: src/lang.c:2608 +#: src/lang.c:2611 msgid "" "# Hash algorithm for Cancel-Lock/Cancel-Key (default 'sha1')\n" "# Use 'none' to not generate Cancel-Lock headers.\n" msgstr "" +"# Type d’algorithme pour Cancel-Lock/Cancel-Key (‘sha1’ par défaut)\n" +"# Utiliser ‘aucun’ pour ne pas générer d’en-tête Cancel-Lock.\n" -#: src/lang.c:2614 +#: src/lang.c:2617 msgid "Enter address elements about which you want to be warned. sets." msgstr "Être averti de ces éléments. valide." -#: src/lang.c:2615 +#: src/lang.c:2618 msgid "Spamtrap warning address parts" msgstr "Pièges à spam dans les adresses" -#: src/lang.c:2616 +#: src/lang.c:2619 msgid "" "# A comma-delimited list of address-parts you want to be warned\n" "# about when trying to reply by email.\n" @@ -7588,28 +7588,28 @@ msgstr "" "# Une liste des parties dans les adresses, délimitées par des virgules,\n" "# que vous souhaitez connaître lors d'une réponse par mail.\n" -#: src/lang.c:2621 +#: src/lang.c:2624 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "Entrer la durée d'un filtre (en nombre de jours). valide." -#: src/lang.c:2622 +#: src/lang.c:2625 msgid "No. of days a filter entry is valid" msgstr "Durée de validité d'un filtre" -#: src/lang.c:2623 +#: src/lang.c:2626 msgid "# Number of days a short term filter will be active\n" msgstr "# Durée (en nombre de jours) de validité d'un filtre\n" -#: src/lang.c:2627 +#: src/lang.c:2630 msgid "Add posted articles to filter. toggles & sets." msgstr "" "Créer une règle pour les articles postés. change & valide." -#: src/lang.c:2628 +#: src/lang.c:2631 msgid "Add posted articles to filter" msgstr "Créer une règle pour les articles postés" -#: src/lang.c:2629 +#: src/lang.c:2632 msgid "" "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" @@ -7617,24 +7617,24 @@ msgstr "" "# Si ON, crée une règle pour les articles débutant un nouveau fil\n" "# afin de mettre en surbrillance les suivis.\n" -#: src/lang.c:2633 +#: src/lang.c:2636 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "Le répertoire où sont enregistrés les articles/fils au format mailbox." -#: src/lang.c:2634 +#: src/lang.c:2637 msgid "Mail directory" msgstr "Répertoire mail" -#: src/lang.c:2635 +#: src/lang.c:2638 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "" "# (-m) répertoire où sont enregistrés les articles/fils au format mailbox\n" -#: src/lang.c:2640 +#: src/lang.c:2643 msgid "Save articles in batch mode (-S)" msgstr "Enregistrer articles en arrière-plan (-S)" -#: src/lang.c:2641 +#: src/lang.c:2644 msgid "" "# If ON articles/threads will be saved in batch mode when save -S\n" "# or mail (-M/-N) is specified on the command line\n" @@ -7642,19 +7642,19 @@ msgstr "" "# Si ON, les articles/fils seront enregistrés à l'arrière-plan lorsque\n" "# l'option -S ou (-M/-N) pour les mails est spécifiée.\n" -#: src/lang.c:2646 +#: src/lang.c:2649 msgid "The directory where you want articles/threads saved." msgstr "Le répertoire où vous voulez enregistrer les articles/fils." -#: src/lang.c:2647 +#: src/lang.c:2650 msgid "Directory to save arts/threads in" msgstr "Répertoire où enregistrer les articles/fils" -#: src/lang.c:2648 +#: src/lang.c:2651 msgid "# Directory where articles/threads are saved\n" msgstr "# Répertoire où sont enregistrés les articles/fils\n" -#: src/lang.c:2652 +#: src/lang.c:2655 msgid "" "Auto save article/thread by Archive-name: header. toggles & " "sets." @@ -7662,11 +7662,11 @@ msgstr "" "Enregistrement auto. basé sur l'en-tête Archive-name:. change & " " valide." -#: src/lang.c:2653 +#: src/lang.c:2656 msgid "Use Archive-name: header for save" msgstr "Honorer l'en-tête 'Archive-name:'" -#: src/lang.c:2654 +#: src/lang.c:2657 msgid "" "# If ON articles/threads with Archive-name: in mail header will\n" "# be automatically saved with the Archive-name & part/patch no.\n" @@ -7675,7 +7675,7 @@ msgstr "" "# du mail seront enregistrés automatiquement avec l'Archive-name\n" "# & le numéro de la partie et ou patch.\n" -#: src/lang.c:2659 +#: src/lang.c:2662 msgid "" "Mark saved articles/threads as read. toggles, sets, " "cancels." @@ -7683,23 +7683,23 @@ msgstr "" "Marquer lu les articles/fils enregistrés. change, valide, " " annule." -#: src/lang.c:2660 +#: src/lang.c:2663 msgid "Mark saved articles/threads as read" msgstr "Marquer lu les articles/fils enregistrés" -#: src/lang.c:2661 +#: src/lang.c:2664 msgid "# If ON mark articles that are saved as read\n" msgstr "# Si ON, marque lu les articles qui sont enregistrés\n" -#: src/lang.c:2665 +#: src/lang.c:2668 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "Post-traiter (p.e. extraire les PJ) les articles enregistrés." -#: src/lang.c:2666 +#: src/lang.c:2669 msgid "Post process saved articles" msgstr "Post-traiter les articles enregistrés" -#: src/lang.c:2667 +#: src/lang.c:2670 msgid "" "# Perform post processing (saving binary attachments) from saved articles.\n" "# Possible values are (the default is marked with *):\n" @@ -7713,11 +7713,11 @@ msgstr "" "# 1 = extraire uniquement les *.shar (archives shell)\n" "# 2 = oui\n" -#: src/lang.c:2676 +#: src/lang.c:2679 msgid "Process only unread articles" msgstr "Traiter uniquement les articles non lus" -#: src/lang.c:2677 +#: src/lang.c:2680 msgid "" "# If ON only save/print/pipe/mail unread articles (tagged articles " "excepted)\n" @@ -7725,22 +7725,22 @@ msgstr "" "# Si ON, enregistre/imprime/pipe/envoi articles non lu\n" "# (excepté les articles marqués)\n" -#: src/lang.c:2682 +#: src/lang.c:2685 msgid "Print all or just part of header. toggles & sets." msgstr "" "Afficher tout ou une partie des en-têtes. change & valide." -#: src/lang.c:2683 +#: src/lang.c:2686 msgid "Print all headers when printing" msgstr "Imprimer tous les en-têtes" -#: src/lang.c:2684 +#: src/lang.c:2687 msgid "" "# If ON print all of article header otherwise just the important lines\n" msgstr "" "# Si ON, imprimer tous les en-têtes, sinon juste les lignes importantes\n" -#: src/lang.c:2688 +#: src/lang.c:2691 msgid "" "The printer program with options that is to be used to print articles/" "threads." @@ -7748,39 +7748,39 @@ msgstr "" "Le logiciel d'impression avec options utilisées pour imprimer les articles/" "fils." -#: src/lang.c:2689 +#: src/lang.c:2692 msgid "Printer program with options" msgstr "Logiciel d'impression avec options" -#: src/lang.c:2690 +#: src/lang.c:2693 msgid "# Print program with parameters used to print articles/threads\n" msgstr "" "# Logiciel d'impression avec options utilisées por imprimer les articles/" "fils\n" -#: src/lang.c:2696 +#: src/lang.c:2699 msgid "Force redraw after certain commands" msgstr "Rafraîchir l'écran après certaines actions" -#: src/lang.c:2697 +#: src/lang.c:2700 msgid "" "# If ON a screen redraw will always be done after certain external commands\n" msgstr "" "# Si ON, un rafraîchissement de l'écran sera toujours effectué après\n" "# certaines commandes externes\n" -#: src/lang.c:2701 +#: src/lang.c:2704 msgid "" "Start editor with line offset. toggles, sets, cancels." msgstr "" "Lancer l'éditeur avec une ligne décalée. change, valide, " " annule." -#: src/lang.c:2702 +#: src/lang.c:2705 msgid "Start editor with line offset" msgstr "Lancer l'éditeur avec une ligne décalée" -#: src/lang.c:2703 +#: src/lang.c:2706 msgid "" "# If ON editor will be started with cursor offset into the file\n" "# otherwise the cursor will be positioned at the first line\n" @@ -7788,16 +7788,16 @@ msgstr "" "# Si ON, l'éditeur sera lancé avec le curseur décalé\n" "# sinon, le curseur sera positionné sur la première ligne\n" -#: src/lang.c:2708 +#: src/lang.c:2711 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "" "%E pour l'éditeur, %F pour le fichier, %N pour la ligne, valide." -#: src/lang.c:2709 +#: src/lang.c:2712 msgid "Invocation of your editor" msgstr "Lancement de votre éditeur" -#: src/lang.c:2710 +#: src/lang.c:2713 msgid "" "# Format of editor line including parameters\n" "# %E Editor %F Filename %N Linenumber\n" @@ -7805,16 +7805,16 @@ msgstr "" "# Format des paramètres pour l'éditeur\n" "# %E Éditeur %F Fichier %N N° de ligne\n" -#: src/lang.c:2715 +#: src/lang.c:2718 msgid "" "Enter name and options for external-inews, --internal for internal inews" msgstr "Nom et options pour l'inews externe, --internal pour l'inews interne" -#: src/lang.c:2716 +#: src/lang.c:2719 msgid "External inews" msgstr "Inews externe" -#: src/lang.c:2717 +#: src/lang.c:2720 msgid "" "# If --internal use the built in mini inews for posting via NNTP\n" "# otherwise use an external inews program\n" @@ -7822,18 +7822,18 @@ msgstr "" "# Si '--internal', utilise l'inews allégé intégré pour poster via\n" "# NNTP sinon, utilise un logiciel inews externe\n" -#: src/lang.c:2721 +#: src/lang.c:2724 msgid "" "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" "%M pour le MUA, %S pour le sujet, %T pour 'to:', %F pour Fichier, " "valide." -#: src/lang.c:2722 +#: src/lang.c:2725 msgid "Invocation of your mail command" msgstr "Lancement de votre client mail" -#: src/lang.c:2723 +#: src/lang.c:2726 msgid "" "# Format of mailer line including parameters\n" "# %M Mailer %S Subject %T To %F Filename\n" @@ -7845,11 +7845,11 @@ msgstr "" "# p.e. pour utiliser elm comme MUA : elm -s \"%S\" \"%T\" < %F\n" "# p.e. pour elm interactif : elm -i %F -s \"%S\" \"%T\"\n" -#: src/lang.c:2731 +#: src/lang.c:2734 msgid "Use interactive mail reader" msgstr "Utiliser un MUA interactif" -#: src/lang.c:2732 +#: src/lang.c:2735 msgid "" "# Interactive mailreader\n" "# Possible values are (the default is marked with *):\n" @@ -7863,36 +7863,36 @@ msgstr "" "# 1 = utiliser un MUA interactif avec les en-têtes du fichier\n" "# 2 = utiliser un MUA interactif sans les en-têtes du fichier\n" -#: src/lang.c:2741 +#: src/lang.c:2744 msgid "Remove ~/.article after posting" msgstr "Effacer ~/.article après le postage" -#: src/lang.c:2742 +#: src/lang.c:2745 msgid "# If ON remove ~/.article after posting.\n" msgstr "# Si ON, effacer ~/.article après le postage.\n" -#: src/lang.c:2748 +#: src/lang.c:2751 msgid "Use UTF-8 graphics (thread tree etc.)" msgstr "Utiliser les formes UTF-8 (symboles, etc.)" -#: src/lang.c:2749 +#: src/lang.c:2752 msgid "" "# If ON use UTF-8 characters for indicator '->', tree and ellipsis '...'.\n" msgstr "" "# Si ON, utilise les caractères UTF-8 pour les symboles '->', '...' et " "autres.\n" -#: src/lang.c:2754 +#: src/lang.c:2757 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "" "Fichier pour les articles postés, valide, pas de fichier = " "désactive." -#: src/lang.c:2755 +#: src/lang.c:2758 msgid "Filename for posted articles" msgstr "Fichier pour les articles postés" -#: src/lang.c:2756 +#: src/lang.c:2759 msgid "" "# Filename where to keep all postings (default posted)\n" "# If no filename is set then postings will not be saved\n" @@ -7901,41 +7901,41 @@ msgstr "" "# Si aucun fichier n'est indiqué, les articles postés ne seront pas\n" "# enregistrés\n" -#: src/lang.c:2761 +#: src/lang.c:2764 msgid "" "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "" "Garder les articles non postés dans ~/dead.articles. change & " " valide." -#: src/lang.c:2762 +#: src/lang.c:2765 msgid "Keep failed arts in ~/dead.articles" msgstr "Articles non postés dans ~/dead.articles" -#: src/lang.c:2763 +#: src/lang.c:2766 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "# Si ON, garde tous les articles non postés dans ~/dead.articles\n" -#: src/lang.c:2767 +#: src/lang.c:2770 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "" "Voulez-vous effacer dans newsrc les groupes auxquels vous vous êtes " "désabonnés" -#: src/lang.c:2768 +#: src/lang.c:2771 msgid "No unsubscribed groups in newsrc" msgstr "Pas de groupes désabonnés dans newsrc" -#: src/lang.c:2769 +#: src/lang.c:2772 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "" "# Si ON, efface dans newsrc les groupes auxquels vous vous êtes désabonnés\n" -#: src/lang.c:2774 +#: src/lang.c:2777 msgid "Remove bogus groups from newsrc" msgstr "Effacer les groupes corrompus de newsrc" -#: src/lang.c:2775 +#: src/lang.c:2778 msgid "" "# What to do with bogus groups in newsrc file\n" "# Possible values are (the default is marked with *):\n" @@ -7949,71 +7949,71 @@ msgstr "" "# 1 = effacer\n" "# 2 = marquer d'un D dans l'écran de sélection\n" -#: src/lang.c:2784 +#: src/lang.c:2787 msgid "" "Enter number of seconds to wait for a response from the server. sets." msgstr "" "Durée de l'attente d'une réponse du serveur (en secondes). valide." -#: src/lang.c:2785 +#: src/lang.c:2788 msgid "NNTP read timeout in seconds" msgstr "Durée limite d'attente lecture NNTP en secondes" -#: src/lang.c:2786 +#: src/lang.c:2789 msgid "" "# Time in seconds to wait for a response from the server (0=no timeout)\n" msgstr "" "# Durée en secondes, de l'attente d'une réponse du serveur (0=pas de durée " "limite)\n" -#: src/lang.c:2791 +#: src/lang.c:2794 msgid "Enter number of seconds until active file will be reread. sets." msgstr "Durée avant que le fichier active ne soit relu. valide." -#: src/lang.c:2792 +#: src/lang.c:2795 msgid "Interval in secs to reread active" msgstr "Durée avant relecture du fichier active" -#: src/lang.c:2793 +#: src/lang.c:2796 msgid "" "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "" "# Durée (en secondes) avant que le fichier active ne soit relu (0=jamais)\n" -#: src/lang.c:2798 +#: src/lang.c:2801 msgid "Reconnect to server automatically" msgstr "Reconnexion automatique au serveur" -#: src/lang.c:2799 +#: src/lang.c:2802 msgid "" "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "" "# Si ON, reconnexion automatique au serveur NNTP si la connexion est rompue\n" -#: src/lang.c:2803 +#: src/lang.c:2806 msgid "" "Create local copies of NNTP overview files. toggles & sets." msgstr "" "Créer des copies locales des en-têtes NNTP. change & " "valide." -#: src/lang.c:2804 +#: src/lang.c:2807 msgid "Cache NNTP overview files locally" msgstr "Cache local des en-têtes NNTP" -#: src/lang.c:2805 +#: src/lang.c:2808 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "# Si ON, crée une copie locale des en-têtes NNTP.\n" -#: src/lang.c:2809 src/lang.c:2824 src/lang.c:2844 src/lang.c:2863 +#: src/lang.c:2812 src/lang.c:2827 src/lang.c:2847 src/lang.c:2866 msgid "Enter format string. sets, cancels." msgstr "Formatage des dates. valide, annule." -#: src/lang.c:2810 +#: src/lang.c:2813 msgid "Format string for selection level" msgstr "Marques de formatage dans la sélection de groupe" -#: src/lang.c:2811 +#: src/lang.c:2814 msgid "" "# Format string for selection level representation\n" "# Default: %f %n %U %G %d\n" @@ -8037,11 +8037,11 @@ msgstr "" "# %n Nombre, numérotation des lignes à l'écran\n" "# %U Nombre de non lu(s)\n" -#: src/lang.c:2825 +#: src/lang.c:2828 msgid "Format string for group level" msgstr "Marques de formatage dans les groupes" -#: src/lang.c:2826 +#: src/lang.c:2829 msgid "" "# Format string for group level representation\n" "# Default: %n %m %R %L %s %F\n" @@ -8075,11 +8075,11 @@ msgstr "" "# %s Sujet (uniquement dans la sélection de groupe)\n" "# %S Score\n" -#: src/lang.c:2845 +#: src/lang.c:2848 msgid "Format string for thread level" msgstr "Marques de formatage dans les fils" -#: src/lang.c:2846 +#: src/lang.c:2849 msgid "" "# Format string for thread level representation\n" "# Default: %n %m [%L] %T %F\n" @@ -8111,19 +8111,19 @@ msgstr "" "# %S Score\n" "# %T Vue du fil (uniquement dans les fils)\n" -#: src/lang.c:2864 +#: src/lang.c:2867 msgid "Format string for display of dates" msgstr "Format des dates affichées" -#: src/lang.c:2865 +#: src/lang.c:2868 msgid "# Format string for date representation\n" msgstr "# Format des dates affichées\n" -#: src/lang.c:2871 +#: src/lang.c:2878 msgid "Unicode normalization form" msgstr "Normalisation d'Unicode" -#: src/lang.c:2872 +#: src/lang.c:2879 msgid "" "# Unicode normalization form\n" "# Possible values are:\n" @@ -8132,6 +8132,7 @@ msgid "" "# 2 = NFKD\n" "# 3 = NFC\n" "# 4 = NFD\n" +"# 5 = NFKC_CF\n" msgstr "" "# Normalisation d'Unicode\n" "# Les valeurs possibles sont :\n" @@ -8140,20 +8141,21 @@ msgstr "" "# 2 = NFKD\n" "# 3 = NFC\n" "# 4 = NFD\n" +"# 5 = NFKC_CF\n" -#: src/lang.c:2885 +#: src/lang.c:2893 msgid "Render BiDi" msgstr "Rendu BiDi" -#: src/lang.c:2886 +#: src/lang.c:2894 msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "# Si ON, le texte bi-directionnel est affiché par tin\n" -#: src/lang.c:2893 +#: src/lang.c:2901 msgid "Function for sorting articles" msgstr "Fonction pour trier les articles" -#: src/lang.c:2894 +#: src/lang.c:2902 msgid "" "# Function for sorting articles\n" "# Possible values are (the default is marked with *):\n" @@ -8165,194 +8167,194 @@ msgstr "" "# * 0 = qsort\n" "# 1 = heapsort\n" -#: src/lang.c:2907 +#: src/lang.c:2915 msgid "Automatically GroupMarkUnselArtRead" msgstr "GroupMarkUnselArtRead automatiquement" -#: src/lang.c:2913 +#: src/lang.c:2921 msgid "Delete post-process files" msgstr "Effacer les fichiers traités" -#: src/lang.c:2918 +#: src/lang.c:2926 msgid "Filename for all mailed articles, sets, no filename=do not save." msgstr "" "Fichier pour les articles postés, valide, pas de fichier = " "désactive." -#: src/lang.c:2919 +#: src/lang.c:2927 msgid "Mailbox to save sent mails" msgstr "Boîte aux lettres pour les emails envoyés" -#: src/lang.c:2924 +#: src/lang.c:2932 msgid "Set Followup-To: header to this group(s). sets, cancels." msgstr "" "En-tête 'Followup-To:' pour ce(s) groupe(s). valide, annule." -#: src/lang.c:2925 +#: src/lang.c:2933 msgid "Followup-To: header" msgstr "En-tête 'Followup-To:'" -#: src/lang.c:2930 +#: src/lang.c:2938 msgid "Enter default mail address (and fullname). sets, cancels." msgstr "" "Adresse mail par défaut (et nom complet). valide, annule." -#: src/lang.c:2937 +#: src/lang.c:2945 msgid "" "Path and options for ispell-like spell-checker. sets, cancels." msgstr "" "Chemin et options pour ispell (ou autre correcteur). valide, " "annule." -#: src/lang.c:2938 +#: src/lang.c:2946 msgid "Ispell program" msgstr "Programme 'Ispell'" -#: src/lang.c:2944 +#: src/lang.c:2952 msgid "When group is a mailing list, send responses to this email address." msgstr "" "Lorsque le groupe est une liste de diffusion, envoyer les réponses à cette " "adresse email." -#: src/lang.c:2945 +#: src/lang.c:2953 msgid "Mailing list address" msgstr "Adresse email de la liste de diffusion" -#: src/lang.c:2951 +#: src/lang.c:2959 msgid "Forward articles as attachment" msgstr "Faire suivre les articles en pièce-jointe" -#: src/lang.c:2956 +#: src/lang.c:2964 msgid "" "A comma separated list of MIME major/minor Content-Types. cancels." msgstr "" "Une liste des 'Content-Type' MIME majeur/mineur séparée par des virgules. " " annule." -#: src/lang.c:2957 +#: src/lang.c:2965 msgid "Which MIME types will be saved" msgstr "Quels types MIME seront enregistrés" -#: src/lang.c:2962 +#: src/lang.c:2970 msgid "Value of the Organization: header. sets, cancels." msgstr "Contenu de l'en-tête 'Organisation:'. valide, annule." -#: src/lang.c:2963 +#: src/lang.c:2971 msgid "Organization: header" msgstr "En-tête 'Organisation:'" -#: src/lang.c:2968 +#: src/lang.c:2976 msgid "Filename for saved articles. sets, cancels." msgstr "Nom des articles sauvegardés. valide, annule." -#: src/lang.c:2969 +#: src/lang.c:2977 msgid "savefile" msgstr "savefile" -#: src/lang.c:2974 src/lang.c:2998 +#: src/lang.c:2982 src/lang.c:3006 msgid "Scope for the filter rule. sets, cancels." msgstr "Durée de la règle. valide, annule." -#: src/lang.c:2975 +#: src/lang.c:2983 msgid "Quick (1 key) select filter scope" msgstr "Sélection rapide (une touche) de la durée d'une règle" -#: src/lang.c:2980 src/lang.c:3004 +#: src/lang.c:2988 src/lang.c:3012 msgid "Header for filter rule. sets, cancels." msgstr "En-tête pour la règle. valide, annule." -#: src/lang.c:2981 +#: src/lang.c:2989 msgid "Quick (1 key) select filter header" msgstr "Sélection rapide (une touche) d'une règle sur l'en-tête" -#: src/lang.c:2986 src/lang.c:3010 +#: src/lang.c:2994 src/lang.c:3018 msgid "ON = case sensitive, OFF = ignore case. sets, cancels." msgstr "" "ON = casse sensible, OFF = ignore la casse. valide, annule." -#: src/lang.c:2987 +#: src/lang.c:2995 msgid "Quick (1 key) select filter case" msgstr "Sélection rapide (une touche) de la casse d'une règle" -#: src/lang.c:2992 src/lang.c:3016 +#: src/lang.c:3000 src/lang.c:3024 msgid "ON = expire, OFF = don't ever expire. sets, cancels." msgstr "ON = expire, OFF = n'expire pas. valide, annule." -#: src/lang.c:2993 +#: src/lang.c:3001 msgid "Quick (1 key) select filter expire" msgstr "Sélection rapide (une touche) de l'expiration d'une règle" -#: src/lang.c:2999 +#: src/lang.c:3007 msgid "Quick (1 key) kill filter scope" msgstr "Sélection rapide (une touche) de la durée du filtre" -#: src/lang.c:3005 +#: src/lang.c:3013 msgid "Quick (1 key) kill filter header" msgstr "Sélection rapide (une touche) du filtre sur l'en-tête" -#: src/lang.c:3011 +#: src/lang.c:3019 msgid "Quick (1 key) kill filter case" msgstr "Sélection rapide (une touche) de la casse d'un filtre" -#: src/lang.c:3017 +#: src/lang.c:3025 msgid "Quick (1 key) kill filter expire" msgstr "Sélection rapide (une touche) de l'expiration du filtre" -#: src/lang.c:3023 +#: src/lang.c:3031 msgid "Assume this charset if no charset declaration is present, to set." msgstr "Utilise cet encodage si aucun n'est spécifié, pour changer." -#: src/lang.c:3024 +#: src/lang.c:3032 msgid "UNDECLARED_CHARSET" msgstr "UNDECLARED_CHARSET" -#: src/lang.c:3030 +#: src/lang.c:3038 msgid "" "Add this text at the start of the message body. sets, cancels." msgstr "Ajouter ce texte au début du message. valide, annule." -#: src/lang.c:3031 +#: src/lang.c:3039 msgid "X_Body" msgstr "X_Body" -#: src/lang.c:3036 +#: src/lang.c:3044 msgid "Insert this header when posting. sets, cancels." msgstr "Insérer cet en-tête lors du postage. valide, annule." -#: src/lang.c:3037 +#: src/lang.c:3045 msgid "X_Headers" msgstr "X_Headers" -#: src/lang.c:3042 +#: src/lang.c:3050 msgid "" "Automatically insert an X-Comment-To: header? toggles & sets." msgstr "" "Si ON, inclus un en-tête 'X-Comment-To:'. change & valide." -#: src/lang.c:3043 +#: src/lang.c:3051 msgid "Insert 'X-Comment-To:' header" msgstr "Insérer l'en-tête 'X-Comment-To:'" #. TODO: lang.c -#: src/main.c:801 +#: src/main.c:812 msgid "reading from local spool" msgstr "lecture depuis le spool local" -#: src/misc.c:3868 +#: src/misc.c:3878 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "Version : %s %s release %s (\"%s\") %s %s\n" -#: src/misc.c:3871 +#: src/misc.c:3881 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Version : %s %s release %s (\"%s\")\n" -#: src/newsrc.c:453 +#: src/newsrc.c:457 msgid "Unreachable?\n" msgstr "Inacessible ?\n" -#: src/nntplib.c:817 +#: src/nntplib.c:822 #, c-format msgid "" "\n" @@ -8361,29 +8363,29 @@ msgstr "" "\n" "Connexion au serveur expirée, reconnexion # %d\n" -#: src/nntplib.c:844 +#: src/nntplib.c:849 msgid "NNTP connection error. Exiting..." msgstr "Erreur de connexion NNTP. Fermeture..." -#: src/nntplib.c:856 src/nntplib.c:1835 +#: src/nntplib.c:861 src/nntplib.c:1852 msgid "Rejoin current group\n" msgstr "Rejoindre le groupe actuel\n" -#: src/nntplib.c:864 src/nntplib.c:1843 +#: src/nntplib.c:869 src/nntplib.c:1860 #, c-format msgid "Read (%s)\n" msgstr "Lecture (%s)\n" -#: src/nntplib.c:866 +#: src/nntplib.c:871 #, c-format msgid "Resend last command (%s)\n" msgstr "Réenvoyer la dernière commande (%s)\n" -#: src/nntplib.c:1482 +#: src/nntplib.c:1500 msgid "CAPABILITIES did not announce READER" msgstr "CAPABILITIES n'a pas annoncé READER" -#: src/nntplib.c:1989 +#: src/nntplib.c:2006 msgid "MOTD: " msgstr "MOTD: " @@ -8393,33 +8395,33 @@ msgid "couldn't expand %s\n" msgstr "impossible de décompacter %s\n" #: src/post.c:1341 -#, fuzzy, c-format +#, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" "encoding is neither set to %s nor to %s\n" msgstr "" -"La ligne %d dépasse les %d octets et devrait être réduite, mais\n" +"La ligne %d est plus longue que %d octets et devrait être réduite, mais\n" "l'encodage n'est ni %s ni %s\n" #: src/post.c:1346 -#, fuzzy, c-format +#, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" "encoding is set to %s without enabling MIME_BREAK_LONG_LINES or\n" "posting doesn't contain any 8bit chars and thus folding won't happen\n" msgstr "" -"La ligne %d dépasse les %d octets et devrait être réduite, mais\n" +"La ligne %d est plus longue que %d octets et devrait être réduite, mais\n" "l'encodage est %s sans que l'option MIME_BREAK_LONG_LINES ne soit\n" "activée ou l'article ne contient pas de caractères 8 bits donc pas\n" "besoin de réduire la ligne\n" #: src/post.c:1348 -#, fuzzy, c-format +#, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" "encoding is not set to %s\n" msgstr "" -"La ligne %d dépasse les %d octets et devrait être réduite, mais\n" +"La ligne %d est plus longue que %d octets et devrait être réduite, mais\n" "l'encodage n'est pas %s\n" #: src/post.c:2322 @@ -8452,7 +8454,7 @@ msgstr "[- Indisponible -]" #. * preamble #. * TODO: -> lang.c #. -#: src/rfc2047.c:1308 +#: src/rfc2047.c:1322 #, c-format msgid "" "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" Binary files tin-2.4.2/po/ru.gmo and tin-2.4.3/po/ru.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.2/po/ru.po tin-2.4.3/po/ru.po --- tin-2.4.2/po/ru.po 2017-12-08 09:39:46.000000000 +0100 +++ tin-2.4.3/po/ru.po 2018-12-24 10:02:05.158977555 +0100 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 1.8.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-08 09:39+0100\n" +"POT-Creation-Date: 2018-12-24 10:02+0100\n" "PO-Revision-Date: 2006-04-21 15:39+0200\n" "Last-Translator: Andrei Emeltchenko \n" "Language-Team: Russian \n" @@ -16,12 +16,12 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: src/attrib.c:954 +#: src/attrib.c:964 #, fuzzy msgid "Processing attributes... " msgstr "úÁÐÉÓØ ÆÁÊÌÁ ÁÔÒÉÂÕÔÏ×..." -#: src/attrib.c:1176 +#: src/attrib.c:1186 #, c-format msgid "" "# Do not edit this comment block\n" @@ -30,464 +30,464 @@ msgstr "" "# îÅ ÒÅÄÁËÔÉÒÕÊÔÅ ÜÔÏÔ ÂÌÏË ËÏÍÍÅÎÔÁÒÉÅ×\n" "#\n" -#: src/attrib.c:1177 +#: src/attrib.c:1187 #, c-format msgid "# scope=STRING (eg. alt.*,!alt.bin*) [mandatory]\n" msgstr "# scope=óôòïëá (ÎÁÐÒ. alt.*,!alt.bin*) [mandatory]\n" -#: src/attrib.c:1178 +#: src/attrib.c:1188 #, c-format msgid "# add_posted_to_filter=ON/OFF\n" msgstr "" -#: src/attrib.c:1179 +#: src/attrib.c:1189 #, c-format msgid "# advertising=ON/OFF\n" msgstr "" -#: src/attrib.c:1180 +#: src/attrib.c:1190 #, c-format msgid "# alternative_handling=ON/OFF\n" msgstr "" -#: src/attrib.c:1181 +#: src/attrib.c:1191 #, c-format msgid "# ask_for_metamail=ON/OFF\n" msgstr "" -#: src/attrib.c:1182 +#: src/attrib.c:1192 #, fuzzy, c-format msgid "# auto_cc_bcc=NUM\n" msgstr "# show_author=þéóìï\n" -#: src/attrib.c:1183 +#: src/attrib.c:1193 #, c-format msgid "# 0=No, 1=Cc, 2=Bcc, 3=Cc and Bcc\n" msgstr "" -#: src/attrib.c:1184 +#: src/attrib.c:1194 #, fuzzy, c-format msgid "# auto_list_thread=ON/OFF\n" msgstr "# show_author=þéóìï\n" -#: src/attrib.c:1185 +#: src/attrib.c:1195 #, c-format msgid "# auto_save=ON/OFF\n" msgstr "" -#: src/attrib.c:1186 +#: src/attrib.c:1196 #, c-format msgid "# auto_select=ON/OFF\n" msgstr "" -#: src/attrib.c:1187 +#: src/attrib.c:1197 #, c-format msgid "# batch_save=ON/OFF\n" msgstr "" -#: src/attrib.c:1188 +#: src/attrib.c:1198 #, c-format msgid "# date_format=STRING (eg. %%a, %%d %%b %%Y %%H:%%M:%%S)\n" msgstr "" -#: src/attrib.c:1189 +#: src/attrib.c:1199 #, c-format msgid "# delete_tmp_files=ON/OFF\n" msgstr "" -#: src/attrib.c:1190 +#: src/attrib.c:1200 #, c-format msgid "# editor_format=STRING (eg. %%E +%%N %%F)\n" msgstr "" -#: src/attrib.c:1191 +#: src/attrib.c:1201 #, c-format msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "# fcc=óôòïëá (ÎÁÐÒ. =mailbox)\n" -#: src/attrib.c:1192 +#: src/attrib.c:1202 #, c-format msgid "# followup_to=STRING\n" msgstr "# followup_to=óôòïëá\n" -#: src/attrib.c:1193 +#: src/attrib.c:1203 #, c-format msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "" "# from=óôòïëá (ÄÏÂÁ×ØÔÅ ÖÅÌÁÅÍÕÀ ÓÔÒÏËÕ From:, ÎÅ ÉÓÐÏÌØÚÕÊÔÅ ËÁ×ÙÞËÉ)\n" -#: src/attrib.c:1194 +#: src/attrib.c:1204 #, c-format msgid "# group_catchup_on_exit=ON/OFF\n" msgstr "" -#: src/attrib.c:1195 +#: src/attrib.c:1205 #, c-format msgid "# group_format=STRING (eg. %%n %%m %%R %%L %%s %%F)\n" msgstr "" -#: src/attrib.c:1196 +#: src/attrib.c:1206 #, fuzzy, c-format msgid "# mail_8bit_header=ON/OFF\n" msgstr "# thread_perc=þéóìï\n" -#: src/attrib.c:1197 +#: src/attrib.c:1207 #, c-format msgid "# mail_mime_encoding=supported_encoding" msgstr "" -#: src/attrib.c:1205 +#: src/attrib.c:1215 #, c-format msgid "# ispell=STRING\n" msgstr "# ispell=óôòïëá\n" -#: src/attrib.c:1207 +#: src/attrib.c:1217 #, c-format msgid "# maildir=STRING (eg. ~/Mail)\n" msgstr "# maildir=óôòïëá (ÎÁÐÒ. ~/Mail)\n" -#: src/attrib.c:1208 +#: src/attrib.c:1218 #, c-format msgid "# mailing_list=STRING (eg. majordomo@example.org)\n" msgstr "# mailing_list=óôòïëá (ÎÁÐÒ. majordomo@example.org)\n" -#: src/attrib.c:1209 +#: src/attrib.c:1219 #, c-format msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "# mime_types_to_save=óôòïëá (ÎÁÐÒ. image/*,!image/bmp)\n" -#: src/attrib.c:1210 +#: src/attrib.c:1220 #, fuzzy, c-format msgid "# mark_ignore_tags=ON/OFF\n" msgstr "# show_author=þéóìï\n" -#: src/attrib.c:1211 +#: src/attrib.c:1221 #, fuzzy, c-format msgid "# mark_saved_read=ON/OFF\n" msgstr "# show_author=þéóìï\n" -#: src/attrib.c:1212 +#: src/attrib.c:1222 #, c-format msgid "# mime_forward=ON/OFF\n" msgstr "" -#: src/attrib.c:1214 +#: src/attrib.c:1224 #, c-format msgid "# mm_network_charset=supported_charset" msgstr "# mm_network_charset=ÐÏÄÄÅÒÖÉ×ÁÅÍÁÑ_ËÏÄÉÒÏ×ËÁ" -#: src/attrib.c:1221 +#: src/attrib.c:1231 #, c-format msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "# undeclared_charset=óôòïëá (ÐÏ ÕÍÏÌÞÁÎÉÀ US-ASCII)\n" -#: src/attrib.c:1223 +#: src/attrib.c:1233 #, fuzzy, c-format msgid "# news_headers_to_display=STRING\n" msgstr "# news_quote_format=óôòïëá\n" -#: src/attrib.c:1224 +#: src/attrib.c:1234 #, fuzzy, c-format msgid "# news_headers_to_not_display=STRING\n" msgstr "# news_quote_format=óôòïëá\n" -#: src/attrib.c:1225 +#: src/attrib.c:1235 #, c-format msgid "# news_quote_format=STRING\n" msgstr "# news_quote_format=óôòïëá\n" -#: src/attrib.c:1226 +#: src/attrib.c:1236 #, c-format msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "" "# organization=óôòïëá (ÅÓÌÉ ÎÁÞÉÎÁÅÔÓÑ Ó '/', ÔÏ ÐÒÏÞÉÔÁÔØ ÉÚ ÆÁÊÌÁ)\n" -#: src/attrib.c:1227 +#: src/attrib.c:1237 #, fuzzy, c-format msgid "# pos_first_unread=ON/OFF\n" msgstr "# show_author=þéóìï\n" -#: src/attrib.c:1228 +#: src/attrib.c:1238 #, fuzzy, c-format msgid "# post_8bit_header=ON/OFF\n" msgstr "# thread_perc=þéóìï\n" -#: src/attrib.c:1229 +#: src/attrib.c:1239 #, c-format msgid "# post_mime_encoding=supported_encoding" msgstr "" -#: src/attrib.c:1236 +#: src/attrib.c:1246 #, fuzzy, c-format msgid "# post_process_type=NUM\n" msgstr "# post_proc_type=þéóìï\n" -#: src/attrib.c:1241 +#: src/attrib.c:1251 #, fuzzy, c-format msgid "# post_process_view=ON/OFF\n" msgstr "# post_proc_type=þéóìï\n" -#: src/attrib.c:1242 +#: src/attrib.c:1252 #, c-format msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "# quick_kill_scope=óôòïëá (ÎÁÐÒ. talk.*)\n" -#: src/attrib.c:1243 +#: src/attrib.c:1253 #, c-format msgid "# quick_kill_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:1244 +#: src/attrib.c:1254 #, c-format msgid "# quick_kill_case=ON/OFF\n" msgstr "" -#: src/attrib.c:1245 +#: src/attrib.c:1255 #, c-format msgid "# quick_kill_header=NUM\n" msgstr "# quick_kill_header=þéóìï\n" -#: src/attrib.c:1246 src/attrib.c:1255 +#: src/attrib.c:1256 src/attrib.c:1265 #, fuzzy, c-format msgid "# 0=Subject: (case sensitive) 1=Subject: (ignore case)\n" msgstr "# 0=subj (ÕÞÉÔÙ×ÁÔØ ÒÅÇÉÓÔÒ) 1=subj (ÉÇÎÏÒÉÒÏ×ÁÔØ ÒÅÇÉÓÔÒ)\n" -#: src/attrib.c:1247 src/attrib.c:1256 +#: src/attrib.c:1257 src/attrib.c:1266 #, fuzzy, c-format msgid "# 2=From: (case sensitive) 3=From: (ignore case)\n" msgstr "# 2=from (ÕÞÉÔÙ×ÁÔØ ÒÅÇÉÓÔÒ) 3=from (ÉÇÎÏÒÉÒÏ×ÁÔØ ÒÅÇÉÓÔÒ)\n" -#: src/attrib.c:1248 src/attrib.c:1257 +#: src/attrib.c:1258 src/attrib.c:1267 #, c-format msgid "# 4=Message-ID: & full References: line\n" msgstr "" -#: src/attrib.c:1249 src/attrib.c:1258 +#: src/attrib.c:1259 src/attrib.c:1268 #, c-format msgid "# 5=Message-ID: & last References: entry only\n" msgstr "" -#: src/attrib.c:1250 src/attrib.c:1259 +#: src/attrib.c:1260 src/attrib.c:1269 #, c-format msgid "# 6=Message-ID: entry only 7=Lines:\n" msgstr "" -#: src/attrib.c:1251 +#: src/attrib.c:1261 #, c-format msgid "# quick_select_scope=STRING\n" msgstr "# quick_select_scope=óôòïëá\n" -#: src/attrib.c:1252 +#: src/attrib.c:1262 #, c-format msgid "# quick_select_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:1253 +#: src/attrib.c:1263 #, c-format msgid "# quick_select_case=ON/OFF\n" msgstr "" -#: src/attrib.c:1254 +#: src/attrib.c:1264 #, c-format msgid "# quick_select_header=NUM\n" msgstr "# quick_select_header=þéóìï\n" -#: src/attrib.c:1260 +#: src/attrib.c:1270 #, c-format msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "# quote_chars=óôòïëá (%%s, %%S ÄÌÑ ÉÎÉÃÉÁÌÏ×)\n" -#: src/attrib.c:1262 +#: src/attrib.c:1272 #, fuzzy, c-format msgid "# print_header=ON/OFF\n" msgstr "# thread_perc=þéóìï\n" -#: src/attrib.c:1264 +#: src/attrib.c:1274 #, fuzzy, c-format msgid "# process_only_unread=ON/OFF\n" msgstr "# show_author=þéóìï\n" -#: src/attrib.c:1265 +#: src/attrib.c:1275 #, fuzzy, c-format msgid "# prompt_followupto=ON/OFF\n" msgstr "# followup_to=óôòïëá\n" -#: src/attrib.c:1266 +#: src/attrib.c:1276 #, c-format msgid "# savedir=STRING (eg. ~user/News)\n" msgstr "# savedir=óôòïëá (ÎÁÐÒ. ~user/News)\n" -#: src/attrib.c:1267 +#: src/attrib.c:1277 #, c-format msgid "# savefile=STRING (eg. =linux)\n" msgstr "# savefile=óôòïëá (ÎÁÐÒ. =linux)\n" -#: src/attrib.c:1268 +#: src/attrib.c:1278 #, c-format msgid "# sigfile=STRING (eg. $var/sig)\n" msgstr "# sigfile=óôòïëá (ÎÁÐÒ. $var/sig)\n" -#: src/attrib.c:1269 +#: src/attrib.c:1279 #, c-format msgid "# show_author=NUM\n" msgstr "# show_author=þéóìï\n" -#: src/attrib.c:1275 +#: src/attrib.c:1285 #, fuzzy, c-format msgid "# show_signatures=ON/OFF\n" msgstr "# show_author=þéóìï\n" -#: src/attrib.c:1276 +#: src/attrib.c:1286 #, fuzzy, c-format msgid "# show_only_unread_arts=ON/OFF\n" msgstr "# show_author=þéóìï\n" -#: src/attrib.c:1277 +#: src/attrib.c:1287 #, fuzzy, c-format msgid "# sigdashes=ON/OFF\n" msgstr "# show_author=þéóìï\n" -#: src/attrib.c:1278 +#: src/attrib.c:1288 #, fuzzy, c-format msgid "# signature_repost=ON/OFF\n" msgstr "# show_author=þéóìï\n" -#: src/attrib.c:1279 +#: src/attrib.c:1289 #, fuzzy, c-format msgid "# sort_article_type=NUM\n" msgstr "# sort_art_type=þéóìï\n" -#: src/attrib.c:1297 +#: src/attrib.c:1307 #, c-format msgid "# sort_threads_type=NUM\n" msgstr "# sort_threads_type=þéóìï\n" -#: src/attrib.c:1306 +#: src/attrib.c:1316 #, fuzzy, c-format msgid "# start_editor_offset=ON/OFF\n" msgstr "# show_author=þéóìï\n" -#: src/attrib.c:1307 +#: src/attrib.c:1317 #, c-format msgid "# tex2iso_conv=ON/OFF\n" msgstr "" -#: src/attrib.c:1308 +#: src/attrib.c:1318 #, c-format msgid "# thread_catchup_on_exit=ON/OFF\n" msgstr "" -#: src/attrib.c:1309 +#: src/attrib.c:1319 #, fuzzy, c-format msgid "# thread_articles=NUM" msgstr "# thread_arts=þéóìï" -#: src/attrib.c:1316 +#: src/attrib.c:1326 #, c-format msgid "# thread_format=STRING (eg. %%n %%m [%%L] %%T %%F)\n" msgstr "" -#: src/attrib.c:1317 +#: src/attrib.c:1327 #, c-format msgid "# thread_perc=NUM\n" msgstr "# thread_perc=þéóìï\n" -#: src/attrib.c:1318 +#: src/attrib.c:1328 #, c-format msgid "# trim_article_body=NUM\n" msgstr "" -#: src/attrib.c:1319 +#: src/attrib.c:1329 #, c-format msgid "# 0 = Don't trim article body\n" msgstr "" -#: src/attrib.c:1320 +#: src/attrib.c:1330 #, c-format msgid "# 1 = Skip leading blank lines\n" msgstr "" -#: src/attrib.c:1321 +#: src/attrib.c:1331 #, c-format msgid "# 2 = Skip trailing blank lines\n" msgstr "" -#: src/attrib.c:1322 +#: src/attrib.c:1332 #, c-format msgid "# 3 = Skip leading and trailing blank lines\n" msgstr "" -#: src/attrib.c:1323 +#: src/attrib.c:1333 #, c-format msgid "# 4 = Compact multiple blank lines between text blocks\n" msgstr "" -#: src/attrib.c:1324 +#: src/attrib.c:1334 #, c-format msgid "" "# 5 = Compact multiple blank lines between text blocks and skip\n" "# leading blank lines\n" msgstr "" -#: src/attrib.c:1325 +#: src/attrib.c:1335 #, c-format msgid "" "# 6 = Compact multiple blank lines between text blocks and skip\n" "# trailing blank lines\n" msgstr "" -#: src/attrib.c:1326 +#: src/attrib.c:1336 #, c-format msgid "" "# 7 = Compact multiple blank lines between text blocks and skip\n" "# leading and trailing blank lines\n" msgstr "" -#: src/attrib.c:1327 +#: src/attrib.c:1337 #, c-format msgid "# verbatim_handling=ON/OFF\n" msgstr "" -#: src/attrib.c:1329 +#: src/attrib.c:1339 #, fuzzy, c-format msgid "# extquote_handling=ON/OFF\n" msgstr "# show_author=þéóìï\n" -#: src/attrib.c:1331 +#: src/attrib.c:1341 #, fuzzy, c-format msgid "# wrap_on_next_unread=ON/OFF\n" msgstr "# show_author=þéóìï\n" -#: src/attrib.c:1332 +#: src/attrib.c:1342 #, c-format msgid "# x_body=STRING (eg. ~/.tin/extra-body-text)\n" msgstr "# x_body=óôòïëá (ÎÁÐÒ. ~/.tin/extra-body-text)\n" -#: src/attrib.c:1333 +#: src/attrib.c:1343 #, c-format msgid "# x_comment_to=ON/OFF\n" msgstr "" -#: src/attrib.c:1334 +#: src/attrib.c:1344 #, c-format msgid "# x_headers=STRING (eg. ~/.tin/extra-headers)\n" msgstr "# x_headers=óôòïëá (ÎÁÐÒ. ~/.tin/extra-headers)\n" -#: src/attrib.c:1335 +#: src/attrib.c:1345 #, c-format msgid "" "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "" -#: src/attrib.c:1336 +#: src/attrib.c:1346 #, c-format msgid "" "# entries first followed by group specific entries.\n" "#\n" msgstr "" -#: src/attrib.c:1337 +#: src/attrib.c:1347 #, c-format msgid "############################################################################\n" msgstr "" @@ -786,58 +786,53 @@ msgstr "" #: src/lang.c:107 #, c-format -msgid "Active file corrupt - %s" -msgstr "Active ÆÁÊÌ ÐÏ×ÒÅÖģΠ- %s" - -#: src/lang.c:108 -#, c-format msgid "" "Article to be posted resulted in errors/warnings. %s=quit, %s=Menu, %s=edit: " msgstr "óÔÁÔØÑ ÄÌÑ ÏÔÐÒÁ×ËÉ Ó ÏÛÉÂ./ÐÒÅÄÕÐÒ. %s=×ÙÈÏÄ, %s=ÍÅÎÀ, %s=ÒÅÄÁËÔ.: " -#: src/lang.c:109 +#: src/lang.c:108 #, c-format msgid "Unrecognized attribute: %s" msgstr "îÅÒÁÓÐÏÚÎÁÎÎÙÊ ÁÔÒÉÂÕÔ: %s" -#: src/lang.c:110 +#: src/lang.c:109 #, c-format msgid "Bad command. Type '%s' for help." msgstr "ïÛÉÂÏÞÎÁÑ ËÏÍÁÎÄÁ. îÁÂÅÒÉÔÅ '%s' ÄÌÑ ÐÏÍÏÝÉ." -#: src/lang.c:112 +#: src/lang.c:111 msgid "Base article" msgstr "ïÓÎÏ×ÎÁÑ ÓÔÁÔØÑ" -#: src/lang.c:113 +#: src/lang.c:112 msgid "Base article range" msgstr "äÉÁÐÁÚÏÎ ÏÓÎÏ×ÎÏÊ ÓÔÁÔØÉ" -#: src/lang.c:114 +#: src/lang.c:113 #, fuzzy, c-format msgid "%s: Updating of index files not supported: cache_overview_files=%s" msgstr "%s: ïÂÎÏ×ÌÅÎÉÅ ÉÎÄÅËÓÁ ÆÁÊÌÏ× ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n" -#: src/lang.c:115 +#: src/lang.c:114 msgid "*** Beginning of article ***" msgstr "*** îÁÞÁÌÏ ÓÔÁÔØÉ ***" -#: src/lang.c:116 +#: src/lang.c:115 #, fuzzy msgid "*** Beginning of page ***" msgstr "*** îÁÞÁÌÏ ÓÔÁÔØÉ ***" -#: src/lang.c:118 +#: src/lang.c:117 #, c-format msgid "Cancel (delete) or supersede (overwrite) article [%%s]? (%s/%s/%s): " msgstr "" "ïÔÍÅÎÉÔØ (ÕÄÁÌÉÔØ) ÉÌÉ ÚÁÍÅÎÉÔØ (ÐÅÒÅÐÉÓÁÔØ) ÓÔÁÔØÀ [%%s]? (%s/%s/%s): " -#: src/lang.c:119 +#: src/lang.c:118 msgid "Cancelling article..." msgstr "ïÔÍÅÎÁ ÓÔÁÔØÉ..." -#: src/lang.c:121 +#: src/lang.c:120 #, c-format msgid "Cannot create %s" msgstr "îÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s" @@ -1372,21 +1367,16 @@ msgstr "" msgid "Insecure permissions of %s (%o)" msgstr "îÅÂÅÚÏÐÁÓÎÙÅ ÐÒÁ×Á ÄÏÓÔÕÐÁ %s (%o)" -#: src/lang.c:242 -#, c-format -msgid "Invalid response to GROUP command, %s" -msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÏÔ×ÅÔ ÎÁ ËÏÍÁÎÄÕ GROUP, %s" - -#: src/lang.c:247 +#: src/lang.c:244 #, c-format msgid "MIME parse error: Unexpected end of %s/%s article" msgstr "ïÛÉÂËÁ ÏÂÒÁÂÏÔËÉ MIME: îÅÏÖÉÄÁÎÎÏÅ ÏËÏÎÞÁÎÉÅ ÓÔÁÔØÉ %s/%s" -#: src/lang.c:248 +#: src/lang.c:245 msgid "MIME parse error: Start boundary whilst reading headers" msgstr "ïÛÉÂËÁ ÏÂÒÁÂÏÔËÉ MIME: îÁÞÁÌÏ ÇÒÁÎÉÃÙ × ÚÁÇÏÌÏ×ËÅ" -#: src/lang.c:249 +#: src/lang.c:246 #, fuzzy msgid "" "\n" @@ -1395,16 +1385,16 @@ msgstr "" "\n" "ïÛÉÂËÁ: \"%s\" - ÎÅÄÏÐÕÓÔÉÍÁÑ ÇÒÕÐÐÁ!\n" -#: src/lang.c:250 +#: src/lang.c:247 msgid "Can't get a (fully-qualified) domain-name!" msgstr "îÅ ÕÄÁ£ÔÓÑ ÐÏÌÕÞÉÔØ ÐÏÌÎÏÅ ÉÍÑ ÄÏÍÅÎÁ!" -#: src/lang.c:251 +#: src/lang.c:248 #, c-format msgid "No permissions to go into %s\n" msgstr "îÅÔ ÄÏÓÔÕÐÁ ÄÌÑ %s\n" -#: src/lang.c:253 +#: src/lang.c:250 msgid "" "\n" "Error: From: line missing.\n" @@ -1412,30 +1402,30 @@ msgstr "" "\n" "ïÛÉÂËÁ: ðÒÏÐÕÝÅÎÁ ÓÔÒÏËÁ From:.\n" -#: src/lang.c:255 +#: src/lang.c:252 #, c-format msgid "No read permissions for %s\n" msgstr "îÅÔ ÐÒÁ×Á ÎÁ ÞÔÅÎÉÅ ÄÌÑ %s\n" -#: src/lang.c:256 +#: src/lang.c:253 #, c-format msgid "File %s does not exist\n" msgstr "æÁÊÌ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ\n" -#: src/lang.c:257 +#: src/lang.c:254 #, c-format msgid "No write permissions for %s\n" msgstr "îÅÔ ÐÒÁ×Á ÎÁ ÚÁÐÉÓØ ÄÌÑ %s\n" -#: src/lang.c:258 +#: src/lang.c:255 msgid "Can't get user information (/etc/passwd missing?)" msgstr "îÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ÐÏÌØÚÏ×ÁÔÅÌÅ (ÎÅÔ /etc/passwd ?)" -#: src/lang.c:259 +#: src/lang.c:256 msgid "errors" msgstr "ÏÛÉÂËÉ" -#: src/lang.c:261 +#: src/lang.c:258 #, c-format msgid "" "\n" @@ -1444,82 +1434,82 @@ msgstr "" "\n" "ïÛÉÂËÁ × ÓÔÒÏËÅ %d: úÁÇÏÌÏ×ÏË \"Sender:\" ÎÅÄÏÐÕÓÔÉÍ (ÂÕÄÅÔ ÄÏÂÁ×ÌÅÎ)\n" -#: src/lang.c:263 +#: src/lang.c:260 #, c-format msgid "Server has non of the groups listed in %s" msgstr "îÁ ÓÅÒ×ÅÒÅ ÎÅÔ ÎÉ ÏÄÎÏÊ ÇÒÕÐÐÙ ÕËÁÚÁÎÎÙÈ × %s" -#: src/lang.c:264 +#: src/lang.c:261 msgid "error" msgstr "ÏÛÉÂËÁ" -#: src/lang.c:265 +#: src/lang.c:262 msgid "Unknown display level" msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÕÒÏ×ÅÎØ ÄÉÓÐÌÅÑ" -#: src/lang.c:266 +#: src/lang.c:263 msgid "" msgstr "" -#: src/lang.c:267 +#: src/lang.c:264 msgid "Exiting..." msgstr "÷ÙÈÏÄ..." -#: src/lang.c:268 +#: src/lang.c:265 msgid "leaving external mail-reader" msgstr "ÏÓÔÁ×ÌÑÅÍ ×ÎÅÛÎÉÊ ÐÏÞÔÏ×ÙÊ ËÌÉÅÎÔ" -#: src/lang.c:269 +#: src/lang.c:266 #, c-format msgid "Extracting %s..." msgstr "éÚ×ÌÅËÁÅÍ %s..." -#: src/lang.c:271 +#: src/lang.c:268 #, c-format msgid "Error writing %s file. Filesystem full? File reset to previous state." msgstr "" "ïÛÉÂËÁ ÚÁÐÉÓÉ ÆÁÊÌÁ %s. îÅÔ ÍÅÓÔÁ? ÷ÏÓÓÔÁÎÏ×ÌÅÎÏ ÐÒÅÄ. ÓÏÓÔÏÑÎÉÅ ÆÁÊÌÁ." -#: src/lang.c:272 +#: src/lang.c:269 #, c-format msgid "Error making backup of %s file. Filesystem full?" msgstr "ïÛÉÂËÁ ÓÏÈÒÁÎÅÎÉÑ ÒÅÚÅÒ×ÎÏÊ ËÏÐÉÉ ÆÁÊÌÁ %s. îÅÔ ÍÅÓÔÁ?" -#: src/lang.c:273 +#: src/lang.c:270 #, c-format msgid "Filtering global rules (%d/%d)..." msgstr "æÉÌØÔÒÁÃÉÑ ÇÌÏÂÁÌØÎÙÈ ÐÒÁ×ÉÌ (%d/%d)..." -#: src/lang.c:274 +#: src/lang.c:271 msgid "Rule created by: " msgstr "ðÒÁ×ÉÌÏ ÓÏÚÄÁÎÏ: " -#: src/lang.c:275 +#: src/lang.c:272 #, c-format msgid "Enter pattern [%s]> " msgstr "÷×ÅÄÉÔÅ ÛÁÂÌÏÎ [%s]> " -#: src/lang.c:276 +#: src/lang.c:273 #, c-format msgid "" "\n" "You requested followups to your article to go to the following %s:\n" msgstr "" -#: src/lang.c:277 +#: src/lang.c:274 #, c-format msgid " %s\t Answers will be directed to you by mail.\n" msgstr " %s\t ïÔ×ÅÔÙ ÂÕÄÕÔ ÎÁÐÒÁ×ÌÅÎÙ Ë ×ÁÍ ÐÏ email.\n" -#: src/lang.c:278 +#: src/lang.c:275 msgid "-- forwarded message --\n" msgstr "-- ÐÅÒÅÓÌÁÎÎÏÅ ÓÏÏÂÝÅÎÉÅ --\n" -#: src/lang.c:279 +#: src/lang.c:276 msgid "-- end of forwarded message --\n" msgstr "-- ËÏÎÅà ÐÅÒÅÓÌÁÎÎÏÇÏ ÓÏÏÂÝÅÎÉÑ --\n" -#: src/lang.c:280 +#: src/lang.c:277 msgid "" "# Format:\n" "# comment=STRING Optional. Multiple lines allowed. Comments must be " @@ -1546,6 +1536,10 @@ msgid "" "# gnksa=[<>]?NUM Optional. GNKSA parse_from() return code. '<' or '>' " "opt.\n" "# xref=PATTERN Optional. Kill pattern (e.g. alt.flame*)\n" +"# path=PATTERN Optional. Kill pattern (e.g. news.example.org)\n" +"# Be aware that filtering on Path: may significantly " +"slow\n" +"# down the process.\n" "# time=NUM Optional. time_t value when rule expires\n" "#\n" msgstr "" @@ -2597,7 +2591,7 @@ msgstr "îÅÔ ÐÒÅÄÙÄÕÝÅÇÏ ×ÙÒÁÖÅÎÉÑ" msgid "Operation disabled in no-overwrite mode" msgstr "ïÐÅÒÁÃÉÑ ÚÁÐÒÅÝÅÎÁ × ÒÅÖÉÍÅ ÚÁÐÒÅÝÅÎÉÑ ÐÅÒÅÚÁÐÉÓÉ" -#. TODO: replace hardcoded key-name in txt_info_postponed +#. TODO: replace hard coded key-name in txt_info_postponed #: src/lang.c:547 #, c-format msgid "%d postponed %s, reuse with ^O...\n" @@ -2626,7 +2620,7 @@ msgstr "TeX2Iso ËÏÄÉÒÏ×ÁÎÎÁÑ ÓÔÁÔØÑ" msgid "incomplete " msgstr "ÎÅÐÏÌÎÙÊ " -#. TODO: replace hardcoded key-names +#. TODO: replace hard coded key-names #: src/lang.c:554 #, c-format msgid "" @@ -2749,8 +2743,8 @@ msgid "Kill Article Menu" msgstr "õÎÉÞÔÏÖÉÔØ ÍÅÎÀ ÓÔÁÔØÉ" #: src/lang.c:587 -#, c-format -msgid "Kill Msg-Id: [%s] (f/l/o/n): " +#, fuzzy, c-format +msgid "Kill Msg-ID: [%s] (f/l/o/n): " msgstr "õÎÉÞÔÏÖÉÔØ Msg-Id: [%s] (f/l/o/n): " #: src/lang.c:588 @@ -3252,7 +3246,7 @@ msgstr "ïÛÉÂËÁ × regex: study - ×ÎÕÔÒÅÎÎ msgid "Post a followup..." msgstr "ïÔÐÒÁ×ÌÅÎÉÅ ÏÔ×ÅÔÁ × ÇÒÕÐÐÕ..." -#. TODO: replace hardcoded key-name in txt_post_error_ask_postpone +#. TODO: replace hard coded key-name in txt_post_error_ask_postpone #: src/lang.c:716 msgid "" "An error has occurred while posting the article. If you think that this\n" @@ -3318,226 +3312,231 @@ msgstr "ðÏÍÅÞÅÎÙ %s" msgid "Untagged %s" msgstr "óÎÑÔÙ ÏÔÍÅÔËÉ %s" -#: src/lang.c:730 +#: src/lang.c:731 +#, c-format +msgid "Preparing for filtering on Path header (%d/%d)..." +msgstr "" + +#: src/lang.c:733 msgid "Processing mail messages marked for deletion." msgstr "ïÂÒÁÂÏÔËÁ ÐÏÞÔÏ×ÙÈ ÓÏÏÂÝÅÎÉÊ ÐÏÍÅÞÅÎÎÙÈ ÄÌÑ ÕÄÁÌÅÎÉÑ." -#: src/lang.c:731 +#: src/lang.c:734 msgid "Processing saved articles marked for deletion." msgstr "ïÂÒÁÂÏÔËÁ ÓÏÈÒÁΣÎÎÙÈ ÓÔÁÔÅÊ ÐÏÍÅÞÅÎÎÙÈ ÄÌÑ ÕÄÁÌÅÎÉÑ." -#: src/lang.c:732 +#: src/lang.c:735 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "ðÒÉÎÑÔØ Followup-To? %s=ÏÔÐÒÁ×ÉÔØ, %s=ÉÇÎÏÒÉÒÏ×ÁÔØ, %s=×ÙÈÏÄ: " -#: src/lang.c:733 +#: src/lang.c:736 msgid "Article unchanged, abort mailing?" msgstr "óÔÁÔØÑ ÎÅ ÉÚÍÅÎÉÌÁÓØ, ÐÒÅÒ×ÁÔØ ÏÔÐÒÁ×ËÕ?" -#: src/lang.c:734 +#: src/lang.c:737 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "èÏÔÉÔÅ ÐÏÓÍÏÔÒÅÔØ ÏÔÌÏÖÅÎÎÙÅ ÓÔÁÔØÉ (%d)?" -#: src/lang.c:736 +#: src/lang.c:739 msgid "Add quick kill filter?" msgstr "äÏÂÁ×ÉÔØ ÆÉÌØÔÒ ÂÙÓÔÒÏÇÏ ÕÎÉÞÔÏÖÅÎÉÑ?" -#: src/lang.c:737 +#: src/lang.c:740 msgid "Add quick selection filter?" msgstr "äÏÂÁ×ÉÔØ ÆÉÌØÔÒ ÂÙÓÔÒÏÇÏ ×ÙÂÏÒÁ?" -#: src/lang.c:738 +#: src/lang.c:741 msgid "Do you really want to quit?" msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ×ÙÊÔÉ?" -#: src/lang.c:739 +#: src/lang.c:742 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "%s=ÒÅÄÁËÔ. ÏÔÍÅÎ. ÓÏÏÂÝÅÎÉÑ, %s=×ÙÈÏÄ, %s=ÕÄÁÌÉÔØ (ÏÔÍÅÎÉÔØ) [%%s]: " -#: src/lang.c:740 +#: src/lang.c:743 msgid "You have tagged articles in this group - quit anyway?" msgstr "ïÓÔÁÌÉÓØ ÐÏÍÅÞÅÎÎÙÅ ÓÔÁÔØÉ × ÇÒÕÐÐÅ - ×ÙÊÔÉ ×ÓÅ ÒÁ×ÎÏ?" -#: src/lang.c:741 +#: src/lang.c:744 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=×ÙÈÏÄ, %s=ÒÅÄÁËÔÉÒÏ×ÁÔØ, %s=ÏÔÌÏÖÉÔØ: " -#: src/lang.c:742 +#: src/lang.c:745 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=×ÙÈÏÄ %s=ÒÅÄÁËÔÉÒÏ×ÁÔØ %s=ÓÏÈÒ. ÕÎÉÞÔÏÖÅÎÎÏÅ ÏÐÉÓÁÎÉÅ: " -#: src/lang.c:743 +#: src/lang.c:746 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "%s=×ÙÈÏÄ %s=ÒÅÄÁËÔÉÒÏ×ÁÔØ %s=ÓÏÈÒ. ×ÙÂÒÁÎÎÏÅ ÏÐÉÓÁÎÉÅ: " -#: src/lang.c:744 +#: src/lang.c:747 msgid "Do you really want to quit without saving your configuration?" msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ×ÙÊÔÉ ÂÅÚ ÓÏÈÒÁÎÅÎÉÑ ËÏÎÆÉÇÕÒÁÃÉÉ?" -#: src/lang.c:747 +#: src/lang.c:750 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÄÉÁÐÁÚÏÎ - ÄÏÓÔÕÐÎÙ '0-9.$', ÎÁÐÒ. 1-$" -#: src/lang.c:749 +#: src/lang.c:752 msgid "Do you want to abort this operation?" msgstr "÷Ù ÈÏÔÉÔÅ ÐÒÅÒ×ÁÔØ ÏÐÅÒÁÃÉÀ?" -#: src/lang.c:750 +#: src/lang.c:753 msgid "Do you want to exit tin immediately?" msgstr "÷Ù ÈÏÔÉÔÅ ×ÙÊÔÉ ÉÚ tin ÎÅÍÅÄÌÅÎÎÏ?" -#: src/lang.c:752 +#: src/lang.c:755 msgid "Reading ('q' to quit)..." msgstr "þÔÅÎÉÅ ('q' - ×ÙÈÏÄ)..." -#: src/lang.c:753 +#: src/lang.c:756 #, c-format msgid "Reading %sarticles..." msgstr "þÔÅÎÉÅ %sÓÔÁÔÅÊ..." -#: src/lang.c:754 +#: src/lang.c:757 #, c-format msgid "Reading %sattributes file...\n" msgstr "þÔÅÎÉÅ ÆÁÊÌÁ %sÁÔÒÉÂÕÔÏ×...\n" -#: src/lang.c:755 +#: src/lang.c:758 #, c-format msgid "Reading %sconfig file...\n" msgstr "þÔÅÎÉÅ ÆÁÊÌÁ %sconfig...\n" -#: src/lang.c:756 +#: src/lang.c:759 msgid "Reading filter file...\n" msgstr "þÔÅÎÉÅ ÆÁÊÌÁ ÆÉÌØÔÒÏ×...\n" -#: src/lang.c:757 +#: src/lang.c:760 #, c-format msgid "Reading %s groups..." msgstr "þÔÅÎÉÅ %s ÇÒÕÐÐ..." -#: src/lang.c:758 +#: src/lang.c:761 msgid "Reading input history file...\n" msgstr "þÔÅÎÉÅ ÆÁÊÌÁ ÉÓÔÏÒÉÉ...\n" -#: src/lang.c:759 +#: src/lang.c:762 msgid "Reading keymap file...\n" msgstr "þÔÅÎÉÅ ÆÁÊÌÁ ÎÁÚÎÁÞÅÎÉÊ ËÌÁ×ÉÛ...\n" -#: src/lang.c:760 +#: src/lang.c:763 msgid "Reading groups from active file... " msgstr "þÔÅÎÉÅ ÇÒÕÐÐ ÉÚ ÆÁÊÌÁ active... " -#: src/lang.c:761 +#: src/lang.c:764 msgid "Reading groups from newsrc file... " msgstr "þÔÅÎÉÅ ÇÒÕÐÐ ÉÚ ÆÁÊÌÁ newsrc... " -#: src/lang.c:762 +#: src/lang.c:765 msgid "Reading newsgroups file... " msgstr "þÔÅÎÉÅ ÆÁÊÌÁ ÇÒÕÐÐ... " -#: src/lang.c:763 +#: src/lang.c:766 msgid "Reading newsrc file..." msgstr "þÔÅÎÉÅ ÆÁÊÌÁ newsrc..." -#: src/lang.c:764 +#: src/lang.c:767 msgid "References: line " msgstr "References: ÓÔÒÏËÁ " -#: src/lang.c:766 +#: src/lang.c:769 #, c-format msgid "(%d:%02d remaining)" msgstr "(%d:%02d ÏÓÔÁÌÏÓØ)" -#: src/lang.c:768 +#: src/lang.c:771 #, c-format msgid "Bogus group %s removed." msgstr "ïÛÉÂÏÞÎÁÑ ÇÒÕÐÐÁ %s ÕÄÁÌÅÎÁ." -#: src/lang.c:769 +#: src/lang.c:772 msgid "Removed from the previous rule: " msgstr "õÄẠ́ΠÉÚ ÐÒÅÄÙÄÕÝÅÇÏ ÐÒÁ×ÉÌÁ: " -#: src/lang.c:770 +#: src/lang.c:773 #, c-format msgid "Error: rename %s to %s" msgstr "ïÛÉÂËÁ: ÐÅÒÅÉÍÅÎÏ×ÁÔØ %s × %s" -#: src/lang.c:771 +#: src/lang.c:774 msgid "Reply to author..." msgstr "ïÔ×ÅÞÁÅÍ Á×ÔÏÒÕ..." -#: src/lang.c:772 +#: src/lang.c:775 msgid "Repost" msgstr "ïÐÒÁ×ÉÔØ ÓÎÏ×Á" -#: src/lang.c:773 +#: src/lang.c:776 msgid "Reposting article..." msgstr "ðÏ×ÔÏÒÎÁÑ ÏÔÐÒÁ×ËÁ ÓÔÁÔØÉ..." -#: src/lang.c:774 +#: src/lang.c:777 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "ïÔÐÒÁ×ÉÔØ ÓÎÏ×Á ÓÔÁÔØÀ(É) × ÇÒÕÐÐÕ(Ù) [%s]> " -#: src/lang.c:775 +#: src/lang.c:778 msgid "Reset newsrc?" msgstr "óÂÒÏÓÉÔØ newsrc?" -#: src/lang.c:776 +#: src/lang.c:779 msgid "Responses have been directed to the following newsgroups" msgstr "ïÔ×ÅÔÙ ÂÙÌÉ ÐÅÒÅÎÁÐÒÁ×ÌÅÎÙ × ÓÌÅÄÕÀÝÉÅ ÇÒÕÐÐÙ" -#: src/lang.c:777 +#: src/lang.c:780 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " msgstr "" "ïÔ×ÅÔÙ ÂÙÌÉ ÐÅÒÅÎÁÐÒÁ×ÌÅÎÙ ÏÔÐÒÁ×ÉÔÅÌÀ. %s=mail, %s=ÏÔÐÒÁ×ÉÔØ, %s=×ÙÈÏÄ: " -#: src/lang.c:779 +#: src/lang.c:782 msgid "Press to continue..." msgstr "îÁÖÍÉÔÅ ÄÌÑ ÐÒÏÄÏÌÖÅÎÉÑ..." -#: src/lang.c:781 +#: src/lang.c:784 #, c-format msgid "Select From [%s] (y/n): " msgstr "÷ÙÂÒÁÔØ From [%s] (y/n): " -#: src/lang.c:782 +#: src/lang.c:785 msgid "Select Lines: (num): " msgstr "÷ÙÂÒÁÔØ ÓÔÒÏËÉ: (num): " -#: src/lang.c:783 +#: src/lang.c:786 msgid "Auto-select Article Menu" msgstr "á×ÔÏ×ÙÂÏÒ íÅÎÀ ÓÔÁÔÅÊ" -#: src/lang.c:784 -#, c-format -msgid "Select Msg-Id [%s] (f/l/o/n): " +#: src/lang.c:787 +#, fuzzy, c-format +msgid "Select Msg-ID [%s] (f/l/o/n): " msgstr "÷ÙÂÒÁÔØ Msg-Id [%s] (f/l/o/n): " -#: src/lang.c:785 +#: src/lang.c:788 msgid "Select pattern scope: " msgstr "÷ÙÂÒÁÔØ ÏÂÌÁÓÔØ ÛÁÂÌÏÎÁ: " -#: src/lang.c:786 +#: src/lang.c:789 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "÷ÙÂÒÁÔØ ôÅÍÕ [%s] (y/n): " -#: src/lang.c:787 +#: src/lang.c:790 msgid "Select text pattern : " msgstr "÷ÙÂÒÁÔØ ÛÁÂÌÏÎ : " -#: src/lang.c:788 +#: src/lang.c:791 msgid "Select time in days : " msgstr "÷ÙÂÒÁÔØ ×ÒÅÍÑ : " -#: src/lang.c:789 +#: src/lang.c:792 #, c-format msgid "" "# %s server configuration file\n" @@ -3558,54 +3557,54 @@ msgstr "" "############################################################################\n" "\n" -#: src/lang.c:795 +#: src/lang.c:798 msgid "Showing unread groups only" msgstr "÷Ù×ÏÄ ÔÏÌØËÏ ÎÅÐÒÏÞÉÔÁÎÎÙÈ ÇÒÕÐÐ" -#: src/lang.c:796 +#: src/lang.c:799 msgid "Subject: line (ignore case) " msgstr "ôÅÍÁ: ÓÔÒÏËÁ (ÉÇÎÏÒÉÒÏ×ÁÔØ ÒÅÇÉÓÔÒ) " -#: src/lang.c:797 +#: src/lang.c:800 msgid "Subject: line (case sensitive)" msgstr "ôÅÍÁ: ÓÔÒÏËÁ (ÎÅ ÉÇÎÏÒÉÒÏ×ÁÔØ ÒÅÇÉÓÔÒ)" -#: src/lang.c:798 +#: src/lang.c:801 msgid "Save" msgstr "óÏÈÒÁÎÉÔØ" -#: src/lang.c:799 +#: src/lang.c:802 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "óÏÈÒÁÎÉÔØ '%s' (%s/%s)?" -#: src/lang.c:800 +#: src/lang.c:803 msgid "Save configuration before continuing?" msgstr "óÏÈÒÁÎÉÔØ ËÏÎÆÉÇÕÒÁÃÉÀ ÐÅÒÅÄ ÐÒÏÄÏÌÖÅÎÉÅÍ?" -#: src/lang.c:801 +#: src/lang.c:804 msgid "Save filename> " msgstr "óÏÈÒÁÎÉÔØ × ÆÁÊÌ> " -#: src/lang.c:802 +#: src/lang.c:805 msgid "Saved" msgstr "óÏÈÒÁÎÅÎÏ" -#: src/lang.c:803 +#: src/lang.c:806 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "%4d ÎÅÐÒÏÞÉÔÁÎÏ (%4d hot) %s × %s\n" -#: src/lang.c:804 +#: src/lang.c:807 #, c-format msgid "Saved %s...\n" msgstr "óÏÈÒÁÎÅÎÏ %s...\n" -#: src/lang.c:805 +#: src/lang.c:808 msgid "Nothing was saved" msgstr "îÉÞÅÇÏ ÎÅ ÂÙÌÏ ÓÏÈÒÁÎÅÎÏ" -#: src/lang.c:806 +#: src/lang.c:809 #, c-format msgid "" "\n" @@ -3614,190 +3613,190 @@ msgstr "" "\n" "%s %d %s ÉÚ %d %s\n" -#: src/lang.c:807 +#: src/lang.c:810 #, c-format msgid "-- %s saved to %s%s --" msgstr "-- %s ÓÏÈÒÁÎ. × %s%s --" -#: src/lang.c:808 +#: src/lang.c:811 #, c-format msgid "-- %s saved to %s - %s --" msgstr "-- %s ÓÏÈÒÁÎ. × %s - %s --" -#: src/lang.c:809 +#: src/lang.c:812 msgid "Saving..." msgstr "úÁÐÉÓØ..." -#: src/lang.c:810 +#: src/lang.c:813 #, c-format msgid "%s: Screen initialization failed" msgstr "%s: ÎÅÕÄÁÞÎÁÑ ÉÎÉÃÉÁÌÉÚÁÃÉÑ ÜËÒÁÎÁ" -#: src/lang.c:812 +#: src/lang.c:815 #, c-format msgid "%s: screen is too small\n" msgstr "%s: ÜËÒÁÎ ÓÌÉÛËÏÍ ÍÁÌ\n" -#: src/lang.c:814 +#: src/lang.c:817 #, fuzzy, c-format msgid "screen is too small, %s is exiting" msgstr "ÜËÒÁÎ ÓÌÉÛËÏÍ ÍÁÌ, %s ×ÙÈÏÄ\n" -#: src/lang.c:815 +#: src/lang.c:818 #, fuzzy msgid "Delete scope?" msgstr "÷ÙÂÒÁÔØ ÏÂÌÁÓÔØ ÛÁÂÌÏÎÁ: " -#: src/lang.c:816 +#: src/lang.c:819 #, fuzzy msgid "Enter scope> " msgstr "÷×ÅÄÉÔÅ ÎÏÍÅÒ ÏÐÃÉÉ> " -#: src/lang.c:817 +#: src/lang.c:820 #, fuzzy msgid "Select new position> " msgstr "÷ÙÂÒÁÔØ ÛÁÂÌÏÎ : " -#: src/lang.c:818 +#: src/lang.c:821 msgid "New position cannot be a global scope" msgstr "" -#: src/lang.c:819 +#: src/lang.c:822 msgid "Global scope, operation not allowed" msgstr "" -#: src/lang.c:820 +#: src/lang.c:823 msgid "Rename scope> " msgstr "" -#: src/lang.c:821 +#: src/lang.c:824 #, fuzzy msgid "Select scope> " msgstr "÷ÙÂÅÒÉÔÅ ÇÒÕÐÐÕ> " -#: src/lang.c:822 +#: src/lang.c:825 #, fuzzy msgid "Scopes Menu" msgstr "íÅÎÀ ÏÐÃÉÊ" -#: src/lang.c:823 +#: src/lang.c:826 #, fuzzy msgid "Scopes Menu Commands" msgstr "ëÏÍÁÎÄÙ ×ÅÒÈÎÅÇÏ ÕÒÏ×ÎÑ" -#: src/lang.c:824 +#: src/lang.c:827 #, c-format msgid "Search backwards [%s]> " msgstr "ðÏÉÓË ÎÁÚÁÄ [%s]> " -#: src/lang.c:825 +#: src/lang.c:828 #, c-format msgid "Search body [%s]> " msgstr "ðÏÉÓË × ÔÅÌÅ [%s]> " -#: src/lang.c:826 +#: src/lang.c:829 #, c-format msgid "Search forwards [%s]> " msgstr "ðÏÉÓË ×ÐÅÒ£Ä [%s]> " -#: src/lang.c:827 +#: src/lang.c:830 msgid "Searching..." msgstr "ðÏÉÓË..." -#: src/lang.c:828 +#: src/lang.c:831 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "ðÏÉÓË ÓÔÁÔØÉ %d ÉÚ %d ('q' - ÐÒÅÒ×ÁÔØ)..." -#: src/lang.c:829 +#: src/lang.c:832 msgid "Select article> " msgstr "÷ÙÂÅÒÉÔÅ ÓÔÁÔØÀ> " -#: src/lang.c:830 +#: src/lang.c:833 msgid "" "Select option number before text or use arrow keys and . 'q' to quit." msgstr "" "÷ÙÂÅÒÉÔÅ ÎÏÍÅÒ ÏÐÃÉÉ ÉÌÉ ÐÅÒÅÊÄÉÔÅ ÓÔÒÅÌÏÞËÁÍÉ É ÎÁÖÍÉÔÅ . 'q' ×ÙÈÏÄ." -#: src/lang.c:831 +#: src/lang.c:834 msgid "Select group> " msgstr "÷ÙÂÅÒÉÔÅ ÇÒÕÐÐÕ> " -#: src/lang.c:832 +#: src/lang.c:835 #, c-format msgid "Enter selection pattern [%s]> " msgstr "÷×ÅÄÉÔÅ ÛÁÂÌÏÎ ÄÌÑ ×ÙÂÏÒÁ [%s]> " -#: src/lang.c:833 +#: src/lang.c:836 #, fuzzy msgid "Select thread> " msgstr "÷ÙÂÅÒÉÔÅ ÄÉÓËÕÓÓÉÀ > " -#: src/lang.c:834 +#: src/lang.c:837 #, c-format msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" msgstr "%s %s %s (\"%s\") [%s]: ÏÔÐÒÁ×ØÔÅ ÐÏÄÒÏÂÎÕÀ ÉÎÆÏÒÍÁÃÉÀ Ï ÏÛÉÂËÅ %s\n" -#: src/lang.c:835 +#: src/lang.c:838 msgid "servers active-file" msgstr "active-ÆÁÊÌ ÓÅÒ×ÅÒÏ×" -#: src/lang.c:836 +#: src/lang.c:839 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "îÅ ÍÏÇÕ ÐÅÒÅÊÔÉ × ÎÏ×ÕÀ ÇÒÕÐÐÕ. óÎÁÞÁÌÁ ÐÏÄÐÉÛÉÔÅÓØ..." -#: src/lang.c:837 +#: src/lang.c:840 msgid "" msgstr "<ðòïâåì>" -#: src/lang.c:838 +#: src/lang.c:841 #, c-format msgid "Starting: (%s)" msgstr "óÔÁÒÔÕÀ: (%s)" -#: src/lang.c:839 +#: src/lang.c:842 #, c-format msgid "List Thread (%d of %d)" msgstr "óÐÉÓÏË ÄÉÓËÕÓÓÉÊ (%d ÉÚ %d)" -#: src/lang.c:840 +#: src/lang.c:843 #, c-format msgid "Thread (%.*s)" msgstr "äÉÓËÕÓÓÉÑ (%.*s)" -#: src/lang.c:841 +#: src/lang.c:844 msgid "Enter wildcard subscribe pattern> " msgstr "÷×ÅÄÉÔÅ ÛÁÂÌÏÎ ÄÌÑ ÐÏÄÐÉÓËÉ> " -#: src/lang.c:842 +#: src/lang.c:845 #, c-format msgid "subscribed to %d groups" msgstr "ÐÏÄÐÉÓÁÌÉÓØ ÎÁ %d ÇÒÕÐÐ" -#: src/lang.c:843 +#: src/lang.c:846 #, c-format msgid "Subscribed to %s" msgstr "ðÏÄÐÉÓÁÌÉÓØ ÎÁ %s" -#: src/lang.c:844 +#: src/lang.c:847 msgid "Subscribing... " msgstr "ðÏÄÐÉÓÙ×ÁÅÍÓÑ... " -#: src/lang.c:845 +#: src/lang.c:848 #, c-format msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " msgstr "ïÔÐÒÁ×ÉÔØ ÓÎÏ×Á ÉÌÉ ÚÁÍÅÎÉÔØ ÓÔÁÔØÀ(É) [%%s]? (%s/%s/%s): " -#: src/lang.c:846 +#: src/lang.c:849 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "úÁÍÅÎÉÔØ ÓÔÁÔØÀ(É) × ÇÒÕÐÐÕ(Ù) [%s]> " -#: src/lang.c:847 +#: src/lang.c:850 msgid "Superseding article ..." msgstr "úÁÍÅÎÁ ÓÔÁÔØÉ ..." -#: src/lang.c:848 +#: src/lang.c:851 #, c-format msgid "" "\n" @@ -3806,24 +3805,24 @@ msgstr "" "\n" "ïÓÔÁÎÏ×ÌÅÎÏ. îÁÂÅÒÉÔÅ 'fg' ÄÌÑ ÐÅÒÅÚÁÐÕÓËÁ %s\n" -#: src/lang.c:850 +#: src/lang.c:853 #, c-format msgid "%d days" msgstr "%d ÄÎÅÊ" -#: src/lang.c:851 +#: src/lang.c:854 msgid "" msgstr "<ôáâ>" -#: src/lang.c:852 +#: src/lang.c:855 msgid "TeX " msgstr "" -#: src/lang.c:853 +#: src/lang.c:856 msgid "# Default action/prompt strings\n" msgstr "" -#: src/lang.c:854 +#: src/lang.c:857 msgid "" "# Defaults for quick (1 key) kill & auto-selection filters\n" "# header=NUM 0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n" @@ -3834,111 +3833,111 @@ msgid "" "# expire=ON/OFF ON=limit to default_filter_days OFF=don't ever expire\n" msgstr "" -#: src/lang.c:867 +#: src/lang.c:870 msgid "" "# If ON use print current subject or newsgroup description in the last line\n" msgstr "" "# åÓÌÉ ON, ÔÏ ×Ù×ÏÄÉÔØ ÔÅËÕÝÕÀ ÔÅÍÕ ÉÌÉ ÏÐÉÓÁÎÉÅ ÇÒÕÐÐÙ × ÐÏÓÌÅÄÎÅÊ ÓÔÒÏËÅ\n" -#: src/lang.c:868 +#: src/lang.c:871 msgid "# Host & time info used for detecting new groups (don't touch)\n" msgstr "" "# éÎÆÏÒÍÁÃÉÑ Ï ÈÏÓÔÅ É ×ÒÅÍÅÎÉ, ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ÏÐÒÅÄÅÌÅÎÉÑ\n" "# ÎÏ×ÙÈ ÇÒÕÐÐ (ÎÅ ÉÚÍÅÎÑÔØ)\n" -#: src/lang.c:869 +#: src/lang.c:872 msgid "There is no news\n" msgstr "îÅÔ ÎÏ×ÏÓÔÅÊ\n" -#: src/lang.c:870 +#: src/lang.c:873 msgid "Thread" msgstr "äÉÓËÕÓÓÉÑ" -#: src/lang.c:871 +#: src/lang.c:874 msgid "Thread Level Commands" msgstr "ëÏÍÁÎÄÙ ÕÒÏ×ÎÑ ÄÉÓËÕÓÓÉÊ" -#: src/lang.c:872 +#: src/lang.c:875 msgid "Thread deselected" msgstr "ó ÄÉÓËÕÓÓÉÉ ÓÎÑÔÁ ÏÔÍÅÔËÁ" -#: src/lang.c:873 +#: src/lang.c:876 msgid "Thread selected" msgstr "äÉÓËÕÓÓÉÑ ×ÙÂÒÁÎÁ" -#: src/lang.c:875 +#: src/lang.c:878 msgid "threads" msgstr "ÄÉÓËÕÓÓÉÉ" -#: src/lang.c:877 +#: src/lang.c:880 msgid "thread" msgstr "ÄÉÓËÕÓÓÉÑ" -#: src/lang.c:878 +#: src/lang.c:881 #, c-format msgid "Thread %4s of %4s" msgstr "äÉÓËÕÓÓÉÑ %4s ÉÚ %4s" -#: src/lang.c:879 +#: src/lang.c:882 msgid "Threading articles..." msgstr "òÁÚÂÏÒ ÄÉÓËÕÓÓÉÊ..." -#: src/lang.c:880 +#: src/lang.c:883 #, c-format msgid "Toggled word highlighting %s" msgstr "ðÅÒÅËÌÀÞÅÎÉÅ ÐÏÄÓ×ÅÔËÉ ÓÌÏ× %s" -#: src/lang.c:881 +#: src/lang.c:884 msgid "Toggled rot13 encoding" msgstr "ðÅÒÅËÌÀÞÅÎÉÅ ËÏÄÉÒÏ×ËÉ rot13" -#: src/lang.c:882 +#: src/lang.c:885 #, c-format msgid "Toggled german TeX encoding %s" msgstr "ðÅÒÅËÌÀÞÅÎÉÅ ÎÅÍÅÃËÏÊ TeX ËÏÄÉÒÏ×ËÉ %s" -#: src/lang.c:883 +#: src/lang.c:886 #, c-format msgid "Toggled tab-width to %d" msgstr "ðÅÒÅËÌÀÞÅÎÉÅ ÛÉÒÉÎÙ ÔÁÂÕÌÑÃÉÉ ÎÁ %d" -#: src/lang.c:885 +#: src/lang.c:888 #, c-format msgid "%d Trying to dotlock %s" msgstr "%d ÐÏÐÙÔËÁ dotlock %s" -#: src/lang.c:886 +#: src/lang.c:889 #, c-format msgid "%d Trying to lock %s" msgstr "%d ðÏÐÙÔËÁ ÚÁÂÌÏËÉÒÏ×ÁÔØ %s" -#: src/lang.c:888 +#: src/lang.c:891 msgid " h=help" msgstr " h=ÐÏÍÏÝØ" -#: src/lang.c:890 +#: src/lang.c:893 msgid "Unlimited" msgstr "îÅÏÇÒÁÎÉÞÅÎ" -#: src/lang.c:891 +#: src/lang.c:894 msgid "Enter wildcard unsubscribe pattern> " msgstr "÷×ÅÄÉÔÅ ÛÁÂÌÏÎ ÄÌÑ ÏÔÐÉÓÙ×ÁÎÉÑ> " -#: src/lang.c:892 +#: src/lang.c:895 #, c-format msgid "Error decoding %s : %s" msgstr "ïÛÉÂËÁ ÒÁÓËÏÄÉÒÏ×ÁÎÉÑ %s : %s" -#: src/lang.c:893 +#: src/lang.c:896 msgid "No end." msgstr "îÅÔ ËÏÎÃÁ." -#: src/lang.c:894 +#: src/lang.c:897 #, c-format msgid "%s successfully decoded." msgstr "%s ÕÓÐÅÛÎÏ ÒÁÓËÏÄÉÒÏ×ÁÎ." -#: src/lang.c:895 +#: src/lang.c:898 #, c-format msgid "" "%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" @@ -3947,37 +3946,32 @@ msgstr "" "%*s[-- %s/%s, %suuencoded ÆÁÊÌ, %d ÓÔÒÏË, ÉÍÑ: %s --]\n" "\n" -#: src/lang.c:896 +#: src/lang.c:899 msgid "unread " msgstr "ÎÅÐÒÏÞÉÔÁÎÏ " -#: src/lang.c:897 +#: src/lang.c:900 #, c-format msgid "unsubscribed from %d groups" msgstr "ÏÔÐÉÓÁÌÉÓØ ÏÔ %d ÇÒÕÐÐ" -#: src/lang.c:898 +#: src/lang.c:901 #, c-format msgid "Unsubscribed from %s" msgstr "ïÔÐÉÓÁÌÉÓØ ÏÔ %s" -#: src/lang.c:899 +#: src/lang.c:902 msgid "Unsubscribing... " msgstr "ïÔÐÉÓÙ×ÁÅÍÓÑ... " -#: src/lang.c:900 +#: src/lang.c:903 msgid "Unthreading articles..." msgstr "òÁÚÇÒÕÐÐÉÒÏ×ËÁ ÄÉÓËÕÓÓÉÊ..." -#: src/lang.c:901 +#: src/lang.c:904 msgid "Updated" msgstr "ïÂÎÏ×ÌÅÎÏ" -#: src/lang.c:903 -#, c-format -msgid "unparseable \"LIST COUNTS\" line: \"%s\"" -msgstr "" - #: src/lang.c:905 msgid "Updating" msgstr "ïÂÎÏ×ÌÅÎÉÅ" @@ -4145,11 +4139,16 @@ msgid "%s only useful for batch mode ope msgstr "%s ÏÐÃÉÑ ÐÏÌÅÚÎÁ ÔÏÌØËÏ × ÐÁËÅÔÎÏÍ ÒÅÖÉÍÅ\n" #: src/lang.c:939 +#, fuzzy, c-format +msgid "%s only useful for batch or debug mode operations\n" +msgstr "%s ÏÐÃÉÑ ÐÏÌÅÚÎÁ ÔÏÌØËÏ × ÐÁËÅÔÎÏÍ ÒÅÖÉÍÅ\n" + +#: src/lang.c:940 #, c-format msgid "Useless combination %s and %s. Ignoring %s.\n" msgstr "" -#: src/lang.c:941 +#: src/lang.c:942 #, c-format msgid "" "\n" @@ -4158,12 +4157,12 @@ msgstr "" "\n" "%s%d ×ÎÅ ÄÉÁÐÁÚÏÎÁ (0 - %d). óÂÒÏÓ × 0" -#: src/lang.c:942 +#: src/lang.c:943 #, c-format msgid "View '%s' (%s/%s)?" msgstr "ðÒÏÓÍÏÔÒ '%s' (%s/%s)?" -#: src/lang.c:944 +#: src/lang.c:945 #, c-format msgid "" "\n" @@ -4175,7 +4174,7 @@ msgstr "" "óÔÒÏËÁ %d - ÐÅÒ×ÁÑ ÄÌÉÎÎÁÑ ÓÔÒÏËÁ:\n" "%-100s\n" -#: src/lang.c:945 +#: src/lang.c:946 msgid "" "\n" "Warning: article unchanged after editing\n" @@ -4183,7 +4182,7 @@ msgstr "" "\n" "÷ÎÉÍÁÎÉÅ: ÓÔÁÔØÑ ÎÅ ÉÚÍÅÎÉÌÁÓØ ÐÏÓÌÅ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ\n" -#: src/lang.c:946 +#: src/lang.c:947 msgid "" "\n" "Warning: \"Subject:\" contains only whitespaces.\n" @@ -4191,7 +4190,7 @@ msgstr "" "\n" "÷ÎÉÍÁÎÉÅ: \"Subject:\" ÓÏÄÅÒÖÉÔ ÏÄÎÉ ÐÒÏÂÅÌÙ.\n" -#: src/lang.c:947 +#: src/lang.c:948 msgid "" "\n" "Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:" @@ -4200,7 +4199,7 @@ msgstr "" "\n" "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: \"Subject:\" ÎÁÞÉÎÁÅÔÓÑ Ó \"Re: \" ÎÏ ÎÅÔ \"References:\".\n" -#: src/lang.c:949 +#: src/lang.c:950 msgid "" "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" @@ -4210,7 +4209,7 @@ msgstr "" "÷ÎÉÍÁÎÉÅ: × ÓÔÁÔØÅ ÅÓÔØ \"References:\" ÎÏ \"Subject:\"\n" " ÎÅ ÎÁÞÉÎÁÅÔÓÑ Ó \"Re: \" É ÎÅ ÓÏÄÅÒÖÉÔ \"(was:\".\n" -#: src/lang.c:952 +#: src/lang.c:953 msgid "" "Read carefully!\n" "\n" @@ -4232,7 +4231,7 @@ msgstr "" "÷ÏÔ ÓÔÁÔØÑ, ËÏÔÏÒÕÀ ×Ù ÈÏÔÉÔÅ ÏÔÍÅÎÉÔØ:\n" "\n" -#: src/lang.c:956 +#: src/lang.c:957 msgid "" "\n" "Warning: You are using a non-plain transfer encoding (such as base64 or\n" @@ -4247,13 +4246,13 @@ msgstr "" "ÂÕÄÅÔ\n" " ÄÏÂÁ×ÌÅÎÁ ÜÔÏÊ ÐÒÏÇÒÁÍÍÏÊ, ÏÎÁ ÎÅ ÂÕÄÅÔ ËÏÒÒÅËÔÎÏ ÚÁËÏÄÉÒÏ×ÁÎÁ.\n" -#: src/lang.c:961 +#: src/lang.c:962 msgid "" "\n" "Warning: \"example\" is a reserved hierarchy!\n" msgstr "" -#: src/lang.c:962 +#: src/lang.c:963 #, c-format msgid "" "\n" @@ -4268,7 +4267,7 @@ msgstr "" "îÅËÏÔÏÒÙÅ ÚÎÁÞÅÎÉÑ × ×ÁÛÅÍ %s ÆÁÊÌÅ ÉÚÍÅÎÉÌÉÓØ!\n" "ðÒÏÞÉÔÁÊÔÅ WHATSNEW, É Ô.Ä...\n" -#: src/lang.c:964 +#: src/lang.c:965 #, c-format msgid "" "\n" @@ -4282,7 +4281,7 @@ msgstr "" "îÅËÏÔÏÒÙÅ ÚÎÁÞÅÎÉÅÑ × ÆÁÊÌÅ %s ÍÏÇÕÔ ÂÙÔØ ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎÙ,\n" "ÄÒÕÇÉÅ ÍÏÇÌÉ ÂÙÔØ ÉÚÍÅÎÅÎÙ!\n" -#: src/lang.c:967 +#: src/lang.c:968 #, c-format msgid "" "Warning: tin wrote fewer groups to your\n" @@ -4292,7 +4291,7 @@ msgid "" "before you start tin once again!\n" msgstr "" -#: src/lang.c:971 +#: src/lang.c:972 #, c-format msgid "" "\n" @@ -4302,12 +4301,12 @@ msgstr "" "÷ÎÉÍÁÎÉÅ: ÏÂÎÁÒÕÖÅÎÏ %d '-- \\n' ÓÔÒÏË, ÜÔÏ ÍÏÖÅÔ ÕÄÉ×ÉÔØ ÎÅËÏÔÏÒÙÈ " "ÐÏÌØÚÏ×ÁÔÅÌÅÊ.\n" -#: src/lang.c:972 +#: src/lang.c:973 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "÷ÎÉÍÁÎÉÅ: óÏÈÒÁÎÅÎÙ ÔÏÌØËÏ %d ÉÚ %d ÓÔÁÔÅÊ" -#: src/lang.c:973 +#: src/lang.c:974 #, c-format msgid "" "\n" @@ -4322,14 +4321,14 @@ msgstr "" " ÐÏÌÅÚÎÕÀ ÉÎÆÏÒÍÁÃÉÀ, ÏÎÉ ÄÏÌÖÎÙ ÂÙÔØ ËÏÒÏÔËÉÍÉ ÎÁÓÔÏÌØËÏ,\n" " ÎÁÓËÏÌØËÏ ÜÔÏ ×ÏÚÍÏÖÎÏ.\n" -#: src/lang.c:977 +#: src/lang.c:978 #, c-format msgid "" "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " msgstr "" "÷ÎÉÍÁÎÉÅ: ÁÄÒÅÓ email ÍÏÖÅÔ ÓÏÄÅÒÖÁÔØ spamtrap. %s=ÐÒÏÄÏÌÖÉÔØ, %s=ÓÔÏÐ? " -#: src/lang.c:978 +#: src/lang.c:979 msgid "" "\n" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" @@ -4337,37 +4336,37 @@ msgstr "" "\n" "÷ÎÉÍÁÎÉÅ: óÉÇÎÁÔÕÒÙ ÄÏÌÖÎÙ ÎÁÞÉÎÁÔØÓÑ Ó '-- \\n' ÎÅ Ó '--\\n'.\n" -#: src/lang.c:979 +#: src/lang.c:980 msgid "Writing attributes file..." msgstr "úÁÐÉÓØ ÆÁÊÌÁ ÁÔÒÉÂÕÔÏ×..." -#: src/lang.c:981 +#: src/lang.c:982 #, c-format msgid "%d Responses" msgstr "%d ÏÔ×ÅÔÏ×" -#: src/lang.c:983 +#: src/lang.c:984 #, c-format msgid "Added %d %s" msgstr "äÏÂÁ×ÌÅÎÏ %d %s" -#: src/lang.c:984 +#: src/lang.c:985 msgid "No unsubscribed groups to show" msgstr "îÅÔ ÏÔÐÉÓÁÎÎÙÈ ÇÒÕÐÐ ÄÌÑ ×Ù×ÏÄÁ" -#: src/lang.c:985 +#: src/lang.c:986 msgid "Showing subscribed to groups only" msgstr "ðÏËÁÚ ÔÏÌØËÏ ÐÏÄÐÉÓÁÎÎÙÈ ÎÁ ÇÒÕÐÐÕ" -#: src/lang.c:986 +#: src/lang.c:987 msgid "Yes " msgstr "äÁ " -#: src/lang.c:987 +#: src/lang.c:988 msgid " You have mail" msgstr " îÏ×ÁÑ ÐÏÞÔÁ" -#: src/lang.c:992 +#: src/lang.c:993 #, c-format msgid "" "\n" @@ -4387,11 +4386,11 @@ msgstr "" " ÏÔÒÅÄÁËÔÉÒÕÊÔŠţ É ÕÂÅÒÉÔÅ ÜÔÉ ÓÉÍ×ÏÌÙ ÉÌÉ ÉÚÍÅÎÉÔÅ × M)ÅÎÀ\n" " ÚÎÁÞÅÎÉÅ MM_NETWORK_CHARSET ÎÁ ÐÏÄÈÏÄÑÝÅÅ.\n" -#: src/lang.c:1003 +#: src/lang.c:1004 msgid " -D mode debug mode" msgstr "" -#: src/lang.c:1007 +#: src/lang.c:1008 msgid "" "Read carefully!\n" "\n" @@ -4418,11 +4417,11 @@ msgstr "" "÷ÏÔ ÓÔÁÔØÑ, ËÏÔÏÒÕÀ ×Ù ÈÏÔÉÔÅ ÏÔÍÅÎÉÔØ:\n" "\n" -#: src/lang.c:1016 +#: src/lang.c:1017 msgid "toggle color" msgstr "ÉÚÍÅÎÉÔØ Ã×ÅÔ" -#: src/lang.c:1017 +#: src/lang.c:1018 msgid "" "# Changing colors of several screen parts\n" "# Possible values are:\n" @@ -4468,11 +4467,11 @@ msgstr "" "# 15 = Ó×ÅÔÌÏ-ÂÅÌÙÊ\n" "\n" -#: src/lang.c:1037 +#: src/lang.c:1038 msgid " -a toggle color flag" msgstr " -a ÉÚÍÅÎÉÔØ Ã×ÅÔ" -#: src/lang.c:1041 +#: src/lang.c:1042 msgid "" "\n" "Error: Followup-To set to more than one newsgroup!\n" @@ -4480,14 +4479,14 @@ msgstr "" "\n" "ïÛÉÂËÁ: Followup-To ÕÓÔÁÎÏ×ÌÅÎ ÎÁ ÂÏÌØÛÅ ÞÅÍ ÏÄÎÕ ÇÒÕÐÐÕ!\n" -#: src/lang.c:1042 +#: src/lang.c:1043 #, c-format msgid "" "\n" "Error: \"%s\" is renamed, use \"%s\" instead!\n" msgstr "" -#: src/lang.c:1043 +#: src/lang.c:1044 #, c-format msgid "" "\n" @@ -4496,7 +4495,7 @@ msgstr "" "\n" "ïÛÉÂËÁ: ËÒÏÓÓ-ÐÏÓÔÉÎÇÁ × %d ÇÒÕÐÐÙ ÂÅÚ Followup-To ÓÔÒÏËÉ!\n" -#: src/lang.c:1044 +#: src/lang.c:1045 #, c-format msgid "" "\n" @@ -4505,7 +4504,7 @@ msgstr "" "\n" "ïÛÉÂËÁ: \"%s\" - ÎÅÄÏÐÕÓÔÉÍÁÑ ÇÒÕÐÐÁ!\n" -#: src/lang.c:1046 +#: src/lang.c:1047 msgid "" "\n" "Warning: Followup-To set to more than one newsgroup!\n" @@ -4513,7 +4512,7 @@ msgstr "" "\n" "÷ÎÉÍÁÎÉÅ: Followup-To ÕÓÔÁÎÏ×ÌÅÎ ÎÁ ÂÏÌØÛÅ ÞÅÍ ÏÄÎÕ ÇÒÕÐÐÕ!\n" -#: src/lang.c:1047 +#: src/lang.c:1048 #, fuzzy, c-format msgid "" "\n" @@ -4522,7 +4521,7 @@ msgstr "" "\n" "÷ÎÉÍÁÎÉÅ: \"%s\" - ÎÅÄÏÐÕÓÔÉÍÁÑ ÎÁ ÜÔÏÍ ÍÅÓÔÅ ÇÒÕÐÐÁ ÎÏ×ÏÓÔÅÊ!\n" -#: src/lang.c:1048 +#: src/lang.c:1049 #, c-format msgid "" "\n" @@ -4531,7 +4530,7 @@ msgstr "" "\n" "÷ÎÉÍÁÎÉÅ: ËÒÏÓÓ-ÐÏÓÔÉÎÇ × %d ÇÒÕÐÐÙ ÂÅÚ Followup-To ÓÔÒÏËÉ!\n" -#: src/lang.c:1049 +#: src/lang.c:1050 #, c-format msgid "" "\n" @@ -4540,7 +4539,7 @@ msgstr "" "\n" "÷ÎÉÍÁÎÉÅ: \"%s\" ÎÅ × newsrc É ÍÏÖÅÔ ÂÙÔØ ÏÛÉÂÏÞÎÁ ÎÁ ÜÔÏÍ ÍÅÓÔÅ!\n" -#: src/lang.c:1050 +#: src/lang.c:1051 #, c-format msgid "" "\n" @@ -4549,157 +4548,152 @@ msgstr "" "\n" "÷ÎÉÍÁÎÉÅ: \"%s\" - ÎÅÄÏÐÕÓÔÉÍÁÑ ÎÁ ÜÔÏÍ ÍÅÓÔÅ ÇÒÕÐÐÁ ÎÏ×ÏÓÔÅÊ!\n" -#: src/lang.c:1054 +#: src/lang.c:1055 #, c-format msgid "%d files successfully written from %d articles. %d %s occurred." msgstr "%d ÆÁÊÌÏ× ÕÓÐÅÛÎÏ ÚÁÐÉÓÁÎÙ ÉÚ %d ÓÔÁÔÅÊ. %d %s." -#: src/lang.c:1055 +#: src/lang.c:1056 msgid "Missing parts." msgstr "ðÒÏÐÕÝÅÎÙ ÞÁÓÔÉ." -#: src/lang.c:1056 +#: src/lang.c:1057 msgid "No beginning." msgstr "îÅÔ ÎÁÞÁÌÁ." -#: src/lang.c:1057 +#: src/lang.c:1058 msgid "No data." msgstr "îÅÔ ÄÁÎÎÙÈ." -#: src/lang.c:1058 +#: src/lang.c:1059 msgid "Unknown error." msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ." -#: src/lang.c:1061 +#: src/lang.c:1062 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "\tëÏÎÔÒÏÌØÎÁÑ ÓÕÍÍÁ %s (%ld %s)" -#: src/lang.c:1066 +#: src/lang.c:1067 msgid "Reading mail active file... " msgstr "" -#: src/lang.c:1067 +#: src/lang.c:1068 msgid "Reading mailgroups file... " msgstr "þÔÅÎÉÅ ÆÁÊÌÁ mailgroups... " -#: src/lang.c:1071 +#: src/lang.c:1072 msgid "perform PGP operations on article" msgstr "×ÙÐÏÌÎÉÔØ PGP ÏÐÅÒÁÃÉÉ ÓÏ ÓÔÁÔØÅÊ" -#: src/lang.c:1072 +#: src/lang.c:1073 msgid "Add key(s) to public keyring?" msgstr "äÏÂÁ×ÉÔØ ËÌÀÞ(É) Ë ÏÔËÒÙÔÙÍ ËÌÀÞÁÍ?" -#: src/lang.c:1073 +#: src/lang.c:1074 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "%s=ÛÉÆÒÏ×ÁÔØ, %s=ÐÏÄÐÉÓÁÔØ, %s=ÏÂÁ, %s=×ÙÈÏÄ: " -#: src/lang.c:1074 +#: src/lang.c:1075 #, c-format msgid "%s=sign, %s=sign & include public key, %s=quit: " msgstr "%s=ÛÉÆÒÏ×ÁÔØ, %s=ÐÏÄÐÉÓÁÔØ É ×ÌÏÖÉÔØ ÏÔËÒÙÔÙÊ ËÌÀÞ, %s=×ÙÈÏÄ: " -#: src/lang.c:1075 +#: src/lang.c:1076 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "PGP ÎÅ ÕÓÔÁÎÏ×ÌÅÎ (ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s)" -#: src/lang.c:1076 +#: src/lang.c:1077 msgid "Article not signed and no public keys found" msgstr "óÔÁÔØÑ ÎÅ ÐÏÄÐÉÓÁÎÁ É ÏÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ" -#: src/lang.c:1078 +#: src/lang.c:1079 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" "%s=×ÙÈÏÄ, %s=ÒÅÄ., %s=ispell, %s=pgp, %s=ÍÅÎÀ, %s=ÏÔÐÒÁ×ÉÔØ, %s=ÏÔÌÏÖÉÔØ: " -#: src/lang.c:1079 +#: src/lang.c:1080 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " msgstr "%s=×ÙÈÏÄ, %s=ÒÅÄ., %s=ispell, %s=pgp, %s=ÏÔÐÒÁ×ÉÔØ [%%s]: " -#: src/lang.c:1080 +#: src/lang.c:1081 #, c-format msgid "" "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" "%s=×ÙÈÏÄ, %s=ÒÅÄ., %s=ispell, %s=pgp, %s=ÍÅÎÀ, %s=ÏÔÐÒ., %s=ÏÔÌÏÖÉÔØ [%%s]: " -#: src/lang.c:1082 +#: src/lang.c:1083 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "%s=×ÙÈÏÄ, %s=ÒÅÄÁËÔ., %s=pgp, %s=ÍÅÎÀ, %s=ÏÔÐÒ., %s=ÏÔÌÏÖÉÔØ: " -#: src/lang.c:1083 +#: src/lang.c:1084 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "%s=×ÙÈÏÄ, %s=ÒÅÄ., %s=pgp, %s=ÏÔÐÒÁ×ÉÔØ [%%s]: " -#: src/lang.c:1084 +#: src/lang.c:1085 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=×ÙÈÏÄ, %s=ÒÅÄ., %s=pgp, %s=ÍÅÎÀ, %s=ÏÔÐÒÁ×ÉÔØ, %s=ÏÔÌÏÖÉÔØ [%%s]: " -#: src/lang.c:1088 +#: src/lang.c:1089 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " msgstr "%s=×ÙÈÏÄ, %s=ÒÅÄ., %s=ispell, %s=ÍÅÎÀ, %s=ÏÔÐÒ., %s=ÏÔÌÏÖÉÔØ: " -#: src/lang.c:1089 +#: src/lang.c:1090 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "%s=×ÙÈÏÄ, %s=ÒÅÄ., %s=ispell, %s=ÏÔÐÒÁ×ÉÔØ [%%s]: " -#: src/lang.c:1090 +#: src/lang.c:1091 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" "%s=×ÙÈÏÄ, %s=ÒÅÄ., %s=ispell, %s=ÍÅÎÀ, %s=ÏÔÐÒÁ×ÉÔØ, %s=ÏÔÌÏÖÉÔØ [%%s]: " -#: src/lang.c:1092 +#: src/lang.c:1093 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "%s=×ÙÈÏÄ, %s=ÒÅÄ., %s=ÍÅÎÀ, %s=ÏÔÐÒÁ×ÉÔØ, %s=ÏÔÌÏÖÉÔØ: " -#: src/lang.c:1093 +#: src/lang.c:1094 #, c-format msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "%s=×ÙÈÏÄ, %s=ÒÅÄ., %s=ÏÔÐÒÁ×ÉÔØ [%%s]: " -#: src/lang.c:1094 +#: src/lang.c:1095 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=×ÙÈÏÄ, %s=ÒÅÄ., %s=ÍÅÎÀ, %s=ÏÔÐÒÁ×ÉÔØ, %s=ÏÔÌÏÖÉÔØ [%%s]: " -#: src/lang.c:1103 +#: src/lang.c:1104 msgid "Try cache_overview_files to speed up things.\n" msgstr "ðÏÐÒÏÂÕÊÔÅ cache_overview_files ÄÌÑ ÕÓËÏÒÅÎÉÑ.\n" -#: src/lang.c:1104 +#: src/lang.c:1105 msgid "Tin will use local index files instead.\n" msgstr "Tin ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÔØ ÆÁÊÌÙ ÌÏËÁÌØÎÏÇÏ ÉÎÄÅËÓÁ.\n" -#: src/lang.c:1105 +#: src/lang.c:1106 msgid "Cannot find NNTP server name" msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ ÉÍÑ NNTP ÓÅÒ×ÅÒÁ" -#: src/lang.c:1106 +#: src/lang.c:1107 #, fuzzy, c-format msgid "Connecting to %s:%u..." msgstr "óÏÅÄÉÎÅÎÉÅ Ó %s:%u..." -#: src/lang.c:1107 -msgid "Disconnecting from server...\n" -msgstr "ïÔÓÏÅÄÉÎÅÎÉÅ ÏÔ ÓÅÒ×ÅÒÁ...\n" - #: src/lang.c:1108 -#, fuzzy, c-format -msgid "" -"Wrong newsgroup name (\"%s\") in response of \"GROUP %s\" command: \"%s\"" -msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ÉÍÑ ÇÒÕÐÐÙ × ÏÔ×ÅÔÅ ÎÁ ËÏÍÁÎÄÕ GROUP, %s ÄÌÑ %s" +#, fuzzy +msgid "Disconnecting from server..." +msgstr "ïÔÓÏÅÄÉÎÅÎÉÅ ÏÔ ÓÅÒ×ÅÒÁ...\n" #: src/lang.c:1109 #, c-format @@ -5480,66 +5474,70 @@ msgstr "" msgid "NFD" msgstr "" -#: src/lang.c:1586 +#: src/lang.c:1580 +msgid "NFKC case fold" +msgstr "" + +#: src/lang.c:1589 msgid "Display Options" msgstr "ïÐÃÉÉ ×Ù×ÏÄÁ" -#: src/lang.c:1593 +#: src/lang.c:1596 msgid "Color Options" msgstr "ïÐÃÉÉ ÒÁÂÏÔÙ Ó Ã×ÅÔÏÍ" -#: src/lang.c:1599 +#: src/lang.c:1602 #, fuzzy msgid "Highlight Options" msgstr "ïÐÃÉÉ ÆÉÌØÔÒÁÃÉÉ" -#: src/lang.c:1606 +#: src/lang.c:1609 msgid "Article-Limiting Options" msgstr "" -#: src/lang.c:1612 +#: src/lang.c:1615 msgid "Posting/Mailing Options" msgstr "ïÐÃÉÉ ÏÔÐÒÁ×ËÉ ÓÔÁÔÅÊ/ÐÉÓÅÍ" -#: src/lang.c:1618 +#: src/lang.c:1621 msgid "Saving/Printing Options" msgstr "ïÐÃÉÉ ÓÏÈÒÁÎÅÎÉÑ É ÐÅÞÁÔÉ" -#: src/lang.c:1624 +#: src/lang.c:1627 msgid "Expert Options" msgstr "üËÓÐÅÒÔÎÙÅ ÏÐÃÉÉ" -#: src/lang.c:1630 +#: src/lang.c:1633 msgid "Filtering Options" msgstr "ïÐÃÉÉ ÆÉÌØÔÒÁÃÉÉ" -#: src/lang.c:1635 src/lang.c:1666 src/lang.c:1672 src/lang.c:1699 -#: src/lang.c:1751 src/lang.c:1757 src/lang.c:1767 src/lang.c:1778 -#: src/lang.c:1796 src/lang.c:1865 src/lang.c:2066 src/lang.c:2072 -#: src/lang.c:2078 src/lang.c:2084 src/lang.c:2096 src/lang.c:2103 -#: src/lang.c:2157 src/lang.c:2166 src/lang.c:2172 src/lang.c:2179 -#: src/lang.c:2186 src/lang.c:2193 src/lang.c:2200 src/lang.c:2207 -#: src/lang.c:2214 src/lang.c:2221 src/lang.c:2228 src/lang.c:2235 -#: src/lang.c:2242 src/lang.c:2249 src/lang.c:2256 src/lang.c:2263 -#: src/lang.c:2270 src/lang.c:2277 src/lang.c:2284 src/lang.c:2291 -#: src/lang.c:2298 src/lang.c:2305 src/lang.c:2312 src/lang.c:2319 -#: src/lang.c:2326 src/lang.c:2333 src/lang.c:2340 src/lang.c:2348 -#: src/lang.c:2364 src/lang.c:2371 src/lang.c:2378 src/lang.c:2385 -#: src/lang.c:2391 src/lang.c:2397 src/lang.c:2414 src/lang.c:2426 -#: src/lang.c:2461 src/lang.c:2514 src/lang.c:2528 src/lang.c:2534 -#: src/lang.c:2559 src/lang.c:2577 src/lang.c:2594 src/lang.c:2606 -#: src/lang.c:2639 src/lang.c:2675 src/lang.c:2695 src/lang.c:2730 -#: src/lang.c:2740 src/lang.c:2747 src/lang.c:2773 src/lang.c:2797 -#: src/lang.c:2870 src/lang.c:2884 src/lang.c:2892 src/lang.c:2906 -#: src/lang.c:2912 src/lang.c:2950 +#: src/lang.c:1638 src/lang.c:1669 src/lang.c:1675 src/lang.c:1702 +#: src/lang.c:1754 src/lang.c:1760 src/lang.c:1770 src/lang.c:1781 +#: src/lang.c:1799 src/lang.c:1868 src/lang.c:2069 src/lang.c:2075 +#: src/lang.c:2081 src/lang.c:2087 src/lang.c:2099 src/lang.c:2106 +#: src/lang.c:2160 src/lang.c:2169 src/lang.c:2175 src/lang.c:2182 +#: src/lang.c:2189 src/lang.c:2196 src/lang.c:2203 src/lang.c:2210 +#: src/lang.c:2217 src/lang.c:2224 src/lang.c:2231 src/lang.c:2238 +#: src/lang.c:2245 src/lang.c:2252 src/lang.c:2259 src/lang.c:2266 +#: src/lang.c:2273 src/lang.c:2280 src/lang.c:2287 src/lang.c:2294 +#: src/lang.c:2301 src/lang.c:2308 src/lang.c:2315 src/lang.c:2322 +#: src/lang.c:2329 src/lang.c:2336 src/lang.c:2343 src/lang.c:2351 +#: src/lang.c:2367 src/lang.c:2374 src/lang.c:2381 src/lang.c:2388 +#: src/lang.c:2394 src/lang.c:2400 src/lang.c:2417 src/lang.c:2429 +#: src/lang.c:2464 src/lang.c:2517 src/lang.c:2531 src/lang.c:2537 +#: src/lang.c:2562 src/lang.c:2580 src/lang.c:2597 src/lang.c:2609 +#: src/lang.c:2642 src/lang.c:2678 src/lang.c:2698 src/lang.c:2733 +#: src/lang.c:2743 src/lang.c:2750 src/lang.c:2776 src/lang.c:2800 +#: src/lang.c:2877 src/lang.c:2892 src/lang.c:2900 src/lang.c:2914 +#: src/lang.c:2920 src/lang.c:2958 msgid " toggles, sets, cancels." msgstr "<ðòïâåì> ×ÙÂÒÁÔØ, ÕÓÔÁÎÏ×ÉÔØ, ÏÔÍÅÎÁ." -#: src/lang.c:1636 +#: src/lang.c:1639 msgid "Show mini menu & posting etiquette" msgstr "ðÏËÁÚÙ×ÁÔØ ÍÉÎÉ-ÍÅÎÀ É ÜÔÉËÅÔ ÏÂÝÅÎÉÑ" -#: src/lang.c:1637 +#: src/lang.c:1640 msgid "" "# If ON show a mini menu of useful commands at each level\n" "# and posting etiquette after composing an article\n" @@ -5547,17 +5545,17 @@ msgstr "" "# åÓÌÉ ON, ÔÏ ÐÏËÁÚÙ×ÁÔØ ËÏÒÏÔËÏÅ ÏÐÉÓÁÎÉÅ ÄÌÑ ËÁÖÄÏÊ ÇÒÕÐÐÙ\n" "# É ÐÒÁ×ÉÌÁ ÓÅÔÅ×ÏÇÏ ÜÔÉËÅÔÁ ÐÏÓÌÅ ÓÏÚÄÁÎÉÑ ÓÔÁÔØÉ\n" -#: src/lang.c:1642 +#: src/lang.c:1645 msgid "Show short description for each newsgroup. toggles & sets." msgstr "" "ðÏËÁÚÙ×ÁÔØ ËÏÒÏÔËÏÅ ÏÐÉÓÁÎÉÑ ÄÌÑ ËÁÖÄÏÊ ÇÒÕÐÐÙ. <ðòïâåì> ×ÙÂÏÒ, " "ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:1643 +#: src/lang.c:1646 msgid "Show description of each newsgroup" msgstr "ðÏËÁÚÙ×ÁÔØ ÏÐÉÓÁÎÉÅ ÇÒÕÐÐ" -#: src/lang.c:1644 +#: src/lang.c:1647 msgid "" "# If ON show group description text after newsgroup name at\n" "# group selection level\n" @@ -5565,19 +5563,19 @@ msgstr "" "# åÓÌÉ ON, ÔÏ ÐÏËÁÚÙ×ÁÔØ ÏÐÉÓÁÎÉÅ ÇÒÕÐÐÙ ÐÏÓÌÅ ÉÍÅÎÉ ÇÒÕÐÐÙ ×\n" "# ÒÅÖÉÍÅ ×ÙÂÏÒÁ ÇÒÕÐÐÙ\n" -#: src/lang.c:1649 +#: src/lang.c:1652 #, fuzzy msgid "" "Show From (author) fields in group & thread level. toggles & " "sets." msgstr "÷Ù×ÏÄ ôÅÍÙ É á×ÔÏÒÁ × ÍÅÎÀ ÇÒÕÐÐÙ. <ðòïâåì> ×ÙÂÏÒ, ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:1650 +#: src/lang.c:1653 #, fuzzy msgid "In group and thread level, show author by" msgstr "÷ ÍÅÎÀ ÇÒÕÐÐÙ ÐÏËÁÚÁÔØ Á×ÔÏÒÁ ËÁË" -#: src/lang.c:1651 +#: src/lang.c:1654 #, fuzzy msgid "" "# Part of From field to display in group and thread level\n" @@ -5594,33 +5592,33 @@ msgstr "" "# * 2 = ÐÏÌÎÏÅ ÉÍÑ\n" "# 3 = ÁÄÒÅÓ É ÐÏÌÎÏÅ ÉÍÑ\n" -#: src/lang.c:1660 +#: src/lang.c:1663 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "÷Ù×ÏÄÉÔØ -> ×ÍÅÓÔÏ ÐÏÄÓ×ÅÔËÉ × ÍÅÎÀ. <ðòïâåì> ×ÙÂÏÒ, ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:1661 +#: src/lang.c:1664 msgid "Draw -> instead of highlighted bar" msgstr "÷Ù×ÏÄÉÔØ -> ×ÍÅÓÔÏ ÐÏÄÓ×ÅÔËÉ × ÍÅÎÀ." -#: src/lang.c:1662 +#: src/lang.c:1665 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "# åÓÌÉ ON, ÔÏ ×Ù×ÏÄÉÔØ -> ×ÍÅÓÔÏ ÐÏÄÓ×ÅÔËÉ × ÍÅÎÀ\n" -#: src/lang.c:1667 +#: src/lang.c:1670 msgid "Use inverse video for page headers" msgstr "éÎ×ÅÒÓÎÙÊ ×ÉÄÅÏ ÒÅÖÉÍ ÄÌÑ ÚÁÇÏÌÏ×ËÏ× ÓÔÒÁÎÉÃ" -#: src/lang.c:1668 +#: src/lang.c:1671 msgid "# If ON use inverse video for page headers at different levels\n" msgstr "" "# åÓÌÉ ON, ÔÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÉÎ×ÅÒÓÉÀ Ã×ÅÔÏ× ÄÌÑ ÚÁÇÏÌÏ×ËÏ× ÎÁ\n" "# ÒÁÚÌÉÞÎÙÈ ÕÒÏ×ÎÑÈ\n" -#: src/lang.c:1673 +#: src/lang.c:1676 msgid "Thread articles by" msgstr "çÒÕÐÐÉÒÏ×ÁÔØ ÓÔÁÔØÉ ÐÏ" -#: src/lang.c:1674 +#: src/lang.c:1677 msgid "" "# Thread articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5640,17 +5638,17 @@ msgstr "" "# 4 = Multipart Subject\n" "# 5 = óÏ×ÐÁÄÅÎÉÅ ÐÏ ÐÒÏÃÅÎÔÁÍ\n" -#: src/lang.c:1685 +#: src/lang.c:1688 msgid "Enter percentage match required to thread together. sets." msgstr "" "÷×ÅÄÉÔÅ ÎÅÏÂÈÏÄÉÍÙÊ ÐÒÏÃÅÎÔ ÓÏ×ÐÁÄÅÎÉÑ ÄÌÑ ÏÂßÅÄÉÎÅÎÉÑ × ÄÉÓËÕÓÓÉÀ. " "ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:1686 +#: src/lang.c:1689 msgid "Thread percentage match" msgstr "ðÒÏÃÅÎÔ ÓÏ×ÐÁÄÅÎÉÑ ÄÉÓËÕÓÓÉÉ" -#: src/lang.c:1688 +#: src/lang.c:1691 #, no-c-format msgid "" "# Thread percentage match...\n" @@ -5665,11 +5663,11 @@ msgid "" "# 'harppy' would be threaded separately from 'happy'\n" msgstr "" -#: src/lang.c:1700 +#: src/lang.c:1703 msgid "Score of a thread" msgstr "Score ÄÉÓËÕÓÓÉÉ" -#: src/lang.c:1701 +#: src/lang.c:1704 msgid "" "# Thread score\n" "# Possible values are (the default is marked with *):\n" @@ -5683,18 +5681,18 @@ msgstr "" "# 1 = ÓÕÍÍÁ\n" "# 2 = ÓÒÅÄÎÅÅ\n" -#: src/lang.c:1709 +#: src/lang.c:1712 msgid "" "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "" "óÏÒÔÉÒÏ×ÁÔØ ÓÔÁÔØÉ ÐÏ ôÅÍÅ, From, äÁÔÅ ÉÌÉ Score. <ðòïâåì> ×ÙÂÏÒ, " "ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:1710 +#: src/lang.c:1713 msgid "Sort articles by" msgstr "óÏÒÔÉÒÏ×ÁÔØ ÓÔÁÔØÉ ÐÏ" -#: src/lang.c:1711 +#: src/lang.c:1714 msgid "" "# Sort articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5724,17 +5722,17 @@ msgstr "" "# 9 = ëÏÌÉÞÅÓÔ×Ï ÓÔÒÏË ÐÏ ÕÂÙ×ÁÎÉÀ\n" "# 10 = ëÏÌÉÞÅÓÔ×Ï ÓÔÒÏË ÐÏ ×ÏÚÒÁÓÔÁÎÉÀ\n" -#: src/lang.c:1727 +#: src/lang.c:1730 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "" "îÅ ÓÏÒÔÉÒÏ×ÁÔØ ÄÉÓËÕÓÓÉÉ ÉÌÉ ÓÏÒÔÉÒÏ×ÁÔØ ÐÏ Score. <ðòïâåì> ×ÙÂÏÒ, " "ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:1728 +#: src/lang.c:1731 msgid "Sort threads by" msgstr "óÏÒÔÉÒÏ×ÁÔØ ÄÉÓËÕÓÓÉÉ ÐÏ" -#: src/lang.c:1729 +#: src/lang.c:1732 #, fuzzy msgid "" "# Sort thread by ...\n" @@ -5751,55 +5749,55 @@ msgstr "" "# * 1 = Score ÐÏ ÕÂÙ×ÁÎÉÀ\n" "# 2 = Score ÐÏ ×ÏÚÒÁÓÔÁÎÉÀ\n" -#: src/lang.c:1739 +#: src/lang.c:1742 msgid "" "Put cursor at first/last unread art in groups. toggles & sets." msgstr "" "õÓÔ. ËÕÒÓÏÒ ÎÁ ÐÅÒ×ÕÀ/ÐÏÓÌÅÄ. ÎÅÐÒÏÞÉÔ. ÓÔÁÔØÀ × ÇÒÕÐÐÁÈ. <ðòïâåì> ×ÙÂÏÒ, " " ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:1740 +#: src/lang.c:1743 #, fuzzy msgid "Go to first unread article in group" msgstr "ðÅÒÅÊÔÉ Ë ÐÅÒ×ÏÊ ÎÅÐÒÏÞ. ÓÔÁÔØÅ × ÇÒÕÐÐÅ" -#: src/lang.c:1741 +#: src/lang.c:1744 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "" "# åÓÌÉ ON ÔÏ ÐÅÒÅÊÔÉ Ë ÐÅÒ×ÏÊ ÎÅÐÒÏÞÉÔÁÎÎÏÊ ÓÔÁÔØÅ × ÇÒÕÐÐÅ,\n" "# ÉÎÁÞÅ Ë ÐÅÒÅÊÔÉ Ë ÐÏÓÌÅÄÎÅÊ.\n" -#: src/lang.c:1745 +#: src/lang.c:1748 msgid "Show all articles or only unread articles. toggles & sets." msgstr "" "ðÏËÁÚÙ×ÁÔØ ×ÓÅ ÓÔÁÔØÉ ÉÌÉ ÔÏÌØËÏ ÎÅÐÒÏÞÉÔÁÎÎÙÅ. <ðòïâåì> ×ÙÂÏÒ, " "ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:1746 +#: src/lang.c:1749 msgid "Show only unread articles" msgstr "ðÏËÁÚÙ×ÁÔØ ÔÏÌØËÏ ÎÅÐÒÏÞÉÔ. ÓÔÁÔØÉ" -#: src/lang.c:1747 +#: src/lang.c:1750 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "" "# åÓÌÉ ON, ÔÏ ÐÏËÁÚÙ×ÁÔØ ÔÏÌØËÏ ÎÏ×ÙÅ/ÎÅÐÒÏÞÉÔÁÎÎÙÅ ÓÔÁÔØÉ,\n" "# ÉÎÁÞÅ ÐÏËÁÚÙ×ÁÔØ ×ÓÅ.\n" -#: src/lang.c:1752 +#: src/lang.c:1755 msgid "Show only groups with unread arts" msgstr "ðÏËÁÚÙ×ÁÔØ ÔÏÌØËÏ ÇÒÕÐÐÙ Ó ÎÅÐÒÏÞ. ÓÔÁÔØÑÍÉ" -#: src/lang.c:1753 +#: src/lang.c:1756 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "" "# åÓÌÉ ON, ÔÏ ÐÏËÁÚÙ×ÁÔØ ÔÏÌØËÏ ÐÏÄÐÉÓÁÎÎÙÅ ÇÒÕÐÐÙ Ó ÎÅÐÒÏÞÔ£ÎÎÙÍÉ " "ÓÔÁÔØÑÍÉ.\n" -#: src/lang.c:1758 +#: src/lang.c:1761 msgid "Filter which articles" msgstr "óÔÁÔØÉ ÄÌÑ ÆÉÌØÔÒÁÃÉÉ" -#: src/lang.c:1759 +#: src/lang.c:1762 msgid "" "# Filter which articles\n" "# Possible values are (the default is marked with *):\n" @@ -5808,11 +5806,11 @@ msgid "" "# 2 = kill all articles and never show them\n" msgstr "" -#: src/lang.c:1768 +#: src/lang.c:1771 msgid "Go to the next unread article with" msgstr "" -#: src/lang.c:1769 +#: src/lang.c:1772 msgid "" "# Go to the unread article with following key(s)\n" "# Possible values are (the default is marked with *):\n" @@ -5822,12 +5820,12 @@ msgid "" "# 3 = PAGE DOWN or TAB\n" msgstr "" -#: src/lang.c:1779 +#: src/lang.c:1782 #, fuzzy msgid "How to treat blank lines" msgstr "ãÉÔÉÒÏ×ÁÔØ ÐÕÓÔÙÅ ÓÔÒÏËÉ" -#: src/lang.c:1780 +#: src/lang.c:1783 msgid "" "# Trim the article body, remove unnecessary blank lines.\n" "# Possible values are (the default is marked with *):\n" @@ -5844,87 +5842,87 @@ msgid "" "# leading and trailing blank lines\n" msgstr "" -#: src/lang.c:1797 +#: src/lang.c:1800 msgid "List thread using right arrow key" msgstr "òÁÚ×ÅÒÎÕÔØ ÄÉÓËÕÓÓÉÀ ÐÒÁ×ÏÊ ÓÔÒÅÌËÏÊ" -#: src/lang.c:1798 +#: src/lang.c:1801 msgid "" "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "" -#: src/lang.c:1802 +#: src/lang.c:1805 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "" "÷×ÅÄÉÔÅ ÓÉÍ×ÏÌ ÄÌÑ ÏÔÍÅÔËÉ ÕÄÁÌ£ÎÎÙÈ ÓÔÁÔÅÊ. ÕÓÔÁÎÏ×ÉÔØ, ÏÔÍÅÎÁ." -#: src/lang.c:1803 +#: src/lang.c:1806 msgid "Character to show deleted articles" msgstr "óÉÍ×ÏÌ ÄÌÑ ÏÔÍÅÔËÉ ÕÄÁÌ£ÎÎÙÈ ÓÔÁÔÅÊ" -#: src/lang.c:1804 +#: src/lang.c:1807 msgid "" "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1809 +#: src/lang.c:1812 msgid "" "Enter character to indicate articles in a range. sets, cancels." msgstr "" "÷×ÅÄÉÔÅ ÓÉÍ×ÏÌ ÄÌÑ ÏÔÍÅÔËÉ ÓÔÁÔÅÊ × ÄÉÁÐÁÚÏÎÅ. ÕÓÔÁÎÏ×ÉÔØ, " "ÏÔÍÅÎÉÔØ." -#: src/lang.c:1810 +#: src/lang.c:1813 msgid "Character to show inrange articles" msgstr "óÉÍ×ÏÌ ÄÌÑ ÏÔÍÅÔËÉ ÓÔÁÔÅÊ × ÄÉÁÐÁÚÏÎÅ" -#: src/lang.c:1811 +#: src/lang.c:1814 msgid "" "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1816 +#: src/lang.c:1819 msgid "" "Enter character to indicate that article will return. sets, " "cancels." msgstr "" -#: src/lang.c:1817 +#: src/lang.c:1820 msgid "Character to show returning arts" msgstr "óÉÍ×ÏÌ ÄÌÑ ÏÔÍÅÔËÉ ×ÏÚ×Ò. ÓÔÁÔÅÊ" -#: src/lang.c:1818 +#: src/lang.c:1821 msgid "" "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1823 +#: src/lang.c:1826 msgid "" "Enter character to indicate selected articles. sets, cancels." msgstr "÷×ÅÄÉÔÅ ÓÉÍ×ÏÌ ÄÌÑ ÏÔÍÅÔËÉ ×ÙÂÒÁÎÎÙÈ ÓÔÁÔÅÊ. ××ÏÄ, ÏÔÍÅÎÁ." -#: src/lang.c:1824 +#: src/lang.c:1827 msgid "Character to show selected articles" msgstr "óÉÍ×ÏÌ ÄÌÑ ÏÔÍÅÔËÉ ×ÙÂÒÁÎÎÙÈ ÓÔÁÔÅÊ" -#: src/lang.c:1825 +#: src/lang.c:1828 msgid "" "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1830 +#: src/lang.c:1833 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "÷×ÅÄÉÔÅ ÓÉÍ×ÏÌ ÄÌÑ ÏÔÍÅÔËÉ ÎÏ×ÙÈ ÓÔÁÔÅÊ. ××ÏÄ, ÏÔÍÅÎÁ." -#: src/lang.c:1831 +#: src/lang.c:1834 msgid "Character to show recent articles" msgstr "óÉÍ×ÏÌ ÄÌÑ ÏÔÍÅÔËÉ ÎÏ×ÙÈ ÓÔÁÔÅÊ" -#: src/lang.c:1832 +#: src/lang.c:1835 msgid "" "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" @@ -5932,16 +5930,16 @@ msgstr "" "# óÉÍ×ÏÌ ÄÌÑ ÏÔÍÅÔËÉ ÎÏ×ÏÊ ÓÔÁÔØÉ (ÐÏ ÕÍÏÌÞÁÎÉÀ 'o')\n" "# _ ÚÁÍÅÎÑÅÔÓÑ ÎÁ ' '\n" -#: src/lang.c:1837 +#: src/lang.c:1840 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "" "÷×ÅÄÉÔÅ ÓÉÍ×ÏÌ ÄÌÑ ÏÔÍÅÔËÉ ÎÅÐÒÏÞÉÔÁÎÎÙÈ ÓÔÁÔÅÊ. ××ÏÄ, ÏÔÍÅÎÁ." -#: src/lang.c:1838 +#: src/lang.c:1841 msgid "Character to show unread articles" msgstr "óÉÍ×ÏÌ ÄÌÑ ÏÔÍÅÔËÉ ÎÅÐÒÏÞÉÔÁÎÎÙÈ ÓÔÁÔÅÊ" -#: src/lang.c:1839 +#: src/lang.c:1842 msgid "" "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" @@ -5949,16 +5947,16 @@ msgstr "" "# óÉÍ×ÏÌ ÄÌÑ ÏÔÍÅÔËÉ ÓÔÁÔØÉ ËÁË ÎÅÐÒÏÞÉÔÁÎÎÏÊ (ÐÏ ÕÍÏÌÞÁÎÉÀ '+')\n" "# _ ÚÁÍÅÎÑÅÔÓÑ ÎÁ ' '\n" -#: src/lang.c:1844 +#: src/lang.c:1847 msgid "Enter character to indicate read articles. sets, cancels." msgstr "" "÷×ÅÄÉÔÅ ÓÉÍ×ÏÌ ÄÌÑ ÏÔÍÅÔËÉ ÐÒÏÞÉÔÁÎÎÙÈ ÓÔÁÔÅÊ. ÕÓÔÁÎÏ×ÉÔØ, ÏÔÍÅÎÁ." -#: src/lang.c:1845 +#: src/lang.c:1848 msgid "Character to show read articles" msgstr "óÉÍ×ÏÌ ÄÌÑ ÏÔÍÅÔËÉ ÐÒÏÞÉÔÁÎÎÙÈ ÓÔÁÔÅÊ" -#: src/lang.c:1846 +#: src/lang.c:1849 msgid "" "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" @@ -5966,49 +5964,49 @@ msgstr "" "# óÉÍ×ÏÌ ÄÌÑ ÏÔÍÅÔËÉ ÓÔÁÔØÉ ËÁË ÐÒÏÞÉÔÁÎÎÏÊ (ÐÏ ÕÍÏÌÞÁÎÉÀ ' ')\n" "# _ ÚÁÍÅÎÑÅÔÓÑ ÎÁ ' '\n" -#: src/lang.c:1851 +#: src/lang.c:1854 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "" "÷×ÅÄÉÔÅ ÓÉÍ×ÏÌ ÄÌÑ ÏÔÍÅÔËÉ ÕÎÉÞÔÏÖÅÎÎÙÈ ÓÔÁÔÅÊ. ÕÓÔÁÎÏ×ÉÔØ, " "ÏÔÍÅÎÁ." -#: src/lang.c:1852 +#: src/lang.c:1855 msgid "Character to show killed articles" msgstr "óÉÍ×ÏÌ ÄÌÑ ÏÔÍÅÔËÉ ÕÎÉÞÔÏÖÅÎÎÙÈ ÓÔÁÔÅÊ" -#: src/lang.c:1853 +#: src/lang.c:1856 msgid "" "# Character used to show that an art was killed (default 'K')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" msgstr "" -#: src/lang.c:1858 +#: src/lang.c:1861 msgid "" "Enter character to indicate read selected articles. sets, cancels." msgstr "" -#: src/lang.c:1859 +#: src/lang.c:1862 msgid "Character to show readselected arts" msgstr "" -#: src/lang.c:1860 +#: src/lang.c:1863 msgid "" "# Character used to show that an art was selected before read (default ':')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" msgstr "" -#: src/lang.c:1866 +#: src/lang.c:1869 msgid "Abbreviate long newsgroup names" msgstr "" -#: src/lang.c:1867 +#: src/lang.c:1870 msgid "" "# If ON abbreviate (if necessary) long newsgroup names at group selection\n" "# level and article level like this:\n" "# news.software.readers -> n.software.readers -> n.s.readers -> n.s.r.\n" msgstr "" -#: src/lang.c:1873 +#: src/lang.c:1876 msgid "" "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" @@ -6016,11 +6014,11 @@ msgstr "" "0 = ÐÒÏËÒÕÔËÁ ×ÓÅÊ ÓÔÒÁÎÉÃÙ, -1 = ÐÒÅÄÙÄÕÝÁÑ ÐÏÓÌÅÄÎÑÑ ÓÔÒÏËÁ ËÁË ÐÅÒ×ÁÑ ÎÁ " "ÓÌÅÄÕÀÝÅÊ ÓÔÒÁÎÉÃÅ, -2 = ÐÏÌÓÔÒÁÎÉÃÙ" -#: src/lang.c:1874 +#: src/lang.c:1877 msgid "Number of lines to scroll in pager" msgstr "þÉÓÌÏ ÓÔÒÏË ÐÒÏËÒÕÔËÉ × ÐÅÊÄÖÅÒÅ" -#: src/lang.c:1875 +#: src/lang.c:1878 msgid "" "# Number of lines that cursor-up/down will scroll in article pager\n" "# Possible values are (the default is marked with *):\n" @@ -6031,30 +6029,30 @@ msgid "" "# 2 or greater = scroll by 2 or more lines (only in the pager)\n" msgstr "" -#: src/lang.c:1885 +#: src/lang.c:1888 msgid "Display signatures. toggles & sets." msgstr "÷Ù×ÏÄÉÔØ ÓÉÇÎÁÔÕÒÙ. <ðòïâåì> ×ÙÂÏÒ, ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:1886 +#: src/lang.c:1889 msgid "Display signatures" msgstr "÷Ù×ÏÄÉÔØ ÓÉÇÎÁÔÕÒÙ" -#: src/lang.c:1887 +#: src/lang.c:1890 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "# åÓÌÉ OFF, ÔÏ ÎÅ ×Ù×ÏÄÉÔØ ÓÉÇÎÁÔÕÒÙ ÐÒÉ ×Ù×ÏÄÅ ÓÔÁÔÅÊ\n" -#: src/lang.c:1891 +#: src/lang.c:1894 msgid "" "Display uuencoded data as tagged attachments. toggles & sets." msgstr "" "÷Ù×ÏÄÉÔØ UUE ÚÁËÏÄÉÒÏ×ÁÎÎÙÅ ÄÁÎÎÙÅ ËÁË ×ÌÏÖÅÎÉÅ. <ðòïâåì> ×ÙÂÏÒ, " "ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:1892 +#: src/lang.c:1895 msgid "Display uue data as an attachment" msgstr "÷Ù×ÏÄÉÔØ UUE ÄÁÎÎÙÅ ËÁË ×ÌÏÖÅÎÉÅ" -#: src/lang.c:1893 +#: src/lang.c:1896 msgid "" "# Handling of uuencoded data in the pager\n" "# Possible values are (the default is marked with *):\n" @@ -6066,30 +6064,30 @@ msgid "" "# be folded into a tag line.\n" msgstr "" -#: src/lang.c:1903 +#: src/lang.c:1906 msgid "" "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "" -#: src/lang.c:1904 +#: src/lang.c:1907 msgid "Display \"a as Umlaut-a" msgstr "÷Ù×ÏÄÉÔØ \"a ËÁË Umlaut-a" -#: src/lang.c:1905 +#: src/lang.c:1908 msgid "" "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" msgstr "" -#: src/lang.c:1910 src/lang.c:1920 +#: src/lang.c:1913 src/lang.c:1923 msgid "Space separated list of header fields" msgstr "óÐÉÓÏË ÐÏÌÅÊ ÚÁÇÏÌÏ×ËÁ, ÒÁÚÄÅÌ£ÎÎÙÅ ÐÒÏÂÅÌÁÍÉ" -#: src/lang.c:1911 +#: src/lang.c:1914 msgid "Display these header fields (or *)" msgstr "ðÏËÁÚÙ×ÁÔØ ÜÔÉ ÐÏÌÑ ÚÁÇÏÌÏ×ËÁ (ÉÌÉ *)" -#: src/lang.c:1912 +#: src/lang.c:1915 msgid "" "# Which news headers you wish to see. If you want to see _all_ the headers,\n" "# place an '*' as this value. This is the only way a wildcard can be used.\n" @@ -6099,11 +6097,11 @@ msgid "" "# spaces. Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1921 +#: src/lang.c:1924 msgid "Do not display these header fields" msgstr "îÅ ÐÏËÁÚÙ×ÁÔØ ÜÔÉ ÐÏÌÑ ÚÁÇÏÌÏ×ËÁ" -#: src/lang.c:1922 +#: src/lang.c:1925 msgid "" "# Same as 'news_headers_to_display' except it denotes the opposite.\n" "# An example of using both options might be if you thought X- headers were\n" @@ -6115,229 +6113,229 @@ msgid "" "# Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1932 +#: src/lang.c:1935 msgid "" "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "èÏÔÉÔÅ ×ËÌÀÞÉÔØ Á×ÔÏÍÁÔÉÞÅÓËÕÀ ÏÂÒÁÂÏÔËÕ multipart/alternative ÓÔÁÔÅÊ?" -#: src/lang.c:1933 +#: src/lang.c:1936 msgid "Skip multipart/alternative parts" msgstr "ðÒÏÐÕÓËÁÔØ multipart/alternative ÞÁÓÔÉ" -#: src/lang.c:1934 +#: src/lang.c:1937 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "" -#: src/lang.c:1938 +#: src/lang.c:1941 #, fuzzy msgid "Enable detection of verbatim blocks? toggles & sets." msgstr "" "äÏÂÁ×ÌÑÔØ ÓÉÇÎÁÔÕÒÕ ÐÒÉ ÐÏ×ÔÏÒÎÏÊ ÏÔÐÒÁ×ËÅ. <ðòïâåì> ×ÙÂÏÒ, ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:1939 +#: src/lang.c:1942 msgid "Detection of verbatim blocks" msgstr "" -#: src/lang.c:1940 +#: src/lang.c:1943 #, fuzzy msgid "# If ON detect verbatim blocks in articles\n" msgstr "" "# åÓÌÉ ON, ÔÏ ÄÅÒÖÁÔØ ×ÓÅ ÎÅÕÄÁ×ÛÉÅÓÑ ÏÔÐÒÁ×ËÉ ÓÔÁÔÅÊ × ~/dead.articles\n" -#: src/lang.c:1945 +#: src/lang.c:1948 msgid "A regex used to decide which lines to show in col_quote." msgstr "" -#: src/lang.c:1946 +#: src/lang.c:1949 msgid "Regex used to show quoted lines" msgstr "çÅÇ. ×ÙÒ. ÃÉÔÉÒÕÅÍÙÈ ÓÔÒÏË" -#: src/lang.c:1947 +#: src/lang.c:1950 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# quoted when viewing articles. Quoted lines are shown in col_quote.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1953 +#: src/lang.c:1956 msgid "A regex used to decide which lines to show in col_quote2." msgstr "" -#: src/lang.c:1954 +#: src/lang.c:1957 msgid "Regex used to show twice quoted l." msgstr "òÅÇ. ×ÙÒ. ÄÌÑ Ä×ÁÖÄÙ ÃÉÔÉÒÕÅÍÙÈ ÓÔÒÏË" -#: src/lang.c:1955 +#: src/lang.c:1958 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# quoted twice. Twice quoted lines are shown in col_quote2.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1961 +#: src/lang.c:1964 msgid "A regex used to decide which lines to show in col_quote3." msgstr "" -#: src/lang.c:1962 +#: src/lang.c:1965 msgid "Regex used to show >= 3 times q.l." msgstr "òÅÇ. ×ÙÒ. ÄÌÑ ÃÉÔÉÒÕÅÍÙÈ ÓÔÒÏË >= 3 ÒÁÚ" -#: src/lang.c:1963 +#: src/lang.c:1966 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# quoted >=3 times. >=3 times quoted lines are shown in col_quote3.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1969 +#: src/lang.c:1972 #, fuzzy msgid "Enable detection of external quotes? toggles & sets." msgstr "" "äÏÂÁ×ÌÑÔØ ÓÉÇÎÁÔÕÒÕ ÐÒÉ ÐÏ×ÔÏÒÎÏÊ ÏÔÐÒÁ×ËÅ. <ðòïâåì> ×ÙÂÏÒ, ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:1970 +#: src/lang.c:1973 msgid "Detection of external quotes" msgstr "" -#: src/lang.c:1971 +#: src/lang.c:1974 #, fuzzy msgid "# If ON detect quoted text from external sources in articles\n" msgstr "" "# åÓÌÉ ON, ÔÏ ÄÅÒÖÁÔØ ×ÓÅ ÎÅÕÄÁ×ÛÉÅÓÑ ÏÔÐÒÁ×ËÉ ÓÔÁÔÅÊ × ~/dead.articles\n" -#: src/lang.c:1975 +#: src/lang.c:1978 msgid "A regex used to decide which lines to show in col_extquote." msgstr "" -#: src/lang.c:1976 +#: src/lang.c:1979 #, fuzzy msgid "Regex used to show quotes from external sources" msgstr "çÅÇ. ×ÙÒ. ÃÉÔÉÒÕÅÍÙÈ ÓÔÒÏË" -#: src/lang.c:1977 +#: src/lang.c:1980 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# external quotes. Text from external quotes is shown in col_extquote.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1984 +#: src/lang.c:1987 msgid "A regex used to decide which words to show in col_markslashes." msgstr "" -#: src/lang.c:1985 +#: src/lang.c:1988 msgid "Regex used to highlight /slashes/" msgstr "òÅÇ. ×ÙÒ. ÄÌÑ ×ÙÄÅÌÅÎÉÑ /ÔÅËÓÔÁ/" -#: src/lang.c:1986 +#: src/lang.c:1989 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '/' are to be shown in col_markslashes.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1992 +#: src/lang.c:1995 msgid "A regex used to decide which words to show in col_markstars." msgstr "" -#: src/lang.c:1993 +#: src/lang.c:1996 msgid "Regex used to highlight *stars*" msgstr "òÅÇ. ×ÙÒ. ÄÌÑ ×ÙÄÅÌÅÎÉÑ *ÔÅËÓÔÁ*" -#: src/lang.c:1994 +#: src/lang.c:1997 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '*' are to be shown in col_markstars.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:2000 +#: src/lang.c:2003 msgid "A regex used to decide which words to show in col_markstroke." msgstr "" -#: src/lang.c:2001 +#: src/lang.c:2004 msgid "Regex used to highlight -strokes-" msgstr "òÅÇ. ×ÙÒ. ÄÌÑ ×ÙÄÅÌÅÎÉÑ -ÔÅËÓÔÁ-" -#: src/lang.c:2002 +#: src/lang.c:2005 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '-' are to be shown in col_markstroke.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:2008 +#: src/lang.c:2011 msgid "A regex used to decide which words to show in col_markdash." msgstr "" -#: src/lang.c:2009 +#: src/lang.c:2012 msgid "Regex used to highlight _underline_" msgstr "òÅÇ. ×ÙÒ. ÄÌÑ ×ÙÄÅÌÅÎÉÑ _ÔÅËÓÔÁ_" -#: src/lang.c:2010 +#: src/lang.c:2013 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '_' are to be shown in col_markdash.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:2016 +#: src/lang.c:2019 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:2017 +#: src/lang.c:2020 msgid "Regex with Subject prefixes" msgstr "" -#: src/lang.c:2018 +#: src/lang.c:2021 msgid "" "# A regular expression that tin will use to find Subject prefixes\n" "# which will be removed before showing the header.\n" msgstr "" -#: src/lang.c:2023 +#: src/lang.c:2026 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:2024 +#: src/lang.c:2027 msgid "Regex with Subject suffixes" msgstr "" -#: src/lang.c:2025 +#: src/lang.c:2028 msgid "" "# A regular expression that tin will use to find Subject suffixes\n" "# which will be removed when replying or posting followup.\n" msgstr "" -#: src/lang.c:2030 +#: src/lang.c:2033 msgid "A regex used to find the begin of a verbatim block." msgstr "" -#: src/lang.c:2031 +#: src/lang.c:2034 msgid "Regex for begin of a verbatim block" msgstr "" -#: src/lang.c:2032 +#: src/lang.c:2035 msgid "" "# A regular expression that tin will use to find the begin of\n" "# a verbatim block.\n" msgstr "" -#: src/lang.c:2037 +#: src/lang.c:2040 msgid "A regex used to find the end of a verbatim block." msgstr "" -#: src/lang.c:2038 +#: src/lang.c:2041 msgid "Regex for end of a verbatim block" msgstr "" -#: src/lang.c:2039 +#: src/lang.c:2042 msgid "" "# A regular expression that tin will use to find the end of\n" "# a verbatim block.\n" msgstr "" -#: src/lang.c:2044 +#: src/lang.c:2047 msgid "" "Enter name and options for external MIME viewer, --internal for built-in " "viewer" @@ -6345,145 +6343,145 @@ msgstr "" "÷×ÅÄÉÔÅ ÉÍÑ É ÏÐÃÉÉ ÄÌÑ ×ÎÅÛÎÅÇÏ ÐÒÏÓÍÏÔÒ. MIME, --internal ÄÌÑ ×ÓÔÒÏÅÎÎÏÇÏ " "ÐÒÏÓÍÏÔÒ." -#: src/lang.c:2045 +#: src/lang.c:2048 msgid "MIME binary content viewer" msgstr "ðÒÏÓÍÏÔÏÒÝÉË ÓÏÄÅÒÖÉÍÏÇÏ Ä×ÏÉÞÎÏÇÏ MIME" -#: src/lang.c:2046 +#: src/lang.c:2049 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 " +"# Otherwise specify an external viewer program (eg. metamail) or leave " "blank\n" "# for no automatic viewing\n" msgstr "" -#: src/lang.c:2053 +#: src/lang.c:2056 msgid "Confirm before starting non-text viewing program" msgstr "ðÏÄÔ×ÅÒÖÄÁÔØ ÓÔÁÒÔ ÐÒÏÓÍÏÔÏÒÝÉËÁ ÎÅÔÅËÓÔÏ×ÏÊ ÉÎÆÏÒÍÁÃÉÉ" -#: src/lang.c:2054 +#: src/lang.c:2057 msgid "Ask before using MIME viewer" msgstr "óÐÒÏÓÉÔØ Ï ÉÓÐÏÌ. ÐÒÏÓÍÏÔÒ. MIME" -#: src/lang.c:2055 +#: src/lang.c:2058 msgid "" "# If ON tin will ask before using metamail to display MIME messages\n" "# this only happens if metamail_prog is set to something\n" msgstr "" -#: src/lang.c:2060 +#: src/lang.c:2063 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "" "óÐÒÏÓÉÔØ Ï ÏÔÍÅÔËÅ ÇÒÕÐÐ ËÁË ÐÒÏÞÉÔ. ÐÒÉ ×ÙÈÏÄÅ. <ðòïâåì> ×ÙÂÏÒ, " "ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:2061 +#: src/lang.c:2064 msgid "Catchup read groups when quitting" msgstr "" -#: src/lang.c:2062 +#: src/lang.c:2065 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "" "# åÓÌÉ ON, ÔÏ ÓÐÒÏÓÉÔØ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÏÌÖÎÙ ÌÉ ÂÙÔØ ×ÓÅ ÇÒÕÐÐÙ\n" "# ÐÏÍÅÞÅÎÙ ËÁË ÐÒÏÞÔ£ÎÎÙÅ.\n" -#: src/lang.c:2067 +#: src/lang.c:2070 msgid "Catchup group using left key" msgstr "" -#: src/lang.c:2068 +#: src/lang.c:2071 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "" -#: src/lang.c:2073 +#: src/lang.c:2076 msgid "Catchup thread by using left key" msgstr "" -#: src/lang.c:2079 +#: src/lang.c:2082 msgid "Which actions require confirmation" msgstr "ëÁËÉÅ ÄÅÊÓÔ×ÉÑ ÔÒÅÂÕÀÔ ÐÏÄÔ×ÅÒÖÄÅÎÉÑ" -#: src/lang.c:2080 +#: src/lang.c:2083 msgid "# What should we ask confirmation for.\n" msgstr "# ëÁËÉÅ ÄÅÊÓÔ×ÉÑ ÔÒÅÂÕÀÔ ÐÏÄÔ×ÅÒÖÄÅÎÉÑ.\n" -#: src/lang.c:2085 +#: src/lang.c:2088 msgid "'Mark as (un)read' ignores tags" msgstr "" -#: src/lang.c:2086 +#: src/lang.c:2089 msgid "" "# If ON the 'Mark as (un)read' function marks only the current article.\n" msgstr "" -#: src/lang.c:2090 +#: src/lang.c:2093 #, fuzzy msgid "Program to run to open URLs, sets, cancels." msgstr "ðÒÏÇÒÁÍÍÙ ÄÌÑ ÏÔËÒÙÔÉÑ URL. ÕÓÔÁÎÏ×ÉÔØ, ÏÔÍÅÎÁ" -#: src/lang.c:2091 +#: src/lang.c:2094 #, fuzzy msgid "Program that opens URLs" msgstr "ðÒÏÇÒÁÍÍÁ ÄÌÑ ÏÔËÒÙÔÉÑ URL" -#: src/lang.c:2092 +#: src/lang.c:2095 #, fuzzy msgid "# The program used to open URLs. The actual URL will be appended\n" msgstr "# ðÒÏÇÒÁÍÍÁ ÄÌÑ ÏÔËÒÙÔÉÑ URL. óÁÍ URL ÂÕÄÅÔ ÄÏÂÁ×ÌÅÎ × ËÏÎÅÃ\n" -#: src/lang.c:2097 +#: src/lang.c:2100 msgid "Use mouse in xterm" msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÍÙÛØ × xterm" -#: src/lang.c:2098 +#: src/lang.c:2101 msgid "# If ON enable mouse button support on xterm terminals\n" msgstr "# åÓÌÉ ON, ÔÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÍÙÛØ × xterm ÔÅÒÍÉÎÁÌÁÈ\n" -#: src/lang.c:2104 +#: src/lang.c:2107 msgid "Use scroll keys on keypad" msgstr "éÓÐÏÌØÚÏ×ÁÔØ ËÌÁ×ÉÛÉ ÐÒÏËÒÕÔËÉ ÎÁ keypad" -#: src/lang.c:2105 +#: src/lang.c:2108 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "# åÓÌÉ ON, ÔÏ ÉÓÐÏÌØÚÏ×ÁÔØ ËÌÁ×ÉÛÉ ÐÒÏËÒÕÔËÉ ÎÁ ÎÅËÏÔÏÒÙÈ ÔÅÒÍÉÎÁÌÁÈ\n" -#: src/lang.c:2110 +#: src/lang.c:2113 msgid "Enter maximum number of article to get. sets." msgstr "÷×ÅÄÉÔÅ ÍÁËÓÉÍÁÌØÎÏÅ ÞÉÓÌÏ ÓÔÁÔÅÊ ÄÌÑ ÚÁÇÒÕÚËÉ. ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:2111 +#: src/lang.c:2114 msgid "Number of articles to get" msgstr "þÉÓÌÏ ÓÔÁÔÅÊ ÄÌÑ ÚÁÇÒÕÚËÉ" -#: src/lang.c:2112 +#: src/lang.c:2115 msgid "" "# Number of articles to get (0=no limit), if negative sets maximum number\n" "# of already read articles to be read before first unread one\n" msgstr "" -#: src/lang.c:2117 +#: src/lang.c:2120 msgid "Enter number of days article is considered recent. sets." msgstr "÷×ÅÄÉÔÅ ÞÉÓÌÏ ÄÎÅÊ, ÐÏËÁ ÓÔÁÔØÑ ÓÞÉÔÁÅÔÓÑ ÎÏ×ÏÊ. ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:2118 +#: src/lang.c:2121 msgid "Article recentness time limit" msgstr "ìÉÍÉÔ ×ÒÅÍÅÎÉ ÄÌÑ ÎÏ×ÙÈ ÓÔÁÔÅÊ" -#: src/lang.c:2119 +#: src/lang.c:2122 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "# þÉÓÌÏ ÄÎÅÊ, ÐÏËÁ ÓÔÁÔØÑ ÓÞÉÔÁÅÔÓÑ ÎÏ×ÏÊ. (0=OFF)\n" -#: src/lang.c:2123 +#: src/lang.c:2126 msgid "" "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "WILDMAT ÄÌÑ ÏÂÙÞÎÙÈ ÛÁÂÌÏÎÏ×, REGEX ÄÌÑ ÒÅÇÕÌÑÒÎÙÈ ×ÙÒÁÖÅÎÉÊ" -#: src/lang.c:2124 +#: src/lang.c:2127 msgid "Wildcard matching" msgstr "ôÉÐ ÛÁÂÌÏÎÁ" -#: src/lang.c:2125 +#: src/lang.c:2128 msgid "" "# Wildcard matching\n" "# Possible values are (the default is marked with *):\n" @@ -6495,59 +6493,59 @@ msgstr "" "# * 0 = wildmat\n" "# 1 = regex\n" -#: src/lang.c:2132 +#: src/lang.c:2135 msgid "Enter minimal score before an article is marked killed. sets." msgstr "" -#: src/lang.c:2133 +#: src/lang.c:2136 msgid "Score limit (kill)" msgstr "" -#: src/lang.c:2134 +#: src/lang.c:2137 msgid "# Score limit before an article is marked killed\n" msgstr "" -#: src/lang.c:2138 +#: src/lang.c:2141 msgid "Enter default score to kill articles. sets." msgstr "" -#: src/lang.c:2139 +#: src/lang.c:2142 msgid "Default score to kill articles" msgstr "" -#: src/lang.c:2140 +#: src/lang.c:2143 msgid "# Default score to kill articles\n" msgstr "" -#: src/lang.c:2144 +#: src/lang.c:2147 msgid "Enter minimal score before an article is marked hot. sets." msgstr "" -#: src/lang.c:2145 +#: src/lang.c:2148 msgid "Score limit (select)" msgstr "" -#: src/lang.c:2146 +#: src/lang.c:2149 msgid "# Score limit before an article is marked hot\n" msgstr "" -#: src/lang.c:2150 +#: src/lang.c:2153 msgid "Enter default score to select articles. sets." msgstr "" -#: src/lang.c:2151 +#: src/lang.c:2154 msgid "Default score to select articles" msgstr "" -#: src/lang.c:2152 +#: src/lang.c:2155 msgid "# Default score to select articles\n" msgstr "" -#: src/lang.c:2158 +#: src/lang.c:2161 msgid "Use slrnface to show ''X-Face:''s" msgstr "éÓÐÏÌØÚÏ×ÁÔØ slrnface ÄÌÑ ÐÏËÁÚÁ X_Face:" -#: src/lang.c:2159 +#: src/lang.c:2162 msgid "" "# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n" "# Only useful when running in an xterm.\n" @@ -6555,19 +6553,19 @@ msgstr "" "# åÓÌÉ ON, ÔÏ ÉÓÐÏÌØÚÏ×ÁÔØ slrnface(1) ÄÌÑ ÉÎÔÅÒÐÒÅÔÉÒÏ×ÁÎÉÑ\n" "# ÚÁÇÏÌÏ×ËÁ X-Face. ðÏÌØÚÎÏ ÔÏÌØËÏ ÐÏÄ xterm.\n" -#: src/lang.c:2167 +#: src/lang.c:2170 msgid "Use ANSI color" msgstr "éÓÐÏÌØÚÏ×ÁÔØ Ã×ÅÔ ANSI" -#: src/lang.c:2168 +#: src/lang.c:2171 msgid "# If ON using ANSI-color\n" msgstr "# åÓÌÉ ON, ÔÏ ÉÓÐÏÌØÚÏ×ÁÔØ Ã×ÅÔ ANSI\n" -#: src/lang.c:2173 +#: src/lang.c:2176 msgid "Standard foreground color" msgstr "óÔÁÎÄÁÒÔÎÙÊ Ã×ÅÔ ÓÉÍ×ÏÌÏ×" -#: src/lang.c:2174 +#: src/lang.c:2177 msgid "" "# Standard foreground color\n" "# Default: -1 (default color)\n" @@ -6575,11 +6573,11 @@ msgstr "" "# óÔÁÎÄÁÒÔÎÙÊ Ã×ÅÔ ÓÉÍ×ÏÌÏ×\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: -1 (Ã×ÅÔ ÐÏ ÕÍÏÌÞÁÎÉÀ)\n" -#: src/lang.c:2180 +#: src/lang.c:2183 msgid "Standard background color" msgstr "óÔÁÎÄÁÒÔÎÙÊ Ã×ÅÔ ÆÏÎÁ" -#: src/lang.c:2181 +#: src/lang.c:2184 msgid "" "# Standard background color\n" "# Default: -1 (default color)\n" @@ -6587,11 +6585,11 @@ msgstr "" "# óÔÁÎÄÁÒÔÎÙÊ Ã×ÅÔ ÆÏÎÁ\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: -1 (Ã×ÅÔ ÐÏ ÕÍÏÌÞÁÎÉÀ)\n" -#: src/lang.c:2187 +#: src/lang.c:2190 msgid "Color for inverse text (background)" msgstr "ã×ÅÔ ÄÌÑ ÉÎ×ÅÒÓÎÏÇÏ ÔÅËÓÔÁ (ÆÏÎ)" -#: src/lang.c:2188 +#: src/lang.c:2191 msgid "" "# Color of background for inverse text\n" "# Default: 4 (blue)\n" @@ -6599,11 +6597,11 @@ msgstr "" "# ã×ÅÔ ÆÏÎÁ ÄÌÑ ÉÎ×ÅÒÓÎÏÇÏ ÔÅËÓÔÁ\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 4 (ÓÉÎÉÊ)\n" -#: src/lang.c:2194 +#: src/lang.c:2197 msgid "Color for inverse text (foreground)" msgstr "ã×ÅÔ ÄÌÑ ÉÎ×ÅÒÓÎÏÇÏ ÔÅËÓÔÁ (ÓÉÍ×ÏÌÙ)" -#: src/lang.c:2195 +#: src/lang.c:2198 msgid "" "# Color of foreground for inverse text\n" "# Default: 7 (white)\n" @@ -6611,11 +6609,11 @@ msgstr "" "# ã×ÅÔ ÄÌÑ ÉÎ×ÅÒÓÎÏÇÏ ÔÅËÓÔÁ (ÓÉÍ×ÏÌÙ)\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 7 (ÂÅÌÙÊ)\n" -#: src/lang.c:2201 +#: src/lang.c:2204 msgid "Color of text lines" msgstr "ã×ÅÔ ÔÅËÓÔÏ×ÙÈ ÓÔÒÏË" -#: src/lang.c:2202 +#: src/lang.c:2205 msgid "" "# Color of text lines\n" "# Default: -1 (default color)\n" @@ -6623,11 +6621,11 @@ msgstr "" "# ã×ÅÔ ÔÅËÓÔÏ×ÙÈ ÓÔÒÏË\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: -1 (Ã×ÅÔ ÐÏ ÕÍÏÌÞÁÎÉÀ)\n" -#: src/lang.c:2208 +#: src/lang.c:2211 msgid "Color of mini help menu" msgstr "ã×ÅÔ ÔÅËÓÔÁ ÍÅÎÀ ÍÉÎÉ-ÐÏÍÏÝÉ" -#: src/lang.c:2209 +#: src/lang.c:2212 msgid "" "# Color of mini help menu\n" "# Default: 3 (brown)\n" @@ -6635,11 +6633,11 @@ msgstr "" "# ã×ÅÔ ÔÅËÓÔÁ ÍÉÎÉ-ÐÏÍÏÝÉ\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 3 (ËÏÒÉÞÎÅ×ÙÊ)\n" -#: src/lang.c:2215 +#: src/lang.c:2218 msgid "Color of help text" msgstr "ã×ÅÔ ÔÅËÓÔÁ ÐÏÍÏÝÉ" -#: src/lang.c:2216 +#: src/lang.c:2219 msgid "" "# Color of help pages\n" "# Default: -1 (default color)\n" @@ -6647,21 +6645,21 @@ msgstr "" "# ã×ÅÔ ÔÅËÓÔÁ ÐÏÍÏÝÉ\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: -1 (Ã×ÅÔ ÐÏ ÕÍÏÌÞÁÎÉÀ)\n" -#: src/lang.c:2222 +#: src/lang.c:2225 msgid "Color of status messages" msgstr "ã×ÅÔ ÓÔÁÔÕÓÎÙÈ ÓÏÏÂÝÅÎÉÊ" -#: src/lang.c:2223 +#: src/lang.c:2226 msgid "" "# Color of messages in last line\n" "# Default: 6 (cyan)\n" msgstr "" -#: src/lang.c:2229 +#: src/lang.c:2232 msgid "Color of quoted lines" msgstr "ã×ÅÔ ÃÉÔÉÒÕÅÍÙÈ ÓÔÒÏË" -#: src/lang.c:2230 +#: src/lang.c:2233 msgid "" "# Color of quote-lines\n" "# Default: 2 (green)\n" @@ -6669,11 +6667,11 @@ msgstr "" "# ã×ÅÔ ÃÉÔÉÒÕÅÍÙÈ ÓÔÒÏË\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 2 (ÚÅÌ£ÎÙÊ)\n" -#: src/lang.c:2236 +#: src/lang.c:2239 msgid "Color of twice quoted line" msgstr "ã×ÅÔ Ä×ÁÖÄÙ ÃÉÔÉÒÕÅÍÙÈ ÓÔÒÏË" -#: src/lang.c:2237 +#: src/lang.c:2240 msgid "" "# Color of twice quoted lines\n" "# Default: 3 (brown)\n" @@ -6681,11 +6679,11 @@ msgstr "" "# ã×ÅÔ Ä×ÁÖÄÙ ÃÉÔÉÒÕÅÍÙÈ ÓÔÒÏË\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 3 (ËÏÒÉÞÎÅ×ÙÊ)\n" -#: src/lang.c:2243 +#: src/lang.c:2246 msgid "Color of =>3 times quoted line" msgstr "ã×ÅÔ >=3 ÃÉÔÉÒÕÅÍÙÈ ÓÔÒÏË" -#: src/lang.c:2244 +#: src/lang.c:2247 msgid "" "# Color of >=3 times quoted lines\n" "# Default: 4 (blue)\n" @@ -6693,11 +6691,11 @@ msgstr "" "# ã×ÅÔ >=3 ÃÉÔÉÒÕÅÍÙÈ ÓÔÒÏË\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 4 (ÓÉÎÉÊ)\n" -#: src/lang.c:2250 +#: src/lang.c:2253 msgid "Color of article header lines" msgstr "ã×ÅÔ ÓÔÒÏË ÚÁÇÏÌÏ×ËÏ× ÓÔÁÔØÉ" -#: src/lang.c:2251 +#: src/lang.c:2254 msgid "" "# Color of header-lines\n" "# Default: 2 (green)\n" @@ -6705,11 +6703,11 @@ msgstr "" "# ã×ÅÔ ÓÔÒÏË ÚÁÇÏÌÏ×ËÁ\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 2 (ÚÅÌ£ÎÙÊ)\n" -#: src/lang.c:2257 +#: src/lang.c:2260 msgid "Color of actual news header fields" msgstr "ã×ÅÔ ÓÔÒÏË news ÚÁÇÏÌÏ×ËÏ× ÓÔÁÔÅÊ" -#: src/lang.c:2258 +#: src/lang.c:2261 msgid "" "# Color of actual news header fields\n" "# Default: 9 (light red)\n" @@ -6717,11 +6715,11 @@ msgstr "" "# ã×ÅÔ ÓÔÒÏË news ÚÁÇÏÌÏ×ËÏ× ÓÔÁÔÅÊ\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 9 (Ó×ÅÔÌÏ-ËÒÁÓÎÙÊ)\n" -#: src/lang.c:2264 +#: src/lang.c:2267 msgid "Color of article subject lines" msgstr "ã×ÅÔ ÓÔÒÏË Ó ÔÅÍÏÊ ÓÔÁÔØÉ" -#: src/lang.c:2265 +#: src/lang.c:2268 msgid "" "# Color of article subject\n" "# Default: 6 (cyan)\n" @@ -6729,12 +6727,12 @@ msgstr "" "# ã×ÅÔ ÓÔÒÏËÉ Ó ÔÅÍÏÊ ÓÔÁÔØÉ\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 6 (ÇÏÌÕÂÏÊ)\n" -#: src/lang.c:2271 +#: src/lang.c:2274 #, fuzzy msgid "Color of external quotes" msgstr "ã×ÅÔ ÔÅËÓÔÏ×ÙÈ ÓÔÒÏË" -#: src/lang.c:2272 +#: src/lang.c:2275 #, fuzzy msgid "" "# Color of quoted text from external sources\n" @@ -6743,11 +6741,11 @@ msgstr "" "# ã×ÅÔ ÓÔÒÏËÉ Ó ÔÅÍÏÊ ÓÔÁÔØÉ\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 6 (ÇÏÌÕÂÏÊ)\n" -#: src/lang.c:2278 +#: src/lang.c:2281 msgid "Color of response counter" msgstr "ã×ÅÔ ÓÞÅÔÞÉËÁ ËÏÌÉÞÅÓÔ×Á ÏÔ×ÅÔÏ×" -#: src/lang.c:2279 +#: src/lang.c:2282 msgid "" "# Color of response counter\n" "# Default: 2 (green)\n" @@ -6755,11 +6753,11 @@ msgstr "" "# ã×ÅÔ ÓÞÅÔÞÉËÁ ËÏÌÉÞÅÓÔ×Á ÏÔ×ÅÔÏ×\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 2 (ÚÅÌ£ÎÙÊ)\n" -#: src/lang.c:2285 +#: src/lang.c:2288 msgid "Color of sender (From:)" msgstr "ã×ÅÔ ÓÔÒÏËÉ ÏÔÐÒÁ×ÉÔÅÌÑ From:" -#: src/lang.c:2286 +#: src/lang.c:2289 msgid "" "# Color of sender (From:)\n" "# Default: 2 (green)\n" @@ -6767,11 +6765,11 @@ msgstr "" "# ã×ÅÔ ÓÔÒÏËÉ ÏÔÐÒÁ×ÉÔÅÌÑ (From:)\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 2 (ÚÅÌ£ÎÙÊ)\n" -#: src/lang.c:2292 +#: src/lang.c:2295 msgid "Color of help/mail sign" msgstr "ã×ÅÔ ÓÏÏÂÝÅÎÉÑ Ï ×ÙÚÏ×Å ÐÏÍÏÝÉ" -#: src/lang.c:2293 +#: src/lang.c:2296 msgid "" "# Color of Help/Mail-Sign\n" "# Default: 4 (blue)\n" @@ -6779,11 +6777,11 @@ msgstr "" "# ã×ÅÔ Help/Mail-Sign\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 4 (ÓÉÎÉÊ)\n" -#: src/lang.c:2299 +#: src/lang.c:2302 msgid "Color of signatures" msgstr "ã×ÅÔ ÓÉÇÎÁÔÕÒ" -#: src/lang.c:2300 +#: src/lang.c:2303 msgid "" "# Color of signature\n" "# Default: 4 (blue)\n" @@ -6791,11 +6789,11 @@ msgstr "" "# ã×ÅÔ ÓÉÇÎÁÔÕÒ\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 4 (ÓÉÎÉÊ)\n" -#: src/lang.c:2306 +#: src/lang.c:2309 msgid "Color of highlighted URLs" msgstr "ã×ÅÔ ÐÏÄÓ×ÅÞÉ×ÁÎÉÑ URL" -#: src/lang.c:2307 +#: src/lang.c:2310 msgid "" "# Color of highlighted URLs\n" "# Default: -1 (default color)\n" @@ -6803,12 +6801,12 @@ msgstr "" "# ã×ÅÔ ÐÏÄÓ×ÅÞÉ×ÁÎÉÑ URL\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: -1 (Ã×ÅÔ ÐÏ ÕÍÏÌÞÁÎÉÀ)\n" -#: src/lang.c:2313 +#: src/lang.c:2316 #, fuzzy msgid "Color of verbatim blocks" msgstr "ã×ÅÔ ÔÅËÓÔÏ×ÙÈ ÓÔÒÏË" -#: src/lang.c:2314 +#: src/lang.c:2317 #, fuzzy msgid "" "# Color of verbatim blocks\n" @@ -6817,11 +6815,11 @@ msgstr "" "# ã×ÅÔ ÓÔÒÏËÉ Ó ÔÅÍÏÊ ÓÔÁÔØÉ\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 6 (ÇÏÌÕÂÏÊ)\n" -#: src/lang.c:2320 +#: src/lang.c:2323 msgid "Color of highlighting with *stars*" msgstr "ã×ÅÔ ×ÙÄÅÌÅÎÎÏÇÏ *ÔÅËÓÔÁ*" -#: src/lang.c:2321 +#: src/lang.c:2324 msgid "" "# Color of word highlighting with *stars*\n" "# Default: 11 (yellow)\n" @@ -6829,11 +6827,11 @@ msgstr "" "# ã×ÅÔ ÄÌÑ ×ÙÄÅÌÅÎÎÏÇÏ *ÔÅËÓÔÁ*\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 11 (Ö£ÌÔÙÊ)\n" -#: src/lang.c:2327 +#: src/lang.c:2330 msgid "Color of highlighting with _dash_" msgstr "ã×ÅÔ ×ÙÄÅÌÅÎÎÏÇÏ _ÔÅËÓÔÁ_" -#: src/lang.c:2328 +#: src/lang.c:2331 msgid "" "# Color of word highlighting with _dash_\n" "# Default: 13 (light pink)\n" @@ -6841,11 +6839,11 @@ msgstr "" "# ã×ÅÔ ÄÌÑ ×ÙÄÅÌÅÎÎÏÇÏ _ÔÅËÓÔÁ_\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 13 (Ó×ÅÔÌÏ-ÒÏÚÏ×ÙÊ)\n" -#: src/lang.c:2334 +#: src/lang.c:2337 msgid "Color of highlighting with /slash/" msgstr "ã×ÅÔ ×ÙÄÅÌÅÎÎÏÇÏ /ÔÅËÓÔÁ/" -#: src/lang.c:2335 +#: src/lang.c:2338 msgid "" "# Color of word highlighting with /slash/\n" "# Default: 14 (light cyan)\n" @@ -6853,11 +6851,11 @@ msgstr "" "# ã×ÅÔ ÄÌÑ ×ÙÄÅÌÅÎÉÑ /ÔÅËÓÔÁ/\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 14 (Ó×ÅÔÌÏ-ÇÏÌÕÂÏÊ)\n" -#: src/lang.c:2341 +#: src/lang.c:2344 msgid "Color of highlighting with -stroke-" msgstr "ã×ÅÔ ×ÙÄÅÌÅÎÎÏÇÏ -ÔÅËÓÔÁ-" -#: src/lang.c:2342 +#: src/lang.c:2345 msgid "" "# Color of word highlighting with -stroke-\n" "# Default: 12 (light blue)\n" @@ -6865,11 +6863,11 @@ msgstr "" "# ã×ÅÔ ÄÌÑ ×ÙÄÅÌÅÎÉÑ -ÔÅËÓÔÁ-\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 12 (Ó×ÅÔÌÏ-ÓÉÎÉÊ)\n" -#: src/lang.c:2349 +#: src/lang.c:2352 msgid "Attr. of highlighting with *stars*" msgstr "áÔÒÉÂÕÔ ×ÙÄÅÌÅÎÎÏÇÏ *ÔÅËÓÔÁ*" -#: src/lang.c:2350 +#: src/lang.c:2353 msgid "" "# Attributes of word highlighting on mono terminals\n" "# Possible values are:\n" @@ -6897,11 +6895,11 @@ msgstr "" "# áÔÒÉÂÕÔ ÄÌÑ ×ÙÄÅÌÅÎÎÏÇÏ *ÔÅËÓÔÁ*\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 6 (bold)\n" -#: src/lang.c:2365 +#: src/lang.c:2368 msgid "Attr. of highlighting with _dash_" msgstr "áÔÒÉÂÕÔ ×ÙÄÅÌÅÎÎÏÇÏ _ÔÅËÓÔÁ_" -#: src/lang.c:2366 +#: src/lang.c:2369 msgid "" "# Attribute of word highlighting with _dash_\n" "# Default: 2 (best highlighting)\n" @@ -6909,11 +6907,11 @@ msgstr "" "# áÔÒÉÂÕÔ ×ÙÄÅÌÅÎÎÏÇÏ _ÔÅËÓÔÁ_\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 2 (ÌÕÞÛÅÅ ÐÏÄÓ×ÅÞÉ×ÁÎÉÅ)\n" -#: src/lang.c:2372 +#: src/lang.c:2375 msgid "Attr. of highlighting with /slash/" msgstr "áÔÒÉÂÕÔ ×ÙÄÅÌÅÎÎÏÇÏ /ÔÅËÓÔÁ/" -#: src/lang.c:2373 +#: src/lang.c:2376 msgid "" "# Attribute of word highlighting with /slash/\n" "# Default: 5 (half bright)\n" @@ -6921,11 +6919,11 @@ msgstr "" "# áÔÒÉÂÕÔ ÄÌÑ ×ÙÄÅÌÅÎÉÑ /ÔÅËÓÔÁ/\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 5 (half bright)\n" -#: src/lang.c:2379 +#: src/lang.c:2382 msgid "Attr. of highlighting with -stroke-" msgstr "áÔÒÉÂÕÔ ×ÙÄÅÌÅÎÎÏÇÏ -ÔÅËÓÔÁ-" -#: src/lang.c:2380 +#: src/lang.c:2383 msgid "" "# Attribute of word highlighting with -stroke-\n" "# Default: 3 (reverse video)\n" @@ -6933,27 +6931,27 @@ msgstr "" "# áÔÒÉÂÕÔ ×ÙÄÅÌÅÎÎÏÇÏ -ÔÅËÓÔÁ-\n" "# ðÏ ÕÍÏÌÞÁÎÉÀ: 3 (ÒÅ×ÅÒÓÎÏÅ ×ÉÄÅÏ)\n" -#: src/lang.c:2386 +#: src/lang.c:2389 msgid "URL highlighting in message body" msgstr "ðÏÄÓ×ÅÞÉ×ÁÔØ URL × ÔÅÌÅ ÐÉÓØÍÁ" -#: src/lang.c:2387 +#: src/lang.c:2390 msgid "# Enable URL highlighting?\n" msgstr "# ÷ËÌÀÞÉÔØ ÐÏÄÓ×ÅÔËÕ URL?\n" -#: src/lang.c:2392 +#: src/lang.c:2395 msgid "Word highlighting in message body" msgstr "ðÏÄÓ×ÅÞÉ×ÁÔØ ÓÌÏ×Á × ÔÅÌÅ ÓÏÏÂÝÅÎÉÑ" -#: src/lang.c:2393 +#: src/lang.c:2396 msgid "# Enable word highlighting?\n" msgstr "# ÷ËÌÀÞÉÔØ ÐÏÄÓ×ÅÔËÕ ÓÌÏ×?\n" -#: src/lang.c:2398 +#: src/lang.c:2401 msgid "What to display instead of mark" msgstr "÷Ù×ÏÄÉÔØ ×ÍÅÓÔÏ ÏÔÍÅÔËÉ" -#: src/lang.c:2399 +#: src/lang.c:2402 msgid "" "# Should the leading and ending stars and dashes also be displayed,\n" "# even when they are highlighting marks?\n" @@ -6963,58 +6961,58 @@ msgid "" "# * 2 = print a space instead\n" msgstr "" -#: src/lang.c:2408 +#: src/lang.c:2411 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "÷×ÅÄÉÔÅ ÍÁËÓ. ÞÉÓÌÏ ÓÉÍ×ÏÌÏ× × ÓÔÒÏËÅ × ÐÅÊÄÖÅÒÅ. ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:2409 +#: src/lang.c:2412 msgid "Page line wrap column" msgstr "íÁËÓ. ÞÉÓÌÏ ÓÉÍ×ÏÌÏ× × ÓÔÒÏËÅ × ÐÅÊÄÖÅÒÅ" -#: src/lang.c:2410 +#: src/lang.c:2413 msgid "# Wrap article lines at column\n" msgstr "" -#: src/lang.c:2415 +#: src/lang.c:2418 msgid "Wrap around threads on next unread" msgstr "" -#: src/lang.c:2416 +#: src/lang.c:2419 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "" -#: src/lang.c:2420 +#: src/lang.c:2423 msgid "Enter default mail address (and fullname). sets." msgstr "÷×ÅÄÉÔÅ email ÁÄÒÅÓ (É ÐÏÌÎÏÅ ÉÍÑ). ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:2421 src/lang.c:2931 +#: src/lang.c:2424 src/lang.c:2939 msgid "Mail address (and fullname)" msgstr "Email ÁÄÒÅÓ (É ÐÏÌÎÏÅ ÉÍÑ)" -#: src/lang.c:2422 +#: src/lang.c:2425 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "# Email ÁÄÒÅÓ ÐÏÌØÚÏ×ÁÔÅÌÑ (É ÐÏÌÎÏÅ ÉÍÑ).\n" -#: src/lang.c:2427 +#: src/lang.c:2430 msgid "Show empty Followup-To in editor" msgstr "ðÏËÁÚÙ×ÁÔØ ÐÕÓÔÏÊ Followup-To × ÒÅÄÁËÔÏÒÅ" -#: src/lang.c:2428 +#: src/lang.c:2431 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "" "# åÓÌÉ ON, ÔÏ ÐÏËÁÚÙ×ÁÔØ ÐÕÓÔÏÊ Follow-up ×Ï ×ÒÅÍÑ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ ÓÔÁÔØÉ\n" -#: src/lang.c:2432 +#: src/lang.c:2435 msgid "" "Enter path/! command/--none to create your default signature. sets." msgstr "" "÷×ÅÄÉÔÅ ÐÕÔØ/! ËÏÍÁÎÄÁ/--none ÄÌÑ ÓÏÚÄÁÎÉÑ ×ÁÛÅÊ ÓÉÇÎÁÔÕÒÙ. ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:2433 +#: src/lang.c:2436 msgid "Create signature from path/command" msgstr "óÏÚÄÁÔØ ÓÉÇÎÁÔÕÒÕ ËÏÍÁÎÄÏÊ" -#: src/lang.c:2434 +#: src/lang.c:2437 #, c-format msgid "" "# Signature path (random sigs)/file to be used when posting/replying\n" @@ -7024,55 +7022,55 @@ msgid "" "# sigfile=--none don't append a signature\n" msgstr "" -#: src/lang.c:2442 +#: src/lang.c:2445 msgid "" "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "" "îÁÞÉÎÁÔØ ÓÉÇÎÁÔÕÒÕ Ó \"--\" × ÏÔÄÅÌØÎÏÊ ÓÔÒÏËÅ. <ðòïâåì> ×ÙÂÏÒ, " "ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:2443 +#: src/lang.c:2446 msgid "Prepend signature with \"-- \"" msgstr "îÁÞÉÎÁÔØ ÓÉÇÎÁÔÕÒÕ Ó \"--\"" -#: src/lang.c:2444 +#: src/lang.c:2447 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "# åÓÌÉ ON, ÔÏ ÎÁÞÉÎÁÔØ ÓÉÇÎÁÔÕÒÕ Ó ÄÅÆÉÓÏ× '\\n-- \\n'\n" -#: src/lang.c:2448 +#: src/lang.c:2451 msgid "Add signature when reposting articles. toggles & sets." msgstr "" "äÏÂÁ×ÌÑÔØ ÓÉÇÎÁÔÕÒÕ ÐÒÉ ÐÏ×ÔÏÒÎÏÊ ÏÔÐÒÁ×ËÅ. <ðòïâåì> ×ÙÂÏÒ, ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:2449 +#: src/lang.c:2452 msgid "Add signature when reposting" msgstr "äÏÂÁ×ÌÑÔØ ÓÉÇÎÁÔÕÒÕ ÐÒÉ ÐÏ×ÔÏÒÎÏÊ ÏÔÐÒÁ×ËÅ" -#: src/lang.c:2450 +#: src/lang.c:2453 msgid "# If ON add signature to reposted articles\n" msgstr "# åÓÌÉ ON, ÔÏ ÄÏÂÁ×ÌÑÔØ ÓÉÇÎÁÔÕÒÕ ÐÒÉ ÐÏ×ÔÏÒÎÏÊ ÏÔÐÒÁ×ËÅ\n" -#: src/lang.c:2454 +#: src/lang.c:2457 #, c-format msgid "Enter quotation marks, %s or %S for author's initials." msgstr "÷×ÅÄÉÔÅ ÓÉÍ×ÏÌÙ ÄÌÑ ÎÁÞÁÌÁ ÃÉÔÉÒÏ×ÁÎÉÑ, %s ÉÌÉ %S ÉÎÉÃÉÁÌÙ Á×ÔÏÒÁ." -#: src/lang.c:2455 +#: src/lang.c:2458 msgid "Characters used as quote-marks" msgstr "óÉÍ×ÏÌÙ ÉÓÐÏÌØÚÕÅÍÙÅ ÄÌÑ ÎÁÞÁÌÁ ÃÉÔÉÒÏ×ÁÎÉÑ" -#: src/lang.c:2456 +#: src/lang.c:2459 #, c-format msgid "" "# Characters used in quoting to followups and replies.\n" "# '_' is replaced by ' ', %s, %S are replaced by author's initials.\n" msgstr "" -#: src/lang.c:2462 +#: src/lang.c:2465 msgid "Quoting behavior" msgstr "ãÉÔÉÒÏ×ÁÎÉÅ" -#: src/lang.c:2463 +#: src/lang.c:2466 msgid "" "# How quoting should be handled when following up or replying.\n" "# Possible values are (the default is marked with *):\n" @@ -7096,56 +7094,56 @@ msgstr "" "# 6 = ãÉÔÉÒÏ×ÁÔØ ÓÉÇÎÁÔÕÒÙ É ÐÕÓÔÙÅ ÓÔÒÏËÉ\n" "# 7 = óÖÉÍÁÔØ ÃÉÔÉÒÏ×ÁÎÉÅ, ÃÉÔÉÒÏ×ÁÔØ ÓÉÇÎÁÔÕÒÙ É ÐÕÓÔÙÅ ÓÔÒÏËÉ\n" -#: src/lang.c:2476 src/lang.c:2484 src/lang.c:2490 +#: src/lang.c:2479 src/lang.c:2487 src/lang.c:2493 msgid "" "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "" -#: src/lang.c:2477 +#: src/lang.c:2480 msgid "Quote line when following up" msgstr "ãÉÔÉÒÏ×ÁÔØ ÐÒÉ follow-up" -#: src/lang.c:2478 +#: src/lang.c:2481 msgid "" "# Format of quote line when mailing/posting/following-up an article\n" "# %A Address %D Date %F Addr+Name %G Groupname %M Message-ID\n" "# %N Full Name %C First Name %I Initials\n" msgstr "" -#: src/lang.c:2485 +#: src/lang.c:2488 msgid "Quote line when cross-posting" msgstr "ãÉÔÉÒÏ×ÁÔØ ÐÒÉ ËÒÏÓÓ-ÐÏÓÔÉÎÇÅ" -#: src/lang.c:2491 +#: src/lang.c:2494 msgid "Quote line when mailing" msgstr "ãÉÔÉÒÏ×ÁÔØ ÐÒÉ ÏÔÐÒÁ×ËÅ email" -#: src/lang.c:2496 +#: src/lang.c:2499 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "" "åÓÌÉ ON, ÔÏ ÄÏÂÁ×ÌÑÔØ ÚÁÇÏÌÏ×ÏË User-Agent:. <ðòïâåì> ×ÙÂÏÒ, ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:2497 +#: src/lang.c:2500 #, fuzzy msgid "Insert 'User-Agent:' header" msgstr "äÏÂÁ×ÌÑÔØ ÚÁÇÏÌÏ×ÏË User-Agent:" -#: src/lang.c:2498 +#: src/lang.c:2501 msgid "# If ON include advertising User-Agent: header\n" msgstr "# åÓÌÉ ON, ÔÏ ÄÏÂÁ×ÌÑÔØ ÒÅËÌÁÍÎÙÊ ÚÁÇÏÌÏ×ÏË User-Agent:\n" -#: src/lang.c:2503 +#: src/lang.c:2506 msgid "" "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" "÷×ÅÄÉÔÅ ËÏÄÉÒÏ×ËÕ ÄÌÑ MIME (ÎÁÐÒ. US-ASCII, ISO-8859-1, EUC-KR), " "ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:2504 +#: src/lang.c:2507 msgid "MM_CHARSET" msgstr "" -#: src/lang.c:2505 +#: src/lang.c:2508 msgid "" "# Charset supported locally which is also used for MIME header and\n" "# Content-Type header.\n" @@ -7155,15 +7153,15 @@ msgid "" "# mm_charset is considered not displayable and represented as '?'.\n" msgstr "" -#: src/lang.c:2515 +#: src/lang.c:2518 msgid "MM_NETWORK_CHARSET" msgstr "" -#: src/lang.c:2516 +#: src/lang.c:2519 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "# ëÏÄÉÒÏ×ËÁ × MIME (Content-Type) × ÏÔÐÒÁ×ÌÑÅÍÙÈ ÓÔÁÔØÑÈ.\n" -#: src/lang.c:2520 +#: src/lang.c:2523 #, fuzzy msgid "" "Enter local charset name (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." @@ -7171,27 +7169,27 @@ msgstr "" "÷×ÅÄÉÔÅ ËÏÄÉÒÏ×ËÕ ÄÌÑ MIME (ÎÁÐÒ. US-ASCII, ISO-8859-1, EUC-KR), " "ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:2521 +#: src/lang.c:2524 msgid "MM_LOCAL_CHARSET" msgstr "" -#: src/lang.c:2522 +#: src/lang.c:2525 msgid "# Charset supported locally.\n" msgstr "" -#: src/lang.c:2529 +#: src/lang.c:2532 msgid "Mailbox format" msgstr "æÏÒÍÁÔ Mailbox" -#: src/lang.c:2530 +#: src/lang.c:2533 msgid "# Format of the mailbox.\n" msgstr "# æÏÒÍÁÔ mailbox.\n" -#: src/lang.c:2535 +#: src/lang.c:2538 msgid "MIME encoding in news messages" msgstr "ëÏÄÉÒÏ×ËÁ MIME × ÓÔÁÔØÑÈ" -#: src/lang.c:2536 +#: src/lang.c:2539 msgid "" "# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n" "# for mails and posts, if necessary. QP is efficient for most European\n" @@ -7200,15 +7198,15 @@ msgid "" "# Russian charsets with a lot of 8bit characters.\n" msgstr "" -#: src/lang.c:2544 src/lang.c:2565 +#: src/lang.c:2547 src/lang.c:2568 msgid "Don't change unless you know what you are doing. cancels." msgstr "îÅ ÉÚÍÅÎÑÊÔÅ, ÅÓÌÉ ÎÅ ÐÏÎÉÍÁÅÔÅ ÞÔÏ ×Ù ÄÅÌÁÅÔÅ. ÏÔÍÅÎÁ." -#: src/lang.c:2545 +#: src/lang.c:2548 msgid "Use 8bit characters in news headers" msgstr "éÓÐÏÌØÚÏ×ÁÔØ 8 ÂÉÔÎÙÅ ÓÉÍ×ÏÌÙ × ÚÁÇÏÌÏ×ËÁÈ ÓÔÁÔÅÊ" -#: src/lang.c:2546 +#: src/lang.c:2549 msgid "" "# If ON, 8bit characters in news headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -7221,32 +7219,32 @@ msgstr "" "# ÏÔ ÚÎÁÞÅÎÉÑ ÜÔÏÇÏ ÐÁÒÁÍÅÔÒÁ, ÐÏËÁ post_mime_encoding ÔÁËÖÅ\n" "# ÎÅ ÕÓÔÁÎÏ×ÌÅÎ × 8bit.\n" -#: src/lang.c:2553 +#: src/lang.c:2556 msgid "" "Auto-view post-processed files toggles, sets, cancels." msgstr "" "á×ÔÏÐÒÏÓÍÏÔÒ ÐÏÓÔ-ÏÂÒÁÂÏÔÁÎÎÙÈ ÆÁÊÌÏ×. <ðòïâåì> ×ÙÂÏÒ, ÕÓÔÁÎÏ×ÉÔØ, " " ÏÔÍÅÎÉÔØ" -#: src/lang.c:2554 +#: src/lang.c:2557 msgid "View post-processed files" msgstr "ðÒÏÓÍÏÔÒ ÐÏÓÔ-ÏÂÒÁÂÏÔÁÎÎÙÈ ÆÁÊÌÏ×" -#: src/lang.c:2555 +#: src/lang.c:2558 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "" "# åÓÌÉ ÕÓÔÁÎÏ×ÌÅÎ, ÔÏ ÐÏÓÔ-ÏÂÒÁÂÏÔÁÎÎÙÅ ÆÁÊÌÙ ÂÕÄÕÔ ÏÔËÒÙ×ÁÔØÓÑ\n" "# × ÐÒÏÓÍÏÔÏÒÝÉËÅ\n" -#: src/lang.c:2560 +#: src/lang.c:2563 msgid "MIME encoding in mail messages" msgstr "MIME ËÏÄÉÒÏ×ËÁ × ÐÏÞÔÏ×ÙÈ ÓÏÏÂÝÅÎÉÑÈ" -#: src/lang.c:2566 +#: src/lang.c:2569 msgid "Use 8bit characters in mail headers" msgstr "éÓÐÏÌØÚÏ×ÁÔØ 8 ÂÉÔÎÙÅ ÓÉÍ×ÏÌÙ × ÚÁÇÏÌÏ×ËÁÈ ÐÏÞÔÙ" -#: src/lang.c:2567 +#: src/lang.c:2570 msgid "" "# If ON, 8bit characters in mail headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -7257,11 +7255,11 @@ msgid "" "# turn it ON unless you have some compelling reason.\n" msgstr "" -#: src/lang.c:2578 +#: src/lang.c:2581 msgid "Strip blanks from ends of lines" msgstr "õÂÉÒÁÔØ ÐÒÏÂÅÌÙ × ËÏÎÃÅ ÓÔÒÏËÉ" -#: src/lang.c:2579 +#: src/lang.c:2582 msgid "" "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" @@ -7269,16 +7267,16 @@ msgstr "" "# åÓÌÉ ON, ÔÏ ÕÂÉÒÁÔØ ÐÒÏÂÅÌÙ × ËÏÎÃÅ ÓÔÒÏËÉ ÄÌÑ ÂÏÌÅÅ ÂÙÓÔÒÏÇÏ ×Ù×ÏÄÁ\n" "# ÎÁ ÍÅÄÌÅÎÎÙÈ ÔÅÒÍÉÎÁÌÁÈ.\n" -#: src/lang.c:2585 +#: src/lang.c:2588 msgid "If ON, use transliteration. toggles & sets." msgstr "" "åÓÌÉ ON, ÔÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÒÁÎÓÌÉÔÅÒÁÃÉÀ, <ðòïâåì> ×ÙÂÏÒ, ÕÓÔÁÎÏ×ÉÔØ" -#: src/lang.c:2586 +#: src/lang.c:2589 msgid "Transliteration" msgstr "ôÒÁÎÓÌÉÔÅÒÁÃÉÑ" -#: src/lang.c:2587 +#: src/lang.c:2590 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" @@ -7288,12 +7286,12 @@ msgstr "" "# ÓÉÍ×ÏÌ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÒÅÄÓÔÁ×ÌÅÎ × ÃÅÌÅ×ÏÍ ÎÁÂÏÒÅ ÓÉÍ×ÏÌÏ×, ÔÏ ÏÎ\n" "# ÁÐÐÒÏËÓÉÍÉÒÕÅÔÓÑ ÏÄÎÉÍ ÉÌÉ ÎÅÓËÏÌØËÉÍÉ ÐÏÈÏÖÉÍÉ ÓÉÍ×ÏÌÁÍÉ.\n" -#: src/lang.c:2595 +#: src/lang.c:2598 #, fuzzy msgid "Send you a Cc/Bcc automatically" msgstr "ïÔÐÒÁ×ÌÑÔØ ×ÁÍ Cc Á×ÔÏÍÁÔÉÞÅÓËÉ" -#: src/lang.c:2596 +#: src/lang.c:2599 #, fuzzy msgid "" "# Put your name in the Cc: and/or Bcc: field when mailing an article.\n" @@ -7311,91 +7309,91 @@ msgstr "" "# 3 = NFC\n" "# 4 = NFD\n" -#: src/lang.c:2607 +#: src/lang.c:2610 msgid "Hash algorithm for Cancel-Lock/Cancel-Key" msgstr "" -#: src/lang.c:2608 +#: src/lang.c:2611 msgid "" "# Hash algorithm for Cancel-Lock/Cancel-Key (default 'sha1')\n" "# Use 'none' to not generate Cancel-Lock headers.\n" msgstr "" -#: src/lang.c:2614 +#: src/lang.c:2617 msgid "Enter address elements about which you want to be warned. sets." msgstr "" -#: src/lang.c:2615 +#: src/lang.c:2618 msgid "Spamtrap warning address parts" msgstr "" -#: src/lang.c:2616 +#: src/lang.c:2619 msgid "" "# A comma-delimited list of address-parts you want to be warned\n" "# about when trying to reply by email.\n" msgstr "" -#: src/lang.c:2621 +#: src/lang.c:2624 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "÷×ÅÄÉÔÅ ÞÉÓÌÏ ÄÎÅÊ ÐÏËÁ ÆÉÌØÔÒ ÉÍÅÅÔ ÓÉÌÕ. ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:2622 +#: src/lang.c:2625 msgid "No. of days a filter entry is valid" msgstr "þÉÓÌÏ ÄÎÅÊ ÐÏËÁ ÆÉÌØÔÒ ÉÍÅÅÔ ÓÉÌÕ" -#: src/lang.c:2623 +#: src/lang.c:2626 msgid "# Number of days a short term filter will be active\n" msgstr "" -#: src/lang.c:2627 +#: src/lang.c:2630 msgid "Add posted articles to filter. toggles & sets." msgstr "äÏÂÁ×ÉÔØ ÏÔÐÒÁ×ÌÅÎÎÙÅ ÓÔÁÔØÉ × ÆÉÌØÔÒ, <ðòïâåì> ×ÙÂÏÒ, ÕÓÔÁÎÏ×ÉÔØ" -#: src/lang.c:2628 +#: src/lang.c:2631 msgid "Add posted articles to filter" msgstr "äÏÂÁ×ÉÔØ ÏÔÐÒÁ×ÌÅÎÎÙÅ ÓÔÁÔØÉ × ÆÉÌØÔÒ" -#: src/lang.c:2629 +#: src/lang.c:2632 msgid "" "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" msgstr "" -#: src/lang.c:2633 +#: src/lang.c:2636 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "äÉÒÅËÔÏÒÉÑ ÄÌÑ ÓÏÈÒÁÎÅÎÉÑ ÓÔÁÔÅÊ/ÄÉÓËÕÓÓÉÊ × ÆÏÒÍÁÔÅ mailbox." -#: src/lang.c:2634 +#: src/lang.c:2637 msgid "Mail directory" msgstr "äÉÒÅËÔÏÒÉÑ ÄÌÑ ÐÏÞÔÙ" -#: src/lang.c:2635 +#: src/lang.c:2638 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "# (-m) ÄÉÒÅËÔÏÒÉÑ ÄÌÑ ÓÏÈÒÁÎÅÎÉÑ ÓÔÁÔÅÊ/ÄÉÓËÕÓÓÉÊ × ÆÏÒÍÁÔÅ mailbox\n" -#: src/lang.c:2640 +#: src/lang.c:2643 msgid "Save articles in batch mode (-S)" msgstr "óÏÈÒÁÎÑÔØ ÓÔÁÔØÉ × ÐÁËÅÔÎÏÍ ÒÅÖÉÍÅ (-S)" -#: src/lang.c:2641 +#: src/lang.c:2644 msgid "" "# If ON articles/threads will be saved in batch mode when save -S\n" "# or mail (-M/-N) is specified on the command line\n" msgstr "" -#: src/lang.c:2646 +#: src/lang.c:2649 msgid "The directory where you want articles/threads saved." msgstr "äÉÒÅËÔÏÒÉÑ ÄÌÑ ÓÏÈÒÁÎÅÎÉÑ ÓÔÁÔÅÊ/ÄÉÓËÕÓÓÉÊ" -#: src/lang.c:2647 +#: src/lang.c:2650 msgid "Directory to save arts/threads in" msgstr "äÉÒÅËÔÏÒÉÑ ÄÌÑ ÓÏÈÒÁÎÅÎÉÑ ÓÔÁÔÅÊ/ÄÉÓËÕÓÓÉÊ" -#: src/lang.c:2648 +#: src/lang.c:2651 msgid "# Directory where articles/threads are saved\n" msgstr "# äÉÒÅËÔÏÒÉÑ ÄÌÑ ÓÏÈÒÁÎÅÎÉÑ ÓÔÁÔÅÊ/ÄÉÓËÕÓÓÉÊ\n" -#: src/lang.c:2652 +#: src/lang.c:2655 msgid "" "Auto save article/thread by Archive-name: header. toggles & " "sets." @@ -7403,17 +7401,17 @@ msgstr "" "á×ÔÏÍÁÔÉÞÅÓËÉ ÓÏÈÒÁÎÑÔØ ÓÔÁÔØÉ/ÄÉÓË. Ó ÚÁÇÏÌÏ×ËÏÍ Archive-name:. <ðòïâåì> " "×ÙÂÏÒ, ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:2653 +#: src/lang.c:2656 msgid "Use Archive-name: header for save" msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÚÁÇÏÌÏ×ÏË Archive-name: ÄÌÑ ÓÏÈÒÁÎÅÎÉÑ" -#: src/lang.c:2654 +#: src/lang.c:2657 msgid "" "# If ON articles/threads with Archive-name: in mail header will\n" "# be automatically saved with the Archive-name & part/patch no.\n" msgstr "" -#: src/lang.c:2659 +#: src/lang.c:2662 msgid "" "Mark saved articles/threads as read. toggles, sets, " "cancels." @@ -7421,24 +7419,24 @@ msgstr "" "ïÔÍÅÔÉÔØ ÓÏÈÒÁΣÎÎÙÅ ÓÔÁÔØÉ/ÄÉÓËÕÓÓÉÉ ËÁË ÐÒÏÞÉÔÁÎÎÙÅ. <ðòïâåì> ×ÙÂÏÒ, " "ÕÓÔÁÎÏ×ÉÔØ, ÏÔÍÅÎÁ" -#: src/lang.c:2660 +#: src/lang.c:2663 msgid "Mark saved articles/threads as read" msgstr "ïÔÍÅÔÉÔØ ÓÏÈÒÁΣÎÎÙÅ ÓÔÁÔØÉ/ÄÉÓËÕÓÓÉÉ ËÁË ÐÒÏÞÉÔÁÎÎÙÅ" -#: src/lang.c:2661 +#: src/lang.c:2664 msgid "# If ON mark articles that are saved as read\n" msgstr "# åÓÌÉ ON, ÔÏ ÏÔÍÅÔÉÔØ ÓÏÈÒÁΣÎÎÙÅ ÓÔÁÔØÉ ËÁË ÐÒÏÞÉÔÁÎÎÙÅ\n" -#: src/lang.c:2665 +#: src/lang.c:2668 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "" "÷ÙÐÏÌÎÉÔØ ÐÏÓÔ-ÏÂÒÁÂÏÔËÕ (ÎÁÐÒ. ÕÂÒÁÔØ ×ÌÏÖÅÎÉÑ) ÄÌÑ ÓÏÈÒÁÎÑÅÍÙÈ ÓÔÁÔÅÊ" -#: src/lang.c:2666 +#: src/lang.c:2669 msgid "Post process saved articles" msgstr "ðÏÓÔ-ÏÂÒÁÂÏÔËÁ ÓÏÈÒÁΣÎÎÙÈ ÓÔÁÔÅÊ" -#: src/lang.c:2667 +#: src/lang.c:2670 msgid "" "# Perform post processing (saving binary attachments) from saved articles.\n" "# Possible values are (the default is marked with *):\n" @@ -7447,65 +7445,65 @@ msgid "" "# 2 = yes\n" msgstr "" -#: src/lang.c:2676 +#: src/lang.c:2679 msgid "Process only unread articles" msgstr "ïÂÒÁÂÏÔÁÔØ ÔÏÌØËÏ ÎÅÐÒÏÞ. ÓÔÁÔØÉ" -#: src/lang.c:2677 +#: src/lang.c:2680 msgid "" "# If ON only save/print/pipe/mail unread articles (tagged articles " "excepted)\n" msgstr "" -#: src/lang.c:2682 +#: src/lang.c:2685 msgid "Print all or just part of header. toggles & sets." msgstr "" "ðÅÞÁÔÁÔØ ×ÓÅ ÉÌÉ ÔÏÌØËÏ ÞÁÓÔØ ÚÁÇÏÌÏ×ËÏ×. <ðòïâåì> ×ÙÂÏÒ, ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:2683 +#: src/lang.c:2686 msgid "Print all headers when printing" msgstr "ðÅÞÁÔÁÔØ ×ÓÅ ÚÁÇÏÌÏ×ËÉ" -#: src/lang.c:2684 +#: src/lang.c:2687 msgid "" "# If ON print all of article header otherwise just the important lines\n" msgstr "# åÓÌÉ ON, ÔÏ ×Ù×ÏÄÉÔØ ×ÓÅ ÚÁÇÏÌÏ×ËÉ ÓÔÁÔÅÊ, ÉÎÁÞÅ ÔÏÌØËÏ ×ÁÖÎÙÅ\n" -#: src/lang.c:2688 +#: src/lang.c:2691 msgid "" "The printer program with options that is to be used to print articles/" "threads." msgstr "ëÏÍÁÎÄÁ ÐÅÞÁÔÉ Ó ÐÁÒÁÍÅÔÒÁÍÉ ÄÌÑ ÐÅÞÁÔÉ ÓÔÁÔÅÊ/ÄÉÓËÕÓÓÉÊ" -#: src/lang.c:2689 +#: src/lang.c:2692 msgid "Printer program with options" msgstr "ðÒÏÇÒÁÍÍÁ ÐÅÞÁÔÉ Ó ÏÐÃÉÑÍÉ" -#: src/lang.c:2690 +#: src/lang.c:2693 msgid "# Print program with parameters used to print articles/threads\n" msgstr "# ëÏÍÁÎÄÁ ÐÅÞÁÔÉ Ó ÐÁÒÁÍÅÔÒÁÍÉ ÄÌÑ ÐÅÞÁÔÉ ÓÔÁÔÅÊ/ÄÉÓËÕÓÓÉÊ\n" -#: src/lang.c:2696 +#: src/lang.c:2699 msgid "Force redraw after certain commands" msgstr "ðÅÒÅÒÉÓÏ×Ù×ÁÔØ ÜËÒÁÎ ÐÏÓÌÅ ÎÅËÏÔÏÒÙÈ ËÏÍÁÎÄ" -#: src/lang.c:2697 +#: src/lang.c:2700 msgid "" "# If ON a screen redraw will always be done after certain external commands\n" msgstr "# åÓÌÉ ON, ÔÏ ÐÅÒÅÒÉÓÏ×Ù×ÁÔØ ÜËÒÁÎ ÐÏÓÌÅ ÎÅËÏÔÏÒÙÈ ×ÎÅÛÎÉÈ ËÏÍÁÎÄ\n" -#: src/lang.c:2701 +#: src/lang.c:2704 msgid "" "Start editor with line offset. toggles, sets, cancels." msgstr "" "úÁÐÕÓÔÉÔØ ÒÅÄÁËÔÏÒ Ó ÕÓÔÁÎÏ×ËÏÊ ËÕÒÓÏÒÁ. <ðòïâåì> ×ÙÂÏÒ, ÕÓÔÁÎÏ×ÉÔØ, " " ÏÔÍÅÎÁ." -#: src/lang.c:2702 +#: src/lang.c:2705 msgid "Start editor with line offset" msgstr "úÁÐÕÓÔÉÔØ ÒÅÄÁËÔÏÒ Ó ÕÓÔÁÎÏ×ËÏÊ ËÕÒÓÏÒÁ" -#: src/lang.c:2703 +#: src/lang.c:2706 msgid "" "# If ON editor will be started with cursor offset into the file\n" "# otherwise the cursor will be positioned at the first line\n" @@ -7513,17 +7511,17 @@ msgstr "" "# åÓÌÉ ON, ÔÏ ÒÅÄÁËÔÏÒ ÂÕÄÅÔ ÚÁÐÕÝÅÎ Ó ÕÓÔÁÎÏ×ËÏÊ ËÕÒÓÏÒÁ ÓÏ ÓÍÅÝÅÎÉÅÍ,\n" "# ÉÎÁÞÅ ËÕÒÓÏÒ ÂÕÄÅÔ ÕÓÔÁÎÏ×ÌÅÎ ÎÁ ÐÅÒ×ÏÊ ÓÔÒÏËÅ\n" -#: src/lang.c:2708 +#: src/lang.c:2711 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "" "÷×ÅÄÉÔÅ %E ÄÌÑ ÉÍÅÎÉ ÒÅÄÁËÔÏÒÁ, %F ÄÌÑ ÉÍÅÎÉ ÆÁÊÌÁ, %N ÄÌÑ ÎÏÍÅÒÁ ÓÔÒÏËÉ. " " ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:2709 +#: src/lang.c:2712 msgid "Invocation of your editor" msgstr "úÁÐÕÓË ×ÁÛÅÇÏ ÒÅÄÁËÔÏÒÁ" -#: src/lang.c:2710 +#: src/lang.c:2713 msgid "" "# Format of editor line including parameters\n" "# %E Editor %F Filename %N Linenumber\n" @@ -7531,16 +7529,16 @@ msgstr "" "# æÏÒÍÁÔ ÓÔÒÏËÉ ÄÌÑ ÚÁÐÕÓËÁ ÒÅÄÁËÔÏÒÁ ×ËÌÀÞÁÅÔ ÐÁÒÁÍÅÔÒÙ\n" "# %E òÅÄÁËÔÏÒ %F éÍÑ ÆÁÊÌÁ %N îÏÍÅÒ ÓÔÒÏËÉ\n" -#: src/lang.c:2715 +#: src/lang.c:2718 msgid "" "Enter name and options for external-inews, --internal for internal inews" msgstr "÷×ÅÄÉÔÅ ÉÍÑ É ÏÐÃÉÉ ÄÌÑ external-inews, --internal ÄÌÑ internal inews" -#: src/lang.c:2716 +#: src/lang.c:2719 msgid "External inews" msgstr "÷ÎÅÛÎÉÊ inews" -#: src/lang.c:2717 +#: src/lang.c:2720 msgid "" "# If --internal use the built in mini inews for posting via NNTP\n" "# otherwise use an external inews program\n" @@ -7548,18 +7546,18 @@ msgstr "" "# åÓÌÉ --internal, ÔÏ ÉÓÐÏÌØÚÏ×ÁÔØ ×ÓÔÒÏÅÎÎÙÊ ÍÉÎÉ unews ÄÌÑ ÏÔÐÒÁ×ËÉ\n" "# ÓÔÁÔÅÊ ÞÅÒÅÚ NNTP, ÉÎÁÞÅ ÉÓÐÏÌØÚÏ×ÁÔØ ×ÎÅÛÎÀÀ ÐÒÏÇÒÁÍÍÕ inews\n" -#: src/lang.c:2721 +#: src/lang.c:2724 msgid "" "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" "÷×ÅÄÉÔÅ %M ÄÌÑ MTA, %S ÄÌÑ ÔÅÍÙ, %T ÄÌÑ To, %F ÄÌÑ ÉÍÅÎÉ ÆÁÊÌÁ, " "ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:2722 +#: src/lang.c:2725 msgid "Invocation of your mail command" msgstr "úÁÐÕÓË ×ÁÛÅÊ ËÏÍÁÎÄÙ ÏÔÐÒÁ×ËÉ ÐÏÞÔÙ" -#: src/lang.c:2723 +#: src/lang.c:2726 msgid "" "# Format of mailer line including parameters\n" "# %M Mailer %S Subject %T To %F Filename\n" @@ -7567,11 +7565,11 @@ msgid "" "# ie. elm interactive : elm -i %F -s \"%S\" \"%T\"\n" msgstr "" -#: src/lang.c:2731 +#: src/lang.c:2734 msgid "Use interactive mail reader" msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÉÎÔÅÒÁËÔÉ×ÎÕÀ ÐÒÏÇÒÁÍÍÕ ÞÔÅÎÉÑ ÐÏÞÔÙ" -#: src/lang.c:2732 +#: src/lang.c:2735 msgid "" "# Interactive mailreader\n" "# Possible values are (the default is marked with *):\n" @@ -7587,34 +7585,34 @@ msgstr "" "# 2 = ÉÓÐÏÌØÚÏ×ÁÔØ ÉÎÔÅÒÁËÔÉ×ÎÕÀ ÐÒÏÇÒÁÍÍÕ ÞÔÅÎÉÑ ÐÏÞÔÙ ÂÅÚ ÚÁÇÏÌÏ×ËÏ× × " "ÆÁÊÌÅ\n" -#: src/lang.c:2741 +#: src/lang.c:2744 msgid "Remove ~/.article after posting" msgstr "õÂÒÁÔØ ~/.article ÐÏÓÌÅ ÏÔÐÒÁ×ËÉ" -#: src/lang.c:2742 +#: src/lang.c:2745 msgid "# If ON remove ~/.article after posting.\n" msgstr "# åÓÌÉ ON, ÔÏ ÕÂÒÁÔØ ~/.article ÐÏÓÌÅ ÏÔÐÒÁ×ËÉ.\n" -#: src/lang.c:2748 +#: src/lang.c:2751 msgid "Use UTF-8 graphics (thread tree etc.)" msgstr "" -#: src/lang.c:2749 +#: src/lang.c:2752 msgid "" "# If ON use UTF-8 characters for indicator '->', tree and ellipsis '...'.\n" msgstr "" -#: src/lang.c:2754 +#: src/lang.c:2757 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "" "éÍÑ ÆÁÊÌÁ ÄÌÑ ×ÓÅÈ ÏÔÐÒÁ×ÌÅÎÎÙÈ ÓÔÁÔÅÊ. ÕÓÔÁÎÏ×ÉÔØ, ÎÅ ÉÍÅÎÉ=ÎÅ " "ÓÏÈÒÁÎÑÔØ." -#: src/lang.c:2755 +#: src/lang.c:2758 msgid "Filename for posted articles" msgstr "éÍÑ ÆÁÊÌÁ ÄÌÑ ÏÔÐÒÁ×ÌÅÎÎÙÈ ÓÔÁÔÅÊ" -#: src/lang.c:2756 +#: src/lang.c:2759 msgid "" "# Filename where to keep all postings (default posted)\n" "# If no filename is set then postings will not be saved\n" @@ -7622,39 +7620,39 @@ msgstr "" "# éÍÑ ÆÁÊÌÁ ÄÌÑ ÓÏÈÒÁÎÅÎÉÑ ÏÔÐÒÁ×ÌÅÎÎÙÈ ÓÔÁÔÅÊ.\n" "# åÓÌÉ ÉÍÑ ÆÁÊÌÁ ÎÅ ÕËÁÚÁÎÏ, ÔÏ ÏÔÐÒÁ×ÌÅÎÎÙÅ ÓÔÁÔØÉ ÎÅ ÂÕÄÕÔ ÓÏÈÒÁÎÑÔÓÑ.\n" -#: src/lang.c:2761 +#: src/lang.c:2764 msgid "" "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "" "äÅÒÖÁÔØ ×ÓÅ ÎÅÕÄÁ×ÛÉÅÓÑ ÓÔÁÔØÉ × ~/dead.articles. <ðòïâåì> ×ÙÂÏÒ, " "ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:2762 +#: src/lang.c:2765 msgid "Keep failed arts in ~/dead.articles" msgstr "äÅÒÖÁÔØ ÎÅÕÄÁ×ÛÉÅÓÑ ÓÔÁÔØÉ × ~/dead.articles" -#: src/lang.c:2763 +#: src/lang.c:2766 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "" "# åÓÌÉ ON, ÔÏ ÄÅÒÖÁÔØ ×ÓÅ ÎÅÕÄÁ×ÛÉÅÓÑ ÏÔÐÒÁ×ËÉ ÓÔÁÔÅÊ × ~/dead.articles\n" -#: src/lang.c:2767 +#: src/lang.c:2770 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "èÏÔÉÔÅ ÕÂÒÁÔØ ÎÅÐÏÄÐÉÓÁÎÎÙÅ ÇÒÕÐÐÙ ÉÚ .newsrc" -#: src/lang.c:2768 +#: src/lang.c:2771 msgid "No unsubscribed groups in newsrc" msgstr "õÂÉÒÁÔØ ÎÅÐÏÄÐÉÓÁÎÎÙÅ ÇÒÕÐÐÙ ÉÚ newsrc" -#: src/lang.c:2769 +#: src/lang.c:2772 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "# åÓÌÉ ON, ÔÏ ÕÂÉÒÁÔØ ÎÅÐÏÄÐÉÓÁÎÎÙÅ ÇÒÕÐÐÙ ÉÚ newsrc\n" -#: src/lang.c:2774 +#: src/lang.c:2777 msgid "Remove bogus groups from newsrc" msgstr "õÂÉÒÁÔØ ÆÉËÔÉ×ÎÙÅ ÇÒÕÐÐÙ ÉÚ newsrc" -#: src/lang.c:2775 +#: src/lang.c:2778 msgid "" "# What to do with bogus groups in newsrc file\n" "# Possible values are (the default is marked with *):\n" @@ -7668,7 +7666,7 @@ msgstr "" "# 1 = ÕÎÉÞÔÏÖÁÔØ\n" "# 2 = ÐÏÍÅÞÁÔØ D × ÜËÒÁÎÅ ×ÙÂÏÒÁ\n" -#: src/lang.c:2784 +#: src/lang.c:2787 #, fuzzy msgid "" "Enter number of seconds to wait for a response from the server. sets." @@ -7676,37 +7674,37 @@ msgstr "" "÷×ÅÄÉÔÅ ËÏÌÉÞÅÓÔ×Ï ÓÅËÕÎÄ ÍÅÖÄÕ Á×ÔÏÍÁÔÉÞÅÓËÉÍ ÞÔÅÎÉÅÍ ÁËÔÉ×ÎÏÇÏ ÆÁÊÌÁ. " "ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:2785 +#: src/lang.c:2788 msgid "NNTP read timeout in seconds" msgstr "" -#: src/lang.c:2786 +#: src/lang.c:2789 msgid "" "# Time in seconds to wait for a response from the server (0=no timeout)\n" msgstr "" -#: src/lang.c:2791 +#: src/lang.c:2794 msgid "Enter number of seconds until active file will be reread. sets." msgstr "" "÷×ÅÄÉÔÅ ËÏÌÉÞÅÓÔ×Ï ÓÅËÕÎÄ ÍÅÖÄÕ Á×ÔÏÍÁÔÉÞÅÓËÉÍ ÞÔÅÎÉÅÍ ÁËÔÉ×ÎÏÇÏ ÆÁÊÌÁ. " "ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:2792 +#: src/lang.c:2795 msgid "Interval in secs to reread active" msgstr "éÎÔÅÒ×ÁÌ × ÓÅËÕÎÄÁÈ ÍÅÖÄÕ ÞÔÅÎÉÅÍ active" -#: src/lang.c:2793 +#: src/lang.c:2796 msgid "" "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "" "# ÷ÒÅÍÅÎÎÏÊ ÉÎÔÅÒ×ÁÌ × ÓÅËÕÎÄÁÈ ÍÅÖÄÕ Á×ÔÏÍÁÔÉÞÅÓËÉÍ ÞÔÅÎÉÅÍ ÆÁÊÌÁ\n" "# active (0=ÎÉËÏÇÄÁ)\n" -#: src/lang.c:2798 +#: src/lang.c:2801 msgid "Reconnect to server automatically" msgstr "óÏÅÄÉÎÉÔØÓÑ ÓÎÏ×Á Ó ÓÅÒ×ÅÒÏÍ Á×ÔÏÍÁÔÉÞÅÓËÉ" -#: src/lang.c:2799 +#: src/lang.c:2802 msgid "" "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "" @@ -7714,29 +7712,29 @@ msgstr "" "ÓÏÅÄÉÎÅÎÉÅ\n" "# ÐÒÅÒ×ÁÌÏÓØ\n" -#: src/lang.c:2803 +#: src/lang.c:2806 msgid "" "Create local copies of NNTP overview files. toggles & sets." msgstr "" -#: src/lang.c:2804 +#: src/lang.c:2807 msgid "Cache NNTP overview files locally" msgstr "" -#: src/lang.c:2805 +#: src/lang.c:2808 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "" -#: src/lang.c:2809 src/lang.c:2824 src/lang.c:2844 src/lang.c:2863 +#: src/lang.c:2812 src/lang.c:2827 src/lang.c:2847 src/lang.c:2866 msgid "Enter format string. sets, cancels." msgstr "÷×ÅÄÉÔÅ ÆÏÒÍÁÔ ÓÔÒÏËÉ. ÕÓÔÁÎÏ×ÉÔØ, ÏÔÍÅÎÁ." -#: src/lang.c:2810 +#: src/lang.c:2813 #, fuzzy msgid "Format string for selection level" msgstr "×ÅÒÎÕÔØÓÑ × ÕÒÏ×ÅÎØ ×ÙÂÏÒÁ ÇÒÕÐÐ" -#: src/lang.c:2811 +#: src/lang.c:2814 msgid "" "# Format string for selection level representation\n" "# Default: %f %n %U %G %d\n" @@ -7750,12 +7748,12 @@ msgid "" "# %U Unread count\n" msgstr "" -#: src/lang.c:2825 +#: src/lang.c:2828 #, fuzzy msgid "Format string for group level" msgstr "æÏÒÍÁÔ ÓÔÒÏËÉ ÄÌÑ ×Ù×ÏÄÁ ÄÁÔ" -#: src/lang.c:2826 +#: src/lang.c:2829 msgid "" "# Format string for group level representation\n" "# Default: %n %m %R %L %s %F\n" @@ -7774,12 +7772,12 @@ msgid "" "# %S Score\n" msgstr "" -#: src/lang.c:2845 +#: src/lang.c:2848 #, fuzzy msgid "Format string for thread level" msgstr "# æÏÒÍÁÔ ÓÔÒÏËÉ ÄÌÑ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ ÄÁÔÙ\n" -#: src/lang.c:2846 +#: src/lang.c:2849 msgid "" "# Format string for thread level representation\n" "# Default: %n %m [%L] %T %F\n" @@ -7797,19 +7795,19 @@ msgid "" "# %T Thread tree (only thread level)\n" msgstr "" -#: src/lang.c:2864 +#: src/lang.c:2867 msgid "Format string for display of dates" msgstr "æÏÒÍÁÔ ÓÔÒÏËÉ ÄÌÑ ×Ù×ÏÄÁ ÄÁÔ" -#: src/lang.c:2865 +#: src/lang.c:2868 msgid "# Format string for date representation\n" msgstr "# æÏÒÍÁÔ ÓÔÒÏËÉ ÄÌÑ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ ÄÁÔÙ\n" -#: src/lang.c:2871 +#: src/lang.c:2878 msgid "Unicode normalization form" msgstr "æÏÒÍÁ ÎÏÒÍÁÌÉÚÁÃÉÉ Unicode" -#: src/lang.c:2872 +#: src/lang.c:2879 #, fuzzy msgid "" "# Unicode normalization form\n" @@ -7819,6 +7817,7 @@ msgid "" "# 2 = NFKD\n" "# 3 = NFC\n" "# 4 = NFD\n" +"# 5 = NFKC_CF\n" msgstr "" "# æÏÒÍÁ ÎÏÒÍÁÌÉÚÁÃÉÉ Unicode\n" "# ÷ÏÚÍÏÖÎÙÅ ÚÎÁÞÅÎÉÑ (ÐÏ ÕÍÏÌÞÁÎÉÀ ÏÔÍÅÞÅÎÏ *):\n" @@ -7828,20 +7827,20 @@ msgstr "" "# 3 = NFC\n" "# 4 = NFD\n" -#: src/lang.c:2885 +#: src/lang.c:2893 msgid "Render BiDi" msgstr "÷ÏÓÐÒÏÉÚ×ÏÄÉÔØ BiDi" -#: src/lang.c:2886 +#: src/lang.c:2894 msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "# åÓÌÉ ON, ÔÏ Ä×ÕÎÁÐÒÁ×ÌÅÎÎÙÊ ÔÅËÓÔ ×ÏÓÐÒÏÉÚ×ÏÄÉÔÓÑ tin'ÏÍ\n" -#: src/lang.c:2893 +#: src/lang.c:2901 #, fuzzy msgid "Function for sorting articles" msgstr "éÍÑ ÆÁÊÌÁ ÄÌÑ ÏÔÐÒÁ×ÌÅÎÎÙÈ ÓÔÁÔÅÊ" -#: src/lang.c:2894 +#: src/lang.c:2902 #, fuzzy msgid "" "# Function for sorting articles\n" @@ -7854,156 +7853,156 @@ msgstr "" "# * 0 = wildmat\n" "# 1 = regex\n" -#: src/lang.c:2907 +#: src/lang.c:2915 msgid "Automatically GroupMarkUnselArtRead" msgstr "" -#: src/lang.c:2913 +#: src/lang.c:2921 #, fuzzy msgid "Delete post-process files" msgstr "ðÒÏÓÍÏÔÒ ÐÏÓÔ-ÏÂÒÁÂÏÔÁÎÎÙÈ ÆÁÊÌÏ×" -#: src/lang.c:2918 +#: src/lang.c:2926 #, fuzzy msgid "Filename for all mailed articles, sets, no filename=do not save." msgstr "" "éÍÑ ÆÁÊÌÁ ÄÌÑ ×ÓÅÈ ÏÔÐÒÁ×ÌÅÎÎÙÈ ÓÔÁÔÅÊ. ÕÓÔÁÎÏ×ÉÔØ, ÎÅ ÉÍÅÎÉ=ÎÅ " "ÓÏÈÒÁÎÑÔØ." -#: src/lang.c:2919 +#: src/lang.c:2927 msgid "Mailbox to save sent mails" msgstr "" -#: src/lang.c:2924 +#: src/lang.c:2932 #, fuzzy msgid "Set Followup-To: header to this group(s). sets, cancels." msgstr "÷×ÅÄÉÔÅ ÆÏÒÍÁÔ ÓÔÒÏËÉ. ÕÓÔÁÎÏ×ÉÔØ, ÏÔÍÅÎÁ." -#: src/lang.c:2925 +#: src/lang.c:2933 msgid "Followup-To: header" msgstr "" -#: src/lang.c:2930 +#: src/lang.c:2938 #, fuzzy msgid "Enter default mail address (and fullname). sets, cancels." msgstr "÷×ÅÄÉÔÅ email ÁÄÒÅÓ (É ÐÏÌÎÏÅ ÉÍÑ). ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:2937 +#: src/lang.c:2945 #, fuzzy msgid "" "Path and options for ispell-like spell-checker. sets, cancels." msgstr "ðÒÏÇÒÁÍÍÙ ÄÌÑ ÏÔËÒÙÔÉÑ URL. ÕÓÔÁÎÏ×ÉÔØ, ÏÔÍÅÎÁ" -#: src/lang.c:2938 +#: src/lang.c:2946 msgid "Ispell program" msgstr "" -#: src/lang.c:2944 +#: src/lang.c:2952 msgid "When group is a mailing list, send responses to this email address." msgstr "" -#: src/lang.c:2945 +#: src/lang.c:2953 #, fuzzy msgid "Mailing list address" msgstr "ïÔÐÒÁ×ÉÔØ ÌÏÇ-ÓÏÏÂÝÅÎÉÅ %s\n" -#: src/lang.c:2951 +#: src/lang.c:2959 msgid "Forward articles as attachment" msgstr "" -#: src/lang.c:2956 +#: src/lang.c:2964 msgid "" "A comma separated list of MIME major/minor Content-Types. cancels." msgstr "" -#: src/lang.c:2957 +#: src/lang.c:2965 msgid "Which MIME types will be saved" msgstr "" -#: src/lang.c:2962 +#: src/lang.c:2970 #, fuzzy msgid "Value of the Organization: header. sets, cancels." msgstr "÷×ÅÄÉÔÅ ÆÏÒÍÁÔ ÓÔÒÏËÉ. ÕÓÔÁÎÏ×ÉÔØ, ÏÔÍÅÎÁ." -#: src/lang.c:2963 +#: src/lang.c:2971 msgid "Organization: header" msgstr "" -#: src/lang.c:2968 +#: src/lang.c:2976 #, fuzzy msgid "Filename for saved articles. sets, cancels." msgstr "÷×ÅÄÉÔÅ ÆÏÒÍÁÔ ÓÔÒÏËÉ. ÕÓÔÁÎÏ×ÉÔØ, ÏÔÍÅÎÁ." -#: src/lang.c:2969 +#: src/lang.c:2977 #, fuzzy msgid "savefile" msgstr "óÏÈÒÁÎÉÔØ × ÆÁÊÌ> " -#: src/lang.c:2974 src/lang.c:2998 +#: src/lang.c:2982 src/lang.c:3006 #, fuzzy msgid "Scope for the filter rule. sets, cancels." msgstr "÷×ÅÄÉÔÅ ÆÏÒÍÁÔ ÓÔÒÏËÉ. ÕÓÔÁÎÏ×ÉÔØ, ÏÔÍÅÎÁ." -#: src/lang.c:2975 +#: src/lang.c:2983 #, fuzzy msgid "Quick (1 key) select filter scope" msgstr "äÏÂÁ×ÉÔØ ÆÉÌØÔÒ ÂÙÓÔÒÏÇÏ ×ÙÂÏÒÁ?" -#: src/lang.c:2980 src/lang.c:3004 +#: src/lang.c:2988 src/lang.c:3012 #, fuzzy msgid "Header for filter rule. sets, cancels." msgstr "÷×ÅÄÉÔÅ ÆÏÒÍÁÔ ÓÔÒÏËÉ. ÕÓÔÁÎÏ×ÉÔØ, ÏÔÍÅÎÁ." -#: src/lang.c:2981 +#: src/lang.c:2989 msgid "Quick (1 key) select filter header" msgstr "" -#: src/lang.c:2986 src/lang.c:3010 +#: src/lang.c:2994 src/lang.c:3018 #, fuzzy msgid "ON = case sensitive, OFF = ignore case. sets, cancels." msgstr "÷×ÅÄÉÔÅ ÆÏÒÍÁÔ ÓÔÒÏËÉ. ÕÓÔÁÎÏ×ÉÔØ, ÏÔÍÅÎÁ." -#: src/lang.c:2987 +#: src/lang.c:2995 #, fuzzy msgid "Quick (1 key) select filter case" msgstr "äÏÂÁ×ÉÔØ ÆÉÌØÔÒ ÂÙÓÔÒÏÇÏ ×ÙÂÏÒÁ?" -#: src/lang.c:2992 src/lang.c:3016 +#: src/lang.c:3000 src/lang.c:3024 #, fuzzy msgid "ON = expire, OFF = don't ever expire. sets, cancels." msgstr "÷×ÅÄÉÔÅ ÆÏÒÍÁÔ ÓÔÒÏËÉ. ÕÓÔÁÎÏ×ÉÔØ, ÏÔÍÅÎÁ." -#: src/lang.c:2993 +#: src/lang.c:3001 msgid "Quick (1 key) select filter expire" msgstr "" -#: src/lang.c:2999 +#: src/lang.c:3007 #, fuzzy msgid "Quick (1 key) kill filter scope" msgstr "äÏÂÁ×ÉÔØ ÆÉÌØÔÒ ÂÙÓÔÒÏÇÏ ÕÎÉÞÔÏÖÅÎÉÑ?" -#: src/lang.c:3005 +#: src/lang.c:3013 msgid "Quick (1 key) kill filter header" msgstr "" -#: src/lang.c:3011 +#: src/lang.c:3019 #, fuzzy msgid "Quick (1 key) kill filter case" msgstr "äÏÂÁ×ÉÔØ ÆÉÌØÔÒ ÂÙÓÔÒÏÇÏ ÕÎÉÞÔÏÖÅÎÉÑ?" -#: src/lang.c:3017 +#: src/lang.c:3025 msgid "Quick (1 key) kill filter expire" msgstr "" -#: src/lang.c:3023 +#: src/lang.c:3031 msgid "Assume this charset if no charset declaration is present, to set." msgstr "" -#: src/lang.c:3024 +#: src/lang.c:3032 msgid "UNDECLARED_CHARSET" msgstr "" -#: src/lang.c:3030 +#: src/lang.c:3038 #, fuzzy msgid "" "Add this text at the start of the message body. sets, cancels." @@ -8011,51 +8010,51 @@ msgstr "" "÷×ÅÄÉÔÅ ÓÉÍ×ÏÌ ÄÌÑ ÏÔÍÅÔËÉ ÓÔÁÔÅÊ × ÄÉÁÐÁÚÏÎÅ. ÕÓÔÁÎÏ×ÉÔØ, " "ÏÔÍÅÎÉÔØ." -#: src/lang.c:3031 +#: src/lang.c:3039 msgid "X_Body" msgstr "" -#: src/lang.c:3036 +#: src/lang.c:3044 #, fuzzy msgid "Insert this header when posting. sets, cancels." msgstr "÷×ÅÄÉÔÅ ÆÏÒÍÁÔ ÓÔÒÏËÉ. ÕÓÔÁÎÏ×ÉÔØ, ÏÔÍÅÎÁ." -#: src/lang.c:3037 +#: src/lang.c:3045 msgid "X_Headers" msgstr "" -#: src/lang.c:3042 +#: src/lang.c:3050 #, fuzzy msgid "" "Automatically insert an X-Comment-To: header? toggles & sets." msgstr "" "åÓÌÉ ON, ÔÏ ÄÏÂÁ×ÌÑÔØ ÚÁÇÏÌÏ×ÏË User-Agent:. <ðòïâåì> ×ÙÂÏÒ, ÕÓÔÁÎÏ×ÉÔØ." -#: src/lang.c:3043 +#: src/lang.c:3051 #, fuzzy msgid "Insert 'X-Comment-To:' header" msgstr "äÏÂÁ×ÌÑÔØ ÚÁÇÏÌÏ×ÏË 'X-Comment-To:'" #. TODO: lang.c -#: src/main.c:801 +#: src/main.c:812 msgid "reading from local spool" msgstr "" -#: src/misc.c:3868 +#: src/misc.c:3878 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "÷ÅÒÓÉÑ: %s %s ÒÅÌÉÚ %s (\"%s\") %s %s\n" -#: src/misc.c:3871 +#: src/misc.c:3881 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "÷ÅÒÓÉÑ: %s %s ÒÅÌÉÚ %s (\"%s\")\n" -#: src/newsrc.c:453 +#: src/newsrc.c:457 msgid "Unreachable?\n" msgstr "îÅÄÏÓÔÉÖÉÍÏ?\n" -#: src/nntplib.c:817 +#: src/nntplib.c:822 #, c-format msgid "" "\n" @@ -8064,30 +8063,30 @@ msgstr "" "\n" "óÅÒ×ÅÒ ÎÅ ÏÔ×ÅÞÁÅÔ, ÐÏÐÙÔËÁ ÓÏÅÄÉÎÉÔØÓÑ ÓÎÏ×Á # %d\n" -#: src/nntplib.c:844 +#: src/nntplib.c:849 #, fuzzy msgid "NNTP connection error. Exiting..." msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÅÄÉÎÉÔØÓÑ Ó NNTP ÓÅÒ×ÅÒÏÍ %s. ÷ÙÈÏÄ..." -#: src/nntplib.c:856 src/nntplib.c:1835 +#: src/nntplib.c:861 src/nntplib.c:1852 msgid "Rejoin current group\n" msgstr "÷ÓÔÕÐÉÔØ ÓÎÏ×Á × ÔÅËÕÝÕÀ ÇÒÕÐÐÕ\n" -#: src/nntplib.c:864 src/nntplib.c:1843 +#: src/nntplib.c:869 src/nntplib.c:1860 #, c-format msgid "Read (%s)\n" msgstr "þÔÅÎÉÅ (%s)\n" -#: src/nntplib.c:866 +#: src/nntplib.c:871 #, c-format msgid "Resend last command (%s)\n" msgstr "ðÅÒÅÓÌÁÔØ ÐÏÓÌÅÄÎÀÀ ËÏÍÁÎÄÕ (%s)\n" -#: src/nntplib.c:1482 +#: src/nntplib.c:1500 msgid "CAPABILITIES did not announce READER" msgstr "" -#: src/nntplib.c:1989 +#: src/nntplib.c:2006 msgid "MOTD: " msgstr "" @@ -8156,7 +8155,7 @@ msgstr "[- îÅÄÏÓÔÕÐÎÏ -]" #. * preamble #. * TODO: -> lang.c #. -#: src/rfc2047.c:1308 +#: src/rfc2047.c:1322 #, c-format msgid "" "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" @@ -8239,6 +8238,17 @@ msgstr "Slrnface ÎÅÐÒÁ×ÉÌØÎÏ ÚÁ×ÅÒÛÅÎÁ Ó msgid "Slrnface failed: %s." msgstr "Slrnface: ÏÛÉÂËÁ ÚÁÐÕÓËÁ: %s." +#~ msgid "Active file corrupt - %s" +#~ msgstr "Active ÆÁÊÌ ÐÏ×ÒÅÖģΠ- %s" + +#~ msgid "Invalid response to GROUP command, %s" +#~ msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÏÔ×ÅÔ ÎÁ ËÏÍÁÎÄÕ GROUP, %s" + +#, fuzzy +#~ msgid "" +#~ "Wrong newsgroup name (\"%s\") in response of \"GROUP %s\" command: \"%s\"" +#~ msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ÉÍÑ ÇÒÕÐÐÙ × ÏÔ×ÅÔÅ ÎÁ ËÏÍÁÎÄÕ GROUP, %s ÄÌÑ %s" + #~ msgid "Enter maximum length of newsgroup names displayed. sets." #~ msgstr "íÁËÓÉÍÁÌØÎÁÑ ÄÌÉÎÁ ÉͣΠÇÒÕÐÐ ÐÒÉ ×Ù×ÏÄÅ. ÕÓÔÁÎÏ×ÉÔØ." Binary files tin-2.4.2/po/sv.gmo and tin-2.4.3/po/sv.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.2/po/sv.po tin-2.4.3/po/sv.po --- tin-2.4.2/po/sv.po 2017-12-08 09:39:46.000000000 +0100 +++ tin-2.4.3/po/sv.po 2018-12-24 10:02:05.366985790 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 1.8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-08 09:39+0100\n" +"POT-Creation-Date: 2018-12-24 10:02+0100\n" "PO-Revision-Date: 2006-01-11 21:22+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -16,474 +16,474 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/attrib.c:954 +#: src/attrib.c:964 #, fuzzy msgid "Processing attributes... " msgstr "Skriver attributfil... " -#: src/attrib.c:1176 +#: src/attrib.c:1186 #, c-format msgid "" "# Do not edit this comment block\n" "#\n" msgstr "" -#: src/attrib.c:1177 +#: src/attrib.c:1187 #, c-format msgid "# scope=STRING (eg. alt.*,!alt.bin*) [mandatory]\n" msgstr "" -#: src/attrib.c:1178 +#: src/attrib.c:1188 #, c-format msgid "# add_posted_to_filter=ON/OFF\n" msgstr "" -#: src/attrib.c:1179 +#: src/attrib.c:1189 #, c-format msgid "# advertising=ON/OFF\n" msgstr "" -#: src/attrib.c:1180 +#: src/attrib.c:1190 #, c-format msgid "# alternative_handling=ON/OFF\n" msgstr "" -#: src/attrib.c:1181 +#: src/attrib.c:1191 #, c-format msgid "# ask_for_metamail=ON/OFF\n" msgstr "" -#: src/attrib.c:1182 +#: src/attrib.c:1192 #, c-format msgid "# auto_cc_bcc=NUM\n" msgstr "" -#: src/attrib.c:1183 +#: src/attrib.c:1193 #, c-format msgid "# 0=No, 1=Cc, 2=Bcc, 3=Cc and Bcc\n" msgstr "" -#: src/attrib.c:1184 +#: src/attrib.c:1194 #, c-format msgid "# auto_list_thread=ON/OFF\n" msgstr "" -#: src/attrib.c:1185 +#: src/attrib.c:1195 #, c-format msgid "# auto_save=ON/OFF\n" msgstr "" -#: src/attrib.c:1186 +#: src/attrib.c:1196 #, c-format msgid "# auto_select=ON/OFF\n" msgstr "" -#: src/attrib.c:1187 +#: src/attrib.c:1197 #, c-format msgid "# batch_save=ON/OFF\n" msgstr "" -#: src/attrib.c:1188 +#: src/attrib.c:1198 #, c-format msgid "# date_format=STRING (eg. %%a, %%d %%b %%Y %%H:%%M:%%S)\n" msgstr "" -#: src/attrib.c:1189 +#: src/attrib.c:1199 #, c-format msgid "# delete_tmp_files=ON/OFF\n" msgstr "" -#: src/attrib.c:1190 +#: src/attrib.c:1200 #, c-format msgid "# editor_format=STRING (eg. %%E +%%N %%F)\n" msgstr "" -#: src/attrib.c:1191 +#: src/attrib.c:1201 #, c-format msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "" -#: src/attrib.c:1192 +#: src/attrib.c:1202 #, c-format msgid "# followup_to=STRING\n" msgstr "" -#: src/attrib.c:1193 +#: src/attrib.c:1203 #, c-format msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "" -#: src/attrib.c:1194 +#: src/attrib.c:1204 #, c-format msgid "# group_catchup_on_exit=ON/OFF\n" msgstr "" -#: src/attrib.c:1195 +#: src/attrib.c:1205 #, c-format msgid "# group_format=STRING (eg. %%n %%m %%R %%L %%s %%F)\n" msgstr "" -#: src/attrib.c:1196 +#: src/attrib.c:1206 #, c-format msgid "# mail_8bit_header=ON/OFF\n" msgstr "" -#: src/attrib.c:1197 +#: src/attrib.c:1207 #, c-format msgid "# mail_mime_encoding=supported_encoding" msgstr "" -#: src/attrib.c:1205 +#: src/attrib.c:1215 #, c-format msgid "# ispell=STRING\n" msgstr "" -#: src/attrib.c:1207 +#: src/attrib.c:1217 #, c-format msgid "# maildir=STRING (eg. ~/Mail)\n" msgstr "" -#: src/attrib.c:1208 +#: src/attrib.c:1218 #, c-format msgid "# mailing_list=STRING (eg. majordomo@example.org)\n" msgstr "" -#: src/attrib.c:1209 +#: src/attrib.c:1219 #, c-format msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "" -#: src/attrib.c:1210 +#: src/attrib.c:1220 #, c-format msgid "# mark_ignore_tags=ON/OFF\n" msgstr "" -#: src/attrib.c:1211 +#: src/attrib.c:1221 #, c-format msgid "# mark_saved_read=ON/OFF\n" msgstr "" -#: src/attrib.c:1212 +#: src/attrib.c:1222 #, c-format msgid "# mime_forward=ON/OFF\n" msgstr "" -#: src/attrib.c:1214 +#: src/attrib.c:1224 #, c-format msgid "# mm_network_charset=supported_charset" msgstr "" -#: src/attrib.c:1221 +#: src/attrib.c:1231 #, c-format msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "" -#: src/attrib.c:1223 +#: src/attrib.c:1233 #, c-format msgid "# news_headers_to_display=STRING\n" msgstr "" -#: src/attrib.c:1224 +#: src/attrib.c:1234 #, c-format msgid "# news_headers_to_not_display=STRING\n" msgstr "" -#: src/attrib.c:1225 +#: src/attrib.c:1235 #, c-format msgid "# news_quote_format=STRING\n" msgstr "" -#: src/attrib.c:1226 +#: src/attrib.c:1236 #, c-format msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "" -#: src/attrib.c:1227 +#: src/attrib.c:1237 #, c-format msgid "# pos_first_unread=ON/OFF\n" msgstr "" -#: src/attrib.c:1228 +#: src/attrib.c:1238 #, c-format msgid "# post_8bit_header=ON/OFF\n" msgstr "" -#: src/attrib.c:1229 +#: src/attrib.c:1239 #, c-format msgid "# post_mime_encoding=supported_encoding" msgstr "" -#: src/attrib.c:1236 +#: src/attrib.c:1246 #, c-format msgid "# post_process_type=NUM\n" msgstr "" -#: src/attrib.c:1241 +#: src/attrib.c:1251 #, c-format msgid "# post_process_view=ON/OFF\n" msgstr "" -#: src/attrib.c:1242 +#: src/attrib.c:1252 #, c-format msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "" -#: src/attrib.c:1243 +#: src/attrib.c:1253 #, c-format msgid "# quick_kill_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:1244 +#: src/attrib.c:1254 #, c-format msgid "# quick_kill_case=ON/OFF\n" msgstr "" -#: src/attrib.c:1245 +#: src/attrib.c:1255 #, c-format msgid "# quick_kill_header=NUM\n" msgstr "" -#: src/attrib.c:1246 src/attrib.c:1255 +#: src/attrib.c:1256 src/attrib.c:1265 #, c-format msgid "# 0=Subject: (case sensitive) 1=Subject: (ignore case)\n" msgstr "" -#: src/attrib.c:1247 src/attrib.c:1256 +#: src/attrib.c:1257 src/attrib.c:1266 #, c-format msgid "# 2=From: (case sensitive) 3=From: (ignore case)\n" msgstr "" -#: src/attrib.c:1248 src/attrib.c:1257 +#: src/attrib.c:1258 src/attrib.c:1267 #, c-format msgid "# 4=Message-ID: & full References: line\n" msgstr "" -#: src/attrib.c:1249 src/attrib.c:1258 +#: src/attrib.c:1259 src/attrib.c:1268 #, c-format msgid "# 5=Message-ID: & last References: entry only\n" msgstr "" -#: src/attrib.c:1250 src/attrib.c:1259 +#: src/attrib.c:1260 src/attrib.c:1269 #, c-format msgid "# 6=Message-ID: entry only 7=Lines:\n" msgstr "" -#: src/attrib.c:1251 +#: src/attrib.c:1261 #, c-format msgid "# quick_select_scope=STRING\n" msgstr "" -#: src/attrib.c:1252 +#: src/attrib.c:1262 #, c-format msgid "# quick_select_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:1253 +#: src/attrib.c:1263 #, c-format msgid "# quick_select_case=ON/OFF\n" msgstr "" -#: src/attrib.c:1254 +#: src/attrib.c:1264 #, c-format msgid "# quick_select_header=NUM\n" msgstr "" -#: src/attrib.c:1260 +#: src/attrib.c:1270 #, c-format msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "" -#: src/attrib.c:1262 +#: src/attrib.c:1272 #, c-format msgid "# print_header=ON/OFF\n" msgstr "" -#: src/attrib.c:1264 +#: src/attrib.c:1274 #, c-format msgid "# process_only_unread=ON/OFF\n" msgstr "" -#: src/attrib.c:1265 +#: src/attrib.c:1275 #, c-format msgid "# prompt_followupto=ON/OFF\n" msgstr "" -#: src/attrib.c:1266 +#: src/attrib.c:1276 #, c-format msgid "# savedir=STRING (eg. ~user/News)\n" msgstr "" -#: src/attrib.c:1267 +#: src/attrib.c:1277 #, c-format msgid "# savefile=STRING (eg. =linux)\n" msgstr "" -#: src/attrib.c:1268 +#: src/attrib.c:1278 #, c-format msgid "# sigfile=STRING (eg. $var/sig)\n" msgstr "" -#: src/attrib.c:1269 +#: src/attrib.c:1279 #, c-format msgid "# show_author=NUM\n" msgstr "" -#: src/attrib.c:1275 +#: src/attrib.c:1285 #, c-format msgid "# show_signatures=ON/OFF\n" msgstr "" -#: src/attrib.c:1276 +#: src/attrib.c:1286 #, c-format msgid "# show_only_unread_arts=ON/OFF\n" msgstr "" -#: src/attrib.c:1277 +#: src/attrib.c:1287 #, c-format msgid "# sigdashes=ON/OFF\n" msgstr "" -#: src/attrib.c:1278 +#: src/attrib.c:1288 #, c-format msgid "# signature_repost=ON/OFF\n" msgstr "" -#: src/attrib.c:1279 +#: src/attrib.c:1289 #, c-format msgid "# sort_article_type=NUM\n" msgstr "" -#: src/attrib.c:1297 +#: src/attrib.c:1307 #, c-format msgid "# sort_threads_type=NUM\n" msgstr "" -#: src/attrib.c:1306 +#: src/attrib.c:1316 #, c-format msgid "# start_editor_offset=ON/OFF\n" msgstr "" -#: src/attrib.c:1307 +#: src/attrib.c:1317 #, c-format msgid "# tex2iso_conv=ON/OFF\n" msgstr "" -#: src/attrib.c:1308 +#: src/attrib.c:1318 #, c-format msgid "# thread_catchup_on_exit=ON/OFF\n" msgstr "" -#: src/attrib.c:1309 +#: src/attrib.c:1319 #, c-format msgid "# thread_articles=NUM" msgstr "" -#: src/attrib.c:1316 +#: src/attrib.c:1326 #, c-format msgid "# thread_format=STRING (eg. %%n %%m [%%L] %%T %%F)\n" msgstr "" -#: src/attrib.c:1317 +#: src/attrib.c:1327 #, c-format msgid "# thread_perc=NUM\n" msgstr "" -#: src/attrib.c:1318 +#: src/attrib.c:1328 #, c-format msgid "# trim_article_body=NUM\n" msgstr "" -#: src/attrib.c:1319 +#: src/attrib.c:1329 #, c-format msgid "# 0 = Don't trim article body\n" msgstr "" -#: src/attrib.c:1320 +#: src/attrib.c:1330 #, c-format msgid "# 1 = Skip leading blank lines\n" msgstr "" -#: src/attrib.c:1321 +#: src/attrib.c:1331 #, c-format msgid "# 2 = Skip trailing blank lines\n" msgstr "" -#: src/attrib.c:1322 +#: src/attrib.c:1332 #, c-format msgid "# 3 = Skip leading and trailing blank lines\n" msgstr "" -#: src/attrib.c:1323 +#: src/attrib.c:1333 #, c-format msgid "# 4 = Compact multiple blank lines between text blocks\n" msgstr "" -#: src/attrib.c:1324 +#: src/attrib.c:1334 #, c-format msgid "" "# 5 = Compact multiple blank lines between text blocks and skip\n" "# leading blank lines\n" msgstr "" -#: src/attrib.c:1325 +#: src/attrib.c:1335 #, c-format msgid "" "# 6 = Compact multiple blank lines between text blocks and skip\n" "# trailing blank lines\n" msgstr "" -#: src/attrib.c:1326 +#: src/attrib.c:1336 #, c-format msgid "" "# 7 = Compact multiple blank lines between text blocks and skip\n" "# leading and trailing blank lines\n" msgstr "" -#: src/attrib.c:1327 +#: src/attrib.c:1337 #, c-format msgid "# verbatim_handling=ON/OFF\n" msgstr "" -#: src/attrib.c:1329 +#: src/attrib.c:1339 #, c-format msgid "# extquote_handling=ON/OFF\n" msgstr "" -#: src/attrib.c:1331 +#: src/attrib.c:1341 #, c-format msgid "# wrap_on_next_unread=ON/OFF\n" msgstr "" -#: src/attrib.c:1332 +#: src/attrib.c:1342 #, c-format msgid "# x_body=STRING (eg. ~/.tin/extra-body-text)\n" msgstr "" -#: src/attrib.c:1333 +#: src/attrib.c:1343 #, c-format msgid "# x_comment_to=ON/OFF\n" msgstr "" -#: src/attrib.c:1334 +#: src/attrib.c:1344 #, c-format msgid "# x_headers=STRING (eg. ~/.tin/extra-headers)\n" msgstr "" -#: src/attrib.c:1335 +#: src/attrib.c:1345 #, c-format msgid "" "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "" -#: src/attrib.c:1336 +#: src/attrib.c:1346 #, c-format msgid "" "# entries first followed by group specific entries.\n" "#\n" msgstr "" -#: src/attrib.c:1337 +#: src/attrib.c:1347 #, c-format msgid "############################################################################\n" msgstr "" @@ -777,57 +777,52 @@ msgstr "" #: src/lang.c:107 #, c-format -msgid "Active file corrupt - %s" -msgstr "" - -#: src/lang.c:108 -#, c-format msgid "" "Article to be posted resulted in errors/warnings. %s=quit, %s=Menu, %s=edit: " msgstr "" -#: src/lang.c:109 +#: src/lang.c:108 #, c-format msgid "Unrecognized attribute: %s" msgstr "" -#: src/lang.c:110 +#: src/lang.c:109 #, c-format msgid "Bad command. Type '%s' for help." msgstr "Felaktigt kommando. Skriv \"%s\" för hjälp." -#: src/lang.c:112 +#: src/lang.c:111 msgid "Base article" msgstr "" -#: src/lang.c:113 +#: src/lang.c:112 msgid "Base article range" msgstr "" -#: src/lang.c:114 +#: src/lang.c:113 #, c-format msgid "%s: Updating of index files not supported: cache_overview_files=%s" msgstr "" -#: src/lang.c:115 +#: src/lang.c:114 msgid "*** Beginning of article ***" msgstr "*** Början av artikel ***" -#: src/lang.c:116 +#: src/lang.c:115 #, fuzzy msgid "*** Beginning of page ***" msgstr "*** Början av artikel ***" -#: src/lang.c:118 +#: src/lang.c:117 #, c-format msgid "Cancel (delete) or supersede (overwrite) article [%%s]? (%s/%s/%s): " msgstr "" -#: src/lang.c:119 +#: src/lang.c:118 msgid "Cancelling article..." msgstr "" -#: src/lang.c:121 +#: src/lang.c:120 #, c-format msgid "Cannot create %s" msgstr "Kan inte skapa %s" @@ -1302,147 +1297,142 @@ msgstr "" msgid "Insecure permissions of %s (%o)" msgstr "" -#: src/lang.c:242 -#, c-format -msgid "Invalid response to GROUP command, %s" -msgstr "" - -#: src/lang.c:247 +#: src/lang.c:244 #, c-format msgid "MIME parse error: Unexpected end of %s/%s article" msgstr "" -#: src/lang.c:248 +#: src/lang.c:245 msgid "MIME parse error: Start boundary whilst reading headers" msgstr "" -#: src/lang.c:249 +#: src/lang.c:246 msgid "" "\n" "Error: \"poster\" is not allowed in Newsgroups!\n" msgstr "" -#: src/lang.c:250 +#: src/lang.c:247 msgid "Can't get a (fully-qualified) domain-name!" msgstr "" -#: src/lang.c:251 +#: src/lang.c:248 #, c-format msgid "No permissions to go into %s\n" msgstr "Inga rättigheter att gå in i %s\n" -#: src/lang.c:253 +#: src/lang.c:250 msgid "" "\n" "Error: From: line missing.\n" msgstr "" -#: src/lang.c:255 +#: src/lang.c:252 #, c-format msgid "No read permissions for %s\n" msgstr "Inga läsrättigheter för %s\n" -#: src/lang.c:256 +#: src/lang.c:253 #, c-format msgid "File %s does not exist\n" msgstr "Filen %s existerar inte\n" -#: src/lang.c:257 +#: src/lang.c:254 #, c-format msgid "No write permissions for %s\n" msgstr "Inga skrivrättigheter för %s\n" -#: src/lang.c:258 +#: src/lang.c:255 msgid "Can't get user information (/etc/passwd missing?)" msgstr "" -#: src/lang.c:259 +#: src/lang.c:256 msgid "errors" msgstr "fel" -#: src/lang.c:261 +#: src/lang.c:258 #, c-format msgid "" "\n" "Error on line %d: \"Sender:\" header not allowed (it will be added for you)\n" msgstr "" -#: src/lang.c:263 +#: src/lang.c:260 #, c-format msgid "Server has non of the groups listed in %s" msgstr "" -#: src/lang.c:264 +#: src/lang.c:261 msgid "error" msgstr "fel" -#: src/lang.c:265 +#: src/lang.c:262 msgid "Unknown display level" msgstr "" -#: src/lang.c:266 +#: src/lang.c:263 msgid "" msgstr "" -#: src/lang.c:267 +#: src/lang.c:264 msgid "Exiting..." msgstr "Avslutar..." -#: src/lang.c:268 +#: src/lang.c:265 msgid "leaving external mail-reader" msgstr "" -#: src/lang.c:269 +#: src/lang.c:266 #, c-format msgid "Extracting %s..." msgstr "extraherar %s..." -#: src/lang.c:271 +#: src/lang.c:268 #, c-format msgid "Error writing %s file. Filesystem full? File reset to previous state." msgstr "" -#: src/lang.c:272 +#: src/lang.c:269 #, c-format msgid "Error making backup of %s file. Filesystem full?" msgstr "" -#: src/lang.c:273 +#: src/lang.c:270 #, c-format msgid "Filtering global rules (%d/%d)..." msgstr "" -#: src/lang.c:274 +#: src/lang.c:271 msgid "Rule created by: " msgstr "" -#: src/lang.c:275 +#: src/lang.c:272 #, c-format msgid "Enter pattern [%s]> " msgstr "Ange mönster [%s]> " -#: src/lang.c:276 +#: src/lang.c:273 #, c-format msgid "" "\n" "You requested followups to your article to go to the following %s:\n" msgstr "" -#: src/lang.c:277 +#: src/lang.c:274 #, c-format msgid " %s\t Answers will be directed to you by mail.\n" msgstr "" -#: src/lang.c:278 +#: src/lang.c:275 msgid "-- forwarded message --\n" msgstr "-- vidarebefordrat meddelande --\n" -#: src/lang.c:279 +#: src/lang.c:276 #, fuzzy msgid "-- end of forwarded message --\n" msgstr "Vidarebefordrat meddelande (slut)\n" -#: src/lang.c:280 +#: src/lang.c:277 msgid "" "# Format:\n" "# comment=STRING Optional. Multiple lines allowed. Comments must be " @@ -1469,6 +1459,10 @@ msgid "" "# gnksa=[<>]?NUM Optional. GNKSA parse_from() return code. '<' or '>' " "opt.\n" "# xref=PATTERN Optional. Kill pattern (e.g. alt.flame*)\n" +"# path=PATTERN Optional. Kill pattern (e.g. news.example.org)\n" +"# Be aware that filtering on Path: may significantly " +"slow\n" +"# down the process.\n" "# time=NUM Optional. time_t value when rule expires\n" "#\n" msgstr "" @@ -2497,7 +2491,7 @@ msgstr "Inget tidigare uttryck" msgid "Operation disabled in no-overwrite mode" msgstr "" -#. TODO: replace hardcoded key-name in txt_info_postponed +#. TODO: replace hard coded key-name in txt_info_postponed #: src/lang.c:547 #, c-format msgid "%d postponed %s, reuse with ^O...\n" @@ -2523,7 +2517,7 @@ msgstr "" msgid "incomplete " msgstr "ej komplett " -#. TODO: replace hardcoded key-names +#. TODO: replace hard coded key-names #: src/lang.c:554 #, c-format msgid "" @@ -2619,7 +2613,7 @@ msgstr "" #: src/lang.c:587 #, c-format -msgid "Kill Msg-Id: [%s] (f/l/o/n): " +msgid "Kill Msg-ID: [%s] (f/l/o/n): " msgstr "" #: src/lang.c:588 @@ -3115,7 +3109,7 @@ msgstr "" msgid "Post a followup..." msgstr "Posta en uppföljning..." -#. TODO: replace hardcoded key-name in txt_post_error_ask_postpone +#. TODO: replace hard coded key-name in txt_post_error_ask_postpone #: src/lang.c:716 msgid "" "An error has occurred while posting the article. If you think that this\n" @@ -3175,225 +3169,230 @@ msgstr "Märkt %s" msgid "Untagged %s" msgstr "" -#: src/lang.c:730 +#: src/lang.c:731 +#, c-format +msgid "Preparing for filtering on Path header (%d/%d)..." +msgstr "" + +#: src/lang.c:733 msgid "Processing mail messages marked for deletion." msgstr "" -#: src/lang.c:731 +#: src/lang.c:734 msgid "Processing saved articles marked for deletion." msgstr "" -#: src/lang.c:732 +#: src/lang.c:735 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "" -#: src/lang.c:733 +#: src/lang.c:736 msgid "Article unchanged, abort mailing?" msgstr "" -#: src/lang.c:734 +#: src/lang.c:737 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "" -#: src/lang.c:736 +#: src/lang.c:739 msgid "Add quick kill filter?" msgstr "" -#: src/lang.c:737 +#: src/lang.c:740 msgid "Add quick selection filter?" msgstr "" -#: src/lang.c:738 +#: src/lang.c:741 msgid "Do you really want to quit?" msgstr "Vill du verkligen avsluta?" -#: src/lang.c:739 +#: src/lang.c:742 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "" -#: src/lang.c:740 +#: src/lang.c:743 msgid "You have tagged articles in this group - quit anyway?" msgstr "" -#: src/lang.c:741 +#: src/lang.c:744 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "" -#: src/lang.c:742 +#: src/lang.c:745 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "" -#: src/lang.c:743 +#: src/lang.c:746 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "" -#: src/lang.c:744 +#: src/lang.c:747 msgid "Do you really want to quit without saving your configuration?" msgstr "Vill du verkligen avsluta utan att spara din konfiguration?" -#: src/lang.c:747 +#: src/lang.c:750 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "" -#: src/lang.c:749 +#: src/lang.c:752 msgid "Do you want to abort this operation?" msgstr "Vill du avbryta denna operation?" -#: src/lang.c:750 +#: src/lang.c:753 msgid "Do you want to exit tin immediately?" msgstr "Vill du avsluta tin omedelbart?" -#: src/lang.c:752 +#: src/lang.c:755 msgid "Reading ('q' to quit)..." msgstr "Läser (\"q\" för att avsluta)..." -#: src/lang.c:753 +#: src/lang.c:756 #, c-format msgid "Reading %sarticles..." msgstr "Läser %sarticles..." -#: src/lang.c:754 +#: src/lang.c:757 #, c-format msgid "Reading %sattributes file...\n" msgstr "Läser %sattributfil...\n" -#: src/lang.c:755 +#: src/lang.c:758 #, c-format msgid "Reading %sconfig file...\n" msgstr "Läser %skonfigurationsfil...\n" -#: src/lang.c:756 +#: src/lang.c:759 msgid "Reading filter file...\n" msgstr "Läser filterfil...\n" -#: src/lang.c:757 +#: src/lang.c:760 #, c-format msgid "Reading %s groups..." msgstr "Läser %s grupper..." -#: src/lang.c:758 +#: src/lang.c:761 msgid "Reading input history file...\n" msgstr "" -#: src/lang.c:759 +#: src/lang.c:762 msgid "Reading keymap file...\n" msgstr "" -#: src/lang.c:760 +#: src/lang.c:763 msgid "Reading groups from active file... " msgstr "Läser grupper från aktiv fil..." -#: src/lang.c:761 +#: src/lang.c:764 msgid "Reading groups from newsrc file... " msgstr "" -#: src/lang.c:762 +#: src/lang.c:765 msgid "Reading newsgroups file... " msgstr "" -#: src/lang.c:763 +#: src/lang.c:766 msgid "Reading newsrc file..." msgstr "" -#: src/lang.c:764 +#: src/lang.c:767 msgid "References: line " msgstr "" -#: src/lang.c:766 +#: src/lang.c:769 #, c-format msgid "(%d:%02d remaining)" msgstr "(%d:%02d återstår)" -#: src/lang.c:768 +#: src/lang.c:771 #, c-format msgid "Bogus group %s removed." msgstr "" -#: src/lang.c:769 +#: src/lang.c:772 msgid "Removed from the previous rule: " msgstr "" -#: src/lang.c:770 +#: src/lang.c:773 #, c-format msgid "Error: rename %s to %s" msgstr "Fel: byt namn på %s till %s" -#: src/lang.c:771 +#: src/lang.c:774 msgid "Reply to author..." msgstr "" -#: src/lang.c:772 +#: src/lang.c:775 msgid "Repost" msgstr "" -#: src/lang.c:773 +#: src/lang.c:776 msgid "Reposting article..." msgstr "" -#: src/lang.c:774 +#: src/lang.c:777 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "" -#: src/lang.c:775 +#: src/lang.c:778 msgid "Reset newsrc?" msgstr "Återställ newsrc?" -#: src/lang.c:776 +#: src/lang.c:779 msgid "Responses have been directed to the following newsgroups" msgstr "" -#: src/lang.c:777 +#: src/lang.c:780 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " msgstr "" -#: src/lang.c:779 +#: src/lang.c:782 msgid "Press to continue..." msgstr "Tryck för att fortsätta..." -#: src/lang.c:781 +#: src/lang.c:784 #, c-format msgid "Select From [%s] (y/n): " msgstr "" -#: src/lang.c:782 +#: src/lang.c:785 msgid "Select Lines: (num): " msgstr "Välj rader: (num): " -#: src/lang.c:783 +#: src/lang.c:786 msgid "Auto-select Article Menu" msgstr "" -#: src/lang.c:784 +#: src/lang.c:787 #, c-format -msgid "Select Msg-Id [%s] (f/l/o/n): " +msgid "Select Msg-ID [%s] (f/l/o/n): " msgstr "" -#: src/lang.c:785 +#: src/lang.c:788 msgid "Select pattern scope: " msgstr "" -#: src/lang.c:786 +#: src/lang.c:789 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "" -#: src/lang.c:787 +#: src/lang.c:790 msgid "Select text pattern : " msgstr "" -#: src/lang.c:788 +#: src/lang.c:791 msgid "Select time in days : " msgstr "Välj tid i dagar : " -#: src/lang.c:789 +#: src/lang.c:792 #, c-format msgid "" "# %s server configuration file\n" @@ -3406,54 +3405,54 @@ msgid "" "\n" msgstr "" -#: src/lang.c:795 +#: src/lang.c:798 msgid "Showing unread groups only" msgstr "Visar endast olästa grupper" -#: src/lang.c:796 +#: src/lang.c:799 msgid "Subject: line (ignore case) " msgstr "" -#: src/lang.c:797 +#: src/lang.c:800 msgid "Subject: line (case sensitive)" msgstr "" -#: src/lang.c:798 +#: src/lang.c:801 msgid "Save" msgstr "Spara" -#: src/lang.c:799 +#: src/lang.c:802 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "Spara \"%s\" (%s/%s)?" -#: src/lang.c:800 +#: src/lang.c:803 msgid "Save configuration before continuing?" msgstr "Spara konfiguration före du fortsätter?" -#: src/lang.c:801 +#: src/lang.c:804 msgid "Save filename> " msgstr "Spara filnamn> " -#: src/lang.c:802 +#: src/lang.c:805 msgid "Saved" msgstr "Sparad" -#: src/lang.c:803 +#: src/lang.c:806 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "" -#: src/lang.c:804 +#: src/lang.c:807 #, c-format msgid "Saved %s...\n" msgstr "Sparade %s...\n" -#: src/lang.c:805 +#: src/lang.c:808 msgid "Nothing was saved" msgstr "Ingenting sparades" -#: src/lang.c:806 +#: src/lang.c:809 #, c-format msgid "" "\n" @@ -3462,213 +3461,213 @@ msgstr "" "\n" "%s %d %s från %d %s\n" -#: src/lang.c:807 +#: src/lang.c:810 #, c-format msgid "-- %s saved to %s%s --" msgstr "-- %s sparad till %s%s --" -#: src/lang.c:808 +#: src/lang.c:811 #, c-format msgid "-- %s saved to %s - %s --" msgstr "-- %s sparad till %s - %s --" -#: src/lang.c:809 +#: src/lang.c:812 msgid "Saving..." msgstr "Sparar..." -#: src/lang.c:810 +#: src/lang.c:813 #, c-format msgid "%s: Screen initialization failed" msgstr "" -#: src/lang.c:812 +#: src/lang.c:815 #, c-format msgid "%s: screen is too small\n" msgstr "%s: skärm är för liten\n" -#: src/lang.c:814 +#: src/lang.c:817 #, fuzzy, c-format msgid "screen is too small, %s is exiting" msgstr "skärm är för liten, %s avslutas\n" -#: src/lang.c:815 +#: src/lang.c:818 msgid "Delete scope?" msgstr "" -#: src/lang.c:816 +#: src/lang.c:819 #, fuzzy msgid "Enter scope> " msgstr "Ange mönster [%s]> " -#: src/lang.c:817 +#: src/lang.c:820 msgid "Select new position> " msgstr "" -#: src/lang.c:818 +#: src/lang.c:821 msgid "New position cannot be a global scope" msgstr "" -#: src/lang.c:819 +#: src/lang.c:822 msgid "Global scope, operation not allowed" msgstr "" -#: src/lang.c:820 +#: src/lang.c:823 msgid "Rename scope> " msgstr "" -#: src/lang.c:821 +#: src/lang.c:824 #, fuzzy msgid "Select scope> " msgstr "Välj grupp> " -#: src/lang.c:822 +#: src/lang.c:825 #, fuzzy msgid "Scopes Menu" msgstr "Alternativmenyn" -#: src/lang.c:823 +#: src/lang.c:826 #, fuzzy msgid "Scopes Menu Commands" msgstr "Toppnivåkommandon" -#: src/lang.c:824 +#: src/lang.c:827 #, c-format msgid "Search backwards [%s]> " msgstr "Sök bakåt [%s]> " -#: src/lang.c:825 +#: src/lang.c:828 #, c-format msgid "Search body [%s]> " msgstr "" -#: src/lang.c:826 +#: src/lang.c:829 #, c-format msgid "Search forwards [%s]> " msgstr "Sök framåt [%s]> " -#: src/lang.c:827 +#: src/lang.c:830 msgid "Searching..." msgstr "Söker..." -#: src/lang.c:828 +#: src/lang.c:831 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "" -#: src/lang.c:829 +#: src/lang.c:832 msgid "Select article> " msgstr "Välj artikel> " -#: src/lang.c:830 +#: src/lang.c:833 msgid "" "Select option number before text or use arrow keys and . 'q' to quit." msgstr "" "Välj alternativnummer före texten eller använd piltangenter och . \"q\" " "avsluta." -#: src/lang.c:831 +#: src/lang.c:834 msgid "Select group> " msgstr "Välj grupp> " -#: src/lang.c:832 +#: src/lang.c:835 #, c-format msgid "Enter selection pattern [%s]> " msgstr "" -#: src/lang.c:833 +#: src/lang.c:836 #, fuzzy msgid "Select thread> " msgstr "Välj tråd > " -#: src/lang.c:834 +#: src/lang.c:837 #, c-format msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" msgstr "" -#: src/lang.c:835 +#: src/lang.c:838 msgid "servers active-file" msgstr "" -#: src/lang.c:836 +#: src/lang.c:839 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "" -#: src/lang.c:837 +#: src/lang.c:840 msgid "" msgstr "" -#: src/lang.c:838 +#: src/lang.c:841 #, c-format msgid "Starting: (%s)" msgstr "Startar: (%s)" -#: src/lang.c:839 +#: src/lang.c:842 #, c-format msgid "List Thread (%d of %d)" msgstr "Lista tråd (%d av %d)" -#: src/lang.c:840 +#: src/lang.c:843 #, c-format msgid "Thread (%.*s)" msgstr "Tråd (%.*s)" -#: src/lang.c:841 +#: src/lang.c:844 msgid "Enter wildcard subscribe pattern> " msgstr "" -#: src/lang.c:842 +#: src/lang.c:845 #, c-format msgid "subscribed to %d groups" msgstr "" -#: src/lang.c:843 +#: src/lang.c:846 #, c-format msgid "Subscribed to %s" msgstr "" -#: src/lang.c:844 +#: src/lang.c:847 msgid "Subscribing... " msgstr "" -#: src/lang.c:845 +#: src/lang.c:848 #, c-format msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " msgstr "" -#: src/lang.c:846 +#: src/lang.c:849 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "" -#: src/lang.c:847 +#: src/lang.c:850 msgid "Superseding article ..." msgstr "" -#: src/lang.c:848 +#: src/lang.c:851 #, c-format msgid "" "\n" "Stopped. Type 'fg' to restart %s\n" msgstr "" -#: src/lang.c:850 +#: src/lang.c:853 #, c-format msgid "%d days" msgstr "%d dagar" -#: src/lang.c:851 +#: src/lang.c:854 msgid "" msgstr "" -#: src/lang.c:852 +#: src/lang.c:855 msgid "TeX " msgstr "TeX " -#: src/lang.c:853 +#: src/lang.c:856 msgid "# Default action/prompt strings\n" msgstr "" -#: src/lang.c:854 +#: src/lang.c:857 msgid "" "# Defaults for quick (1 key) kill & auto-selection filters\n" "# header=NUM 0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n" @@ -3679,145 +3678,140 @@ msgid "" "# expire=ON/OFF ON=limit to default_filter_days OFF=don't ever expire\n" msgstr "" -#: src/lang.c:867 +#: src/lang.c:870 msgid "" "# If ON use print current subject or newsgroup description in the last line\n" msgstr "" -#: src/lang.c:868 +#: src/lang.c:871 msgid "# Host & time info used for detecting new groups (don't touch)\n" msgstr "" -#: src/lang.c:869 +#: src/lang.c:872 msgid "There is no news\n" msgstr "" -#: src/lang.c:870 +#: src/lang.c:873 msgid "Thread" msgstr "Tråd" -#: src/lang.c:871 +#: src/lang.c:874 msgid "Thread Level Commands" msgstr "" -#: src/lang.c:872 +#: src/lang.c:875 msgid "Thread deselected" msgstr "" -#: src/lang.c:873 +#: src/lang.c:876 msgid "Thread selected" msgstr "" -#: src/lang.c:875 +#: src/lang.c:878 msgid "threads" msgstr "trådar" -#: src/lang.c:877 +#: src/lang.c:880 msgid "thread" msgstr "tråd" -#: src/lang.c:878 +#: src/lang.c:881 #, c-format msgid "Thread %4s of %4s" msgstr "Tråd %4s av %4s" -#: src/lang.c:879 +#: src/lang.c:882 msgid "Threading articles..." msgstr "Trådar artiklar..." -#: src/lang.c:880 +#: src/lang.c:883 #, c-format msgid "Toggled word highlighting %s" msgstr "" -#: src/lang.c:881 +#: src/lang.c:884 msgid "Toggled rot13 encoding" msgstr "" -#: src/lang.c:882 +#: src/lang.c:885 #, c-format msgid "Toggled german TeX encoding %s" msgstr "" -#: src/lang.c:883 +#: src/lang.c:886 #, c-format msgid "Toggled tab-width to %d" msgstr "" -#: src/lang.c:885 +#: src/lang.c:888 #, c-format msgid "%d Trying to dotlock %s" msgstr "" -#: src/lang.c:886 +#: src/lang.c:889 #, c-format msgid "%d Trying to lock %s" msgstr "%d Försöker att låsa %s" -#: src/lang.c:888 +#: src/lang.c:891 msgid " h=help" msgstr " h=hjälp" -#: src/lang.c:890 +#: src/lang.c:893 msgid "Unlimited" msgstr "Obegränsad" -#: src/lang.c:891 +#: src/lang.c:894 msgid "Enter wildcard unsubscribe pattern> " msgstr "" -#: src/lang.c:892 +#: src/lang.c:895 #, c-format msgid "Error decoding %s : %s" msgstr "Fel vid avkodning av %s : %s" -#: src/lang.c:893 +#: src/lang.c:896 msgid "No end." msgstr "Inget slut." -#: src/lang.c:894 +#: src/lang.c:897 #, c-format msgid "%s successfully decoded." msgstr "%s lyckades avkodas." -#: src/lang.c:895 +#: src/lang.c:898 #, c-format msgid "" "%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" "\n" msgstr "" -#: src/lang.c:896 +#: src/lang.c:899 msgid "unread " msgstr "oläst " -#: src/lang.c:897 +#: src/lang.c:900 #, c-format msgid "unsubscribed from %d groups" msgstr "" -#: src/lang.c:898 +#: src/lang.c:901 #, c-format msgid "Unsubscribed from %s" msgstr "" -#: src/lang.c:899 +#: src/lang.c:902 msgid "Unsubscribing... " msgstr "" -#: src/lang.c:900 +#: src/lang.c:903 msgid "Unthreading articles..." msgstr "" -#: src/lang.c:901 +#: src/lang.c:904 msgid "Updated" msgstr "Uppdaterad" -#: src/lang.c:903 -#, c-format -msgid "unparseable \"LIST COUNTS\" line: \"%s\"" -msgstr "" - #: src/lang.c:905 msgid "Updating" msgstr "Uppdaterar" @@ -3980,22 +3974,27 @@ msgstr "" #: src/lang.c:939 #, c-format +msgid "%s only useful for batch or debug mode operations\n" +msgstr "" + +#: src/lang.c:940 +#, c-format msgid "Useless combination %s and %s. Ignoring %s.\n" msgstr "" -#: src/lang.c:941 +#: src/lang.c:942 #, c-format msgid "" "\n" "%s%d out of range (0 - %d). Reset to 0" msgstr "" -#: src/lang.c:942 +#: src/lang.c:943 #, c-format msgid "View '%s' (%s/%s)?" msgstr "Visa \"%s\" (%s/%s)?" -#: src/lang.c:944 +#: src/lang.c:945 #, c-format msgid "" "\n" @@ -4003,33 +4002,33 @@ msgid "" "%-100s\n" msgstr "" -#: src/lang.c:945 +#: src/lang.c:946 msgid "" "\n" "Warning: article unchanged after editing\n" msgstr "" -#: src/lang.c:946 +#: src/lang.c:947 msgid "" "\n" "Warning: \"Subject:\" contains only whitespaces.\n" msgstr "" -#: src/lang.c:947 +#: src/lang.c:948 msgid "" "\n" "Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:" "\".\n" msgstr "" -#: src/lang.c:949 +#: src/lang.c:950 msgid "" "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" " with \"Re: \" and does not contain \"(was:\".\n" msgstr "" -#: src/lang.c:952 +#: src/lang.c:953 msgid "" "Read carefully!\n" "\n" @@ -4043,7 +4042,7 @@ msgid "" "\n" msgstr "" -#: src/lang.c:956 +#: src/lang.c:957 msgid "" "\n" "Warning: You are using a non-plain transfer encoding (such as base64 or\n" @@ -4052,13 +4051,13 @@ msgid "" " not be encoded properly.\n" msgstr "" -#: src/lang.c:961 +#: src/lang.c:962 msgid "" "\n" "Warning: \"example\" is a reserved hierarchy!\n" msgstr "" -#: src/lang.c:962 +#: src/lang.c:963 #, c-format msgid "" "\n" @@ -4068,7 +4067,7 @@ msgid "" "Read WHATSNEW, etc...\n" msgstr "" -#: src/lang.c:964 +#: src/lang.c:965 #, c-format msgid "" "\n" @@ -4077,7 +4076,7 @@ msgid "" "Some values in your %s file may be ignored, others might have changed!\n" msgstr "" -#: src/lang.c:967 +#: src/lang.c:968 #, c-format msgid "" "Warning: tin wrote fewer groups to your\n" @@ -4087,19 +4086,19 @@ msgid "" "before you start tin once again!\n" msgstr "" -#: src/lang.c:971 +#: src/lang.c:972 #, c-format msgid "" "\n" "Warning: Found %d '-- \\n' lines, this may confuse some people.\n" msgstr "" -#: src/lang.c:972 +#: src/lang.c:973 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "" -#: src/lang.c:973 +#: src/lang.c:974 #, c-format msgid "" "\n" @@ -4110,49 +4109,49 @@ msgid "" " possible.\n" msgstr "" -#: src/lang.c:977 +#: src/lang.c:978 #, c-format msgid "" "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " msgstr "" -#: src/lang.c:978 +#: src/lang.c:979 msgid "" "\n" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" msgstr "" -#: src/lang.c:979 +#: src/lang.c:980 msgid "Writing attributes file..." msgstr "Skriver attributfil..." -#: src/lang.c:981 +#: src/lang.c:982 #, c-format msgid "%d Responses" msgstr "%d svar" -#: src/lang.c:983 +#: src/lang.c:984 #, c-format msgid "Added %d %s" msgstr "Lade till %d %s" -#: src/lang.c:984 +#: src/lang.c:985 msgid "No unsubscribed groups to show" msgstr "" -#: src/lang.c:985 +#: src/lang.c:986 msgid "Showing subscribed to groups only" msgstr "" -#: src/lang.c:986 +#: src/lang.c:987 msgid "Yes " msgstr "Ja " -#: src/lang.c:987 +#: src/lang.c:988 msgid " You have mail" msgstr " Du har post" -#: src/lang.c:992 +#: src/lang.c:993 #, c-format msgid "" "\n" @@ -4165,11 +4164,11 @@ msgid "" " M)enu option.\n" msgstr "" -#: src/lang.c:1003 +#: src/lang.c:1004 msgid " -D mode debug mode" msgstr "" -#: src/lang.c:1007 +#: src/lang.c:1008 msgid "" "Read carefully!\n" "\n" @@ -4186,11 +4185,11 @@ msgid "" "\n" msgstr "" -#: src/lang.c:1016 +#: src/lang.c:1017 msgid "toggle color" msgstr "växla färg" -#: src/lang.c:1017 +#: src/lang.c:1018 msgid "" "# Changing colors of several screen parts\n" "# Possible values are:\n" @@ -4215,219 +4214,214 @@ msgid "" "\n" msgstr "" -#: src/lang.c:1037 +#: src/lang.c:1038 msgid " -a toggle color flag" msgstr "" -#: src/lang.c:1041 +#: src/lang.c:1042 msgid "" "\n" "Error: Followup-To set to more than one newsgroup!\n" msgstr "" -#: src/lang.c:1042 +#: src/lang.c:1043 #, c-format msgid "" "\n" "Error: \"%s\" is renamed, use \"%s\" instead!\n" msgstr "" -#: src/lang.c:1043 +#: src/lang.c:1044 #, c-format msgid "" "\n" "Error: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "" -#: src/lang.c:1044 +#: src/lang.c:1045 #, c-format msgid "" "\n" "Error: \"%s\" is not a valid newsgroup!\n" msgstr "" -#: src/lang.c:1046 +#: src/lang.c:1047 msgid "" "\n" "Warning: Followup-To set to more than one newsgroup!\n" msgstr "" -#: src/lang.c:1047 +#: src/lang.c:1048 #, c-format msgid "" "\n" "Warning: \"%s\" is renamed, you should use \"%s\" instead!\n" msgstr "" -#: src/lang.c:1048 +#: src/lang.c:1049 #, c-format msgid "" "\n" "Warning: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "" -#: src/lang.c:1049 +#: src/lang.c:1050 #, c-format msgid "" "\n" "Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n" msgstr "" -#: src/lang.c:1050 +#: src/lang.c:1051 #, c-format msgid "" "\n" "Warning: \"%s\" is not a valid newsgroup at this site!\n" msgstr "" -#: src/lang.c:1054 +#: src/lang.c:1055 #, c-format msgid "%d files successfully written from %d articles. %d %s occurred." msgstr "" -#: src/lang.c:1055 +#: src/lang.c:1056 msgid "Missing parts." msgstr "" -#: src/lang.c:1056 +#: src/lang.c:1057 msgid "No beginning." msgstr "Ingen början." -#: src/lang.c:1057 +#: src/lang.c:1058 msgid "No data." msgstr "Inget data." -#: src/lang.c:1058 +#: src/lang.c:1059 msgid "Unknown error." msgstr "Okänt fel." -#: src/lang.c:1061 +#: src/lang.c:1062 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "\tKontrollsumma för %s (%ld %s)" -#: src/lang.c:1066 +#: src/lang.c:1067 msgid "Reading mail active file... " msgstr "" -#: src/lang.c:1067 +#: src/lang.c:1068 msgid "Reading mailgroups file... " msgstr "" -#: src/lang.c:1071 +#: src/lang.c:1072 msgid "perform PGP operations on article" msgstr "genomför PGP-operationer på artikel" -#: src/lang.c:1072 +#: src/lang.c:1073 msgid "Add key(s) to public keyring?" msgstr "" -#: src/lang.c:1073 +#: src/lang.c:1074 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "%s=kryptera, %s=signera, %s=båda, %s=avsluta: " -#: src/lang.c:1074 +#: src/lang.c:1075 #, c-format msgid "%s=sign, %s=sign & include public key, %s=quit: " msgstr "%s=signera, %s=signera & inkludera publik nyckel, %s=avsluta: " -#: src/lang.c:1075 +#: src/lang.c:1076 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "" -#: src/lang.c:1076 +#: src/lang.c:1077 msgid "Article not signed and no public keys found" msgstr "" -#: src/lang.c:1078 +#: src/lang.c:1079 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:1079 +#: src/lang.c:1080 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " msgstr "" -#: src/lang.c:1080 +#: src/lang.c:1081 #, c-format msgid "" "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:1082 +#: src/lang.c:1083 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:1083 +#: src/lang.c:1084 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "" -#: src/lang.c:1084 +#: src/lang.c:1085 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:1088 +#: src/lang.c:1089 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:1089 +#: src/lang.c:1090 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "" -#: src/lang.c:1090 +#: src/lang.c:1091 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:1092 +#: src/lang.c:1093 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:1093 +#: src/lang.c:1094 #, c-format msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "" -#: src/lang.c:1094 +#: src/lang.c:1095 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:1103 +#: src/lang.c:1104 msgid "Try cache_overview_files to speed up things.\n" msgstr "" -#: src/lang.c:1104 +#: src/lang.c:1105 msgid "Tin will use local index files instead.\n" msgstr "" -#: src/lang.c:1105 +#: src/lang.c:1106 msgid "Cannot find NNTP server name" msgstr "" -#: src/lang.c:1106 +#: src/lang.c:1107 #, c-format msgid "Connecting to %s:%u..." msgstr "Ansluter till %s:%u..." -#: src/lang.c:1107 -msgid "Disconnecting from server...\n" -msgstr "Kopplar ner från server...\n" - #: src/lang.c:1108 -#, c-format -msgid "" -"Wrong newsgroup name (\"%s\") in response of \"GROUP %s\" command: \"%s\"" -msgstr "" +#, fuzzy +msgid "Disconnecting from server..." +msgstr "Kopplar ner från server...\n" #: src/lang.c:1109 #, c-format @@ -5173,96 +5167,100 @@ msgstr "" msgid "NFD" msgstr "" -#: src/lang.c:1586 +#: src/lang.c:1580 +msgid "NFKC case fold" +msgstr "" + +#: src/lang.c:1589 msgid "Display Options" msgstr "Visningsalternativ" -#: src/lang.c:1593 +#: src/lang.c:1596 msgid "Color Options" msgstr "" -#: src/lang.c:1599 +#: src/lang.c:1602 #, fuzzy msgid "Highlight Options" msgstr "Visningsalternativ" -#: src/lang.c:1606 +#: src/lang.c:1609 msgid "Article-Limiting Options" msgstr "" -#: src/lang.c:1612 +#: src/lang.c:1615 msgid "Posting/Mailing Options" msgstr "" -#: src/lang.c:1618 +#: src/lang.c:1621 msgid "Saving/Printing Options" msgstr "" -#: src/lang.c:1624 +#: src/lang.c:1627 msgid "Expert Options" msgstr "" -#: src/lang.c:1630 +#: src/lang.c:1633 msgid "Filtering Options" msgstr "" -#: src/lang.c:1635 src/lang.c:1666 src/lang.c:1672 src/lang.c:1699 -#: src/lang.c:1751 src/lang.c:1757 src/lang.c:1767 src/lang.c:1778 -#: src/lang.c:1796 src/lang.c:1865 src/lang.c:2066 src/lang.c:2072 -#: src/lang.c:2078 src/lang.c:2084 src/lang.c:2096 src/lang.c:2103 -#: src/lang.c:2157 src/lang.c:2166 src/lang.c:2172 src/lang.c:2179 -#: src/lang.c:2186 src/lang.c:2193 src/lang.c:2200 src/lang.c:2207 -#: src/lang.c:2214 src/lang.c:2221 src/lang.c:2228 src/lang.c:2235 -#: src/lang.c:2242 src/lang.c:2249 src/lang.c:2256 src/lang.c:2263 -#: src/lang.c:2270 src/lang.c:2277 src/lang.c:2284 src/lang.c:2291 -#: src/lang.c:2298 src/lang.c:2305 src/lang.c:2312 src/lang.c:2319 -#: src/lang.c:2326 src/lang.c:2333 src/lang.c:2340 src/lang.c:2348 -#: src/lang.c:2364 src/lang.c:2371 src/lang.c:2378 src/lang.c:2385 -#: src/lang.c:2391 src/lang.c:2397 src/lang.c:2414 src/lang.c:2426 -#: src/lang.c:2461 src/lang.c:2514 src/lang.c:2528 src/lang.c:2534 -#: src/lang.c:2559 src/lang.c:2577 src/lang.c:2594 src/lang.c:2606 -#: src/lang.c:2639 src/lang.c:2675 src/lang.c:2695 src/lang.c:2730 -#: src/lang.c:2740 src/lang.c:2747 src/lang.c:2773 src/lang.c:2797 -#: src/lang.c:2870 src/lang.c:2884 src/lang.c:2892 src/lang.c:2906 -#: src/lang.c:2912 src/lang.c:2950 +#: src/lang.c:1638 src/lang.c:1669 src/lang.c:1675 src/lang.c:1702 +#: src/lang.c:1754 src/lang.c:1760 src/lang.c:1770 src/lang.c:1781 +#: src/lang.c:1799 src/lang.c:1868 src/lang.c:2069 src/lang.c:2075 +#: src/lang.c:2081 src/lang.c:2087 src/lang.c:2099 src/lang.c:2106 +#: src/lang.c:2160 src/lang.c:2169 src/lang.c:2175 src/lang.c:2182 +#: src/lang.c:2189 src/lang.c:2196 src/lang.c:2203 src/lang.c:2210 +#: src/lang.c:2217 src/lang.c:2224 src/lang.c:2231 src/lang.c:2238 +#: src/lang.c:2245 src/lang.c:2252 src/lang.c:2259 src/lang.c:2266 +#: src/lang.c:2273 src/lang.c:2280 src/lang.c:2287 src/lang.c:2294 +#: src/lang.c:2301 src/lang.c:2308 src/lang.c:2315 src/lang.c:2322 +#: src/lang.c:2329 src/lang.c:2336 src/lang.c:2343 src/lang.c:2351 +#: src/lang.c:2367 src/lang.c:2374 src/lang.c:2381 src/lang.c:2388 +#: src/lang.c:2394 src/lang.c:2400 src/lang.c:2417 src/lang.c:2429 +#: src/lang.c:2464 src/lang.c:2517 src/lang.c:2531 src/lang.c:2537 +#: src/lang.c:2562 src/lang.c:2580 src/lang.c:2597 src/lang.c:2609 +#: src/lang.c:2642 src/lang.c:2678 src/lang.c:2698 src/lang.c:2733 +#: src/lang.c:2743 src/lang.c:2750 src/lang.c:2776 src/lang.c:2800 +#: src/lang.c:2877 src/lang.c:2892 src/lang.c:2900 src/lang.c:2914 +#: src/lang.c:2920 src/lang.c:2958 msgid " toggles, sets, cancels." msgstr "" -#: src/lang.c:1636 +#: src/lang.c:1639 msgid "Show mini menu & posting etiquette" msgstr "" -#: src/lang.c:1637 +#: src/lang.c:1640 msgid "" "# If ON show a mini menu of useful commands at each level\n" "# and posting etiquette after composing an article\n" msgstr "" -#: src/lang.c:1642 +#: src/lang.c:1645 msgid "Show short description for each newsgroup. toggles & sets." msgstr "" -#: src/lang.c:1643 +#: src/lang.c:1646 msgid "Show description of each newsgroup" msgstr "" -#: src/lang.c:1644 +#: src/lang.c:1647 msgid "" "# If ON show group description text after newsgroup name at\n" "# group selection level\n" msgstr "" -#: src/lang.c:1649 +#: src/lang.c:1652 msgid "" "Show From (author) fields in group & thread level. toggles & " "sets." msgstr "" -#: src/lang.c:1650 +#: src/lang.c:1653 msgid "In group and thread level, show author by" msgstr "" -#: src/lang.c:1651 +#: src/lang.c:1654 msgid "" "# Part of From field to display in group and thread level\n" "# Possible values are (the default is marked with *):\n" @@ -5272,31 +5270,31 @@ msgid "" "# 3 = both\n" msgstr "" -#: src/lang.c:1660 +#: src/lang.c:1663 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "" -#: src/lang.c:1661 +#: src/lang.c:1664 msgid "Draw -> instead of highlighted bar" msgstr "" -#: src/lang.c:1662 +#: src/lang.c:1665 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "" -#: src/lang.c:1667 +#: src/lang.c:1670 msgid "Use inverse video for page headers" msgstr "" -#: src/lang.c:1668 +#: src/lang.c:1671 msgid "# If ON use inverse video for page headers at different levels\n" msgstr "" -#: src/lang.c:1673 +#: src/lang.c:1676 msgid "Thread articles by" msgstr "Tråda artiklar efter" -#: src/lang.c:1674 +#: src/lang.c:1677 msgid "" "# Thread articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5308,15 +5306,15 @@ msgid "" "# 5 = Percentage Match\n" msgstr "" -#: src/lang.c:1685 +#: src/lang.c:1688 msgid "Enter percentage match required to thread together. sets." msgstr "" -#: src/lang.c:1686 +#: src/lang.c:1689 msgid "Thread percentage match" msgstr "" -#: src/lang.c:1688 +#: src/lang.c:1691 #, no-c-format msgid "" "# Thread percentage match...\n" @@ -5331,11 +5329,11 @@ msgid "" "# 'harppy' would be threaded separately from 'happy'\n" msgstr "" -#: src/lang.c:1700 +#: src/lang.c:1703 msgid "Score of a thread" msgstr "" -#: src/lang.c:1701 +#: src/lang.c:1704 msgid "" "# Thread score\n" "# Possible values are (the default is marked with *):\n" @@ -5344,16 +5342,16 @@ msgid "" "# 2 = average\n" msgstr "" -#: src/lang.c:1709 +#: src/lang.c:1712 msgid "" "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "" -#: src/lang.c:1710 +#: src/lang.c:1713 msgid "Sort articles by" msgstr "Sortera artiklar efter" -#: src/lang.c:1711 +#: src/lang.c:1714 msgid "" "# Sort articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5370,15 +5368,15 @@ msgid "" "# 10 = Lines ascending\n" msgstr "" -#: src/lang.c:1727 +#: src/lang.c:1730 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "" -#: src/lang.c:1728 +#: src/lang.c:1731 msgid "Sort threads by" msgstr "Sortera trådar efter" -#: src/lang.c:1729 +#: src/lang.c:1732 msgid "" "# Sort thread by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5389,44 +5387,44 @@ msgid "" "# 4 = Last posting date ascending\n" msgstr "" -#: src/lang.c:1739 +#: src/lang.c:1742 msgid "" "Put cursor at first/last unread art in groups. toggles & sets." msgstr "" -#: src/lang.c:1740 +#: src/lang.c:1743 msgid "Go to first unread article in group" msgstr "välj första artikel i lista" -#: src/lang.c:1741 +#: src/lang.c:1744 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "" -#: src/lang.c:1745 +#: src/lang.c:1748 msgid "Show all articles or only unread articles. toggles & sets." msgstr "" -#: src/lang.c:1746 +#: src/lang.c:1749 msgid "Show only unread articles" msgstr "Visa endast olästa artiklar" -#: src/lang.c:1747 +#: src/lang.c:1750 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "" -#: src/lang.c:1752 +#: src/lang.c:1755 msgid "Show only groups with unread arts" msgstr "" -#: src/lang.c:1753 +#: src/lang.c:1756 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "" -#: src/lang.c:1758 +#: src/lang.c:1761 msgid "Filter which articles" msgstr "Filtrera vilka artiklar" -#: src/lang.c:1759 +#: src/lang.c:1762 msgid "" "# Filter which articles\n" "# Possible values are (the default is marked with *):\n" @@ -5435,11 +5433,11 @@ msgid "" "# 2 = kill all articles and never show them\n" msgstr "" -#: src/lang.c:1768 +#: src/lang.c:1771 msgid "Go to the next unread article with" msgstr "" -#: src/lang.c:1769 +#: src/lang.c:1772 msgid "" "# Go to the unread article with following key(s)\n" "# Possible values are (the default is marked with *):\n" @@ -5449,11 +5447,11 @@ msgid "" "# 3 = PAGE DOWN or TAB\n" msgstr "" -#: src/lang.c:1779 +#: src/lang.c:1782 msgid "How to treat blank lines" msgstr "" -#: src/lang.c:1780 +#: src/lang.c:1783 msgid "" "# Trim the article body, remove unnecessary blank lines.\n" "# Possible values are (the default is marked with *):\n" @@ -5470,168 +5468,168 @@ msgid "" "# leading and trailing blank lines\n" msgstr "" -#: src/lang.c:1797 +#: src/lang.c:1800 msgid "List thread using right arrow key" msgstr "" -#: src/lang.c:1798 +#: src/lang.c:1801 msgid "" "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "" -#: src/lang.c:1802 +#: src/lang.c:1805 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "" -#: src/lang.c:1803 +#: src/lang.c:1806 msgid "Character to show deleted articles" msgstr "" -#: src/lang.c:1804 +#: src/lang.c:1807 msgid "" "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1809 +#: src/lang.c:1812 msgid "" "Enter character to indicate articles in a range. sets, cancels." msgstr "" -#: src/lang.c:1810 +#: src/lang.c:1813 msgid "Character to show inrange articles" msgstr "" -#: src/lang.c:1811 +#: src/lang.c:1814 msgid "" "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1816 +#: src/lang.c:1819 msgid "" "Enter character to indicate that article will return. sets, " "cancels." msgstr "" -#: src/lang.c:1817 +#: src/lang.c:1820 msgid "Character to show returning arts" msgstr "" -#: src/lang.c:1818 +#: src/lang.c:1821 msgid "" "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1823 +#: src/lang.c:1826 msgid "" "Enter character to indicate selected articles. sets, cancels." msgstr "" -#: src/lang.c:1824 +#: src/lang.c:1827 msgid "Character to show selected articles" msgstr "" -#: src/lang.c:1825 +#: src/lang.c:1828 msgid "" "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1830 +#: src/lang.c:1833 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "" -#: src/lang.c:1831 +#: src/lang.c:1834 msgid "Character to show recent articles" msgstr "" -#: src/lang.c:1832 +#: src/lang.c:1835 msgid "" "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1837 +#: src/lang.c:1840 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "" -#: src/lang.c:1838 +#: src/lang.c:1841 msgid "Character to show unread articles" msgstr "" -#: src/lang.c:1839 +#: src/lang.c:1842 msgid "" "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1844 +#: src/lang.c:1847 msgid "Enter character to indicate read articles. sets, cancels." msgstr "" -#: src/lang.c:1845 +#: src/lang.c:1848 msgid "Character to show read articles" msgstr "" -#: src/lang.c:1846 +#: src/lang.c:1849 msgid "" "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1851 +#: src/lang.c:1854 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "" -#: src/lang.c:1852 +#: src/lang.c:1855 msgid "Character to show killed articles" msgstr "" -#: src/lang.c:1853 +#: src/lang.c:1856 msgid "" "# Character used to show that an art was killed (default 'K')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" msgstr "" -#: src/lang.c:1858 +#: src/lang.c:1861 msgid "" "Enter character to indicate read selected articles. sets, cancels." msgstr "" -#: src/lang.c:1859 +#: src/lang.c:1862 msgid "Character to show readselected arts" msgstr "" -#: src/lang.c:1860 +#: src/lang.c:1863 msgid "" "# Character used to show that an art was selected before read (default ':')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" msgstr "" -#: src/lang.c:1866 +#: src/lang.c:1869 msgid "Abbreviate long newsgroup names" msgstr "" -#: src/lang.c:1867 +#: src/lang.c:1870 msgid "" "# If ON abbreviate (if necessary) long newsgroup names at group selection\n" "# level and article level like this:\n" "# news.software.readers -> n.software.readers -> n.s.readers -> n.s.r.\n" msgstr "" -#: src/lang.c:1873 +#: src/lang.c:1876 msgid "" "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" msgstr "" -#: src/lang.c:1874 +#: src/lang.c:1877 msgid "Number of lines to scroll in pager" msgstr "" -#: src/lang.c:1875 +#: src/lang.c:1878 msgid "" "# Number of lines that cursor-up/down will scroll in article pager\n" "# Possible values are (the default is marked with *):\n" @@ -5642,28 +5640,28 @@ msgid "" "# 2 or greater = scroll by 2 or more lines (only in the pager)\n" msgstr "" -#: src/lang.c:1885 +#: src/lang.c:1888 msgid "Display signatures. toggles & sets." msgstr "" -#: src/lang.c:1886 +#: src/lang.c:1889 msgid "Display signatures" msgstr "Visa signaturer" -#: src/lang.c:1887 +#: src/lang.c:1890 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "" -#: src/lang.c:1891 +#: src/lang.c:1894 msgid "" "Display uuencoded data as tagged attachments. toggles & sets." msgstr "" -#: src/lang.c:1892 +#: src/lang.c:1895 msgid "Display uue data as an attachment" msgstr "" -#: src/lang.c:1893 +#: src/lang.c:1896 msgid "" "# Handling of uuencoded data in the pager\n" "# Possible values are (the default is marked with *):\n" @@ -5675,30 +5673,30 @@ msgid "" "# be folded into a tag line.\n" msgstr "" -#: src/lang.c:1903 +#: src/lang.c:1906 msgid "" "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "" -#: src/lang.c:1904 +#: src/lang.c:1907 msgid "Display \"a as Umlaut-a" msgstr "Visa \"a som Umlaut-a" -#: src/lang.c:1905 +#: src/lang.c:1908 msgid "" "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" msgstr "" -#: src/lang.c:1910 src/lang.c:1920 +#: src/lang.c:1913 src/lang.c:1923 msgid "Space separated list of header fields" msgstr "" -#: src/lang.c:1911 +#: src/lang.c:1914 msgid "Display these header fields (or *)" msgstr "" -#: src/lang.c:1912 +#: src/lang.c:1915 msgid "" "# Which news headers you wish to see. If you want to see _all_ the headers,\n" "# place an '*' as this value. This is the only way a wildcard can be used.\n" @@ -5708,11 +5706,11 @@ msgid "" "# spaces. Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1921 +#: src/lang.c:1924 msgid "Do not display these header fields" msgstr "" -#: src/lang.c:1922 +#: src/lang.c:1925 msgid "" "# Same as 'news_headers_to_display' except it denotes the opposite.\n" "# An example of using both options might be if you thought X- headers were\n" @@ -5724,357 +5722,357 @@ msgid "" "# Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1932 +#: src/lang.c:1935 msgid "" "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "" -#: src/lang.c:1933 +#: src/lang.c:1936 msgid "Skip multipart/alternative parts" msgstr "" -#: src/lang.c:1934 +#: src/lang.c:1937 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "" -#: src/lang.c:1938 +#: src/lang.c:1941 msgid "Enable detection of verbatim blocks? toggles & sets." msgstr "" -#: src/lang.c:1939 +#: src/lang.c:1942 msgid "Detection of verbatim blocks" msgstr "" -#: src/lang.c:1940 +#: src/lang.c:1943 msgid "# If ON detect verbatim blocks in articles\n" msgstr "" -#: src/lang.c:1945 +#: src/lang.c:1948 msgid "A regex used to decide which lines to show in col_quote." msgstr "" -#: src/lang.c:1946 +#: src/lang.c:1949 msgid "Regex used to show quoted lines" msgstr "" -#: src/lang.c:1947 +#: src/lang.c:1950 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# quoted when viewing articles. Quoted lines are shown in col_quote.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1953 +#: src/lang.c:1956 msgid "A regex used to decide which lines to show in col_quote2." msgstr "" -#: src/lang.c:1954 +#: src/lang.c:1957 msgid "Regex used to show twice quoted l." msgstr "" -#: src/lang.c:1955 +#: src/lang.c:1958 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# quoted twice. Twice quoted lines are shown in col_quote2.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1961 +#: src/lang.c:1964 msgid "A regex used to decide which lines to show in col_quote3." msgstr "" -#: src/lang.c:1962 +#: src/lang.c:1965 msgid "Regex used to show >= 3 times q.l." msgstr "" -#: src/lang.c:1963 +#: src/lang.c:1966 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# quoted >=3 times. >=3 times quoted lines are shown in col_quote3.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1969 +#: src/lang.c:1972 msgid "Enable detection of external quotes? toggles & sets." msgstr "" -#: src/lang.c:1970 +#: src/lang.c:1973 msgid "Detection of external quotes" msgstr "" -#: src/lang.c:1971 +#: src/lang.c:1974 msgid "# If ON detect quoted text from external sources in articles\n" msgstr "" -#: src/lang.c:1975 +#: src/lang.c:1978 msgid "A regex used to decide which lines to show in col_extquote." msgstr "" -#: src/lang.c:1976 +#: src/lang.c:1979 msgid "Regex used to show quotes from external sources" msgstr "" -#: src/lang.c:1977 +#: src/lang.c:1980 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# external quotes. Text from external quotes is shown in col_extquote.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1984 +#: src/lang.c:1987 msgid "A regex used to decide which words to show in col_markslashes." msgstr "" -#: src/lang.c:1985 +#: src/lang.c:1988 msgid "Regex used to highlight /slashes/" msgstr "" -#: src/lang.c:1986 +#: src/lang.c:1989 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '/' are to be shown in col_markslashes.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1992 +#: src/lang.c:1995 msgid "A regex used to decide which words to show in col_markstars." msgstr "" -#: src/lang.c:1993 +#: src/lang.c:1996 msgid "Regex used to highlight *stars*" msgstr "" -#: src/lang.c:1994 +#: src/lang.c:1997 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '*' are to be shown in col_markstars.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:2000 +#: src/lang.c:2003 msgid "A regex used to decide which words to show in col_markstroke." msgstr "" -#: src/lang.c:2001 +#: src/lang.c:2004 msgid "Regex used to highlight -strokes-" msgstr "" -#: src/lang.c:2002 +#: src/lang.c:2005 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '-' are to be shown in col_markstroke.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:2008 +#: src/lang.c:2011 msgid "A regex used to decide which words to show in col_markdash." msgstr "" -#: src/lang.c:2009 +#: src/lang.c:2012 msgid "Regex used to highlight _underline_" msgstr "" -#: src/lang.c:2010 +#: src/lang.c:2013 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '_' are to be shown in col_markdash.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:2016 +#: src/lang.c:2019 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:2017 +#: src/lang.c:2020 msgid "Regex with Subject prefixes" msgstr "" -#: src/lang.c:2018 +#: src/lang.c:2021 msgid "" "# A regular expression that tin will use to find Subject prefixes\n" "# which will be removed before showing the header.\n" msgstr "" -#: src/lang.c:2023 +#: src/lang.c:2026 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:2024 +#: src/lang.c:2027 msgid "Regex with Subject suffixes" msgstr "" -#: src/lang.c:2025 +#: src/lang.c:2028 msgid "" "# A regular expression that tin will use to find Subject suffixes\n" "# which will be removed when replying or posting followup.\n" msgstr "" -#: src/lang.c:2030 +#: src/lang.c:2033 msgid "A regex used to find the begin of a verbatim block." msgstr "" -#: src/lang.c:2031 +#: src/lang.c:2034 msgid "Regex for begin of a verbatim block" msgstr "" -#: src/lang.c:2032 +#: src/lang.c:2035 msgid "" "# A regular expression that tin will use to find the begin of\n" "# a verbatim block.\n" msgstr "" -#: src/lang.c:2037 +#: src/lang.c:2040 msgid "A regex used to find the end of a verbatim block." msgstr "" -#: src/lang.c:2038 +#: src/lang.c:2041 msgid "Regex for end of a verbatim block" msgstr "" -#: src/lang.c:2039 +#: src/lang.c:2042 msgid "" "# A regular expression that tin will use to find the end of\n" "# a verbatim block.\n" msgstr "" -#: src/lang.c:2044 +#: src/lang.c:2047 msgid "" "Enter name and options for external MIME viewer, --internal for built-in " "viewer" msgstr "" -#: src/lang.c:2045 +#: src/lang.c:2048 msgid "MIME binary content viewer" msgstr "" -#: src/lang.c:2046 +#: src/lang.c:2049 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 " +"# Otherwise specify an external viewer program (eg. metamail) or leave " "blank\n" "# for no automatic viewing\n" msgstr "" -#: src/lang.c:2053 +#: src/lang.c:2056 msgid "Confirm before starting non-text viewing program" msgstr "" -#: src/lang.c:2054 +#: src/lang.c:2057 msgid "Ask before using MIME viewer" msgstr "" -#: src/lang.c:2055 +#: src/lang.c:2058 msgid "" "# If ON tin will ask before using metamail to display MIME messages\n" "# this only happens if metamail_prog is set to something\n" msgstr "" -#: src/lang.c:2060 +#: src/lang.c:2063 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "" -#: src/lang.c:2061 +#: src/lang.c:2064 msgid "Catchup read groups when quitting" msgstr "" -#: src/lang.c:2062 +#: src/lang.c:2065 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "" -#: src/lang.c:2067 +#: src/lang.c:2070 msgid "Catchup group using left key" msgstr "" -#: src/lang.c:2068 +#: src/lang.c:2071 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "" -#: src/lang.c:2073 +#: src/lang.c:2076 msgid "Catchup thread by using left key" msgstr "" -#: src/lang.c:2079 +#: src/lang.c:2082 msgid "Which actions require confirmation" msgstr "" -#: src/lang.c:2080 +#: src/lang.c:2083 msgid "# What should we ask confirmation for.\n" msgstr "" -#: src/lang.c:2085 +#: src/lang.c:2088 msgid "'Mark as (un)read' ignores tags" msgstr "" -#: src/lang.c:2086 +#: src/lang.c:2089 msgid "" "# If ON the 'Mark as (un)read' function marks only the current article.\n" msgstr "" -#: src/lang.c:2090 +#: src/lang.c:2093 msgid "Program to run to open URLs, sets, cancels." msgstr "" -#: src/lang.c:2091 +#: src/lang.c:2094 msgid "Program that opens URLs" msgstr "" -#: src/lang.c:2092 +#: src/lang.c:2095 msgid "# The program used to open URLs. The actual URL will be appended\n" msgstr "" -#: src/lang.c:2097 +#: src/lang.c:2100 msgid "Use mouse in xterm" msgstr "" -#: src/lang.c:2098 +#: src/lang.c:2101 msgid "# If ON enable mouse button support on xterm terminals\n" msgstr "" -#: src/lang.c:2104 +#: src/lang.c:2107 msgid "Use scroll keys on keypad" msgstr "" -#: src/lang.c:2105 +#: src/lang.c:2108 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "" -#: src/lang.c:2110 +#: src/lang.c:2113 msgid "Enter maximum number of article to get. sets." msgstr "" -#: src/lang.c:2111 +#: src/lang.c:2114 msgid "Number of articles to get" msgstr "" -#: src/lang.c:2112 +#: src/lang.c:2115 msgid "" "# Number of articles to get (0=no limit), if negative sets maximum number\n" "# of already read articles to be read before first unread one\n" msgstr "" -#: src/lang.c:2117 +#: src/lang.c:2120 msgid "Enter number of days article is considered recent. sets." msgstr "" -#: src/lang.c:2118 +#: src/lang.c:2121 msgid "Article recentness time limit" msgstr "" -#: src/lang.c:2119 +#: src/lang.c:2122 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "" -#: src/lang.c:2123 +#: src/lang.c:2126 msgid "" "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "" -#: src/lang.c:2124 +#: src/lang.c:2127 msgid "Wildcard matching" msgstr "" -#: src/lang.c:2125 +#: src/lang.c:2128 msgid "" "# Wildcard matching\n" "# Possible values are (the default is marked with *):\n" @@ -6082,328 +6080,328 @@ msgid "" "# 1 = regex\n" msgstr "" -#: src/lang.c:2132 +#: src/lang.c:2135 msgid "Enter minimal score before an article is marked killed. sets." msgstr "" -#: src/lang.c:2133 +#: src/lang.c:2136 msgid "Score limit (kill)" msgstr "" -#: src/lang.c:2134 +#: src/lang.c:2137 msgid "# Score limit before an article is marked killed\n" msgstr "" -#: src/lang.c:2138 +#: src/lang.c:2141 msgid "Enter default score to kill articles. sets." msgstr "" -#: src/lang.c:2139 +#: src/lang.c:2142 msgid "Default score to kill articles" msgstr "" -#: src/lang.c:2140 +#: src/lang.c:2143 msgid "# Default score to kill articles\n" msgstr "" -#: src/lang.c:2144 +#: src/lang.c:2147 msgid "Enter minimal score before an article is marked hot. sets." msgstr "" -#: src/lang.c:2145 +#: src/lang.c:2148 msgid "Score limit (select)" msgstr "" -#: src/lang.c:2146 +#: src/lang.c:2149 msgid "# Score limit before an article is marked hot\n" msgstr "" -#: src/lang.c:2150 +#: src/lang.c:2153 msgid "Enter default score to select articles. sets." msgstr "" -#: src/lang.c:2151 +#: src/lang.c:2154 msgid "Default score to select articles" msgstr "" -#: src/lang.c:2152 +#: src/lang.c:2155 msgid "# Default score to select articles\n" msgstr "" -#: src/lang.c:2158 +#: src/lang.c:2161 msgid "Use slrnface to show ''X-Face:''s" msgstr "" -#: src/lang.c:2159 +#: src/lang.c:2162 msgid "" "# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n" "# Only useful when running in an xterm.\n" msgstr "" -#: src/lang.c:2167 +#: src/lang.c:2170 msgid "Use ANSI color" msgstr "Använd ANSI-färg" -#: src/lang.c:2168 +#: src/lang.c:2171 msgid "# If ON using ANSI-color\n" msgstr "" -#: src/lang.c:2173 +#: src/lang.c:2176 msgid "Standard foreground color" msgstr "" -#: src/lang.c:2174 +#: src/lang.c:2177 msgid "" "# Standard foreground color\n" "# Default: -1 (default color)\n" msgstr "" -#: src/lang.c:2180 +#: src/lang.c:2183 msgid "Standard background color" msgstr "" -#: src/lang.c:2181 +#: src/lang.c:2184 msgid "" "# Standard background color\n" "# Default: -1 (default color)\n" msgstr "" -#: src/lang.c:2187 +#: src/lang.c:2190 msgid "Color for inverse text (background)" msgstr "" -#: src/lang.c:2188 +#: src/lang.c:2191 msgid "" "# Color of background for inverse text\n" "# Default: 4 (blue)\n" msgstr "" -#: src/lang.c:2194 +#: src/lang.c:2197 msgid "Color for inverse text (foreground)" msgstr "" -#: src/lang.c:2195 +#: src/lang.c:2198 msgid "" "# Color of foreground for inverse text\n" "# Default: 7 (white)\n" msgstr "" -#: src/lang.c:2201 +#: src/lang.c:2204 msgid "Color of text lines" msgstr "" -#: src/lang.c:2202 +#: src/lang.c:2205 msgid "" "# Color of text lines\n" "# Default: -1 (default color)\n" msgstr "" -#: src/lang.c:2208 +#: src/lang.c:2211 msgid "Color of mini help menu" msgstr "" -#: src/lang.c:2209 +#: src/lang.c:2212 msgid "" "# Color of mini help menu\n" "# Default: 3 (brown)\n" msgstr "" -#: src/lang.c:2215 +#: src/lang.c:2218 msgid "Color of help text" msgstr "" -#: src/lang.c:2216 +#: src/lang.c:2219 msgid "" "# Color of help pages\n" "# Default: -1 (default color)\n" msgstr "" -#: src/lang.c:2222 +#: src/lang.c:2225 msgid "Color of status messages" msgstr "" -#: src/lang.c:2223 +#: src/lang.c:2226 msgid "" "# Color of messages in last line\n" "# Default: 6 (cyan)\n" msgstr "" -#: src/lang.c:2229 +#: src/lang.c:2232 msgid "Color of quoted lines" msgstr "" -#: src/lang.c:2230 +#: src/lang.c:2233 msgid "" "# Color of quote-lines\n" "# Default: 2 (green)\n" msgstr "" -#: src/lang.c:2236 +#: src/lang.c:2239 msgid "Color of twice quoted line" msgstr "" -#: src/lang.c:2237 +#: src/lang.c:2240 msgid "" "# Color of twice quoted lines\n" "# Default: 3 (brown)\n" msgstr "" -#: src/lang.c:2243 +#: src/lang.c:2246 msgid "Color of =>3 times quoted line" msgstr "" -#: src/lang.c:2244 +#: src/lang.c:2247 msgid "" "# Color of >=3 times quoted lines\n" "# Default: 4 (blue)\n" msgstr "" -#: src/lang.c:2250 +#: src/lang.c:2253 msgid "Color of article header lines" msgstr "" -#: src/lang.c:2251 +#: src/lang.c:2254 msgid "" "# Color of header-lines\n" "# Default: 2 (green)\n" msgstr "" -#: src/lang.c:2257 +#: src/lang.c:2260 msgid "Color of actual news header fields" msgstr "" -#: src/lang.c:2258 +#: src/lang.c:2261 msgid "" "# Color of actual news header fields\n" "# Default: 9 (light red)\n" msgstr "" -#: src/lang.c:2264 +#: src/lang.c:2267 msgid "Color of article subject lines" msgstr "" -#: src/lang.c:2265 +#: src/lang.c:2268 msgid "" "# Color of article subject\n" "# Default: 6 (cyan)\n" msgstr "" -#: src/lang.c:2271 +#: src/lang.c:2274 #, fuzzy msgid "Color of external quotes" msgstr "Färg för signaturer" -#: src/lang.c:2272 +#: src/lang.c:2275 msgid "" "# Color of quoted text from external sources\n" "# Default: 5 (pink)\n" msgstr "" -#: src/lang.c:2278 +#: src/lang.c:2281 msgid "Color of response counter" msgstr "" -#: src/lang.c:2279 +#: src/lang.c:2282 msgid "" "# Color of response counter\n" "# Default: 2 (green)\n" msgstr "" -#: src/lang.c:2285 +#: src/lang.c:2288 msgid "Color of sender (From:)" msgstr "" -#: src/lang.c:2286 +#: src/lang.c:2289 msgid "" "# Color of sender (From:)\n" "# Default: 2 (green)\n" msgstr "" -#: src/lang.c:2292 +#: src/lang.c:2295 msgid "Color of help/mail sign" msgstr "" -#: src/lang.c:2293 +#: src/lang.c:2296 msgid "" "# Color of Help/Mail-Sign\n" "# Default: 4 (blue)\n" msgstr "" -#: src/lang.c:2299 +#: src/lang.c:2302 msgid "Color of signatures" msgstr "Färg för signaturer" -#: src/lang.c:2300 +#: src/lang.c:2303 msgid "" "# Color of signature\n" "# Default: 4 (blue)\n" msgstr "" -#: src/lang.c:2306 +#: src/lang.c:2309 msgid "Color of highlighted URLs" msgstr "" -#: src/lang.c:2307 +#: src/lang.c:2310 msgid "" "# Color of highlighted URLs\n" "# Default: -1 (default color)\n" msgstr "" -#: src/lang.c:2313 +#: src/lang.c:2316 msgid "Color of verbatim blocks" msgstr "" -#: src/lang.c:2314 +#: src/lang.c:2317 msgid "" "# Color of verbatim blocks\n" "# Default: 5 (pink)\n" msgstr "" -#: src/lang.c:2320 +#: src/lang.c:2323 msgid "Color of highlighting with *stars*" msgstr "" -#: src/lang.c:2321 +#: src/lang.c:2324 msgid "" "# Color of word highlighting with *stars*\n" "# Default: 11 (yellow)\n" msgstr "" -#: src/lang.c:2327 +#: src/lang.c:2330 msgid "Color of highlighting with _dash_" msgstr "" -#: src/lang.c:2328 +#: src/lang.c:2331 msgid "" "# Color of word highlighting with _dash_\n" "# Default: 13 (light pink)\n" msgstr "" -#: src/lang.c:2334 +#: src/lang.c:2337 msgid "Color of highlighting with /slash/" msgstr "" -#: src/lang.c:2335 +#: src/lang.c:2338 msgid "" "# Color of word highlighting with /slash/\n" "# Default: 14 (light cyan)\n" msgstr "" -#: src/lang.c:2341 +#: src/lang.c:2344 msgid "Color of highlighting with -stroke-" msgstr "" -#: src/lang.c:2342 +#: src/lang.c:2345 msgid "" "# Color of word highlighting with -stroke-\n" "# Default: 12 (light blue)\n" msgstr "" -#: src/lang.c:2349 +#: src/lang.c:2352 msgid "Attr. of highlighting with *stars*" msgstr "" -#: src/lang.c:2350 +#: src/lang.c:2353 msgid "" "# Attributes of word highlighting on mono terminals\n" "# Possible values are:\n" @@ -6419,57 +6417,57 @@ msgid "" "# Default: 6 (bold)\n" msgstr "" -#: src/lang.c:2365 +#: src/lang.c:2368 msgid "Attr. of highlighting with _dash_" msgstr "" -#: src/lang.c:2366 +#: src/lang.c:2369 msgid "" "# Attribute of word highlighting with _dash_\n" "# Default: 2 (best highlighting)\n" msgstr "" -#: src/lang.c:2372 +#: src/lang.c:2375 msgid "Attr. of highlighting with /slash/" msgstr "" -#: src/lang.c:2373 +#: src/lang.c:2376 msgid "" "# Attribute of word highlighting with /slash/\n" "# Default: 5 (half bright)\n" msgstr "" -#: src/lang.c:2379 +#: src/lang.c:2382 msgid "Attr. of highlighting with -stroke-" msgstr "" -#: src/lang.c:2380 +#: src/lang.c:2383 msgid "" "# Attribute of word highlighting with -stroke-\n" "# Default: 3 (reverse video)\n" msgstr "" -#: src/lang.c:2386 +#: src/lang.c:2389 msgid "URL highlighting in message body" msgstr "" -#: src/lang.c:2387 +#: src/lang.c:2390 msgid "# Enable URL highlighting?\n" msgstr "" -#: src/lang.c:2392 +#: src/lang.c:2395 msgid "Word highlighting in message body" msgstr "" -#: src/lang.c:2393 +#: src/lang.c:2396 msgid "# Enable word highlighting?\n" msgstr "" -#: src/lang.c:2398 +#: src/lang.c:2401 msgid "What to display instead of mark" msgstr "" -#: src/lang.c:2399 +#: src/lang.c:2402 msgid "" "# Should the leading and ending stars and dashes also be displayed,\n" "# even when they are highlighting marks?\n" @@ -6479,56 +6477,56 @@ msgid "" "# * 2 = print a space instead\n" msgstr "" -#: src/lang.c:2408 +#: src/lang.c:2411 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "" -#: src/lang.c:2409 +#: src/lang.c:2412 msgid "Page line wrap column" msgstr "" -#: src/lang.c:2410 +#: src/lang.c:2413 msgid "# Wrap article lines at column\n" msgstr "" -#: src/lang.c:2415 +#: src/lang.c:2418 msgid "Wrap around threads on next unread" msgstr "" -#: src/lang.c:2416 +#: src/lang.c:2419 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "" -#: src/lang.c:2420 +#: src/lang.c:2423 msgid "Enter default mail address (and fullname). sets." msgstr "" -#: src/lang.c:2421 src/lang.c:2931 +#: src/lang.c:2424 src/lang.c:2939 msgid "Mail address (and fullname)" msgstr "E-postadress (och hela namnet)" -#: src/lang.c:2422 +#: src/lang.c:2425 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "" -#: src/lang.c:2427 +#: src/lang.c:2430 msgid "Show empty Followup-To in editor" msgstr "" -#: src/lang.c:2428 +#: src/lang.c:2431 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "" -#: src/lang.c:2432 +#: src/lang.c:2435 msgid "" "Enter path/! command/--none to create your default signature. sets." msgstr "" -#: src/lang.c:2433 +#: src/lang.c:2436 msgid "Create signature from path/command" msgstr "" -#: src/lang.c:2434 +#: src/lang.c:2437 #, c-format msgid "" "# Signature path (random sigs)/file to be used when posting/replying\n" @@ -6538,52 +6536,52 @@ msgid "" "# sigfile=--none don't append a signature\n" msgstr "" -#: src/lang.c:2442 +#: src/lang.c:2445 msgid "" "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "" -#: src/lang.c:2443 +#: src/lang.c:2446 msgid "Prepend signature with \"-- \"" msgstr "" -#: src/lang.c:2444 +#: src/lang.c:2447 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "" -#: src/lang.c:2448 +#: src/lang.c:2451 msgid "Add signature when reposting articles. toggles & sets." msgstr "" -#: src/lang.c:2449 +#: src/lang.c:2452 msgid "Add signature when reposting" msgstr "" -#: src/lang.c:2450 +#: src/lang.c:2453 msgid "# If ON add signature to reposted articles\n" msgstr "" -#: src/lang.c:2454 +#: src/lang.c:2457 #, c-format msgid "Enter quotation marks, %s or %S for author's initials." msgstr "" -#: src/lang.c:2455 +#: src/lang.c:2458 msgid "Characters used as quote-marks" msgstr "" -#: src/lang.c:2456 +#: src/lang.c:2459 #, c-format msgid "" "# Characters used in quoting to followups and replies.\n" "# '_' is replaced by ' ', %s, %S are replaced by author's initials.\n" msgstr "" -#: src/lang.c:2462 +#: src/lang.c:2465 msgid "Quoting behavior" msgstr "" -#: src/lang.c:2463 +#: src/lang.c:2466 msgid "" "# How quoting should be handled when following up or replying.\n" "# Possible values are (the default is marked with *):\n" @@ -6597,52 +6595,52 @@ msgid "" "# 7 = Compress quotes, quote signatures, quote empty lines\n" msgstr "" -#: src/lang.c:2476 src/lang.c:2484 src/lang.c:2490 +#: src/lang.c:2479 src/lang.c:2487 src/lang.c:2493 msgid "" "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "" -#: src/lang.c:2477 +#: src/lang.c:2480 msgid "Quote line when following up" msgstr "" -#: src/lang.c:2478 +#: src/lang.c:2481 msgid "" "# Format of quote line when mailing/posting/following-up an article\n" "# %A Address %D Date %F Addr+Name %G Groupname %M Message-ID\n" "# %N Full Name %C First Name %I Initials\n" msgstr "" -#: src/lang.c:2485 +#: src/lang.c:2488 msgid "Quote line when cross-posting" msgstr "" -#: src/lang.c:2491 +#: src/lang.c:2494 msgid "Quote line when mailing" msgstr "" -#: src/lang.c:2496 +#: src/lang.c:2499 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "" -#: src/lang.c:2497 +#: src/lang.c:2500 msgid "Insert 'User-Agent:' header" msgstr "" -#: src/lang.c:2498 +#: src/lang.c:2501 msgid "# If ON include advertising User-Agent: header\n" msgstr "" -#: src/lang.c:2503 +#: src/lang.c:2506 msgid "" "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" -#: src/lang.c:2504 +#: src/lang.c:2507 msgid "MM_CHARSET" msgstr "MM_CHARSET" -#: src/lang.c:2505 +#: src/lang.c:2508 msgid "" "# Charset supported locally which is also used for MIME header and\n" "# Content-Type header.\n" @@ -6652,41 +6650,41 @@ msgid "" "# mm_charset is considered not displayable and represented as '?'.\n" msgstr "" -#: src/lang.c:2515 +#: src/lang.c:2518 msgid "MM_NETWORK_CHARSET" msgstr "MM_NETWORK_CHARSET" -#: src/lang.c:2516 +#: src/lang.c:2519 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "" -#: src/lang.c:2520 +#: src/lang.c:2523 msgid "" "Enter local charset name (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" -#: src/lang.c:2521 +#: src/lang.c:2524 #, fuzzy msgid "MM_LOCAL_CHARSET" msgstr "MM_CHARSET" -#: src/lang.c:2522 +#: src/lang.c:2525 msgid "# Charset supported locally.\n" msgstr "" -#: src/lang.c:2529 +#: src/lang.c:2532 msgid "Mailbox format" msgstr "Format på postlåda" -#: src/lang.c:2530 +#: src/lang.c:2533 msgid "# Format of the mailbox.\n" msgstr "# Format på postlåda.\n" -#: src/lang.c:2535 +#: src/lang.c:2538 msgid "MIME encoding in news messages" msgstr "" -#: src/lang.c:2536 +#: src/lang.c:2539 msgid "" "# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n" "# for mails and posts, if necessary. QP is efficient for most European\n" @@ -6695,15 +6693,15 @@ msgid "" "# Russian charsets with a lot of 8bit characters.\n" msgstr "" -#: src/lang.c:2544 src/lang.c:2565 +#: src/lang.c:2547 src/lang.c:2568 msgid "Don't change unless you know what you are doing. cancels." msgstr "" -#: src/lang.c:2545 +#: src/lang.c:2548 msgid "Use 8bit characters in news headers" msgstr "" -#: src/lang.c:2546 +#: src/lang.c:2549 msgid "" "# If ON, 8bit characters in news headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -6711,28 +6709,28 @@ msgid "" "# parameter unless post_mime_encoding is 8bit as well.\n" msgstr "" -#: src/lang.c:2553 +#: src/lang.c:2556 msgid "" "Auto-view post-processed files toggles, sets, cancels." msgstr "" -#: src/lang.c:2554 +#: src/lang.c:2557 msgid "View post-processed files" msgstr "" -#: src/lang.c:2555 +#: src/lang.c:2558 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "" -#: src/lang.c:2560 +#: src/lang.c:2563 msgid "MIME encoding in mail messages" msgstr "" -#: src/lang.c:2566 +#: src/lang.c:2569 msgid "Use 8bit characters in mail headers" msgstr "" -#: src/lang.c:2567 +#: src/lang.c:2570 msgid "" "# If ON, 8bit characters in mail headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -6743,36 +6741,36 @@ msgid "" "# turn it ON unless you have some compelling reason.\n" msgstr "" -#: src/lang.c:2578 +#: src/lang.c:2581 msgid "Strip blanks from ends of lines" msgstr "" -#: src/lang.c:2579 +#: src/lang.c:2582 msgid "" "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" msgstr "" -#: src/lang.c:2585 +#: src/lang.c:2588 msgid "If ON, use transliteration. toggles & sets." msgstr "" -#: src/lang.c:2586 +#: src/lang.c:2589 msgid "Transliteration" msgstr "" -#: src/lang.c:2587 +#: src/lang.c:2590 msgid "" "# If ON, use //TRANSLIT extension. This means that when a character cannot\n" "# be represented in the in the target character set, it can be approximated\n" "# through one or several similarly looking characters.\n" msgstr "" -#: src/lang.c:2595 +#: src/lang.c:2598 msgid "Send you a Cc/Bcc automatically" msgstr "" -#: src/lang.c:2596 +#: src/lang.c:2599 msgid "" "# Put your name in the Cc: and/or Bcc: field when mailing an article.\n" "# Possible values are (the default is marked with *):\n" @@ -6782,129 +6780,129 @@ msgid "" "# 3 = Cc and Bcc\n" msgstr "" -#: src/lang.c:2607 +#: src/lang.c:2610 msgid "Hash algorithm for Cancel-Lock/Cancel-Key" msgstr "" -#: src/lang.c:2608 +#: src/lang.c:2611 msgid "" "# Hash algorithm for Cancel-Lock/Cancel-Key (default 'sha1')\n" "# Use 'none' to not generate Cancel-Lock headers.\n" msgstr "" -#: src/lang.c:2614 +#: src/lang.c:2617 msgid "Enter address elements about which you want to be warned. sets." msgstr "" -#: src/lang.c:2615 +#: src/lang.c:2618 msgid "Spamtrap warning address parts" msgstr "" -#: src/lang.c:2616 +#: src/lang.c:2619 msgid "" "# A comma-delimited list of address-parts you want to be warned\n" "# about when trying to reply by email.\n" msgstr "" -#: src/lang.c:2621 +#: src/lang.c:2624 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "" -#: src/lang.c:2622 +#: src/lang.c:2625 msgid "No. of days a filter entry is valid" msgstr "" -#: src/lang.c:2623 +#: src/lang.c:2626 msgid "# Number of days a short term filter will be active\n" msgstr "" -#: src/lang.c:2627 +#: src/lang.c:2630 msgid "Add posted articles to filter. toggles & sets." msgstr "" -#: src/lang.c:2628 +#: src/lang.c:2631 msgid "Add posted articles to filter" msgstr "" -#: src/lang.c:2629 +#: src/lang.c:2632 msgid "" "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" msgstr "" -#: src/lang.c:2633 +#: src/lang.c:2636 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "" -#: src/lang.c:2634 +#: src/lang.c:2637 msgid "Mail directory" msgstr "Postkatalog" -#: src/lang.c:2635 +#: src/lang.c:2638 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "" -#: src/lang.c:2640 +#: src/lang.c:2643 msgid "Save articles in batch mode (-S)" msgstr "" -#: src/lang.c:2641 +#: src/lang.c:2644 msgid "" "# If ON articles/threads will be saved in batch mode when save -S\n" "# or mail (-M/-N) is specified on the command line\n" msgstr "" -#: src/lang.c:2646 +#: src/lang.c:2649 msgid "The directory where you want articles/threads saved." msgstr "" -#: src/lang.c:2647 +#: src/lang.c:2650 msgid "Directory to save arts/threads in" msgstr "" -#: src/lang.c:2648 +#: src/lang.c:2651 msgid "# Directory where articles/threads are saved\n" msgstr "" -#: src/lang.c:2652 +#: src/lang.c:2655 msgid "" "Auto save article/thread by Archive-name: header. toggles & " "sets." msgstr "" -#: src/lang.c:2653 +#: src/lang.c:2656 msgid "Use Archive-name: header for save" msgstr "" -#: src/lang.c:2654 +#: src/lang.c:2657 msgid "" "# If ON articles/threads with Archive-name: in mail header will\n" "# be automatically saved with the Archive-name & part/patch no.\n" msgstr "" -#: src/lang.c:2659 +#: src/lang.c:2662 msgid "" "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "" -#: src/lang.c:2660 +#: src/lang.c:2663 msgid "Mark saved articles/threads as read" msgstr "" -#: src/lang.c:2661 +#: src/lang.c:2664 msgid "# If ON mark articles that are saved as read\n" msgstr "" -#: src/lang.c:2665 +#: src/lang.c:2668 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "" -#: src/lang.c:2666 +#: src/lang.c:2669 msgid "Post process saved articles" msgstr "" -#: src/lang.c:2667 +#: src/lang.c:2670 msgid "" "# Perform post processing (saving binary attachments) from saved articles.\n" "# Possible values are (the default is marked with *):\n" @@ -6913,106 +6911,106 @@ msgid "" "# 2 = yes\n" msgstr "" -#: src/lang.c:2676 +#: src/lang.c:2679 msgid "Process only unread articles" msgstr "" -#: src/lang.c:2677 +#: src/lang.c:2680 msgid "" "# If ON only save/print/pipe/mail unread articles (tagged articles " "excepted)\n" msgstr "" -#: src/lang.c:2682 +#: src/lang.c:2685 msgid "Print all or just part of header. toggles & sets." msgstr "" -#: src/lang.c:2683 +#: src/lang.c:2686 msgid "Print all headers when printing" msgstr "" -#: src/lang.c:2684 +#: src/lang.c:2687 msgid "" "# If ON print all of article header otherwise just the important lines\n" msgstr "" -#: src/lang.c:2688 +#: src/lang.c:2691 msgid "" "The printer program with options that is to be used to print articles/" "threads." msgstr "" -#: src/lang.c:2689 +#: src/lang.c:2692 msgid "Printer program with options" msgstr "" -#: src/lang.c:2690 +#: src/lang.c:2693 msgid "# Print program with parameters used to print articles/threads\n" msgstr "" -#: src/lang.c:2696 +#: src/lang.c:2699 msgid "Force redraw after certain commands" msgstr "" -#: src/lang.c:2697 +#: src/lang.c:2700 msgid "" "# If ON a screen redraw will always be done after certain external commands\n" msgstr "" -#: src/lang.c:2701 +#: src/lang.c:2704 msgid "" "Start editor with line offset. toggles, sets, cancels." msgstr "" -#: src/lang.c:2702 +#: src/lang.c:2705 msgid "Start editor with line offset" msgstr "" -#: src/lang.c:2703 +#: src/lang.c:2706 msgid "" "# If ON editor will be started with cursor offset into the file\n" "# otherwise the cursor will be positioned at the first line\n" msgstr "" -#: src/lang.c:2708 +#: src/lang.c:2711 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "" -#: src/lang.c:2709 +#: src/lang.c:2712 msgid "Invocation of your editor" msgstr "" -#: src/lang.c:2710 +#: src/lang.c:2713 msgid "" "# Format of editor line including parameters\n" "# %E Editor %F Filename %N Linenumber\n" msgstr "" -#: src/lang.c:2715 +#: src/lang.c:2718 msgid "" "Enter name and options for external-inews, --internal for internal inews" msgstr "" -#: src/lang.c:2716 +#: src/lang.c:2719 msgid "External inews" msgstr "Extern inews" -#: src/lang.c:2717 +#: src/lang.c:2720 msgid "" "# If --internal use the built in mini inews for posting via NNTP\n" "# otherwise use an external inews program\n" msgstr "" -#: src/lang.c:2721 +#: src/lang.c:2724 msgid "" "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" -#: src/lang.c:2722 +#: src/lang.c:2725 msgid "Invocation of your mail command" msgstr "" -#: src/lang.c:2723 +#: src/lang.c:2726 msgid "" "# Format of mailer line including parameters\n" "# %M Mailer %S Subject %T To %F Filename\n" @@ -7020,11 +7018,11 @@ msgid "" "# ie. elm interactive : elm -i %F -s \"%S\" \"%T\"\n" msgstr "" -#: src/lang.c:2731 +#: src/lang.c:2734 msgid "Use interactive mail reader" msgstr "" -#: src/lang.c:2732 +#: src/lang.c:2735 msgid "" "# Interactive mailreader\n" "# Possible values are (the default is marked with *):\n" @@ -7033,67 +7031,67 @@ msgid "" "# 2 = use interactive mailreader without headers in file\n" msgstr "" -#: src/lang.c:2741 +#: src/lang.c:2744 msgid "Remove ~/.article after posting" msgstr "Ta bort ~/.article efter postning" -#: src/lang.c:2742 +#: src/lang.c:2745 msgid "# If ON remove ~/.article after posting.\n" msgstr "" -#: src/lang.c:2748 +#: src/lang.c:2751 msgid "Use UTF-8 graphics (thread tree etc.)" msgstr "" -#: src/lang.c:2749 +#: src/lang.c:2752 msgid "" "# If ON use UTF-8 characters for indicator '->', tree and ellipsis '...'.\n" msgstr "" -#: src/lang.c:2754 +#: src/lang.c:2757 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "" -#: src/lang.c:2755 +#: src/lang.c:2758 msgid "Filename for posted articles" msgstr "" -#: src/lang.c:2756 +#: src/lang.c:2759 msgid "" "# Filename where to keep all postings (default posted)\n" "# If no filename is set then postings will not be saved\n" msgstr "" -#: src/lang.c:2761 +#: src/lang.c:2764 msgid "" "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "" -#: src/lang.c:2762 +#: src/lang.c:2765 msgid "Keep failed arts in ~/dead.articles" msgstr "" -#: src/lang.c:2763 +#: src/lang.c:2766 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "" -#: src/lang.c:2767 +#: src/lang.c:2770 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "" -#: src/lang.c:2768 +#: src/lang.c:2771 msgid "No unsubscribed groups in newsrc" msgstr "" -#: src/lang.c:2769 +#: src/lang.c:2772 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "" -#: src/lang.c:2774 +#: src/lang.c:2777 msgid "Remove bogus groups from newsrc" msgstr "" -#: src/lang.c:2775 +#: src/lang.c:2778 msgid "" "# What to do with bogus groups in newsrc file\n" "# Possible values are (the default is marked with *):\n" @@ -7102,65 +7100,65 @@ msgid "" "# 2 = highlight with D on selection screen\n" msgstr "" -#: src/lang.c:2784 +#: src/lang.c:2787 msgid "" "Enter number of seconds to wait for a response from the server. sets." msgstr "" -#: src/lang.c:2785 +#: src/lang.c:2788 msgid "NNTP read timeout in seconds" msgstr "" -#: src/lang.c:2786 +#: src/lang.c:2789 msgid "" "# Time in seconds to wait for a response from the server (0=no timeout)\n" msgstr "" -#: src/lang.c:2791 +#: src/lang.c:2794 msgid "Enter number of seconds until active file will be reread. sets." msgstr "" -#: src/lang.c:2792 +#: src/lang.c:2795 msgid "Interval in secs to reread active" msgstr "" -#: src/lang.c:2793 +#: src/lang.c:2796 msgid "" "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "" -#: src/lang.c:2798 +#: src/lang.c:2801 msgid "Reconnect to server automatically" msgstr "" -#: src/lang.c:2799 +#: src/lang.c:2802 msgid "" "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "" -#: src/lang.c:2803 +#: src/lang.c:2806 msgid "" "Create local copies of NNTP overview files. toggles & sets." msgstr "" -#: src/lang.c:2804 +#: src/lang.c:2807 msgid "Cache NNTP overview files locally" msgstr "" -#: src/lang.c:2805 +#: src/lang.c:2808 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "" -#: src/lang.c:2809 src/lang.c:2824 src/lang.c:2844 src/lang.c:2863 +#: src/lang.c:2812 src/lang.c:2827 src/lang.c:2847 src/lang.c:2866 msgid "Enter format string. sets, cancels." msgstr "" -#: src/lang.c:2810 +#: src/lang.c:2813 #, fuzzy msgid "Format string for selection level" msgstr "återgå till gruppvalsnivå" -#: src/lang.c:2811 +#: src/lang.c:2814 msgid "" "# Format string for selection level representation\n" "# Default: %f %n %U %G %d\n" @@ -7174,12 +7172,12 @@ msgid "" "# %U Unread count\n" msgstr "" -#: src/lang.c:2825 +#: src/lang.c:2828 #, fuzzy msgid "Format string for group level" msgstr "återgå till gruppvalsnivå" -#: src/lang.c:2826 +#: src/lang.c:2829 msgid "" "# Format string for group level representation\n" "# Default: %n %m %R %L %s %F\n" @@ -7198,11 +7196,11 @@ msgid "" "# %S Score\n" msgstr "" -#: src/lang.c:2845 +#: src/lang.c:2848 msgid "Format string for thread level" msgstr "" -#: src/lang.c:2846 +#: src/lang.c:2849 msgid "" "# Format string for thread level representation\n" "# Default: %n %m [%L] %T %F\n" @@ -7220,19 +7218,19 @@ msgid "" "# %T Thread tree (only thread level)\n" msgstr "" -#: src/lang.c:2864 +#: src/lang.c:2867 msgid "Format string for display of dates" msgstr "" -#: src/lang.c:2865 +#: src/lang.c:2868 msgid "# Format string for date representation\n" msgstr "" -#: src/lang.c:2871 +#: src/lang.c:2878 msgid "Unicode normalization form" msgstr "" -#: src/lang.c:2872 +#: src/lang.c:2879 msgid "" "# Unicode normalization form\n" "# Possible values are:\n" @@ -7241,21 +7239,22 @@ msgid "" "# 2 = NFKD\n" "# 3 = NFC\n" "# 4 = NFD\n" +"# 5 = NFKC_CF\n" msgstr "" -#: src/lang.c:2885 +#: src/lang.c:2893 msgid "Render BiDi" msgstr "" -#: src/lang.c:2886 +#: src/lang.c:2894 msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "" -#: src/lang.c:2893 +#: src/lang.c:2901 msgid "Function for sorting articles" msgstr "" -#: src/lang.c:2894 +#: src/lang.c:2902 msgid "" "# Function for sorting articles\n" "# Possible values are (the default is marked with *):\n" @@ -7263,214 +7262,214 @@ msgid "" "# 1 = heapsort\n" msgstr "" -#: src/lang.c:2907 +#: src/lang.c:2915 msgid "Automatically GroupMarkUnselArtRead" msgstr "" -#: src/lang.c:2913 +#: src/lang.c:2921 msgid "Delete post-process files" msgstr "" -#: src/lang.c:2918 +#: src/lang.c:2926 msgid "Filename for all mailed articles, sets, no filename=do not save." msgstr "" -#: src/lang.c:2919 +#: src/lang.c:2927 msgid "Mailbox to save sent mails" msgstr "" -#: src/lang.c:2924 +#: src/lang.c:2932 msgid "Set Followup-To: header to this group(s). sets, cancels." msgstr "" -#: src/lang.c:2925 +#: src/lang.c:2933 msgid "Followup-To: header" msgstr "" -#: src/lang.c:2930 +#: src/lang.c:2938 msgid "Enter default mail address (and fullname). sets, cancels." msgstr "" -#: src/lang.c:2937 +#: src/lang.c:2945 msgid "" "Path and options for ispell-like spell-checker. sets, cancels." msgstr "" -#: src/lang.c:2938 +#: src/lang.c:2946 msgid "Ispell program" msgstr "" -#: src/lang.c:2944 +#: src/lang.c:2952 msgid "When group is a mailing list, send responses to this email address." msgstr "" -#: src/lang.c:2945 +#: src/lang.c:2953 msgid "Mailing list address" msgstr "" -#: src/lang.c:2951 +#: src/lang.c:2959 msgid "Forward articles as attachment" msgstr "" -#: src/lang.c:2956 +#: src/lang.c:2964 msgid "" "A comma separated list of MIME major/minor Content-Types. cancels." msgstr "" -#: src/lang.c:2957 +#: src/lang.c:2965 msgid "Which MIME types will be saved" msgstr "" -#: src/lang.c:2962 +#: src/lang.c:2970 msgid "Value of the Organization: header. sets, cancels." msgstr "" -#: src/lang.c:2963 +#: src/lang.c:2971 msgid "Organization: header" msgstr "" -#: src/lang.c:2968 +#: src/lang.c:2976 msgid "Filename for saved articles. sets, cancels." msgstr "" -#: src/lang.c:2969 +#: src/lang.c:2977 #, fuzzy msgid "savefile" msgstr "Spara filnamn> " -#: src/lang.c:2974 src/lang.c:2998 +#: src/lang.c:2982 src/lang.c:3006 msgid "Scope for the filter rule. sets, cancels." msgstr "" -#: src/lang.c:2975 +#: src/lang.c:2983 msgid "Quick (1 key) select filter scope" msgstr "" -#: src/lang.c:2980 src/lang.c:3004 +#: src/lang.c:2988 src/lang.c:3012 msgid "Header for filter rule. sets, cancels." msgstr "" -#: src/lang.c:2981 +#: src/lang.c:2989 msgid "Quick (1 key) select filter header" msgstr "" -#: src/lang.c:2986 src/lang.c:3010 +#: src/lang.c:2994 src/lang.c:3018 msgid "ON = case sensitive, OFF = ignore case. sets, cancels." msgstr "" -#: src/lang.c:2987 +#: src/lang.c:2995 msgid "Quick (1 key) select filter case" msgstr "" -#: src/lang.c:2992 src/lang.c:3016 +#: src/lang.c:3000 src/lang.c:3024 msgid "ON = expire, OFF = don't ever expire. sets, cancels." msgstr "" -#: src/lang.c:2993 +#: src/lang.c:3001 msgid "Quick (1 key) select filter expire" msgstr "" -#: src/lang.c:2999 +#: src/lang.c:3007 msgid "Quick (1 key) kill filter scope" msgstr "" -#: src/lang.c:3005 +#: src/lang.c:3013 msgid "Quick (1 key) kill filter header" msgstr "" -#: src/lang.c:3011 +#: src/lang.c:3019 msgid "Quick (1 key) kill filter case" msgstr "" -#: src/lang.c:3017 +#: src/lang.c:3025 msgid "Quick (1 key) kill filter expire" msgstr "" -#: src/lang.c:3023 +#: src/lang.c:3031 msgid "Assume this charset if no charset declaration is present, to set." msgstr "" -#: src/lang.c:3024 +#: src/lang.c:3032 #, fuzzy msgid "UNDECLARED_CHARSET" msgstr "MM_NETWORK_CHARSET" -#: src/lang.c:3030 +#: src/lang.c:3038 msgid "" "Add this text at the start of the message body. sets, cancels." msgstr "" -#: src/lang.c:3031 +#: src/lang.c:3039 #, fuzzy msgid "X_Body" msgstr "Fet" -#: src/lang.c:3036 +#: src/lang.c:3044 msgid "Insert this header when posting. sets, cancels." msgstr "" -#: src/lang.c:3037 +#: src/lang.c:3045 msgid "X_Headers" msgstr "" -#: src/lang.c:3042 +#: src/lang.c:3050 msgid "" "Automatically insert an X-Comment-To: header? toggles & sets." msgstr "" -#: src/lang.c:3043 +#: src/lang.c:3051 msgid "Insert 'X-Comment-To:' header" msgstr "" #. TODO: lang.c -#: src/main.c:801 +#: src/main.c:812 msgid "reading from local spool" msgstr "" -#: src/misc.c:3868 +#: src/misc.c:3878 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "Version: %s %s utgåva %s (\"%s\") %s %s\n" -#: src/misc.c:3871 +#: src/misc.c:3881 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Version: %s %s utgåva %s (\"%s\")\n" -#: src/newsrc.c:453 +#: src/newsrc.c:457 msgid "Unreachable?\n" msgstr "Ej nåbar?\n" -#: src/nntplib.c:817 +#: src/nntplib.c:822 #, c-format msgid "" "\n" "Server timed out, trying reconnect # %d\n" msgstr "" -#: src/nntplib.c:844 +#: src/nntplib.c:849 msgid "NNTP connection error. Exiting..." msgstr "" -#: src/nntplib.c:856 src/nntplib.c:1835 +#: src/nntplib.c:861 src/nntplib.c:1852 msgid "Rejoin current group\n" msgstr "" -#: src/nntplib.c:864 src/nntplib.c:1843 +#: src/nntplib.c:869 src/nntplib.c:1860 #, c-format msgid "Read (%s)\n" msgstr "Läs (%s)\n" -#: src/nntplib.c:866 +#: src/nntplib.c:871 #, c-format msgid "Resend last command (%s)\n" msgstr "" -#: src/nntplib.c:1482 +#: src/nntplib.c:1500 msgid "CAPABILITIES did not announce READER" msgstr "" -#: src/nntplib.c:1989 +#: src/nntplib.c:2006 msgid "MOTD: " msgstr "" @@ -7531,7 +7530,7 @@ msgstr "[- Ej tillgänglig -]" #. * preamble #. * TODO: -> lang.c #. -#: src/rfc2047.c:1308 +#: src/rfc2047.c:1322 #, c-format msgid "" "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" diff -Nurp '--exclude=.bzr*' tin-2.4.2/po/tin.pot tin-2.4.3/po/tin.pot --- tin-2.4.2/po/tin.pot 2017-12-08 09:40:06.000000000 +0100 +++ tin-2.4.3/po/tin.pot 2018-12-24 10:02:03.358906289 +0100 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-08 09:39+0100\n" +"POT-Creation-Date: 2018-12-24 10:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,473 +17,473 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/attrib.c:954 +#: src/attrib.c:964 msgid "Processing attributes... " msgstr "" -#: src/attrib.c:1176 +#: src/attrib.c:1186 #, c-format msgid "" "# Do not edit this comment block\n" "#\n" msgstr "" -#: src/attrib.c:1177 +#: src/attrib.c:1187 #, c-format msgid "# scope=STRING (eg. alt.*,!alt.bin*) [mandatory]\n" msgstr "" -#: src/attrib.c:1178 +#: src/attrib.c:1188 #, c-format msgid "# add_posted_to_filter=ON/OFF\n" msgstr "" -#: src/attrib.c:1179 +#: src/attrib.c:1189 #, c-format msgid "# advertising=ON/OFF\n" msgstr "" -#: src/attrib.c:1180 +#: src/attrib.c:1190 #, c-format msgid "# alternative_handling=ON/OFF\n" msgstr "" -#: src/attrib.c:1181 +#: src/attrib.c:1191 #, c-format msgid "# ask_for_metamail=ON/OFF\n" msgstr "" -#: src/attrib.c:1182 +#: src/attrib.c:1192 #, c-format msgid "# auto_cc_bcc=NUM\n" msgstr "" -#: src/attrib.c:1183 +#: src/attrib.c:1193 #, c-format msgid "# 0=No, 1=Cc, 2=Bcc, 3=Cc and Bcc\n" msgstr "" -#: src/attrib.c:1184 +#: src/attrib.c:1194 #, c-format msgid "# auto_list_thread=ON/OFF\n" msgstr "" -#: src/attrib.c:1185 +#: src/attrib.c:1195 #, c-format msgid "# auto_save=ON/OFF\n" msgstr "" -#: src/attrib.c:1186 +#: src/attrib.c:1196 #, c-format msgid "# auto_select=ON/OFF\n" msgstr "" -#: src/attrib.c:1187 +#: src/attrib.c:1197 #, c-format msgid "# batch_save=ON/OFF\n" msgstr "" -#: src/attrib.c:1188 +#: src/attrib.c:1198 #, c-format msgid "# date_format=STRING (eg. %%a, %%d %%b %%Y %%H:%%M:%%S)\n" msgstr "" -#: src/attrib.c:1189 +#: src/attrib.c:1199 #, c-format msgid "# delete_tmp_files=ON/OFF\n" msgstr "" -#: src/attrib.c:1190 +#: src/attrib.c:1200 #, c-format msgid "# editor_format=STRING (eg. %%E +%%N %%F)\n" msgstr "" -#: src/attrib.c:1191 +#: src/attrib.c:1201 #, c-format msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "" -#: src/attrib.c:1192 +#: src/attrib.c:1202 #, c-format msgid "# followup_to=STRING\n" msgstr "" -#: src/attrib.c:1193 +#: src/attrib.c:1203 #, c-format msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "" -#: src/attrib.c:1194 +#: src/attrib.c:1204 #, c-format msgid "# group_catchup_on_exit=ON/OFF\n" msgstr "" -#: src/attrib.c:1195 +#: src/attrib.c:1205 #, c-format msgid "# group_format=STRING (eg. %%n %%m %%R %%L %%s %%F)\n" msgstr "" -#: src/attrib.c:1196 +#: src/attrib.c:1206 #, c-format msgid "# mail_8bit_header=ON/OFF\n" msgstr "" -#: src/attrib.c:1197 +#: src/attrib.c:1207 #, c-format msgid "# mail_mime_encoding=supported_encoding" msgstr "" -#: src/attrib.c:1205 +#: src/attrib.c:1215 #, c-format msgid "# ispell=STRING\n" msgstr "" -#: src/attrib.c:1207 +#: src/attrib.c:1217 #, c-format msgid "# maildir=STRING (eg. ~/Mail)\n" msgstr "" -#: src/attrib.c:1208 +#: src/attrib.c:1218 #, c-format msgid "# mailing_list=STRING (eg. majordomo@example.org)\n" msgstr "" -#: src/attrib.c:1209 +#: src/attrib.c:1219 #, c-format msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "" -#: src/attrib.c:1210 +#: src/attrib.c:1220 #, c-format msgid "# mark_ignore_tags=ON/OFF\n" msgstr "" -#: src/attrib.c:1211 +#: src/attrib.c:1221 #, c-format msgid "# mark_saved_read=ON/OFF\n" msgstr "" -#: src/attrib.c:1212 +#: src/attrib.c:1222 #, c-format msgid "# mime_forward=ON/OFF\n" msgstr "" -#: src/attrib.c:1214 +#: src/attrib.c:1224 #, c-format msgid "# mm_network_charset=supported_charset" msgstr "" -#: src/attrib.c:1221 +#: src/attrib.c:1231 #, c-format msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "" -#: src/attrib.c:1223 +#: src/attrib.c:1233 #, c-format msgid "# news_headers_to_display=STRING\n" msgstr "" -#: src/attrib.c:1224 +#: src/attrib.c:1234 #, c-format msgid "# news_headers_to_not_display=STRING\n" msgstr "" -#: src/attrib.c:1225 +#: src/attrib.c:1235 #, c-format msgid "# news_quote_format=STRING\n" msgstr "" -#: src/attrib.c:1226 +#: src/attrib.c:1236 #, c-format msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "" -#: src/attrib.c:1227 +#: src/attrib.c:1237 #, c-format msgid "# pos_first_unread=ON/OFF\n" msgstr "" -#: src/attrib.c:1228 +#: src/attrib.c:1238 #, c-format msgid "# post_8bit_header=ON/OFF\n" msgstr "" -#: src/attrib.c:1229 +#: src/attrib.c:1239 #, c-format msgid "# post_mime_encoding=supported_encoding" msgstr "" -#: src/attrib.c:1236 +#: src/attrib.c:1246 #, c-format msgid "# post_process_type=NUM\n" msgstr "" -#: src/attrib.c:1241 +#: src/attrib.c:1251 #, c-format msgid "# post_process_view=ON/OFF\n" msgstr "" -#: src/attrib.c:1242 +#: src/attrib.c:1252 #, c-format msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "" -#: src/attrib.c:1243 +#: src/attrib.c:1253 #, c-format msgid "# quick_kill_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:1244 +#: src/attrib.c:1254 #, c-format msgid "# quick_kill_case=ON/OFF\n" msgstr "" -#: src/attrib.c:1245 +#: src/attrib.c:1255 #, c-format msgid "# quick_kill_header=NUM\n" msgstr "" -#: src/attrib.c:1246 src/attrib.c:1255 +#: src/attrib.c:1256 src/attrib.c:1265 #, c-format msgid "# 0=Subject: (case sensitive) 1=Subject: (ignore case)\n" msgstr "" -#: src/attrib.c:1247 src/attrib.c:1256 +#: src/attrib.c:1257 src/attrib.c:1266 #, c-format msgid "# 2=From: (case sensitive) 3=From: (ignore case)\n" msgstr "" -#: src/attrib.c:1248 src/attrib.c:1257 +#: src/attrib.c:1258 src/attrib.c:1267 #, c-format msgid "# 4=Message-ID: & full References: line\n" msgstr "" -#: src/attrib.c:1249 src/attrib.c:1258 +#: src/attrib.c:1259 src/attrib.c:1268 #, c-format msgid "# 5=Message-ID: & last References: entry only\n" msgstr "" -#: src/attrib.c:1250 src/attrib.c:1259 +#: src/attrib.c:1260 src/attrib.c:1269 #, c-format msgid "# 6=Message-ID: entry only 7=Lines:\n" msgstr "" -#: src/attrib.c:1251 +#: src/attrib.c:1261 #, c-format msgid "# quick_select_scope=STRING\n" msgstr "" -#: src/attrib.c:1252 +#: src/attrib.c:1262 #, c-format msgid "# quick_select_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:1253 +#: src/attrib.c:1263 #, c-format msgid "# quick_select_case=ON/OFF\n" msgstr "" -#: src/attrib.c:1254 +#: src/attrib.c:1264 #, c-format msgid "# quick_select_header=NUM\n" msgstr "" -#: src/attrib.c:1260 +#: src/attrib.c:1270 #, c-format msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "" -#: src/attrib.c:1262 +#: src/attrib.c:1272 #, c-format msgid "# print_header=ON/OFF\n" msgstr "" -#: src/attrib.c:1264 +#: src/attrib.c:1274 #, c-format msgid "# process_only_unread=ON/OFF\n" msgstr "" -#: src/attrib.c:1265 +#: src/attrib.c:1275 #, c-format msgid "# prompt_followupto=ON/OFF\n" msgstr "" -#: src/attrib.c:1266 +#: src/attrib.c:1276 #, c-format msgid "# savedir=STRING (eg. ~user/News)\n" msgstr "" -#: src/attrib.c:1267 +#: src/attrib.c:1277 #, c-format msgid "# savefile=STRING (eg. =linux)\n" msgstr "" -#: src/attrib.c:1268 +#: src/attrib.c:1278 #, c-format msgid "# sigfile=STRING (eg. $var/sig)\n" msgstr "" -#: src/attrib.c:1269 +#: src/attrib.c:1279 #, c-format msgid "# show_author=NUM\n" msgstr "" -#: src/attrib.c:1275 +#: src/attrib.c:1285 #, c-format msgid "# show_signatures=ON/OFF\n" msgstr "" -#: src/attrib.c:1276 +#: src/attrib.c:1286 #, c-format msgid "# show_only_unread_arts=ON/OFF\n" msgstr "" -#: src/attrib.c:1277 +#: src/attrib.c:1287 #, c-format msgid "# sigdashes=ON/OFF\n" msgstr "" -#: src/attrib.c:1278 +#: src/attrib.c:1288 #, c-format msgid "# signature_repost=ON/OFF\n" msgstr "" -#: src/attrib.c:1279 +#: src/attrib.c:1289 #, c-format msgid "# sort_article_type=NUM\n" msgstr "" -#: src/attrib.c:1297 +#: src/attrib.c:1307 #, c-format msgid "# sort_threads_type=NUM\n" msgstr "" -#: src/attrib.c:1306 +#: src/attrib.c:1316 #, c-format msgid "# start_editor_offset=ON/OFF\n" msgstr "" -#: src/attrib.c:1307 +#: src/attrib.c:1317 #, c-format msgid "# tex2iso_conv=ON/OFF\n" msgstr "" -#: src/attrib.c:1308 +#: src/attrib.c:1318 #, c-format msgid "# thread_catchup_on_exit=ON/OFF\n" msgstr "" -#: src/attrib.c:1309 +#: src/attrib.c:1319 #, c-format msgid "# thread_articles=NUM" msgstr "" -#: src/attrib.c:1316 +#: src/attrib.c:1326 #, c-format msgid "# thread_format=STRING (eg. %%n %%m [%%L] %%T %%F)\n" msgstr "" -#: src/attrib.c:1317 +#: src/attrib.c:1327 #, c-format msgid "# thread_perc=NUM\n" msgstr "" -#: src/attrib.c:1318 +#: src/attrib.c:1328 #, c-format msgid "# trim_article_body=NUM\n" msgstr "" -#: src/attrib.c:1319 +#: src/attrib.c:1329 #, c-format msgid "# 0 = Don't trim article body\n" msgstr "" -#: src/attrib.c:1320 +#: src/attrib.c:1330 #, c-format msgid "# 1 = Skip leading blank lines\n" msgstr "" -#: src/attrib.c:1321 +#: src/attrib.c:1331 #, c-format msgid "# 2 = Skip trailing blank lines\n" msgstr "" -#: src/attrib.c:1322 +#: src/attrib.c:1332 #, c-format msgid "# 3 = Skip leading and trailing blank lines\n" msgstr "" -#: src/attrib.c:1323 +#: src/attrib.c:1333 #, c-format msgid "# 4 = Compact multiple blank lines between text blocks\n" msgstr "" -#: src/attrib.c:1324 +#: src/attrib.c:1334 #, c-format msgid "" "# 5 = Compact multiple blank lines between text blocks and skip\n" "# leading blank lines\n" msgstr "" -#: src/attrib.c:1325 +#: src/attrib.c:1335 #, c-format msgid "" "# 6 = Compact multiple blank lines between text blocks and skip\n" "# trailing blank lines\n" msgstr "" -#: src/attrib.c:1326 +#: src/attrib.c:1336 #, c-format msgid "" "# 7 = Compact multiple blank lines between text blocks and skip\n" "# leading and trailing blank lines\n" msgstr "" -#: src/attrib.c:1327 +#: src/attrib.c:1337 #, c-format msgid "# verbatim_handling=ON/OFF\n" msgstr "" -#: src/attrib.c:1329 +#: src/attrib.c:1339 #, c-format msgid "# extquote_handling=ON/OFF\n" msgstr "" -#: src/attrib.c:1331 +#: src/attrib.c:1341 #, c-format msgid "# wrap_on_next_unread=ON/OFF\n" msgstr "" -#: src/attrib.c:1332 +#: src/attrib.c:1342 #, c-format msgid "# x_body=STRING (eg. ~/.tin/extra-body-text)\n" msgstr "" -#: src/attrib.c:1333 +#: src/attrib.c:1343 #, c-format msgid "# x_comment_to=ON/OFF\n" msgstr "" -#: src/attrib.c:1334 +#: src/attrib.c:1344 #, c-format msgid "# x_headers=STRING (eg. ~/.tin/extra-headers)\n" msgstr "" -#: src/attrib.c:1335 +#: src/attrib.c:1345 #, c-format msgid "" "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "" -#: src/attrib.c:1336 +#: src/attrib.c:1346 #, c-format msgid "" "# entries first followed by group specific entries.\n" "#\n" msgstr "" -#: src/attrib.c:1337 +#: src/attrib.c:1347 #, c-format msgid "############################################################################\n" msgstr "" @@ -761,56 +762,51 @@ msgstr "" #: src/lang.c:107 #, c-format -msgid "Active file corrupt - %s" -msgstr "" - -#: src/lang.c:108 -#, c-format msgid "" "Article to be posted resulted in errors/warnings. %s=quit, %s=Menu, %s=edit: " msgstr "" -#: src/lang.c:109 +#: src/lang.c:108 #, c-format msgid "Unrecognized attribute: %s" msgstr "" -#: src/lang.c:110 +#: src/lang.c:109 #, c-format msgid "Bad command. Type '%s' for help." msgstr "" -#: src/lang.c:112 +#: src/lang.c:111 msgid "Base article" msgstr "" -#: src/lang.c:113 +#: src/lang.c:112 msgid "Base article range" msgstr "" -#: src/lang.c:114 +#: src/lang.c:113 #, c-format msgid "%s: Updating of index files not supported: cache_overview_files=%s" msgstr "" -#: src/lang.c:115 +#: src/lang.c:114 msgid "*** Beginning of article ***" msgstr "" -#: src/lang.c:116 +#: src/lang.c:115 msgid "*** Beginning of page ***" msgstr "" -#: src/lang.c:118 +#: src/lang.c:117 #, c-format msgid "Cancel (delete) or supersede (overwrite) article [%%s]? (%s/%s/%s): " msgstr "" -#: src/lang.c:119 +#: src/lang.c:118 msgid "Cancelling article..." msgstr "" -#: src/lang.c:121 +#: src/lang.c:120 #, c-format msgid "Cannot create %s" msgstr "" @@ -1280,146 +1276,141 @@ msgstr "" msgid "Insecure permissions of %s (%o)" msgstr "" -#: src/lang.c:242 -#, c-format -msgid "Invalid response to GROUP command, %s" -msgstr "" - -#: src/lang.c:247 +#: src/lang.c:244 #, c-format msgid "MIME parse error: Unexpected end of %s/%s article" msgstr "" -#: src/lang.c:248 +#: src/lang.c:245 msgid "MIME parse error: Start boundary whilst reading headers" msgstr "" -#: src/lang.c:249 +#: src/lang.c:246 msgid "" "\n" "Error: \"poster\" is not allowed in Newsgroups!\n" msgstr "" -#: src/lang.c:250 +#: src/lang.c:247 msgid "Can't get a (fully-qualified) domain-name!" msgstr "" -#: src/lang.c:251 +#: src/lang.c:248 #, c-format msgid "No permissions to go into %s\n" msgstr "" -#: src/lang.c:253 +#: src/lang.c:250 msgid "" "\n" "Error: From: line missing.\n" msgstr "" -#: src/lang.c:255 +#: src/lang.c:252 #, c-format msgid "No read permissions for %s\n" msgstr "" -#: src/lang.c:256 +#: src/lang.c:253 #, c-format msgid "File %s does not exist\n" msgstr "" -#: src/lang.c:257 +#: src/lang.c:254 #, c-format msgid "No write permissions for %s\n" msgstr "" -#: src/lang.c:258 +#: src/lang.c:255 msgid "Can't get user information (/etc/passwd missing?)" msgstr "" -#: src/lang.c:259 +#: src/lang.c:256 msgid "errors" msgstr "" -#: src/lang.c:261 +#: src/lang.c:258 #, c-format msgid "" "\n" "Error on line %d: \"Sender:\" header not allowed (it will be added for you)\n" msgstr "" -#: src/lang.c:263 +#: src/lang.c:260 #, c-format msgid "Server has non of the groups listed in %s" msgstr "" -#: src/lang.c:264 +#: src/lang.c:261 msgid "error" msgstr "" -#: src/lang.c:265 +#: src/lang.c:262 msgid "Unknown display level" msgstr "" -#: src/lang.c:266 +#: src/lang.c:263 msgid "" msgstr "" -#: src/lang.c:267 +#: src/lang.c:264 msgid "Exiting..." msgstr "" -#: src/lang.c:268 +#: src/lang.c:265 msgid "leaving external mail-reader" msgstr "" -#: src/lang.c:269 +#: src/lang.c:266 #, c-format msgid "Extracting %s..." msgstr "" -#: src/lang.c:271 +#: src/lang.c:268 #, c-format msgid "Error writing %s file. Filesystem full? File reset to previous state." msgstr "" -#: src/lang.c:272 +#: src/lang.c:269 #, c-format msgid "Error making backup of %s file. Filesystem full?" msgstr "" -#: src/lang.c:273 +#: src/lang.c:270 #, c-format msgid "Filtering global rules (%d/%d)..." msgstr "" -#: src/lang.c:274 +#: src/lang.c:271 msgid "Rule created by: " msgstr "" -#: src/lang.c:275 +#: src/lang.c:272 #, c-format msgid "Enter pattern [%s]> " msgstr "" -#: src/lang.c:276 +#: src/lang.c:273 #, c-format msgid "" "\n" "You requested followups to your article to go to the following %s:\n" msgstr "" -#: src/lang.c:277 +#: src/lang.c:274 #, c-format msgid " %s\t Answers will be directed to you by mail.\n" msgstr "" -#: src/lang.c:278 +#: src/lang.c:275 msgid "-- forwarded message --\n" msgstr "" -#: src/lang.c:279 +#: src/lang.c:276 msgid "-- end of forwarded message --\n" msgstr "" -#: src/lang.c:280 +#: src/lang.c:277 msgid "" "# Format:\n" "# comment=STRING Optional. Multiple lines allowed. Comments must be " @@ -1446,6 +1437,10 @@ msgid "" "# gnksa=[<>]?NUM Optional. GNKSA parse_from() return code. '<' or '>' " "opt.\n" "# xref=PATTERN Optional. Kill pattern (e.g. alt.flame*)\n" +"# path=PATTERN Optional. Kill pattern (e.g. news.example.org)\n" +"# Be aware that filtering on Path: may significantly " +"slow\n" +"# down the process.\n" "# time=NUM Optional. time_t value when rule expires\n" "#\n" msgstr "" @@ -2418,7 +2413,7 @@ msgstr "" msgid "Operation disabled in no-overwrite mode" msgstr "" -#. TODO: replace hardcoded key-name in txt_info_postponed +#. TODO: replace hard coded key-name in txt_info_postponed #: src/lang.c:547 #, c-format msgid "%d postponed %s, reuse with ^O...\n" @@ -2444,7 +2439,7 @@ msgstr "" msgid "incomplete " msgstr "" -#. TODO: replace hardcoded key-names +#. TODO: replace hard coded key-names #: src/lang.c:554 #, c-format msgid "" @@ -2540,7 +2535,7 @@ msgstr "" #: src/lang.c:587 #, c-format -msgid "Kill Msg-Id: [%s] (f/l/o/n): " +msgid "Kill Msg-ID: [%s] (f/l/o/n): " msgstr "" #: src/lang.c:588 @@ -3026,7 +3021,7 @@ msgstr "" msgid "Post a followup..." msgstr "" -#. TODO: replace hardcoded key-name in txt_post_error_ask_postpone +#. TODO: replace hard coded key-name in txt_post_error_ask_postpone #: src/lang.c:716 msgid "" "An error has occurred while posting the article. If you think that this\n" @@ -3086,225 +3081,230 @@ msgstr "" msgid "Untagged %s" msgstr "" -#: src/lang.c:730 +#: src/lang.c:731 +#, c-format +msgid "Preparing for filtering on Path header (%d/%d)..." +msgstr "" + +#: src/lang.c:733 msgid "Processing mail messages marked for deletion." msgstr "" -#: src/lang.c:731 +#: src/lang.c:734 msgid "Processing saved articles marked for deletion." msgstr "" -#: src/lang.c:732 +#: src/lang.c:735 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "" -#: src/lang.c:733 +#: src/lang.c:736 msgid "Article unchanged, abort mailing?" msgstr "" -#: src/lang.c:734 +#: src/lang.c:737 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "" -#: src/lang.c:736 +#: src/lang.c:739 msgid "Add quick kill filter?" msgstr "" -#: src/lang.c:737 +#: src/lang.c:740 msgid "Add quick selection filter?" msgstr "" -#: src/lang.c:738 +#: src/lang.c:741 msgid "Do you really want to quit?" msgstr "" -#: src/lang.c:739 +#: src/lang.c:742 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "" -#: src/lang.c:740 +#: src/lang.c:743 msgid "You have tagged articles in this group - quit anyway?" msgstr "" -#: src/lang.c:741 +#: src/lang.c:744 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "" -#: src/lang.c:742 +#: src/lang.c:745 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "" -#: src/lang.c:743 +#: src/lang.c:746 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "" -#: src/lang.c:744 +#: src/lang.c:747 msgid "Do you really want to quit without saving your configuration?" msgstr "" -#: src/lang.c:747 +#: src/lang.c:750 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "" -#: src/lang.c:749 +#: src/lang.c:752 msgid "Do you want to abort this operation?" msgstr "" -#: src/lang.c:750 +#: src/lang.c:753 msgid "Do you want to exit tin immediately?" msgstr "" -#: src/lang.c:752 +#: src/lang.c:755 msgid "Reading ('q' to quit)..." msgstr "" -#: src/lang.c:753 +#: src/lang.c:756 #, c-format msgid "Reading %sarticles..." msgstr "" -#: src/lang.c:754 +#: src/lang.c:757 #, c-format msgid "Reading %sattributes file...\n" msgstr "" -#: src/lang.c:755 +#: src/lang.c:758 #, c-format msgid "Reading %sconfig file...\n" msgstr "" -#: src/lang.c:756 +#: src/lang.c:759 msgid "Reading filter file...\n" msgstr "" -#: src/lang.c:757 +#: src/lang.c:760 #, c-format msgid "Reading %s groups..." msgstr "" -#: src/lang.c:758 +#: src/lang.c:761 msgid "Reading input history file...\n" msgstr "" -#: src/lang.c:759 +#: src/lang.c:762 msgid "Reading keymap file...\n" msgstr "" -#: src/lang.c:760 +#: src/lang.c:763 msgid "Reading groups from active file... " msgstr "" -#: src/lang.c:761 +#: src/lang.c:764 msgid "Reading groups from newsrc file... " msgstr "" -#: src/lang.c:762 +#: src/lang.c:765 msgid "Reading newsgroups file... " msgstr "" -#: src/lang.c:763 +#: src/lang.c:766 msgid "Reading newsrc file..." msgstr "" -#: src/lang.c:764 +#: src/lang.c:767 msgid "References: line " msgstr "" -#: src/lang.c:766 +#: src/lang.c:769 #, c-format msgid "(%d:%02d remaining)" msgstr "" -#: src/lang.c:768 +#: src/lang.c:771 #, c-format msgid "Bogus group %s removed." msgstr "" -#: src/lang.c:769 +#: src/lang.c:772 msgid "Removed from the previous rule: " msgstr "" -#: src/lang.c:770 +#: src/lang.c:773 #, c-format msgid "Error: rename %s to %s" msgstr "" -#: src/lang.c:771 +#: src/lang.c:774 msgid "Reply to author..." msgstr "" -#: src/lang.c:772 +#: src/lang.c:775 msgid "Repost" msgstr "" -#: src/lang.c:773 +#: src/lang.c:776 msgid "Reposting article..." msgstr "" -#: src/lang.c:774 +#: src/lang.c:777 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "" -#: src/lang.c:775 +#: src/lang.c:778 msgid "Reset newsrc?" msgstr "" -#: src/lang.c:776 +#: src/lang.c:779 msgid "Responses have been directed to the following newsgroups" msgstr "" -#: src/lang.c:777 +#: src/lang.c:780 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " msgstr "" -#: src/lang.c:779 +#: src/lang.c:782 msgid "Press to continue..." msgstr "" -#: src/lang.c:781 +#: src/lang.c:784 #, c-format msgid "Select From [%s] (y/n): " msgstr "" -#: src/lang.c:782 +#: src/lang.c:785 msgid "Select Lines: (num): " msgstr "" -#: src/lang.c:783 +#: src/lang.c:786 msgid "Auto-select Article Menu" msgstr "" -#: src/lang.c:784 +#: src/lang.c:787 #, c-format -msgid "Select Msg-Id [%s] (f/l/o/n): " +msgid "Select Msg-ID [%s] (f/l/o/n): " msgstr "" -#: src/lang.c:785 +#: src/lang.c:788 msgid "Select pattern scope: " msgstr "" -#: src/lang.c:786 +#: src/lang.c:789 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "" -#: src/lang.c:787 +#: src/lang.c:790 msgid "Select text pattern : " msgstr "" -#: src/lang.c:788 +#: src/lang.c:791 msgid "Select time in days : " msgstr "" -#: src/lang.c:789 +#: src/lang.c:792 #, c-format msgid "" "# %s server configuration file\n" @@ -3317,260 +3317,260 @@ msgid "" "\n" msgstr "" -#: src/lang.c:795 +#: src/lang.c:798 msgid "Showing unread groups only" msgstr "" -#: src/lang.c:796 +#: src/lang.c:799 msgid "Subject: line (ignore case) " msgstr "" -#: src/lang.c:797 +#: src/lang.c:800 msgid "Subject: line (case sensitive)" msgstr "" -#: src/lang.c:798 +#: src/lang.c:801 msgid "Save" msgstr "" -#: src/lang.c:799 +#: src/lang.c:802 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "" -#: src/lang.c:800 +#: src/lang.c:803 msgid "Save configuration before continuing?" msgstr "" -#: src/lang.c:801 +#: src/lang.c:804 msgid "Save filename> " msgstr "" -#: src/lang.c:802 +#: src/lang.c:805 msgid "Saved" msgstr "" -#: src/lang.c:803 +#: src/lang.c:806 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "" -#: src/lang.c:804 +#: src/lang.c:807 #, c-format msgid "Saved %s...\n" msgstr "" -#: src/lang.c:805 +#: src/lang.c:808 msgid "Nothing was saved" msgstr "" -#: src/lang.c:806 +#: src/lang.c:809 #, c-format msgid "" "\n" "%s %d %s from %d %s\n" msgstr "" -#: src/lang.c:807 +#: src/lang.c:810 #, c-format msgid "-- %s saved to %s%s --" msgstr "" -#: src/lang.c:808 +#: src/lang.c:811 #, c-format msgid "-- %s saved to %s - %s --" msgstr "" -#: src/lang.c:809 +#: src/lang.c:812 msgid "Saving..." msgstr "" -#: src/lang.c:810 +#: src/lang.c:813 #, c-format msgid "%s: Screen initialization failed" msgstr "" -#: src/lang.c:812 +#: src/lang.c:815 #, c-format msgid "%s: screen is too small\n" msgstr "" -#: src/lang.c:814 +#: src/lang.c:817 #, c-format msgid "screen is too small, %s is exiting" msgstr "" -#: src/lang.c:815 +#: src/lang.c:818 msgid "Delete scope?" msgstr "" -#: src/lang.c:816 +#: src/lang.c:819 msgid "Enter scope> " msgstr "" -#: src/lang.c:817 +#: src/lang.c:820 msgid "Select new position> " msgstr "" -#: src/lang.c:818 +#: src/lang.c:821 msgid "New position cannot be a global scope" msgstr "" -#: src/lang.c:819 +#: src/lang.c:822 msgid "Global scope, operation not allowed" msgstr "" -#: src/lang.c:820 +#: src/lang.c:823 msgid "Rename scope> " msgstr "" -#: src/lang.c:821 +#: src/lang.c:824 msgid "Select scope> " msgstr "" -#: src/lang.c:822 +#: src/lang.c:825 msgid "Scopes Menu" msgstr "" -#: src/lang.c:823 +#: src/lang.c:826 msgid "Scopes Menu Commands" msgstr "" -#: src/lang.c:824 +#: src/lang.c:827 #, c-format msgid "Search backwards [%s]> " msgstr "" -#: src/lang.c:825 +#: src/lang.c:828 #, c-format msgid "Search body [%s]> " msgstr "" -#: src/lang.c:826 +#: src/lang.c:829 #, c-format msgid "Search forwards [%s]> " msgstr "" -#: src/lang.c:827 +#: src/lang.c:830 msgid "Searching..." msgstr "" -#: src/lang.c:828 +#: src/lang.c:831 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "" -#: src/lang.c:829 +#: src/lang.c:832 msgid "Select article> " msgstr "" -#: src/lang.c:830 +#: src/lang.c:833 msgid "" "Select option number before text or use arrow keys and . 'q' to quit." msgstr "" -#: src/lang.c:831 +#: src/lang.c:834 msgid "Select group> " msgstr "" -#: src/lang.c:832 +#: src/lang.c:835 #, c-format msgid "Enter selection pattern [%s]> " msgstr "" -#: src/lang.c:833 +#: src/lang.c:836 msgid "Select thread> " msgstr "" -#: src/lang.c:834 +#: src/lang.c:837 #, c-format msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" msgstr "" -#: src/lang.c:835 +#: src/lang.c:838 msgid "servers active-file" msgstr "" -#: src/lang.c:836 +#: src/lang.c:839 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "" -#: src/lang.c:837 +#: src/lang.c:840 msgid "" msgstr "" -#: src/lang.c:838 +#: src/lang.c:841 #, c-format msgid "Starting: (%s)" msgstr "" -#: src/lang.c:839 +#: src/lang.c:842 #, c-format msgid "List Thread (%d of %d)" msgstr "" -#: src/lang.c:840 +#: src/lang.c:843 #, c-format msgid "Thread (%.*s)" msgstr "" -#: src/lang.c:841 +#: src/lang.c:844 msgid "Enter wildcard subscribe pattern> " msgstr "" -#: src/lang.c:842 +#: src/lang.c:845 #, c-format msgid "subscribed to %d groups" msgstr "" -#: src/lang.c:843 +#: src/lang.c:846 #, c-format msgid "Subscribed to %s" msgstr "" -#: src/lang.c:844 +#: src/lang.c:847 msgid "Subscribing... " msgstr "" -#: src/lang.c:845 +#: src/lang.c:848 #, c-format msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " msgstr "" -#: src/lang.c:846 +#: src/lang.c:849 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "" -#: src/lang.c:847 +#: src/lang.c:850 msgid "Superseding article ..." msgstr "" -#: src/lang.c:848 +#: src/lang.c:851 #, c-format msgid "" "\n" "Stopped. Type 'fg' to restart %s\n" msgstr "" -#: src/lang.c:850 +#: src/lang.c:853 #, c-format msgid "%d days" msgstr "" -#: src/lang.c:851 +#: src/lang.c:854 msgid "" msgstr "" -#: src/lang.c:852 +#: src/lang.c:855 msgid "TeX " msgstr "" -#: src/lang.c:853 +#: src/lang.c:856 msgid "# Default action/prompt strings\n" msgstr "" -#: src/lang.c:854 +#: src/lang.c:857 msgid "" "# Defaults for quick (1 key) kill & auto-selection filters\n" "# header=NUM 0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n" @@ -3581,145 +3581,140 @@ msgid "" "# expire=ON/OFF ON=limit to default_filter_days OFF=don't ever expire\n" msgstr "" -#: src/lang.c:867 +#: src/lang.c:870 msgid "" "# If ON use print current subject or newsgroup description in the last line\n" msgstr "" -#: src/lang.c:868 +#: src/lang.c:871 msgid "# Host & time info used for detecting new groups (don't touch)\n" msgstr "" -#: src/lang.c:869 +#: src/lang.c:872 msgid "There is no news\n" msgstr "" -#: src/lang.c:870 +#: src/lang.c:873 msgid "Thread" msgstr "" -#: src/lang.c:871 +#: src/lang.c:874 msgid "Thread Level Commands" msgstr "" -#: src/lang.c:872 +#: src/lang.c:875 msgid "Thread deselected" msgstr "" -#: src/lang.c:873 +#: src/lang.c:876 msgid "Thread selected" msgstr "" -#: src/lang.c:875 +#: src/lang.c:878 msgid "threads" msgstr "" -#: src/lang.c:877 +#: src/lang.c:880 msgid "thread" msgstr "" -#: src/lang.c:878 +#: src/lang.c:881 #, c-format msgid "Thread %4s of %4s" msgstr "" -#: src/lang.c:879 +#: src/lang.c:882 msgid "Threading articles..." msgstr "" -#: src/lang.c:880 +#: src/lang.c:883 #, c-format msgid "Toggled word highlighting %s" msgstr "" -#: src/lang.c:881 +#: src/lang.c:884 msgid "Toggled rot13 encoding" msgstr "" -#: src/lang.c:882 +#: src/lang.c:885 #, c-format msgid "Toggled german TeX encoding %s" msgstr "" -#: src/lang.c:883 +#: src/lang.c:886 #, c-format msgid "Toggled tab-width to %d" msgstr "" -#: src/lang.c:885 +#: src/lang.c:888 #, c-format msgid "%d Trying to dotlock %s" msgstr "" -#: src/lang.c:886 +#: src/lang.c:889 #, c-format msgid "%d Trying to lock %s" msgstr "" -#: src/lang.c:888 +#: src/lang.c:891 msgid " h=help" msgstr "" -#: src/lang.c:890 +#: src/lang.c:893 msgid "Unlimited" msgstr "" -#: src/lang.c:891 +#: src/lang.c:894 msgid "Enter wildcard unsubscribe pattern> " msgstr "" -#: src/lang.c:892 +#: src/lang.c:895 #, c-format msgid "Error decoding %s : %s" msgstr "" -#: src/lang.c:893 +#: src/lang.c:896 msgid "No end." msgstr "" -#: src/lang.c:894 +#: src/lang.c:897 #, c-format msgid "%s successfully decoded." msgstr "" -#: src/lang.c:895 +#: src/lang.c:898 #, c-format msgid "" "%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" "\n" msgstr "" -#: src/lang.c:896 +#: src/lang.c:899 msgid "unread " msgstr "" -#: src/lang.c:897 +#: src/lang.c:900 #, c-format msgid "unsubscribed from %d groups" msgstr "" -#: src/lang.c:898 +#: src/lang.c:901 #, c-format msgid "Unsubscribed from %s" msgstr "" -#: src/lang.c:899 +#: src/lang.c:902 msgid "Unsubscribing... " msgstr "" -#: src/lang.c:900 +#: src/lang.c:903 msgid "Unthreading articles..." msgstr "" -#: src/lang.c:901 +#: src/lang.c:904 msgid "Updated" msgstr "" -#: src/lang.c:903 -#, c-format -msgid "unparseable \"LIST COUNTS\" line: \"%s\"" -msgstr "" - #: src/lang.c:905 msgid "Updating" msgstr "" @@ -3873,22 +3868,27 @@ msgstr "" #: src/lang.c:939 #, c-format +msgid "%s only useful for batch or debug mode operations\n" +msgstr "" + +#: src/lang.c:940 +#, c-format msgid "Useless combination %s and %s. Ignoring %s.\n" msgstr "" -#: src/lang.c:941 +#: src/lang.c:942 #, c-format msgid "" "\n" "%s%d out of range (0 - %d). Reset to 0" msgstr "" -#: src/lang.c:942 +#: src/lang.c:943 #, c-format msgid "View '%s' (%s/%s)?" msgstr "" -#: src/lang.c:944 +#: src/lang.c:945 #, c-format msgid "" "\n" @@ -3896,33 +3896,33 @@ msgid "" "%-100s\n" msgstr "" -#: src/lang.c:945 +#: src/lang.c:946 msgid "" "\n" "Warning: article unchanged after editing\n" msgstr "" -#: src/lang.c:946 +#: src/lang.c:947 msgid "" "\n" "Warning: \"Subject:\" contains only whitespaces.\n" msgstr "" -#: src/lang.c:947 +#: src/lang.c:948 msgid "" "\n" "Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:" "\".\n" msgstr "" -#: src/lang.c:949 +#: src/lang.c:950 msgid "" "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" " with \"Re: \" and does not contain \"(was:\".\n" msgstr "" -#: src/lang.c:952 +#: src/lang.c:953 msgid "" "Read carefully!\n" "\n" @@ -3936,7 +3936,7 @@ msgid "" "\n" msgstr "" -#: src/lang.c:956 +#: src/lang.c:957 msgid "" "\n" "Warning: You are using a non-plain transfer encoding (such as base64 or\n" @@ -3945,13 +3945,13 @@ msgid "" " not be encoded properly.\n" msgstr "" -#: src/lang.c:961 +#: src/lang.c:962 msgid "" "\n" "Warning: \"example\" is a reserved hierarchy!\n" msgstr "" -#: src/lang.c:962 +#: src/lang.c:963 #, c-format msgid "" "\n" @@ -3961,7 +3961,7 @@ msgid "" "Read WHATSNEW, etc...\n" msgstr "" -#: src/lang.c:964 +#: src/lang.c:965 #, c-format msgid "" "\n" @@ -3970,7 +3970,7 @@ msgid "" "Some values in your %s file may be ignored, others might have changed!\n" msgstr "" -#: src/lang.c:967 +#: src/lang.c:968 #, c-format msgid "" "Warning: tin wrote fewer groups to your\n" @@ -3980,19 +3980,19 @@ msgid "" "before you start tin once again!\n" msgstr "" -#: src/lang.c:971 +#: src/lang.c:972 #, c-format msgid "" "\n" "Warning: Found %d '-- \\n' lines, this may confuse some people.\n" msgstr "" -#: src/lang.c:972 +#: src/lang.c:973 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "" -#: src/lang.c:973 +#: src/lang.c:974 #, c-format msgid "" "\n" @@ -4003,49 +4003,49 @@ msgid "" " possible.\n" msgstr "" -#: src/lang.c:977 +#: src/lang.c:978 #, c-format msgid "" "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " msgstr "" -#: src/lang.c:978 +#: src/lang.c:979 msgid "" "\n" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" msgstr "" -#: src/lang.c:979 +#: src/lang.c:980 msgid "Writing attributes file..." msgstr "" -#: src/lang.c:981 +#: src/lang.c:982 #, c-format msgid "%d Responses" msgstr "" -#: src/lang.c:983 +#: src/lang.c:984 #, c-format msgid "Added %d %s" msgstr "" -#: src/lang.c:984 +#: src/lang.c:985 msgid "No unsubscribed groups to show" msgstr "" -#: src/lang.c:985 +#: src/lang.c:986 msgid "Showing subscribed to groups only" msgstr "" -#: src/lang.c:986 +#: src/lang.c:987 msgid "Yes " msgstr "" -#: src/lang.c:987 +#: src/lang.c:988 msgid " You have mail" msgstr "" -#: src/lang.c:992 +#: src/lang.c:993 #, c-format msgid "" "\n" @@ -4058,11 +4058,11 @@ msgid "" " M)enu option.\n" msgstr "" -#: src/lang.c:1003 +#: src/lang.c:1004 msgid " -D mode debug mode" msgstr "" -#: src/lang.c:1007 +#: src/lang.c:1008 msgid "" "Read carefully!\n" "\n" @@ -4079,11 +4079,11 @@ msgid "" "\n" msgstr "" -#: src/lang.c:1016 +#: src/lang.c:1017 msgid "toggle color" msgstr "" -#: src/lang.c:1017 +#: src/lang.c:1018 msgid "" "# Changing colors of several screen parts\n" "# Possible values are:\n" @@ -4108,218 +4108,212 @@ msgid "" "\n" msgstr "" -#: src/lang.c:1037 +#: src/lang.c:1038 msgid " -a toggle color flag" msgstr "" -#: src/lang.c:1041 +#: src/lang.c:1042 msgid "" "\n" "Error: Followup-To set to more than one newsgroup!\n" msgstr "" -#: src/lang.c:1042 +#: src/lang.c:1043 #, c-format msgid "" "\n" "Error: \"%s\" is renamed, use \"%s\" instead!\n" msgstr "" -#: src/lang.c:1043 +#: src/lang.c:1044 #, c-format msgid "" "\n" "Error: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "" -#: src/lang.c:1044 +#: src/lang.c:1045 #, c-format msgid "" "\n" "Error: \"%s\" is not a valid newsgroup!\n" msgstr "" -#: src/lang.c:1046 +#: src/lang.c:1047 msgid "" "\n" "Warning: Followup-To set to more than one newsgroup!\n" msgstr "" -#: src/lang.c:1047 +#: src/lang.c:1048 #, c-format msgid "" "\n" "Warning: \"%s\" is renamed, you should use \"%s\" instead!\n" msgstr "" -#: src/lang.c:1048 +#: src/lang.c:1049 #, c-format msgid "" "\n" "Warning: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "" -#: src/lang.c:1049 +#: src/lang.c:1050 #, c-format msgid "" "\n" "Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n" msgstr "" -#: src/lang.c:1050 +#: src/lang.c:1051 #, c-format msgid "" "\n" "Warning: \"%s\" is not a valid newsgroup at this site!\n" msgstr "" -#: src/lang.c:1054 +#: src/lang.c:1055 #, c-format msgid "%d files successfully written from %d articles. %d %s occurred." msgstr "" -#: src/lang.c:1055 +#: src/lang.c:1056 msgid "Missing parts." msgstr "" -#: src/lang.c:1056 +#: src/lang.c:1057 msgid "No beginning." msgstr "" -#: src/lang.c:1057 +#: src/lang.c:1058 msgid "No data." msgstr "" -#: src/lang.c:1058 +#: src/lang.c:1059 msgid "Unknown error." msgstr "" -#: src/lang.c:1061 +#: src/lang.c:1062 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "" -#: src/lang.c:1066 +#: src/lang.c:1067 msgid "Reading mail active file... " msgstr "" -#: src/lang.c:1067 +#: src/lang.c:1068 msgid "Reading mailgroups file... " msgstr "" -#: src/lang.c:1071 +#: src/lang.c:1072 msgid "perform PGP operations on article" msgstr "" -#: src/lang.c:1072 +#: src/lang.c:1073 msgid "Add key(s) to public keyring?" msgstr "" -#: src/lang.c:1073 +#: src/lang.c:1074 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "" -#: src/lang.c:1074 +#: src/lang.c:1075 #, c-format msgid "%s=sign, %s=sign & include public key, %s=quit: " msgstr "" -#: src/lang.c:1075 +#: src/lang.c:1076 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "" -#: src/lang.c:1076 +#: src/lang.c:1077 msgid "Article not signed and no public keys found" msgstr "" -#: src/lang.c:1078 +#: src/lang.c:1079 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:1079 +#: src/lang.c:1080 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " msgstr "" -#: src/lang.c:1080 +#: src/lang.c:1081 #, c-format msgid "" "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:1082 +#: src/lang.c:1083 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:1083 +#: src/lang.c:1084 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "" -#: src/lang.c:1084 +#: src/lang.c:1085 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:1088 +#: src/lang.c:1089 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:1089 +#: src/lang.c:1090 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "" -#: src/lang.c:1090 +#: src/lang.c:1091 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:1092 +#: src/lang.c:1093 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:1093 +#: src/lang.c:1094 #, c-format msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "" -#: src/lang.c:1094 +#: src/lang.c:1095 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:1103 +#: src/lang.c:1104 msgid "Try cache_overview_files to speed up things.\n" msgstr "" -#: src/lang.c:1104 +#: src/lang.c:1105 msgid "Tin will use local index files instead.\n" msgstr "" -#: src/lang.c:1105 +#: src/lang.c:1106 msgid "Cannot find NNTP server name" msgstr "" -#: src/lang.c:1106 +#: src/lang.c:1107 #, c-format msgid "Connecting to %s:%u..." msgstr "" -#: src/lang.c:1107 -msgid "Disconnecting from server...\n" -msgstr "" - #: src/lang.c:1108 -#, c-format -msgid "" -"Wrong newsgroup name (\"%s\") in response of \"GROUP %s\" command: \"%s\"" +msgid "Disconnecting from server..." msgstr "" #: src/lang.c:1109 @@ -5057,95 +5051,99 @@ msgstr "" msgid "NFD" msgstr "" -#: src/lang.c:1586 +#: src/lang.c:1580 +msgid "NFKC case fold" +msgstr "" + +#: src/lang.c:1589 msgid "Display Options" msgstr "" -#: src/lang.c:1593 +#: src/lang.c:1596 msgid "Color Options" msgstr "" -#: src/lang.c:1599 +#: src/lang.c:1602 msgid "Highlight Options" msgstr "" -#: src/lang.c:1606 +#: src/lang.c:1609 msgid "Article-Limiting Options" msgstr "" -#: src/lang.c:1612 +#: src/lang.c:1615 msgid "Posting/Mailing Options" msgstr "" -#: src/lang.c:1618 +#: src/lang.c:1621 msgid "Saving/Printing Options" msgstr "" -#: src/lang.c:1624 +#: src/lang.c:1627 msgid "Expert Options" msgstr "" -#: src/lang.c:1630 +#: src/lang.c:1633 msgid "Filtering Options" msgstr "" -#: src/lang.c:1635 src/lang.c:1666 src/lang.c:1672 src/lang.c:1699 -#: src/lang.c:1751 src/lang.c:1757 src/lang.c:1767 src/lang.c:1778 -#: src/lang.c:1796 src/lang.c:1865 src/lang.c:2066 src/lang.c:2072 -#: src/lang.c:2078 src/lang.c:2084 src/lang.c:2096 src/lang.c:2103 -#: src/lang.c:2157 src/lang.c:2166 src/lang.c:2172 src/lang.c:2179 -#: src/lang.c:2186 src/lang.c:2193 src/lang.c:2200 src/lang.c:2207 -#: src/lang.c:2214 src/lang.c:2221 src/lang.c:2228 src/lang.c:2235 -#: src/lang.c:2242 src/lang.c:2249 src/lang.c:2256 src/lang.c:2263 -#: src/lang.c:2270 src/lang.c:2277 src/lang.c:2284 src/lang.c:2291 -#: src/lang.c:2298 src/lang.c:2305 src/lang.c:2312 src/lang.c:2319 -#: src/lang.c:2326 src/lang.c:2333 src/lang.c:2340 src/lang.c:2348 -#: src/lang.c:2364 src/lang.c:2371 src/lang.c:2378 src/lang.c:2385 -#: src/lang.c:2391 src/lang.c:2397 src/lang.c:2414 src/lang.c:2426 -#: src/lang.c:2461 src/lang.c:2514 src/lang.c:2528 src/lang.c:2534 -#: src/lang.c:2559 src/lang.c:2577 src/lang.c:2594 src/lang.c:2606 -#: src/lang.c:2639 src/lang.c:2675 src/lang.c:2695 src/lang.c:2730 -#: src/lang.c:2740 src/lang.c:2747 src/lang.c:2773 src/lang.c:2797 -#: src/lang.c:2870 src/lang.c:2884 src/lang.c:2892 src/lang.c:2906 -#: src/lang.c:2912 src/lang.c:2950 +#: src/lang.c:1638 src/lang.c:1669 src/lang.c:1675 src/lang.c:1702 +#: src/lang.c:1754 src/lang.c:1760 src/lang.c:1770 src/lang.c:1781 +#: src/lang.c:1799 src/lang.c:1868 src/lang.c:2069 src/lang.c:2075 +#: src/lang.c:2081 src/lang.c:2087 src/lang.c:2099 src/lang.c:2106 +#: src/lang.c:2160 src/lang.c:2169 src/lang.c:2175 src/lang.c:2182 +#: src/lang.c:2189 src/lang.c:2196 src/lang.c:2203 src/lang.c:2210 +#: src/lang.c:2217 src/lang.c:2224 src/lang.c:2231 src/lang.c:2238 +#: src/lang.c:2245 src/lang.c:2252 src/lang.c:2259 src/lang.c:2266 +#: src/lang.c:2273 src/lang.c:2280 src/lang.c:2287 src/lang.c:2294 +#: src/lang.c:2301 src/lang.c:2308 src/lang.c:2315 src/lang.c:2322 +#: src/lang.c:2329 src/lang.c:2336 src/lang.c:2343 src/lang.c:2351 +#: src/lang.c:2367 src/lang.c:2374 src/lang.c:2381 src/lang.c:2388 +#: src/lang.c:2394 src/lang.c:2400 src/lang.c:2417 src/lang.c:2429 +#: src/lang.c:2464 src/lang.c:2517 src/lang.c:2531 src/lang.c:2537 +#: src/lang.c:2562 src/lang.c:2580 src/lang.c:2597 src/lang.c:2609 +#: src/lang.c:2642 src/lang.c:2678 src/lang.c:2698 src/lang.c:2733 +#: src/lang.c:2743 src/lang.c:2750 src/lang.c:2776 src/lang.c:2800 +#: src/lang.c:2877 src/lang.c:2892 src/lang.c:2900 src/lang.c:2914 +#: src/lang.c:2920 src/lang.c:2958 msgid " toggles, sets, cancels." msgstr "" -#: src/lang.c:1636 +#: src/lang.c:1639 msgid "Show mini menu & posting etiquette" msgstr "" -#: src/lang.c:1637 +#: src/lang.c:1640 msgid "" "# If ON show a mini menu of useful commands at each level\n" "# and posting etiquette after composing an article\n" msgstr "" -#: src/lang.c:1642 +#: src/lang.c:1645 msgid "Show short description for each newsgroup. toggles & sets." msgstr "" -#: src/lang.c:1643 +#: src/lang.c:1646 msgid "Show description of each newsgroup" msgstr "" -#: src/lang.c:1644 +#: src/lang.c:1647 msgid "" "# If ON show group description text after newsgroup name at\n" "# group selection level\n" msgstr "" -#: src/lang.c:1649 +#: src/lang.c:1652 msgid "" "Show From (author) fields in group & thread level. toggles & " "sets." msgstr "" -#: src/lang.c:1650 +#: src/lang.c:1653 msgid "In group and thread level, show author by" msgstr "" -#: src/lang.c:1651 +#: src/lang.c:1654 msgid "" "# Part of From field to display in group and thread level\n" "# Possible values are (the default is marked with *):\n" @@ -5155,31 +5153,31 @@ msgid "" "# 3 = both\n" msgstr "" -#: src/lang.c:1660 +#: src/lang.c:1663 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "" -#: src/lang.c:1661 +#: src/lang.c:1664 msgid "Draw -> instead of highlighted bar" msgstr "" -#: src/lang.c:1662 +#: src/lang.c:1665 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "" -#: src/lang.c:1667 +#: src/lang.c:1670 msgid "Use inverse video for page headers" msgstr "" -#: src/lang.c:1668 +#: src/lang.c:1671 msgid "# If ON use inverse video for page headers at different levels\n" msgstr "" -#: src/lang.c:1673 +#: src/lang.c:1676 msgid "Thread articles by" msgstr "" -#: src/lang.c:1674 +#: src/lang.c:1677 msgid "" "# Thread articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5191,15 +5189,15 @@ msgid "" "# 5 = Percentage Match\n" msgstr "" -#: src/lang.c:1685 +#: src/lang.c:1688 msgid "Enter percentage match required to thread together. sets." msgstr "" -#: src/lang.c:1686 +#: src/lang.c:1689 msgid "Thread percentage match" msgstr "" -#: src/lang.c:1688 +#: src/lang.c:1691 #, no-c-format msgid "" "# Thread percentage match...\n" @@ -5214,11 +5212,11 @@ msgid "" "# 'harppy' would be threaded separately from 'happy'\n" msgstr "" -#: src/lang.c:1700 +#: src/lang.c:1703 msgid "Score of a thread" msgstr "" -#: src/lang.c:1701 +#: src/lang.c:1704 msgid "" "# Thread score\n" "# Possible values are (the default is marked with *):\n" @@ -5227,16 +5225,16 @@ msgid "" "# 2 = average\n" msgstr "" -#: src/lang.c:1709 +#: src/lang.c:1712 msgid "" "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "" -#: src/lang.c:1710 +#: src/lang.c:1713 msgid "Sort articles by" msgstr "" -#: src/lang.c:1711 +#: src/lang.c:1714 msgid "" "# Sort articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5253,15 +5251,15 @@ msgid "" "# 10 = Lines ascending\n" msgstr "" -#: src/lang.c:1727 +#: src/lang.c:1730 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "" -#: src/lang.c:1728 +#: src/lang.c:1731 msgid "Sort threads by" msgstr "" -#: src/lang.c:1729 +#: src/lang.c:1732 msgid "" "# Sort thread by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5272,44 +5270,44 @@ msgid "" "# 4 = Last posting date ascending\n" msgstr "" -#: src/lang.c:1739 +#: src/lang.c:1742 msgid "" "Put cursor at first/last unread art in groups. toggles & sets." msgstr "" -#: src/lang.c:1740 +#: src/lang.c:1743 msgid "Go to first unread article in group" msgstr "" -#: src/lang.c:1741 +#: src/lang.c:1744 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "" -#: src/lang.c:1745 +#: src/lang.c:1748 msgid "Show all articles or only unread articles. toggles & sets." msgstr "" -#: src/lang.c:1746 +#: src/lang.c:1749 msgid "Show only unread articles" msgstr "" -#: src/lang.c:1747 +#: src/lang.c:1750 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "" -#: src/lang.c:1752 +#: src/lang.c:1755 msgid "Show only groups with unread arts" msgstr "" -#: src/lang.c:1753 +#: src/lang.c:1756 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "" -#: src/lang.c:1758 +#: src/lang.c:1761 msgid "Filter which articles" msgstr "" -#: src/lang.c:1759 +#: src/lang.c:1762 msgid "" "# Filter which articles\n" "# Possible values are (the default is marked with *):\n" @@ -5318,11 +5316,11 @@ msgid "" "# 2 = kill all articles and never show them\n" msgstr "" -#: src/lang.c:1768 +#: src/lang.c:1771 msgid "Go to the next unread article with" msgstr "" -#: src/lang.c:1769 +#: src/lang.c:1772 msgid "" "# Go to the unread article with following key(s)\n" "# Possible values are (the default is marked with *):\n" @@ -5332,11 +5330,11 @@ msgid "" "# 3 = PAGE DOWN or TAB\n" msgstr "" -#: src/lang.c:1779 +#: src/lang.c:1782 msgid "How to treat blank lines" msgstr "" -#: src/lang.c:1780 +#: src/lang.c:1783 msgid "" "# Trim the article body, remove unnecessary blank lines.\n" "# Possible values are (the default is marked with *):\n" @@ -5353,168 +5351,168 @@ msgid "" "# leading and trailing blank lines\n" msgstr "" -#: src/lang.c:1797 +#: src/lang.c:1800 msgid "List thread using right arrow key" msgstr "" -#: src/lang.c:1798 +#: src/lang.c:1801 msgid "" "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "" -#: src/lang.c:1802 +#: src/lang.c:1805 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "" -#: src/lang.c:1803 +#: src/lang.c:1806 msgid "Character to show deleted articles" msgstr "" -#: src/lang.c:1804 +#: src/lang.c:1807 msgid "" "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1809 +#: src/lang.c:1812 msgid "" "Enter character to indicate articles in a range. sets, cancels." msgstr "" -#: src/lang.c:1810 +#: src/lang.c:1813 msgid "Character to show inrange articles" msgstr "" -#: src/lang.c:1811 +#: src/lang.c:1814 msgid "" "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1816 +#: src/lang.c:1819 msgid "" "Enter character to indicate that article will return. sets, " "cancels." msgstr "" -#: src/lang.c:1817 +#: src/lang.c:1820 msgid "Character to show returning arts" msgstr "" -#: src/lang.c:1818 +#: src/lang.c:1821 msgid "" "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1823 +#: src/lang.c:1826 msgid "" "Enter character to indicate selected articles. sets, cancels." msgstr "" -#: src/lang.c:1824 +#: src/lang.c:1827 msgid "Character to show selected articles" msgstr "" -#: src/lang.c:1825 +#: src/lang.c:1828 msgid "" "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1830 +#: src/lang.c:1833 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "" -#: src/lang.c:1831 +#: src/lang.c:1834 msgid "Character to show recent articles" msgstr "" -#: src/lang.c:1832 +#: src/lang.c:1835 msgid "" "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1837 +#: src/lang.c:1840 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "" -#: src/lang.c:1838 +#: src/lang.c:1841 msgid "Character to show unread articles" msgstr "" -#: src/lang.c:1839 +#: src/lang.c:1842 msgid "" "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1844 +#: src/lang.c:1847 msgid "Enter character to indicate read articles. sets, cancels." msgstr "" -#: src/lang.c:1845 +#: src/lang.c:1848 msgid "Character to show read articles" msgstr "" -#: src/lang.c:1846 +#: src/lang.c:1849 msgid "" "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1851 +#: src/lang.c:1854 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "" -#: src/lang.c:1852 +#: src/lang.c:1855 msgid "Character to show killed articles" msgstr "" -#: src/lang.c:1853 +#: src/lang.c:1856 msgid "" "# Character used to show that an art was killed (default 'K')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" msgstr "" -#: src/lang.c:1858 +#: src/lang.c:1861 msgid "" "Enter character to indicate read selected articles. sets, cancels." msgstr "" -#: src/lang.c:1859 +#: src/lang.c:1862 msgid "Character to show readselected arts" msgstr "" -#: src/lang.c:1860 +#: src/lang.c:1863 msgid "" "# Character used to show that an art was selected before read (default ':')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" msgstr "" -#: src/lang.c:1866 +#: src/lang.c:1869 msgid "Abbreviate long newsgroup names" msgstr "" -#: src/lang.c:1867 +#: src/lang.c:1870 msgid "" "# If ON abbreviate (if necessary) long newsgroup names at group selection\n" "# level and article level like this:\n" "# news.software.readers -> n.software.readers -> n.s.readers -> n.s.r.\n" msgstr "" -#: src/lang.c:1873 +#: src/lang.c:1876 msgid "" "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" msgstr "" -#: src/lang.c:1874 +#: src/lang.c:1877 msgid "Number of lines to scroll in pager" msgstr "" -#: src/lang.c:1875 +#: src/lang.c:1878 msgid "" "# Number of lines that cursor-up/down will scroll in article pager\n" "# Possible values are (the default is marked with *):\n" @@ -5525,28 +5523,28 @@ msgid "" "# 2 or greater = scroll by 2 or more lines (only in the pager)\n" msgstr "" -#: src/lang.c:1885 +#: src/lang.c:1888 msgid "Display signatures. toggles & sets." msgstr "" -#: src/lang.c:1886 +#: src/lang.c:1889 msgid "Display signatures" msgstr "" -#: src/lang.c:1887 +#: src/lang.c:1890 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "" -#: src/lang.c:1891 +#: src/lang.c:1894 msgid "" "Display uuencoded data as tagged attachments. toggles & sets." msgstr "" -#: src/lang.c:1892 +#: src/lang.c:1895 msgid "Display uue data as an attachment" msgstr "" -#: src/lang.c:1893 +#: src/lang.c:1896 msgid "" "# Handling of uuencoded data in the pager\n" "# Possible values are (the default is marked with *):\n" @@ -5558,30 +5556,30 @@ msgid "" "# be folded into a tag line.\n" msgstr "" -#: src/lang.c:1903 +#: src/lang.c:1906 msgid "" "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "" -#: src/lang.c:1904 +#: src/lang.c:1907 msgid "Display \"a as Umlaut-a" msgstr "" -#: src/lang.c:1905 +#: src/lang.c:1908 msgid "" "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" msgstr "" -#: src/lang.c:1910 src/lang.c:1920 +#: src/lang.c:1913 src/lang.c:1923 msgid "Space separated list of header fields" msgstr "" -#: src/lang.c:1911 +#: src/lang.c:1914 msgid "Display these header fields (or *)" msgstr "" -#: src/lang.c:1912 +#: src/lang.c:1915 msgid "" "# Which news headers you wish to see. If you want to see _all_ the headers,\n" "# place an '*' as this value. This is the only way a wildcard can be used.\n" @@ -5591,11 +5589,11 @@ msgid "" "# spaces. Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1921 +#: src/lang.c:1924 msgid "Do not display these header fields" msgstr "" -#: src/lang.c:1922 +#: src/lang.c:1925 msgid "" "# Same as 'news_headers_to_display' except it denotes the opposite.\n" "# An example of using both options might be if you thought X- headers were\n" @@ -5607,357 +5605,357 @@ msgid "" "# Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1932 +#: src/lang.c:1935 msgid "" "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "" -#: src/lang.c:1933 +#: src/lang.c:1936 msgid "Skip multipart/alternative parts" msgstr "" -#: src/lang.c:1934 +#: src/lang.c:1937 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "" -#: src/lang.c:1938 +#: src/lang.c:1941 msgid "Enable detection of verbatim blocks? toggles & sets." msgstr "" -#: src/lang.c:1939 +#: src/lang.c:1942 msgid "Detection of verbatim blocks" msgstr "" -#: src/lang.c:1940 +#: src/lang.c:1943 msgid "# If ON detect verbatim blocks in articles\n" msgstr "" -#: src/lang.c:1945 +#: src/lang.c:1948 msgid "A regex used to decide which lines to show in col_quote." msgstr "" -#: src/lang.c:1946 +#: src/lang.c:1949 msgid "Regex used to show quoted lines" msgstr "" -#: src/lang.c:1947 +#: src/lang.c:1950 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# quoted when viewing articles. Quoted lines are shown in col_quote.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1953 +#: src/lang.c:1956 msgid "A regex used to decide which lines to show in col_quote2." msgstr "" -#: src/lang.c:1954 +#: src/lang.c:1957 msgid "Regex used to show twice quoted l." msgstr "" -#: src/lang.c:1955 +#: src/lang.c:1958 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# quoted twice. Twice quoted lines are shown in col_quote2.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1961 +#: src/lang.c:1964 msgid "A regex used to decide which lines to show in col_quote3." msgstr "" -#: src/lang.c:1962 +#: src/lang.c:1965 msgid "Regex used to show >= 3 times q.l." msgstr "" -#: src/lang.c:1963 +#: src/lang.c:1966 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# quoted >=3 times. >=3 times quoted lines are shown in col_quote3.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1969 +#: src/lang.c:1972 msgid "Enable detection of external quotes? toggles & sets." msgstr "" -#: src/lang.c:1970 +#: src/lang.c:1973 msgid "Detection of external quotes" msgstr "" -#: src/lang.c:1971 +#: src/lang.c:1974 msgid "# If ON detect quoted text from external sources in articles\n" msgstr "" -#: src/lang.c:1975 +#: src/lang.c:1978 msgid "A regex used to decide which lines to show in col_extquote." msgstr "" -#: src/lang.c:1976 +#: src/lang.c:1979 msgid "Regex used to show quotes from external sources" msgstr "" -#: src/lang.c:1977 +#: src/lang.c:1980 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# external quotes. Text from external quotes is shown in col_extquote.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1984 +#: src/lang.c:1987 msgid "A regex used to decide which words to show in col_markslashes." msgstr "" -#: src/lang.c:1985 +#: src/lang.c:1988 msgid "Regex used to highlight /slashes/" msgstr "" -#: src/lang.c:1986 +#: src/lang.c:1989 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '/' are to be shown in col_markslashes.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1992 +#: src/lang.c:1995 msgid "A regex used to decide which words to show in col_markstars." msgstr "" -#: src/lang.c:1993 +#: src/lang.c:1996 msgid "Regex used to highlight *stars*" msgstr "" -#: src/lang.c:1994 +#: src/lang.c:1997 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '*' are to be shown in col_markstars.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:2000 +#: src/lang.c:2003 msgid "A regex used to decide which words to show in col_markstroke." msgstr "" -#: src/lang.c:2001 +#: src/lang.c:2004 msgid "Regex used to highlight -strokes-" msgstr "" -#: src/lang.c:2002 +#: src/lang.c:2005 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '-' are to be shown in col_markstroke.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:2008 +#: src/lang.c:2011 msgid "A regex used to decide which words to show in col_markdash." msgstr "" -#: src/lang.c:2009 +#: src/lang.c:2012 msgid "Regex used to highlight _underline_" msgstr "" -#: src/lang.c:2010 +#: src/lang.c:2013 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '_' are to be shown in col_markdash.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:2016 +#: src/lang.c:2019 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:2017 +#: src/lang.c:2020 msgid "Regex with Subject prefixes" msgstr "" -#: src/lang.c:2018 +#: src/lang.c:2021 msgid "" "# A regular expression that tin will use to find Subject prefixes\n" "# which will be removed before showing the header.\n" msgstr "" -#: src/lang.c:2023 +#: src/lang.c:2026 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:2024 +#: src/lang.c:2027 msgid "Regex with Subject suffixes" msgstr "" -#: src/lang.c:2025 +#: src/lang.c:2028 msgid "" "# A regular expression that tin will use to find Subject suffixes\n" "# which will be removed when replying or posting followup.\n" msgstr "" -#: src/lang.c:2030 +#: src/lang.c:2033 msgid "A regex used to find the begin of a verbatim block." msgstr "" -#: src/lang.c:2031 +#: src/lang.c:2034 msgid "Regex for begin of a verbatim block" msgstr "" -#: src/lang.c:2032 +#: src/lang.c:2035 msgid "" "# A regular expression that tin will use to find the begin of\n" "# a verbatim block.\n" msgstr "" -#: src/lang.c:2037 +#: src/lang.c:2040 msgid "A regex used to find the end of a verbatim block." msgstr "" -#: src/lang.c:2038 +#: src/lang.c:2041 msgid "Regex for end of a verbatim block" msgstr "" -#: src/lang.c:2039 +#: src/lang.c:2042 msgid "" "# A regular expression that tin will use to find the end of\n" "# a verbatim block.\n" msgstr "" -#: src/lang.c:2044 +#: src/lang.c:2047 msgid "" "Enter name and options for external MIME viewer, --internal for built-in " "viewer" msgstr "" -#: src/lang.c:2045 +#: src/lang.c:2048 msgid "MIME binary content viewer" msgstr "" -#: src/lang.c:2046 +#: src/lang.c:2049 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 " +"# Otherwise specify an external viewer program (eg. metamail) or leave " "blank\n" "# for no automatic viewing\n" msgstr "" -#: src/lang.c:2053 +#: src/lang.c:2056 msgid "Confirm before starting non-text viewing program" msgstr "" -#: src/lang.c:2054 +#: src/lang.c:2057 msgid "Ask before using MIME viewer" msgstr "" -#: src/lang.c:2055 +#: src/lang.c:2058 msgid "" "# If ON tin will ask before using metamail to display MIME messages\n" "# this only happens if metamail_prog is set to something\n" msgstr "" -#: src/lang.c:2060 +#: src/lang.c:2063 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "" -#: src/lang.c:2061 +#: src/lang.c:2064 msgid "Catchup read groups when quitting" msgstr "" -#: src/lang.c:2062 +#: src/lang.c:2065 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "" -#: src/lang.c:2067 +#: src/lang.c:2070 msgid "Catchup group using left key" msgstr "" -#: src/lang.c:2068 +#: src/lang.c:2071 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "" -#: src/lang.c:2073 +#: src/lang.c:2076 msgid "Catchup thread by using left key" msgstr "" -#: src/lang.c:2079 +#: src/lang.c:2082 msgid "Which actions require confirmation" msgstr "" -#: src/lang.c:2080 +#: src/lang.c:2083 msgid "# What should we ask confirmation for.\n" msgstr "" -#: src/lang.c:2085 +#: src/lang.c:2088 msgid "'Mark as (un)read' ignores tags" msgstr "" -#: src/lang.c:2086 +#: src/lang.c:2089 msgid "" "# If ON the 'Mark as (un)read' function marks only the current article.\n" msgstr "" -#: src/lang.c:2090 +#: src/lang.c:2093 msgid "Program to run to open URLs, sets, cancels." msgstr "" -#: src/lang.c:2091 +#: src/lang.c:2094 msgid "Program that opens URLs" msgstr "" -#: src/lang.c:2092 +#: src/lang.c:2095 msgid "# The program used to open URLs. The actual URL will be appended\n" msgstr "" -#: src/lang.c:2097 +#: src/lang.c:2100 msgid "Use mouse in xterm" msgstr "" -#: src/lang.c:2098 +#: src/lang.c:2101 msgid "# If ON enable mouse button support on xterm terminals\n" msgstr "" -#: src/lang.c:2104 +#: src/lang.c:2107 msgid "Use scroll keys on keypad" msgstr "" -#: src/lang.c:2105 +#: src/lang.c:2108 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "" -#: src/lang.c:2110 +#: src/lang.c:2113 msgid "Enter maximum number of article to get. sets." msgstr "" -#: src/lang.c:2111 +#: src/lang.c:2114 msgid "Number of articles to get" msgstr "" -#: src/lang.c:2112 +#: src/lang.c:2115 msgid "" "# Number of articles to get (0=no limit), if negative sets maximum number\n" "# of already read articles to be read before first unread one\n" msgstr "" -#: src/lang.c:2117 +#: src/lang.c:2120 msgid "Enter number of days article is considered recent. sets." msgstr "" -#: src/lang.c:2118 +#: src/lang.c:2121 msgid "Article recentness time limit" msgstr "" -#: src/lang.c:2119 +#: src/lang.c:2122 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "" -#: src/lang.c:2123 +#: src/lang.c:2126 msgid "" "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "" -#: src/lang.c:2124 +#: src/lang.c:2127 msgid "Wildcard matching" msgstr "" -#: src/lang.c:2125 +#: src/lang.c:2128 msgid "" "# Wildcard matching\n" "# Possible values are (the default is marked with *):\n" @@ -5965,327 +5963,327 @@ msgid "" "# 1 = regex\n" msgstr "" -#: src/lang.c:2132 +#: src/lang.c:2135 msgid "Enter minimal score before an article is marked killed. sets." msgstr "" -#: src/lang.c:2133 +#: src/lang.c:2136 msgid "Score limit (kill)" msgstr "" -#: src/lang.c:2134 +#: src/lang.c:2137 msgid "# Score limit before an article is marked killed\n" msgstr "" -#: src/lang.c:2138 +#: src/lang.c:2141 msgid "Enter default score to kill articles. sets." msgstr "" -#: src/lang.c:2139 +#: src/lang.c:2142 msgid "Default score to kill articles" msgstr "" -#: src/lang.c:2140 +#: src/lang.c:2143 msgid "# Default score to kill articles\n" msgstr "" -#: src/lang.c:2144 +#: src/lang.c:2147 msgid "Enter minimal score before an article is marked hot. sets." msgstr "" -#: src/lang.c:2145 +#: src/lang.c:2148 msgid "Score limit (select)" msgstr "" -#: src/lang.c:2146 +#: src/lang.c:2149 msgid "# Score limit before an article is marked hot\n" msgstr "" -#: src/lang.c:2150 +#: src/lang.c:2153 msgid "Enter default score to select articles. sets." msgstr "" -#: src/lang.c:2151 +#: src/lang.c:2154 msgid "Default score to select articles" msgstr "" -#: src/lang.c:2152 +#: src/lang.c:2155 msgid "# Default score to select articles\n" msgstr "" -#: src/lang.c:2158 +#: src/lang.c:2161 msgid "Use slrnface to show ''X-Face:''s" msgstr "" -#: src/lang.c:2159 +#: src/lang.c:2162 msgid "" "# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n" "# Only useful when running in an xterm.\n" msgstr "" -#: src/lang.c:2167 +#: src/lang.c:2170 msgid "Use ANSI color" msgstr "" -#: src/lang.c:2168 +#: src/lang.c:2171 msgid "# If ON using ANSI-color\n" msgstr "" -#: src/lang.c:2173 +#: src/lang.c:2176 msgid "Standard foreground color" msgstr "" -#: src/lang.c:2174 +#: src/lang.c:2177 msgid "" "# Standard foreground color\n" "# Default: -1 (default color)\n" msgstr "" -#: src/lang.c:2180 +#: src/lang.c:2183 msgid "Standard background color" msgstr "" -#: src/lang.c:2181 +#: src/lang.c:2184 msgid "" "# Standard background color\n" "# Default: -1 (default color)\n" msgstr "" -#: src/lang.c:2187 +#: src/lang.c:2190 msgid "Color for inverse text (background)" msgstr "" -#: src/lang.c:2188 +#: src/lang.c:2191 msgid "" "# Color of background for inverse text\n" "# Default: 4 (blue)\n" msgstr "" -#: src/lang.c:2194 +#: src/lang.c:2197 msgid "Color for inverse text (foreground)" msgstr "" -#: src/lang.c:2195 +#: src/lang.c:2198 msgid "" "# Color of foreground for inverse text\n" "# Default: 7 (white)\n" msgstr "" -#: src/lang.c:2201 +#: src/lang.c:2204 msgid "Color of text lines" msgstr "" -#: src/lang.c:2202 +#: src/lang.c:2205 msgid "" "# Color of text lines\n" "# Default: -1 (default color)\n" msgstr "" -#: src/lang.c:2208 +#: src/lang.c:2211 msgid "Color of mini help menu" msgstr "" -#: src/lang.c:2209 +#: src/lang.c:2212 msgid "" "# Color of mini help menu\n" "# Default: 3 (brown)\n" msgstr "" -#: src/lang.c:2215 +#: src/lang.c:2218 msgid "Color of help text" msgstr "" -#: src/lang.c:2216 +#: src/lang.c:2219 msgid "" "# Color of help pages\n" "# Default: -1 (default color)\n" msgstr "" -#: src/lang.c:2222 +#: src/lang.c:2225 msgid "Color of status messages" msgstr "" -#: src/lang.c:2223 +#: src/lang.c:2226 msgid "" "# Color of messages in last line\n" "# Default: 6 (cyan)\n" msgstr "" -#: src/lang.c:2229 +#: src/lang.c:2232 msgid "Color of quoted lines" msgstr "" -#: src/lang.c:2230 +#: src/lang.c:2233 msgid "" "# Color of quote-lines\n" "# Default: 2 (green)\n" msgstr "" -#: src/lang.c:2236 +#: src/lang.c:2239 msgid "Color of twice quoted line" msgstr "" -#: src/lang.c:2237 +#: src/lang.c:2240 msgid "" "# Color of twice quoted lines\n" "# Default: 3 (brown)\n" msgstr "" -#: src/lang.c:2243 +#: src/lang.c:2246 msgid "Color of =>3 times quoted line" msgstr "" -#: src/lang.c:2244 +#: src/lang.c:2247 msgid "" "# Color of >=3 times quoted lines\n" "# Default: 4 (blue)\n" msgstr "" -#: src/lang.c:2250 +#: src/lang.c:2253 msgid "Color of article header lines" msgstr "" -#: src/lang.c:2251 +#: src/lang.c:2254 msgid "" "# Color of header-lines\n" "# Default: 2 (green)\n" msgstr "" -#: src/lang.c:2257 +#: src/lang.c:2260 msgid "Color of actual news header fields" msgstr "" -#: src/lang.c:2258 +#: src/lang.c:2261 msgid "" "# Color of actual news header fields\n" "# Default: 9 (light red)\n" msgstr "" -#: src/lang.c:2264 +#: src/lang.c:2267 msgid "Color of article subject lines" msgstr "" -#: src/lang.c:2265 +#: src/lang.c:2268 msgid "" "# Color of article subject\n" "# Default: 6 (cyan)\n" msgstr "" -#: src/lang.c:2271 +#: src/lang.c:2274 msgid "Color of external quotes" msgstr "" -#: src/lang.c:2272 +#: src/lang.c:2275 msgid "" "# Color of quoted text from external sources\n" "# Default: 5 (pink)\n" msgstr "" -#: src/lang.c:2278 +#: src/lang.c:2281 msgid "Color of response counter" msgstr "" -#: src/lang.c:2279 +#: src/lang.c:2282 msgid "" "# Color of response counter\n" "# Default: 2 (green)\n" msgstr "" -#: src/lang.c:2285 +#: src/lang.c:2288 msgid "Color of sender (From:)" msgstr "" -#: src/lang.c:2286 +#: src/lang.c:2289 msgid "" "# Color of sender (From:)\n" "# Default: 2 (green)\n" msgstr "" -#: src/lang.c:2292 +#: src/lang.c:2295 msgid "Color of help/mail sign" msgstr "" -#: src/lang.c:2293 +#: src/lang.c:2296 msgid "" "# Color of Help/Mail-Sign\n" "# Default: 4 (blue)\n" msgstr "" -#: src/lang.c:2299 +#: src/lang.c:2302 msgid "Color of signatures" msgstr "" -#: src/lang.c:2300 +#: src/lang.c:2303 msgid "" "# Color of signature\n" "# Default: 4 (blue)\n" msgstr "" -#: src/lang.c:2306 +#: src/lang.c:2309 msgid "Color of highlighted URLs" msgstr "" -#: src/lang.c:2307 +#: src/lang.c:2310 msgid "" "# Color of highlighted URLs\n" "# Default: -1 (default color)\n" msgstr "" -#: src/lang.c:2313 +#: src/lang.c:2316 msgid "Color of verbatim blocks" msgstr "" -#: src/lang.c:2314 +#: src/lang.c:2317 msgid "" "# Color of verbatim blocks\n" "# Default: 5 (pink)\n" msgstr "" -#: src/lang.c:2320 +#: src/lang.c:2323 msgid "Color of highlighting with *stars*" msgstr "" -#: src/lang.c:2321 +#: src/lang.c:2324 msgid "" "# Color of word highlighting with *stars*\n" "# Default: 11 (yellow)\n" msgstr "" -#: src/lang.c:2327 +#: src/lang.c:2330 msgid "Color of highlighting with _dash_" msgstr "" -#: src/lang.c:2328 +#: src/lang.c:2331 msgid "" "# Color of word highlighting with _dash_\n" "# Default: 13 (light pink)\n" msgstr "" -#: src/lang.c:2334 +#: src/lang.c:2337 msgid "Color of highlighting with /slash/" msgstr "" -#: src/lang.c:2335 +#: src/lang.c:2338 msgid "" "# Color of word highlighting with /slash/\n" "# Default: 14 (light cyan)\n" msgstr "" -#: src/lang.c:2341 +#: src/lang.c:2344 msgid "Color of highlighting with -stroke-" msgstr "" -#: src/lang.c:2342 +#: src/lang.c:2345 msgid "" "# Color of word highlighting with -stroke-\n" "# Default: 12 (light blue)\n" msgstr "" -#: src/lang.c:2349 +#: src/lang.c:2352 msgid "Attr. of highlighting with *stars*" msgstr "" -#: src/lang.c:2350 +#: src/lang.c:2353 msgid "" "# Attributes of word highlighting on mono terminals\n" "# Possible values are:\n" @@ -6301,57 +6299,57 @@ msgid "" "# Default: 6 (bold)\n" msgstr "" -#: src/lang.c:2365 +#: src/lang.c:2368 msgid "Attr. of highlighting with _dash_" msgstr "" -#: src/lang.c:2366 +#: src/lang.c:2369 msgid "" "# Attribute of word highlighting with _dash_\n" "# Default: 2 (best highlighting)\n" msgstr "" -#: src/lang.c:2372 +#: src/lang.c:2375 msgid "Attr. of highlighting with /slash/" msgstr "" -#: src/lang.c:2373 +#: src/lang.c:2376 msgid "" "# Attribute of word highlighting with /slash/\n" "# Default: 5 (half bright)\n" msgstr "" -#: src/lang.c:2379 +#: src/lang.c:2382 msgid "Attr. of highlighting with -stroke-" msgstr "" -#: src/lang.c:2380 +#: src/lang.c:2383 msgid "" "# Attribute of word highlighting with -stroke-\n" "# Default: 3 (reverse video)\n" msgstr "" -#: src/lang.c:2386 +#: src/lang.c:2389 msgid "URL highlighting in message body" msgstr "" -#: src/lang.c:2387 +#: src/lang.c:2390 msgid "# Enable URL highlighting?\n" msgstr "" -#: src/lang.c:2392 +#: src/lang.c:2395 msgid "Word highlighting in message body" msgstr "" -#: src/lang.c:2393 +#: src/lang.c:2396 msgid "# Enable word highlighting?\n" msgstr "" -#: src/lang.c:2398 +#: src/lang.c:2401 msgid "What to display instead of mark" msgstr "" -#: src/lang.c:2399 +#: src/lang.c:2402 msgid "" "# Should the leading and ending stars and dashes also be displayed,\n" "# even when they are highlighting marks?\n" @@ -6361,56 +6359,56 @@ msgid "" "# * 2 = print a space instead\n" msgstr "" -#: src/lang.c:2408 +#: src/lang.c:2411 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "" -#: src/lang.c:2409 +#: src/lang.c:2412 msgid "Page line wrap column" msgstr "" -#: src/lang.c:2410 +#: src/lang.c:2413 msgid "# Wrap article lines at column\n" msgstr "" -#: src/lang.c:2415 +#: src/lang.c:2418 msgid "Wrap around threads on next unread" msgstr "" -#: src/lang.c:2416 +#: src/lang.c:2419 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "" -#: src/lang.c:2420 +#: src/lang.c:2423 msgid "Enter default mail address (and fullname). sets." msgstr "" -#: src/lang.c:2421 src/lang.c:2931 +#: src/lang.c:2424 src/lang.c:2939 msgid "Mail address (and fullname)" msgstr "" -#: src/lang.c:2422 +#: src/lang.c:2425 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "" -#: src/lang.c:2427 +#: src/lang.c:2430 msgid "Show empty Followup-To in editor" msgstr "" -#: src/lang.c:2428 +#: src/lang.c:2431 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "" -#: src/lang.c:2432 +#: src/lang.c:2435 msgid "" "Enter path/! command/--none to create your default signature. sets." msgstr "" -#: src/lang.c:2433 +#: src/lang.c:2436 msgid "Create signature from path/command" msgstr "" -#: src/lang.c:2434 +#: src/lang.c:2437 #, c-format msgid "" "# Signature path (random sigs)/file to be used when posting/replying\n" @@ -6420,52 +6418,52 @@ msgid "" "# sigfile=--none don't append a signature\n" msgstr "" -#: src/lang.c:2442 +#: src/lang.c:2445 msgid "" "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "" -#: src/lang.c:2443 +#: src/lang.c:2446 msgid "Prepend signature with \"-- \"" msgstr "" -#: src/lang.c:2444 +#: src/lang.c:2447 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "" -#: src/lang.c:2448 +#: src/lang.c:2451 msgid "Add signature when reposting articles. toggles & sets." msgstr "" -#: src/lang.c:2449 +#: src/lang.c:2452 msgid "Add signature when reposting" msgstr "" -#: src/lang.c:2450 +#: src/lang.c:2453 msgid "# If ON add signature to reposted articles\n" msgstr "" -#: src/lang.c:2454 +#: src/lang.c:2457 #, c-format msgid "Enter quotation marks, %s or %S for author's initials." msgstr "" -#: src/lang.c:2455 +#: src/lang.c:2458 msgid "Characters used as quote-marks" msgstr "" -#: src/lang.c:2456 +#: src/lang.c:2459 #, c-format msgid "" "# Characters used in quoting to followups and replies.\n" "# '_' is replaced by ' ', %s, %S are replaced by author's initials.\n" msgstr "" -#: src/lang.c:2462 +#: src/lang.c:2465 msgid "Quoting behavior" msgstr "" -#: src/lang.c:2463 +#: src/lang.c:2466 msgid "" "# How quoting should be handled when following up or replying.\n" "# Possible values are (the default is marked with *):\n" @@ -6479,52 +6477,52 @@ msgid "" "# 7 = Compress quotes, quote signatures, quote empty lines\n" msgstr "" -#: src/lang.c:2476 src/lang.c:2484 src/lang.c:2490 +#: src/lang.c:2479 src/lang.c:2487 src/lang.c:2493 msgid "" "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "" -#: src/lang.c:2477 +#: src/lang.c:2480 msgid "Quote line when following up" msgstr "" -#: src/lang.c:2478 +#: src/lang.c:2481 msgid "" "# Format of quote line when mailing/posting/following-up an article\n" "# %A Address %D Date %F Addr+Name %G Groupname %M Message-ID\n" "# %N Full Name %C First Name %I Initials\n" msgstr "" -#: src/lang.c:2485 +#: src/lang.c:2488 msgid "Quote line when cross-posting" msgstr "" -#: src/lang.c:2491 +#: src/lang.c:2494 msgid "Quote line when mailing" msgstr "" -#: src/lang.c:2496 +#: src/lang.c:2499 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "" -#: src/lang.c:2497 +#: src/lang.c:2500 msgid "Insert 'User-Agent:' header" msgstr "" -#: src/lang.c:2498 +#: src/lang.c:2501 msgid "# If ON include advertising User-Agent: header\n" msgstr "" -#: src/lang.c:2503 +#: src/lang.c:2506 msgid "" "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" -#: src/lang.c:2504 +#: src/lang.c:2507 msgid "MM_CHARSET" msgstr "" -#: src/lang.c:2505 +#: src/lang.c:2508 msgid "" "# Charset supported locally which is also used for MIME header and\n" "# Content-Type header.\n" @@ -6534,40 +6532,40 @@ msgid "" "# mm_charset is considered not displayable and represented as '?'.\n" msgstr "" -#: src/lang.c:2515 +#: src/lang.c:2518 msgid "MM_NETWORK_CHARSET" msgstr "" -#: src/lang.c:2516 +#: src/lang.c:2519 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "" -#: src/lang.c:2520 +#: src/lang.c:2523 msgid "" "Enter local charset name (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" -#: src/lang.c:2521 +#: src/lang.c:2524 msgid "MM_LOCAL_CHARSET" msgstr "" -#: src/lang.c:2522 +#: src/lang.c:2525 msgid "# Charset supported locally.\n" msgstr "" -#: src/lang.c:2529 +#: src/lang.c:2532 msgid "Mailbox format" msgstr "" -#: src/lang.c:2530 +#: src/lang.c:2533 msgid "# Format of the mailbox.\n" msgstr "" -#: src/lang.c:2535 +#: src/lang.c:2538 msgid "MIME encoding in news messages" msgstr "" -#: src/lang.c:2536 +#: src/lang.c:2539 msgid "" "# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n" "# for mails and posts, if necessary. QP is efficient for most European\n" @@ -6576,15 +6574,15 @@ msgid "" "# Russian charsets with a lot of 8bit characters.\n" msgstr "" -#: src/lang.c:2544 src/lang.c:2565 +#: src/lang.c:2547 src/lang.c:2568 msgid "Don't change unless you know what you are doing. cancels." msgstr "" -#: src/lang.c:2545 +#: src/lang.c:2548 msgid "Use 8bit characters in news headers" msgstr "" -#: src/lang.c:2546 +#: src/lang.c:2549 msgid "" "# If ON, 8bit characters in news headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -6592,28 +6590,28 @@ msgid "" "# parameter unless post_mime_encoding is 8bit as well.\n" msgstr "" -#: src/lang.c:2553 +#: src/lang.c:2556 msgid "" "Auto-view post-processed files toggles, sets, cancels." msgstr "" -#: src/lang.c:2554 +#: src/lang.c:2557 msgid "View post-processed files" msgstr "" -#: src/lang.c:2555 +#: src/lang.c:2558 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "" -#: src/lang.c:2560 +#: src/lang.c:2563 msgid "MIME encoding in mail messages" msgstr "" -#: src/lang.c:2566 +#: src/lang.c:2569 msgid "Use 8bit characters in mail headers" msgstr "" -#: src/lang.c:2567 +#: src/lang.c:2570 msgid "" "# If ON, 8bit characters in mail headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -6624,36 +6622,36 @@ msgid "" "# turn it ON unless you have some compelling reason.\n" msgstr "" -#: src/lang.c:2578 +#: src/lang.c:2581 msgid "Strip blanks from ends of lines" msgstr "" -#: src/lang.c:2579 +#: src/lang.c:2582 msgid "" "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" msgstr "" -#: src/lang.c:2585 +#: src/lang.c:2588 msgid "If ON, use transliteration. toggles & sets." msgstr "" -#: src/lang.c:2586 +#: src/lang.c:2589 msgid "Transliteration" msgstr "" -#: src/lang.c:2587 +#: src/lang.c:2590 msgid "" "# If ON, use //TRANSLIT extension. This means that when a character cannot\n" "# be represented in the in the target character set, it can be approximated\n" "# through one or several similarly looking characters.\n" msgstr "" -#: src/lang.c:2595 +#: src/lang.c:2598 msgid "Send you a Cc/Bcc automatically" msgstr "" -#: src/lang.c:2596 +#: src/lang.c:2599 msgid "" "# Put your name in the Cc: and/or Bcc: field when mailing an article.\n" "# Possible values are (the default is marked with *):\n" @@ -6663,129 +6661,129 @@ msgid "" "# 3 = Cc and Bcc\n" msgstr "" -#: src/lang.c:2607 +#: src/lang.c:2610 msgid "Hash algorithm for Cancel-Lock/Cancel-Key" msgstr "" -#: src/lang.c:2608 +#: src/lang.c:2611 msgid "" "# Hash algorithm for Cancel-Lock/Cancel-Key (default 'sha1')\n" "# Use 'none' to not generate Cancel-Lock headers.\n" msgstr "" -#: src/lang.c:2614 +#: src/lang.c:2617 msgid "Enter address elements about which you want to be warned. sets." msgstr "" -#: src/lang.c:2615 +#: src/lang.c:2618 msgid "Spamtrap warning address parts" msgstr "" -#: src/lang.c:2616 +#: src/lang.c:2619 msgid "" "# A comma-delimited list of address-parts you want to be warned\n" "# about when trying to reply by email.\n" msgstr "" -#: src/lang.c:2621 +#: src/lang.c:2624 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "" -#: src/lang.c:2622 +#: src/lang.c:2625 msgid "No. of days a filter entry is valid" msgstr "" -#: src/lang.c:2623 +#: src/lang.c:2626 msgid "# Number of days a short term filter will be active\n" msgstr "" -#: src/lang.c:2627 +#: src/lang.c:2630 msgid "Add posted articles to filter. toggles & sets." msgstr "" -#: src/lang.c:2628 +#: src/lang.c:2631 msgid "Add posted articles to filter" msgstr "" -#: src/lang.c:2629 +#: src/lang.c:2632 msgid "" "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" msgstr "" -#: src/lang.c:2633 +#: src/lang.c:2636 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "" -#: src/lang.c:2634 +#: src/lang.c:2637 msgid "Mail directory" msgstr "" -#: src/lang.c:2635 +#: src/lang.c:2638 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "" -#: src/lang.c:2640 +#: src/lang.c:2643 msgid "Save articles in batch mode (-S)" msgstr "" -#: src/lang.c:2641 +#: src/lang.c:2644 msgid "" "# If ON articles/threads will be saved in batch mode when save -S\n" "# or mail (-M/-N) is specified on the command line\n" msgstr "" -#: src/lang.c:2646 +#: src/lang.c:2649 msgid "The directory where you want articles/threads saved." msgstr "" -#: src/lang.c:2647 +#: src/lang.c:2650 msgid "Directory to save arts/threads in" msgstr "" -#: src/lang.c:2648 +#: src/lang.c:2651 msgid "# Directory where articles/threads are saved\n" msgstr "" -#: src/lang.c:2652 +#: src/lang.c:2655 msgid "" "Auto save article/thread by Archive-name: header. toggles & " "sets." msgstr "" -#: src/lang.c:2653 +#: src/lang.c:2656 msgid "Use Archive-name: header for save" msgstr "" -#: src/lang.c:2654 +#: src/lang.c:2657 msgid "" "# If ON articles/threads with Archive-name: in mail header will\n" "# be automatically saved with the Archive-name & part/patch no.\n" msgstr "" -#: src/lang.c:2659 +#: src/lang.c:2662 msgid "" "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "" -#: src/lang.c:2660 +#: src/lang.c:2663 msgid "Mark saved articles/threads as read" msgstr "" -#: src/lang.c:2661 +#: src/lang.c:2664 msgid "# If ON mark articles that are saved as read\n" msgstr "" -#: src/lang.c:2665 +#: src/lang.c:2668 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "" -#: src/lang.c:2666 +#: src/lang.c:2669 msgid "Post process saved articles" msgstr "" -#: src/lang.c:2667 +#: src/lang.c:2670 msgid "" "# Perform post processing (saving binary attachments) from saved articles.\n" "# Possible values are (the default is marked with *):\n" @@ -6794,106 +6792,106 @@ msgid "" "# 2 = yes\n" msgstr "" -#: src/lang.c:2676 +#: src/lang.c:2679 msgid "Process only unread articles" msgstr "" -#: src/lang.c:2677 +#: src/lang.c:2680 msgid "" "# If ON only save/print/pipe/mail unread articles (tagged articles " "excepted)\n" msgstr "" -#: src/lang.c:2682 +#: src/lang.c:2685 msgid "Print all or just part of header. toggles & sets." msgstr "" -#: src/lang.c:2683 +#: src/lang.c:2686 msgid "Print all headers when printing" msgstr "" -#: src/lang.c:2684 +#: src/lang.c:2687 msgid "" "# If ON print all of article header otherwise just the important lines\n" msgstr "" -#: src/lang.c:2688 +#: src/lang.c:2691 msgid "" "The printer program with options that is to be used to print articles/" "threads." msgstr "" -#: src/lang.c:2689 +#: src/lang.c:2692 msgid "Printer program with options" msgstr "" -#: src/lang.c:2690 +#: src/lang.c:2693 msgid "# Print program with parameters used to print articles/threads\n" msgstr "" -#: src/lang.c:2696 +#: src/lang.c:2699 msgid "Force redraw after certain commands" msgstr "" -#: src/lang.c:2697 +#: src/lang.c:2700 msgid "" "# If ON a screen redraw will always be done after certain external commands\n" msgstr "" -#: src/lang.c:2701 +#: src/lang.c:2704 msgid "" "Start editor with line offset. toggles, sets, cancels." msgstr "" -#: src/lang.c:2702 +#: src/lang.c:2705 msgid "Start editor with line offset" msgstr "" -#: src/lang.c:2703 +#: src/lang.c:2706 msgid "" "# If ON editor will be started with cursor offset into the file\n" "# otherwise the cursor will be positioned at the first line\n" msgstr "" -#: src/lang.c:2708 +#: src/lang.c:2711 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "" -#: src/lang.c:2709 +#: src/lang.c:2712 msgid "Invocation of your editor" msgstr "" -#: src/lang.c:2710 +#: src/lang.c:2713 msgid "" "# Format of editor line including parameters\n" "# %E Editor %F Filename %N Linenumber\n" msgstr "" -#: src/lang.c:2715 +#: src/lang.c:2718 msgid "" "Enter name and options for external-inews, --internal for internal inews" msgstr "" -#: src/lang.c:2716 +#: src/lang.c:2719 msgid "External inews" msgstr "" -#: src/lang.c:2717 +#: src/lang.c:2720 msgid "" "# If --internal use the built in mini inews for posting via NNTP\n" "# otherwise use an external inews program\n" msgstr "" -#: src/lang.c:2721 +#: src/lang.c:2724 msgid "" "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" -#: src/lang.c:2722 +#: src/lang.c:2725 msgid "Invocation of your mail command" msgstr "" -#: src/lang.c:2723 +#: src/lang.c:2726 msgid "" "# Format of mailer line including parameters\n" "# %M Mailer %S Subject %T To %F Filename\n" @@ -6901,11 +6899,11 @@ msgid "" "# ie. elm interactive : elm -i %F -s \"%S\" \"%T\"\n" msgstr "" -#: src/lang.c:2731 +#: src/lang.c:2734 msgid "Use interactive mail reader" msgstr "" -#: src/lang.c:2732 +#: src/lang.c:2735 msgid "" "# Interactive mailreader\n" "# Possible values are (the default is marked with *):\n" @@ -6914,67 +6912,67 @@ msgid "" "# 2 = use interactive mailreader without headers in file\n" msgstr "" -#: src/lang.c:2741 +#: src/lang.c:2744 msgid "Remove ~/.article after posting" msgstr "" -#: src/lang.c:2742 +#: src/lang.c:2745 msgid "# If ON remove ~/.article after posting.\n" msgstr "" -#: src/lang.c:2748 +#: src/lang.c:2751 msgid "Use UTF-8 graphics (thread tree etc.)" msgstr "" -#: src/lang.c:2749 +#: src/lang.c:2752 msgid "" "# If ON use UTF-8 characters for indicator '->', tree and ellipsis '...'.\n" msgstr "" -#: src/lang.c:2754 +#: src/lang.c:2757 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "" -#: src/lang.c:2755 +#: src/lang.c:2758 msgid "Filename for posted articles" msgstr "" -#: src/lang.c:2756 +#: src/lang.c:2759 msgid "" "# Filename where to keep all postings (default posted)\n" "# If no filename is set then postings will not be saved\n" msgstr "" -#: src/lang.c:2761 +#: src/lang.c:2764 msgid "" "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "" -#: src/lang.c:2762 +#: src/lang.c:2765 msgid "Keep failed arts in ~/dead.articles" msgstr "" -#: src/lang.c:2763 +#: src/lang.c:2766 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "" -#: src/lang.c:2767 +#: src/lang.c:2770 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "" -#: src/lang.c:2768 +#: src/lang.c:2771 msgid "No unsubscribed groups in newsrc" msgstr "" -#: src/lang.c:2769 +#: src/lang.c:2772 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "" -#: src/lang.c:2774 +#: src/lang.c:2777 msgid "Remove bogus groups from newsrc" msgstr "" -#: src/lang.c:2775 +#: src/lang.c:2778 msgid "" "# What to do with bogus groups in newsrc file\n" "# Possible values are (the default is marked with *):\n" @@ -6983,64 +6981,64 @@ msgid "" "# 2 = highlight with D on selection screen\n" msgstr "" -#: src/lang.c:2784 +#: src/lang.c:2787 msgid "" "Enter number of seconds to wait for a response from the server. sets." msgstr "" -#: src/lang.c:2785 +#: src/lang.c:2788 msgid "NNTP read timeout in seconds" msgstr "" -#: src/lang.c:2786 +#: src/lang.c:2789 msgid "" "# Time in seconds to wait for a response from the server (0=no timeout)\n" msgstr "" -#: src/lang.c:2791 +#: src/lang.c:2794 msgid "Enter number of seconds until active file will be reread. sets." msgstr "" -#: src/lang.c:2792 +#: src/lang.c:2795 msgid "Interval in secs to reread active" msgstr "" -#: src/lang.c:2793 +#: src/lang.c:2796 msgid "" "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "" -#: src/lang.c:2798 +#: src/lang.c:2801 msgid "Reconnect to server automatically" msgstr "" -#: src/lang.c:2799 +#: src/lang.c:2802 msgid "" "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "" -#: src/lang.c:2803 +#: src/lang.c:2806 msgid "" "Create local copies of NNTP overview files. toggles & sets." msgstr "" -#: src/lang.c:2804 +#: src/lang.c:2807 msgid "Cache NNTP overview files locally" msgstr "" -#: src/lang.c:2805 +#: src/lang.c:2808 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "" -#: src/lang.c:2809 src/lang.c:2824 src/lang.c:2844 src/lang.c:2863 +#: src/lang.c:2812 src/lang.c:2827 src/lang.c:2847 src/lang.c:2866 msgid "Enter format string. sets, cancels." msgstr "" -#: src/lang.c:2810 +#: src/lang.c:2813 msgid "Format string for selection level" msgstr "" -#: src/lang.c:2811 +#: src/lang.c:2814 msgid "" "# Format string for selection level representation\n" "# Default: %f %n %U %G %d\n" @@ -7054,11 +7052,11 @@ msgid "" "# %U Unread count\n" msgstr "" -#: src/lang.c:2825 +#: src/lang.c:2828 msgid "Format string for group level" msgstr "" -#: src/lang.c:2826 +#: src/lang.c:2829 msgid "" "# Format string for group level representation\n" "# Default: %n %m %R %L %s %F\n" @@ -7077,11 +7075,11 @@ msgid "" "# %S Score\n" msgstr "" -#: src/lang.c:2845 +#: src/lang.c:2848 msgid "Format string for thread level" msgstr "" -#: src/lang.c:2846 +#: src/lang.c:2849 msgid "" "# Format string for thread level representation\n" "# Default: %n %m [%L] %T %F\n" @@ -7099,19 +7097,19 @@ msgid "" "# %T Thread tree (only thread level)\n" msgstr "" -#: src/lang.c:2864 +#: src/lang.c:2867 msgid "Format string for display of dates" msgstr "" -#: src/lang.c:2865 +#: src/lang.c:2868 msgid "# Format string for date representation\n" msgstr "" -#: src/lang.c:2871 +#: src/lang.c:2878 msgid "Unicode normalization form" msgstr "" -#: src/lang.c:2872 +#: src/lang.c:2879 msgid "" "# Unicode normalization form\n" "# Possible values are:\n" @@ -7120,21 +7118,22 @@ msgid "" "# 2 = NFKD\n" "# 3 = NFC\n" "# 4 = NFD\n" +"# 5 = NFKC_CF\n" msgstr "" -#: src/lang.c:2885 +#: src/lang.c:2893 msgid "Render BiDi" msgstr "" -#: src/lang.c:2886 +#: src/lang.c:2894 msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "" -#: src/lang.c:2893 +#: src/lang.c:2901 msgid "Function for sorting articles" msgstr "" -#: src/lang.c:2894 +#: src/lang.c:2902 msgid "" "# Function for sorting articles\n" "# Possible values are (the default is marked with *):\n" @@ -7142,211 +7141,211 @@ msgid "" "# 1 = heapsort\n" msgstr "" -#: src/lang.c:2907 +#: src/lang.c:2915 msgid "Automatically GroupMarkUnselArtRead" msgstr "" -#: src/lang.c:2913 +#: src/lang.c:2921 msgid "Delete post-process files" msgstr "" -#: src/lang.c:2918 +#: src/lang.c:2926 msgid "Filename for all mailed articles, sets, no filename=do not save." msgstr "" -#: src/lang.c:2919 +#: src/lang.c:2927 msgid "Mailbox to save sent mails" msgstr "" -#: src/lang.c:2924 +#: src/lang.c:2932 msgid "Set Followup-To: header to this group(s). sets, cancels." msgstr "" -#: src/lang.c:2925 +#: src/lang.c:2933 msgid "Followup-To: header" msgstr "" -#: src/lang.c:2930 +#: src/lang.c:2938 msgid "Enter default mail address (and fullname). sets, cancels." msgstr "" -#: src/lang.c:2937 +#: src/lang.c:2945 msgid "" "Path and options for ispell-like spell-checker. sets, cancels." msgstr "" -#: src/lang.c:2938 +#: src/lang.c:2946 msgid "Ispell program" msgstr "" -#: src/lang.c:2944 +#: src/lang.c:2952 msgid "When group is a mailing list, send responses to this email address." msgstr "" -#: src/lang.c:2945 +#: src/lang.c:2953 msgid "Mailing list address" msgstr "" -#: src/lang.c:2951 +#: src/lang.c:2959 msgid "Forward articles as attachment" msgstr "" -#: src/lang.c:2956 +#: src/lang.c:2964 msgid "" "A comma separated list of MIME major/minor Content-Types. cancels." msgstr "" -#: src/lang.c:2957 +#: src/lang.c:2965 msgid "Which MIME types will be saved" msgstr "" -#: src/lang.c:2962 +#: src/lang.c:2970 msgid "Value of the Organization: header. sets, cancels." msgstr "" -#: src/lang.c:2963 +#: src/lang.c:2971 msgid "Organization: header" msgstr "" -#: src/lang.c:2968 +#: src/lang.c:2976 msgid "Filename for saved articles. sets, cancels." msgstr "" -#: src/lang.c:2969 +#: src/lang.c:2977 msgid "savefile" msgstr "" -#: src/lang.c:2974 src/lang.c:2998 +#: src/lang.c:2982 src/lang.c:3006 msgid "Scope for the filter rule. sets, cancels." msgstr "" -#: src/lang.c:2975 +#: src/lang.c:2983 msgid "Quick (1 key) select filter scope" msgstr "" -#: src/lang.c:2980 src/lang.c:3004 +#: src/lang.c:2988 src/lang.c:3012 msgid "Header for filter rule. sets, cancels." msgstr "" -#: src/lang.c:2981 +#: src/lang.c:2989 msgid "Quick (1 key) select filter header" msgstr "" -#: src/lang.c:2986 src/lang.c:3010 +#: src/lang.c:2994 src/lang.c:3018 msgid "ON = case sensitive, OFF = ignore case. sets, cancels." msgstr "" -#: src/lang.c:2987 +#: src/lang.c:2995 msgid "Quick (1 key) select filter case" msgstr "" -#: src/lang.c:2992 src/lang.c:3016 +#: src/lang.c:3000 src/lang.c:3024 msgid "ON = expire, OFF = don't ever expire. sets, cancels." msgstr "" -#: src/lang.c:2993 +#: src/lang.c:3001 msgid "Quick (1 key) select filter expire" msgstr "" -#: src/lang.c:2999 +#: src/lang.c:3007 msgid "Quick (1 key) kill filter scope" msgstr "" -#: src/lang.c:3005 +#: src/lang.c:3013 msgid "Quick (1 key) kill filter header" msgstr "" -#: src/lang.c:3011 +#: src/lang.c:3019 msgid "Quick (1 key) kill filter case" msgstr "" -#: src/lang.c:3017 +#: src/lang.c:3025 msgid "Quick (1 key) kill filter expire" msgstr "" -#: src/lang.c:3023 +#: src/lang.c:3031 msgid "Assume this charset if no charset declaration is present, to set." msgstr "" -#: src/lang.c:3024 +#: src/lang.c:3032 msgid "UNDECLARED_CHARSET" msgstr "" -#: src/lang.c:3030 +#: src/lang.c:3038 msgid "" "Add this text at the start of the message body. sets, cancels." msgstr "" -#: src/lang.c:3031 +#: src/lang.c:3039 msgid "X_Body" msgstr "" -#: src/lang.c:3036 +#: src/lang.c:3044 msgid "Insert this header when posting. sets, cancels." msgstr "" -#: src/lang.c:3037 +#: src/lang.c:3045 msgid "X_Headers" msgstr "" -#: src/lang.c:3042 +#: src/lang.c:3050 msgid "" "Automatically insert an X-Comment-To: header? toggles & sets." msgstr "" -#: src/lang.c:3043 +#: src/lang.c:3051 msgid "Insert 'X-Comment-To:' header" msgstr "" #. TODO: lang.c -#: src/main.c:801 +#: src/main.c:812 msgid "reading from local spool" msgstr "" -#: src/misc.c:3868 +#: src/misc.c:3878 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "" -#: src/misc.c:3871 +#: src/misc.c:3881 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "" -#: src/newsrc.c:453 +#: src/newsrc.c:457 msgid "Unreachable?\n" msgstr "" -#: src/nntplib.c:817 +#: src/nntplib.c:822 #, c-format msgid "" "\n" "Server timed out, trying reconnect # %d\n" msgstr "" -#: src/nntplib.c:844 +#: src/nntplib.c:849 msgid "NNTP connection error. Exiting..." msgstr "" -#: src/nntplib.c:856 src/nntplib.c:1835 +#: src/nntplib.c:861 src/nntplib.c:1852 msgid "Rejoin current group\n" msgstr "" -#: src/nntplib.c:864 src/nntplib.c:1843 +#: src/nntplib.c:869 src/nntplib.c:1860 #, c-format msgid "Read (%s)\n" msgstr "" -#: src/nntplib.c:866 +#: src/nntplib.c:871 #, c-format msgid "Resend last command (%s)\n" msgstr "" -#: src/nntplib.c:1482 +#: src/nntplib.c:1500 msgid "CAPABILITIES did not announce READER" msgstr "" -#: src/nntplib.c:1989 +#: src/nntplib.c:2006 msgid "MOTD: " msgstr "" @@ -7407,7 +7406,7 @@ msgstr "" #. * preamble #. * TODO: -> lang.c #. -#: src/rfc2047.c:1308 +#: src/rfc2047.c:1322 #, c-format msgid "" "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" Binary files tin-2.4.2/po/tr.gmo and tin-2.4.3/po/tr.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.2/po/tr.po tin-2.4.3/po/tr.po --- tin-2.4.2/po/tr.po 2017-12-08 09:39:46.000000000 +0100 +++ tin-2.4.3/po/tr.po 2018-12-24 10:02:05.594994818 +0100 @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 2.4.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-08 09:39+0100\n" +"POT-Creation-Date: 2018-12-24 10:02+0100\n" "PO-Revision-Date: 2017-05-29 18:40+0000\n" "Last-Translator: Mesutcan Kurt \n" "Language-Team: Turkish \n" @@ -22,11 +22,11 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "X-POOTLE-MTIME: 1496083249.000000\n" -#: src/attrib.c:954 +#: src/attrib.c:964 msgid "Processing attributes... " msgstr "Nitelikleri iÅŸliyor... " -#: src/attrib.c:1176 +#: src/attrib.c:1186 #, c-format msgid "" "# Do not edit this comment block\n" @@ -35,403 +35,403 @@ msgstr "" "# Bu açıklama bloÄŸunu düzenlemeyin\n" "#\n" -#: src/attrib.c:1177 +#: src/attrib.c:1187 #, c-format msgid "# scope=STRING (eg. alt.*,!alt.bin*) [mandatory]\n" msgstr "# scope=DÄ°ZGE (örn. alt.*,!alt.bin*) [zorunlu]\n" -#: src/attrib.c:1178 +#: src/attrib.c:1188 #, c-format msgid "# add_posted_to_filter=ON/OFF\n" msgstr "# add_posted_to_filter=AÇIK/KAPALI\n" -#: src/attrib.c:1179 +#: src/attrib.c:1189 #, c-format msgid "# advertising=ON/OFF\n" msgstr "# advertising=AÇIK/KAPALI\n" -#: src/attrib.c:1180 +#: src/attrib.c:1190 #, c-format msgid "# alternative_handling=ON/OFF\n" msgstr "# alternative_handling=AÇIK/KAPALI\n" -#: src/attrib.c:1181 +#: src/attrib.c:1191 #, c-format msgid "# ask_for_metamail=ON/OFF\n" msgstr "# ask_for_metamail=AÇIK/KAPALI\n" -#: src/attrib.c:1182 +#: src/attrib.c:1192 #, c-format msgid "# auto_cc_bcc=NUM\n" msgstr "# auto_cc_bcc=SAYI\n" -#: src/attrib.c:1183 +#: src/attrib.c:1193 #, c-format msgid "# 0=No, 1=Cc, 2=Bcc, 3=Cc and Bcc\n" msgstr "# 0=Hayır, 1=Kopya, 2=Gizli Kopya, 3=Kopya ve Gizli kopya\n" -#: src/attrib.c:1184 +#: src/attrib.c:1194 #, c-format msgid "# auto_list_thread=ON/OFF\n" msgstr "# auto_list_thread=AÇIK/KAPALI\n" -#: src/attrib.c:1185 +#: src/attrib.c:1195 #, c-format msgid "# auto_save=ON/OFF\n" msgstr "# auto_save=AÇIK/KAPALI\n" -#: src/attrib.c:1186 +#: src/attrib.c:1196 #, c-format msgid "# auto_select=ON/OFF\n" msgstr "# auto_select=AÇIK/KAPALI\n" -#: src/attrib.c:1187 +#: src/attrib.c:1197 #, c-format msgid "# batch_save=ON/OFF\n" msgstr "# batch_save=AÇIK/KAPALI\n" -#: src/attrib.c:1188 +#: src/attrib.c:1198 #, c-format msgid "# date_format=STRING (eg. %%a, %%d %%b %%Y %%H:%%M:%%S)\n" msgstr "# date_format=DÄ°ZGE (örn. %%a, %%d %%b %%Y %%H:%%M:%%S)\n" -#: src/attrib.c:1189 +#: src/attrib.c:1199 #, c-format msgid "# delete_tmp_files=ON/OFF\n" msgstr "# delete_tmp_files=AÇIK/KAPALI\n" -#: src/attrib.c:1190 +#: src/attrib.c:1200 #, c-format msgid "# editor_format=STRING (eg. %%E +%%N %%F)\n" msgstr "# editor_format=DÄ°ZGE (örn. %%E +%%N %%F)\n" -#: src/attrib.c:1191 +#: src/attrib.c:1201 #, c-format msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "# fcc=DÄ°ZGE (örn. =mailbox)\n" -#: src/attrib.c:1192 +#: src/attrib.c:1202 #, c-format msgid "# followup_to=STRING\n" msgstr "# followup_to=DÄ°ZGE\n" -#: src/attrib.c:1193 +#: src/attrib.c:1203 #, c-format msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "" "# from=DÄ°ZGE (sadece istenen gönderen satırını ekle, çift tırnak kullanma)\n" -#: src/attrib.c:1194 +#: src/attrib.c:1204 #, c-format msgid "# group_catchup_on_exit=ON/OFF\n" msgstr "# group_catchup_on_exit=AÇIK/KAPALI\n" -#: src/attrib.c:1195 +#: src/attrib.c:1205 #, c-format msgid "# group_format=STRING (eg. %%n %%m %%R %%L %%s %%F)\n" msgstr "# group_format=DÄ°ZGE (örn. %%n %%m %%R %%L %%s %%F)\n" -#: src/attrib.c:1196 +#: src/attrib.c:1206 #, c-format msgid "# mail_8bit_header=ON/OFF\n" msgstr "# mail_8bit_header=AÇIK/KAPALI\n" -#: src/attrib.c:1197 +#: src/attrib.c:1207 #, c-format msgid "# mail_mime_encoding=supported_encoding" msgstr "# mail_mime_encoding=desteklenen_kodlama" -#: src/attrib.c:1205 +#: src/attrib.c:1215 #, c-format msgid "# ispell=STRING\n" msgstr "# ispell=DÄ°ZGE\n" -#: src/attrib.c:1207 +#: src/attrib.c:1217 #, c-format msgid "# maildir=STRING (eg. ~/Mail)\n" msgstr "# maildir=DÄ°ZGE (örn. ~/Mail)\n" -#: src/attrib.c:1208 +#: src/attrib.c:1218 #, c-format msgid "# mailing_list=STRING (eg. majordomo@example.org)\n" msgstr "# mailing_list=DÄ°ZGE (örn. majordomo@example.org)\n" -#: src/attrib.c:1209 +#: src/attrib.c:1219 #, c-format msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "# mime_types_to_save=DÄ°ZGE (örn. image/*,!image/bmp)\n" -#: src/attrib.c:1210 +#: src/attrib.c:1220 #, c-format msgid "# mark_ignore_tags=ON/OFF\n" msgstr "# mark_ignore_tags=AÇIK/KAPALI\n" -#: src/attrib.c:1211 +#: src/attrib.c:1221 #, c-format msgid "# mark_saved_read=ON/OFF\n" msgstr "# mark_saved_read=AÇIK/KAPALI\n" -#: src/attrib.c:1212 +#: src/attrib.c:1222 #, c-format msgid "# mime_forward=ON/OFF\n" msgstr "# mime_forward=AÇIK/KAPALI\n" -#: src/attrib.c:1214 +#: src/attrib.c:1224 #, c-format msgid "# mm_network_charset=supported_charset" msgstr "# mm_network_charset=supported_charset" -#: src/attrib.c:1221 +#: src/attrib.c:1231 #, c-format msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "# undeclared_charset=DÄ°ZGE (varsayılan US-ASCII)\n" -#: src/attrib.c:1223 +#: src/attrib.c:1233 #, c-format msgid "# news_headers_to_display=STRING\n" msgstr "# news_headers_to_display=DÄ°ZGE\n" -#: src/attrib.c:1224 +#: src/attrib.c:1234 #, c-format msgid "# news_headers_to_not_display=STRING\n" msgstr "# news_headers_to_not_display=DÄ°ZGE\n" -#: src/attrib.c:1225 +#: src/attrib.c:1235 #, c-format msgid "# news_quote_format=STRING\n" msgstr "# news_quote_format=DÄ°ZGE\n" -#: src/attrib.c:1226 +#: src/attrib.c:1236 #, c-format msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "" "# organization=DÄ°ZGE (kurum; eÄŸer / ile baÅŸlıyor ise, dosyadan okunur)\n" -#: src/attrib.c:1227 +#: src/attrib.c:1237 #, c-format msgid "# pos_first_unread=ON/OFF\n" msgstr "# pos_first_unread=AÇIK/KAPALI\n" -#: src/attrib.c:1228 +#: src/attrib.c:1238 #, c-format msgid "# post_8bit_header=ON/OFF\n" msgstr "# post_8bit_header=AÇIK/KAPALI\n" -#: src/attrib.c:1229 +#: src/attrib.c:1239 #, c-format msgid "# post_mime_encoding=supported_encoding" msgstr "# post_mime_encoding=desteklenen_kodlama" -#: src/attrib.c:1236 +#: src/attrib.c:1246 #, c-format msgid "# post_process_type=NUM\n" msgstr "# post_process_type=SAYI\n" -#: src/attrib.c:1241 +#: src/attrib.c:1251 #, c-format msgid "# post_process_view=ON/OFF\n" msgstr "# post_process_view=AÇIK/KAPALI\n" -#: src/attrib.c:1242 +#: src/attrib.c:1252 #, c-format msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "# quick_kill_scope=DÄ°ZGE (yani. talk.*)\n" -#: src/attrib.c:1243 +#: src/attrib.c:1253 #, c-format msgid "# quick_kill_expire=ON/OFF\n" msgstr "# quick_kill_expire=AÇIK/KAPALI\n" -#: src/attrib.c:1244 +#: src/attrib.c:1254 #, c-format msgid "# quick_kill_case=ON/OFF\n" msgstr "# quick_kill_case=AÇIK/KAPALI\n" -#: src/attrib.c:1245 +#: src/attrib.c:1255 #, c-format msgid "# quick_kill_header=NUM\n" msgstr "# quick_kill_header=SAYI\n" -#: src/attrib.c:1246 src/attrib.c:1255 +#: src/attrib.c:1256 src/attrib.c:1265 #, c-format msgid "# 0=Subject: (case sensitive) 1=Subject: (ignore case)\n" msgstr "" "# 0=Konu: (büyük/küçük harfe duyarlı) 1=Konu: (büyük/küçük harf göz ardı " "et)\n" -#: src/attrib.c:1247 src/attrib.c:1256 +#: src/attrib.c:1257 src/attrib.c:1266 #, c-format msgid "# 2=From: (case sensitive) 3=From: (ignore case)\n" msgstr "" "# 2=Gönderen: (büyük küçük harf duyarlı) 3=Gönderen: (büyük küçük " "harf duyarsız)\n" -#: src/attrib.c:1248 src/attrib.c:1257 +#: src/attrib.c:1258 src/attrib.c:1267 #, c-format msgid "# 4=Message-ID: & full References: line\n" msgstr "# 4=Ä°leti-KimliÄŸi: & tüm Referanslar: satırı\n" -#: src/attrib.c:1249 src/attrib.c:1258 +#: src/attrib.c:1259 src/attrib.c:1268 #, c-format msgid "# 5=Message-ID: & last References: entry only\n" msgstr "# 5=Ä°leti-KimliÄŸi: & sadece son Referanslar: girdisi\n" -#: src/attrib.c:1250 src/attrib.c:1259 +#: src/attrib.c:1260 src/attrib.c:1269 #, c-format msgid "# 6=Message-ID: entry only 7=Lines:\n" msgstr "# 6=Ä°leti-KimliÄŸi: girdisi sadece 7=Satırlar:\n" -#: src/attrib.c:1251 +#: src/attrib.c:1261 #, c-format msgid "# quick_select_scope=STRING\n" msgstr "# quick_select_scope=DÄ°ZGE\n" -#: src/attrib.c:1252 +#: src/attrib.c:1262 #, c-format msgid "# quick_select_expire=ON/OFF\n" msgstr "# quick_select_expire=AÇIK/KAPALI\n" -#: src/attrib.c:1253 +#: src/attrib.c:1263 #, c-format msgid "# quick_select_case=ON/OFF\n" msgstr "# quick_select_case=AÇIK/KAPALI\n" -#: src/attrib.c:1254 +#: src/attrib.c:1264 #, c-format msgid "# quick_select_header=NUM\n" msgstr "# quick_select_header=SAYI\n" -#: src/attrib.c:1260 +#: src/attrib.c:1270 #, c-format msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "# quote_chars=DÄ°ZGE (baÅŸlangıç için %%s, %%S)\n" -#: src/attrib.c:1262 +#: src/attrib.c:1272 #, c-format msgid "# print_header=ON/OFF\n" msgstr "# print_header=AÇIK/KAPALI\n" -#: src/attrib.c:1264 +#: src/attrib.c:1274 #, c-format msgid "# process_only_unread=ON/OFF\n" msgstr "# process_only_unread=AÇIK/KAPALI\n" -#: src/attrib.c:1265 +#: src/attrib.c:1275 #, c-format msgid "# prompt_followupto=ON/OFF\n" msgstr "# prompt_followupto=AÇIK/KAPALI\n" -#: src/attrib.c:1266 +#: src/attrib.c:1276 #, c-format msgid "# savedir=STRING (eg. ~user/News)\n" msgstr "# savedir=DÄ°ZGE (örn. ~user/News)\n" -#: src/attrib.c:1267 +#: src/attrib.c:1277 #, c-format msgid "# savefile=STRING (eg. =linux)\n" msgstr "# savefile=DÄ°ZGE (örn. =linux)\n" -#: src/attrib.c:1268 +#: src/attrib.c:1278 #, c-format msgid "# sigfile=STRING (eg. $var/sig)\n" msgstr "# sigfile=DÄ°ZGE (örn. $var/sig)\n" -#: src/attrib.c:1269 +#: src/attrib.c:1279 #, c-format msgid "# show_author=NUM\n" msgstr "# show_author=SAYI\n" -#: src/attrib.c:1275 +#: src/attrib.c:1285 #, c-format msgid "# show_signatures=ON/OFF\n" msgstr "# show_signatures=AÇIK/KAPALI\n" -#: src/attrib.c:1276 +#: src/attrib.c:1286 #, c-format msgid "# show_only_unread_arts=ON/OFF\n" msgstr "# show_only_unread_arts=AÇIK/KAPALI\n" -#: src/attrib.c:1277 +#: src/attrib.c:1287 #, c-format msgid "# sigdashes=ON/OFF\n" msgstr "# sigdashes=AÇIK/KAPALI\n" -#: src/attrib.c:1278 +#: src/attrib.c:1288 #, c-format msgid "# signature_repost=ON/OFF\n" msgstr "# signature_repost=AÇIK/KAPALI\n" -#: src/attrib.c:1279 +#: src/attrib.c:1289 #, c-format msgid "# sort_article_type=NUM\n" msgstr "# sort_article_type=SAYI\n" -#: src/attrib.c:1297 +#: src/attrib.c:1307 #, c-format msgid "# sort_threads_type=NUM\n" msgstr "# sort_threads_type=SAYI\n" -#: src/attrib.c:1306 +#: src/attrib.c:1316 #, c-format msgid "# start_editor_offset=ON/OFF\n" msgstr "# start_editor_offset=AÇIK/KAPALI\n" -#: src/attrib.c:1307 +#: src/attrib.c:1317 #, c-format msgid "# tex2iso_conv=ON/OFF\n" msgstr "# tex2iso_conv=AÇIK/KAPALI\n" -#: src/attrib.c:1308 +#: src/attrib.c:1318 #, c-format msgid "# thread_catchup_on_exit=ON/OFF\n" msgstr "# thread_catchup_on_exit=AÇIK/KAPALI\n" -#: src/attrib.c:1309 +#: src/attrib.c:1319 #, c-format msgid "# thread_articles=NUM" msgstr "# thread_articles=SAYI" -#: src/attrib.c:1316 +#: src/attrib.c:1326 #, c-format msgid "# thread_format=STRING (eg. %%n %%m [%%L] %%T %%F)\n" msgstr "# thread_format=DÄ°ZGE (örn. %%n %%m [%%L] %%T %%F)\n" -#: src/attrib.c:1317 +#: src/attrib.c:1327 #, c-format msgid "# thread_perc=NUM\n" msgstr "# thread_perc=SAYI\n" -#: src/attrib.c:1318 +#: src/attrib.c:1328 #, c-format msgid "# trim_article_body=NUM\n" msgstr "# trim_article_body=SAYI\n" -#: src/attrib.c:1319 +#: src/attrib.c:1329 #, c-format msgid "# 0 = Don't trim article body\n" msgstr "# 0 = Makale gövdesini kesme\n" -#: src/attrib.c:1320 +#: src/attrib.c:1330 #, c-format msgid "# 1 = Skip leading blank lines\n" msgstr "# 1 = BaÅŸtaki boÅŸ satırları atla\n" -#: src/attrib.c:1321 +#: src/attrib.c:1331 #, c-format msgid "# 2 = Skip trailing blank lines\n" msgstr "# 2 = Sondaki boÅŸ satırları atla\n" -#: src/attrib.c:1322 +#: src/attrib.c:1332 #, c-format msgid "# 3 = Skip leading and trailing blank lines\n" msgstr "# 3 = BaÅŸtaki ve sondaki boÅŸ satırları atla\n" -#: src/attrib.c:1323 +#: src/attrib.c:1333 #, c-format msgid "# 4 = Compact multiple blank lines between text blocks\n" msgstr "# 4 = Metin blokları arasındaki birden fazla boÅŸ satırı birleÅŸtir\n" -#: src/attrib.c:1324 +#: src/attrib.c:1334 #, c-format msgid "" "# 5 = Compact multiple blank lines between text blocks and skip\n" @@ -440,7 +440,7 @@ msgstr "" "# 5 = Metin blokları arasındaki birden fazla boÅŸ satırı birleÅŸtir ve\n" "# baÅŸtaki boÅŸ satırları atla\n" -#: src/attrib.c:1325 +#: src/attrib.c:1335 #, c-format msgid "" "# 6 = Compact multiple blank lines between text blocks and skip\n" @@ -449,7 +449,7 @@ msgstr "" "# 6 = Metin blokları arasındaki birden fazla boÅŸ satırı birleÅŸtir ve\n" "# sondaki boÅŸ satırları atla\n" -#: src/attrib.c:1326 +#: src/attrib.c:1336 #, c-format msgid "" "# 7 = Compact multiple blank lines between text blocks and skip\n" @@ -458,37 +458,37 @@ msgstr "" "# 7 = Metin blokları arasındaki birden fazla boÅŸ satırı birleÅŸtir ve\n" "# baÅŸtaki ve sonraki boÅŸ satırları atla\n" -#: src/attrib.c:1327 +#: src/attrib.c:1337 #, c-format msgid "# verbatim_handling=ON/OFF\n" msgstr "# verbatim_handling=AÇIK/KAPLI\n" -#: src/attrib.c:1329 +#: src/attrib.c:1339 #, c-format msgid "# extquote_handling=ON/OFF\n" msgstr "# exquote_handling=AÇIK/KAPALI\n" -#: src/attrib.c:1331 +#: src/attrib.c:1341 #, c-format msgid "# wrap_on_next_unread=ON/OFF\n" msgstr "# wrap_on_next_unread=AÇIK/KAPALI\n" -#: src/attrib.c:1332 +#: src/attrib.c:1342 #, c-format msgid "# x_body=STRING (eg. ~/.tin/extra-body-text)\n" msgstr "# x_body=DÄ°ZGE (örn. ~/.tin/extra-body-text)\n" -#: src/attrib.c:1333 +#: src/attrib.c:1343 #, c-format msgid "# x_comment_to=ON/OFF\n" msgstr "# x_comment_to=AÇIK/KAPALI\n" -#: src/attrib.c:1334 +#: src/attrib.c:1344 #, c-format msgid "# x_headers=STRING (eg. ~/.tin/extra-headers)\n" msgstr "# x_headers=DÄ°ZGE (örn. ~/.tin/extra-headers)\n" -#: src/attrib.c:1335 +#: src/attrib.c:1345 #, c-format msgid "" "#\n" @@ -497,7 +497,7 @@ msgstr "" "#\n" "# Genele (küresel kapsama) koymak en iyisidir\n" -#: src/attrib.c:1336 +#: src/attrib.c:1346 #, c-format msgid "" "# entries first followed by group specific entries.\n" @@ -506,7 +506,7 @@ msgstr "" "# grup özel girdilerinden hemen önce gelen girdiler.\n" "#\n" -#: src/attrib.c:1337 +#: src/attrib.c:1347 #, c-format msgid "############################################################################\n" msgstr "############################################################################\n" @@ -802,60 +802,55 @@ msgstr "" #: src/lang.c:107 #, c-format -msgid "Active file corrupt - %s" -msgstr "Aktif dosya bozuk- %s" - -#: src/lang.c:108 -#, c-format msgid "" "Article to be posted resulted in errors/warnings. %s=quit, %s=Menu, %s=edit: " msgstr "" "Gönderilecek makalede hatalar/uyarılar çıktı. %s=çık, %s=Menü, %s=düzenle: " -#: src/lang.c:109 +#: src/lang.c:108 #, c-format msgid "Unrecognized attribute: %s" msgstr "Tanınmayan öznitelik: %s" -#: src/lang.c:110 +#: src/lang.c:109 #, c-format msgid "Bad command. Type '%s' for help." msgstr "Bozuk komut. Yardım için '%s' yazın." -#: src/lang.c:112 +#: src/lang.c:111 msgid "Base article" msgstr "Temel makale" -#: src/lang.c:113 +#: src/lang.c:112 msgid "Base article range" msgstr "Temel makale aralığı" -#: src/lang.c:114 +#: src/lang.c:113 #, c-format msgid "%s: Updating of index files not supported: cache_overview_files=%s" msgstr "" "%s: Dizin dosyalarını güncelleme desteklenmiyor: cache_overview_files=%s" -#: src/lang.c:115 +#: src/lang.c:114 msgid "*** Beginning of article ***" msgstr "*** Makalenin başı ***" -#: src/lang.c:116 +#: src/lang.c:115 msgid "*** Beginning of page ***" msgstr "*** Sayfanın başı ***" -#: src/lang.c:118 +#: src/lang.c:117 #, c-format msgid "Cancel (delete) or supersede (overwrite) article [%%s]? (%s/%s/%s): " msgstr "" "Ä°ptal et (sil) veya dosyanın yerini al (üstüne yaz) makale [%%.*s]? (%s/%s/" "%s): " -#: src/lang.c:119 +#: src/lang.c:118 msgid "Cancelling article..." msgstr "Makale iptal ediliyor..." -#: src/lang.c:121 +#: src/lang.c:120 #, c-format msgid "Cannot create %s" msgstr "%s oluÅŸturulamıyor" @@ -1401,21 +1396,16 @@ msgstr "" msgid "Insecure permissions of %s (%o)" msgstr "%s'de güvenli olmayan yetkiler (%o)" -#: src/lang.c:242 -#, c-format -msgid "Invalid response to GROUP command, %s" -msgstr "GROUP komutuna geçersiz yanıt, %s" - -#: src/lang.c:247 +#: src/lang.c:244 #, c-format msgid "MIME parse error: Unexpected end of %s/%s article" msgstr "MIME ayrıştırma hatası: Makale %s/%s için beklenmeyen son" -#: src/lang.c:248 +#: src/lang.c:245 msgid "MIME parse error: Start boundary whilst reading headers" msgstr "MIME ayrıştırma hatası: BaÅŸlıkları okurken baÅŸlatma sınırı" -#: src/lang.c:249 +#: src/lang.c:246 msgid "" "\n" "Error: \"poster\" is not allowed in Newsgroups!\n" @@ -1423,16 +1413,16 @@ msgstr "" "\n" "Hata: Haber gruplarında \"poster\" izin verilmiyor!\n" -#: src/lang.c:250 +#: src/lang.c:247 msgid "Can't get a (fully-qualified) domain-name!" msgstr "(tam yetkinlikte) bir alan adı alınamadı!" -#: src/lang.c:251 +#: src/lang.c:248 #, c-format msgid "No permissions to go into %s\n" msgstr "%s'e giriÅŸ yetkisi yok\n" -#: src/lang.c:253 +#: src/lang.c:250 msgid "" "\n" "Error: From: line missing.\n" @@ -1440,30 +1430,30 @@ msgstr "" "\n" "Hata: Gönderen: satırı eksik.\n" -#: src/lang.c:255 +#: src/lang.c:252 #, c-format msgid "No read permissions for %s\n" msgstr "%s için okuma yetkisi yok\n" -#: src/lang.c:256 +#: src/lang.c:253 #, c-format msgid "File %s does not exist\n" msgstr "%s dosyası yok\n" -#: src/lang.c:257 +#: src/lang.c:254 #, c-format msgid "No write permissions for %s\n" msgstr "%s için yazma yetkisi yok\n" -#: src/lang.c:258 +#: src/lang.c:255 msgid "Can't get user information (/etc/passwd missing?)" msgstr "Kullanıcı bilgisi alınamıyor (/etc/passwd kayıp?)" -#: src/lang.c:259 +#: src/lang.c:256 msgid "errors" msgstr "hatalar" -#: src/lang.c:261 +#: src/lang.c:258 #, c-format msgid "" "\n" @@ -1473,63 +1463,63 @@ msgstr "" "%d satırında hata: \"Gönderen:\" baÅŸlığına izin verilmedi (sizin için " "eklenecek)\n" -#: src/lang.c:263 +#: src/lang.c:260 #, c-format msgid "Server has non of the groups listed in %s" msgstr "Sunucuda %s'de listelenen grupların hiçbiri yok " -#: src/lang.c:264 +#: src/lang.c:261 msgid "error" msgstr "hata" -#: src/lang.c:265 +#: src/lang.c:262 msgid "Unknown display level" msgstr "Bilinmeyen gösterim düzeyi" -#: src/lang.c:266 +#: src/lang.c:263 msgid "" msgstr "" -#: src/lang.c:267 +#: src/lang.c:264 msgid "Exiting..." msgstr "Çıkılıyor..." -#: src/lang.c:268 +#: src/lang.c:265 msgid "leaving external mail-reader" msgstr "harici eposta okuyucusundan çıkılıyor" -#: src/lang.c:269 +#: src/lang.c:266 #, c-format msgid "Extracting %s..." msgstr "%s çıkartılıyor..." -#: src/lang.c:271 +#: src/lang.c:268 #, c-format msgid "Error writing %s file. Filesystem full? File reset to previous state." msgstr "" "%s dosyasını yazarken hata oluÅŸtu. Dosya sistemi dolu olabilir mi? Dosya " "önceki durumuna dönüştürüldü. " -#: src/lang.c:272 +#: src/lang.c:269 #, c-format msgid "Error making backup of %s file. Filesystem full?" msgstr "%s dosyasını yedeklerken hata oluÅŸtu. Dosya sistemi dolu olabilir mi?" -#: src/lang.c:273 +#: src/lang.c:270 #, c-format msgid "Filtering global rules (%d/%d)..." msgstr "Genel kurallar filtreleniyor (%d/%d)..." -#: src/lang.c:274 +#: src/lang.c:271 msgid "Rule created by: " msgstr "Kuralı oluÅŸturan: " -#: src/lang.c:275 +#: src/lang.c:272 #, c-format msgid "Enter pattern [%s]> " msgstr "Örüntüyü girin [%s]> " -#: src/lang.c:276 +#: src/lang.c:273 #, c-format msgid "" "\n" @@ -1538,20 +1528,21 @@ msgstr "" "\n" "Sonraki %s'e gitmek için makalenize takip-et istediniz:\n" -#: src/lang.c:277 +#: src/lang.c:274 #, c-format msgid " %s\t Answers will be directed to you by mail.\n" msgstr " %s\t Cevaplar, size eposta ile yönlendirilecek.\n" -#: src/lang.c:278 +#: src/lang.c:275 msgid "-- forwarded message --\n" msgstr "-- yönlendirilmiÅŸ ileti --\n" -#: src/lang.c:279 +#: src/lang.c:276 msgid "-- end of forwarded message --\n" msgstr "-- yönlendirilmiÅŸ iletinin sonu --\n" -#: src/lang.c:280 +#: src/lang.c:277 +#, fuzzy msgid "" "# Format:\n" "# comment=STRING Optional. Multiple lines allowed. Comments must be " @@ -1578,6 +1569,10 @@ msgid "" "# gnksa=[<>]?NUM Optional. GNKSA parse_from() return code. '<' or '>' " "opt.\n" "# xref=PATTERN Optional. Kill pattern (e.g. alt.flame*)\n" +"# path=PATTERN Optional. Kill pattern (e.g. news.example.org)\n" +"# Be aware that filtering on Path: may significantly " +"slow\n" +"# down the process.\n" "# time=NUM Optional. time_t value when rule expires\n" "#\n" msgstr "" @@ -2651,7 +2646,7 @@ msgid "Operation disabled in no-overwrit msgstr "Ãœstüne yazılmayan kipte iÅŸlem geçersiz" # TODO: replace hardcoded key-name in txt_info_postponed -#. TODO: replace hardcoded key-name in txt_info_postponed +#. TODO: replace hard coded key-name in txt_info_postponed #: src/lang.c:547 #, c-format msgid "%d postponed %s, reuse with ^O...\n" @@ -2681,7 +2676,7 @@ msgid "incomplete " msgstr "tamamlanmadı " # TODO: replace hardcoded key-names -#. TODO: replace hardcoded key-names +#. TODO: replace hard coded key-names #: src/lang.c:554 #, c-format msgid "" @@ -2805,8 +2800,8 @@ msgid "Kill Article Menu" msgstr "Makale Menüsünü Yok Et" #: src/lang.c:587 -#, c-format -msgid "Kill Msg-Id: [%s] (f/l/o/n): " +#, fuzzy, c-format +msgid "Kill Msg-ID: [%s] (f/l/o/n): " msgstr "Ä°leti-KimliÄŸi: yok et: [%s] (f/l/o/n): " #: src/lang.c:588 @@ -3339,7 +3334,7 @@ msgid "Post a followup..." msgstr "Takip gönder..." # TODO: replace hardcoded key-name in txt_post_error_ask_postpone -#. TODO: replace hardcoded key-name in txt_post_error_ask_postpone +#. TODO: replace hard coded key-name in txt_post_error_ask_postpone #: src/lang.c:716 msgid "" "An error has occurred while posting the article. If you think that this\n" @@ -3404,226 +3399,231 @@ msgstr "EtiketlenmiÅŸ %s" msgid "Untagged %s" msgstr "EtiketlenmemiÅŸ %s" -#: src/lang.c:730 +#: src/lang.c:731 +#, c-format +msgid "Preparing for filtering on Path header (%d/%d)..." +msgstr "" + +#: src/lang.c:733 msgid "Processing mail messages marked for deletion." msgstr "Silinmek için iÅŸaretlenen iletiler iÅŸleniyor." -#: src/lang.c:731 +#: src/lang.c:734 msgid "Processing saved articles marked for deletion." msgstr "Silinmek için iÅŸaretlenen kaydedilmiÅŸ makaleler iÅŸleniyor." -#: src/lang.c:732 +#: src/lang.c:735 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "Takip etmeyi kabul et? %s=gönder, %s=yoksay, %s=çık: " -#: src/lang.c:733 +#: src/lang.c:736 msgid "Article unchanged, abort mailing?" msgstr "Makale deÄŸiÅŸtirilmedi, postalama iptal edilsin mi?" -#: src/lang.c:734 +#: src/lang.c:737 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "ErtelenmiÅŸ makaleleri görmek ister misiniz (%d)?" -#: src/lang.c:736 +#: src/lang.c:739 msgid "Add quick kill filter?" msgstr "Hızlıca öldürme filtresi ekle?" -#: src/lang.c:737 +#: src/lang.c:740 msgid "Add quick selection filter?" msgstr "Hızlı seçme filtresi ekle?" -#: src/lang.c:738 +#: src/lang.c:741 msgid "Do you really want to quit?" msgstr "Gerçekten çıkmak istiyor musunuz?" -#: src/lang.c:739 +#: src/lang.c:742 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "%s=iptal edilen iletiyi düzenle, %s=terk et, %s=sil (iptal) [%%s]: " -#: src/lang.c:740 +#: src/lang.c:743 msgid "You have tagged articles in this group - quit anyway?" msgstr "Bu grupta etiketlenmiÅŸ makaleleriniz var - yine de çıkılsın mı?" -#: src/lang.c:741 +#: src/lang.c:744 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=çık, %s=düzenle, %s=ertele: " -#: src/lang.c:742 +#: src/lang.c:745 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=çık %s=düzenle %s=öldürme tanımı kaydet: " -#: src/lang.c:743 +#: src/lang.c:746 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "%s=çık %s=düzenle %s=tanım seçme kaydet: " -#: src/lang.c:744 +#: src/lang.c:747 msgid "Do you really want to quit without saving your configuration?" msgstr "Yapılandırmaları kaydetmeden çıkmak istediÄŸinizden emin misiniz?" -#: src/lang.c:747 +#: src/lang.c:750 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "Geçersiz aralık- 'geçerli aralık '0-9.$' örn. 1-$" -#: src/lang.c:749 +#: src/lang.c:752 msgid "Do you want to abort this operation?" msgstr "Ä°ÅŸlem durdurulsun mu?" -#: src/lang.c:750 +#: src/lang.c:753 msgid "Do you want to exit tin immediately?" msgstr "tin'den hemen çıkmak istediÄŸinizden emin misiniz?" -#: src/lang.c:752 +#: src/lang.c:755 msgid "Reading ('q' to quit)..." msgstr "okunuyor (çıkmak için 'q')..." -#: src/lang.c:753 +#: src/lang.c:756 #, c-format msgid "Reading %sarticles..." msgstr "%smakaleler okunuyor..." -#: src/lang.c:754 +#: src/lang.c:757 #, c-format msgid "Reading %sattributes file...\n" msgstr "%söznitelik dosyası okunuyor...\n" -#: src/lang.c:755 +#: src/lang.c:758 #, c-format msgid "Reading %sconfig file...\n" msgstr " %syapılandırma dosyası okunuyor...\n" -#: src/lang.c:756 +#: src/lang.c:759 msgid "Reading filter file...\n" msgstr "filtre dosyası okunuyor...\n" -#: src/lang.c:757 +#: src/lang.c:760 #, c-format msgid "Reading %s groups..." msgstr "%s gruplar okunuyor..." -#: src/lang.c:758 +#: src/lang.c:761 msgid "Reading input history file...\n" msgstr "Girdi geçmiÅŸ dosyası okunuyor...\n" -#: src/lang.c:759 +#: src/lang.c:762 msgid "Reading keymap file...\n" msgstr "tuÅŸeÅŸlem dosyası okunuyor...\n" -#: src/lang.c:760 +#: src/lang.c:763 msgid "Reading groups from active file... " msgstr "Gruplar etkin dosyadan okunuyor... " -#: src/lang.c:761 +#: src/lang.c:764 msgid "Reading groups from newsrc file... " msgstr "Gruplar newsrc dosyasından okunuyor... " -#: src/lang.c:762 +#: src/lang.c:765 msgid "Reading newsgroups file... " msgstr "haber grupları dosyası okunuyor... " -#: src/lang.c:763 +#: src/lang.c:766 msgid "Reading newsrc file..." msgstr "newsrc dosyası okunuyor..." -#: src/lang.c:764 +#: src/lang.c:767 msgid "References: line " msgstr "Referanslar: satırı " -#: src/lang.c:766 +#: src/lang.c:769 #, c-format msgid "(%d:%02d remaining)" msgstr "(%d:%02d kaldı)" -#: src/lang.c:768 +#: src/lang.c:771 #, c-format msgid "Bogus group %s removed." msgstr "Sahte grup %s kaldırıldı." # * TODO: add to the right rule, give better explanation, -> lang.c -#: src/lang.c:769 +#: src/lang.c:772 msgid "Removed from the previous rule: " msgstr "Önceki kuraldan kaldırıldı: " -#: src/lang.c:770 +#: src/lang.c:773 #, c-format msgid "Error: rename %s to %s" msgstr "Hata: %s'den %s'ye yeniden adlandırma" -#: src/lang.c:771 +#: src/lang.c:774 msgid "Reply to author..." msgstr "Yazara yanıtla..." -#: src/lang.c:772 +#: src/lang.c:775 msgid "Repost" msgstr "Yeniden gönder" -#: src/lang.c:773 +#: src/lang.c:776 msgid "Reposting article..." msgstr "\"Makale yeniden gönderiliyor..." -#: src/lang.c:774 +#: src/lang.c:777 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "Makale(ler)i grup(lar)a gönder [%s]> " -#: src/lang.c:775 +#: src/lang.c:778 msgid "Reset newsrc?" msgstr "newsrc sıfırlansın mı?" -#: src/lang.c:776 +#: src/lang.c:779 msgid "Responses have been directed to the following newsgroups" msgstr "Yanıtlar ÅŸu haber gruplarına yönlendirildi" -#: src/lang.c:777 +#: src/lang.c:780 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " msgstr "Yanıtlar göndericiye yönlendirildi. %s=postala, %s=gönder, %s=iptal: " -#: src/lang.c:779 +#: src/lang.c:782 msgid "Press to continue..." msgstr "Devam etmek için ..." -#: src/lang.c:781 +#: src/lang.c:784 #, c-format msgid "Select From [%s] (y/n): " msgstr "Gönderen Seç [%s] (e/h): " -#: src/lang.c:782 +#: src/lang.c:785 msgid "Select Lines: (num): " msgstr "Satırlar: Seç (num):" -#: src/lang.c:783 +#: src/lang.c:786 msgid "Auto-select Article Menu" msgstr "Makale Menüsünü Otomatik Seç" -#: src/lang.c:784 -#, c-format -msgid "Select Msg-Id [%s] (f/l/o/n): " +#: src/lang.c:787 +#, fuzzy, c-format +msgid "Select Msg-ID [%s] (f/l/o/n): " msgstr "Ä°leti-kimliÄŸi seçiniz [%s] (f/l/o/n): " -#: src/lang.c:785 +#: src/lang.c:788 msgid "Select pattern scope: " msgstr "Desen etki alanını seç: " -#: src/lang.c:786 +#: src/lang.c:789 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "Konuyu Seç [%s] (e/h): " -#: src/lang.c:787 +#: src/lang.c:790 msgid "Select text pattern : " msgstr "Metin örüntüsü seç : " -#: src/lang.c:788 +#: src/lang.c:791 msgid "Select time in days : " msgstr "Zamanı gün cinsinden seç : " -#: src/lang.c:789 +#: src/lang.c:792 #, c-format msgid "" "# %s server configuration file\n" @@ -3644,54 +3644,54 @@ msgstr "" "############################################################################\n" "\n" -#: src/lang.c:795 +#: src/lang.c:798 msgid "Showing unread groups only" msgstr "Sadece okunmamış gruplar gösteriliyor" -#: src/lang.c:796 +#: src/lang.c:799 msgid "Subject: line (ignore case) " msgstr "Konu: satır (büyük küçük harf durumunu yoksay) " -#: src/lang.c:797 +#: src/lang.c:800 msgid "Subject: line (case sensitive)" msgstr "Konu: satır (büyük-küçük harf duyarlı)" -#: src/lang.c:798 +#: src/lang.c:801 msgid "Save" msgstr "Kaydet" -#: src/lang.c:799 +#: src/lang.c:802 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "'%s' Kaydedilsin mi (%s/%s)?" -#: src/lang.c:800 +#: src/lang.c:803 msgid "Save configuration before continuing?" msgstr "Devam etmeden yapılandırmayı kaydet?" -#: src/lang.c:801 +#: src/lang.c:804 msgid "Save filename> " msgstr "Kaydet dosyaadı> " -#: src/lang.c:802 +#: src/lang.c:805 msgid "Saved" msgstr "Kaydedildi" -#: src/lang.c:803 +#: src/lang.c:806 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "%4d okunmamış (%4d sıcak) %s ÅŸunun içinde %s\n" -#: src/lang.c:804 +#: src/lang.c:807 #, c-format msgid "Saved %s...\n" msgstr "%s kaydedildi...\n" -#: src/lang.c:805 +#: src/lang.c:808 msgid "Nothing was saved" msgstr "Hiçbir ÅŸey kaydedilmedi" -#: src/lang.c:806 +#: src/lang.c:809 #, c-format msgid "" "\n" @@ -3700,184 +3700,184 @@ msgstr "" "\n" "%s %d %s ÅŸundan %d %s\n" -#: src/lang.c:807 +#: src/lang.c:810 #, c-format msgid "-- %s saved to %s%s --" msgstr "-- %s ÅŸuna kaydedildi %s%s --" -#: src/lang.c:808 +#: src/lang.c:811 #, c-format msgid "-- %s saved to %s - %s --" msgstr "-- %s ÅŸuna kaydedildi %s - %s --" -#: src/lang.c:809 +#: src/lang.c:812 msgid "Saving..." msgstr "Kaydediliyor..." -#: src/lang.c:810 +#: src/lang.c:813 #, c-format msgid "%s: Screen initialization failed" msgstr "%s: Ekran baÅŸlatma baÅŸarısız" -#: src/lang.c:812 +#: src/lang.c:815 #, c-format msgid "%s: screen is too small\n" msgstr "%s: ekran çok küçük\n" -#: src/lang.c:814 +#: src/lang.c:817 #, c-format msgid "screen is too small, %s is exiting" msgstr "ekran çok küçük, %s çıkıyor" -#: src/lang.c:815 +#: src/lang.c:818 msgid "Delete scope?" msgstr "Alanı sil?" -#: src/lang.c:816 +#: src/lang.c:819 msgid "Enter scope> " msgstr "Alan gir> " -#: src/lang.c:817 +#: src/lang.c:820 msgid "Select new position> " msgstr "Yeni konum seç> " -#: src/lang.c:818 +#: src/lang.c:821 msgid "New position cannot be a global scope" msgstr "Yeni konum küresel kapsam olamaz" -#: src/lang.c:819 +#: src/lang.c:822 msgid "Global scope, operation not allowed" msgstr "Genel etki alanı, iÅŸleme izin verilmedi" -#: src/lang.c:820 +#: src/lang.c:823 msgid "Rename scope> " msgstr "Kapsamı yeniden adlandır> " -#: src/lang.c:821 +#: src/lang.c:824 msgid "Select scope> " msgstr "Etki alanı seç> " -#: src/lang.c:822 +#: src/lang.c:825 msgid "Scopes Menu" msgstr "Etki Alanı Menüsü" -#: src/lang.c:823 +#: src/lang.c:826 msgid "Scopes Menu Commands" msgstr "Alan Menüsü Komutları" -#: src/lang.c:824 +#: src/lang.c:827 #, c-format msgid "Search backwards [%s]> " msgstr "Geriye doÄŸru ara [%s]> " -#: src/lang.c:825 +#: src/lang.c:828 #, c-format msgid "Search body [%s]> " msgstr "Gövdeyi ara [%s]> " -#: src/lang.c:826 +#: src/lang.c:829 #, c-format msgid "Search forwards [%s]> " msgstr "Ä°leri ara [%s]> " -#: src/lang.c:827 +#: src/lang.c:830 msgid "Searching..." msgstr "Aranıyor..." -#: src/lang.c:828 +#: src/lang.c:831 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "Makale aranıyor %d / %d ('q' durdur)..." -#: src/lang.c:829 +#: src/lang.c:832 msgid "Select article> " msgstr "Makale seç> " -#: src/lang.c:830 +#: src/lang.c:833 msgid "" "Select option number before text or use arrow keys and . 'q' to quit." msgstr "" "Metinden önce seçenek numarasını seçin ya da ok tuÅŸları ve ile seçin. " "Çıkmak için 'q'." -#: src/lang.c:831 +#: src/lang.c:834 msgid "Select group> " msgstr "Grup seç> " -#: src/lang.c:832 +#: src/lang.c:835 #, c-format msgid "Enter selection pattern [%s]> " msgstr "Seçme örüntüsünü girin [%s]> " -#: src/lang.c:833 +#: src/lang.c:836 msgid "Select thread> " msgstr "eposta zinciri seç> " -#: src/lang.c:834 +#: src/lang.c:837 #, c-format msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" msgstr "\"%s %s %s (\"%s\") [%s]: DETAYLI hata raporunu ÅŸuna gönder %s\n" -#: src/lang.c:835 +#: src/lang.c:838 msgid "servers active-file" msgstr "sunucular etkin-dosyası" -#: src/lang.c:836 +#: src/lang.c:839 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "Yeni habergruplarına giriÅŸ yapılamıyor. Önce abone ol..." -#: src/lang.c:837 +#: src/lang.c:840 msgid "" msgstr "" -#: src/lang.c:838 +#: src/lang.c:841 #, c-format msgid "Starting: (%s)" msgstr "BaÅŸlıyor: (%s)" -#: src/lang.c:839 +#: src/lang.c:842 #, c-format msgid "List Thread (%d of %d)" msgstr "Eposta zinciri listeleme (%d of %d)" -#: src/lang.c:840 +#: src/lang.c:843 #, c-format msgid "Thread (%.*s)" msgstr "Eposta zinciri (%.*s)" -#: src/lang.c:841 +#: src/lang.c:844 msgid "Enter wildcard subscribe pattern> " msgstr "Abone olma joker karakter örüntüsünü girin> " -#: src/lang.c:842 +#: src/lang.c:845 #, c-format msgid "subscribed to %d groups" msgstr "\"%d gruba abone olundu" -#: src/lang.c:843 +#: src/lang.c:846 #, c-format msgid "Subscribed to %s" msgstr "%s'e abone olundu" -#: src/lang.c:844 +#: src/lang.c:847 msgid "Subscribing... " msgstr "Abone olunuyor... " -#: src/lang.c:845 +#: src/lang.c:848 #, c-format msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " msgstr "Makale(ler)i yeniden gönder yada deÄŸiÅŸtir [%%s]? (%s/%s/%s): " -#: src/lang.c:846 +#: src/lang.c:849 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "Makale(ler)i Grup(lar)ın yerine al [%s]> " -#: src/lang.c:847 +#: src/lang.c:850 msgid "Superseding article ..." msgstr "Makale deÄŸiÅŸtiriliyor ..." -#: src/lang.c:848 +#: src/lang.c:851 #, c-format msgid "" "\n" @@ -3886,24 +3886,24 @@ msgstr "" "\n" "Durduruldu. Yeniden baÅŸlatmak için 'fg' yaz %s\n" -#: src/lang.c:850 +#: src/lang.c:853 #, c-format msgid "%d days" msgstr "%d gün" -#: src/lang.c:851 +#: src/lang.c:854 msgid "" msgstr "" -#: src/lang.c:852 +#: src/lang.c:855 msgid "TeX " msgstr "TeX " -#: src/lang.c:853 +#: src/lang.c:856 msgid "# Default action/prompt strings\n" msgstr "# Varsayılan iÅŸlem/komut dizgileri\n" -#: src/lang.c:854 +#: src/lang.c:857 msgid "" "# Defaults for quick (1 key) kill & auto-selection filters\n" "# header=NUM 0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n" @@ -3925,112 +3925,112 @@ msgstr "" "# süre doldur=AÇIK/KAPALI AÇIK=default_filter_days deÄŸerine sınırla " "KAPALI=hiçbir zaman süresini doldurma\n" -#: src/lang.c:867 +#: src/lang.c:870 msgid "" "# If ON use print current subject or newsgroup description in the last line\n" msgstr "" "# eÄŸer AÇIK durumdaysa mevcut konu yada son satırdaki haber grubu tanımı " "için yazdırır\n" -#: src/lang.c:868 +#: src/lang.c:871 msgid "# Host & time info used for detecting new groups (don't touch)\n" msgstr "" "# Yeni grupları algılamak için sunucu & zaman bilgileri kullanılır " "(dokunmayınız)\n" -#: src/lang.c:869 +#: src/lang.c:872 msgid "There is no news\n" msgstr "Hiçbir haber yok\n" -#: src/lang.c:870 +#: src/lang.c:873 msgid "Thread" msgstr "Eposta zinciri" -#: src/lang.c:871 +#: src/lang.c:874 msgid "Thread Level Commands" msgstr "Eposta Zinciri Seviyesi Komutları" -#: src/lang.c:872 +#: src/lang.c:875 msgid "Thread deselected" msgstr "Eposta zinciri seçimi kaldırıldı" -#: src/lang.c:873 +#: src/lang.c:876 msgid "Thread selected" msgstr "Eposta zinciri seçildi" -#: src/lang.c:875 +#: src/lang.c:878 msgid "threads" msgstr "eposta zincirleri" -#: src/lang.c:877 +#: src/lang.c:880 msgid "thread" msgstr "eposta zinciri" -#: src/lang.c:878 +#: src/lang.c:881 #, c-format msgid "Thread %4s of %4s" msgstr "Eposta zinciri %4s / %4s " -#: src/lang.c:879 +#: src/lang.c:882 msgid "Threading articles..." msgstr "Makaleler zincirleniyor..." -#: src/lang.c:880 +#: src/lang.c:883 #, c-format msgid "Toggled word highlighting %s" msgstr "Kelime vurgulaması deÄŸiÅŸtirildi %s" -#: src/lang.c:881 +#: src/lang.c:884 msgid "Toggled rot13 encoding" msgstr "rot13 kodlama deÄŸiÅŸtirildi" -#: src/lang.c:882 +#: src/lang.c:885 #, c-format msgid "Toggled german TeX encoding %s" msgstr "Almanca TeX kodlama deÄŸiÅŸtirildi %s" -#: src/lang.c:883 +#: src/lang.c:886 #, c-format msgid "Toggled tab-width to %d" msgstr "tab geniÅŸliÄŸi ÅŸuna deÄŸiÅŸtirildi %d" -#: src/lang.c:885 +#: src/lang.c:888 #, c-format msgid "%d Trying to dotlock %s" msgstr "\"%d dotlock yapılmaya çalışılıyor %s" -#: src/lang.c:886 +#: src/lang.c:889 #, c-format msgid "%d Trying to lock %s" msgstr "\"%d Kilitlemeye çalışılıyor %s" -#: src/lang.c:888 +#: src/lang.c:891 msgid " h=help" msgstr " h=yardım" -#: src/lang.c:890 +#: src/lang.c:893 msgid "Unlimited" msgstr "Sınırsız" -#: src/lang.c:891 +#: src/lang.c:894 msgid "Enter wildcard unsubscribe pattern> " msgstr "abonelikten çıkma joker karakter örüntüsünü girin> " -#: src/lang.c:892 +#: src/lang.c:895 #, c-format msgid "Error decoding %s : %s" msgstr "Çözülürken hata %s: %s" -#: src/lang.c:893 +#: src/lang.c:896 msgid "No end." msgstr "Son yok." -#: src/lang.c:894 +#: src/lang.c:897 #, c-format msgid "%s successfully decoded." msgstr "%s baÅŸarıyla çözüldü." -#: src/lang.c:895 +#: src/lang.c:898 #, c-format msgid "" "%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" @@ -4039,37 +4039,32 @@ msgstr "" "%*s[-- %s/%s, %s uuencoded dosya, %d satır, ad: %s --]\n" "\n" -#: src/lang.c:896 +#: src/lang.c:899 msgid "unread " msgstr "okunmamış " -#: src/lang.c:897 +#: src/lang.c:900 #, c-format msgid "unsubscribed from %d groups" msgstr "%d tane gruptan abonelikten çıkıldı" -#: src/lang.c:898 +#: src/lang.c:901 #, c-format msgid "Unsubscribed from %s" msgstr "%s aboneliÄŸinden çıkıldı" -#: src/lang.c:899 +#: src/lang.c:902 msgid "Unsubscribing... " msgstr "Abonelik iptal ediliyor... " -#: src/lang.c:900 +#: src/lang.c:903 msgid "Unthreading articles..." msgstr "Makalelerin baÄŸlantısı sonlanıyor..." -#: src/lang.c:901 +#: src/lang.c:904 msgid "Updated" msgstr "Güncellendi" -#: src/lang.c:903 -#, c-format -msgid "unparseable \"LIST COUNTS\" line: \"%s\"" -msgstr "çözümlenemez \"LIST COUNTS\" satırı: \"%s\"" - #: src/lang.c:905 msgid "Updating" msgstr "Güncelleniyor" @@ -4232,11 +4227,16 @@ msgid "%s only useful for batch mode ope msgstr "%s sadece toplu kip iÅŸlemleri varsa kullanışlı\n" #: src/lang.c:939 +#, fuzzy, c-format +msgid "%s only useful for batch or debug mode operations\n" +msgstr "%s sadece toplu kip iÅŸlemleri varsa kullanışlı\n" + +#: src/lang.c:940 #, c-format msgid "Useless combination %s and %s. Ignoring %s.\n" msgstr "Kombinasyon %s ve %s kullanışsız. %s önemsenmiyor.\n" -#: src/lang.c:941 +#: src/lang.c:942 #, c-format msgid "" "\n" @@ -4245,12 +4245,12 @@ msgstr "" "\n" "%s%d aralık dışında (0 - %d). 0'a Sıfırla" -#: src/lang.c:942 +#: src/lang.c:943 #, c-format msgid "View '%s' (%s/%s)?" msgstr "Göster '%s' (%s/%s)?" -#: src/lang.c:944 +#: src/lang.c:945 #, c-format msgid "" "\n" @@ -4261,7 +4261,7 @@ msgstr "" "Uyarı: gönderi %d sütunu aşıyor. %d en uzun ilk satır:\n" "%-100s\n" -#: src/lang.c:945 +#: src/lang.c:946 msgid "" "\n" "Warning: article unchanged after editing\n" @@ -4269,7 +4269,7 @@ msgstr "" "\n" "Uyarı: makale düzenlendikten sonra deÄŸiÅŸtirilmedi\n" -#: src/lang.c:946 +#: src/lang.c:947 msgid "" "\n" "Warning: \"Subject:\" contains only whitespaces.\n" @@ -4277,7 +4277,7 @@ msgstr "" "\n" "Uyarı: \"Konu:\" sadece beyaz boÅŸluklardan oluÅŸuyor. \n" -#: src/lang.c:947 +#: src/lang.c:948 msgid "" "\n" "Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:" @@ -4286,7 +4286,7 @@ msgstr "" "\n" "Uyarı: \"Konu:\", \"Re: \" ile baÅŸlıyor ama \"Referanslar:\" yok.\n" -#: src/lang.c:949 +#: src/lang.c:950 msgid "" "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" @@ -4296,7 +4296,7 @@ msgstr "" "Uyarı: Makalede \"Referanslar:\" var ama \"Konu:\" \"Re: \" ile\n" " baÅŸlamıyor ve \"(was:\" yok.\n" -#: src/lang.c:952 +#: src/lang.c:953 msgid "" "Read carefully!\n" "\n" @@ -4319,7 +4319,7 @@ msgstr "" "Ä°ptal etmek üzere olduÄŸunuz makale bu:\n" "\n" -#: src/lang.c:956 +#: src/lang.c:957 msgid "" "\n" "Warning: You are using a non-plain transfer encoding (such as base64 or\n" @@ -4335,7 +4335,7 @@ msgstr "" " inews programı tarafından bir imza iliÅŸtirildiyse, uygun ÅŸekilde " "kodlanamaz.\n" -#: src/lang.c:961 +#: src/lang.c:962 msgid "" "\n" "Warning: \"example\" is a reserved hierarchy!\n" @@ -4343,7 +4343,7 @@ msgstr "" "\n" "Uyarı: \"örnek\" ayrılmış bir hiyerarÅŸidir!\n" -#: src/lang.c:962 +#: src/lang.c:963 #, c-format msgid "" "\n" @@ -4358,7 +4358,7 @@ msgstr "" "%s dosyanızdaki bazı deÄŸerler deÄŸiÅŸtirilmiÅŸtir!\n" "WHATSNEW, vb dosyaları okuyun...\n" -#: src/lang.c:964 +#: src/lang.c:965 #, c-format msgid "" "\n" @@ -4371,7 +4371,7 @@ msgstr "" "Yeni bir sürümden tin %s'e alçaltıyorsunuz!\n" "%s dosyanıdaki bazı deÄŸerler yoksayılabir, diÄŸerleri deÄŸiÅŸtirilebilir!\n" -#: src/lang.c:967 +#: src/lang.c:968 #, c-format msgid "" "Warning: tin wrote fewer groups to your\n" @@ -4387,7 +4387,7 @@ msgstr "" "bu oturum bir hataya iÅŸarettir ve tin'i tekrar baÅŸlatmadan %s'i\n" "yedeklemeniz gerekmektedir!\n" -#: src/lang.c:971 +#: src/lang.c:972 #, c-format msgid "" "\n" @@ -4396,12 +4396,12 @@ msgstr "" "\n" "Uyarı: %d bulundu '-- \\n' satır, bazı insanların kafası karışabilir.\n" -#: src/lang.c:972 +#: src/lang.c:973 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "Uyarı: Sadece %d'de %d makale kaydedildi" -#: src/lang.c:973 +#: src/lang.c:974 #, c-format msgid "" "\n" @@ -4416,7 +4416,7 @@ msgstr "" " iÅŸe yarar bilgi aktarmadıkları için, olabildikleri kadar kısa\n" " olmalılar.\n" -#: src/lang.c:977 +#: src/lang.c:978 #, c-format msgid "" "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " @@ -4424,7 +4424,7 @@ msgstr "" "Uyarı: bu eposta adresinde mesaj yaÄŸanağı tuzağı olabilir. %s=devam, " "%s=durdur? " -#: src/lang.c:978 +#: src/lang.c:979 msgid "" "\n" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" @@ -4432,37 +4432,37 @@ msgstr "" "\n" "Uyarı: Ä°mzalar '-- \\n ile baÅŸlamalı '--\\n ile deÄŸil'.\n" -#: src/lang.c:979 +#: src/lang.c:980 msgid "Writing attributes file..." msgstr "Öznitelikler dosylası yazılıyor..." -#: src/lang.c:981 +#: src/lang.c:982 #, c-format msgid "%d Responses" msgstr "%d Yanıt" -#: src/lang.c:983 +#: src/lang.c:984 #, c-format msgid "Added %d %s" msgstr "%d %s Eklendi" -#: src/lang.c:984 +#: src/lang.c:985 msgid "No unsubscribed groups to show" msgstr "Gösterilecek abonelikten çıkılmış grup yok" -#: src/lang.c:985 +#: src/lang.c:986 msgid "Showing subscribed to groups only" msgstr "Sadece abone olunan grupları göster" -#: src/lang.c:986 +#: src/lang.c:987 msgid "Yes " msgstr "Evet " -#: src/lang.c:987 +#: src/lang.c:988 msgid " You have mail" msgstr " Epostanız var" -#: src/lang.c:992 +#: src/lang.c:993 #, c-format msgid "" "\n" @@ -4483,11 +4483,11 @@ msgstr "" " ayarlarını M)enü seçeneÄŸi ile yollamak için daha uygun bir ÅŸekilde\n" " deÄŸiÅŸtirin.\n" -#: src/lang.c:1003 +#: src/lang.c:1004 msgid " -D mode debug mode" msgstr " -D kip hata ayıklama kipi" -#: src/lang.c:1007 +#: src/lang.c:1008 msgid "" "Read carefully!\n" "\n" @@ -4514,11 +4514,11 @@ msgstr "" "Ä°ptal etmek üzere olduÄŸunuz makale bu:\n" "\n" -#: src/lang.c:1016 +#: src/lang.c:1017 msgid "toggle color" msgstr "renk deÄŸiÅŸtir" -#: src/lang.c:1017 +#: src/lang.c:1018 msgid "" "# Changing colors of several screen parts\n" "# Possible values are:\n" @@ -4564,11 +4564,11 @@ msgstr "" "# 15 = açık beyaz\n" "\n" -#: src/lang.c:1037 +#: src/lang.c:1038 msgid " -a toggle color flag" msgstr " -a renk bayrağını deÄŸiÅŸtir" -#: src/lang.c:1041 +#: src/lang.c:1042 msgid "" "\n" "Error: Followup-To set to more than one newsgroup!\n" @@ -4576,7 +4576,7 @@ msgstr "" "\n" "Hata: Birden fazla haber grubu için Takip-Et ayarlandı!\n" -#: src/lang.c:1042 +#: src/lang.c:1043 #, c-format msgid "" "\n" @@ -4585,7 +4585,7 @@ msgstr "" "\n" "Hata: \"%s\" yeniden adlandırılmış, onun yerine \"%s\" kullanın!\n" -#: src/lang.c:1043 +#: src/lang.c:1044 #, c-format msgid "" "\n" @@ -4594,7 +4594,7 @@ msgstr "" "\n" "Hata: %d haber gruubuna çapraz gönderiyor ve Takip-Et satırı yok!\n" -#: src/lang.c:1044 +#: src/lang.c:1045 #, c-format msgid "" "\n" @@ -4603,7 +4603,7 @@ msgstr "" "\n" "Hata: \"%s\" geçerli bir haber grubu deÄŸil!\n" -#: src/lang.c:1046 +#: src/lang.c:1047 msgid "" "\n" "Warning: Followup-To set to more than one newsgroup!\n" @@ -4611,7 +4611,7 @@ msgstr "" "\n" "Uyarı: Birden fazla haber grubu için Takip-Et ayarlandı!\n" -#: src/lang.c:1047 +#: src/lang.c:1048 #, c-format msgid "" "\n" @@ -4620,7 +4620,7 @@ msgstr "" "\n" "Uyarı: \"%s\"nin ismi deÄŸiÅŸti, onun yerine \"%s\" kullanmalısınız!\n" -#: src/lang.c:1048 +#: src/lang.c:1049 #, c-format msgid "" "\n" @@ -4629,7 +4629,7 @@ msgstr "" "\n" "Hata: %d haber grubuna çapraz gönderiyor ve Takip-Et satırı yok!\n" -#: src/lang.c:1049 +#: src/lang.c:1050 #, c-format msgid "" "\n" @@ -4638,7 +4638,7 @@ msgstr "" "\n" "Uyarı: \"%s\" sizin newsrc'nizde mevcut deÄŸil, bu sitede geçersiz olabilir!\n" -#: src/lang.c:1050 +#: src/lang.c:1051 #, c-format msgid "" "\n" @@ -4647,156 +4647,150 @@ msgstr "" "\n" "Uyaı: \"%s\" bu sitede geçerli bir haber grubu deÄŸil!\n" -#: src/lang.c:1054 +#: src/lang.c:1055 #, c-format msgid "%d files successfully written from %d articles. %d %s occurred." msgstr "%d dosya %d makalelerinden baÅŸarıyla yazıldı. %d %s meydana geldi." -#: src/lang.c:1055 +#: src/lang.c:1056 msgid "Missing parts." msgstr "Eksik bölümler var." -#: src/lang.c:1056 +#: src/lang.c:1057 msgid "No beginning." msgstr "BaÅŸlangıç yok." -#: src/lang.c:1057 +#: src/lang.c:1058 msgid "No data." msgstr "Veri yok." -#: src/lang.c:1058 +#: src/lang.c:1059 msgid "Unknown error." msgstr "Bilinmeyen hata." -#: src/lang.c:1061 +#: src/lang.c:1062 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "\tSaÄŸlama toplamı %s (%ld %s)" -#: src/lang.c:1066 +#: src/lang.c:1067 msgid "Reading mail active file... " msgstr "eposta etkin dosya okunuyor... " -#: src/lang.c:1067 +#: src/lang.c:1068 msgid "Reading mailgroups file... " msgstr "mailgroups dosyası okunuyor... " -#: src/lang.c:1071 +#: src/lang.c:1072 msgid "perform PGP operations on article" msgstr "makalede PGP iÅŸlemi gerçekleÅŸtir" -#: src/lang.c:1072 +#: src/lang.c:1073 msgid "Add key(s) to public keyring?" msgstr "Genel anahtar zincirine anahtar(lar) ekle?" -#: src/lang.c:1073 +#: src/lang.c:1074 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "%s=ÅŸifrele, %s=imzala. %s=ikisi de, %s=çık: " -#: src/lang.c:1074 +#: src/lang.c:1075 #, c-format msgid "%s=sign, %s=sign & include public key, %s=quit: " msgstr "%s=iÅŸaretle, %s=imzala & genel anahtarı dahil et, %s=çık: " -#: src/lang.c:1075 +#: src/lang.c:1076 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "PGP ayarlanmadı (%s açılamıyor)" -#: src/lang.c:1076 +#: src/lang.c:1077 msgid "Article not signed and no public keys found" msgstr "Makale imzalanmadı ve genel anahtar bulunamadı" -#: src/lang.c:1078 +#: src/lang.c:1079 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "%s=çık, %s=düzenle, %s=ispell, %s=pgp, %s=menü, %s=gönder, %s=ertele: " -#: src/lang.c:1079 +#: src/lang.c:1080 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " msgstr "%s=çık, %s=düzenle, %s=ispell, %s=pgp, %s=gönder [%%s]: " -#: src/lang.c:1080 +#: src/lang.c:1081 #, c-format msgid "" "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" "%s=çık, %s=düzenle, %s=ispell, %s=pgp, %s=menü, %s=gönder, %s=ertele [%%s]: " -#: src/lang.c:1082 +#: src/lang.c:1083 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "%s=çık, %s=düzenle, %s=pgp, %s=menü, %s=yolla, %s=ertele: " -#: src/lang.c:1083 +#: src/lang.c:1084 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "%s=çık, %s=düzenle, %s=pgp, %s=gönder [%%s]: " -#: src/lang.c:1084 +#: src/lang.c:1085 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=çık, %s=düzenle, %s=pgp, %s=menü, %s=yolla, %s=ertele [%%s]: " -#: src/lang.c:1088 +#: src/lang.c:1089 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " msgstr "%s=çık, %s=düzenle, %s=ispell, %s=menü, %s=yolla, %s=ertele: " -#: src/lang.c:1089 +#: src/lang.c:1090 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "%s=çık, %s=düzenle, %s=ispell, %s=yolla [%%s]: " -#: src/lang.c:1090 +#: src/lang.c:1091 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=çık, %s=düzenle, %s=ispell, %s=menü, %s=yolla, %s=ertele [%%s]: " -#: src/lang.c:1092 +#: src/lang.c:1093 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "%s=çık, %s=düzenle, %s=menü, %s=yolla, %s=ertele: " -#: src/lang.c:1093 +#: src/lang.c:1094 #, c-format msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "%s=çık, %s=düzenle, %s=gönder [%%s]: " -#: src/lang.c:1094 +#: src/lang.c:1095 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=çık, %s=düzenle, %s=menü, %s=yolla, %s=ertele [%%.*s]: " -#: src/lang.c:1103 +#: src/lang.c:1104 msgid "Try cache_overview_files to speed up things.\n" msgstr "Hızlandırmak için cace_overview_files deneyin.\n" -#: src/lang.c:1104 +#: src/lang.c:1105 msgid "Tin will use local index files instead.\n" msgstr "Tin yerel dizinleme dosyalarını kullanacak.\n" -#: src/lang.c:1105 +#: src/lang.c:1106 msgid "Cannot find NNTP server name" msgstr "NNTP sunucu ismi bulunamadı" -#: src/lang.c:1106 +#: src/lang.c:1107 #, c-format msgid "Connecting to %s:%u..." msgstr "BaÄŸlanıyor %s:%u..." -#: src/lang.c:1107 -msgid "Disconnecting from server...\n" -msgstr "Sunucu baÄŸlantısı kesiliyor...\n" - #: src/lang.c:1108 -#, c-format -msgid "" -"Wrong newsgroup name (\"%s\") in response of \"GROUP %s\" command: \"%s\"" -msgstr "" -"\"GROUP %s\" komutuna cevap olarak Hatalı haber grubu ismi (\"%s\"): \"%s\"" +#, fuzzy +msgid "Disconnecting from server..." +msgstr "Sunucu baÄŸlantısı kesiliyor...\n" #: src/lang.c:1109 #, c-format @@ -5590,65 +5584,69 @@ msgstr "NFC" msgid "NFD" msgstr "NFD" -#: src/lang.c:1586 +#: src/lang.c:1580 +msgid "NFKC case fold" +msgstr "" + +#: src/lang.c:1589 msgid "Display Options" msgstr "Görüntü Seçenekleri" -#: src/lang.c:1593 +#: src/lang.c:1596 msgid "Color Options" msgstr "Renk Seçenekleri" -#: src/lang.c:1599 +#: src/lang.c:1602 msgid "Highlight Options" msgstr "Vurgulama Seçenekleri" -#: src/lang.c:1606 +#: src/lang.c:1609 msgid "Article-Limiting Options" msgstr "Makale-Sınırlandırma Seçenekleri" -#: src/lang.c:1612 +#: src/lang.c:1615 msgid "Posting/Mailing Options" msgstr "Yollama/Postalama Seçenekleri" -#: src/lang.c:1618 +#: src/lang.c:1621 msgid "Saving/Printing Options" msgstr "Kaydetme/Yazdırma Seçenekleri" -#: src/lang.c:1624 +#: src/lang.c:1627 msgid "Expert Options" msgstr "Uzman Seçenekleri" -#: src/lang.c:1630 +#: src/lang.c:1633 msgid "Filtering Options" msgstr "Filtreleme Seçenekleri" -#: src/lang.c:1635 src/lang.c:1666 src/lang.c:1672 src/lang.c:1699 -#: src/lang.c:1751 src/lang.c:1757 src/lang.c:1767 src/lang.c:1778 -#: src/lang.c:1796 src/lang.c:1865 src/lang.c:2066 src/lang.c:2072 -#: src/lang.c:2078 src/lang.c:2084 src/lang.c:2096 src/lang.c:2103 -#: src/lang.c:2157 src/lang.c:2166 src/lang.c:2172 src/lang.c:2179 -#: src/lang.c:2186 src/lang.c:2193 src/lang.c:2200 src/lang.c:2207 -#: src/lang.c:2214 src/lang.c:2221 src/lang.c:2228 src/lang.c:2235 -#: src/lang.c:2242 src/lang.c:2249 src/lang.c:2256 src/lang.c:2263 -#: src/lang.c:2270 src/lang.c:2277 src/lang.c:2284 src/lang.c:2291 -#: src/lang.c:2298 src/lang.c:2305 src/lang.c:2312 src/lang.c:2319 -#: src/lang.c:2326 src/lang.c:2333 src/lang.c:2340 src/lang.c:2348 -#: src/lang.c:2364 src/lang.c:2371 src/lang.c:2378 src/lang.c:2385 -#: src/lang.c:2391 src/lang.c:2397 src/lang.c:2414 src/lang.c:2426 -#: src/lang.c:2461 src/lang.c:2514 src/lang.c:2528 src/lang.c:2534 -#: src/lang.c:2559 src/lang.c:2577 src/lang.c:2594 src/lang.c:2606 -#: src/lang.c:2639 src/lang.c:2675 src/lang.c:2695 src/lang.c:2730 -#: src/lang.c:2740 src/lang.c:2747 src/lang.c:2773 src/lang.c:2797 -#: src/lang.c:2870 src/lang.c:2884 src/lang.c:2892 src/lang.c:2906 -#: src/lang.c:2912 src/lang.c:2950 +#: src/lang.c:1638 src/lang.c:1669 src/lang.c:1675 src/lang.c:1702 +#: src/lang.c:1754 src/lang.c:1760 src/lang.c:1770 src/lang.c:1781 +#: src/lang.c:1799 src/lang.c:1868 src/lang.c:2069 src/lang.c:2075 +#: src/lang.c:2081 src/lang.c:2087 src/lang.c:2099 src/lang.c:2106 +#: src/lang.c:2160 src/lang.c:2169 src/lang.c:2175 src/lang.c:2182 +#: src/lang.c:2189 src/lang.c:2196 src/lang.c:2203 src/lang.c:2210 +#: src/lang.c:2217 src/lang.c:2224 src/lang.c:2231 src/lang.c:2238 +#: src/lang.c:2245 src/lang.c:2252 src/lang.c:2259 src/lang.c:2266 +#: src/lang.c:2273 src/lang.c:2280 src/lang.c:2287 src/lang.c:2294 +#: src/lang.c:2301 src/lang.c:2308 src/lang.c:2315 src/lang.c:2322 +#: src/lang.c:2329 src/lang.c:2336 src/lang.c:2343 src/lang.c:2351 +#: src/lang.c:2367 src/lang.c:2374 src/lang.c:2381 src/lang.c:2388 +#: src/lang.c:2394 src/lang.c:2400 src/lang.c:2417 src/lang.c:2429 +#: src/lang.c:2464 src/lang.c:2517 src/lang.c:2531 src/lang.c:2537 +#: src/lang.c:2562 src/lang.c:2580 src/lang.c:2597 src/lang.c:2609 +#: src/lang.c:2642 src/lang.c:2678 src/lang.c:2698 src/lang.c:2733 +#: src/lang.c:2743 src/lang.c:2750 src/lang.c:2776 src/lang.c:2800 +#: src/lang.c:2877 src/lang.c:2892 src/lang.c:2900 src/lang.c:2914 +#: src/lang.c:2920 src/lang.c:2958 msgid " toggles, sets, cancels." msgstr " deÄŸiÅŸtirir, ayarlar, iptal eder." -#: src/lang.c:1636 +#: src/lang.c:1639 msgid "Show mini menu & posting etiquette" msgstr "Mini menüyü ve gönderme etiketini göster" -#: src/lang.c:1637 +#: src/lang.c:1640 msgid "" "# If ON show a mini menu of useful commands at each level\n" "# and posting etiquette after composing an article\n" @@ -5657,16 +5655,16 @@ msgstr "" "# düzeylerde kullanışlı komutların mini menüsünü ve yollama etiketini " "göster.\n" -#: src/lang.c:1642 +#: src/lang.c:1645 msgid "Show short description for each newsgroup. toggles & sets." msgstr "" "Her haber grubu için kısa açıklama göster. deÄŸiÅŸtirir & ayarlar." -#: src/lang.c:1643 +#: src/lang.c:1646 msgid "Show description of each newsgroup" msgstr "Her haber grubu için açıklama göster" -#: src/lang.c:1644 +#: src/lang.c:1647 msgid "" "# If ON show group description text after newsgroup name at\n" "# group selection level\n" @@ -5675,7 +5673,7 @@ msgstr "" "sonraki\n" "# grup açıklama metnini göster.\n" -#: src/lang.c:1649 +#: src/lang.c:1652 msgid "" "Show From (author) fields in group & thread level. toggles & " "sets." @@ -5683,11 +5681,11 @@ msgstr "" "Grup & zincir seviyesinde Konu & Gönderen (yazar) alanlarını göster. " "deÄŸiÅŸtirir & ayarlar." -#: src/lang.c:1650 +#: src/lang.c:1653 msgid "In group and thread level, show author by" msgstr "Grup ve zincir seviyesinde, yazarı ÅŸuna göre göster" -#: src/lang.c:1651 +#: src/lang.c:1654 msgid "" "# Part of From field to display in group and thread level\n" "# Possible values are (the default is marked with *):\n" @@ -5704,35 +5702,35 @@ msgstr "" "# * 2 = tam isim\n" "# 3 = her ikisi de\n" -#: src/lang.c:1660 +#: src/lang.c:1663 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "" "-> çiz ya da seçim için vurgulanmış çubuk. deÄŸiÅŸtirir & ayarlar." -#: src/lang.c:1661 +#: src/lang.c:1664 msgid "Draw -> instead of highlighted bar" msgstr "Çiz -> vurgulanmış çubuk yerine" -#: src/lang.c:1662 +#: src/lang.c:1665 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "" "# EÄŸer AÇIK durumundaysa kullan -> deÄŸilse seçim için vurgulanmış çubuk\n" -#: src/lang.c:1667 +#: src/lang.c:1670 msgid "Use inverse video for page headers" msgstr "Sayfa üst bilgileri için ters görüntü kullan" -#: src/lang.c:1668 +#: src/lang.c:1671 msgid "# If ON use inverse video for page headers at different levels\n" msgstr "" "# EÄŸer AÇIK durumundaysa farklı seviyelerdeki sayfa üst bilgileri için ters " "görüntü kullan\n" -#: src/lang.c:1673 +#: src/lang.c:1676 msgid "Thread articles by" msgstr "Zincir makaleleri ÅŸuna göre" -#: src/lang.c:1674 +#: src/lang.c:1677 msgid "" "# Thread articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5752,15 +5750,15 @@ msgstr "" "# 4 = Çok Bölümlü Konu\n" "# 5 = Yüzde EÅŸleÅŸmesi\n" -#: src/lang.c:1685 +#: src/lang.c:1688 msgid "Enter percentage match required to thread together. sets." msgstr "Zincirlemek için gerekli eÅŸleÅŸme yüzdesini girin. ayarlar." -#: src/lang.c:1686 +#: src/lang.c:1689 msgid "Thread percentage match" msgstr "Zincir eÅŸleÅŸme yüzdesi" -#: src/lang.c:1688 +#: src/lang.c:1691 #, no-c-format msgid "" "# Thread percentage match...\n" @@ -5785,11 +5783,11 @@ msgstr "" "# fakat 'mttllu', 'muuttl' ve 'mtluuu', 'mutlu'dan ayrı bir ÅŸekilde " "zincirlenecektir.\n" -#: src/lang.c:1700 +#: src/lang.c:1703 msgid "Score of a thread" msgstr "Eposta zincirinin skoru" -#: src/lang.c:1701 +#: src/lang.c:1704 msgid "" "# Thread score\n" "# Possible values are (the default is marked with *):\n" @@ -5803,18 +5801,18 @@ msgstr "" "# 1 = toplam\n" "# 2 = ortalama\n" -#: src/lang.c:1709 +#: src/lang.c:1712 msgid "" "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "" "Makaleleri Konu, Gönderen, Tarih ya da Skora göre sırala. deÄŸiÅŸtirir " "& ayarlar." -#: src/lang.c:1710 +#: src/lang.c:1713 msgid "Sort articles by" msgstr "Makaleleri ÅŸuna göre sırala" -#: src/lang.c:1711 +#: src/lang.c:1714 msgid "" "# Sort articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5844,17 +5842,17 @@ msgstr "" "# 9 = (Satırlar azalan)\n" "# 10 = (Satırlar artan)\n" -#: src/lang.c:1727 +#: src/lang.c:1730 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "" "Eposta zincirlerini Hiçbir ÅŸeye ya da skora göre sırala. deÄŸiÅŸtirir " "& ayarlar." -#: src/lang.c:1728 +#: src/lang.c:1731 msgid "Sort threads by" msgstr "Eposta zincirlerini ÅŸuna göre sırala" -#: src/lang.c:1729 +#: src/lang.c:1732 msgid "" "# Sort thread by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5872,54 +5870,54 @@ msgstr "" "# 3 = Son gönderim tarihi azalan\n" "# 4 = Son gönderim tarihi artan\n" -#: src/lang.c:1739 +#: src/lang.c:1742 msgid "" "Put cursor at first/last unread art in groups. toggles & sets." msgstr "" "Ä°mleci gruplardaki ilk/son okunmamış makalelere koy. deÄŸiÅŸtirir & " " ayarlar." -#: src/lang.c:1740 +#: src/lang.c:1743 msgid "Go to first unread article in group" msgstr "Gruptaki ilk okunmamış makaleye git" -#: src/lang.c:1741 +#: src/lang.c:1744 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "" "# EÄŸer AÇIK durumundaysa imleci ilk okunmamış makeleye, deÄŸilse son makeleye " "koy\n" -#: src/lang.c:1745 +#: src/lang.c:1748 msgid "Show all articles or only unread articles. toggles & sets." msgstr "" "Tüm makaleleri ya da sadece okunmamış makaleleri göster. deÄŸiÅŸtirir & " " ayarlar." -#: src/lang.c:1746 +#: src/lang.c:1749 msgid "Show only unread articles" msgstr "Sadece okunmayan makaleleri göster" -#: src/lang.c:1747 +#: src/lang.c:1750 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "" "# EÄŸer AÇIK durumundaysa sadece yeni/okunmamış makaleleri, deÄŸilse hepsini " "göster.\n" -#: src/lang.c:1752 +#: src/lang.c:1755 msgid "Show only groups with unread arts" msgstr "Sadece okunmamış makale olan grupları göster" -#: src/lang.c:1753 +#: src/lang.c:1756 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "" "# EÄŸer AÇIK durumundaysa sadece abone olunup okunmamış makaler içeren " "grupları göster.\n" -#: src/lang.c:1758 +#: src/lang.c:1761 msgid "Filter which articles" msgstr "Hangi makaleler filtrelenecek" -#: src/lang.c:1759 +#: src/lang.c:1762 msgid "" "# Filter which articles\n" "# Possible values are (the default is marked with *):\n" @@ -5934,11 +5932,11 @@ msgstr "" "göster\n" "# 2 = Tüm makaleleri yok et ve bir daha gösterme.\n" -#: src/lang.c:1768 +#: src/lang.c:1771 msgid "Go to the next unread article with" msgstr "Sonraki okunmamış makaleye ÅŸununla git" -#: src/lang.c:1769 +#: src/lang.c:1772 msgid "" "# Go to the unread article with following key(s)\n" "# Possible values are (the default is marked with *):\n" @@ -5954,11 +5952,11 @@ msgstr "" "# * 2 = TAB\n" "# 3 = PAGE DOWN ya da TAB\n" -#: src/lang.c:1779 +#: src/lang.c:1782 msgid "How to treat blank lines" msgstr "BoÅŸ satırlar nasıl iÅŸlensin" -#: src/lang.c:1780 +#: src/lang.c:1783 msgid "" "# Trim the article body, remove unnecessary blank lines.\n" "# Possible values are (the default is marked with *):\n" @@ -5988,28 +5986,28 @@ msgstr "" "# 7 = Metin blokları arasındaki birden fazla boÅŸ satırı birleÅŸtir ve\n" "# baÅŸtaki ve sondaki boÅŸ satırları atla\n" -#: src/lang.c:1797 +#: src/lang.c:1800 msgid "List thread using right arrow key" msgstr "SaÄŸ ok tuÅŸunu kullanarak eposta zincirlerini listele" -#: src/lang.c:1798 +#: src/lang.c:1801 msgid "" "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "" "# EÄŸer AÇIK durumundaysa zincirleri saÄŸ ok tuÅŸunu kullanarak girerken " "otomatik olarak listele.\n" -#: src/lang.c:1802 +#: src/lang.c:1805 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "" "SilinmiÅŸ makaleleri göstermek için karakter giriniz. ayarlar, " "iptal eder." -#: src/lang.c:1803 +#: src/lang.c:1806 msgid "Character to show deleted articles" msgstr "SilinmiÅŸ makaleleri gösterecek olan karakter" -#: src/lang.c:1804 +#: src/lang.c:1807 msgid "" "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" @@ -6017,18 +6015,18 @@ msgstr "" "# Makalenin silindiÄŸini göstermek için kullanılan karakter (varsayılan 'D')\n" "#_ ÅŸuna dönüşü ' '\n" -#: src/lang.c:1809 +#: src/lang.c:1812 msgid "" "Enter character to indicate articles in a range. sets, cancels." msgstr "" "Bir aralıktaki makaleleri belirtmek için karakter girin. ayarlar, " "iptal eder." -#: src/lang.c:1810 +#: src/lang.c:1813 msgid "Character to show inrange articles" msgstr "Sıralanmış makaleleri gösterecek olan karakter" -#: src/lang.c:1811 +#: src/lang.c:1814 msgid "" "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" @@ -6037,7 +6035,7 @@ msgstr "" "(varsayılan '#')\n" "# _ ÅŸuna dönüştü ' '\n" -#: src/lang.c:1816 +#: src/lang.c:1819 msgid "" "Enter character to indicate that article will return. sets, " "cancels." @@ -6045,11 +6043,11 @@ msgstr "" "Makalenin döneceÄŸini göstermek için karakter girin. ayarlar, " "iptal eder." -#: src/lang.c:1817 +#: src/lang.c:1820 msgid "Character to show returning arts" msgstr "Dönen makaleleri gösterecek olan karakter" -#: src/lang.c:1818 +#: src/lang.c:1821 msgid "" "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" @@ -6058,18 +6056,18 @@ msgstr "" "'-')\n" "# _ ÅŸuna dönüştü ' '\n" -#: src/lang.c:1823 +#: src/lang.c:1826 msgid "" "Enter character to indicate selected articles. sets, cancels." msgstr "" "Seçilen makaleleri belirtmek için karakter girin. ayarlar, iptal " "eder." -#: src/lang.c:1824 +#: src/lang.c:1827 msgid "Character to show selected articles" msgstr "Seçilen makaleleri gösterecek olan karakter" -#: src/lang.c:1825 +#: src/lang.c:1828 msgid "" "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" @@ -6078,16 +6076,16 @@ msgstr "" "(varsayılan '*')\n" "#_ ÅŸuna dönüşür ' '\n" -#: src/lang.c:1830 +#: src/lang.c:1833 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "" "Son makaleleri belirtmek için karakter girin. ayarlar, iptal eder." -#: src/lang.c:1831 +#: src/lang.c:1834 msgid "Character to show recent articles" msgstr "Son makaleleri gösterecek olan karakter" -#: src/lang.c:1832 +#: src/lang.c:1835 msgid "" "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" @@ -6096,17 +6094,17 @@ msgstr "" "'o')\n" "# _ ÅŸuna dönüştü ' '\n" -#: src/lang.c:1837 +#: src/lang.c:1840 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "" "Okunmamış makaleleri belirtmek için karakter girin. ayarlar, " "iptal eder." -#: src/lang.c:1838 +#: src/lang.c:1841 msgid "Character to show unread articles" msgstr "Okunmamış makaleleri gösterecek olan karakter" -#: src/lang.c:1839 +#: src/lang.c:1842 msgid "" "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" @@ -6115,17 +6113,17 @@ msgstr "" "'+')\n" "# _ ÅŸuna dönüştü ' '\n" -#: src/lang.c:1844 +#: src/lang.c:1847 msgid "Enter character to indicate read articles. sets, cancels." msgstr "" "Okunan makaleleri belirtmek için karakter girin. ayarlar, iptal " "eder." -#: src/lang.c:1845 +#: src/lang.c:1848 msgid "Character to show read articles" msgstr "OkunmuÅŸ makaleleri gösterecek olan karakter" -#: src/lang.c:1846 +#: src/lang.c:1849 msgid "" "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" @@ -6134,17 +6132,17 @@ msgstr "" "')\n" "# _ ÅŸuna dönüştü ' '\n" -#: src/lang.c:1851 +#: src/lang.c:1854 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "" "Yok olan makaleleri belirtmek için karakter girin. ayarlar, iptal " "eder." -#: src/lang.c:1852 +#: src/lang.c:1855 msgid "Character to show killed articles" msgstr "Yok olan makaleleri gösterecek olan karakter" -#: src/lang.c:1853 +#: src/lang.c:1856 msgid "" "# Character used to show that an art was killed (default 'K')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" @@ -6153,18 +6151,18 @@ msgstr "" "'K')\n" "# kill_level ona göre ayarlanmalıdır, _ ÅŸuna dönüştü ' '\n" -#: src/lang.c:1858 +#: src/lang.c:1861 msgid "" "Enter character to indicate read selected articles. sets, cancels." msgstr "" "OkunmuÅŸ seçilmiÅŸ makaleleri belirtmek için karakter girin. ayarlar, " " iptal eder." -#: src/lang.c:1859 +#: src/lang.c:1862 msgid "Character to show readselected arts" msgstr "OkunmuÅŸ seçilmiÅŸ makaleleri gösteren karakter:" -#: src/lang.c:1860 +#: src/lang.c:1863 msgid "" "# Character used to show that an art was selected before read (default ':')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" @@ -6173,11 +6171,11 @@ msgstr "" "(varsayılan ':')\n" "# kill_level ona göre ayarlanmalıdır, _ ÅŸuna dönüştü ' '\n" -#: src/lang.c:1866 +#: src/lang.c:1869 msgid "Abbreviate long newsgroup names" msgstr "Uzun haber grubu isimlerini kısaltın" -#: src/lang.c:1867 +#: src/lang.c:1870 msgid "" "# If ON abbreviate (if necessary) long newsgroup names at group selection\n" "# level and article level like this:\n" @@ -6188,7 +6186,7 @@ msgstr "" "# (eÄŸer gerekliyse) ÅŸu ÅŸekilde kısalt:\n" "# news.software.readers -> n.software.readers -> n.s.readers -> n.s.r.\n" -#: src/lang.c:1873 +#: src/lang.c:1876 msgid "" "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" @@ -6196,11 +6194,11 @@ msgstr "" "0 = tüm sayfa kaydırımı, -1 = önceki son satırı bir sonraki sayfanın ilk " "satırında göster, -2 = yarım sayfa " -#: src/lang.c:1874 +#: src/lang.c:1877 msgid "Number of lines to scroll in pager" msgstr "Sayfalayıcıda kaydırılacak satır sayısı" -#: src/lang.c:1875 +#: src/lang.c:1878 msgid "" "# Number of lines that cursor-up/down will scroll in article pager\n" "# Possible values are (the default is marked with *):\n" @@ -6219,30 +6217,30 @@ msgstr "" "# 2 ya da daha fazla = 2 ya da daha fazla satır kaydır (sadece " "sayfalayıcıda)\n" -#: src/lang.c:1885 +#: src/lang.c:1888 msgid "Display signatures. toggles & sets." msgstr "Ä°mzaları göster. deÄŸiÅŸtirir & ayarlar." -#: src/lang.c:1886 +#: src/lang.c:1889 msgid "Display signatures" msgstr "Ä°mzaları göster" -#: src/lang.c:1887 +#: src/lang.c:1890 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "# EÄŸer KAPALI ise makaleleri görüntülerken imzaları gösterme\n" -#: src/lang.c:1891 +#: src/lang.c:1894 msgid "" "Display uuencoded data as tagged attachments. toggles & sets." msgstr "" "Uuencoded veriyi etiketli ek olarak göster. deÄŸiÅŸtirir & " "ayarlar." -#: src/lang.c:1892 +#: src/lang.c:1895 msgid "Display uue data as an attachment" msgstr "Uue verilerini ek olarak görüntüle" -#: src/lang.c:1893 +#: src/lang.c:1896 msgid "" "# Handling of uuencoded data in the pager\n" "# Possible values are (the default is marked with *):\n" @@ -6262,18 +6260,18 @@ msgstr "" "# 2 = hepsini gizle, 1 gibi fakat uuencoded veri gibi görünen veriler\n" "# etiket satırına küçültülecek.\n" -#: src/lang.c:1903 +#: src/lang.c:1906 msgid "" "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "" "Alman stili TeX noktalama kodlarını ISO'ya çöz. deÄŸiÅŸtirir & " "ayarlar." -#: src/lang.c:1904 +#: src/lang.c:1907 msgid "Display \"a as Umlaut-a" msgstr "\"a karaklerlerini noktalı a olarak göster" -#: src/lang.c:1905 +#: src/lang.c:1908 msgid "" "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" @@ -6281,15 +6279,15 @@ msgstr "" "# EÄŸer AÇIK ise Alman stili TeX noktalama kodlarını ISO'ya çevir\n" "# ve \"a'yı noktalı a, vb. ÅŸekilde göster\n" -#: src/lang.c:1910 src/lang.c:1920 +#: src/lang.c:1913 src/lang.c:1923 msgid "Space separated list of header fields" msgstr "BoÅŸluk ile ayrılmış baÅŸlık alanları listesi" -#: src/lang.c:1911 +#: src/lang.c:1914 msgid "Display these header fields (or *)" msgstr "Åžu baÅŸlık alanlarını göster (ya da *)" -#: src/lang.c:1912 +#: src/lang.c:1915 msgid "" "# Which news headers you wish to see. If you want to see _all_ the headers,\n" "# place an '*' as this value. This is the only way a wildcard can be used.\n" @@ -6308,11 +6306,11 @@ msgstr "" "listeleyebilirsiniz.\n" "# Hiçbir ÅŸey belirtmezseniz bu özellik kapanır.\n" -#: src/lang.c:1921 +#: src/lang.c:1924 msgid "Do not display these header fields" msgstr "Bu üst bilgi alanlarını gösterme" -#: src/lang.c:1922 +#: src/lang.c:1925 msgid "" "# Same as 'news_headers_to_display' except it denotes the opposite.\n" "# An example of using both options might be if you thought X- headers were\n" @@ -6331,48 +6329,48 @@ msgstr "" "# news_headers_to_not_display=X-Alan X-Pape\n" "# Hiçbir ÅŸey belirtmezseniz bu özellik kapanır.\n" -#: src/lang.c:1932 +#: src/lang.c:1935 msgid "" "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "" "multipart/alternative makalelerin otomatik iÅŸlenmesini etkinleÅŸtirmek " "istiyor musunuz?" -#: src/lang.c:1933 +#: src/lang.c:1936 msgid "Skip multipart/alternative parts" msgstr "multipart/alternative bölümleri atla" -#: src/lang.c:1934 +#: src/lang.c:1937 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "# EÄŸer AÇIK ise multipart/alternative iletileri otomatik olarak kırp\n" -#: src/lang.c:1938 +#: src/lang.c:1941 msgid "Enable detection of verbatim blocks? toggles & sets." msgstr "" "Birebir aynı blokların algılanmasını etkinleÅŸtir. deÄŸiÅŸtirir & " "ayarlar." -#: src/lang.c:1939 +#: src/lang.c:1942 msgid "Detection of verbatim blocks" msgstr "Birebir aynı blokların algılanması" -#: src/lang.c:1940 +#: src/lang.c:1943 msgid "# If ON detect verbatim blocks in articles\n" msgstr "" "# EÄŸer AÇIK ise makalelerde birebir aynı blokların algılanmasını " "etkinleÅŸtir\n" -#: src/lang.c:1945 +#: src/lang.c:1948 msgid "A regex used to decide which lines to show in col_quote." msgstr "" "Hangi satırların col_quote içinde gösterileceÄŸine karar vermek için regex " "kullanıldı." -#: src/lang.c:1946 +#: src/lang.c:1949 msgid "Regex used to show quoted lines" msgstr "Alıntılanmış satırları göstermek için regex kullanıldı" -#: src/lang.c:1947 +#: src/lang.c:1950 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" @@ -6383,17 +6381,17 @@ msgstr "" "col_quote içerisinde gösteriliyor.\n" "# EÄŸer bunu boÅŸ bırakırsanız, tin yerleÅŸik varsayılanı kullanacak.\n" -#: src/lang.c:1953 +#: src/lang.c:1956 msgid "A regex used to decide which lines to show in col_quote2." msgstr "" "Hangi satırların col_quote2 içinde gösterileceÄŸine karar vermek için regex " "kullanıldı." -#: src/lang.c:1954 +#: src/lang.c:1957 msgid "Regex used to show twice quoted l." msgstr "Ä°ki kere alıntılanan dil için kullanılan regex." -#: src/lang.c:1955 +#: src/lang.c:1958 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" @@ -6404,17 +6402,17 @@ msgstr "" "içerisinde gösteriliyor.\n" "# EÄŸer bunu boÅŸ bırakırsanız, tin yerleÅŸik varsayılanı kullanacak.\n" -#: src/lang.c:1961 +#: src/lang.c:1964 msgid "A regex used to decide which lines to show in col_quote3." msgstr "" "Hangi satırların col_quote3 içinde gösterileceÄŸine karar vermek için regex " "kullanıldı." -#: src/lang.c:1962 +#: src/lang.c:1965 msgid "Regex used to show >= 3 times q.l." msgstr "3 kere ya da daha fazla kullanılan sorgu dili için kullanılan regex." -#: src/lang.c:1963 +#: src/lang.c:1966 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" @@ -6426,33 +6424,33 @@ msgstr "" "gösteriliyor.\n" "# EÄŸer bunu boÅŸ bırakırsanız, tin yerleÅŸik varsayılanı kullanacak.\n" -#: src/lang.c:1969 +#: src/lang.c:1972 msgid "Enable detection of external quotes? toggles & sets." msgstr "" "Harici alıntılar için algılamayı etkinleÅŸtir? deÄŸiÅŸtirir & " "ayarlar." -#: src/lang.c:1970 +#: src/lang.c:1973 msgid "Detection of external quotes" msgstr "Harici alıntılar algılandı" -#: src/lang.c:1971 +#: src/lang.c:1974 msgid "# If ON detect quoted text from external sources in articles\n" msgstr "" "# EÄŸer AÇIK ise makaledeki harici kaynaklardan alıntılanmış metinleri " "algıla\n" -#: src/lang.c:1975 +#: src/lang.c:1978 msgid "A regex used to decide which lines to show in col_extquote." msgstr "" "Hangi satırların col_extquote içinde gösterileceÄŸine karar vermek için regex " "kullanıldı." -#: src/lang.c:1976 +#: src/lang.c:1979 msgid "Regex used to show quotes from external sources" msgstr "Harici kaynaklardan alıntıları göstermek için regex kullanıldı" -#: src/lang.c:1977 +#: src/lang.c:1980 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# external quotes. Text from external quotes is shown in col_extquote.\n" @@ -6463,17 +6461,17 @@ msgstr "" "içinde gösteriliyor.\n" "# EÄŸer bunu boÅŸ bırakırsanız, tin yerleÅŸik varsayılanı kullanacak.\n" -#: src/lang.c:1984 +#: src/lang.c:1987 msgid "A regex used to decide which words to show in col_markslashes." msgstr "" "Hangi kelimelerin col_markslashes içinde gösterileceÄŸine karar vermek için " "regex kullanıldı." -#: src/lang.c:1985 +#: src/lang.c:1988 msgid "Regex used to highlight /slashes/" msgstr "/taksimleri/ vurgulamak için regex kullanıldı" -#: src/lang.c:1986 +#: src/lang.c:1989 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '/' are to be shown in col_markslashes.\n" @@ -6484,17 +6482,17 @@ msgstr "" "# gösterileceÄŸine karar vermek için kullanacağı düzenli ifade\n" "# EÄŸer bunu boÅŸ bırakırsanız, tin yerleÅŸik varsayılanı kullanacak.\n" -#: src/lang.c:1992 +#: src/lang.c:1995 msgid "A regex used to decide which words to show in col_markstars." msgstr "" "Hangi kelimelerin col_markstars içinde gösterileceÄŸine karar vermek için " "regex kullanıldı." -#: src/lang.c:1993 +#: src/lang.c:1996 msgid "Regex used to highlight *stars*" msgstr "*yıldızları* vurgulamak için regex kullanıldı" -#: src/lang.c:1994 +#: src/lang.c:1997 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '*' are to be shown in col_markstars.\n" @@ -6504,17 +6502,17 @@ msgstr "" "# gösterileceÄŸine karar vermek için kullanacağı düzenli ifade\n" "# EÄŸer bunu boÅŸ bırakırsanız, tin yerleÅŸik varsayılanı kullanacak.\n" -#: src/lang.c:2000 +#: src/lang.c:2003 msgid "A regex used to decide which words to show in col_markstroke." msgstr "" "Hangi kelimelerin col_markstroke içinde gösterileceÄŸine karar vermek için " "regex kullanıldı." -#: src/lang.c:2001 +#: src/lang.c:2004 msgid "Regex used to highlight -strokes-" msgstr "-vuruÅŸ- ile vurgulama regex'i" -#: src/lang.c:2002 +#: src/lang.c:2005 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '-' are to be shown in col_markstroke.\n" @@ -6524,17 +6522,17 @@ msgstr "" "# gösterileceÄŸine karar vermek için kullanacağı düzenli ifade\n" "# EÄŸer bunu boÅŸ bırakırsanız, tin yerleÅŸik varsayılanı kullanacak.\n" -#: src/lang.c:2008 +#: src/lang.c:2011 msgid "A regex used to decide which words to show in col_markdash." msgstr "" "Hangi kelimelerin col_markdash içinde kullanılacağına karar vermek için " "regex kullanıldı." -#: src/lang.c:2009 +#: src/lang.c:2012 msgid "Regex used to highlight _underline_" msgstr "_alt çizgiyi_ vurgulamak için regex kullanıldı" -#: src/lang.c:2010 +#: src/lang.c:2013 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '_' are to be shown in col_markdash.\n" @@ -6544,17 +6542,17 @@ msgstr "" "# gösterileceÄŸine karar vermek için kullanacağı düzenli ifade\n" "# EÄŸer bunu boÅŸ bırakırsanız, tin yerleÅŸik varsayılanı kullanacak.\n" -#: src/lang.c:2016 +#: src/lang.c:2019 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "" "Çıkartılacak konu öneklerini bulmak için regex kullanıldı. \"|\" ayırıcı " "olarak kullan." -#: src/lang.c:2017 +#: src/lang.c:2020 msgid "Regex with Subject prefixes" msgstr "Konu önekleriyle regex" -#: src/lang.c:2018 +#: src/lang.c:2021 msgid "" "# A regular expression that tin will use to find Subject prefixes\n" "# which will be removed before showing the header.\n" @@ -6562,17 +6560,17 @@ msgstr "" "# Tin'in hangi konu öneklerinin baÅŸlık gösterilmeden önce\n" "# kaldırılacağını bulmak için kullanacağı düzenli ifade.\n" -#: src/lang.c:2023 +#: src/lang.c:2026 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "" "Çıkartılacak konu soneklerini bulmak için regex kullanıldı. \"|\" ayırıcı " "olarak kullan." -#: src/lang.c:2024 +#: src/lang.c:2027 msgid "Regex with Subject suffixes" msgstr "Konu sonekleriyle regex" -#: src/lang.c:2025 +#: src/lang.c:2028 msgid "" "# A regular expression that tin will use to find Subject suffixes\n" "# which will be removed when replying or posting followup.\n" @@ -6580,15 +6578,15 @@ msgstr "" "# Tin'in hangi konu soneklerinin takip edeni cevaplarken ya da gönderirken\n" "# kaldırılacağını bulmak için kullanacağı düzenli ifade.\n" -#: src/lang.c:2030 +#: src/lang.c:2033 msgid "A regex used to find the begin of a verbatim block." msgstr "BloÄŸun birebir aynısının baÅŸlangıcını bulmak için regex kullanıldı." -#: src/lang.c:2031 +#: src/lang.c:2034 msgid "Regex for begin of a verbatim block" msgstr "BloÄŸun birebir aynısının baÅŸlangıcı için regex" -#: src/lang.c:2032 +#: src/lang.c:2035 msgid "" "# A regular expression that tin will use to find the begin of\n" "# a verbatim block.\n" @@ -6596,15 +6594,15 @@ msgstr "" "# Tin'in bloÄŸun birebir aynısının baÅŸlangıcını bulmak için\n" "# kullanacağı düzenli ifade.\n" -#: src/lang.c:2037 +#: src/lang.c:2040 msgid "A regex used to find the end of a verbatim block." msgstr "BloÄŸun birebir aynısının sonunu bulmak için regex kullanıldı." -#: src/lang.c:2038 +#: src/lang.c:2041 msgid "Regex for end of a verbatim block" msgstr "BloÄŸun birebir aynısının sonu için regex" -#: src/lang.c:2039 +#: src/lang.c:2042 msgid "" "# A regular expression that tin will use to find the end of\n" "# a verbatim block.\n" @@ -6612,7 +6610,7 @@ msgstr "" "# Tin'in bloÄŸun birebir aynısının sonunu bulmak için\n" "# kullanacağı düzenli ifade.\n" -#: src/lang.c:2044 +#: src/lang.c:2047 msgid "" "Enter name and options for external MIME viewer, --internal for built-in " "viewer" @@ -6620,15 +6618,16 @@ msgstr "" "Harici MIME görüntüleyici için isim ve seçenek girin, --internal for built-" "in viewer" -#: src/lang.c:2045 +#: src/lang.c:2048 msgid "MIME binary content viewer" msgstr "MIME ikili deÄŸeri içerik görüntüleyicisi" -#: src/lang.c:2046 +#: src/lang.c:2049 +#, fuzzy 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 " +"# Otherwise specify an external viewer program (eg. metamail) or leave " "blank\n" "# for no automatic viewing\n" msgstr "" @@ -6637,15 +6636,15 @@ msgstr "" "# Aksi takdirde harici görüntüleme programı (örn. metamail) belirtin ya da\n" "# otomatik görüntüleme istemiyorsanız boÅŸ bırakın\n" -#: src/lang.c:2053 +#: src/lang.c:2056 msgid "Confirm before starting non-text viewing program" msgstr "Metin olmayan görüntüleme programını baÅŸlatmadan önce onaylayın" -#: src/lang.c:2054 +#: src/lang.c:2057 msgid "Ask before using MIME viewer" msgstr "MIME görüntüleyiciyi kullanmadan önce sor" -#: src/lang.c:2055 +#: src/lang.c:2058 msgid "" "# If ON tin will ask before using metamail to display MIME messages\n" "# this only happens if metamail_prog is set to something\n" @@ -6654,93 +6653,93 @@ msgstr "" "önce soracak\n" "# bu sadece metamail_prog bir ÅŸeye ayarlı ise olur\n" -#: src/lang.c:2060 +#: src/lang.c:2063 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "" "Grupları kapatırken iÅŸaretlemek için sor. deÄŸiÅŸtirir & ayarlar." -#: src/lang.c:2061 +#: src/lang.c:2064 msgid "Catchup read groups when quitting" msgstr "Çıkmadan okunan gruplar yakalansın mı" -#: src/lang.c:2062 +#: src/lang.c:2065 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "" "# EÄŸer AÇIK ise kullanıcıya okuma gruplarının tamamının okunmuÅŸ olarak " "iÅŸaretlenmesini sor\n" -#: src/lang.c:2067 +#: src/lang.c:2070 msgid "Catchup group using left key" msgstr "Sol tuÅŸ ile grubu yakala" -#: src/lang.c:2068 +#: src/lang.c:2071 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "# EÄŸer AÇIKSA gruptan/zincirden sol ok tuÅŸ ile ayrılırken yakala.\n" -#: src/lang.c:2073 +#: src/lang.c:2076 msgid "Catchup thread by using left key" msgstr "Makaleyi sol tuÅŸ ile yakala" -#: src/lang.c:2079 +#: src/lang.c:2082 msgid "Which actions require confirmation" msgstr "Hangi eylemler onay gerektiriyor" -#: src/lang.c:2080 +#: src/lang.c:2083 msgid "# What should we ask confirmation for.\n" msgstr "# Onay için ne sormalıyız.\n" -#: src/lang.c:2085 +#: src/lang.c:2088 msgid "'Mark as (un)read' ignores tags" msgstr "'Okun(ma)muÅŸ olarak iÅŸaretle' etiketleri yoksayar" -#: src/lang.c:2086 +#: src/lang.c:2089 msgid "" "# If ON the 'Mark as (un)read' function marks only the current article.\n" msgstr "" "# EÄŸer AÇIK durumundaysa 'makaleyi okunmuÅŸ/okunmamış olarak iÅŸaretle' iÅŸlevi " "sadece mevcut makale için geçerlidir.\n" -#: src/lang.c:2090 +#: src/lang.c:2093 msgid "Program to run to open URLs, sets, cancels." msgstr "URL açmak için çalıştırılacak program, ayarlar, iptal eder." -#: src/lang.c:2091 +#: src/lang.c:2094 msgid "Program that opens URLs" msgstr "URL'leri açan program" -#: src/lang.c:2092 +#: src/lang.c:2095 msgid "# The program used to open URLs. The actual URL will be appended\n" msgstr "# Program URL açıyordu. Asıl URL'ler sona eklenecek\n" -#: src/lang.c:2097 +#: src/lang.c:2100 msgid "Use mouse in xterm" msgstr "xterm'de fare kullan" -#: src/lang.c:2098 +#: src/lang.c:2101 msgid "# If ON enable mouse button support on xterm terminals\n" msgstr "" "# EÄŸer AÇIK durumundaysa xtrem uçbirimlerini destekleyen fare tuÅŸunu " "etkinleÅŸtir.\n" -#: src/lang.c:2104 +#: src/lang.c:2107 msgid "Use scroll keys on keypad" msgstr "TuÅŸ takımındaki ok tuÅŸlarını kullan" -#: src/lang.c:2105 +#: src/lang.c:2108 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "" "# EÄŸer AÇIK durumunduysa uçbirimler tarafından desteklenen kaydırma " "tuÅŸlarını etkinleÅŸtir\n" -#: src/lang.c:2110 +#: src/lang.c:2113 msgid "Enter maximum number of article to get. sets." msgstr "En fazla alınacak makalenin sayısını yazın. ayarlar. " -#: src/lang.c:2111 +#: src/lang.c:2114 msgid "Number of articles to get" msgstr "Alınacak makale sayısı" -#: src/lang.c:2112 +#: src/lang.c:2115 msgid "" "# Number of articles to get (0=no limit), if negative sets maximum number\n" "# of already read articles to be read before first unread one\n" @@ -6749,30 +6748,30 @@ msgstr "" "okunmamıştan öncce\n" "# ÅŸu anki mevcut okunan makale sayısı okunur\n" -#: src/lang.c:2117 +#: src/lang.c:2120 msgid "Enter number of days article is considered recent. sets." msgstr "Makalenin yeni sayılacağı gün sayısını yazın. ayarlar." -#: src/lang.c:2118 +#: src/lang.c:2121 msgid "Article recentness time limit" msgstr "Makalenin yenilik zaman sınırı" -#: src/lang.c:2119 +#: src/lang.c:2122 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "# Makalenin yeni sayıldığı gün sayısı, (0=KAPALI)\n" -#: src/lang.c:2123 +#: src/lang.c:2126 msgid "" "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "" "WILDMAT normal joker karakterler, REGEX tam düzenli ifade eÅŸleÅŸtirmeleri " "içindir." -#: src/lang.c:2124 +#: src/lang.c:2127 msgid "Wildcard matching" msgstr "Joker karakterler eÅŸleÅŸtiriyor" -#: src/lang.c:2125 +#: src/lang.c:2128 msgid "" "# Wildcard matching\n" "# Possible values are (the default is marked with *):\n" @@ -6784,62 +6783,62 @@ msgstr "" "# * 0 = wildmat\n" "# 1 = regex\n" -#: src/lang.c:2132 +#: src/lang.c:2135 msgid "Enter minimal score before an article is marked killed. sets." msgstr "" "Makale yok et olarak iÅŸaretlenmeden önce minimal skoru yazın. ayarlar." -#: src/lang.c:2133 +#: src/lang.c:2136 msgid "Score limit (kill)" msgstr "Skor sınırı (yok et)" -#: src/lang.c:2134 +#: src/lang.c:2137 msgid "# Score limit before an article is marked killed\n" msgstr "# Makale yok et olarak iÅŸaretlenmeden önceki skor sınırı\n" -#: src/lang.c:2138 +#: src/lang.c:2141 msgid "Enter default score to kill articles. sets." msgstr "Makaleleri yok etmek için varsayılan skoru yazın. ayarlar." -#: src/lang.c:2139 +#: src/lang.c:2142 msgid "Default score to kill articles" msgstr "Makaleleri yok etmek için öntanımlı skor" -#: src/lang.c:2140 +#: src/lang.c:2143 msgid "# Default score to kill articles\n" msgstr "# Makaleleri yok etmek için öntanımlı skor\n" -#: src/lang.c:2144 +#: src/lang.c:2147 msgid "Enter minimal score before an article is marked hot. sets." msgstr "" "Makale sıcak olarak iÅŸaretlenmeden önce gereken en az skoru yazın. " "ayarlar." -#: src/lang.c:2145 +#: src/lang.c:2148 msgid "Score limit (select)" msgstr "Skor sınırı (seç) :" -#: src/lang.c:2146 +#: src/lang.c:2149 msgid "# Score limit before an article is marked hot\n" msgstr "# Makale sıcak olarak iÅŸaretlenmeden önceki skor sınırı\n" -#: src/lang.c:2150 +#: src/lang.c:2153 msgid "Enter default score to select articles. sets." msgstr "Makaleleri seçmek için öntanımlı skoru yazın. ayarlar." -#: src/lang.c:2151 +#: src/lang.c:2154 msgid "Default score to select articles" msgstr "Makaleleri seçmek için öntanımlı skor" -#: src/lang.c:2152 +#: src/lang.c:2155 msgid "# Default score to select articles\n" msgstr "# Makaleleri seçmek için öntanımlı skor\n" -#: src/lang.c:2158 +#: src/lang.c:2161 msgid "Use slrnface to show ''X-Face:''s" msgstr " ''X-Face:''leri göstermek için slmface kullan" -#: src/lang.c:2159 +#: src/lang.c:2162 msgid "" "# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n" "# Only useful when running in an xterm.\n" @@ -6848,19 +6847,19 @@ msgstr "" "kullanılır.\n" "# Sadece xterm'de çalışırken faydalı.\n" -#: src/lang.c:2167 +#: src/lang.c:2170 msgid "Use ANSI color" msgstr "ANSI renk kullan" -#: src/lang.c:2168 +#: src/lang.c:2171 msgid "# If ON using ANSI-color\n" msgstr "# EÄŸer AÇIK durumundaysa ANSI-renk kullanılıyor\n" -#: src/lang.c:2173 +#: src/lang.c:2176 msgid "Standard foreground color" msgstr "Standart önplan rengi" -#: src/lang.c:2174 +#: src/lang.c:2177 msgid "" "# Standard foreground color\n" "# Default: -1 (default color)\n" @@ -6868,11 +6867,11 @@ msgstr "" "# Standart önplan rengi\n" "# Öntanımlı: -1 (varsayılan renk)\n" -#: src/lang.c:2180 +#: src/lang.c:2183 msgid "Standard background color" msgstr "Standart arkaplan rengi" -#: src/lang.c:2181 +#: src/lang.c:2184 msgid "" "# Standard background color\n" "# Default: -1 (default color)\n" @@ -6880,11 +6879,11 @@ msgstr "" "# Standart arkaplan rengi\n" "# Öntanımlı: -1 (öntanımlı renk)\n" -#: src/lang.c:2187 +#: src/lang.c:2190 msgid "Color for inverse text (background)" msgstr "Ters metin için renk (arkaplan)" -#: src/lang.c:2188 +#: src/lang.c:2191 msgid "" "# Color of background for inverse text\n" "# Default: 4 (blue)\n" @@ -6892,11 +6891,11 @@ msgstr "" "# Ters metin için arkaplan rengi\n" "# Öntanımlı: 4 (mavi)\n" -#: src/lang.c:2194 +#: src/lang.c:2197 msgid "Color for inverse text (foreground)" msgstr "Ters metin için renk (önplan)" -#: src/lang.c:2195 +#: src/lang.c:2198 msgid "" "# Color of foreground for inverse text\n" "# Default: 7 (white)\n" @@ -6904,11 +6903,11 @@ msgstr "" "# Ters çerilmiÅŸ metin için önplan rengi\n" "# Öntanımlı: 7 (beyaz)\n" -#: src/lang.c:2201 +#: src/lang.c:2204 msgid "Color of text lines" msgstr "Metin satırları için renk" -#: src/lang.c:2202 +#: src/lang.c:2205 msgid "" "# Color of text lines\n" "# Default: -1 (default color)\n" @@ -6916,11 +6915,11 @@ msgstr "" "# Metin satırlarının renkleri\n" "# Varsayılan: -1 (varsayılan renk)\n" -#: src/lang.c:2208 +#: src/lang.c:2211 msgid "Color of mini help menu" msgstr "Küçük yardım menüsü için renk" -#: src/lang.c:2209 +#: src/lang.c:2212 msgid "" "# Color of mini help menu\n" "# Default: 3 (brown)\n" @@ -6928,11 +6927,11 @@ msgstr "" "# Küçük yardım menüsü için renk\n" "# Öntanımlı: 3 (kahverengi)\n" -#: src/lang.c:2215 +#: src/lang.c:2218 msgid "Color of help text" msgstr "Yardım metinleri için renk" -#: src/lang.c:2216 +#: src/lang.c:2219 msgid "" "# Color of help pages\n" "# Default: -1 (default color)\n" @@ -6940,11 +6939,11 @@ msgstr "" "# Yardım sayfalarının renkleri\n" "# Varsayılan: -1 (varsayılan renk)\n" -#: src/lang.c:2222 +#: src/lang.c:2225 msgid "Color of status messages" msgstr "Durum mesajları için renk" -#: src/lang.c:2223 +#: src/lang.c:2226 msgid "" "# Color of messages in last line\n" "# Default: 6 (cyan)\n" @@ -6952,11 +6951,11 @@ msgstr "" "# Son satırdaki iletilerin rengi\n" "# Öntanımlı: 6 (cam göbeÄŸi)\n" -#: src/lang.c:2229 +#: src/lang.c:2232 msgid "Color of quoted lines" msgstr "Alıntılanmış satırların rengi" -#: src/lang.c:2230 +#: src/lang.c:2233 msgid "" "# Color of quote-lines\n" "# Default: 2 (green)\n" @@ -6964,11 +6963,11 @@ msgstr "" "# Alıntılanmış satır rengi\n" "# Öntanımlı: 2 (yeÅŸil)\n" -#: src/lang.c:2236 +#: src/lang.c:2239 msgid "Color of twice quoted line" msgstr "Ä°ki kez alıntılanan satırların rengi" -#: src/lang.c:2237 +#: src/lang.c:2240 msgid "" "# Color of twice quoted lines\n" "# Default: 3 (brown)\n" @@ -6976,32 +6975,32 @@ msgstr "" "# Ä°ki kez alıntılanan satırların rengi\n" "# Öntanımı: 3 (kahverengi)\n" -#: src/lang.c:2243 +#: src/lang.c:2246 msgid "Color of =>3 times quoted line" msgstr "3 ya da daha fazla alıntılanan satırların rengi" -#: src/lang.c:2244 +#: src/lang.c:2247 msgid "" "# Color of >=3 times quoted lines\n" "# Default: 4 (blue)\n" msgstr "" "# 3 ya da daha fazla alıntılanan satırların rengi# Öntanımlı: 4 (mavi)\n" -#: src/lang.c:2250 +#: src/lang.c:2253 msgid "Color of article header lines" msgstr "Makale üst bilgi satırlarının rengi" -#: src/lang.c:2251 +#: src/lang.c:2254 msgid "" "# Color of header-lines\n" "# Default: 2 (green)\n" msgstr "# Makale üst bilgi satırlarının rengi# Öntanımlı: 2 (yeÅŸil)\n" -#: src/lang.c:2257 +#: src/lang.c:2260 msgid "Color of actual news header fields" msgstr "Mevcut haber üst bilgi alanları için renk" -#: src/lang.c:2258 +#: src/lang.c:2261 msgid "" "# Color of actual news header fields\n" "# Default: 9 (light red)\n" @@ -7009,11 +7008,11 @@ msgstr "" "# Mevcut haber üst bilgi alanları için renk\n" "# Öntanımlı: 9 (açık kırmızı)\n" -#: src/lang.c:2264 +#: src/lang.c:2267 msgid "Color of article subject lines" msgstr "Makale baÅŸlık satırları için renk" -#: src/lang.c:2265 +#: src/lang.c:2268 msgid "" "# Color of article subject\n" "# Default: 6 (cyan)\n" @@ -7021,11 +7020,11 @@ msgstr "" "# Makale baÅŸlığı rengi\n" "# Öntanımlı: 6 (camgöbeÄŸi)\n" -#: src/lang.c:2271 +#: src/lang.c:2274 msgid "Color of external quotes" msgstr "Harici alıntıların rengi" -#: src/lang.c:2272 +#: src/lang.c:2275 msgid "" "# Color of quoted text from external sources\n" "# Default: 5 (pink)\n" @@ -7033,11 +7032,11 @@ msgstr "" "# Harici kaynaklardan alıntılanan metnin rengi\n" "# Varsayılan: 5 (pembe)\n" -#: src/lang.c:2278 +#: src/lang.c:2281 msgid "Color of response counter" msgstr "Yanıt sayacı rengi" -#: src/lang.c:2279 +#: src/lang.c:2282 msgid "" "# Color of response counter\n" "# Default: 2 (green)\n" @@ -7045,11 +7044,11 @@ msgstr "" "# Yanıt sayacı rengi\n" "# Öntanımlı: 2 (yeÅŸil)\n" -#: src/lang.c:2285 +#: src/lang.c:2288 msgid "Color of sender (From:)" msgstr "Gönderen rengi (Gönderen:)" -#: src/lang.c:2286 +#: src/lang.c:2289 msgid "" "# Color of sender (From:)\n" "# Default: 2 (green)\n" @@ -7057,11 +7056,11 @@ msgstr "" "# Gönderen rengi (Gönderen:)\n" "# Öntanımlı: 2 (yeÅŸil)\n" -#: src/lang.c:2292 +#: src/lang.c:2295 msgid "Color of help/mail sign" msgstr "Yardım/posta iÅŸaretinin rengi" -#: src/lang.c:2293 +#: src/lang.c:2296 msgid "" "# Color of Help/Mail-Sign\n" "# Default: 4 (blue)\n" @@ -7069,11 +7068,11 @@ msgstr "" "# Yardım/Posta Ä°ÅŸareti rengi\n" "# Öntanımlı: 4 (mavi)\n" -#: src/lang.c:2299 +#: src/lang.c:2302 msgid "Color of signatures" msgstr "Ä°mzaların rengi" -#: src/lang.c:2300 +#: src/lang.c:2303 msgid "" "# Color of signature\n" "# Default: 4 (blue)\n" @@ -7081,11 +7080,11 @@ msgstr "" "# Ä°nzanın rengi\n" "# Öntanımlı: 4 (mavi)\n" -#: src/lang.c:2306 +#: src/lang.c:2309 msgid "Color of highlighted URLs" msgstr "Vurgulanmış URL'lerin rengi" -#: src/lang.c:2307 +#: src/lang.c:2310 msgid "" "# Color of highlighted URLs\n" "# Default: -1 (default color)\n" @@ -7093,11 +7092,11 @@ msgstr "" "# Vurgulanmış URL renkleri\n" "# Default: -1 (varsayılan renk)\n" -#: src/lang.c:2313 +#: src/lang.c:2316 msgid "Color of verbatim blocks" msgstr "Birebir aynı blokların rengi" -#: src/lang.c:2314 +#: src/lang.c:2317 msgid "" "# Color of verbatim blocks\n" "# Default: 5 (pink)\n" @@ -7105,11 +7104,11 @@ msgstr "" "# Birebir aynı blokların rengi\n" "# Varsayılan: 5 (pink)\n" -#: src/lang.c:2320 +#: src/lang.c:2323 msgid "Color of highlighting with *stars*" msgstr "*yıldız* ile vurgulama rengi" -#: src/lang.c:2321 +#: src/lang.c:2324 msgid "" "# Color of word highlighting with *stars*\n" "# Default: 11 (yellow)\n" @@ -7117,11 +7116,11 @@ msgstr "" "# *yıldız* ile kelime vurgulama rengi\n" "# Öntanımlı: 11 (yeÅŸil)\n" -#: src/lang.c:2327 +#: src/lang.c:2330 msgid "Color of highlighting with _dash_" msgstr "_alt çizgi_ ile vurgulama rengi" -#: src/lang.c:2328 +#: src/lang.c:2331 msgid "" "# Color of word highlighting with _dash_\n" "# Default: 13 (light pink)\n" @@ -7129,11 +7128,11 @@ msgstr "" "# _alt çizgi_ ile kelime vurgulama rengi\n" "# Öntanımlı: 13 (açık pembe)\n" -#: src/lang.c:2334 +#: src/lang.c:2337 msgid "Color of highlighting with /slash/" msgstr "/taksim/ ile vurgulama rengi" -#: src/lang.c:2335 +#: src/lang.c:2338 msgid "" "# Color of word highlighting with /slash/\n" "# Default: 14 (light cyan)\n" @@ -7141,11 +7140,11 @@ msgstr "" "# /taksim/ ile kelime vurgulama rengi\n" "# Öntanımlı: 14 (açık camgöbeÄŸi)\n" -#: src/lang.c:2341 +#: src/lang.c:2344 msgid "Color of highlighting with -stroke-" msgstr "-tire- ile vurgulama rengi" -#: src/lang.c:2342 +#: src/lang.c:2345 msgid "" "# Color of word highlighting with -stroke-\n" "# Default: 12 (light blue)\n" @@ -7153,11 +7152,11 @@ msgstr "" "# -vuruÅŸ- ile kelime vurgulama rengi\n" "# Öntanımlı: 14 (açık mavi)\n" -#: src/lang.c:2349 +#: src/lang.c:2352 msgid "Attr. of highlighting with *stars*" msgstr "*yıldız* ile vurgulama özelliÄŸi" -#: src/lang.c:2350 +#: src/lang.c:2353 msgid "" "# Attributes of word highlighting on mono terminals\n" "# Possible values are:\n" @@ -7185,11 +7184,11 @@ msgstr "" "# *yıldızlarla kelime vurgulama özelliÄŸi\n" "# Öntanımlı: 6 (kalın)\n" -#: src/lang.c:2365 +#: src/lang.c:2368 msgid "Attr. of highlighting with _dash_" msgstr "_alt çizgi_ ile vurgulama özelliÄŸi" -#: src/lang.c:2366 +#: src/lang.c:2369 msgid "" "# Attribute of word highlighting with _dash_\n" "# Default: 2 (best highlighting)\n" @@ -7197,11 +7196,11 @@ msgstr "" "# _tire_ ile vurgulanan kelimenin rengi\n" "# Varsayılan: 2 (en iyi vurgu)\n" -#: src/lang.c:2372 +#: src/lang.c:2375 msgid "Attr. of highlighting with /slash/" msgstr "/bölü/ ile vurgulama özelliÄŸi" -#: src/lang.c:2373 +#: src/lang.c:2376 msgid "" "# Attribute of word highlighting with /slash/\n" "# Default: 5 (half bright)\n" @@ -7209,11 +7208,11 @@ msgstr "" "# /taksim/ ile kelime vurgulama özelliÄŸi\n" "# Öntanımlı: 5 (hafif parlak)\n" -#: src/lang.c:2379 +#: src/lang.c:2382 msgid "Attr. of highlighting with -stroke-" msgstr "-tire- ile vurgulama özniteliÄŸi" -#: src/lang.c:2380 +#: src/lang.c:2383 msgid "" "# Attribute of word highlighting with -stroke-\n" "# Default: 3 (reverse video)\n" @@ -7221,27 +7220,27 @@ msgstr "" "# -tire- ile kelime vurgulama özniteliÄŸi\n" "# Öntanımlı: 3 (ters video)\n" -#: src/lang.c:2386 +#: src/lang.c:2389 msgid "URL highlighting in message body" msgstr "Ä°leti gövdesindeki URL vurgulaması" -#: src/lang.c:2387 +#: src/lang.c:2390 msgid "# Enable URL highlighting?\n" msgstr "# URL vurgulamasını etkinleÅŸtir?\n" -#: src/lang.c:2392 +#: src/lang.c:2395 msgid "Word highlighting in message body" msgstr "Ä°leti gövdesinde kelime vurgulama" -#: src/lang.c:2393 +#: src/lang.c:2396 msgid "# Enable word highlighting?\n" msgstr "# Kelime vurgulamasını etkinleÅŸtir?\n" -#: src/lang.c:2398 +#: src/lang.c:2401 msgid "What to display instead of mark" msgstr "Ä°ÅŸaretin yerine ne gösterilecek?" -#: src/lang.c:2399 +#: src/lang.c:2402 msgid "" "# Should the leading and ending stars and dashes also be displayed,\n" "# even when they are highlighting marks?\n" @@ -7257,64 +7256,64 @@ msgstr "" "# 1 = evet, iÅŸareti göster\n" "# * 2 = onların yerine bir boÅŸluk yaz\n" -#: src/lang.c:2408 +#: src/lang.c:2411 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "" "Sayfalayıcıdaki makale satırlarını çevrelemek için sütun mumarasını yazın. " " ayarlar." -#: src/lang.c:2409 +#: src/lang.c:2412 msgid "Page line wrap column" msgstr "Sayfa satırı sütunu çevreliyor" -#: src/lang.c:2410 +#: src/lang.c:2413 msgid "# Wrap article lines at column\n" msgstr "# Sütundaki makale satırlarını çevrele\n" -#: src/lang.c:2415 +#: src/lang.c:2418 msgid "Wrap around threads on next unread" msgstr "Sonraki okunmayanda zincirleri çevrele" -#: src/lang.c:2416 +#: src/lang.c:2419 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "" "# EÄŸer AÇIK durumunduysa sonraki okunmayan makaleyi aramak için zincirleri " "çevrele\n" -#: src/lang.c:2420 +#: src/lang.c:2423 msgid "Enter default mail address (and fullname). sets." msgstr "Öntanımlı e-posta adresini (ve tüm ismi) yaz, ayarlar." -#: src/lang.c:2421 src/lang.c:2931 +#: src/lang.c:2424 src/lang.c:2939 msgid "Mail address (and fullname)" msgstr "E-posta adresi (ve tüm isim)" -#: src/lang.c:2422 +#: src/lang.c:2425 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "" "# Kullanıcının e-posta adresi (ve tüm ismi), yoksa kullanıcıadı@sistem (tüm " "isim)\n" -#: src/lang.c:2427 +#: src/lang.c:2430 msgid "Show empty Followup-To in editor" msgstr "BoÅŸ izleneni düzenleyicide göster" -#: src/lang.c:2428 +#: src/lang.c:2431 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "" "# EÄŸer AÇIK ise makaleyi düzenlerken boÅŸ izlenen üst bilgisini göster\n" -#: src/lang.c:2432 +#: src/lang.c:2435 msgid "" "Enter path/! command/--none to create your default signature. sets." msgstr "" "Öntanımlı imzayı oluÅŸturmak için yol/! komut/--none girin. ayarlar." -#: src/lang.c:2433 +#: src/lang.c:2436 msgid "Create signature from path/command" msgstr "Yoldan/komuttan imza oluÅŸtur" -#: src/lang.c:2434 +#: src/lang.c:2437 #, fuzzy, c-format msgid "" "# Signature path (random sigs)/file to be used when posting/replying\n" @@ -7328,43 +7327,43 @@ msgstr "" "# sigfile=!komut harici komutu imza oluÅŸturmak için çalıştırır\n" "# sigfile=--none imza eklemez\n" -#: src/lang.c:2442 +#: src/lang.c:2445 msgid "" "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "" "Ä°mzayı kendi satırında \"--\" ile baÅŸlat. deÄŸiÅŸtirir & ayarlar." -#: src/lang.c:2443 +#: src/lang.c:2446 msgid "Prepend signature with \"-- \"" msgstr "Ä°mzayı \"--\" ile baÅŸlat" -#: src/lang.c:2444 +#: src/lang.c:2447 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "# EÄŸer AÇIK ise imzayı tire ile baÅŸlat '\\n-- \\n'\n" -#: src/lang.c:2448 +#: src/lang.c:2451 msgid "Add signature when reposting articles. toggles & sets." msgstr "" "Makaleleri yeniden gönderirken imza ekle. deÄŸiÅŸtirir & ayarlar." -#: src/lang.c:2449 +#: src/lang.c:2452 msgid "Add signature when reposting" msgstr "Tekrar gönderirken imza ekle" -#: src/lang.c:2450 +#: src/lang.c:2453 msgid "# If ON add signature to reposted articles\n" msgstr "# EÄŸer AÇIK ise tekrar gönderilmiÅŸ makaleler için imza ekle\n" -#: src/lang.c:2454 +#: src/lang.c:2457 #, c-format msgid "Enter quotation marks, %s or %S for author's initials." msgstr "Yazarın baÅŸlangıçları için, %s ya da %S alıntı iÅŸaretleri gir." -#: src/lang.c:2455 +#: src/lang.c:2458 msgid "Characters used as quote-marks" msgstr "Tırnak iÅŸaretleri olarak kullanılmış karakterler" -#: src/lang.c:2456 +#: src/lang.c:2459 #, c-format msgid "" "# Characters used in quoting to followups and replies.\n" @@ -7373,11 +7372,11 @@ msgstr "" "# Cevaplar ve takipleri alıntılamak için kullanılacak karakter\n" "# '_' ÅŸuna dönüştü ' ', %s, %S yazarın baÅŸlangıçlarıyla deÄŸiÅŸtiriliyor.\n" -#: src/lang.c:2462 +#: src/lang.c:2465 msgid "Quoting behavior" msgstr "Alıntılama davranışı" -#: src/lang.c:2463 +#: src/lang.c:2466 msgid "" "# How quoting should be handled when following up or replying.\n" "# Possible values are (the default is marked with *):\n" @@ -7401,17 +7400,17 @@ msgstr "" "# 6 = Ä°mzaları alıntıla, boÅŸ satırları alıntıla\n" "# 7 = Alıntıları sıkıştır, imzaları alıntıla, boÅŸ satırları alıntıla\n" -#: src/lang.c:2476 src/lang.c:2484 src/lang.c:2490 +#: src/lang.c:2479 src/lang.c:2487 src/lang.c:2493 msgid "" "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "" "%A Adres %D Tarih %F Adres+Ad %G Grup adı %M Ä°leti-KimliÄŸi %N Ad %C Ä°lk Ad" -#: src/lang.c:2477 +#: src/lang.c:2480 msgid "Quote line when following up" msgstr "Takip ederken satırı alıntıla" -#: src/lang.c:2478 +#: src/lang.c:2481 msgid "" "# Format of quote line when mailing/posting/following-up an article\n" "# %A Address %D Date %F Addr+Name %G Groupname %M Message-ID\n" @@ -7422,40 +7421,40 @@ msgstr "" "# %A Adres %D Tarih %F Adres+Ad %G Grupadı %M Ä°leti-KimliÄŸi\n" "# %N Tam Ad %C Ä°lk Ad %I Ä°lk harfler\n" -#: src/lang.c:2485 +#: src/lang.c:2488 msgid "Quote line when cross-posting" msgstr "Çapraz gönderirken satırı alıntıla" -#: src/lang.c:2491 +#: src/lang.c:2494 msgid "Quote line when mailing" msgstr "E-posta gönderirken satırı alıntıla" -#: src/lang.c:2496 +#: src/lang.c:2499 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "" "EÄŸer AÇIK durumdaysa, User-Agent: baÅŸlığı ekler. deÄŸiÅŸtirir & " "ayarlar." -#: src/lang.c:2497 +#: src/lang.c:2500 msgid "Insert 'User-Agent:' header" msgstr "'User-Agent' baÅŸlığı ekle" -#: src/lang.c:2498 +#: src/lang.c:2501 msgid "# If ON include advertising User-Agent: header\n" msgstr "# EÄŸer AÇIK durumdaysa User-Agent: baÅŸlığını içer\n" -#: src/lang.c:2503 +#: src/lang.c:2506 msgid "" "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" "MIME için karakter kümesi adı girin (örn. US-ASCII, ISO-8859-1, EUC-KR), " " ayarlar." -#: src/lang.c:2504 +#: src/lang.c:2507 msgid "MM_CHARSET" msgstr "MM_CHARSET" -#: src/lang.c:2505 +#: src/lang.c:2508 msgid "" "# Charset supported locally which is also used for MIME header and\n" "# Content-Type header.\n" @@ -7473,43 +7472,43 @@ msgstr "" "# haricinde karakter kümeleri gösterilemez kabul edilir ve '?' olarak " "gösterilir.\n" -#: src/lang.c:2515 +#: src/lang.c:2518 msgid "MM_NETWORK_CHARSET" msgstr "MM_NETWORK_CHARSET" -#: src/lang.c:2516 +#: src/lang.c:2519 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "" "Gönderilerde MIME (Content-Type) baÅŸlığı için kullanılan karakter kümesi.\n" -#: src/lang.c:2520 +#: src/lang.c:2523 msgid "" "Enter local charset name (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" "Yerel karakter kümesi adı giriniz (örneÄŸin US-ASCII, ISO-8859-1, EUC-KR), " " ayarlar." -#: src/lang.c:2521 +#: src/lang.c:2524 msgid "MM_LOCAL_CHARSET" msgstr "MM_LOCAL_CHARSET" -#: src/lang.c:2522 +#: src/lang.c:2525 msgid "# Charset supported locally.\n" msgstr "# Karakter kümesi yerel olarak destekleniyor.\n" -#: src/lang.c:2529 +#: src/lang.c:2532 msgid "Mailbox format" msgstr "Mailbox biçimi" -#: src/lang.c:2530 +#: src/lang.c:2533 msgid "# Format of the mailbox.\n" msgstr "# mailbox biçimi.\n" -#: src/lang.c:2535 +#: src/lang.c:2538 msgid "MIME encoding in news messages" msgstr "Haber mesajlarında MIME kodlama" -#: src/lang.c:2536 +#: src/lang.c:2539 msgid "" "# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n" "# for mails and posts, if necessary. QP is efficient for most European\n" @@ -7525,15 +7524,15 @@ msgstr "" "# Anca Base64 çoÄŸu 8bit DoÄŸu Asya, Yunanca ve Rusça gibi çok fazla 8bit\n" "# karaktere sahip olaln karakter kümelerinde daha iyidir.\n" -#: src/lang.c:2544 src/lang.c:2565 +#: src/lang.c:2547 src/lang.c:2568 msgid "Don't change unless you know what you are doing. cancels." msgstr "Ne yaptığını bilmiyorsan deÄŸiÅŸtirme. iptal eder." -#: src/lang.c:2545 +#: src/lang.c:2548 msgid "Use 8bit characters in news headers" msgstr "Haber baÅŸlıklarında 8bit karakterler kullan." -#: src/lang.c:2546 +#: src/lang.c:2549 msgid "" "# If ON, 8bit characters in news headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -7545,32 +7544,32 @@ msgstr "" "# kodlanır. post_mime_encoding deÄŸeri 8bit ise bu deÄŸere bakılmaksızın\n" "# baÅŸlıklardaki 8bit karakterler kodlanır.\n" -#: src/lang.c:2553 +#: src/lang.c:2556 msgid "" "Auto-view post-processed files toggles, sets, cancels." msgstr "" "Sonradan iÅŸlenmiÅŸ dosyaları otomatik olarak göster deÄŸiÅŸtirir, " "ayarlar, iptal eder." -#: src/lang.c:2554 +#: src/lang.c:2557 msgid "View post-processed files" msgstr "sonradan-iÅŸlenmiÅŸ dosyaları göster" -#: src/lang.c:2555 +#: src/lang.c:2558 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "" "# EÄŸer ayarlandıysa, sonradan iÅŸlenmiÅŸ dosyalar bir görüntüleyicide " "açılacaktır\n" -#: src/lang.c:2560 +#: src/lang.c:2563 msgid "MIME encoding in mail messages" msgstr "E-posta iletilerinde MIME kodlama" -#: src/lang.c:2566 +#: src/lang.c:2569 msgid "Use 8bit characters in mail headers" msgstr "E-posta baÅŸlıklarında 8bit karakterler kullan" -#: src/lang.c:2567 +#: src/lang.c:2570 msgid "" "# If ON, 8bit characters in mail headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -7588,11 +7587,11 @@ msgstr "" "# yasaklar. EÄŸer çok önemli bir nedeniniz yoksa bunu AÇIK TUTMAMANI " "önerilir.\n" -#: src/lang.c:2578 +#: src/lang.c:2581 msgid "Strip blanks from ends of lines" msgstr "Satır sonu boÅŸları yok et" -#: src/lang.c:2579 +#: src/lang.c:2582 msgid "" "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" @@ -7600,17 +7599,17 @@ msgstr "" "# EÄŸer AÇIK durumdaysa yavaÅŸ uçbirimde daha hızlı görüntü için boÅŸları yok " "et.\n" -#: src/lang.c:2585 +#: src/lang.c:2588 msgid "If ON, use transliteration. toggles & sets." msgstr "" "EÄŸer AÇIK durumdaysa damga çevirisi kullan. deÄŸiÅŸtirir & " "ayarlar." -#: src/lang.c:2586 +#: src/lang.c:2589 msgid "Transliteration" msgstr "BaÅŸka alfabe ile yazma" -#: src/lang.c:2587 +#: src/lang.c:2590 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" @@ -7621,11 +7620,11 @@ msgstr "" "karakterlerin\n" "# bir ya da birkaçı ile benzetilebilir.\n" -#: src/lang.c:2595 +#: src/lang.c:2598 msgid "Send you a Cc/Bcc automatically" msgstr "kopyasını/gizli kopyasını otomatik olarak kendine gönder" -#: src/lang.c:2596 +#: src/lang.c:2599 msgid "" "# Put your name in the Cc: and/or Bcc: field when mailing an article.\n" "# Possible values are (the default is marked with *):\n" @@ -7641,25 +7640,25 @@ msgstr "" "# 2 = Gizli Bilgi\n" "# 3 = Bilgi ve Gizli Bilgi\n" -#: src/lang.c:2607 +#: src/lang.c:2610 msgid "Hash algorithm for Cancel-Lock/Cancel-Key" msgstr "" -#: src/lang.c:2608 +#: src/lang.c:2611 msgid "" "# Hash algorithm for Cancel-Lock/Cancel-Key (default 'sha1')\n" "# Use 'none' to not generate Cancel-Lock headers.\n" msgstr "" -#: src/lang.c:2614 +#: src/lang.c:2617 msgid "Enter address elements about which you want to be warned. sets." msgstr "Uyarılmak istediÄŸiniz adres bileÅŸenlerini girin. ayarlar." -#: src/lang.c:2615 +#: src/lang.c:2618 msgid "Spamtrap warning address parts" msgstr "Spam tuzağı uyarı adres bölümleri" -#: src/lang.c:2616 +#: src/lang.c:2619 msgid "" "# A comma-delimited list of address-parts you want to be warned\n" "# about when trying to reply by email.\n" @@ -7667,30 +7666,30 @@ msgstr "" "# E-posta ile cevap yazmaya çalışırken\n" "# uyarılmak istediÄŸin virgülle ayrılmış adres bölümleri listesi\n" -#: src/lang.c:2621 +#: src/lang.c:2624 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "" "Bir filtre girdisinin geçerli olacağı varsayılan gün sayısına gir. " "ayarlar." -#: src/lang.c:2622 +#: src/lang.c:2625 msgid "No. of days a filter entry is valid" msgstr "Süzgeç girdisinin geçerli olduÄŸu gün sayısı" -#: src/lang.c:2623 +#: src/lang.c:2626 msgid "# Number of days a short term filter will be active\n" msgstr "# Kısa süreli filtrenin aktif olacağı gün sayısı\n" -#: src/lang.c:2627 +#: src/lang.c:2630 msgid "Add posted articles to filter. toggles & sets." msgstr "" "GönderilmiÅŸ makaleleri süzgece ekle. deÄŸiÅŸtirir & ayarlar." -#: src/lang.c:2628 +#: src/lang.c:2631 msgid "Add posted articles to filter" msgstr "Gönderilen makaleleri süzgece ekle" -#: src/lang.c:2629 +#: src/lang.c:2632 msgid "" "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" @@ -7699,26 +7698,26 @@ msgstr "" "oluÅŸturan\n" "# gönderilmiÅŸ makaleleri ekle\n" -#: src/lang.c:2633 +#: src/lang.c:2636 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "" "makalelerin/e-posta zincirlerinin mailbox biçiminde kaydedileceÄŸi dizin" -#: src/lang.c:2634 +#: src/lang.c:2637 msgid "Mail directory" msgstr "Eposta dizini" -#: src/lang.c:2635 +#: src/lang.c:2638 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "" "# (-m) dizin makaleler/zincirlerin mailbox biçiminde kaydetmek istediÄŸiniz " "dizin\n" -#: src/lang.c:2640 +#: src/lang.c:2643 msgid "Save articles in batch mode (-S)" msgstr "Makaleleri toplu modda kaydet (-S)" -#: src/lang.c:2641 +#: src/lang.c:2644 msgid "" "# If ON articles/threads will be saved in batch mode when save -S\n" "# or mail (-M/-N) is specified on the command line\n" @@ -7726,19 +7725,19 @@ msgstr "" "# EÄŸer AÇIK durumdaysa komut satırından save -S ya da mail (-M/-N)\n" "# belirtilirse makaleler/zincirler toplu kipte kaydedilir\n" -#: src/lang.c:2646 +#: src/lang.c:2649 msgid "The directory where you want articles/threads saved." msgstr "makeleleri/e-pota zincirlerini kaydetmek istediÄŸiniz dizin." -#: src/lang.c:2647 +#: src/lang.c:2650 msgid "Directory to save arts/threads in" msgstr "makaleler/zincirler ÅŸu dizine kaydedilir" -#: src/lang.c:2648 +#: src/lang.c:2651 msgid "# Directory where articles/threads are saved\n" msgstr "# Makalelerin/zincirlerin kaydedildiÄŸi dizin\n" -#: src/lang.c:2652 +#: src/lang.c:2655 msgid "" "Auto save article/thread by Archive-name: header. toggles & " "sets." @@ -7746,11 +7745,11 @@ msgstr "" "Archive-name: baÅŸlığına göre makale/zincirleri otomatik kaydet. " "deÄŸiÅŸtirir & ayarlar." -#: src/lang.c:2653 +#: src/lang.c:2656 msgid "Use Archive-name: header for save" msgstr "Kaydetmek için Archive-name: üst bilgisini kullan" -#: src/lang.c:2654 +#: src/lang.c:2657 msgid "" "# If ON articles/threads with Archive-name: in mail header will\n" "# be automatically saved with the Archive-name & part/patch no.\n" @@ -7758,7 +7757,7 @@ msgstr "" "# EÄŸer AÇIK ise Archive-name: olan baÅŸlık makaleler/zincirler\n" "# otomatik olarak Arcive-name & parti/ek no. ile kaydedilecektir.\n" -#: src/lang.c:2659 +#: src/lang.c:2662 msgid "" "Mark saved articles/threads as read. toggles, sets, " "cancels." @@ -7766,23 +7765,23 @@ msgstr "" "Kaydedilen makale/zincirleri okunmuÅŸ olarak iÅŸaretle. deÄŸiÅŸtirir, " " ayarlar, iptal eder." -#: src/lang.c:2660 +#: src/lang.c:2663 msgid "Mark saved articles/threads as read" msgstr "KaydedilmiÅŸ makaleleri/eposta zincirlerini okunmuÅŸ olarak iÅŸaretle" -#: src/lang.c:2661 +#: src/lang.c:2664 msgid "# If ON mark articles that are saved as read\n" msgstr "# AÇIK durumdaysa okunmuÅŸ olarak kaydedilmiÅŸ makaleleri iÅŸaretle\n" -#: src/lang.c:2665 +#: src/lang.c:2668 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "KaydedilmiÅŸ makaleler için sonradan iÅŸleme uygula (örn. ek çıkartma)." -#: src/lang.c:2666 +#: src/lang.c:2669 msgid "Post process saved articles" msgstr "KaydedilmiÅŸ makaleleri sonradan iÅŸle" -#: src/lang.c:2667 +#: src/lang.c:2670 msgid "" "# Perform post processing (saving binary attachments) from saved articles.\n" "# Possible values are (the default is marked with *):\n" @@ -7796,11 +7795,11 @@ msgstr "" "# 1 = sadece kabuk arÅŸivlerini (shar) çıkart\n" "# 2 = evet\n" -#: src/lang.c:2676 +#: src/lang.c:2679 msgid "Process only unread articles" msgstr "Sadece okunmayan makaleleri iÅŸle" -#: src/lang.c:2677 +#: src/lang.c:2680 msgid "" "# If ON only save/print/pipe/mail unread articles (tagged articles " "excepted)\n" @@ -7808,23 +7807,23 @@ msgstr "" "# EÄŸer AÇIK durumundaysa okunmamış makaleleri sadece kaydet/yazdır/yönlendir/" "postala (etiketlenmiÅŸ makaleler hariç tutulur)\n" -#: src/lang.c:2682 +#: src/lang.c:2685 msgid "Print all or just part of header. toggles & sets." msgstr "" "BaÅŸlığın tümünü ya da bir kısmını yazdır. deÄŸiÅŸtirir & ayarlar." -#: src/lang.c:2683 +#: src/lang.c:2686 msgid "Print all headers when printing" msgstr "Yazdırırken bütün üst bilgileri yazdır" -#: src/lang.c:2684 +#: src/lang.c:2687 msgid "" "# If ON print all of article header otherwise just the important lines\n" msgstr "" "# EÄŸer AÇIK durumundaysa makale baÅŸlığının tümünü deÄŸilse sadece önemli " "olanları yazdır\n" -#: src/lang.c:2688 +#: src/lang.c:2691 msgid "" "The printer program with options that is to be used to print articles/" "threads." @@ -7832,39 +7831,39 @@ msgstr "" "Makaleleri/zincirleri yazdırmak için kullanılacak seçenekleriyle yazıcı " "programı" -#: src/lang.c:2689 +#: src/lang.c:2692 msgid "Printer program with options" msgstr "Seçenekleriyle yazıcı programı" -#: src/lang.c:2690 +#: src/lang.c:2693 msgid "# Print program with parameters used to print articles/threads\n" msgstr "" "# Programı makaleleri/zincirleri yazdırmak için kullanılan parametreleri " "kullanarak yazdır\n" -#: src/lang.c:2696 +#: src/lang.c:2699 msgid "Force redraw after certain commands" msgstr "Belli komutlardan sonra ekrandaki çizimin yenilenmesini zorla" -#: src/lang.c:2697 +#: src/lang.c:2700 msgid "" "# If ON a screen redraw will always be done after certain external commands\n" msgstr "" "# EÄŸer AÇIK durumdaysa ekrandaki çizimin yenilenmesi bazı dış komutlardan " "sonra tamamlanacak\n" -#: src/lang.c:2701 +#: src/lang.c:2704 msgid "" "Start editor with line offset. toggles, sets, cancels." msgstr "" "Satır kaydırarak düzenleciyi baÅŸlat. deÄŸiÅŸtirir, ayarlar, " "iptal eder." -#: src/lang.c:2702 +#: src/lang.c:2705 msgid "Start editor with line offset" msgstr "Düzenleyiciyi satır konumu ile baÅŸlat" -#: src/lang.c:2703 +#: src/lang.c:2706 msgid "" "# If ON editor will be started with cursor offset into the file\n" "# otherwise the cursor will be positioned at the first line\n" @@ -7872,17 +7871,17 @@ msgstr "" "# AÇIK ise düzenleyici imleci dosyadaki kaldığı yerden baÅŸlatacak\n" "# aksi takdirde imleç ilk satırda yer alacak\n" -#: src/lang.c:2708 +#: src/lang.c:2711 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "" "Düzenleyici için %E, dosya adı için %F, satır numarası için %N, ayarlama " "için ." -#: src/lang.c:2709 +#: src/lang.c:2712 msgid "Invocation of your editor" msgstr "Düzenleyicinizin baÅŸlatılması" -#: src/lang.c:2710 +#: src/lang.c:2713 msgid "" "# Format of editor line including parameters\n" "# %E Editor %F Filename %N Linenumber\n" @@ -7890,17 +7889,17 @@ msgstr "" "# Parametrelerde düzenleyici satırı biçimi\n" "# %E Düzenleyici %F Dosya adı %N Satır numarası\n" -#: src/lang.c:2715 +#: src/lang.c:2718 msgid "" "Enter name and options for external-inews, --internal for internal inews" msgstr "" "Harici inews programı için isim ve seçenekler, dahili inews için --internal" -#: src/lang.c:2716 +#: src/lang.c:2719 msgid "External inews" msgstr "Harici inews" -#: src/lang.c:2717 +#: src/lang.c:2720 msgid "" "# If --internal use the built in mini inews for posting via NNTP\n" "# otherwise use an external inews program\n" @@ -7908,18 +7907,18 @@ msgstr "" "# EÄŸer --internal ise NNTP üzerinden göndermek için dahili mini inews\n" "# kullan, aksi takdirde harici inews programı kullan\n" -#: src/lang.c:2721 +#: src/lang.c:2724 msgid "" "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" "Posta gönderici için %M, konu için %S, gönderilen için %T, dosya adı için " "%F, ayarlamak için ." -#: src/lang.c:2722 +#: src/lang.c:2725 msgid "Invocation of your mail command" msgstr "E-posta komutunuzun baÅŸlatılması" -#: src/lang.c:2723 +#: src/lang.c:2726 msgid "" "# Format of mailer line including parameters\n" "# %M Mailer %S Subject %T To %F Filename\n" @@ -7931,11 +7930,11 @@ msgstr "" "# örn. epostacı olarak elm: elm -s \"%S\" \"%T\" < %F\n" "# örn. elm interaktif : elm -i %F -s \"%S\" \"%T\"\n" -#: src/lang.c:2731 +#: src/lang.c:2734 msgid "Use interactive mail reader" msgstr "EtkileÅŸimli posta okuyucusu kullan" -#: src/lang.c:2732 +#: src/lang.c:2735 msgid "" "# Interactive mailreader\n" "# Possible values are (the default is marked with *):\n" @@ -7951,36 +7950,36 @@ msgstr "" "# 2 = etkileÅŸimli eposta okuyucusunu dosyada baÅŸlıklar olmayacak ÅŸekilde " "kullan\n" -#: src/lang.c:2741 +#: src/lang.c:2744 msgid "Remove ~/.article after posting" msgstr "Gönderim sonrası ~/.article dosyasını sil" -#: src/lang.c:2742 +#: src/lang.c:2745 msgid "# If ON remove ~/.article after posting.\n" msgstr "# AÇIK durumundaysa gönderim sonrası ~/.article dosyasını sil.\n" -#: src/lang.c:2748 +#: src/lang.c:2751 msgid "Use UTF-8 graphics (thread tree etc.)" msgstr "UTF-8 grafik kullan (zincir aÄŸacı vb.)" -#: src/lang.c:2749 +#: src/lang.c:2752 msgid "" "# If ON use UTF-8 characters for indicator '->', tree and ellipsis '...'.\n" msgstr "" "# EÄŸer AÇIK ise belirtgeç '->', aÄŸaç ve elips '...' için UTF-8 karakterler " "kullan.\n" -#: src/lang.c:2754 +#: src/lang.c:2757 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "" "Tüm gönderilen makaleler için dosya adı, ayarlar, dosya adı " "yok=kaydetme." -#: src/lang.c:2755 +#: src/lang.c:2758 msgid "Filename for posted articles" msgstr "Gönderilen makaleler için dosya adı" -#: src/lang.c:2756 +#: src/lang.c:2759 msgid "" "# Filename where to keep all postings (default posted)\n" "# If no filename is set then postings will not be saved\n" @@ -7988,39 +7987,39 @@ msgstr "" "# Tüm gönderilerin tutulacağı dosya adı (gönderilmiÅŸ varsayılan)\n" "# Dosya adı ayarlanmazsa hiçbir gönderi kaydedilmeyecek\n" -#: src/lang.c:2761 +#: src/lang.c:2764 msgid "" "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "" "Tüm baÅŸarısız makaleleri ~/dead.articles altında tut. deÄŸiÅŸtirir & " " ayarlar." -#: src/lang.c:2762 +#: src/lang.c:2765 msgid "Keep failed arts in ~/dead.articles" msgstr "BaÅŸarısız makaleleri ~/dead.articles altında tut" -#: src/lang.c:2763 +#: src/lang.c:2766 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "" "# EÄŸer AÇIK ise tüm baÅŸarısız gönderileri ~/dead.articles içinde sakla\n" -#: src/lang.c:2767 +#: src/lang.c:2770 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "Abone olmayan grupları çıkart .newsrc dosyasından çıkart" -#: src/lang.c:2768 +#: src/lang.c:2771 msgid "No unsubscribed groups in newsrc" msgstr "newsrc dosyasında abone olunmayan grup yok" -#: src/lang.c:2769 +#: src/lang.c:2772 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "# EÄŸer AÇIK ise newsrc'den abonelikten çıkılmış grupları çıkart\n" -#: src/lang.c:2774 +#: src/lang.c:2777 msgid "Remove bogus groups from newsrc" msgstr "sahte gruplarını newsrc'den çıkart" -#: src/lang.c:2775 +#: src/lang.c:2778 msgid "" "# What to do with bogus groups in newsrc file\n" "# Possible values are (the default is marked with *):\n" @@ -8034,75 +8033,75 @@ msgstr "" "# 1 = kaldır\n" "# 2 = seçim ekranında D ile vurgula\n" -#: src/lang.c:2784 +#: src/lang.c:2787 msgid "" "Enter number of seconds to wait for a response from the server. sets." msgstr "" "Sunucudan cevap gelene kadar beklenecek saniye miktarını girin. ayarlar." -#: src/lang.c:2785 +#: src/lang.c:2788 msgid "NNTP read timeout in seconds" msgstr "NNTP saniye cinsinden okuma zaman aşımı" -#: src/lang.c:2786 +#: src/lang.c:2789 msgid "" "# Time in seconds to wait for a response from the server (0=no timeout)\n" msgstr "" "# Sunucudan cevap gelmesi için saniye cinsinden beklenen süre (0=zaman aşımı " "yok)\n" -#: src/lang.c:2791 +#: src/lang.c:2794 msgid "Enter number of seconds until active file will be reread. sets." msgstr "" "Aktif dosya tekrar okunana kadar beklenecek saniye miktarını girin. " "ayarlar." -#: src/lang.c:2792 +#: src/lang.c:2795 msgid "Interval in secs to reread active" msgstr "Etkin olanı yeniden okmak için saniye cinsinden zaman aralığı" -#: src/lang.c:2793 +#: src/lang.c:2796 msgid "" "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "" "# Aktif dosyalar tekrar okunurken saniye cinsinden zaman aralığı (0=asla)\n" -#: src/lang.c:2798 +#: src/lang.c:2801 msgid "Reconnect to server automatically" msgstr "Sunucuya otomatik olarak baÄŸlan" -#: src/lang.c:2799 +#: src/lang.c:2802 msgid "" "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "" "# AÇIK konumunda ise baÄŸlantı kesilirse NNTP sunucusuna otomatik olarak " "tekrar baÄŸlan\n" -#: src/lang.c:2803 +#: src/lang.c:2806 msgid "" "Create local copies of NNTP overview files. toggles & sets." msgstr "" "NNTP önizleme dosyalarının yerel kopyalarını yarat. deÄŸiÅŸtirir & " " ayarlar." -#: src/lang.c:2804 +#: src/lang.c:2807 msgid "Cache NNTP overview files locally" msgstr "NNTP önizleme dosyalarını yerel olarak önbellekle" -#: src/lang.c:2805 +#: src/lang.c:2808 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "" "# AÇIK durumundaysa, NNTP önizleme dosyalarının yerel kopyalarını yarat.\n" -#: src/lang.c:2809 src/lang.c:2824 src/lang.c:2844 src/lang.c:2863 +#: src/lang.c:2812 src/lang.c:2827 src/lang.c:2847 src/lang.c:2866 msgid "Enter format string. sets, cancels." msgstr "Biçimleme dizgesini girin. ayarlar, iptal eder." -#: src/lang.c:2810 +#: src/lang.c:2813 msgid "Format string for selection level" msgstr "Seçim seviyesinde formatlama dizgesi" -#: src/lang.c:2811 +#: src/lang.c:2814 msgid "" "# Format string for selection level representation\n" "# Default: %f %n %U %G %d\n" @@ -8127,11 +8126,11 @@ msgstr "" "# %n Sayı, ekrandaki satır sayısı\n" "# %U Okunmamış say\n" -#: src/lang.c:2825 +#: src/lang.c:2828 msgid "Format string for group level" msgstr "Grup seviyesinde biçimleme dizgesi" -#: src/lang.c:2826 +#: src/lang.c:2829 msgid "" "# Format string for group level representation\n" "# Default: %n %m %R %L %s %F\n" @@ -8166,11 +8165,11 @@ msgstr "" "# %s BaÅŸlık (sadece grup seviyesinde)\n" "# %S Skor\n" -#: src/lang.c:2845 +#: src/lang.c:2848 msgid "Format string for thread level" msgstr "E-posta zinciri için dizge biçimi" -#: src/lang.c:2846 +#: src/lang.c:2849 msgid "" "# Format string for thread level representation\n" "# Default: %n %m [%L] %T %F\n" @@ -8203,19 +8202,20 @@ msgstr "" "# %S Skor\n" "# %T Zincir aÄŸacı(sadece zincir seviyesinde)\n" -#: src/lang.c:2864 +#: src/lang.c:2867 msgid "Format string for display of dates" msgstr "Tarihlerin gösterilmesi için dizge biçimi" -#: src/lang.c:2865 +#: src/lang.c:2868 msgid "# Format string for date representation\n" msgstr "# Tarih gösterimi için dizge biçimi\n" -#: src/lang.c:2871 +#: src/lang.c:2878 msgid "Unicode normalization form" msgstr "Unicode normalleÅŸtirme biçimi" -#: src/lang.c:2872 +#: src/lang.c:2879 +#, fuzzy msgid "" "# Unicode normalization form\n" "# Possible values are:\n" @@ -8224,6 +8224,7 @@ msgid "" "# 2 = NFKD\n" "# 3 = NFC\n" "# 4 = NFD\n" +"# 5 = NFKC_CF\n" msgstr "" "# Unicode normalleÅŸtirme biçimi\n" "# Olası deÄŸerler:\n" @@ -8233,19 +8234,19 @@ msgstr "" "# 3 = NFC\n" "# 4 = NFD\n" -#: src/lang.c:2885 +#: src/lang.c:2893 msgid "Render BiDi" msgstr "BiDi gerçekle" -#: src/lang.c:2886 +#: src/lang.c:2894 msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "# EÄŸer AÇIK ise çift yönlü metinler tin tarafından gerçeklenir\n" -#: src/lang.c:2893 +#: src/lang.c:2901 msgid "Function for sorting articles" msgstr "Makaleleri sıralamak için fonksiyon" -#: src/lang.c:2894 +#: src/lang.c:2902 msgid "" "# Function for sorting articles\n" "# Possible values are (the default is marked with *):\n" @@ -8257,197 +8258,197 @@ msgstr "" "# * 0 = qsort\n" "# 1 = heapsort\n" -#: src/lang.c:2907 +#: src/lang.c:2915 msgid "Automatically GroupMarkUnselArtRead" msgstr "Otomatik olarak GroupMarkUnselArtRead" -#: src/lang.c:2913 +#: src/lang.c:2921 msgid "Delete post-process files" msgstr "sonradan-iÅŸlenmiÅŸ dosyaları sil" -#: src/lang.c:2918 +#: src/lang.c:2926 msgid "Filename for all mailed articles, sets, no filename=do not save." msgstr "" "Tüm gönderilen makaleler için dosya adı, ayarlar, dosya adı " "yok=kaydetme." -#: src/lang.c:2919 +#: src/lang.c:2927 msgid "Mailbox to save sent mails" msgstr "GönderilmiÅŸ postaları kaydetmek için posta kutusu" -#: src/lang.c:2924 +#: src/lang.c:2932 msgid "Set Followup-To: header to this group(s). sets, cancels." msgstr "" "Takip-Et: baÅŸlığını bu grup(lar) için ayarla. ayarlar, iptal eder." -#: src/lang.c:2925 +#: src/lang.c:2933 msgid "Followup-To: header" msgstr "Takip-Et: baÅŸlığı" -#: src/lang.c:2930 +#: src/lang.c:2938 msgid "Enter default mail address (and fullname). sets, cancels." msgstr "" "Varsayılan e-posta adresi (ve tüm ismi) girin. ayarlar, iptal " "eder." -#: src/lang.c:2937 +#: src/lang.c:2945 msgid "" "Path and options for ispell-like spell-checker. sets, cancels." msgstr "" "ispell gibi imla kontrol araçları için yol ve seçenekler. ayarlar, " " iptal eder." -#: src/lang.c:2938 +#: src/lang.c:2946 msgid "Ispell program" msgstr "Ispell programı" -#: src/lang.c:2944 +#: src/lang.c:2952 msgid "When group is a mailing list, send responses to this email address." msgstr "Grup bir posta listesi ise, yanıtları bu e-posta adresine yolla." -#: src/lang.c:2945 +#: src/lang.c:2953 msgid "Mailing list address" msgstr "Eposta listesi adresi" -#: src/lang.c:2951 +#: src/lang.c:2959 msgid "Forward articles as attachment" msgstr "Makaleleri ek olarak ilet" -#: src/lang.c:2956 +#: src/lang.c:2964 msgid "" "A comma separated list of MIME major/minor Content-Types. cancels." msgstr "" "Virgülle ayrılmış MIME büyük/küçük Content-Type listesi. iptal eder." -#: src/lang.c:2957 +#: src/lang.c:2965 msgid "Which MIME types will be saved" msgstr "Hangi MIME türleri kaydedilecek" -#: src/lang.c:2962 +#: src/lang.c:2970 msgid "Value of the Organization: header. sets, cancels." msgstr "Organizasyon: baÅŸlığı için deÄŸer. ayarlar, iptal eder." -#: src/lang.c:2963 +#: src/lang.c:2971 msgid "Organization: header" msgstr "Kurum: üst bilgi" -#: src/lang.c:2968 +#: src/lang.c:2976 msgid "Filename for saved articles. sets, cancels." msgstr "KaydedilmiÅŸ makaleler için dosya adı. ayarlar, iptal eder." -#: src/lang.c:2969 +#: src/lang.c:2977 msgid "savefile" msgstr "kayıtdosyası" -#: src/lang.c:2974 src/lang.c:2998 +#: src/lang.c:2982 src/lang.c:3006 msgid "Scope for the filter rule. sets, cancels." msgstr "Filtre kuralının kapsamı. ayarlar, iptal eder." -#: src/lang.c:2975 +#: src/lang.c:2983 msgid "Quick (1 key) select filter scope" msgstr "Hızlı (1 tuÅŸ) filtre alanı seç" -#: src/lang.c:2980 src/lang.c:3004 +#: src/lang.c:2988 src/lang.c:3012 msgid "Header for filter rule. sets, cancels." msgstr "Filtre kuralının üst bilgisi. ayarlar, iptal eder." -#: src/lang.c:2981 +#: src/lang.c:2989 msgid "Quick (1 key) select filter header" msgstr "Filtre üst bilgisi hızlı seçimi (1 tuÅŸ)" -#: src/lang.c:2986 src/lang.c:3010 +#: src/lang.c:2994 src/lang.c:3018 msgid "ON = case sensitive, OFF = ignore case. sets, cancels." msgstr "" "AÇIK = büyük küçük harf duyarlı, KAPALI = büyük küçük harf duyarsız. " "ayarlar, iptal eder." -#: src/lang.c:2987 +#: src/lang.c:2995 msgid "Quick (1 key) select filter case" msgstr "Hızlı filtre durumu seçme (1 tuÅŸ)" -#: src/lang.c:2992 src/lang.c:3016 +#: src/lang.c:3000 src/lang.c:3024 msgid "ON = expire, OFF = don't ever expire. sets, cancels." msgstr "" "AÇIK = süresini doldur, KAPALI = hiçbir zaman süresini doldurma. " "ayarlar, iptal eder." -#: src/lang.c:2993 +#: src/lang.c:3001 msgid "Quick (1 key) select filter expire" msgstr "Hızlı (1 tuÅŸ) filtre bitiÅŸ seçme" -#: src/lang.c:2999 +#: src/lang.c:3007 msgid "Quick (1 key) kill filter scope" msgstr "Hızlı (1 tuÅŸ) filtre alanı öldür" -#: src/lang.c:3005 +#: src/lang.c:3013 msgid "Quick (1 key) kill filter header" msgstr "Hızlı (1 tuÅŸ) filtre baÅŸlığı yok etme" -#: src/lang.c:3011 +#: src/lang.c:3019 msgid "Quick (1 key) kill filter case" msgstr "Hızlı (1 tuÅŸ) filtre durumu öldür" -#: src/lang.c:3017 +#: src/lang.c:3025 msgid "Quick (1 key) kill filter expire" msgstr "Hızlı (1 tuÅŸ) filtre bitiÅŸi öldürme" -#: src/lang.c:3023 +#: src/lang.c:3031 msgid "Assume this charset if no charset declaration is present, to set." msgstr "" "EÄŸer hiçbir karakter kümesi tanımlamamışsa bu karakter kümesini varsay, " "ayarlamak için ." -#: src/lang.c:3024 +#: src/lang.c:3032 msgid "UNDECLARED_CHARSET" msgstr "UNDECLARED_CHARSET" -#: src/lang.c:3030 +#: src/lang.c:3038 msgid "" "Add this text at the start of the message body. sets, cancels." msgstr "Bu metni ileti gövdesinin başına ekle. ayarlar, iptal eder." -#: src/lang.c:3031 +#: src/lang.c:3039 msgid "X_Body" msgstr "X_Body" -#: src/lang.c:3036 +#: src/lang.c:3044 msgid "Insert this header when posting. sets, cancels." msgstr "Bu üst bilgiyi gönderirken ekle. ayarlar, iptal eder." -#: src/lang.c:3037 +#: src/lang.c:3045 msgid "X_Headers" msgstr "X_Headers" -#: src/lang.c:3042 +#: src/lang.c:3050 msgid "" "Automatically insert an X-Comment-To: header? toggles & sets." msgstr "" "X-Comment-To: baÅŸlığını otomatik ekle? deÄŸiÅŸtirir & ayarlar." -#: src/lang.c:3043 +#: src/lang.c:3051 msgid "Insert 'X-Comment-To:' header" msgstr "'X-Comment-To:' üst bilgisi ekle" #. TODO: lang.c -#: src/main.c:801 +#: src/main.c:812 msgid "reading from local spool" msgstr "yerel kuyruktan okunuyor" -#: src/misc.c:3868 +#: src/misc.c:3878 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "Sürüm: %s yayım %s %s (\"%s\") %s %s\n" -#: src/misc.c:3871 +#: src/misc.c:3881 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Sürüm: %s yayım %s %s (\"%s\")\n" -#: src/newsrc.c:453 +#: src/newsrc.c:457 msgid "Unreachable?\n" msgstr "Ulaşılamaz?\n" -#: src/nntplib.c:817 +#: src/nntplib.c:822 #, c-format msgid "" "\n" @@ -8456,29 +8457,29 @@ msgstr "" "\n" "Sunucu zaman aşımına uÄŸradı, tekrar baÄŸlanmaya çalışıyor # %d\n" -#: src/nntplib.c:844 +#: src/nntplib.c:849 msgid "NNTP connection error. Exiting..." msgstr "NNTP sunucusuna baÄŸlantı baÅŸarısız %s. Çıkıyor..." -#: src/nntplib.c:856 src/nntplib.c:1835 +#: src/nntplib.c:861 src/nntplib.c:1852 msgid "Rejoin current group\n" msgstr "Åžu anki gruba tekrar katıl\n" -#: src/nntplib.c:864 src/nntplib.c:1843 +#: src/nntplib.c:869 src/nntplib.c:1860 #, c-format msgid "Read (%s)\n" msgstr "Oku (%s)\n" -#: src/nntplib.c:866 +#: src/nntplib.c:871 #, c-format msgid "Resend last command (%s)\n" msgstr "Son komutu tekrar yolla (%s)\n" -#: src/nntplib.c:1482 +#: src/nntplib.c:1500 msgid "CAPABILITIES did not announce READER" msgstr "CAPABILITIES, READER duyurmadı" -#: src/nntplib.c:1989 +#: src/nntplib.c:2006 msgid "MOTD: " msgstr "MOTD: " @@ -8550,7 +8551,7 @@ msgstr "[- Kullanılamıyor -]" #. * preamble #. * TODO: -> lang.c #. -#: src/rfc2047.c:1308 +#: src/rfc2047.c:1322 #, c-format msgid "" "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" @@ -8634,3 +8635,18 @@ msgstr "Slrnface beklenmedik ÅŸekilde so #, c-format msgid "Slrnface failed: %s." msgstr "Slrnface baÅŸarısız: %s" + +#~ msgid "Active file corrupt - %s" +#~ msgstr "Aktif dosya bozuk- %s" + +#~ msgid "Invalid response to GROUP command, %s" +#~ msgstr "GROUP komutuna geçersiz yanıt, %s" + +#~ msgid "unparseable \"LIST COUNTS\" line: \"%s\"" +#~ msgstr "çözümlenemez \"LIST COUNTS\" satırı: \"%s\"" + +#~ msgid "" +#~ "Wrong newsgroup name (\"%s\") in response of \"GROUP %s\" command: \"%s\"" +#~ msgstr "" +#~ "\"GROUP %s\" komutuna cevap olarak Hatalı haber grubu ismi (\"%s\"): \"%s" +#~ "\"" Binary files tin-2.4.2/po/zh_CN.gmo and tin-2.4.3/po/zh_CN.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.2/po/zh_CN.po tin-2.4.3/po/zh_CN.po --- tin-2.4.2/po/zh_CN.po 2017-12-08 09:39:46.000000000 +0100 +++ tin-2.4.3/po/zh_CN.po 2018-12-24 10:02:05.819003685 +0100 @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 2.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-08 09:39+0100\n" +"POT-Creation-Date: 2018-12-24 10:02+0100\n" "PO-Revision-Date: 2015-08-28 12:21+0800\n" "Last-Translator: Mingye Wang \n" "Language-Team: Chinese (simplified) \n" @@ -20,11 +20,11 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 1.8.4\n" -#: src/attrib.c:954 +#: src/attrib.c:964 msgid "Processing attributes... " msgstr "处ç†å±žæ€§â€¦" -#: src/attrib.c:1176 +#: src/attrib.c:1186 #, c-format msgid "" "# Do not edit this comment block\n" @@ -33,397 +33,397 @@ msgstr "" "# ä¸ç¼–辑这个评论区å—\n" "#\n" -#: src/attrib.c:1177 +#: src/attrib.c:1187 #, c-format msgid "# scope=STRING (eg. alt.*,!alt.bin*) [mandatory]\n" msgstr "# scope=字串 (例如：alt.*,!alt.bin*) [å¿…è¦]\n" -#: src/attrib.c:1178 +#: src/attrib.c:1188 #, c-format msgid "# add_posted_to_filter=ON/OFF\n" msgstr "# add_posted_to_filter=ON/OFF\n" -#: src/attrib.c:1179 +#: src/attrib.c:1189 #, c-format msgid "# advertising=ON/OFF\n" msgstr "# advertising=ON/OFF\n" -#: src/attrib.c:1180 +#: src/attrib.c:1190 #, c-format msgid "# alternative_handling=ON/OFF\n" msgstr "# alternative_handling=ON/OFF\n" -#: src/attrib.c:1181 +#: src/attrib.c:1191 #, c-format msgid "# ask_for_metamail=ON/OFF\n" msgstr "# ask_for_metamail=ON/OFF\n" -#: src/attrib.c:1182 +#: src/attrib.c:1192 #, c-format msgid "# auto_cc_bcc=NUM\n" msgstr "# auto_cc_bcc=æ•°å­—\n" -#: src/attrib.c:1183 +#: src/attrib.c:1193 #, c-format msgid "# 0=No, 1=Cc, 2=Bcc, 3=Cc and Bcc\n" msgstr "# 0=无，1=抄é€ï¼Œ2=密件抄é€ï¼Œ3=抄é€å’Œå¯†ä»¶æŠ„é€\n" -#: src/attrib.c:1184 +#: src/attrib.c:1194 #, c-format msgid "# auto_list_thread=ON/OFF\n" msgstr "# auto_list_thread=ON/OFF\n" -#: src/attrib.c:1185 +#: src/attrib.c:1195 #, c-format msgid "# auto_save=ON/OFF\n" msgstr "# auto_save=ON/OFF\n" -#: src/attrib.c:1186 +#: src/attrib.c:1196 #, c-format msgid "# auto_select=ON/OFF\n" msgstr "# auto_select=ON/OFF\n" -#: src/attrib.c:1187 +#: src/attrib.c:1197 #, c-format msgid "# batch_save=ON/OFF\n" msgstr "# batch_save=ON/OFF\n" -#: src/attrib.c:1188 +#: src/attrib.c:1198 #, c-format msgid "# date_format=STRING (eg. %%a, %%d %%b %%Y %%H:%%M:%%S)\n" msgstr "# date_format=字串 (例如：%%a，%%d %%b %%Y %%H:%%M:%%S)\n" -#: src/attrib.c:1189 +#: src/attrib.c:1199 #, c-format msgid "# delete_tmp_files=ON/OFF\n" msgstr "# delete_tmp_files=ON/OFF\n" -#: src/attrib.c:1190 +#: src/attrib.c:1200 #, c-format msgid "# editor_format=STRING (eg. %%E +%%N %%F)\n" msgstr "# editor_format=字串 (例如：%%E+%%N %%F)\n" -#: src/attrib.c:1191 +#: src/attrib.c:1201 #, c-format msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "# fcc=字串 (例如：=mailbox)\n" -#: src/attrib.c:1192 +#: src/attrib.c:1202 #, c-format msgid "# followup_to=STRING\n" msgstr "# followup_to=字串\n" -#: src/attrib.c:1193 +#: src/attrib.c:1203 #, c-format msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "# from=字串 (仅附加想è¦çš„å‘信者 :-line，ä¸ä½¿ç”¨å¼•è¨€)\n" -#: src/attrib.c:1194 +#: src/attrib.c:1204 #, c-format msgid "# group_catchup_on_exit=ON/OFF\n" msgstr "# group_catchup_on_exit=ON/OFF\n" -#: src/attrib.c:1195 +#: src/attrib.c:1205 #, c-format msgid "# group_format=STRING (eg. %%n %%m %%R %%L %%s %%F)\n" msgstr "# group_format=字串 (例如：%%n %%m %%R %%L %%s %%F)\n" -#: src/attrib.c:1196 +#: src/attrib.c:1206 #, c-format msgid "# mail_8bit_header=ON/OFF\n" msgstr "# mail_8 bit_header=ON/OFF\n" -#: src/attrib.c:1197 +#: src/attrib.c:1207 #, c-format msgid "# mail_mime_encoding=supported_encoding" msgstr "# mail_mime_encoding=supported_encoding" -#: src/attrib.c:1205 +#: src/attrib.c:1215 #, c-format msgid "# ispell=STRING\n" msgstr "# ispell=字串\n" -#: src/attrib.c:1207 +#: src/attrib.c:1217 #, c-format msgid "# maildir=STRING (eg. ~/Mail)\n" msgstr "# maildir=字串 (例如：~/Mail)\n" -#: src/attrib.c:1208 +#: src/attrib.c:1218 #, c-format msgid "# mailing_list=STRING (eg. majordomo@example.org)\n" msgstr "# mailing_list=字串 (例如：majordomo@example.org)\n" -#: src/attrib.c:1209 +#: src/attrib.c:1219 #, c-format msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "# mime_types_to_save=字串 (例如：image/*,!image/bmp)\n" -#: src/attrib.c:1210 +#: src/attrib.c:1220 #, c-format msgid "# mark_ignore_tags=ON/OFF\n" msgstr "# mark_ignore_tags=ON/OFF\n" -#: src/attrib.c:1211 +#: src/attrib.c:1221 #, c-format msgid "# mark_saved_read=ON/OFF\n" msgstr "# mark_saved_read=ON/OFF\n" -#: src/attrib.c:1212 +#: src/attrib.c:1222 #, c-format msgid "# mime_forward=ON/OFF\n" msgstr "# mime_forward=ON/OFF\n" -#: src/attrib.c:1214 +#: src/attrib.c:1224 #, c-format msgid "# mm_network_charset=supported_charset" msgstr "# mm_network_charset=支æŒçš„字符集" -#: src/attrib.c:1221 +#: src/attrib.c:1231 #, c-format msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "# undeclared_charset=字串 (缺çœæ˜¯ US-ASCII)\n" -#: src/attrib.c:1223 +#: src/attrib.c:1233 #, c-format msgid "# news_headers_to_display=STRING\n" msgstr "# news_headers_to_display=字串\n" -#: src/attrib.c:1224 +#: src/attrib.c:1234 #, c-format msgid "# news_headers_to_not_display=STRING\n" msgstr "# news_headers_to_not_display=字串\n" -#: src/attrib.c:1225 +#: src/attrib.c:1235 #, c-format msgid "# news_quote_format=STRING\n" msgstr "# news_quote_format=字串\n" -#: src/attrib.c:1226 +#: src/attrib.c:1236 #, c-format msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "# organization=字串 (如果起始部分与‘/’读å–从文件)\n" -#: src/attrib.c:1227 +#: src/attrib.c:1237 #, c-format msgid "# pos_first_unread=ON/OFF\n" msgstr "# pos_first_unread=ON/OFF\n" -#: src/attrib.c:1228 +#: src/attrib.c:1238 #, c-format msgid "# post_8bit_header=ON/OFF\n" msgstr "# post_8 bit_header=ON/OFF\n" -#: src/attrib.c:1229 +#: src/attrib.c:1239 #, c-format msgid "# post_mime_encoding=supported_encoding" msgstr "# post_mime_encoding=支æŒçš„ç¼–ç " -#: src/attrib.c:1236 +#: src/attrib.c:1246 #, c-format msgid "# post_process_type=NUM\n" msgstr "# post_process_type=æ•°å­—\n" -#: src/attrib.c:1241 +#: src/attrib.c:1251 #, c-format msgid "# post_process_view=ON/OFF\n" msgstr "# post_process_view=ON/OFF\n" -#: src/attrib.c:1242 +#: src/attrib.c:1252 #, c-format msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "# quick_kill_scope=字串 (äº¦å³ talk.*)\n" -#: src/attrib.c:1243 +#: src/attrib.c:1253 #, c-format msgid "# quick_kill_expire=ON/OFF\n" msgstr "# quick_kill_expire=ON/OFF\n" -#: src/attrib.c:1244 +#: src/attrib.c:1254 #, c-format msgid "# quick_kill_case=ON/OFF\n" msgstr "# quick_kill_case=ON/OFF\n" -#: src/attrib.c:1245 +#: src/attrib.c:1255 #, c-format msgid "# quick_kill_header=NUM\n" msgstr "# quick_kill_header=æ•°å­—\n" -#: src/attrib.c:1246 src/attrib.c:1255 +#: src/attrib.c:1256 src/attrib.c:1265 #, c-format msgid "# 0=Subject: (case sensitive) 1=Subject: (ignore case)\n" msgstr "# 0=Subject: (大å°å†™ç›¸ç¬¦) 1=Subject: (忽略大å°å†™)\n" -#: src/attrib.c:1247 src/attrib.c:1256 +#: src/attrib.c:1257 src/attrib.c:1266 #, c-format msgid "# 2=From: (case sensitive) 3=From: (ignore case)\n" msgstr "# 2=From: (大å°å†™ç›¸ç¬¦) 3=From: (忽略大å°å†™)\n" -#: src/attrib.c:1248 src/attrib.c:1257 +#: src/attrib.c:1258 src/attrib.c:1267 #, c-format msgid "# 4=Message-ID: & full References: line\n" msgstr "# 4=Message-ID: & 全部 References: è¡Œ\n" -#: src/attrib.c:1249 src/attrib.c:1258 +#: src/attrib.c:1259 src/attrib.c:1268 #, c-format msgid "# 5=Message-ID: & last References: entry only\n" msgstr "# 5=åªæœ‰ Message-ID: & 最åŽä¸€ç¬” References: æ¡ç›®\n" -#: src/attrib.c:1250 src/attrib.c:1259 +#: src/attrib.c:1260 src/attrib.c:1269 #, c-format msgid "# 6=Message-ID: entry only 7=Lines:\n" msgstr "# 6=åªæœ‰ Message-ID: æ¡ç›® 7=Lines:\n" -#: src/attrib.c:1251 +#: src/attrib.c:1261 #, c-format msgid "# quick_select_scope=STRING\n" msgstr "# quick_select_scope=字串\n" -#: src/attrib.c:1252 +#: src/attrib.c:1262 #, c-format msgid "# quick_select_expire=ON/OFF\n" msgstr "# quick_select_expire=ON/OFF\n" -#: src/attrib.c:1253 +#: src/attrib.c:1263 #, c-format msgid "# quick_select_case=ON/OFF\n" msgstr "# quick_select_case=ON/OFF\n" -#: src/attrib.c:1254 +#: src/attrib.c:1264 #, c-format msgid "# quick_select_header=NUM\n" msgstr "# quick_select_header=æ•°å­—\n" -#: src/attrib.c:1260 +#: src/attrib.c:1270 #, c-format msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "# quote_chars=字串 (%%s，%%S 用于缩写)\n" -#: src/attrib.c:1262 +#: src/attrib.c:1272 #, c-format msgid "# print_header=ON/OFF\n" msgstr "# print_header=ON/OFF\n" -#: src/attrib.c:1264 +#: src/attrib.c:1274 #, c-format msgid "# process_only_unread=ON/OFF\n" msgstr "# process_only_unread=ON/OFF\n" -#: src/attrib.c:1265 +#: src/attrib.c:1275 #, c-format msgid "# prompt_followupto=ON/OFF\n" msgstr "# prompt_followupto=ON/OFF\n" -#: src/attrib.c:1266 +#: src/attrib.c:1276 #, c-format msgid "# savedir=STRING (eg. ~user/News)\n" msgstr "# savedir=字串 (例如：~user/News)\n" -#: src/attrib.c:1267 +#: src/attrib.c:1277 #, c-format msgid "# savefile=STRING (eg. =linux)\n" msgstr "# savefile=字串 (例如：=linux)\n" -#: src/attrib.c:1268 +#: src/attrib.c:1278 #, c-format msgid "# sigfile=STRING (eg. $var/sig)\n" msgstr "# sigfile=字串 (例如：$var/sig)\n" -#: src/attrib.c:1269 +#: src/attrib.c:1279 #, c-format msgid "# show_author=NUM\n" msgstr "# show_author=æ•°å­—\n" -#: src/attrib.c:1275 +#: src/attrib.c:1285 #, c-format msgid "# show_signatures=ON/OFF\n" msgstr "# show_signatures=ON/OFF\n" -#: src/attrib.c:1276 +#: src/attrib.c:1286 #, c-format msgid "# show_only_unread_arts=ON/OFF\n" msgstr "# show_only_unread_arts=ON/OFF\n" -#: src/attrib.c:1277 +#: src/attrib.c:1287 #, c-format msgid "# sigdashes=ON/OFF\n" msgstr "# sigdashes=ON/OFF\n" -#: src/attrib.c:1278 +#: src/attrib.c:1288 #, c-format msgid "# signature_repost=ON/OFF\n" msgstr "# signature_repost=ON/OFF\n" -#: src/attrib.c:1279 +#: src/attrib.c:1289 #, c-format msgid "# sort_article_type=NUM\n" msgstr "# sort_article_type=æ•°å­—\n" -#: src/attrib.c:1297 +#: src/attrib.c:1307 #, c-format msgid "# sort_threads_type=NUM\n" msgstr "# sort_threads_type=æ•°å­—\n" -#: src/attrib.c:1306 +#: src/attrib.c:1316 #, c-format msgid "# start_editor_offset=ON/OFF\n" msgstr "# start_editor_offset=ON/OFF\n" -#: src/attrib.c:1307 +#: src/attrib.c:1317 #, c-format msgid "# tex2iso_conv=ON/OFF\n" msgstr "# tex2iso_conv=ON/OFF\n" -#: src/attrib.c:1308 +#: src/attrib.c:1318 #, c-format msgid "# thread_catchup_on_exit=ON/OFF\n" msgstr "# thread_catchup_on_exit=ON/OFF\n" -#: src/attrib.c:1309 +#: src/attrib.c:1319 #, c-format msgid "# thread_articles=NUM" msgstr "# thread_articles=æ•°å­—" -#: src/attrib.c:1316 +#: src/attrib.c:1326 #, c-format msgid "# thread_format=STRING (eg. %%n %%m [%%L] %%T %%F)\n" msgstr "# thread_format=字串 (例如：%%n %%m [%%L] %%T %%F)\n" -#: src/attrib.c:1317 +#: src/attrib.c:1327 #, c-format msgid "# thread_perc=NUM\n" msgstr "# thread_perc=æ•°å­—\n" -#: src/attrib.c:1318 +#: src/attrib.c:1328 #, c-format msgid "# trim_article_body=NUM\n" msgstr "# trim_article_body=æ•°å­—\n" -#: src/attrib.c:1319 +#: src/attrib.c:1329 #, c-format msgid "# 0 = Don't trim article body\n" msgstr "# 0 = ä¸ä¿®å‰ªæ–‡ç« å†…æ–‡\n" -#: src/attrib.c:1320 +#: src/attrib.c:1330 #, c-format msgid "# 1 = Skip leading blank lines\n" msgstr "# 1 = 跳过å‰å¯¼ç©ºè¡Œ\n" -#: src/attrib.c:1321 +#: src/attrib.c:1331 #, c-format msgid "# 2 = Skip trailing blank lines\n" msgstr "# 2 = 跳过尾éšç©ºè¡Œ\n" -#: src/attrib.c:1322 +#: src/attrib.c:1332 #, c-format msgid "# 3 = Skip leading and trailing blank lines\n" msgstr "# 3 = 跳过å‰å¯¼å’Œå°¾éšç©ºè¡Œ\n" -#: src/attrib.c:1323 +#: src/attrib.c:1333 #, c-format msgid "# 4 = Compact multiple blank lines between text blocks\n" msgstr "# 4 = 压缩文本区å—之间的多é‡ç©ºè¡Œ\n" -#: src/attrib.c:1324 +#: src/attrib.c:1334 #, c-format msgid "" "# 5 = Compact multiple blank lines between text blocks and skip\n" @@ -432,7 +432,7 @@ msgstr "" "# 5 = 压缩文本区å—之间的多é‡ç©ºè¡Œå¹¶è·³è¿‡\n" "# å‰å¯¼ç©ºè¡Œ\n" -#: src/attrib.c:1325 +#: src/attrib.c:1335 #, c-format msgid "" "# 6 = Compact multiple blank lines between text blocks and skip\n" @@ -441,7 +441,7 @@ msgstr "" "# 6 = 压缩文本区å—之间的多é‡ç©ºè¡Œå¹¶è·³è¿‡\n" "# å°¾éšç©ºè¡Œ\n" -#: src/attrib.c:1326 +#: src/attrib.c:1336 #, c-format msgid "" "# 7 = Compact multiple blank lines between text blocks and skip\n" @@ -450,37 +450,37 @@ msgstr "" "# 7 = 压缩文本区å—之间的多é‡ç©ºè¡Œå¹¶è·³è¿‡\n" "# å‰å¯¼å’Œå°¾éšç©ºè¡Œ\n" -#: src/attrib.c:1327 +#: src/attrib.c:1337 #, c-format msgid "# verbatim_handling=ON/OFF\n" msgstr "# verbatim_handling=ON/OFF\n" -#: src/attrib.c:1329 +#: src/attrib.c:1339 #, fuzzy, c-format msgid "# extquote_handling=ON/OFF\n" msgstr "# verbatim_handling=ON/OFF\n" -#: src/attrib.c:1331 +#: src/attrib.c:1341 #, c-format msgid "# wrap_on_next_unread=ON/OFF\n" msgstr "# wrap_on_next_unread=ON/OFF\n" -#: src/attrib.c:1332 +#: src/attrib.c:1342 #, c-format msgid "# x_body=STRING (eg. ~/.tin/extra-body-text)\n" msgstr "# x_body=字串 (例如：~/.tin/extra-body-text)\n" -#: src/attrib.c:1333 +#: src/attrib.c:1343 #, c-format msgid "# x_comment_to=ON/OFF\n" msgstr "# x_comment_to=ON/OFF\n" -#: src/attrib.c:1334 +#: src/attrib.c:1344 #, c-format msgid "# x_headers=STRING (eg. ~/.tin/extra-headers)\n" msgstr "# x_headers=字串 (例如：~/.tin/extra-headers)\n" -#: src/attrib.c:1335 +#: src/attrib.c:1345 #, c-format msgid "" "#\n" @@ -489,7 +489,7 @@ msgstr "" "#\n" "# è¦æ³¨æ„的是，最好是放到一般环境 (全局范围)\n" -#: src/attrib.c:1336 +#: src/attrib.c:1346 #, c-format msgid "" "# entries first followed by group specific entries.\n" @@ -498,7 +498,7 @@ msgstr "" "# æ¡ç›®å…ˆäºŽç¾¤ç»„特定的æ¡ç›®ã€‚\n" "#\n" -#: src/attrib.c:1337 +#: src/attrib.c:1347 #, c-format msgid "############################################################################\n" msgstr "############################################################################\n" @@ -790,56 +790,51 @@ msgstr "自动选å–文章 (使用‘%sâ #: src/lang.c:107 #, c-format -msgid "Active file corrupt - %s" -msgstr "现用文件æŸå - %s" - -#: src/lang.c:108 -#, c-format msgid "" "Article to be posted resulted in errors/warnings. %s=quit, %s=Menu, %s=edit: " msgstr "è¦å¼ è´´çš„文章导致错误/警告。%s=离开，%s=èœå•ï¼Œ%s=编辑：" -#: src/lang.c:109 +#: src/lang.c:108 #, c-format msgid "Unrecognized attribute: %s" msgstr "无法辨识的属性：%s" -#: src/lang.c:110 +#: src/lang.c:109 #, c-format msgid "Bad command. Type '%s' for help." msgstr "ä¸å½“的命令。输入‘%s’以获得说明。" -#: src/lang.c:112 +#: src/lang.c:111 msgid "Base article" msgstr "基底文章" -#: src/lang.c:113 +#: src/lang.c:112 msgid "Base article range" msgstr "基底文章范围" -#: src/lang.c:114 +#: src/lang.c:113 #, fuzzy, c-format msgid "%s: Updating of index files not supported: cache_overview_files=%s" msgstr "%s：ä¸æ”¯æŒç´¢å¼•æ–‡ä»¶çš„æ›´æ–°\n" -#: src/lang.c:115 +#: src/lang.c:114 msgid "*** Beginning of article ***" msgstr "*** 文章开头 ***" -#: src/lang.c:116 +#: src/lang.c:115 msgid "*** Beginning of page ***" msgstr "*** 页é¢å¼€å¤´ ***" -#: src/lang.c:118 +#: src/lang.c:117 #, c-format msgid "Cancel (delete) or supersede (overwrite) article [%%s]? (%s/%s/%s): " msgstr "å–消 (删除) 或å–代 (覆写) 文章 [%%s]？(%s/%s/%s)：" -#: src/lang.c:119 +#: src/lang.c:118 msgid "Cancelling article..." msgstr "å–消文章…" -#: src/lang.c:121 +#: src/lang.c:120 #, c-format msgid "Cannot create %s" msgstr "无法创建 %s" @@ -1369,21 +1364,16 @@ msgstr "" msgid "Insecure permissions of %s (%o)" msgstr "%s (%o) çš„ä¸å®‰å…¨æƒé™" -#: src/lang.c:242 -#, c-format -msgid "Invalid response to GROUP command, %s" -msgstr "对于 GROUP 命令的无效回应，%s" - -#: src/lang.c:247 +#: src/lang.c:244 #, c-format msgid "MIME parse error: Unexpected end of %s/%s article" msgstr "MIME 剖æžé”™è¯¯ï¼šæœªé¢„期的 %s/%s 文章结æŸ" -#: src/lang.c:248 +#: src/lang.c:245 msgid "MIME parse error: Start boundary whilst reading headers" msgstr "MIME 剖æžé”™è¯¯ï¼šè¯»å–标头时出现起始边界" -#: src/lang.c:249 +#: src/lang.c:246 msgid "" "\n" "Error: \"poster\" is not allowed in Newsgroups!\n" @@ -1391,16 +1381,16 @@ msgstr "" "\n" "错误：在新闻群组中ä¸å…许“posterâ€ï¼\n" -#: src/lang.c:250 +#: src/lang.c:247 msgid "Can't get a (fully-qualified) domain-name!" msgstr "无法æå– (完全åˆæ ¼çš„) 域åå称ï¼" -#: src/lang.c:251 +#: src/lang.c:248 #, c-format msgid "No permissions to go into %s\n" msgstr "没有æƒé™å¯è¿›å…¥ %s\n" -#: src/lang.c:253 +#: src/lang.c:250 msgid "" "\n" "Error: From: line missing.\n" @@ -1408,30 +1398,30 @@ msgstr "" "\n" "错误： From: 行缺失。\n" -#: src/lang.c:255 +#: src/lang.c:252 #, c-format msgid "No read permissions for %s\n" msgstr "没有 %s 的读å–æƒé™\n" -#: src/lang.c:256 +#: src/lang.c:253 #, c-format msgid "File %s does not exist\n" msgstr "文件 %s ä¸å­˜åœ¨\n" -#: src/lang.c:257 +#: src/lang.c:254 #, c-format msgid "No write permissions for %s\n" msgstr "没有 %s 的写入æƒé™\n" -#: src/lang.c:258 +#: src/lang.c:255 msgid "Can't get user information (/etc/passwd missing?)" msgstr "无法æå–ç”¨æˆ·ä¿¡æ¯ (缺少 /etc/passwd ?)" -#: src/lang.c:259 +#: src/lang.c:256 msgid "errors" msgstr "错误" -#: src/lang.c:261 +#: src/lang.c:258 #, c-format msgid "" "\n" @@ -1440,61 +1430,61 @@ msgstr "" "\n" "错误于第 %d 行：“Sender:â€æ ‡å¤´ä¸è¢«å…许 (将会为您加入)\n" -#: src/lang.c:263 +#: src/lang.c:260 #, c-format msgid "Server has non of the groups listed in %s" msgstr "æœåŠ¡å™¨ä¸å…·ä»»ä½•ä¸€ä¸ªåˆ—在 %s 中的群组" -#: src/lang.c:264 +#: src/lang.c:261 msgid "error" msgstr "错误" -#: src/lang.c:265 +#: src/lang.c:262 msgid "Unknown display level" msgstr "ä¸æ˜Žçš„显示层级" -#: src/lang.c:266 +#: src/lang.c:263 msgid "" msgstr "" -#: src/lang.c:267 +#: src/lang.c:264 msgid "Exiting..." msgstr "正在离开…" -#: src/lang.c:268 +#: src/lang.c:265 msgid "leaving external mail-reader" msgstr "离开外部邮件阅读器" -#: src/lang.c:269 +#: src/lang.c:266 #, c-format msgid "Extracting %s..." msgstr "æ­£åœ¨æˆªå– %s…" -#: src/lang.c:271 +#: src/lang.c:268 #, c-format msgid "Error writing %s file. Filesystem full? File reset to previous state." msgstr "写入 %s 文件时å‘生错误。文件系统已满？文件é‡ç½®åˆ°ä¸Šä¸€ä¸ªçŠ¶æ€ã€‚" -#: src/lang.c:272 +#: src/lang.c:269 #, c-format msgid "Error making backup of %s file. Filesystem full?" msgstr "制作文件 %s 备份时å‘生错误。文件系统已满？" -#: src/lang.c:273 +#: src/lang.c:270 #, c-format msgid "Filtering global rules (%d/%d)..." msgstr "筛选全局规则 (%d/%d)…" -#: src/lang.c:274 +#: src/lang.c:271 msgid "Rule created by: " msgstr "规则创建者为：" -#: src/lang.c:275 +#: src/lang.c:272 #, c-format msgid "Enter pattern [%s]> " msgstr "è¾“å…¥æ¨¡å¼ [%s]>" -#: src/lang.c:276 +#: src/lang.c:273 #, c-format msgid "" "\n" @@ -1503,20 +1493,21 @@ msgstr "" "\n" "您所è¦æ±‚对于您文章的跟贴为下列 %s：\n" -#: src/lang.c:277 +#: src/lang.c:274 #, c-format msgid " %s\t Answers will be directed to you by mail.\n" msgstr " %s\t 回å¤å°†ä¼šç›´æŽ¥ç»ç”±é‚®ä»¶å¯„给您。\n" -#: src/lang.c:278 +#: src/lang.c:275 msgid "-- forwarded message --\n" msgstr "-- 已转å‘æ¶ˆæ¯ --\n" -#: src/lang.c:279 +#: src/lang.c:276 msgid "-- end of forwarded message --\n" msgstr "-- 已转å‘消æ¯ç»“æŸ --\n" -#: src/lang.c:280 +#: src/lang.c:277 +#, fuzzy msgid "" "# Format:\n" "# comment=STRING Optional. Multiple lines allowed. Comments must be " @@ -1543,6 +1534,10 @@ msgid "" "# gnksa=[<>]?NUM Optional. GNKSA parse_from() return code. '<' or '>' " "opt.\n" "# xref=PATTERN Optional. Kill pattern (e.g. alt.flame*)\n" +"# path=PATTERN Optional. Kill pattern (e.g. news.example.org)\n" +"# Be aware that filtering on Path: may significantly " +"slow\n" +"# down the process.\n" "# time=NUM Optional. time_t value when rule expires\n" "#\n" msgstr "" @@ -2557,7 +2552,7 @@ msgstr "没有上一个表达å¼" msgid "Operation disabled in no-overwrite mode" msgstr "在无覆写模å¼ä¸­çš„æ“作已åœç”¨" -#. TODO: replace hardcoded key-name in txt_info_postponed +#. TODO: replace hard coded key-name in txt_info_postponed #: src/lang.c:547 #, c-format msgid "%d postponed %s, reuse with ^O...\n" @@ -2585,7 +2580,7 @@ msgstr "TeX2Iso ç¼–ç æ–‡ç« " msgid "incomplete " msgstr "ä¸å®Œæ•´çš„ " -#. TODO: replace hardcoded key-names +#. TODO: replace hard coded key-names #: src/lang.c:554 #, c-format msgid "" @@ -2701,8 +2696,8 @@ msgid "Kill Article Menu" msgstr "ç é™¤æ–‡ç« èœå•" #: src/lang.c:587 -#, c-format -msgid "Kill Msg-Id: [%s] (f/l/o/n): " +#, fuzzy, c-format +msgid "Kill Msg-ID: [%s] (f/l/o/n): " msgstr "ç é™¤ Msg-Id： [%s] (f/l/o/n)：" #: src/lang.c:588 @@ -3208,7 +3203,7 @@ msgstr "在正则表达å¼ä¸­å‘ç”Ÿé”™è¯ msgid "Post a followup..." msgstr "跟贴…" -#. TODO: replace hardcoded key-name in txt_post_error_ask_postpone +#. TODO: replace hard coded key-name in txt_post_error_ask_postpone #: src/lang.c:716 msgid "" "An error has occurred while posting the article. If you think that this\n" @@ -3271,225 +3266,230 @@ msgstr "已标记 %s" msgid "Untagged %s" msgstr "å·²å–消标记 %s" -#: src/lang.c:730 +#: src/lang.c:731 +#, c-format +msgid "Preparing for filtering on Path header (%d/%d)..." +msgstr "" + +#: src/lang.c:733 msgid "Processing mail messages marked for deletion." msgstr "处ç†æ ‡è®°ä¸ºåˆ é™¤çš„邮件消æ¯ã€‚" -#: src/lang.c:731 +#: src/lang.c:734 msgid "Processing saved articles marked for deletion." msgstr "处ç†æ ‡è®°ä¸ºåˆ é™¤çš„å·²ä¿å­˜æ–‡ç« ã€‚" -#: src/lang.c:732 +#: src/lang.c:735 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "接å—跟贴？%s=张贴，%s=忽略，%s=离开：" -#: src/lang.c:733 +#: src/lang.c:736 msgid "Article unchanged, abort mailing?" msgstr "文章未å˜æ›´ï¼Œæ”¾å¼ƒé‚®å¯„？" -#: src/lang.c:734 +#: src/lang.c:737 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "您è¦çœ‹åˆ°æ置的文章 (%d) å—？" -#: src/lang.c:736 +#: src/lang.c:739 msgid "Add quick kill filter?" msgstr "加入快速ç é™¤ç­›é€‰å™¨ï¼Ÿ" -#: src/lang.c:737 +#: src/lang.c:740 msgid "Add quick selection filter?" msgstr "加入快速选择筛选器？" -#: src/lang.c:738 +#: src/lang.c:741 msgid "Do you really want to quit?" msgstr "您真的è¦ç¦»å¼€å—？" -#: src/lang.c:739 +#: src/lang.c:742 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "%s=编辑å–消消æ¯ï¼Œ%s=离开，%s=删除 (å–消) [%%s]：" -#: src/lang.c:740 +#: src/lang.c:743 msgid "You have tagged articles in this group - quit anyway?" msgstr "您已在这个群组中标记文章 - 无论如何都è¦ç¦»å¼€ï¼Ÿ" -#: src/lang.c:741 +#: src/lang.c:744 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=离开，%s=编辑，%s=æ置：" -#: src/lang.c:742 +#: src/lang.c:745 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=离开 %s=编辑 %s=ä¿å­˜ç é™¤æ述：" -#: src/lang.c:743 +#: src/lang.c:746 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "%s=离开 %s=编辑 %s=ä¿å­˜é€‰å–æ述：" -#: src/lang.c:744 +#: src/lang.c:747 msgid "Do you really want to quit without saving your configuration?" msgstr "您真的è¦ç¦»å¼€å´ä¸ä¿å­˜æ‚¨çš„组æ€å—？" -#: src/lang.c:747 +#: src/lang.c:750 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "无效的范围 - 有效是‘0-9.$’例如：1-$" -#: src/lang.c:749 +#: src/lang.c:752 msgid "Do you want to abort this operation?" msgstr "您è¦æ”¾å¼ƒè¿™ä¸ªæ“作å—？" -#: src/lang.c:750 +#: src/lang.c:753 msgid "Do you want to exit tin immediately?" msgstr "您è¦é©¬ä¸Šç¦»å¼€ tin å—？" -#: src/lang.c:752 +#: src/lang.c:755 msgid "Reading ('q' to quit)..." msgstr "è¯»å– (‘q’表示离开)…" -#: src/lang.c:753 +#: src/lang.c:756 #, c-format msgid "Reading %sarticles..." msgstr "è¯»å– %s 篇文章…" -#: src/lang.c:754 +#: src/lang.c:757 #, c-format msgid "Reading %sattributes file...\n" msgstr "è¯»å– %s 属性文件…\n" -#: src/lang.c:755 +#: src/lang.c:758 #, c-format msgid "Reading %sconfig file...\n" msgstr "è¯»å– %s 组æ€æ–‡ä»¶â€¦\n" -#: src/lang.c:756 +#: src/lang.c:759 msgid "Reading filter file...\n" msgstr "读å–筛选器文件…\n" -#: src/lang.c:757 +#: src/lang.c:760 #, c-format msgid "Reading %s groups..." msgstr "è¯»å– %s 群组…" -#: src/lang.c:758 +#: src/lang.c:761 msgid "Reading input history file...\n" msgstr "读å–输入历å²æ–‡ä»¶â€¦\n" -#: src/lang.c:759 +#: src/lang.c:762 msgid "Reading keymap file...\n" msgstr "è¯»å– keymap 文件…\n" -#: src/lang.c:760 +#: src/lang.c:763 msgid "Reading groups from active file... " msgstr "从现用文件读å–群组…" -#: src/lang.c:761 +#: src/lang.c:764 msgid "Reading groups from newsrc file... " msgstr "从 newsrc 文件读å–群组…" -#: src/lang.c:762 +#: src/lang.c:765 msgid "Reading newsgroups file... " msgstr "读å–新闻群组文件…" -#: src/lang.c:763 +#: src/lang.c:766 msgid "Reading newsrc file..." msgstr "è¯»å– newsrc 文件…" -#: src/lang.c:764 +#: src/lang.c:767 msgid "References: line " msgstr "References: è¡Œ " -#: src/lang.c:766 +#: src/lang.c:769 #, c-format msgid "(%d:%02d remaining)" msgstr "(%d:%02d 还剩余)" -#: src/lang.c:768 +#: src/lang.c:771 #, c-format msgid "Bogus group %s removed." msgstr "å‡é€ çš„群组 %s 已移除。" -#: src/lang.c:769 +#: src/lang.c:772 msgid "Removed from the previous rule: " msgstr "已从上一个规则移除：" -#: src/lang.c:770 +#: src/lang.c:773 #, c-format msgid "Error: rename %s to %s" msgstr "错误：é‡å‘½å %s 为 %s" -#: src/lang.c:771 +#: src/lang.c:774 msgid "Reply to author..." msgstr "回å¤ç»™ä½œè€……" -#: src/lang.c:772 +#: src/lang.c:775 msgid "Repost" msgstr "é‡æ–°å¼ è´´" -#: src/lang.c:773 +#: src/lang.c:776 msgid "Reposting article..." msgstr "é‡æ–°å¼ è´´æ–‡ç« â€¦" -#: src/lang.c:774 +#: src/lang.c:777 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "é‡æ–°å¼ è´´æ–‡ç« åˆ°ç¾¤ç»„ [%s]>" -#: src/lang.c:775 +#: src/lang.c:778 msgid "Reset newsrc?" msgstr "é‡ç½® newsrc？" -#: src/lang.c:776 +#: src/lang.c:779 msgid "Responses have been directed to the following newsgroups" msgstr "回应已被导å‘下列新闻群组" -#: src/lang.c:777 +#: src/lang.c:780 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " msgstr "回应已被导å‘张贴者。%s=邮寄，%s=张贴，%s=离开：" -#: src/lang.c:779 +#: src/lang.c:782 msgid "Press to continue..." msgstr "按下 以继续…" -#: src/lang.c:781 +#: src/lang.c:784 #, c-format msgid "Select From [%s] (y/n): " msgstr "选å–自 [%s] (y/n)：" -#: src/lang.c:782 +#: src/lang.c:785 msgid "Select Lines: (num): " msgstr "选å–多行：(num)：" -#: src/lang.c:783 +#: src/lang.c:786 msgid "Auto-select Article Menu" msgstr "自动选å–文章èœå•" -#: src/lang.c:784 -#, c-format -msgid "Select Msg-Id [%s] (f/l/o/n): " +#: src/lang.c:787 +#, fuzzy, c-format +msgid "Select Msg-ID [%s] (f/l/o/n): " msgstr "é€‰å– Msg-Id [%s] (f/l/o/n)：" -#: src/lang.c:785 +#: src/lang.c:788 msgid "Select pattern scope: " msgstr "选å–模å¼èŒƒå›´ï¼š" -#: src/lang.c:786 +#: src/lang.c:789 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "选å–主旨 [%s] (y/n)：" -#: src/lang.c:787 +#: src/lang.c:790 msgid "Select text pattern : " msgstr "选å–文本模å¼ï¼š" -#: src/lang.c:788 +#: src/lang.c:791 msgid "Select time in days : " msgstr "选å–时间天数 ：" -#: src/lang.c:789 +#: src/lang.c:792 #, c-format msgid "" "# %s server configuration file\n" @@ -3510,54 +3510,54 @@ msgstr "" "############################################################################\n" "\n" -#: src/lang.c:795 +#: src/lang.c:798 msgid "Showing unread groups only" msgstr "åªæ˜¾ç¤ºæœªè¯»ç¾¤ç»„" -#: src/lang.c:796 +#: src/lang.c:799 msgid "Subject: line (ignore case) " msgstr "Subject: è¡Œ (忽略大å°å†™) " -#: src/lang.c:797 +#: src/lang.c:800 msgid "Subject: line (case sensitive)" msgstr "Subject: è¡Œ (大å°å†™ç›¸ç¬¦)" -#: src/lang.c:798 +#: src/lang.c:801 msgid "Save" msgstr "ä¿å­˜" -#: src/lang.c:799 +#: src/lang.c:802 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "ä¿å­˜â€˜%s’(%s/%s)？" -#: src/lang.c:800 +#: src/lang.c:803 msgid "Save configuration before continuing?" msgstr "继续之å‰å…ˆä¿å­˜ç»„æ€ï¼Ÿ" -#: src/lang.c:801 +#: src/lang.c:804 msgid "Save filename> " msgstr "ä¿å­˜æ–‡ä»¶å>" -#: src/lang.c:802 +#: src/lang.c:805 msgid "Saved" msgstr "å·²ä¿å­˜" -#: src/lang.c:803 +#: src/lang.c:806 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "%4d 未读 (%4d 热门) %s 于 %s\n" -#: src/lang.c:804 +#: src/lang.c:807 #, c-format msgid "Saved %s...\n" msgstr "å·²ä¿å­˜ %s…\n" -#: src/lang.c:805 +#: src/lang.c:808 msgid "Nothing was saved" msgstr "没有任何东西被ä¿å­˜" -#: src/lang.c:806 +#: src/lang.c:809 #, c-format msgid "" "\n" @@ -3566,182 +3566,182 @@ msgstr "" "\n" "%s %d %s æ¥è‡ª %d %s\n" -#: src/lang.c:807 +#: src/lang.c:810 #, c-format msgid "-- %s saved to %s%s --" msgstr "-- %s ä¿å­˜åˆ° %s%s --" -#: src/lang.c:808 +#: src/lang.c:811 #, c-format msgid "-- %s saved to %s - %s --" msgstr "-- %s ä¿å­˜åˆ° %s - %s --" -#: src/lang.c:809 +#: src/lang.c:812 msgid "Saving..." msgstr "ä¿å­˜ä¸­â€¦" -#: src/lang.c:810 +#: src/lang.c:813 #, c-format msgid "%s: Screen initialization failed" msgstr "%s：å±å¹•åˆå§‹åŒ–失败" -#: src/lang.c:812 +#: src/lang.c:815 #, c-format msgid "%s: screen is too small\n" msgstr "%s：å±å¹•å¤ªå°\n" -#: src/lang.c:814 +#: src/lang.c:817 #, fuzzy, c-format msgid "screen is too small, %s is exiting" msgstr "å±å¹•å¤ªå°ï¼Œ%s 正在离开\n" -#: src/lang.c:815 +#: src/lang.c:818 msgid "Delete scope?" msgstr "删除范围？" -#: src/lang.c:816 +#: src/lang.c:819 msgid "Enter scope> " msgstr "输入范围>" -#: src/lang.c:817 +#: src/lang.c:820 msgid "Select new position> " msgstr "选å–æ–°ä½ç½®>" -#: src/lang.c:818 +#: src/lang.c:821 msgid "New position cannot be a global scope" msgstr "æ–°ä½ç½®ä¸å¯æ˜¯å…¨å±€èŒƒå›´" -#: src/lang.c:819 +#: src/lang.c:822 msgid "Global scope, operation not allowed" msgstr "全局范围，æ“作ä¸å…许" -#: src/lang.c:820 +#: src/lang.c:823 msgid "Rename scope> " msgstr "é‡å‘½å范围>" -#: src/lang.c:821 +#: src/lang.c:824 msgid "Select scope> " msgstr "选å–范围>" -#: src/lang.c:822 +#: src/lang.c:825 msgid "Scopes Menu" msgstr "范围èœå•" -#: src/lang.c:823 +#: src/lang.c:826 msgid "Scopes Menu Commands" msgstr "范围功能表指令" -#: src/lang.c:824 +#: src/lang.c:827 #, c-format msgid "Search backwards [%s]> " msgstr "å‘åŽæœç´¢ [%s]>" -#: src/lang.c:825 +#: src/lang.c:828 #, c-format msgid "Search body [%s]> " msgstr "æœç´¢å†…æ–‡ [%s]>" -#: src/lang.c:826 +#: src/lang.c:829 #, c-format msgid "Search forwards [%s]> " msgstr "å‘å‰æœç´¢ [%s]>" -#: src/lang.c:827 +#: src/lang.c:830 msgid "Searching..." msgstr "æœç´¢ä¸­â€¦" -#: src/lang.c:828 +#: src/lang.c:831 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "æœç´¢æ–‡ç«  %2$d 中的 %1$d (‘q’以放弃)…" -#: src/lang.c:829 +#: src/lang.c:832 msgid "Select article> " msgstr "选å–文章>" -#: src/lang.c:830 +#: src/lang.c:833 msgid "" "Select option number before text or use arrow keys and . 'q' to quit." msgstr "选å–文本å‰æ–¹çš„选项数字或使用方å‘键和 。‘q’以离开。" -#: src/lang.c:831 +#: src/lang.c:834 msgid "Select group> " msgstr "选å–群组>" -#: src/lang.c:832 +#: src/lang.c:835 #, c-format msgid "Enter selection pattern [%s]> " msgstr "è¾“å…¥é€‰æ‹©æ¨¡å¼ [%s]>" -#: src/lang.c:833 +#: src/lang.c:836 msgid "Select thread> " msgstr "选å–帖å­> " -#: src/lang.c:834 +#: src/lang.c:837 #, c-format msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" msgstr "%s %s %s (“%sâ€) [%s]：å‘é€è¯¦ç»†çš„错误报告给 %s\n" -#: src/lang.c:835 +#: src/lang.c:838 msgid "servers active-file" msgstr "æœåŠ¡å™¨ç›®å‰æ–‡ä»¶" -#: src/lang.c:836 +#: src/lang.c:839 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "无法移入新的新闻群组。请先订阅…" -#: src/lang.c:837 +#: src/lang.c:840 msgid "" msgstr "" -#: src/lang.c:838 +#: src/lang.c:841 #, c-format msgid "Starting: (%s)" msgstr "开始：(%s)" -#: src/lang.c:839 +#: src/lang.c:842 #, c-format msgid "List Thread (%d of %d)" msgstr "列出讨论串 (%2$d 中的 %1$d)" -#: src/lang.c:840 +#: src/lang.c:843 #, c-format msgid "Thread (%.*s)" msgstr "讨论串 (%.*s)" -#: src/lang.c:841 +#: src/lang.c:844 msgid "Enter wildcard subscribe pattern> " msgstr "输入通é…符订阅模å¼>" -#: src/lang.c:842 +#: src/lang.c:845 #, c-format msgid "subscribed to %d groups" msgstr "已订阅 %d 群组" -#: src/lang.c:843 +#: src/lang.c:846 #, c-format msgid "Subscribed to %s" msgstr "已订阅 %s" -#: src/lang.c:844 +#: src/lang.c:847 msgid "Subscribing... " msgstr "订阅…" -#: src/lang.c:845 +#: src/lang.c:848 #, c-format msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " msgstr "é‡æ–°å¼ è´´æˆ–å–代文章 [%%s]？(%s/%s/%s)：" -#: src/lang.c:846 +#: src/lang.c:849 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "å–代文章于群组 [%s]>" -#: src/lang.c:847 +#: src/lang.c:850 msgid "Superseding article ..." msgstr "å–代文章…" -#: src/lang.c:848 +#: src/lang.c:851 #, c-format msgid "" "\n" @@ -3750,24 +3750,24 @@ msgstr "" "\n" "å·²åœæ­¢ã€‚输入‘fg’以é‡æ–°å¯åŠ¨ %s\n" -#: src/lang.c:850 +#: src/lang.c:853 #, c-format msgid "%d days" msgstr "%d 天" -#: src/lang.c:851 +#: src/lang.c:854 msgid "" msgstr "" -#: src/lang.c:852 +#: src/lang.c:855 msgid "TeX " msgstr "TeX " -#: src/lang.c:853 +#: src/lang.c:856 msgid "# Default action/prompt strings\n" msgstr "# 缺çœçš„动作/æ示字串\n" -#: src/lang.c:854 +#: src/lang.c:857 msgid "" "# Defaults for quick (1 key) kill & auto-selection filters\n" "# header=NUM 0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n" @@ -3785,108 +3785,108 @@ msgstr "" "# case=ON/OFF ON=筛选器大å°å†™é¡»ç›¸ç¬¦ OFF=忽略大å°å†™\n" "# expire=ON/OFF ON=é™åˆ¶åˆ° default_filter_days OFF=ä¸ä¼šè¿‡æœŸ\n" -#: src/lang.c:867 +#: src/lang.c:870 msgid "" "# If ON use print current subject or newsgroup description in the last line\n" msgstr "# 如果为 ON å°±å°å‡ºç›®å‰çš„主旨或最åŽä¸€è¡Œä¸­çš„新闻群组æè¿°\n" -#: src/lang.c:868 +#: src/lang.c:871 msgid "# Host & time info used for detecting new groups (don't touch)\n" msgstr "# 主机 & 时间信æ¯ç”¨äºŽä¾¦æµ‹æ–°ç¾¤ç»„ (ä¸å½±å“)\n" -#: src/lang.c:869 +#: src/lang.c:872 msgid "There is no news\n" msgstr "没有任何新闻\n" -#: src/lang.c:870 +#: src/lang.c:873 msgid "Thread" msgstr "讨论串" -#: src/lang.c:871 +#: src/lang.c:874 msgid "Thread Level Commands" msgstr "讨论串层级命令" -#: src/lang.c:872 +#: src/lang.c:875 msgid "Thread deselected" msgstr "讨论串已å–消选å–" -#: src/lang.c:873 +#: src/lang.c:876 msgid "Thread selected" msgstr "讨论串已选å–" -#: src/lang.c:875 +#: src/lang.c:878 msgid "threads" msgstr "讨论串" -#: src/lang.c:877 +#: src/lang.c:880 msgid "thread" msgstr "讨论串" -#: src/lang.c:878 +#: src/lang.c:881 #, c-format msgid "Thread %4s of %4s" msgstr "讨论串 %2$4s 中的 %1$4s" -#: src/lang.c:879 +#: src/lang.c:882 msgid "Threading articles..." msgstr "讨论串文章…" -#: src/lang.c:880 +#: src/lang.c:883 #, c-format msgid "Toggled word highlighting %s" msgstr "已切æ¢å­—è¯é«˜äº®åº¦æ˜¾ç¤º %s" -#: src/lang.c:881 +#: src/lang.c:884 msgid "Toggled rot13 encoding" msgstr "å·²åˆ‡æ¢ rot13 ç¼–ç " -#: src/lang.c:882 +#: src/lang.c:885 #, c-format msgid "Toggled german TeX encoding %s" msgstr "已切æ¢å¾·è¯­ TeX ç¼–ç  %s" -#: src/lang.c:883 +#: src/lang.c:886 #, c-format msgid "Toggled tab-width to %d" msgstr "已切æ¢è·³æ ¼å®½åº¦ä¸º %d" -#: src/lang.c:885 +#: src/lang.c:888 #, c-format msgid "%d Trying to dotlock %s" msgstr "%d å°è¯•ç‚¹é”定 %s" -#: src/lang.c:886 +#: src/lang.c:889 #, c-format msgid "%d Trying to lock %s" msgstr "%d å°è¯•é”定 %s" -#: src/lang.c:888 +#: src/lang.c:891 msgid " h=help" msgstr " h=求助" -#: src/lang.c:890 +#: src/lang.c:893 msgid "Unlimited" msgstr "没有é™åˆ¶" -#: src/lang.c:891 +#: src/lang.c:894 msgid "Enter wildcard unsubscribe pattern> " msgstr "输入å–消订阅的通é…符模å¼>" -#: src/lang.c:892 +#: src/lang.c:895 #, c-format msgid "Error decoding %s : %s" msgstr "è§£ç  %s æ—¶å‘生错误：%s" -#: src/lang.c:893 +#: src/lang.c:896 msgid "No end." msgstr "没有结æŸã€‚" -#: src/lang.c:894 +#: src/lang.c:897 #, c-format msgid "%s successfully decoded." msgstr "%s å·²æˆåŠŸè§£ç ã€‚" -#: src/lang.c:895 +#: src/lang.c:898 #, c-format msgid "" "%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" @@ -3895,37 +3895,32 @@ msgstr "" "%*s[-- %s/%s，%suuencoded 文件，%d 行，å称：%s --]\n" "\n" -#: src/lang.c:896 +#: src/lang.c:899 msgid "unread " msgstr "未读 " -#: src/lang.c:897 +#: src/lang.c:900 #, c-format msgid "unsubscribed from %d groups" msgstr "已从 %d 群组å–消订阅" -#: src/lang.c:898 +#: src/lang.c:901 #, c-format msgid "Unsubscribed from %s" msgstr "已从 %s å–消订阅" -#: src/lang.c:899 +#: src/lang.c:902 msgid "Unsubscribing... " msgstr "å–消订阅…" -#: src/lang.c:900 +#: src/lang.c:903 msgid "Unthreading articles..." msgstr "展开讨论串文章…" -#: src/lang.c:901 +#: src/lang.c:904 msgid "Updated" msgstr "已更新" -#: src/lang.c:903 -#, c-format -msgid "unparseable \"LIST COUNTS\" line: \"%s\"" -msgstr "无法解æžçš„“清å•è®¡æ•°â€è¡Œï¼šâ€œ%sâ€" - #: src/lang.c:905 msgid "Updating" msgstr "æ›´æ–°" @@ -4083,11 +4078,16 @@ msgid "%s only useful for batch mode ope msgstr "%s åªæœ‰åœ¨æ‰¹æ¬¡æ¨¡å¼æ“作时有用\n" #: src/lang.c:939 +#, fuzzy, c-format +msgid "%s only useful for batch or debug mode operations\n" +msgstr "%s åªæœ‰åœ¨æ‰¹æ¬¡æ¨¡å¼æ“作时有用\n" + +#: src/lang.c:940 #, c-format msgid "Useless combination %s and %s. Ignoring %s.\n" msgstr "æ— ç”¨çš„ç»„åˆ %s å’Œ %s。忽略 %s。\n" -#: src/lang.c:941 +#: src/lang.c:942 #, c-format msgid "" "\n" @@ -4096,12 +4096,12 @@ msgstr "" "\n" "%s%d 超出范围 (0 - %d)。é‡ç½®ä¸º 0" -#: src/lang.c:942 +#: src/lang.c:943 #, c-format msgid "View '%s' (%s/%s)?" msgstr "查看‘%s’(%s/%s)？" -#: src/lang.c:944 +#: src/lang.c:945 #, c-format msgid "" "\n" @@ -4112,7 +4112,7 @@ msgstr "" "警告：张贴超出 %d 字段。第 %d 行是第一个长行：\n" "%-100s\n" -#: src/lang.c:945 +#: src/lang.c:946 msgid "" "\n" "Warning: article unchanged after editing\n" @@ -4120,7 +4120,7 @@ msgstr "" "\n" "警告：文章编辑之åŽæœªå˜æ›´\n" -#: src/lang.c:946 +#: src/lang.c:947 msgid "" "\n" "Warning: \"Subject:\" contains only whitespaces.\n" @@ -4128,7 +4128,7 @@ msgstr "" "\n" "警告：“ Subject: â€åªå«ç©ºç™½ã€‚\n" -#: src/lang.c:947 +#: src/lang.c:948 msgid "" "\n" "Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:" @@ -4137,7 +4137,7 @@ msgstr "" "\n" "警告：“ Subject: â€ä»¥â€œRe：â€å¼€å§‹ä½†æ˜¯æ²¡æœ‰â€œ References: â€ã€‚\n" -#: src/lang.c:949 +#: src/lang.c:950 msgid "" "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" @@ -4147,7 +4147,7 @@ msgstr "" "警告：文章有“ References: â€ä½†æ˜¯â€œ Subject: â€å¹¶éž\n" " 以“Re:â€å¼€å§‹ä¸”ä¸åŒ…å«â€œ(was:â€ã€‚\n" -#: src/lang.c:952 +#: src/lang.c:953 msgid "" "Read carefully!\n" "\n" @@ -4169,7 +4169,7 @@ msgstr "" "这是您å³å°†å–消的文章：\n" "\n" -#: src/lang.c:956 +#: src/lang.c:957 msgid "" "\n" "Warning: You are using a non-plain transfer encoding (such as base64 or\n" @@ -4183,7 +4183,7 @@ msgstr "" " 文章。如果æŸä¸ªç­¾å被该 inews 程åºæ‰€é™„加，它将\n" " 无法被适当地编ç ã€‚\n" -#: src/lang.c:961 +#: src/lang.c:962 msgid "" "\n" "Warning: \"example\" is a reserved hierarchy!\n" @@ -4191,7 +4191,7 @@ msgstr "" "\n" "警告：“exampleâ€æ˜¯è¢«ä¿ç•™çš„阶层结构ï¼\n" -#: src/lang.c:962 +#: src/lang.c:963 #, c-format msgid "" "\n" @@ -4206,7 +4206,7 @@ msgstr "" "在您 %s 文件中的æŸäº›å€¼å·²æœ‰å˜æ›´ï¼\n" "请å‚阅 WHATSNEW …等等\n" -#: src/lang.c:964 +#: src/lang.c:965 #, c-format msgid "" "\n" @@ -4219,7 +4219,7 @@ msgstr "" "您正在从较新的版本é™çº§åˆ° tin %sï¼\n" "在您 %s 文件中的æŸäº›å€¼å¯èƒ½ä¼šè¢«å¿½ç•¥ï¼Œå…¶ä»–值也å¯èƒ½å·²æœ‰å˜æ›´ï¼\n" -#: src/lang.c:967 +#: src/lang.c:968 #, c-format msgid "" "Warning: tin wrote fewer groups to your\n" @@ -4234,7 +4234,7 @@ msgstr "" "并未å–消订阅 %ld %s，那么这就代表å‘生了错误，而您应该\n" "于å†æ¬¡å¯åŠ¨ tin 之å‰å…ˆå¤‡ä»½æ‚¨çš„ %sï¼\n" -#: src/lang.c:971 +#: src/lang.c:972 #, c-format msgid "" "\n" @@ -4243,12 +4243,12 @@ msgstr "" "\n" "警告：找到 %d 个‘-- \\n’行，这也许会使æŸäº›äººæ„Ÿåˆ°å›°æƒ‘。\n" -#: src/lang.c:972 +#: src/lang.c:973 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "警告：åªæœ‰ %2$d 中的 %1$d 篇文章被ä¿å­˜" -#: src/lang.c:973 +#: src/lang.c:974 #, c-format msgid "" "\n" @@ -4262,13 +4262,13 @@ msgstr "" "警告：您的签å长度已超过 %d 行。 由于签å通常\n" " ä¸ä¼šç”¨æ¥ä¼ è¾“任何有用的信æ¯ï¼Œå®ƒä»¬åº”该è¦æ„ˆçŸ­æ„ˆå¥½ã€‚\n" -#: src/lang.c:977 +#: src/lang.c:978 #, c-format msgid "" "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " msgstr "警告：这个邮件地å€å¯èƒ½åŒ…å«åžƒåœ¾é™·é˜±ã€‚%s=继续，%s=放弃？" -#: src/lang.c:978 +#: src/lang.c:979 msgid "" "\n" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" @@ -4276,37 +4276,37 @@ msgstr "" "\n" "警告：签å应该以‘-- \\n’起始而éžä»¥â€˜--\\n’。\n" -#: src/lang.c:979 +#: src/lang.c:980 msgid "Writing attributes file..." msgstr "写入属性文件…" -#: src/lang.c:981 +#: src/lang.c:982 #, c-format msgid "%d Responses" msgstr "%d 篇回应" -#: src/lang.c:983 +#: src/lang.c:984 #, c-format msgid "Added %d %s" msgstr "已加入 %d %s" -#: src/lang.c:984 +#: src/lang.c:985 msgid "No unsubscribed groups to show" msgstr "没有已å–消订阅的群组å¯æ˜¾ç¤º" -#: src/lang.c:985 +#: src/lang.c:986 msgid "Showing subscribed to groups only" msgstr "åªæ˜¾ç¤ºå·²è®¢é˜…群组" -#: src/lang.c:986 +#: src/lang.c:987 msgid "Yes " msgstr "是 " -#: src/lang.c:987 +#: src/lang.c:988 msgid " You have mail" msgstr " 您有邮件" -#: src/lang.c:992 +#: src/lang.c:993 #, c-format msgid "" "\n" @@ -4327,11 +4327,11 @@ msgstr "" " å˜æ›´ MM_NETWORK_CHARSET 的设置为适当的值，\n" " 以用于您的张贴。\n" -#: src/lang.c:1003 +#: src/lang.c:1004 msgid " -D mode debug mode" msgstr " -D æ¨¡å¼ é™¤é”™æ¨¡å¼" -#: src/lang.c:1007 +#: src/lang.c:1008 msgid "" "Read carefully!\n" "\n" @@ -4358,11 +4358,11 @@ msgstr "" "这是您å³å°†è¦å–消的文章：\n" "\n" -#: src/lang.c:1016 +#: src/lang.c:1017 msgid "toggle color" msgstr "切æ¢é¢œè‰²" -#: src/lang.c:1017 +#: src/lang.c:1018 msgid "" "# Changing colors of several screen parts\n" "# Possible values are:\n" @@ -4408,11 +4408,11 @@ msgstr "" "# 15 = 亮白色\n" "\n" -#: src/lang.c:1037 +#: src/lang.c:1038 msgid " -a toggle color flag" msgstr " -a 切æ¢é¢œè‰²æ——æ ‡" -#: src/lang.c:1041 +#: src/lang.c:1042 msgid "" "\n" "Error: Followup-To set to more than one newsgroup!\n" @@ -4420,7 +4420,7 @@ msgstr "" "\n" "错误：跟贴被设置超过一个新闻群组ï¼\n" -#: src/lang.c:1042 +#: src/lang.c:1043 #, c-format msgid "" "\n" @@ -4429,7 +4429,7 @@ msgstr "" "\n" "错误：“%sâ€è¢«é‡å‘½å，使用“%sâ€ä½œä¸ºæ›¿ä»£ï¼\n" -#: src/lang.c:1043 +#: src/lang.c:1044 #, c-format msgid "" "\n" @@ -4438,7 +4438,7 @@ msgstr "" "\n" "错误：跨æ¿å¼ è´´åˆ° %d 新闻群组而没有跟贴行ï¼\n" -#: src/lang.c:1044 +#: src/lang.c:1045 #, c-format msgid "" "\n" @@ -4447,7 +4447,7 @@ msgstr "" "\n" "错误：“%sâ€å¹¶éžæœ‰æ•ˆæ–°é—»ç¾¤ç»„ï¼\n" -#: src/lang.c:1046 +#: src/lang.c:1047 msgid "" "\n" "Warning: Followup-To set to more than one newsgroup!\n" @@ -4455,7 +4455,7 @@ msgstr "" "\n" "警告：跟贴被设置超过一个新闻群组ï¼\n" -#: src/lang.c:1047 +#: src/lang.c:1048 #, c-format msgid "" "\n" @@ -4464,7 +4464,7 @@ msgstr "" "\n" "警告：“%sâ€è¢«é‡å‘½å，您应该使用“%sâ€ä½œä¸ºæ›¿ä»£ï¼\n" -#: src/lang.c:1048 +#: src/lang.c:1049 #, c-format msgid "" "\n" @@ -4473,7 +4473,7 @@ msgstr "" "\n" "警告：跨æ¿å¼ è´´åˆ° %d 新闻群组而没有跟贴行ï¼\n" -#: src/lang.c:1049 +#: src/lang.c:1050 #, c-format msgid "" "\n" @@ -4482,7 +4482,7 @@ msgstr "" "\n" "警告：“%sâ€ä¸åœ¨æ‚¨çš„ newsrc 之中，在这个站å°å®ƒä¹Ÿè®¸ä¼šæ— æ•ˆï¼\n" -#: src/lang.c:1050 +#: src/lang.c:1051 #, c-format msgid "" "\n" @@ -4491,155 +4491,150 @@ msgstr "" "\n" "警告：“%sâ€å¹¶éžè¿™ä¸ªç«™å°ä¸Šçš„有效新闻群组ï¼\n" -#: src/lang.c:1054 +#: src/lang.c:1055 #, c-format msgid "%d files successfully written from %d articles. %d %s occurred." msgstr "%d 个文件æˆåŠŸåœ°ä»Ž %d 篇文章写入。%d %s å·²å‘生。" -#: src/lang.c:1055 +#: src/lang.c:1056 msgid "Missing parts." msgstr "缺少部分。" -#: src/lang.c:1056 +#: src/lang.c:1057 msgid "No beginning." msgstr "没有起始部分。" -#: src/lang.c:1057 +#: src/lang.c:1058 msgid "No data." msgstr "没有数æ®ã€‚" -#: src/lang.c:1058 +#: src/lang.c:1059 msgid "Unknown error." msgstr "ä¸æ˜Žé”™è¯¯ã€‚" -#: src/lang.c:1061 +#: src/lang.c:1062 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "\t%s çš„æ€»å’Œæ£€æŸ¥ç  (%ld %s)" -#: src/lang.c:1066 +#: src/lang.c:1067 msgid "Reading mail active file... " msgstr "读å–邮件现用文件…" -#: src/lang.c:1067 +#: src/lang.c:1068 msgid "Reading mailgroups file... " msgstr "读å–邮件群组文件…" -#: src/lang.c:1071 +#: src/lang.c:1072 msgid "perform PGP operations on article" msgstr "对于文章施行 PGP æ“作" -#: src/lang.c:1072 +#: src/lang.c:1073 msgid "Add key(s) to public keyring?" msgstr "将密钥加入公用钥匙圈？" -#: src/lang.c:1073 +#: src/lang.c:1074 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "%s=加密，%s=ç­¾å，%s=两者，%s=离开：" -#: src/lang.c:1074 +#: src/lang.c:1075 #, c-format msgid "%s=sign, %s=sign & include public key, %s=quit: " msgstr "%s=ç­¾å，%s=ç­¾å & 包å«å…¬å¼€å¯†é’¥ï¼Œ%s=离开：" -#: src/lang.c:1075 +#: src/lang.c:1076 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "PGP 尚未设置 (无法打开 %s)" -#: src/lang.c:1076 +#: src/lang.c:1077 msgid "Article not signed and no public keys found" msgstr "文章未被签å且找ä¸åˆ°ä»»ä½•å…¬å¼€å¯†é’¥" -#: src/lang.c:1078 +#: src/lang.c:1079 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "%s=离开，%s=编辑，%s=拼写检查，%s=pgp，%s=èœå•ï¼Œ%s=张贴，%s=æ置：" -#: src/lang.c:1079 +#: src/lang.c:1080 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " msgstr "%s=离开，%s=编辑，%s=拼写检查，%s=pgp，%s=å‘é€ [%%s]：" -#: src/lang.c:1080 +#: src/lang.c:1081 #, c-format msgid "" "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" "%s=离开，%s=编辑，%s=拼写检查，%s=pgp，%s=èœå•ï¼Œ%s=张贴，%s=æç½® [%%s]：" -#: src/lang.c:1082 +#: src/lang.c:1083 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "%s=离开，%s=编辑，%s=pgp，%s=èœå•ï¼Œ%s=张贴，%s=æ置：" -#: src/lang.c:1083 +#: src/lang.c:1084 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "%s=离开，%s=编辑，%s=pgp，%s=å‘é€ [%%s]：" -#: src/lang.c:1084 +#: src/lang.c:1085 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=离开，%s=编辑，%s=pgp，%s=èœå•ï¼Œ%s=张贴，%s=æç½® [%%s]：" -#: src/lang.c:1088 +#: src/lang.c:1089 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " msgstr "%s=离开，%s=编辑，%s=拼写检查，%s=èœå•ï¼Œ%s=张贴，%s=æ置：" -#: src/lang.c:1089 +#: src/lang.c:1090 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "%s=离开，%s=编辑，%s=拼写检查，%s=å‘é€ [%%s]：" -#: src/lang.c:1090 +#: src/lang.c:1091 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=离开，%s=编辑，%s=拼写检查，%s=èœå•ï¼Œ%s=张贴，%s=æç½® [%%s]：" -#: src/lang.c:1092 +#: src/lang.c:1093 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "%s=离开，%s=编辑，%s=èœå•ï¼Œ%s=张贴，%s=æ置：" -#: src/lang.c:1093 +#: src/lang.c:1094 #, c-format msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "%s=离开，%s=编辑，%s=å‘é€ [%%s]：" -#: src/lang.c:1094 +#: src/lang.c:1095 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=离开，%s=编辑，%s=èœå•ï¼Œ%s=张贴，%s=æç½® [%%s]：" -#: src/lang.c:1103 +#: src/lang.c:1104 msgid "Try cache_overview_files to speed up things.\n" msgstr "å°è¯• cache_overview_files 以加速。\n" -#: src/lang.c:1104 +#: src/lang.c:1105 msgid "Tin will use local index files instead.\n" msgstr "Tin 将使用本地索引文件作为替代。\n" -#: src/lang.c:1105 +#: src/lang.c:1106 msgid "Cannot find NNTP server name" msgstr "找ä¸åˆ° NNTP æœåŠ¡å™¨å称" -#: src/lang.c:1106 +#: src/lang.c:1107 #, c-format msgid "Connecting to %s:%u..." msgstr "连接到 %s:%u…" -#: src/lang.c:1107 -msgid "Disconnecting from server...\n" -msgstr "从æœåŠ¡å™¨ä¸­æ–­è¿žæŽ¥â€¦\n" - #: src/lang.c:1108 -#, c-format -msgid "" -"Wrong newsgroup name (\"%s\") in response of \"GROUP %s\" command: \"%s\"" -msgstr "错误新闻群组å称 (“%sâ€) 于“群组 %sâ€å‘½ä»¤ï¼šâ€œ%sâ€çš„回应之中" +#, fuzzy +msgid "Disconnecting from server..." +msgstr "从æœåŠ¡å™¨ä¸­æ–­è¿žæŽ¥â€¦\n" #: src/lang.c:1109 #, c-format @@ -5412,65 +5407,69 @@ msgstr "NFC" msgid "NFD" msgstr "NFD" -#: src/lang.c:1586 +#: src/lang.c:1580 +msgid "NFKC case fold" +msgstr "" + +#: src/lang.c:1589 msgid "Display Options" msgstr "显示选项" -#: src/lang.c:1593 +#: src/lang.c:1596 msgid "Color Options" msgstr "颜色选项" -#: src/lang.c:1599 +#: src/lang.c:1602 msgid "Highlight Options" msgstr "çªæ˜¾é€‰é¡¹" -#: src/lang.c:1606 +#: src/lang.c:1609 msgid "Article-Limiting Options" msgstr "文章é™åˆ¶é€‰é¡¹" -#: src/lang.c:1612 +#: src/lang.c:1615 msgid "Posting/Mailing Options" msgstr "å¼ è´´/邮寄选项" -#: src/lang.c:1618 +#: src/lang.c:1621 msgid "Saving/Printing Options" msgstr "ä¿å­˜/打å°é€‰é¡¹" -#: src/lang.c:1624 +#: src/lang.c:1627 msgid "Expert Options" msgstr "专家选项" -#: src/lang.c:1630 +#: src/lang.c:1633 msgid "Filtering Options" msgstr "筛选选项" -#: src/lang.c:1635 src/lang.c:1666 src/lang.c:1672 src/lang.c:1699 -#: src/lang.c:1751 src/lang.c:1757 src/lang.c:1767 src/lang.c:1778 -#: src/lang.c:1796 src/lang.c:1865 src/lang.c:2066 src/lang.c:2072 -#: src/lang.c:2078 src/lang.c:2084 src/lang.c:2096 src/lang.c:2103 -#: src/lang.c:2157 src/lang.c:2166 src/lang.c:2172 src/lang.c:2179 -#: src/lang.c:2186 src/lang.c:2193 src/lang.c:2200 src/lang.c:2207 -#: src/lang.c:2214 src/lang.c:2221 src/lang.c:2228 src/lang.c:2235 -#: src/lang.c:2242 src/lang.c:2249 src/lang.c:2256 src/lang.c:2263 -#: src/lang.c:2270 src/lang.c:2277 src/lang.c:2284 src/lang.c:2291 -#: src/lang.c:2298 src/lang.c:2305 src/lang.c:2312 src/lang.c:2319 -#: src/lang.c:2326 src/lang.c:2333 src/lang.c:2340 src/lang.c:2348 -#: src/lang.c:2364 src/lang.c:2371 src/lang.c:2378 src/lang.c:2385 -#: src/lang.c:2391 src/lang.c:2397 src/lang.c:2414 src/lang.c:2426 -#: src/lang.c:2461 src/lang.c:2514 src/lang.c:2528 src/lang.c:2534 -#: src/lang.c:2559 src/lang.c:2577 src/lang.c:2594 src/lang.c:2606 -#: src/lang.c:2639 src/lang.c:2675 src/lang.c:2695 src/lang.c:2730 -#: src/lang.c:2740 src/lang.c:2747 src/lang.c:2773 src/lang.c:2797 -#: src/lang.c:2870 src/lang.c:2884 src/lang.c:2892 src/lang.c:2906 -#: src/lang.c:2912 src/lang.c:2950 +#: src/lang.c:1638 src/lang.c:1669 src/lang.c:1675 src/lang.c:1702 +#: src/lang.c:1754 src/lang.c:1760 src/lang.c:1770 src/lang.c:1781 +#: src/lang.c:1799 src/lang.c:1868 src/lang.c:2069 src/lang.c:2075 +#: src/lang.c:2081 src/lang.c:2087 src/lang.c:2099 src/lang.c:2106 +#: src/lang.c:2160 src/lang.c:2169 src/lang.c:2175 src/lang.c:2182 +#: src/lang.c:2189 src/lang.c:2196 src/lang.c:2203 src/lang.c:2210 +#: src/lang.c:2217 src/lang.c:2224 src/lang.c:2231 src/lang.c:2238 +#: src/lang.c:2245 src/lang.c:2252 src/lang.c:2259 src/lang.c:2266 +#: src/lang.c:2273 src/lang.c:2280 src/lang.c:2287 src/lang.c:2294 +#: src/lang.c:2301 src/lang.c:2308 src/lang.c:2315 src/lang.c:2322 +#: src/lang.c:2329 src/lang.c:2336 src/lang.c:2343 src/lang.c:2351 +#: src/lang.c:2367 src/lang.c:2374 src/lang.c:2381 src/lang.c:2388 +#: src/lang.c:2394 src/lang.c:2400 src/lang.c:2417 src/lang.c:2429 +#: src/lang.c:2464 src/lang.c:2517 src/lang.c:2531 src/lang.c:2537 +#: src/lang.c:2562 src/lang.c:2580 src/lang.c:2597 src/lang.c:2609 +#: src/lang.c:2642 src/lang.c:2678 src/lang.c:2698 src/lang.c:2733 +#: src/lang.c:2743 src/lang.c:2750 src/lang.c:2776 src/lang.c:2800 +#: src/lang.c:2877 src/lang.c:2892 src/lang.c:2900 src/lang.c:2914 +#: src/lang.c:2920 src/lang.c:2958 msgid " toggles, sets, cancels." msgstr " 切æ¢ï¼Œ 设置， å–消。" -#: src/lang.c:1636 +#: src/lang.c:1639 msgid "Show mini menu & posting etiquette" msgstr "显示迷你èœå• & 张贴礼仪" -#: src/lang.c:1637 +#: src/lang.c:1640 msgid "" "# If ON show a mini menu of useful commands at each level\n" "# and posting etiquette after composing an article\n" @@ -5478,15 +5477,15 @@ msgstr "" "# 如果打开就在æ¯ä¸ªå±‚级中显示常用命令的迷你èœå•\n" "# 并于撰写文章之åŽæ˜¾ç¤ºå¼ è´´ç¤¼ä»ª\n" -#: src/lang.c:1642 +#: src/lang.c:1645 msgid "Show short description for each newsgroup. toggles & sets." msgstr "显示æ¯ä¸ªæ–°é—»ç¾¤ç»„的简短æ述。 åˆ‡æ¢ & 设置。" -#: src/lang.c:1643 +#: src/lang.c:1646 msgid "Show description of each newsgroup" msgstr "显示æ¯ä¸ªæ–°é—»ç¾¤ç»„çš„æè¿°" -#: src/lang.c:1644 +#: src/lang.c:1647 msgid "" "# If ON show group description text after newsgroup name at\n" "# group selection level\n" @@ -5494,19 +5493,19 @@ msgstr "" "# 如果打开就在群组选择层级中于新闻群组å称之åŽ\n" "# 显示群组æ述文本\n" -#: src/lang.c:1649 +#: src/lang.c:1652 #, fuzzy msgid "" "Show From (author) fields in group & thread level. toggles & " "sets." msgstr "在群组èœå•ä¸­æ˜¾ç¤ºä¸»æ—¨ & å‘信者 (作者) 字段。 åˆ‡æ¢ & 设置。" -#: src/lang.c:1650 +#: src/lang.c:1653 #, fuzzy msgid "In group and thread level, show author by" msgstr "在群组èœå•ä¸­ï¼Œæ˜¾ç¤ºä½œè€…" -#: src/lang.c:1651 +#: src/lang.c:1654 #, fuzzy msgid "" "# Part of From field to display in group and thread level\n" @@ -5523,31 +5522,31 @@ msgstr "" "# * 2 = å…¨å\n" "# 3 = 两者\n" -#: src/lang.c:1660 +#: src/lang.c:1663 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "绘制 -> 或高亮度æ¡ç”¨äºŽé€‰æ‹©ã€‚ åˆ‡æ¢ & 设置。" -#: src/lang.c:1661 +#: src/lang.c:1664 msgid "Draw -> instead of highlighted bar" msgstr "绘制 -> 以代替高亮度æ¡" -#: src/lang.c:1662 +#: src/lang.c:1665 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "# 如果打开就使用 -> å¦åˆ™é«˜äº®åº¦æ¡ç”¨äºŽé€‰æ‹©\n" -#: src/lang.c:1667 +#: src/lang.c:1670 msgid "Use inverse video for page headers" msgstr "使用å白显示用于页é¢æ ‡å¤´" -#: src/lang.c:1668 +#: src/lang.c:1671 msgid "# If ON use inverse video for page headers at different levels\n" msgstr "# 如果打开就于ä¸åŒçš„层级使用å白显示用于页é¢æ ‡å¤´\n" -#: src/lang.c:1673 +#: src/lang.c:1676 msgid "Thread articles by" msgstr "讨论串文章ä¾æ®" -#: src/lang.c:1674 +#: src/lang.c:1677 msgid "" "# Thread articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5567,15 +5566,15 @@ msgstr "" "# 4 = 多部件主旨\n" "# 5 = 百分比匹é…\n" -#: src/lang.c:1685 +#: src/lang.c:1688 msgid "Enter percentage match required to thread together. sets." msgstr "输入将讨论串起所必需的百分比匹é…。 设置。" -#: src/lang.c:1686 +#: src/lang.c:1689 msgid "Thread percentage match" msgstr "讨论串百分比匹é…" -#: src/lang.c:1688 +#: src/lang.c:1691 #, no-c-format msgid "" "# Thread percentage match...\n" @@ -5598,11 +5597,11 @@ msgstr "" "# 任何æ’入。例如 happy å°†åŒ¹é… harpy，但 harpie, happie å’Œ harpy 会被分入å¦ä¸€" "篇帖å­ã€‚\n" -#: src/lang.c:1700 +#: src/lang.c:1703 msgid "Score of a thread" msgstr "讨论串的分数" -#: src/lang.c:1701 +#: src/lang.c:1704 msgid "" "# Thread score\n" "# Possible values are (the default is marked with *):\n" @@ -5616,16 +5615,16 @@ msgstr "" "# 1 = 总和\n" "# 2 = å¹³å‡\n" -#: src/lang.c:1709 +#: src/lang.c:1712 msgid "" "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "排åºæ–‡ç« ä¾æ®ä¸»é¢˜ã€å‘信者ã€æ—¥æœŸæˆ–分数。 åˆ‡æ¢ & 设置。" -#: src/lang.c:1710 +#: src/lang.c:1713 msgid "Sort articles by" msgstr "排åºæ–‡ç« ä¾æ®" -#: src/lang.c:1711 +#: src/lang.c:1714 msgid "" "# Sort articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5655,15 +5654,15 @@ msgstr "" "# 9 = 行数递å‡\n" "# 10 = 行数递å‡\n" -#: src/lang.c:1727 +#: src/lang.c:1730 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "排åºè®¨è®ºä¸²ä¸ä¾æ®ä»»ä½•ä¸œè¥¿æˆ–ä¾æ®åˆ†æ•°ã€‚ åˆ‡æ¢ & 设置。" -#: src/lang.c:1728 +#: src/lang.c:1731 msgid "Sort threads by" msgstr "排åºè®¨è®ºä¸²ä¾æ®" -#: src/lang.c:1729 +#: src/lang.c:1732 msgid "" "# Sort thread by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5681,44 +5680,44 @@ msgstr "" "# 3 = 最近一次张贴日期递å‡\n" "# 4 = 最近一次张贴日期递å‡\n" -#: src/lang.c:1739 +#: src/lang.c:1742 msgid "" "Put cursor at first/last unread art in groups. toggles & sets." msgstr "将光标放在群组中第一/最åŽä¸€ç¯‡æœªè¯»æ–‡ç« ã€‚ åˆ‡æ¢ & 设置。" -#: src/lang.c:1740 +#: src/lang.c:1743 msgid "Go to first unread article in group" msgstr "å‰å¾€ç¾¤ç»„中第一篇未读的文章" -#: src/lang.c:1741 +#: src/lang.c:1744 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "# 如果打开就将光标放在群组中第一篇未读文章，å¦åˆ™æ˜¯æœ€åŽä¸€ç¯‡æ–‡ç« \n" -#: src/lang.c:1745 +#: src/lang.c:1748 msgid "Show all articles or only unread articles. toggles & sets." msgstr "显示所有文章或åªæœ‰æœªè¯»æ–‡ç« ã€‚ åˆ‡æ¢ & 设置。" -#: src/lang.c:1746 +#: src/lang.c:1749 msgid "Show only unread articles" msgstr "åªæ˜¾ç¤ºæœªè¯»æ–‡ç« " -#: src/lang.c:1747 +#: src/lang.c:1750 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "# 如果打开就åªæ˜¾ç¤ºæ–°çš„/未读文章，å¦åˆ™å…¨éƒ¨æ˜¾ç¤ºã€‚\n" -#: src/lang.c:1752 +#: src/lang.c:1755 msgid "Show only groups with unread arts" msgstr "åªæ˜¾ç¤ºæœ‰æœªè¯»æ–‡ç« çš„群组" -#: src/lang.c:1753 +#: src/lang.c:1756 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "# 如果打开就åªæ˜¾ç¤ºåŒ…å«æœªè¯»æ–‡ç« çš„订阅群组。\n" -#: src/lang.c:1758 +#: src/lang.c:1761 msgid "Filter which articles" msgstr "筛选哪些文章" -#: src/lang.c:1759 +#: src/lang.c:1762 msgid "" "# Filter which articles\n" "# Possible values are (the default is marked with *):\n" @@ -5732,11 +5731,11 @@ msgstr "" "# 1 = ç é™¤æ‰€æœ‰æ–‡ç« å¹¶åœ¨è®¨è®ºä¸²ä¸­æ˜¾ç¤ºæ—¶ä»¥ K 标记\n" "# 2 = ç é™¤æ‰€æœ‰æ–‡ç« å¹¶æ°¸ä¸æ˜¾ç¤ºå®ƒä»¬\n" -#: src/lang.c:1768 +#: src/lang.c:1771 msgid "Go to the next unread article with" msgstr "å‰å¾€ä¸‹ä¸€ç¯‡æœªè¯»æ–‡ç« å€Ÿç”±" -#: src/lang.c:1769 +#: src/lang.c:1772 msgid "" "# Go to the unread article with following key(s)\n" "# Possible values are (the default is marked with *):\n" @@ -5752,11 +5751,11 @@ msgstr "" "# * 2 = TAB\n" "# 3 = PAGE DOWN 或 TAB\n" -#: src/lang.c:1779 +#: src/lang.c:1782 msgid "How to treat blank lines" msgstr "如何对待空行" -#: src/lang.c:1780 +#: src/lang.c:1783 msgid "" "# Trim the article body, remove unnecessary blank lines.\n" "# Possible values are (the default is marked with *):\n" @@ -5786,24 +5785,24 @@ msgstr "" "# 7 = 压缩文本区å—间的多é‡ç©ºè¡Œå’Œè·³è¿‡\n" "# å‰å¯¼å’Œå°¾éšç©ºè¡Œ\n" -#: src/lang.c:1797 +#: src/lang.c:1800 msgid "List thread using right arrow key" msgstr "使用å‘å³é”®åˆ—出讨论串" -#: src/lang.c:1798 +#: src/lang.c:1801 msgid "" "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "# 如果打开当使用å‘å³é”®è¾“入它时就自动列出讨论串。\n" -#: src/lang.c:1802 +#: src/lang.c:1805 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "输入字符以指出已删除文章。 设置， å–消。" -#: src/lang.c:1803 +#: src/lang.c:1806 msgid "Character to show deleted articles" msgstr "用æ¥æ˜¾ç¤ºå·²åˆ é™¤æ–‡ç« çš„字符" -#: src/lang.c:1804 +#: src/lang.c:1807 msgid "" "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" @@ -5811,16 +5810,16 @@ msgstr "" "# 用æ¥æ˜¾ç¤ºæ–‡ç« è¢«åˆ é™¤çš„字符 (缺çœâ€˜D’)\n" "# _ 被转æ¢ä¸ºâ€˜ ’\n" -#: src/lang.c:1809 +#: src/lang.c:1812 msgid "" "Enter character to indicate articles in a range. sets, cancels." msgstr "输入字符以指出在范围中的文章。 设置， å–消。" -#: src/lang.c:1810 +#: src/lang.c:1813 msgid "Character to show inrange articles" msgstr "用æ¥æ˜¾ç¤ºèŒƒå›´ä¸­æ–‡ç« çš„字符" -#: src/lang.c:1811 +#: src/lang.c:1814 msgid "" "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" @@ -5828,17 +5827,17 @@ msgstr "" "# 用æ¥æ˜¾ç¤ºæ–‡ç« åœ¨èŒƒå›´ä¸­çš„字符 (缺çœâ€˜#’)\n" "# _ 被转æ¢ä¸ºâ€˜ ’\n" -#: src/lang.c:1816 +#: src/lang.c:1819 msgid "" "Enter character to indicate that article will return. sets, " "cancels." msgstr "输入字符以指出该文章将返回。 设置， å–消。" -#: src/lang.c:1817 +#: src/lang.c:1820 msgid "Character to show returning arts" msgstr "用æ¥æ˜¾ç¤ºè¿”回文章的字符" -#: src/lang.c:1818 +#: src/lang.c:1821 msgid "" "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" @@ -5846,16 +5845,16 @@ msgstr "" "# 用æ¥æ˜¾ç¤ºè¯¥æ–‡ç« å°†è¿”回的字符 (缺çœâ€˜-’)\n" "# _ 被转æ¢ä¸ºâ€˜ ’\n" -#: src/lang.c:1823 +#: src/lang.c:1826 msgid "" "Enter character to indicate selected articles. sets, cancels." msgstr "输入字符以指出已选文章。 设置， å–消。" -#: src/lang.c:1824 +#: src/lang.c:1827 msgid "Character to show selected articles" msgstr "用æ¥æ˜¾ç¤ºå·²é€‰æ–‡ç« çš„字符" -#: src/lang.c:1825 +#: src/lang.c:1828 msgid "" "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" @@ -5863,15 +5862,15 @@ msgstr "" "# 用æ¥æ˜¾ç¤ºè¯¥æ–‡ç« å·²è¢«è‡ªåŠ¨é€‰å–的字符 (缺çœâ€˜*’)\n" "# _ 被转æ¢ä¸ºâ€˜ ’\n" -#: src/lang.c:1830 +#: src/lang.c:1833 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "输入字符以指出最近文章。 设置， å–消。" -#: src/lang.c:1831 +#: src/lang.c:1834 msgid "Character to show recent articles" msgstr "用æ¥æ˜¾ç¤ºæœ€è¿‘文章的字符" -#: src/lang.c:1832 +#: src/lang.c:1835 msgid "" "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" @@ -5879,15 +5878,15 @@ msgstr "" "# 用æ¥æ˜¾ç¤ºæ˜¯æœ€è¿‘文章的字符 (缺çœâ€˜o’)\n" "# _ 被转æ¢ä¸ºâ€˜ ’\n" -#: src/lang.c:1837 +#: src/lang.c:1840 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "输入字符以指出未读文章。 设置， å–消。" -#: src/lang.c:1838 +#: src/lang.c:1841 msgid "Character to show unread articles" msgstr "用æ¥æ˜¾ç¤ºæœªè¯»æ–‡ç« çš„字符" -#: src/lang.c:1839 +#: src/lang.c:1842 msgid "" "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" @@ -5895,15 +5894,15 @@ msgstr "" "# 用æ¥æ˜¾ç¤ºè¯¥æ–‡ç« æœªè¯»çš„字符 (缺çœâ€˜+’)\n" "# _ 被转æ¢ä¸ºâ€˜ ’\n" -#: src/lang.c:1844 +#: src/lang.c:1847 msgid "Enter character to indicate read articles. sets, cancels." msgstr "输入字符以指出已读文章。 设置， å–消。" -#: src/lang.c:1845 +#: src/lang.c:1848 msgid "Character to show read articles" msgstr "用æ¥æ˜¾ç¤ºå·²è¯»æ–‡ç« çš„字符" -#: src/lang.c:1846 +#: src/lang.c:1849 msgid "" "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" @@ -5911,15 +5910,15 @@ msgstr "" "# 用æ¥æ˜¾ç¤ºè¯¥æ–‡ç« å·²è¯»å–字符 (缺çœâ€˜ ’)\n" "# _ 被转æ¢ä¸ºâ€˜ ’\n" -#: src/lang.c:1851 +#: src/lang.c:1854 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "输入字符以指出被ç é™¤æ–‡ç« ã€‚ 设置， å–消。" -#: src/lang.c:1852 +#: src/lang.c:1855 msgid "Character to show killed articles" msgstr "用æ¥æ˜¾ç¤ºè¢«ç é™¤æ–‡ç« çš„字符" -#: src/lang.c:1853 +#: src/lang.c:1856 msgid "" "# Character used to show that an art was killed (default 'K')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" @@ -5927,16 +5926,16 @@ msgstr "" "# 用æ¥æ˜¾ç¤ºè¯¥æ–‡ç« è¢«ç é™¤çš„字符 (缺çœâ€˜K’)\n" "# kill_level 必须根æ®ä¸åŒæƒ…况而设置，_ 被转æ¢ä¸ºâ€˜ ’\n" -#: src/lang.c:1858 +#: src/lang.c:1861 msgid "" "Enter character to indicate read selected articles. sets, cancels." msgstr "输入字符以指出读å–所选文章。 设置， å–消。" -#: src/lang.c:1859 +#: src/lang.c:1862 msgid "Character to show readselected arts" msgstr "用æ¥æ˜¾ç¤ºè¯»å–所选文章的字符" -#: src/lang.c:1860 +#: src/lang.c:1863 msgid "" "# Character used to show that an art was selected before read (default ':')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" @@ -5944,11 +5943,11 @@ msgstr "" "# 用æ¥æ˜¾ç¤ºè¯¥æ–‡ç« è¯»å–之å‰å·²è¢«é€‰çš„字符 (缺çœâ€˜:’)\n" "# kill_level 必须根æ®ä¸åŒæƒ…况而设置，_ 被转æ¢ä¸ºâ€˜ ’\n" -#: src/lang.c:1866 +#: src/lang.c:1869 msgid "Abbreviate long newsgroup names" msgstr "将较长新闻群组å称缩写" -#: src/lang.c:1867 +#: src/lang.c:1870 msgid "" "# If ON abbreviate (if necessary) long newsgroup names at group selection\n" "# level and article level like this:\n" @@ -5958,17 +5957,17 @@ msgstr "" "# 层级和文章层级会如下所示：\n" "# news.software.readers -> n.software.readers -> n.s.readers -> n.s.r。\n" -#: src/lang.c:1873 +#: src/lang.c:1876 msgid "" "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" msgstr "0 = 整页å·åŠ¨ï¼Œ-1 = 显示上页最åŽä¸€è¡Œä¸ºä¸‹é¡µç¬¬ä¸€è¡Œï¼Œ-2 = åŠé¡µå·åŠ¨" -#: src/lang.c:1874 +#: src/lang.c:1877 msgid "Number of lines to scroll in pager" msgstr "页é¢åˆ‡æ¢æ—¶å·åŠ¨çš„行数" -#: src/lang.c:1875 +#: src/lang.c:1878 msgid "" "# Number of lines that cursor-up/down will scroll in article pager\n" "# Possible values are (the default is marked with *):\n" @@ -5986,28 +5985,28 @@ msgstr "" "# * 1 = å·åŠ¨ä¸€è¡Œ\n" "# 2 或更大 = å·åŠ¨ 2 或更多行 (åªæœ‰åœ¨é¡µé¢åˆ‡æ¢æ—¶)\n" -#: src/lang.c:1885 +#: src/lang.c:1888 msgid "Display signatures. toggles & sets." msgstr "显示签å。 åˆ‡æ¢ & 设置。" -#: src/lang.c:1886 +#: src/lang.c:1889 msgid "Display signatures" msgstr "显示签å" -#: src/lang.c:1887 +#: src/lang.c:1890 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "# 如果关闭于显示文章时就ä¸æ˜¾ç¤ºç­¾å\n" -#: src/lang.c:1891 +#: src/lang.c:1894 msgid "" "Display uuencoded data as tagged attachments. toggles & sets." msgstr "å°† uuencoded æ•°æ®æ˜¾ç¤ºä¸ºå·²æ ‡è®°é™„件。 åˆ‡æ¢ & 设置。" -#: src/lang.c:1892 +#: src/lang.c:1895 msgid "Display uue data as an attachment" msgstr "å°† uue æ•°æ®ä½œä¸ºé™„件显示" -#: src/lang.c:1893 +#: src/lang.c:1896 msgid "" "# Handling of uuencoded data in the pager\n" "# Possible values are (the default is marked with *):\n" @@ -6026,16 +6025,16 @@ msgstr "" "# 2 = éšè—所有，类似 1，但是任何看æ¥åƒæ˜¯ uuencoded æ•°æ®çš„行，都将\n" "# 被折å ä¸ºä¸€æ ‡è®°è¡Œã€‚\n" -#: src/lang.c:1903 +#: src/lang.c:1906 msgid "" "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "解ç å¾·è¯­æ ·å¼ TeX å˜éŸ³ç¼–ç ä¸º ISO。 åˆ‡æ¢ & 设置。" -#: src/lang.c:1904 +#: src/lang.c:1907 msgid "Display \"a as Umlaut-a" msgstr "显示 \"a 为å˜éŸ³ a" -#: src/lang.c:1905 +#: src/lang.c:1908 msgid "" "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" @@ -6043,15 +6042,15 @@ msgstr "" "# 如果打开就解ç å¾·è¯­æ ·å¼ TeX å˜éŸ³ç¼–ç ä¸º ISO 并\n" "# 显示 \"a 为å˜éŸ³ a ...等等\n" -#: src/lang.c:1910 src/lang.c:1920 +#: src/lang.c:1913 src/lang.c:1923 msgid "Space separated list of header fields" msgstr "以空格分隔的标头字段清å•" -#: src/lang.c:1911 +#: src/lang.c:1914 msgid "Display these header fields (or *)" msgstr "显示这些标头字段 (或 *)" -#: src/lang.c:1912 +#: src/lang.c:1915 msgid "" "# Which news headers you wish to see. If you want to see _all_ the headers,\n" "# place an '*' as this value. This is the only way a wildcard can be used.\n" @@ -6066,11 +6065,11 @@ msgstr "" "#‘X-’(åƒæ˜¯ X-Alan 或 X-Pape)。您å¯ä»¥å€Ÿç”±ä»¥ç©ºæ ¼åˆ†éš”而列出\n" "# 超过一个。没有定义任何值将会关闭这个选项。\n" -#: src/lang.c:1921 +#: src/lang.c:1924 msgid "Do not display these header fields" msgstr "ä¸æ˜¾ç¤ºè¿™äº›æ ‡å¤´å­—段" -#: src/lang.c:1922 +#: src/lang.c:1925 msgid "" "# Same as 'news_headers_to_display' except it denotes the opposite.\n" "# An example of using both options might be if you thought X- headers were\n" @@ -6089,40 +6088,40 @@ msgstr "" "# news_headers_to_not_display=X-Alan X-Pape\n" "# 没有定义任何值就表示关闭这个选项。\n" -#: src/lang.c:1932 +#: src/lang.c:1935 msgid "" "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "您è¦å¯ç”¨å¤šéƒ¨ä»¶/替代文章的自动处ç†å—？" -#: src/lang.c:1933 +#: src/lang.c:1936 msgid "Skip multipart/alternative parts" msgstr "跳过多部件/替代部分" -#: src/lang.c:1934 +#: src/lang.c:1937 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "# 如果打开就自动截除多部件/替代消æ¯\n" -#: src/lang.c:1938 +#: src/lang.c:1941 msgid "Enable detection of verbatim blocks? toggles & sets." msgstr "å¯ç”¨å­—é¢åŒºå—的侦测？ åˆ‡æ¢ & 设置。" -#: src/lang.c:1939 +#: src/lang.c:1942 msgid "Detection of verbatim blocks" msgstr "å­—é¢åŒºå—的侦测" -#: src/lang.c:1940 +#: src/lang.c:1943 msgid "# If ON detect verbatim blocks in articles\n" msgstr "# 如果打开就在文章中侦测字é¢åŒºå—\n" -#: src/lang.c:1945 +#: src/lang.c:1948 msgid "A regex used to decide which lines to show in col_quote." msgstr "用æ¥å†³å®šåœ¨ col_quote 中è¦æ˜¾ç¤ºå“ªäº›è¡Œçš„ regex。" -#: src/lang.c:1946 +#: src/lang.c:1949 msgid "Regex used to show quoted lines" msgstr "用æ¥æ˜¾ç¤ºå¼•è¨€è¡Œçš„ regex" -#: src/lang.c:1947 +#: src/lang.c:1950 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" @@ -6132,15 +6131,15 @@ msgstr "" "# 正则表达å¼ã€‚引言行将以 col_quote 显示。\n" "# 如果您ä¿ç•™å®ƒä¸ºç©ºç™½ï¼Œtin 将使用内置的默认值。\n" -#: src/lang.c:1953 +#: src/lang.c:1956 msgid "A regex used to decide which lines to show in col_quote2." msgstr "用æ¥å†³å®šè¦ä»¥ col_quote2 显示哪些行的 regex。" -#: src/lang.c:1954 +#: src/lang.c:1957 msgid "Regex used to show twice quoted l." msgstr "用æ¥æ˜¾ç¤ºç¬¬äºŒå±‚引言行的 regex。" -#: src/lang.c:1955 +#: src/lang.c:1958 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" @@ -6150,15 +6149,15 @@ msgstr "" "# 正则表达å¼ã€‚第二层引言行将以 col_quote2 显示。\n" "# 如果您ä¿ç•™å®ƒä¸ºç©ºç™½ï¼Œtin 将使用内置的默认值。\n" -#: src/lang.c:1961 +#: src/lang.c:1964 msgid "A regex used to decide which lines to show in col_quote3." msgstr "用æ¥å†³å®šè¦ä»¥ col_quote3 显示哪些行的 regex。" -#: src/lang.c:1962 +#: src/lang.c:1965 msgid "Regex used to show >= 3 times q.l." msgstr "用æ¥æ˜¾ç¤º >= 3 层引言行的 regex。" -#: src/lang.c:1963 +#: src/lang.c:1966 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" @@ -6168,32 +6167,32 @@ msgstr "" "# 正则表达å¼ã€‚>= 3 层引言行将以 col_quote3 显示。\n" "# 如果您ä¿ç•™å®ƒä¸ºç©ºç™½ï¼Œtin 将使用内置的默认值。\n" -#: src/lang.c:1969 +#: src/lang.c:1972 #, fuzzy msgid "Enable detection of external quotes? toggles & sets." msgstr "å¯ç”¨å­—é¢åŒºå—的侦测？ åˆ‡æ¢ & 设置。" -#: src/lang.c:1970 +#: src/lang.c:1973 #, fuzzy msgid "Detection of external quotes" msgstr "å­—é¢åŒºå—的侦测" -#: src/lang.c:1971 +#: src/lang.c:1974 #, fuzzy msgid "# If ON detect quoted text from external sources in articles\n" msgstr "# 如果打开就在文章中侦测字é¢åŒºå—\n" -#: src/lang.c:1975 +#: src/lang.c:1978 #, fuzzy msgid "A regex used to decide which lines to show in col_extquote." msgstr "用æ¥å†³å®šåœ¨ col_quote 中è¦æ˜¾ç¤ºå“ªäº›è¡Œçš„ regex。" -#: src/lang.c:1976 +#: src/lang.c:1979 #, fuzzy msgid "Regex used to show quotes from external sources" msgstr "用æ¥æ˜¾ç¤ºå¼•è¨€è¡Œçš„ regex" -#: src/lang.c:1977 +#: src/lang.c:1980 #, fuzzy msgid "" "# A regular expression that tin will use to decide which lines are\n" @@ -6204,15 +6203,15 @@ msgstr "" "# 正则表达å¼ã€‚第二层引言行将以 col_quote2 显示。\n" "# 如果您ä¿ç•™å®ƒä¸ºç©ºç™½ï¼Œtin 将使用内置的默认值。\n" -#: src/lang.c:1984 +#: src/lang.c:1987 msgid "A regex used to decide which words to show in col_markslashes." msgstr "用æ¥å†³å®šè¦ä»¥ col_markslashes 显示哪些字è¯çš„ regex。" -#: src/lang.c:1985 +#: src/lang.c:1988 msgid "Regex used to highlight /slashes/" msgstr "用æ¥é«˜äº®åº¦æ ‡ç¤º /斜线/ çš„ regex" -#: src/lang.c:1986 +#: src/lang.c:1989 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '/' are to be shown in col_markslashes.\n" @@ -6222,15 +6221,15 @@ msgstr "" "# 将以 col_markslashes 显示的正则表达å¼ã€‚\n" "# 如果您ä¿ç•™å®ƒä¸ºç©ºç™½ï¼Œtin 将使用内置的默认值。\n" -#: src/lang.c:1992 +#: src/lang.c:1995 msgid "A regex used to decide which words to show in col_markstars." msgstr "用æ¥å†³å®šè¦ä»¥ col_markstars 显示哪些字è¯çš„ regex。" -#: src/lang.c:1993 +#: src/lang.c:1996 msgid "Regex used to highlight *stars*" msgstr "用æ¥é«˜äº®åº¦æ˜¾ç¤º *星å·* çš„ regex" -#: src/lang.c:1994 +#: src/lang.c:1997 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '*' are to be shown in col_markstars.\n" @@ -6240,15 +6239,15 @@ msgstr "" "# 将以 col_markstars 显示的正则表达å¼ã€‚\n" "# 如果您ä¿ç•™å®ƒä¸ºç©ºç™½ï¼Œtin 将使用内置的默认值。\n" -#: src/lang.c:2000 +#: src/lang.c:2003 msgid "A regex used to decide which words to show in col_markstroke." msgstr "用æ¥å†³å®šè¦ä»¥ col_markstroke 显示哪些字è¯çš„ regex。" -#: src/lang.c:2001 +#: src/lang.c:2004 msgid "Regex used to highlight -strokes-" msgstr "用æ¥é«˜äº®åº¦æ˜¾ç¤º -横线- çš„ regex" -#: src/lang.c:2002 +#: src/lang.c:2005 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '-' are to be shown in col_markstroke.\n" @@ -6258,15 +6257,15 @@ msgstr "" "# 将以 col_markstroke 显示的正则表达å¼ã€‚\n" "# 如果您ä¿ç•™å®ƒä¸ºç©ºç™½ï¼Œtin 将使用内置的默认值。\n" -#: src/lang.c:2008 +#: src/lang.c:2011 msgid "A regex used to decide which words to show in col_markdash." msgstr "用æ¥å†³å®šè¦ä»¥ col_markdash 显示哪些字è¯çš„ regex。" -#: src/lang.c:2009 +#: src/lang.c:2012 msgid "Regex used to highlight _underline_" msgstr "用æ¥é«˜äº®åº¦æ˜¾ç¤º _底线_ çš„ regex" -#: src/lang.c:2010 +#: src/lang.c:2013 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '_' are to be shown in col_markdash.\n" @@ -6276,15 +6275,15 @@ msgstr "" "# 将以 col_markdash 显示的正则表达å¼ã€‚\n" "# 如果您ä¿ç•™å®ƒä¸ºç©ºç™½ï¼Œtin 将使用内置的默认值。\n" -#: src/lang.c:2016 +#: src/lang.c:2019 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "用æ¥å¯»æ‰¾è¦ç§»é™¤çš„主旨å‰ç¼€çš„ regex。 使用‘|’作为分隔符å·ã€‚" -#: src/lang.c:2017 +#: src/lang.c:2020 msgid "Regex with Subject prefixes" msgstr "主旨å‰ç¼€çš„ regex" -#: src/lang.c:2018 +#: src/lang.c:2021 msgid "" "# A regular expression that tin will use to find Subject prefixes\n" "# which will be removed before showing the header.\n" @@ -6292,15 +6291,15 @@ msgstr "" "# tin 将用æ¥å¯»æ‰¾ä¸»æ—¨å‰ç¼€çš„正则表达å¼\n" "# 于显示标头之å‰å°†è¢«ç§»é™¤ã€‚\n" -#: src/lang.c:2023 +#: src/lang.c:2026 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "用æ¥å¯»æ‰¾è¦ç§»é™¤çš„主旨åŽç¼€çš„ regex。 使用‘|’作为分隔符å·ã€‚" -#: src/lang.c:2024 +#: src/lang.c:2027 msgid "Regex with Subject suffixes" msgstr "主旨åŽç¼€çš„ regex" -#: src/lang.c:2025 +#: src/lang.c:2028 msgid "" "# A regular expression that tin will use to find Subject suffixes\n" "# which will be removed when replying or posting followup.\n" @@ -6308,49 +6307,50 @@ msgstr "" "# tin 将用æ¥å¯»æ‰¾ä¸»æ—¨åŽç¼€çš„正则表达å¼\n" "# 于回å¤æˆ–跟贴时将被移除。\n" -#: src/lang.c:2030 +#: src/lang.c:2033 msgid "A regex used to find the begin of a verbatim block." msgstr "用æ¥æ‰¾å¯»å­—é¢åŒºå—开始的 regex。" -#: src/lang.c:2031 +#: src/lang.c:2034 msgid "Regex for begin of a verbatim block" msgstr "用于字é¢åŒºå—开始的 regex" -#: src/lang.c:2032 +#: src/lang.c:2035 msgid "" "# A regular expression that tin will use to find the begin of\n" "# a verbatim block.\n" msgstr "# tin 将用æ¥æ‰¾å¯»å­—é¢åŒºå—开始的正则表达å¼ã€‚\n" -#: src/lang.c:2037 +#: src/lang.c:2040 msgid "A regex used to find the end of a verbatim block." msgstr "用æ¥æ‰¾å¯»å­—é¢åŒºå—结æŸçš„ regex。" -#: src/lang.c:2038 +#: src/lang.c:2041 msgid "Regex for end of a verbatim block" msgstr "用于字é¢åŒºå—结æŸçš„ regex" -#: src/lang.c:2039 +#: src/lang.c:2042 msgid "" "# A regular expression that tin will use to find the end of\n" "# a verbatim block.\n" msgstr "# tin 将用æ¥æ‰¾å¯»å­—é¢åŒºå—结æŸçš„正则表达å¼ã€‚\n" -#: src/lang.c:2044 +#: src/lang.c:2047 msgid "" "Enter name and options for external MIME viewer, --internal for built-in " "viewer" msgstr "输入外部 MIME 查看器的å称和选项，--internal 表示内置查看器" -#: src/lang.c:2045 +#: src/lang.c:2048 msgid "MIME binary content viewer" msgstr "MIME 二进制内容查看器" -#: src/lang.c:2046 +#: src/lang.c:2049 +#, fuzzy 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 " +"# Otherwise specify an external viewer program (eg. metamail) or leave " "blank\n" "# for no automatic viewing\n" msgstr "" @@ -6359,15 +6359,15 @@ msgstr "" "# å¦åˆ™è¯·æŒ‡å®šå¤–éƒ¨æŸ¥çœ‹å™¨ç¨‹åº (例：metamail) 或ä¿æŒç©ºç™½ä»¥\n" "# 表示ä¸è¦è‡ªåŠ¨æŸ¥çœ‹\n" -#: src/lang.c:2053 +#: src/lang.c:2056 msgid "Confirm before starting non-text viewing program" msgstr "å¯åŠ¨éžçº¯æ–‡æœ¬æŸ¥çœ‹ç¨‹åºä¹‹å‰å…ˆç¡®è®¤" -#: src/lang.c:2054 +#: src/lang.c:2057 msgid "Ask before using MIME viewer" msgstr "使用 MIME 查看器之å‰å…ˆè¯¢é—®" -#: src/lang.c:2055 +#: src/lang.c:2058 msgid "" "# If ON tin will ask before using metamail to display MIME messages\n" "# this only happens if metamail_prog is set to something\n" @@ -6375,84 +6375,84 @@ msgstr "" "# 如果打开，tin 将于使用 metamail 显示 MIME 消æ¯ä¹‹å‰å…ˆè¯¢é—®\n" "# åªæœ‰å½“ metamail_prog 已设置为æŸä¸ªå€¼æ—¶ï¼Œè¿™æ‰ä¼šå‘生\n" -#: src/lang.c:2060 +#: src/lang.c:2063 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "离开时询问是å¦å°†ç¾¤ç»„标记为已读。 åˆ‡æ¢ & 设置。" -#: src/lang.c:2061 +#: src/lang.c:2064 msgid "Catchup read groups when quitting" msgstr "离开时将已读群组设回未读" -#: src/lang.c:2062 +#: src/lang.c:2065 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "# 如果打开就询问用户是å¦æ‰€æœ‰å·²è¯»ç¾¤ç»„应该都被标记为已读\n" -#: src/lang.c:2067 +#: src/lang.c:2070 msgid "Catchup group using left key" msgstr "使用å‘左键将群组设回未读" -#: src/lang.c:2068 +#: src/lang.c:2071 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "# 如果打开则当以å‘左键离开时，将群组/讨论串设回未读。\n" -#: src/lang.c:2073 +#: src/lang.c:2076 msgid "Catchup thread by using left key" msgstr "使用å‘左键将讨论串设回未读" -#: src/lang.c:2079 +#: src/lang.c:2082 msgid "Which actions require confirmation" msgstr "哪些动作需è¦ç¡®è®¤" -#: src/lang.c:2080 +#: src/lang.c:2083 msgid "# What should we ask confirmation for.\n" msgstr "# 我们应该对于什么询问确认。\n" -#: src/lang.c:2085 +#: src/lang.c:2088 msgid "'Mark as (un)read' ignores tags" msgstr "‘标记为(未)已读’忽略标记" -#: src/lang.c:2086 +#: src/lang.c:2089 msgid "" "# If ON the 'Mark as (un)read' function marks only the current article.\n" msgstr "# 如果打开则‘标记为(未)已读’功能åªä¼šæ ‡è®°ç›®å‰çš„文章。\n" -#: src/lang.c:2090 +#: src/lang.c:2093 msgid "Program to run to open URLs, sets, cancels." msgstr "è¿è¡Œä»¥æ‰“开网å€çš„程åºï¼Œ 设置， å–消。" -#: src/lang.c:2091 +#: src/lang.c:2094 msgid "Program that opens URLs" msgstr "打开网å€çš„程åº" -#: src/lang.c:2092 +#: src/lang.c:2095 msgid "# The program used to open URLs. The actual URL will be appended\n" msgstr "# 用æ¥æ‰“开网å€çš„程åºã€‚将会附加实际的网å€\n" -#: src/lang.c:2097 +#: src/lang.c:2100 msgid "Use mouse in xterm" msgstr "在 xterm 中使用鼠标" -#: src/lang.c:2098 +#: src/lang.c:2101 msgid "# If ON enable mouse button support on xterm terminals\n" msgstr "# 如果打开就å¯ç”¨ xterm 终端机对于鼠标按钮的支æŒ\n" -#: src/lang.c:2104 +#: src/lang.c:2107 msgid "Use scroll keys on keypad" msgstr "使用数字键盘上的å·åŠ¨é”®" -#: src/lang.c:2105 +#: src/lang.c:2108 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "# 如果打开就在有支æŒå·åŠ¨é”®çš„终端机上å¯ç”¨å®ƒ\n" -#: src/lang.c:2110 +#: src/lang.c:2113 msgid "Enter maximum number of article to get. sets." msgstr "输入è¦æå–文章的最大值数é‡ã€‚ 设置。" -#: src/lang.c:2111 +#: src/lang.c:2114 msgid "Number of articles to get" msgstr "è¦æå–文章的数é‡" -#: src/lang.c:2112 +#: src/lang.c:2115 msgid "" "# Number of articles to get (0=no limit), if negative sets maximum number\n" "# of already read articles to be read before first unread one\n" @@ -6460,28 +6460,28 @@ msgstr "" "# è¦æå–æ–‡ç« çš„æ•°é‡ (0=æ— é™åˆ¶)，如果为负就设置\n" "# 为第一篇未读文章之å‰è¦è¯»å–的已读文章最大值\n" -#: src/lang.c:2117 +#: src/lang.c:2120 msgid "Enter number of days article is considered recent. sets." msgstr "输入被认为最近文章的日数。 设置。" -#: src/lang.c:2118 +#: src/lang.c:2121 msgid "Article recentness time limit" msgstr "最近文章的时间é™åˆ¶" -#: src/lang.c:2119 +#: src/lang.c:2122 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "# 被认为是最近文章所需的日数，(0=关闭)\n" -#: src/lang.c:2123 +#: src/lang.c:2126 msgid "" "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "WILDMAT 用于一般通é…符，REGEX 用于完整正则表达å¼åŒ¹é…。" -#: src/lang.c:2124 +#: src/lang.c:2127 msgid "Wildcard matching" msgstr "通é…符匹é…" -#: src/lang.c:2125 +#: src/lang.c:2128 msgid "" "# Wildcard matching\n" "# Possible values are (the default is marked with *):\n" @@ -6493,59 +6493,59 @@ msgstr "" "# * 0 = wildmat\n" "# 1 = regex\n" -#: src/lang.c:2132 +#: src/lang.c:2135 msgid "Enter minimal score before an article is marked killed. sets." msgstr "输入文章被标记ç é™¤ä¹‹å‰çš„最少分数。 设置。" -#: src/lang.c:2133 +#: src/lang.c:2136 msgid "Score limit (kill)" msgstr "分数é™åˆ¶ (ç é™¤)" -#: src/lang.c:2134 +#: src/lang.c:2137 msgid "# Score limit before an article is marked killed\n" msgstr "# 文章被标记ç é™¤ä¹‹å‰çš„分数é™åˆ¶\n" -#: src/lang.c:2138 +#: src/lang.c:2141 msgid "Enter default score to kill articles. sets." msgstr "输入ç é™¤æ–‡ç« çš„缺çœåˆ†æ•°ã€‚ 设置。" -#: src/lang.c:2139 +#: src/lang.c:2142 msgid "Default score to kill articles" msgstr "ç é™¤æ–‡ç« çš„缺çœåˆ†æ•°" -#: src/lang.c:2140 +#: src/lang.c:2143 msgid "# Default score to kill articles\n" msgstr "# ç é™¤æ–‡ç« çš„缺çœåˆ†æ•°\n" -#: src/lang.c:2144 +#: src/lang.c:2147 msgid "Enter minimal score before an article is marked hot. sets." msgstr "输入文章被标记热门之å‰çš„最少分数。 设置。" -#: src/lang.c:2145 +#: src/lang.c:2148 msgid "Score limit (select)" msgstr "分数é™åˆ¶ (选å–)" -#: src/lang.c:2146 +#: src/lang.c:2149 msgid "# Score limit before an article is marked hot\n" msgstr "# 文章被标记热门之å‰çš„分数é™åˆ¶\n" -#: src/lang.c:2150 +#: src/lang.c:2153 msgid "Enter default score to select articles. sets." msgstr "输入选å–文章的缺çœåˆ†æ•°ã€‚ 设置。" -#: src/lang.c:2151 +#: src/lang.c:2154 msgid "Default score to select articles" msgstr "选å–文章的缺çœåˆ†æ•°" -#: src/lang.c:2152 +#: src/lang.c:2155 msgid "# Default score to select articles\n" msgstr "# 选å–文章的缺çœåˆ†æ•°\n" -#: src/lang.c:2158 +#: src/lang.c:2161 msgid "Use slrnface to show ''X-Face:''s" msgstr "使用 slrnface 以显示‘X-Face:’" -#: src/lang.c:2159 +#: src/lang.c:2162 msgid "" "# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n" "# Only useful when running in an xterm.\n" @@ -6553,19 +6553,19 @@ msgstr "" "# 如果打开就使用 slrnface(1) 以解译‘X-Face:’标头。\n" "# åªæœ‰åœ¨ xterm 中è¿è¡Œæ—¶æ‰æœ‰ä½œç”¨ã€‚\n" -#: src/lang.c:2167 +#: src/lang.c:2170 msgid "Use ANSI color" msgstr "使用 ANSI 颜色" -#: src/lang.c:2168 +#: src/lang.c:2171 msgid "# If ON using ANSI-color\n" msgstr "# 如果打开就使用 ANSI 颜色\n" -#: src/lang.c:2173 +#: src/lang.c:2176 msgid "Standard foreground color" msgstr "标准å‰æ™¯é¢œè‰²" -#: src/lang.c:2174 +#: src/lang.c:2177 msgid "" "# Standard foreground color\n" "# Default: -1 (default color)\n" @@ -6573,11 +6573,11 @@ msgstr "" "# 标准å‰æ™¯é¢œè‰²\n" "# 缺çœï¼š-1 (缺çœé¢œè‰²)\n" -#: src/lang.c:2180 +#: src/lang.c:2183 msgid "Standard background color" msgstr "标准背景颜色" -#: src/lang.c:2181 +#: src/lang.c:2184 msgid "" "# Standard background color\n" "# Default: -1 (default color)\n" @@ -6585,11 +6585,11 @@ msgstr "" "# 标准背景颜色\n" "# 缺çœï¼š-1 (缺çœé¢œè‰²)\n" -#: src/lang.c:2187 +#: src/lang.c:2190 msgid "Color for inverse text (background)" msgstr "å白文本的颜色 (背景)" -#: src/lang.c:2188 +#: src/lang.c:2191 msgid "" "# Color of background for inverse text\n" "# Default: 4 (blue)\n" @@ -6597,11 +6597,11 @@ msgstr "" "# å白文本的背景颜色\n" "# 缺çœï¼š4 (è“色)\n" -#: src/lang.c:2194 +#: src/lang.c:2197 msgid "Color for inverse text (foreground)" msgstr "å白文本的颜色 (å‰æ™¯)" -#: src/lang.c:2195 +#: src/lang.c:2198 msgid "" "# Color of foreground for inverse text\n" "# Default: 7 (white)\n" @@ -6609,11 +6609,11 @@ msgstr "" "# å白文本的å‰æ™¯é¢œè‰²\n" "# 缺çœï¼š7 (白色)\n" -#: src/lang.c:2201 +#: src/lang.c:2204 msgid "Color of text lines" msgstr "文本行的颜色" -#: src/lang.c:2202 +#: src/lang.c:2205 msgid "" "# Color of text lines\n" "# Default: -1 (default color)\n" @@ -6621,11 +6621,11 @@ msgstr "" "# 文本行的颜色\n" "# 缺çœï¼š-1 (缺çœé¢œè‰²)\n" -#: src/lang.c:2208 +#: src/lang.c:2211 msgid "Color of mini help menu" msgstr "迷你说明èœå•çš„颜色" -#: src/lang.c:2209 +#: src/lang.c:2212 msgid "" "# Color of mini help menu\n" "# Default: 3 (brown)\n" @@ -6633,11 +6633,11 @@ msgstr "" "# 迷你说明èœå•çš„颜色\n" "# 缺çœï¼š3 (棕色)\n" -#: src/lang.c:2215 +#: src/lang.c:2218 msgid "Color of help text" msgstr "说明文本的颜色" -#: src/lang.c:2216 +#: src/lang.c:2219 msgid "" "# Color of help pages\n" "# Default: -1 (default color)\n" @@ -6645,11 +6645,11 @@ msgstr "" "# 说明页é¢çš„颜色\n" "# 缺çœï¼š-1 (缺çœé¢œè‰²)\n" -#: src/lang.c:2222 +#: src/lang.c:2225 msgid "Color of status messages" msgstr "状æ€æ¶ˆæ¯çš„颜色" -#: src/lang.c:2223 +#: src/lang.c:2226 msgid "" "# Color of messages in last line\n" "# Default: 6 (cyan)\n" @@ -6657,11 +6657,11 @@ msgstr "" "# 最åŽä¸€è¡Œä¸­æ¶ˆæ¯çš„颜色\n" "# 缺çœï¼š6 (é’色)\n" -#: src/lang.c:2229 +#: src/lang.c:2232 msgid "Color of quoted lines" msgstr "引言行的颜色" -#: src/lang.c:2230 +#: src/lang.c:2233 msgid "" "# Color of quote-lines\n" "# Default: 2 (green)\n" @@ -6669,11 +6669,11 @@ msgstr "" "# 引言行的颜色\n" "# 缺çœï¼š2 (绿色)\n" -#: src/lang.c:2236 +#: src/lang.c:2239 msgid "Color of twice quoted line" msgstr "第二层引言行的颜色" -#: src/lang.c:2237 +#: src/lang.c:2240 msgid "" "# Color of twice quoted lines\n" "# Default: 3 (brown)\n" @@ -6681,11 +6681,11 @@ msgstr "" "# 第二层引言行的颜色\n" "# 缺çœï¼š3 (棕色)\n" -#: src/lang.c:2243 +#: src/lang.c:2246 msgid "Color of =>3 times quoted line" msgstr "=>3 层引言行的颜色" -#: src/lang.c:2244 +#: src/lang.c:2247 msgid "" "# Color of >=3 times quoted lines\n" "# Default: 4 (blue)\n" @@ -6693,11 +6693,11 @@ msgstr "" "# =>3 层引言行的颜色\n" "# 缺çœï¼š4 (è“色)\n" -#: src/lang.c:2250 +#: src/lang.c:2253 msgid "Color of article header lines" msgstr "标头行的颜色" -#: src/lang.c:2251 +#: src/lang.c:2254 msgid "" "# Color of header-lines\n" "# Default: 2 (green)\n" @@ -6705,11 +6705,11 @@ msgstr "" "# 标头行的颜色\n" "# 缺çœï¼š2 (绿色)\n" -#: src/lang.c:2257 +#: src/lang.c:2260 msgid "Color of actual news header fields" msgstr "实际新闻标头字段的颜色" -#: src/lang.c:2258 +#: src/lang.c:2261 msgid "" "# Color of actual news header fields\n" "# Default: 9 (light red)\n" @@ -6717,11 +6717,11 @@ msgstr "" "# 实际新闻标头字段的颜色\n" "# 缺çœï¼š9 (浅红色)\n" -#: src/lang.c:2264 +#: src/lang.c:2267 msgid "Color of article subject lines" msgstr "文章主旨行的颜色" -#: src/lang.c:2265 +#: src/lang.c:2268 msgid "" "# Color of article subject\n" "# Default: 6 (cyan)\n" @@ -6729,12 +6729,12 @@ msgstr "" "# 文章主旨行的颜色\n" "# 缺çœï¼š6 (é’色)\n" -#: src/lang.c:2271 +#: src/lang.c:2274 #, fuzzy msgid "Color of external quotes" msgstr "文本行的颜色" -#: src/lang.c:2272 +#: src/lang.c:2275 #, fuzzy msgid "" "# Color of quoted text from external sources\n" @@ -6743,11 +6743,11 @@ msgstr "" "# å­—é¢åŒºå—的颜色\n" "# 缺çœï¼š5 (粉红)\n" -#: src/lang.c:2278 +#: src/lang.c:2281 msgid "Color of response counter" msgstr "回应计数器的颜色" -#: src/lang.c:2279 +#: src/lang.c:2282 msgid "" "# Color of response counter\n" "# Default: 2 (green)\n" @@ -6755,11 +6755,11 @@ msgstr "" "# 回应计数器的颜色\n" "# 缺çœï¼š2 (绿色)\n" -#: src/lang.c:2285 +#: src/lang.c:2288 msgid "Color of sender (From:)" msgstr "å‘é€è€…的颜色 ( From: )" -#: src/lang.c:2286 +#: src/lang.c:2289 msgid "" "# Color of sender (From:)\n" "# Default: 2 (green)\n" @@ -6767,11 +6767,11 @@ msgstr "" "# å‘é€è€…的颜色 ( From: )\n" "# 缺çœï¼š2 (绿色)\n" -#: src/lang.c:2292 +#: src/lang.c:2295 msgid "Color of help/mail sign" msgstr "说明/邮件签å的颜色" -#: src/lang.c:2293 +#: src/lang.c:2296 msgid "" "# Color of Help/Mail-Sign\n" "# Default: 4 (blue)\n" @@ -6779,11 +6779,11 @@ msgstr "" "# 说明/邮件签å的颜色\n" "# 缺çœï¼š4 (è“色)\n" -#: src/lang.c:2299 +#: src/lang.c:2302 msgid "Color of signatures" msgstr "ç­¾å的颜色" -#: src/lang.c:2300 +#: src/lang.c:2303 msgid "" "# Color of signature\n" "# Default: 4 (blue)\n" @@ -6791,11 +6791,11 @@ msgstr "" "# ç­¾å的颜色\n" "# 缺çœï¼š4 (è“色)\n" -#: src/lang.c:2306 +#: src/lang.c:2309 msgid "Color of highlighted URLs" msgstr "高亮度网å€çš„颜色" -#: src/lang.c:2307 +#: src/lang.c:2310 msgid "" "# Color of highlighted URLs\n" "# Default: -1 (default color)\n" @@ -6803,11 +6803,11 @@ msgstr "" "# 高亮度网å€çš„颜色\n" "# 缺çœï¼š-1 (缺çœé¢œè‰²)\n" -#: src/lang.c:2313 +#: src/lang.c:2316 msgid "Color of verbatim blocks" msgstr "å­—é¢åŒºå—的颜色" -#: src/lang.c:2314 +#: src/lang.c:2317 msgid "" "# Color of verbatim blocks\n" "# Default: 5 (pink)\n" @@ -6815,11 +6815,11 @@ msgstr "" "# å­—é¢åŒºå—的颜色\n" "# 缺çœï¼š5 (粉红)\n" -#: src/lang.c:2320 +#: src/lang.c:2323 msgid "Color of highlighting with *stars*" msgstr "高亮度显示 *星å·* 的颜色" -#: src/lang.c:2321 +#: src/lang.c:2324 msgid "" "# Color of word highlighting with *stars*\n" "# Default: 11 (yellow)\n" @@ -6827,11 +6827,11 @@ msgstr "" "# 高亮度显示 *星å·* å­—è¯çš„颜色\n" "# 缺çœï¼š11 (黄色)\n" -#: src/lang.c:2327 +#: src/lang.c:2330 msgid "Color of highlighting with _dash_" msgstr "高亮度显示 _底线_ 的颜色" -#: src/lang.c:2328 +#: src/lang.c:2331 msgid "" "# Color of word highlighting with _dash_\n" "# Default: 13 (light pink)\n" @@ -6839,11 +6839,11 @@ msgstr "" "# 高亮度显示 _底线_ å­—è¯çš„颜色\n" "# 缺çœï¼š13 (浅粉红)\n" -#: src/lang.c:2334 +#: src/lang.c:2337 msgid "Color of highlighting with /slash/" msgstr "高亮度显示 /斜线/ 的颜色" -#: src/lang.c:2335 +#: src/lang.c:2338 msgid "" "# Color of word highlighting with /slash/\n" "# Default: 14 (light cyan)\n" @@ -6851,11 +6851,11 @@ msgstr "" "# 高亮度显示 /斜线/ å­—è¯çš„颜色\n" "# 缺çœï¼š14 (æµ…è“绿色)\n" -#: src/lang.c:2341 +#: src/lang.c:2344 msgid "Color of highlighting with -stroke-" msgstr "高亮度显示 -横线- 的颜色" -#: src/lang.c:2342 +#: src/lang.c:2345 msgid "" "# Color of word highlighting with -stroke-\n" "# Default: 12 (light blue)\n" @@ -6863,11 +6863,11 @@ msgstr "" "# 高亮度显示 -横线- å­—è¯çš„颜色\n" "# 缺çœï¼š12 (æµ…è“色)\n" -#: src/lang.c:2349 +#: src/lang.c:2352 msgid "Attr. of highlighting with *stars*" msgstr "高亮度显示 *星å·* 的属性" -#: src/lang.c:2350 +#: src/lang.c:2353 msgid "" "# Attributes of word highlighting on mono terminals\n" "# Possible values are:\n" @@ -6895,11 +6895,11 @@ msgstr "" "# 高亮度显示 *星å·* å­—è¯çš„属性\n" "# 缺çœï¼š6 (粗体)\n" -#: src/lang.c:2365 +#: src/lang.c:2368 msgid "Attr. of highlighting with _dash_" msgstr "高亮度显示 _底线_ 的属性" -#: src/lang.c:2366 +#: src/lang.c:2369 msgid "" "# Attribute of word highlighting with _dash_\n" "# Default: 2 (best highlighting)\n" @@ -6907,11 +6907,11 @@ msgstr "" "# 高亮度显示 _底线_ å­—è¯çš„属性\n" "# 缺çœï¼š2 (最好高亮度显示)\n" -#: src/lang.c:2372 +#: src/lang.c:2375 msgid "Attr. of highlighting with /slash/" msgstr "高亮度显示 /斜线/ 的属性" -#: src/lang.c:2373 +#: src/lang.c:2376 msgid "" "# Attribute of word highlighting with /slash/\n" "# Default: 5 (half bright)\n" @@ -6919,11 +6919,11 @@ msgstr "" "# 高亮度显示 /斜线/ å­—è¯çš„属性\n" "# 缺çœï¼š5 (åŠæ˜Žäº®)\n" -#: src/lang.c:2379 +#: src/lang.c:2382 msgid "Attr. of highlighting with -stroke-" msgstr "高亮度显示 -横线- 的属性" -#: src/lang.c:2380 +#: src/lang.c:2383 msgid "" "# Attribute of word highlighting with -stroke-\n" "# Default: 3 (reverse video)\n" @@ -6931,27 +6931,27 @@ msgstr "" "# 高亮度显示 /斜线/ å­—è¯çš„属性\n" "# 缺çœï¼š3 (å白显示)\n" -#: src/lang.c:2386 +#: src/lang.c:2389 msgid "URL highlighting in message body" msgstr "在消æ¯å†…文中高亮度显示网å€" -#: src/lang.c:2387 +#: src/lang.c:2390 msgid "# Enable URL highlighting?\n" msgstr "# å¯ç”¨é«˜äº®åº¦æ˜¾ç¤ºç½‘å€ï¼Ÿ\n" -#: src/lang.c:2392 +#: src/lang.c:2395 msgid "Word highlighting in message body" msgstr "在消æ¯å†…文中高亮度显示字è¯" -#: src/lang.c:2393 +#: src/lang.c:2396 msgid "# Enable word highlighting?\n" msgstr "# å¯ç”¨é«˜äº®åº¦æ˜¾ç¤ºå­—è¯ï¼Ÿ\n" -#: src/lang.c:2398 +#: src/lang.c:2401 msgid "What to display instead of mark" msgstr "è¦æ˜¾ç¤ºä»€ä¹ˆä»¥ä»£æ›¿æ ‡è®°" -#: src/lang.c:2399 +#: src/lang.c:2402 msgid "" "# Should the leading and ending stars and dashes also be displayed,\n" "# even when they are highlighting marks?\n" @@ -6967,56 +6967,56 @@ msgstr "" "# 1 = 是，显示标记\n" "# * 2 = å°å‡ºç©ºæ ¼ä½œä¸ºæ›¿ä»£\n" -#: src/lang.c:2408 +#: src/lang.c:2411 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "输入在页é¢åˆ‡æ¢ä¸­ç”¨æ¥å°†æ–‡ç« æ¢è¡Œçš„æ å·ã€‚ 设置。" -#: src/lang.c:2409 +#: src/lang.c:2412 msgid "Page line wrap column" msgstr "页é¢è‡ªåŠ¨æ¢è¡Œæ å·" -#: src/lang.c:2410 +#: src/lang.c:2413 msgid "# Wrap article lines at column\n" msgstr "# 文章æ¢è¡ŒäºŽæ å·\n" -#: src/lang.c:2415 +#: src/lang.c:2418 msgid "Wrap around threads on next unread" msgstr "于下一篇未读回到开始部分讨论串" -#: src/lang.c:2416 +#: src/lang.c:2419 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "# 如果打开就于æœç´¢ä¸‹ä¸€ç¯‡æœªè¯»æ–‡ç« æ—¶å›žåˆ°å¼€å§‹éƒ¨åˆ†è®¨è®ºä¸²\n" -#: src/lang.c:2420 +#: src/lang.c:2423 msgid "Enter default mail address (and fullname). sets." msgstr "输入缺çœé‚®ä»¶åœ°å€ (以åŠå…¨å)。 设置。" -#: src/lang.c:2421 src/lang.c:2931 +#: src/lang.c:2424 src/lang.c:2939 msgid "Mail address (and fullname)" msgstr "é‚®ä»¶åœ°å€ (以åŠå…¨å)" -#: src/lang.c:2422 +#: src/lang.c:2425 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "# ç”¨æˆ·é‚®ä»¶åœ°å€ (以åŠå…¨å)，如果ä¸æ˜¯ 用户å@主机 (å…¨å)\n" -#: src/lang.c:2427 +#: src/lang.c:2430 msgid "Show empty Followup-To in editor" msgstr "在编辑器中显示空的跟贴" -#: src/lang.c:2428 +#: src/lang.c:2431 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "# 如果打开就于编辑文章时显示空的跟贴标头\n" -#: src/lang.c:2432 +#: src/lang.c:2435 msgid "" "Enter path/! command/--none to create your default signature. sets." msgstr "输入 path/! command/--none 以创建您的缺çœç­¾å。 设置。" -#: src/lang.c:2433 +#: src/lang.c:2436 msgid "Create signature from path/command" msgstr "从路径/命令创建签å" -#: src/lang.c:2434 +#: src/lang.c:2437 #, fuzzy, c-format msgid "" "# Signature path (random sigs)/file to be used when posting/replying\n" @@ -7030,41 +7030,41 @@ msgstr "" "# sigfile=!命令 è¿è¡Œå¤–部命令以产生签å\n" "# sigfile=--none ä¸é™„加签å\n" -#: src/lang.c:2442 +#: src/lang.c:2445 msgid "" "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "å°†å•ç‹¬ä¸€è¡Œçš„“-- â€å‰ç½®äºŽç­¾å。 åˆ‡æ¢ & 设置。" -#: src/lang.c:2443 +#: src/lang.c:2446 msgid "Prepend signature with \"-- \"" msgstr "将“-- â€å‰ç½®äºŽç­¾å" -#: src/lang.c:2444 +#: src/lang.c:2447 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "# 如果打开就将虚线‘\\n-- \\n’å‰ç½®äºŽç­¾å\n" -#: src/lang.c:2448 +#: src/lang.c:2451 msgid "Add signature when reposting articles. toggles & sets." msgstr "é‡æ–°å¼ è´´æ–‡ç« æ—¶åŠ å…¥ç­¾å。 åˆ‡æ¢ & 设置。" -#: src/lang.c:2449 +#: src/lang.c:2452 msgid "Add signature when reposting" msgstr "é‡æ–°å¼ è´´æ—¶åŠ å…¥ç­¾å" -#: src/lang.c:2450 +#: src/lang.c:2453 msgid "# If ON add signature to reposted articles\n" msgstr "# 如果打开就将签å加入é‡æ–°å¼ è´´çš„文章\n" -#: src/lang.c:2454 +#: src/lang.c:2457 #, c-format msgid "Enter quotation marks, %s or %S for author's initials." msgstr "输入引言符å·ã€%s 或 %S 作为作者的缩写。" -#: src/lang.c:2455 +#: src/lang.c:2458 msgid "Characters used as quote-marks" msgstr "作为引言符å·ä½¿ç”¨çš„字符" -#: src/lang.c:2456 +#: src/lang.c:2459 #, c-format msgid "" "# Characters used in quoting to followups and replies.\n" @@ -7073,11 +7073,11 @@ msgstr "" "# 字符已用于引言到跟éšå’Œå›žå¤ã€‚\n" "#‘_’被置æ¢ç”±â€˜ ’，%s，%S 被置æ¢ä¾ä½œè€…设置缩写。\n" -#: src/lang.c:2462 +#: src/lang.c:2465 msgid "Quoting behavior" msgstr "引言行为" -#: src/lang.c:2463 +#: src/lang.c:2466 msgid "" "# How quoting should be handled when following up or replying.\n" "# Possible values are (the default is marked with *):\n" @@ -7101,16 +7101,16 @@ msgstr "" "# 6 = 引用签å，引用空行\n" "# 7 = 压缩引言，引用签å，引用空行\n" -#: src/lang.c:2476 src/lang.c:2484 src/lang.c:2490 +#: src/lang.c:2479 src/lang.c:2487 src/lang.c:2493 msgid "" "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "%A åœ°å€ %D 日期 %F 地å€+å称 %G 群组å称 %M 消æ¯è¯†åˆ«å· %N å称 %C åå­—" -#: src/lang.c:2477 +#: src/lang.c:2480 msgid "Quote line when following up" msgstr "跟贴时的引言行" -#: src/lang.c:2478 +#: src/lang.c:2481 msgid "" "# Format of quote line when mailing/posting/following-up an article\n" "# %A Address %D Date %F Addr+Name %G Groupname %M Message-ID\n" @@ -7120,38 +7120,38 @@ msgstr "" "# %A åœ°å€ %D 日期 %F Addr+å称 %G 群组å称 %M 消æ¯è¯†åˆ«å·\n" "# %N å…¨å %C åå­— %I 缩写\n" -#: src/lang.c:2485 +#: src/lang.c:2488 msgid "Quote line when cross-posting" msgstr "è·¨æ¿å¼ è´´æ—¶çš„引言行" -#: src/lang.c:2491 +#: src/lang.c:2494 msgid "Quote line when mailing" msgstr "邮寄时的引言行" -#: src/lang.c:2496 +#: src/lang.c:2499 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "å¦‚æžœæ‰“å¼€å°±åŒ…å« User-Agent: 标头。 åˆ‡æ¢ & 设置。" -#: src/lang.c:2497 +#: src/lang.c:2500 msgid "Insert 'User-Agent:' header" msgstr "æ’入‘User-Agent:’标头" -#: src/lang.c:2498 +#: src/lang.c:2501 msgid "# If ON include advertising User-Agent: header\n" msgstr "# 如果打开就包å«ä½œä¸ºé€šå‘Šçš„ User-Agent: 标头\n" -#: src/lang.c:2503 +#: src/lang.c:2506 msgid "" "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" "输入用于 MIME 的字符集å称 (例如：US-ASCII, ISO-8859-1, EUC-KR)， 以设" "置。" -#: src/lang.c:2504 +#: src/lang.c:2507 msgid "MM_CHARSET" msgstr "MM_CHARSET" -#: src/lang.c:2505 +#: src/lang.c:2508 msgid "" "# Charset supported locally which is also used for MIME header and\n" "# Content-Type header.\n" @@ -7167,40 +7167,40 @@ msgstr "" "# 如果 MIME_STRICT_CHARSET 于编译时期被定义，那么 mm_charset 以外的\n" "# 字符集将被认为无法显示，并且以‘？’的方å¼è¡¨è¿°ã€‚\n" -#: src/lang.c:2515 +#: src/lang.c:2518 msgid "MM_NETWORK_CHARSET" msgstr "MM_NETWORK_CHARSET" -#: src/lang.c:2516 +#: src/lang.c:2519 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "# 在贴文中作为 MIME (内容类型) 标头的字符集。\n" -#: src/lang.c:2520 +#: src/lang.c:2523 msgid "" "Enter local charset name (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "输入本地字符集å称 (例如：US-ASCII, ISO-8859-1, EUC-KR)， 以设置。" -#: src/lang.c:2521 +#: src/lang.c:2524 msgid "MM_LOCAL_CHARSET" msgstr "MM_LOCAL_CHARSET" -#: src/lang.c:2522 +#: src/lang.c:2525 msgid "# Charset supported locally.\n" msgstr "# 本地支æŒçš„字符集。\n" -#: src/lang.c:2529 +#: src/lang.c:2532 msgid "Mailbox format" msgstr "信箱格å¼" -#: src/lang.c:2530 +#: src/lang.c:2533 msgid "# Format of the mailbox.\n" msgstr "# 信箱的格å¼ã€‚\n" -#: src/lang.c:2535 +#: src/lang.c:2538 msgid "MIME encoding in news messages" msgstr "在新闻消æ¯ä¸­çš„ MIME ç¼–ç " -#: src/lang.c:2536 +#: src/lang.c:2539 msgid "" "# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n" "# for mails and posts, if necessary. QP is efficient for most European\n" @@ -7214,15 +7214,15 @@ msgstr "" "# 而 Base64 对于包å«å¾ˆå¤š 8 比特字符的多数 8 比特东亚诸语ã€\n" "# 希腊语以åŠä¿„语字符集æ¥è¯´æ›´ä¸ºé€‚当。\n" -#: src/lang.c:2544 src/lang.c:2565 +#: src/lang.c:2547 src/lang.c:2568 msgid "Don't change unless you know what you are doing. cancels." msgstr "ä¸è¦å˜æ›´ï¼Œé™¤éžæ‚¨çŸ¥é“您在åšä»€ä¹ˆã€‚ å–消。" -#: src/lang.c:2545 +#: src/lang.c:2548 msgid "Use 8bit characters in news headers" msgstr "在新闻标头中使用 8 比特字符" -#: src/lang.c:2546 +#: src/lang.c:2549 msgid "" "# If ON, 8bit characters in news headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -7234,28 +7234,28 @@ msgstr "" "# é™¤éž post_mime_encoding åŒæ ·ä¹Ÿè¢«è®¾ç½®ä¸º 8 比特，\n" "# å¦åˆ™æ ‡å¤´ä¸­çš„ 8 比特字符将无视于此å‚数而被编ç ã€‚\n" -#: src/lang.c:2553 +#: src/lang.c:2556 msgid "" "Auto-view post-processed files toggles, sets, cancels." msgstr "自动查看处ç†åŽæ–‡ä»¶ 切æ¢ï¼Œ 设置， å–消。" -#: src/lang.c:2554 +#: src/lang.c:2557 msgid "View post-processed files" msgstr "查看处ç†åŽæ–‡ä»¶" -#: src/lang.c:2555 +#: src/lang.c:2558 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "# 如果设置，处ç†ä¹‹åŽçš„文件将在查看器中被打开\n" -#: src/lang.c:2560 +#: src/lang.c:2563 msgid "MIME encoding in mail messages" msgstr "邮件消æ¯ä¸­çš„ MIME ç¼–ç " -#: src/lang.c:2566 +#: src/lang.c:2569 msgid "Use 8bit characters in mail headers" msgstr "邮件标头中使用 8 比特字符" -#: src/lang.c:2567 +#: src/lang.c:2570 msgid "" "# If ON, 8bit characters in mail headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -7272,25 +7272,25 @@ msgstr "" "# ç¦æ­¢é‚®ä»¶æ ‡å¤´ä¸­çš„ 8 比特字符，因此建议您ä¸è¦å°†å®ƒæ‰“开，\n" "# 除éžæ‚¨æœ‰æŸäº›å¼ºåˆ¶çš„原因。\n" -#: src/lang.c:2578 +#: src/lang.c:2581 msgid "Strip blanks from ends of lines" msgstr "从行尾截除空白" -#: src/lang.c:2579 +#: src/lang.c:2582 msgid "" "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" msgstr "# 如果打开就从行尾截除空白，以便在较慢终端机上能较快显示。\n" -#: src/lang.c:2585 +#: src/lang.c:2588 msgid "If ON, use transliteration. toggles & sets." msgstr "如果打开就使用字é¢é‡è½¬è¯‘。 åˆ‡æ¢ & 设置。" -#: src/lang.c:2586 +#: src/lang.c:2589 msgid "Transliteration" msgstr "å­—é¢é‡è½¬è¯‘" -#: src/lang.c:2587 +#: src/lang.c:2590 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" @@ -7300,11 +7300,11 @@ msgstr "" "# 在目标字符集中被表述时，它å¯ä»¥é€è¿‡ä¸€ä¸ª\n" "# 或多个外观类似的字符所近似显示。\n" -#: src/lang.c:2595 +#: src/lang.c:2598 msgid "Send you a Cc/Bcc automatically" msgstr "自动å‘é€ç»™æ‚¨ä¸€ä»½å‰¯æœ¬/密件副本" -#: src/lang.c:2596 +#: src/lang.c:2599 msgid "" "# Put your name in the Cc: and/or Bcc: field when mailing an article.\n" "# Possible values are (the default is marked with *):\n" @@ -7320,25 +7320,25 @@ msgstr "" "# 2 = 密件副本\n" "# 3 = 副本和密件副本\n" -#: src/lang.c:2607 +#: src/lang.c:2610 msgid "Hash algorithm for Cancel-Lock/Cancel-Key" msgstr "" -#: src/lang.c:2608 +#: src/lang.c:2611 msgid "" "# Hash algorithm for Cancel-Lock/Cancel-Key (default 'sha1')\n" "# Use 'none' to not generate Cancel-Lock headers.\n" msgstr "" -#: src/lang.c:2614 +#: src/lang.c:2617 msgid "Enter address elements about which you want to be warned. sets." msgstr "输入您想è¦èŽ·å¾—相关警告的地å€å› ç´ ã€‚ 设置。" -#: src/lang.c:2615 +#: src/lang.c:2618 msgid "Spamtrap warning address parts" msgstr "垃圾邮件抓å–警告的地å€éƒ¨åˆ†" -#: src/lang.c:2616 +#: src/lang.c:2619 msgid "" "# A comma-delimited list of address-parts you want to be warned\n" "# about when trying to reply by email.\n" @@ -7346,27 +7346,27 @@ msgstr "" "# 当您å°è¯•ä»¥ç”µå­é‚®ä»¶å›žå¤æ—¶\n" "# 想è¦èŽ·å¾—相关警告而以逗å·åˆ†éš”的地å€éƒ¨åˆ†æ¸…å•ã€‚\n" -#: src/lang.c:2621 +#: src/lang.c:2624 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "输入筛选器æ¡ç›®ä¿æŒæœ‰æ•ˆçš„缺çœå¤©æ•°ã€‚ 设置。" -#: src/lang.c:2622 +#: src/lang.c:2625 msgid "No. of days a filter entry is valid" msgstr "筛选器æ¡ç›®æœ‰æ•ˆå¤©æ•°" -#: src/lang.c:2623 +#: src/lang.c:2626 msgid "# Number of days a short term filter will be active\n" msgstr "# 短期筛选器ä¿æŒä½œç”¨çš„天数\n" -#: src/lang.c:2627 +#: src/lang.c:2630 msgid "Add posted articles to filter. toggles & sets." msgstr "加入已张贴文章到筛选器。 åˆ‡æ¢ & 设置。" -#: src/lang.c:2628 +#: src/lang.c:2631 msgid "Add posted articles to filter" msgstr "加入已张贴文章到筛选器" -#: src/lang.c:2629 +#: src/lang.c:2632 msgid "" "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" @@ -7374,23 +7374,23 @@ msgstr "" "# 如果打开就加入开始新讨论串的已张贴文章到筛选器\n" "# 作为高亮度显示跟贴\n" -#: src/lang.c:2633 +#: src/lang.c:2636 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "将以 mailbox æ ¼å¼ä¿å­˜çš„文章/讨论串目录ä½ç½®ã€‚" -#: src/lang.c:2634 +#: src/lang.c:2637 msgid "Mail directory" msgstr "邮件目录" -#: src/lang.c:2635 +#: src/lang.c:2638 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "# (-m) 以 mailbox æ ¼å¼ä¿å­˜çš„文章/讨论串目录ä½ç½®\n" -#: src/lang.c:2640 +#: src/lang.c:2643 msgid "Save articles in batch mode (-S)" msgstr "以批次模å¼ä¿å­˜æ–‡ç«  (-S)" -#: src/lang.c:2641 +#: src/lang.c:2644 msgid "" "# If ON articles/threads will be saved in batch mode when save -S\n" "# or mail (-M/-N) is specified on the command line\n" @@ -7398,29 +7398,29 @@ msgstr "" "# 如果打开就于命令行上指定ä¿å­˜ -S 或邮寄 (-M/-N) æ—¶\n" "# 以批次模å¼ä¿å­˜æ–‡ç« /讨论串\n" -#: src/lang.c:2646 +#: src/lang.c:2649 msgid "The directory where you want articles/threads saved." msgstr "您想è¦ä¿å­˜æ–‡ç« /讨论串的目录ä½ç½®ã€‚" -#: src/lang.c:2647 +#: src/lang.c:2650 msgid "Directory to save arts/threads in" msgstr "è¦ä¿å­˜æ–‡ç« /讨论串的目录" -#: src/lang.c:2648 +#: src/lang.c:2651 msgid "# Directory where articles/threads are saved\n" msgstr "# ä¿å­˜æ–‡ç« /讨论串的目录ä½ç½®\n" -#: src/lang.c:2652 +#: src/lang.c:2655 msgid "" "Auto save article/thread by Archive-name: header. toggles & " "sets." msgstr "ä¾ Archive-name: 标头æ¥è‡ªåŠ¨ä¿å­˜æ–‡ç« /讨论串。 åˆ‡æ¢ & 设置。" -#: src/lang.c:2653 +#: src/lang.c:2656 msgid "Use Archive-name: header for save" msgstr "ä¿å­˜ä½¿ç”¨ Archive-name: 标头" -#: src/lang.c:2654 +#: src/lang.c:2657 msgid "" "# If ON articles/threads with Archive-name: in mail header will\n" "# be automatically saved with the Archive-name & part/patch no.\n" @@ -7428,29 +7428,29 @@ msgstr "" "# 如果打开就将在邮件标头中具有 Archive-name: 的文章/讨论串\n" "# 以存盘å称 & 部分/修补程åºå·ç è‡ªåŠ¨ä¿å­˜\n" -#: src/lang.c:2659 +#: src/lang.c:2662 msgid "" "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "将已ä¿å­˜çš„文章/讨论串标记为已读。 切æ¢ï¼Œ 设置， å–消。" -#: src/lang.c:2660 +#: src/lang.c:2663 msgid "Mark saved articles/threads as read" msgstr "将已ä¿å­˜çš„文章/讨论串标记为已读" -#: src/lang.c:2661 +#: src/lang.c:2664 msgid "# If ON mark articles that are saved as read\n" msgstr "# 如果打开就标记已ä¿å­˜çš„文章为已读\n" -#: src/lang.c:2665 +#: src/lang.c:2668 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "对于已ä¿å­˜çš„文章进行åŽç»­å¤„ç† (例如：截å–附件)。" -#: src/lang.c:2666 +#: src/lang.c:2669 msgid "Post process saved articles" msgstr "åŽç»­å¤„ç†å·²ä¿å­˜çš„文章" -#: src/lang.c:2667 +#: src/lang.c:2670 msgid "" "# Perform post processing (saving binary attachments) from saved articles.\n" "# Possible values are (the default is marked with *):\n" @@ -7464,62 +7464,62 @@ msgstr "" "# 1 = åªæˆªå–命令壳归档 (shar)\n" "# 2 = 是\n" -#: src/lang.c:2676 +#: src/lang.c:2679 msgid "Process only unread articles" msgstr "åªå¤„ç†æœªè¯»æ–‡ç« " -#: src/lang.c:2677 +#: src/lang.c:2680 msgid "" "# If ON only save/print/pipe/mail unread articles (tagged articles " "excepted)\n" msgstr "# å¦‚æžœæ‰“å¼€å°±åª ä¿å­˜/打å°/管é“/邮寄 未读文章 (除了已标记文章)\n" -#: src/lang.c:2682 +#: src/lang.c:2685 msgid "Print all or just part of header. toggles & sets." msgstr "打å°æ‰€æœ‰æˆ–是仅仅部分的标头。 åˆ‡æ¢ & 设置。" -#: src/lang.c:2683 +#: src/lang.c:2686 msgid "Print all headers when printing" msgstr "打å°æ—¶æ‰“å°æ‰€æœ‰æ ‡å¤´" -#: src/lang.c:2684 +#: src/lang.c:2687 msgid "" "# If ON print all of article header otherwise just the important lines\n" msgstr "# 如果打开就打å°æ‰€æœ‰çš„文章标头，å¦åˆ™ä»…打å°é‡è¦è¡Œ\n" -#: src/lang.c:2688 +#: src/lang.c:2691 msgid "" "The printer program with options that is to be used to print articles/" "threads." msgstr "将被用æ¥æ‰“å°æ–‡ç« /讨论串的打å°ç¨‹åºä»¥åŠé€‰é¡¹ã€‚" -#: src/lang.c:2689 +#: src/lang.c:2692 msgid "Printer program with options" msgstr "打å°ç¨‹åºä»¥åŠé€‰é¡¹" -#: src/lang.c:2690 +#: src/lang.c:2693 msgid "# Print program with parameters used to print articles/threads\n" msgstr "# 用æ¥æ‰“å°æ–‡ç« /讨论串的打å°ç¨‹åºä»¥åŠå‚æ•°\n" -#: src/lang.c:2696 +#: src/lang.c:2699 msgid "Force redraw after certain commands" msgstr "特定命令之åŽå¼ºåˆ¶é‡ç»˜" -#: src/lang.c:2697 +#: src/lang.c:2700 msgid "" "# If ON a screen redraw will always be done after certain external commands\n" msgstr "# 如果打开就于特定外部命令之åŽå°†ä¸€å¾‹å®Œæˆå±å¹•é‡ç»˜\n" -#: src/lang.c:2701 +#: src/lang.c:2704 msgid "" "Start editor with line offset. toggles, sets, cancels." msgstr "å¯å§‹ç¼–辑器以åŠè¡Œå移。 切æ¢ï¼Œ 设置， å–消。" -#: src/lang.c:2702 +#: src/lang.c:2705 msgid "Start editor with line offset" msgstr "å¯å§‹ç¼–辑器以åŠè¡Œå移" -#: src/lang.c:2703 +#: src/lang.c:2706 msgid "" "# If ON editor will be started with cursor offset into the file\n" "# otherwise the cursor will be positioned at the first line\n" @@ -7527,15 +7527,15 @@ msgstr "" "# 如果打开就å¯å§‹ç¼–辑器以åŠè¿›å…¥æ–‡ä»¶åŽçš„光标å移\n" "# å¦åˆ™å…‰æ ‡å°†è¢«å®šä½äºŽç¬¬ä¸€è¡Œ\n" -#: src/lang.c:2708 +#: src/lang.c:2711 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "输入 %E 作为编辑器，%F 作为文件å，%N 作为行å·ï¼Œ 以设置。" -#: src/lang.c:2709 +#: src/lang.c:2712 msgid "Invocation of your editor" msgstr "调用您的编辑器" -#: src/lang.c:2710 +#: src/lang.c:2713 msgid "" "# Format of editor line including parameters\n" "# %E Editor %F Filename %N Linenumber\n" @@ -7543,16 +7543,16 @@ msgstr "" "# æ ¼å¼çš„编辑器行包å«å‚æ•°\n" "# %E 编辑器 %F 文件å %N Linenumber\n" -#: src/lang.c:2715 +#: src/lang.c:2718 msgid "" "Enter name and options for external-inews, --internal for internal inews" msgstr "输入用于外部 inews çš„å称和选项，--internal 用于内部 inews" -#: src/lang.c:2716 +#: src/lang.c:2719 msgid "External inews" msgstr "外部 inews" -#: src/lang.c:2717 +#: src/lang.c:2720 msgid "" "# If --internal use the built in mini inews for posting via NNTP\n" "# otherwise use an external inews program\n" @@ -7560,18 +7560,18 @@ msgstr "" "# 如果设置 --internal 就使用内置的迷你 inews 作为é€è¿‡ NNTP å¼ è´´\n" "# å¦åˆ™ä½¿ç”¨å¤–部 inews 程åº\n" -#: src/lang.c:2721 +#: src/lang.c:2724 msgid "" "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" "输入 %M 作为邮件程åºï¼Œ%S 作为主旨，%T 作为收件者，%F 作为文件å， 以设" "置。" -#: src/lang.c:2722 +#: src/lang.c:2725 msgid "Invocation of your mail command" msgstr "调用您的邮寄命令" -#: src/lang.c:2723 +#: src/lang.c:2726 msgid "" "# Format of mailer line including parameters\n" "# %M Mailer %S Subject %T To %F Filename\n" @@ -7583,11 +7583,11 @@ msgstr "" "# 我。以使用 elm 作为您的邮件程åºï¼š elm -s“%Sâ€â€œ%Tâ€<%F\n" "# 我。elm äº¤äº’å¼ ï¼š elm -i %F -s“%Sâ€â€œ%Tâ€\n" -#: src/lang.c:2731 +#: src/lang.c:2734 msgid "Use interactive mail reader" msgstr "使用交互å¼é‚®ä»¶é˜…读器" -#: src/lang.c:2732 +#: src/lang.c:2735 msgid "" "# Interactive mailreader\n" "# Possible values are (the default is marked with *):\n" @@ -7601,32 +7601,32 @@ msgstr "" "# 1 = 使用交互å¼é‚®ä»¶é˜…读器以åŠæ–‡ä»¶ä¸­çš„标头\n" "# 2 = 使用交互å¼é‚®ä»¶é˜…读器而无需文件中的标头\n" -#: src/lang.c:2741 +#: src/lang.c:2744 msgid "Remove ~/.article after posting" msgstr "张贴之åŽç§»é™¤ ~/.article" -#: src/lang.c:2742 +#: src/lang.c:2745 msgid "# If ON remove ~/.article after posting.\n" msgstr "# 如果打开就于张贴之åŽç§»é™¤ ~/.article。\n" -#: src/lang.c:2748 +#: src/lang.c:2751 msgid "Use UTF-8 graphics (thread tree etc.)" msgstr "使用 UTF-8 图形 (树状讨论串等等…)" -#: src/lang.c:2749 +#: src/lang.c:2752 msgid "" "# If ON use UTF-8 characters for indicator '->', tree and ellipsis '...'.\n" msgstr "# 如果打开就使用 UTF-8 字符作为指示器‘->’ã€æ ‘状结构和çœç•¥ç¬¦å·â€˜â€¦â€™ã€‚\n" -#: src/lang.c:2754 +#: src/lang.c:2757 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "用于所有已张贴文章的文件å， 设置，没有文件å=ä¸ä¿å­˜ã€‚" -#: src/lang.c:2755 +#: src/lang.c:2758 msgid "Filename for posted articles" msgstr "用于已张贴文章的文件å" -#: src/lang.c:2756 +#: src/lang.c:2759 msgid "" "# Filename where to keep all postings (default posted)\n" "# If no filename is set then postings will not be saved\n" @@ -7634,36 +7634,36 @@ msgstr "" "# ä¿ç•™æ‰€æœ‰è´´æ–‡ (缺çœä¸ºå·²å¼ è´´) 的文件ä½ç½®\n" "# 如果没有设置文件å则ä¸ä¼šä¿å­˜è´´æ–‡\n" -#: src/lang.c:2761 +#: src/lang.c:2764 msgid "" "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "ä¿ç•™æ‰€æœ‰å¼ è´´å¤±è´¥çš„文章于 ~/dead.articles。 åˆ‡æ¢ & 设置。" -#: src/lang.c:2762 +#: src/lang.c:2765 msgid "Keep failed arts in ~/dead.articles" msgstr "ä¿ç•™å¼ è´´å¤±è´¥çš„文章于 ~/dead.articles" -#: src/lang.c:2763 +#: src/lang.c:2766 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "# 如果打开就ä¿ç•™æ‰€æœ‰å¼ è´´å¤±è´¥çš„贴文于 ~/dead.articles\n" -#: src/lang.c:2767 +#: src/lang.c:2770 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "您è¦ä»Ž .newsrc 截除已å–消订阅的群组" -#: src/lang.c:2768 +#: src/lang.c:2771 msgid "No unsubscribed groups in newsrc" msgstr "在 newsrc 中没有已å–消订阅的群组" -#: src/lang.c:2769 +#: src/lang.c:2772 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "# 如果打开就从 newsrc 截除已å–消订阅的群组\n" -#: src/lang.c:2774 +#: src/lang.c:2777 msgid "Remove bogus groups from newsrc" msgstr "从 newsrc 移除å‡é€ çš„群组" -#: src/lang.c:2775 +#: src/lang.c:2778 msgid "" "# What to do with bogus groups in newsrc file\n" "# Possible values are (the default is marked with *):\n" @@ -7677,64 +7677,64 @@ msgstr "" "# 1 = 移除\n" "# 2 = 以 D 高亮度显示于选择å±å¹•\n" -#: src/lang.c:2784 +#: src/lang.c:2787 msgid "" "Enter number of seconds to wait for a response from the server. sets." msgstr "输入从æœåŠ¡å™¨ç­‰å¾…回应的秒数。 表示设置。" -#: src/lang.c:2785 +#: src/lang.c:2788 msgid "NNTP read timeout in seconds" msgstr "NNTP 读å–超时的秒数" -#: src/lang.c:2786 +#: src/lang.c:2789 msgid "" "# Time in seconds to wait for a response from the server (0=no timeout)\n" msgstr "# 从æœåŠ¡å™¨ç­‰å¾…回应的秒数时间 (0=没有超时é™åˆ¶)\n" -#: src/lang.c:2791 +#: src/lang.c:2794 msgid "Enter number of seconds until active file will be reread. sets." msgstr "输入é‡æ–°è¯»å–现用文件的间隔秒数。 设置。" -#: src/lang.c:2792 +#: src/lang.c:2795 msgid "Interval in secs to reread active" msgstr "é‡æ–°è¯»å–现用文件的间隔(以秒为å•ä½)" -#: src/lang.c:2793 +#: src/lang.c:2796 msgid "" "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "# é‡æ–°è¯»å–现用文件的时间间隔秒数 (0=æ°¸ä¸)\n" -#: src/lang.c:2798 +#: src/lang.c:2801 msgid "Reconnect to server automatically" msgstr "自动é‡æ–°è¿žæŽ¥åˆ°æœåŠ¡å™¨" -#: src/lang.c:2799 +#: src/lang.c:2802 msgid "" "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "# 如果打开就于连接中断时自动é‡æ–°è¿žæŽ¥åˆ° NNTP æœåŠ¡å™¨\n" -#: src/lang.c:2803 +#: src/lang.c:2806 msgid "" "Create local copies of NNTP overview files. toggles & sets." msgstr "创建 NNTP 概述文件的本地å¤æœ¬ã€‚ åˆ‡æ¢ & 设置。" -#: src/lang.c:2804 +#: src/lang.c:2807 msgid "Cache NNTP overview files locally" msgstr "产生 NNTP 概述文件的本地缓存" -#: src/lang.c:2805 +#: src/lang.c:2808 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "# 如果打开就创建 NNTP 概述文件的本地å¤æœ¬ã€‚\n" -#: src/lang.c:2809 src/lang.c:2824 src/lang.c:2844 src/lang.c:2863 +#: src/lang.c:2812 src/lang.c:2827 src/lang.c:2847 src/lang.c:2866 msgid "Enter format string. sets, cancels." msgstr "输入格å¼å­—串。 设置， å–消。" -#: src/lang.c:2810 +#: src/lang.c:2813 msgid "Format string for selection level" msgstr "用于选择层级表示的格å¼å­—串" -#: src/lang.c:2811 +#: src/lang.c:2814 msgid "" "# Format string for selection level representation\n" "# Default: %f %n %U %G %d\n" @@ -7758,11 +7758,11 @@ msgstr "" "# %n 数字，å±å¹•ä¸Šçš„行数\n" "# %U 未读数\n" -#: src/lang.c:2825 +#: src/lang.c:2828 msgid "Format string for group level" msgstr "用于组层级表示的格å¼å­—串" -#: src/lang.c:2826 +#: src/lang.c:2829 msgid "" "# Format string for group level representation\n" "# Default: %n %m %R %L %s %F\n" @@ -7796,11 +7796,11 @@ msgstr "" "# %s 主题（仅组级）\n" "# %S 分数\n" -#: src/lang.c:2845 +#: src/lang.c:2848 msgid "Format string for thread level" msgstr "用于帖å­å±‚级的格å¼å­—串" -#: src/lang.c:2846 +#: src/lang.c:2849 msgid "" "# Format string for thread level representation\n" "# Default: %n %m [%L] %T %F\n" @@ -7834,19 +7834,20 @@ msgstr "" "# %T 帖å­æ ‘（仅帖级）\n" "\n" -#: src/lang.c:2864 +#: src/lang.c:2867 msgid "Format string for display of dates" msgstr "用于显示日期的格å¼å­—串" -#: src/lang.c:2865 +#: src/lang.c:2868 msgid "# Format string for date representation\n" msgstr "# 用于日期表示的格å¼å­—串\n" -#: src/lang.c:2871 +#: src/lang.c:2878 msgid "Unicode normalization form" msgstr "万国ç èŒƒå¼å½¢å¼" -#: src/lang.c:2872 +#: src/lang.c:2879 +#, fuzzy msgid "" "# Unicode normalization form\n" "# Possible values are:\n" @@ -7855,6 +7856,7 @@ msgid "" "# 2 = NFKD\n" "# 3 = NFC\n" "# 4 = NFD\n" +"# 5 = NFKC_CF\n" msgstr "" "# 万国ç èŒƒå¼å½¢å¼\n" "# å¯èƒ½çš„值为：\n" @@ -7864,19 +7866,19 @@ msgstr "" "# 3 = NFC\n" "# 4 = NFD\n" -#: src/lang.c:2885 +#: src/lang.c:2893 msgid "Render BiDi" msgstr "呈现åŒå‘文本" -#: src/lang.c:2886 +#: src/lang.c:2894 msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "# 如果打开就由 tin 呈现åŒå‘文本\n" -#: src/lang.c:2893 +#: src/lang.c:2901 msgid "Function for sorting articles" msgstr "用于排åºæ–‡ç« çš„函数" -#: src/lang.c:2894 +#: src/lang.c:2902 msgid "" "# Function for sorting articles\n" "# Possible values are (the default is marked with *):\n" @@ -7888,182 +7890,182 @@ msgstr "" "# * 0 = 快速排åº\n" "# 1 = 堆积排åº\n" -#: src/lang.c:2907 +#: src/lang.c:2915 msgid "Automatically GroupMarkUnselArtRead" msgstr "自动 GroupMarkUnselArtRead" -#: src/lang.c:2913 +#: src/lang.c:2921 msgid "Delete post-process files" msgstr "删除åŽç»­å¤„ç†æ–‡ä»¶" -#: src/lang.c:2918 +#: src/lang.c:2926 msgid "Filename for all mailed articles, sets, no filename=do not save." msgstr "用于所有已邮寄文章的文件å， 设置，没有文件å=ä¸ä¿å­˜ã€‚" -#: src/lang.c:2919 +#: src/lang.c:2927 msgid "Mailbox to save sent mails" msgstr "è¦ä¿å­˜å·²å‘é€é‚®ä»¶çš„ä¿¡ç®±" -#: src/lang.c:2924 +#: src/lang.c:2932 msgid "Set Followup-To: header to this group(s). sets, cancels." msgstr "设置 Followup-To: 标头为这个群组。 设置， å–消。" -#: src/lang.c:2925 +#: src/lang.c:2933 msgid "Followup-To: header" msgstr "Followup-To: 标头" -#: src/lang.c:2930 +#: src/lang.c:2938 msgid "Enter default mail address (and fullname). sets, cancels." msgstr "输入缺çœé‚®ä»¶åœ°å€ (附全å)。 设置， å–消。" -#: src/lang.c:2937 +#: src/lang.c:2945 msgid "" "Path and options for ispell-like spell-checker. sets, cancels." msgstr "作为类似 ispell 拼写检查器的路径和选项。 设置， å–消。" -#: src/lang.c:2938 +#: src/lang.c:2946 msgid "Ispell program" msgstr "Ispell 程åº" -#: src/lang.c:2944 +#: src/lang.c:2952 msgid "When group is a mailing list, send responses to this email address." msgstr "当群组是个邮递论å›æ—¶ï¼Œå‘é€å›žåº”到这个电å­é‚®ä»¶åœ°å€ã€‚" -#: src/lang.c:2945 +#: src/lang.c:2953 msgid "Mailing list address" msgstr "邮递论å›åœ°å€" -#: src/lang.c:2951 +#: src/lang.c:2959 msgid "Forward articles as attachment" msgstr "作为附件以转å‘文章" -#: src/lang.c:2956 +#: src/lang.c:2964 msgid "" "A comma separated list of MIME major/minor Content-Types. cancels." msgstr "逗å·åˆ†éš”çš„ MIME 主è¦/次è¦å†…容类型清å•ã€‚ å–消。" -#: src/lang.c:2957 +#: src/lang.c:2965 msgid "Which MIME types will be saved" msgstr "将被ä¿å­˜çš„ MIME 类型" -#: src/lang.c:2962 +#: src/lang.c:2970 msgid "Value of the Organization: header. sets, cancels." msgstr "Organization: 标头的值。 设置， å–消。" -#: src/lang.c:2963 +#: src/lang.c:2971 msgid "Organization: header" msgstr "Organization: 标头" -#: src/lang.c:2968 +#: src/lang.c:2976 msgid "Filename for saved articles. sets, cancels." msgstr "用于已ä¿å­˜æ–‡ç« çš„文件å。 设置， å–消。" -#: src/lang.c:2969 +#: src/lang.c:2977 msgid "savefile" msgstr "ä¿å­˜æ–‡ä»¶" -#: src/lang.c:2974 src/lang.c:2998 +#: src/lang.c:2982 src/lang.c:3006 msgid "Scope for the filter rule. sets, cancels." msgstr "用于筛选器规则的范围。 设置， å–消。" -#: src/lang.c:2975 +#: src/lang.c:2983 msgid "Quick (1 key) select filter scope" msgstr "快速 (1 é”®) 选å–筛选器范围" -#: src/lang.c:2980 src/lang.c:3004 +#: src/lang.c:2988 src/lang.c:3012 msgid "Header for filter rule. sets, cancels." msgstr "用于筛选器规则的标头。 设置， å–消。" -#: src/lang.c:2981 +#: src/lang.c:2989 msgid "Quick (1 key) select filter header" msgstr "快速 (1 é”®) 选å–筛选器标头" -#: src/lang.c:2986 src/lang.c:3010 +#: src/lang.c:2994 src/lang.c:3018 msgid "ON = case sensitive, OFF = ignore case. sets, cancels." msgstr "ON = 大å°å†™ç›¸ç¬¦ï¼ŒOFF = 忽略大å°å†™ã€‚ 设置， å–消。" -#: src/lang.c:2987 +#: src/lang.c:2995 msgid "Quick (1 key) select filter case" msgstr "快速 (1 é”®) 选å–筛选器大å°å†™" -#: src/lang.c:2992 src/lang.c:3016 +#: src/lang.c:3000 src/lang.c:3024 msgid "ON = expire, OFF = don't ever expire. sets, cancels." msgstr "ON = 过期，OFF = ä¸ä¼šè¿‡æœŸã€‚ 设置， å–消。" -#: src/lang.c:2993 +#: src/lang.c:3001 msgid "Quick (1 key) select filter expire" msgstr "快速 (1 é”®) 选å–筛选器过期" -#: src/lang.c:2999 +#: src/lang.c:3007 msgid "Quick (1 key) kill filter scope" msgstr "快速 (1 é”®) ç é™¤ç­›é€‰å™¨èŒƒå›´" -#: src/lang.c:3005 +#: src/lang.c:3013 msgid "Quick (1 key) kill filter header" msgstr "快速 (1 é”®) ç é™¤ç­›é€‰å™¨æ ‡å¤´" -#: src/lang.c:3011 +#: src/lang.c:3019 msgid "Quick (1 key) kill filter case" msgstr "快速 (1 é”®) ç é™¤ç­›é€‰å™¨å¤§å°å†™" -#: src/lang.c:3017 +#: src/lang.c:3025 msgid "Quick (1 key) kill filter expire" msgstr "快速 (1 é”®) ç é™¤ç­›é€‰å™¨è¿‡æœŸ" -#: src/lang.c:3023 +#: src/lang.c:3031 msgid "Assume this charset if no charset declaration is present, to set." msgstr "如果ä¸å­˜åœ¨ä»»ä½•å­—符集宣告就å‡è®¾ä¸ºè¿™ä¸ªå­—符集， 以设置。" -#: src/lang.c:3024 +#: src/lang.c:3032 msgid "UNDECLARED_CHARSET" msgstr "未宣告字符集" -#: src/lang.c:3030 +#: src/lang.c:3038 msgid "" "Add this text at the start of the message body. sets, cancels." msgstr "加入这个文本于消æ¯å†…文的开始。 设置， å–消。" -#: src/lang.c:3031 +#: src/lang.c:3039 msgid "X_Body" msgstr "X_Body" -#: src/lang.c:3036 +#: src/lang.c:3044 msgid "Insert this header when posting. sets, cancels." msgstr "å¼ è´´æ—¶æ’入这个标头。 设置， å–消。" -#: src/lang.c:3037 +#: src/lang.c:3045 msgid "X_Headers" msgstr "X_Headers" -#: src/lang.c:3042 +#: src/lang.c:3050 msgid "" "Automatically insert an X-Comment-To: header? toggles & sets." msgstr "自动æ’å…¥ X-Comment-To: 标头？ åˆ‡æ¢ & 设置。" -#: src/lang.c:3043 +#: src/lang.c:3051 msgid "Insert 'X-Comment-To:' header" msgstr "æ’入‘X-Comment-To:’标头" #. TODO: lang.c -#: src/main.c:801 +#: src/main.c:812 msgid "reading from local spool" msgstr "" -#: src/misc.c:3868 +#: src/misc.c:3878 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "版本：%s %s å‘布 %s (“%sâ€) %s %s\n" -#: src/misc.c:3871 +#: src/misc.c:3881 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "版本：%s %s å‘布 %s (“%sâ€)\n" -#: src/newsrc.c:453 +#: src/newsrc.c:457 msgid "Unreachable?\n" msgstr "无法连接？\n" -#: src/nntplib.c:817 +#: src/nntplib.c:822 #, c-format msgid "" "\n" @@ -8072,30 +8074,30 @@ msgstr "" "\n" "æœåŠ¡å™¨å·²è¶…时，å°è¯•é‡æ–°è¿žæŽ¥ # %d\n" -#: src/nntplib.c:844 +#: src/nntplib.c:849 #, fuzzy msgid "NNTP connection error. Exiting..." msgstr "连接到 NNTP æœåŠ¡å™¨ %s 时失败。离开…" -#: src/nntplib.c:856 src/nntplib.c:1835 +#: src/nntplib.c:861 src/nntplib.c:1852 msgid "Rejoin current group\n" msgstr "é‡æ–°é“¾æŽ¥ç›®å‰çš„群组\n" -#: src/nntplib.c:864 src/nntplib.c:1843 +#: src/nntplib.c:869 src/nntplib.c:1860 #, c-format msgid "Read (%s)\n" msgstr "已读 (%s)\n" -#: src/nntplib.c:866 +#: src/nntplib.c:871 #, c-format msgid "Resend last command (%s)\n" msgstr "é‡æ–°å‘é€æœ€è¿‘的命令 (%s)\n" -#: src/nntplib.c:1482 +#: src/nntplib.c:1500 msgid "CAPABILITIES did not announce READER" msgstr "能力中并未宣告包å«é˜…读器" -#: src/nntplib.c:1989 +#: src/nntplib.c:2006 msgid "MOTD: " msgstr "MOTD: " @@ -8163,7 +8165,7 @@ msgstr "[- ä¸å¯ç”¨ -]" #. * preamble #. * TODO: -> lang.c #. -#: src/rfc2047.c:1308 +#: src/rfc2047.c:1322 #, c-format msgid "" "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" @@ -8245,6 +8247,19 @@ msgstr "Slrnface ä¸æ­£å¸¸é€€å‡ºï¼Œä»£ç  msgid "Slrnface failed: %s." msgstr "Slrnface 失败：%s。" +#~ msgid "Active file corrupt - %s" +#~ msgstr "现用文件æŸå - %s" + +#~ msgid "Invalid response to GROUP command, %s" +#~ msgstr "对于 GROUP 命令的无效回应，%s" + +#~ msgid "unparseable \"LIST COUNTS\" line: \"%s\"" +#~ msgstr "无法解æžçš„“清å•è®¡æ•°â€è¡Œï¼šâ€œ%sâ€" + +#~ msgid "" +#~ "Wrong newsgroup name (\"%s\") in response of \"GROUP %s\" command: \"%s\"" +#~ msgstr "错误新闻群组å称 (“%sâ€) 于“群组 %sâ€å‘½ä»¤ï¼šâ€œ%sâ€çš„回应之中" + #~ msgid "Enter maximum length of newsgroup names displayed. sets." #~ msgstr "输入显示新闻群组å称的最大长度。 设置。" Binary files tin-2.4.2/po/zh_TW.gmo and tin-2.4.3/po/zh_TW.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.2/po/zh_TW.po tin-2.4.3/po/zh_TW.po --- tin-2.4.2/po/zh_TW.po 2017-12-08 09:39:47.000000000 +0100 +++ tin-2.4.3/po/zh_TW.po 2018-12-24 10:02:06.039012394 +0100 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 2.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-08 09:39+0100\n" +"POT-Creation-Date: 2018-12-24 10:02+0100\n" "PO-Revision-Date: 2015-10-08 12:13+0800\n" "Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (traditional) \n" @@ -18,11 +18,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: src/attrib.c:954 +#: src/attrib.c:964 msgid "Processing attributes... " msgstr "處ç†å±¬æ€§â€¦" -#: src/attrib.c:1176 +#: src/attrib.c:1186 #, c-format msgid "" "# Do not edit this comment block\n" @@ -31,397 +31,397 @@ msgstr "" "# ä¸ç·¨è¼¯é€™å€‹è©•è«–å€å¡Š\n" "#\n" -#: src/attrib.c:1177 +#: src/attrib.c:1187 #, c-format msgid "# scope=STRING (eg. alt.*,!alt.bin*) [mandatory]\n" msgstr "# scope=字串 (例如：alt.*,!alt.bin*) [å¿…è¦]\n" -#: src/attrib.c:1178 +#: src/attrib.c:1188 #, c-format msgid "# add_posted_to_filter=ON/OFF\n" msgstr "# add_posted_to_filter=ON/OFF\n" -#: src/attrib.c:1179 +#: src/attrib.c:1189 #, c-format msgid "# advertising=ON/OFF\n" msgstr "# advertising=ON/OFF\n" -#: src/attrib.c:1180 +#: src/attrib.c:1190 #, c-format msgid "# alternative_handling=ON/OFF\n" msgstr "# alternative_handling=ON/OFF\n" -#: src/attrib.c:1181 +#: src/attrib.c:1191 #, c-format msgid "# ask_for_metamail=ON/OFF\n" msgstr "# ask_for_metamail=ON/OFF\n" -#: src/attrib.c:1182 +#: src/attrib.c:1192 #, c-format msgid "# auto_cc_bcc=NUM\n" msgstr "# auto_cc_bcc=數字\n" -#: src/attrib.c:1183 +#: src/attrib.c:1193 #, c-format msgid "# 0=No, 1=Cc, 2=Bcc, 3=Cc and Bcc\n" msgstr "# 0=無，1=副本，2=密件副本，3=副本和密件副本\n" -#: src/attrib.c:1184 +#: src/attrib.c:1194 #, c-format msgid "# auto_list_thread=ON/OFF\n" msgstr "# auto_list_thread=ON/OFF\n" -#: src/attrib.c:1185 +#: src/attrib.c:1195 #, c-format msgid "# auto_save=ON/OFF\n" msgstr "# auto_save=ON/OFF\n" -#: src/attrib.c:1186 +#: src/attrib.c:1196 #, c-format msgid "# auto_select=ON/OFF\n" msgstr "# auto_select=ON/OFF\n" -#: src/attrib.c:1187 +#: src/attrib.c:1197 #, c-format msgid "# batch_save=ON/OFF\n" msgstr "# batch_save=ON/OFF\n" -#: src/attrib.c:1188 +#: src/attrib.c:1198 #, c-format msgid "# date_format=STRING (eg. %%a, %%d %%b %%Y %%H:%%M:%%S)\n" msgstr "# date_format=字串 (例如：%%a，%%d %%b %%Y %%H:%%M:%%S)\n" -#: src/attrib.c:1189 +#: src/attrib.c:1199 #, c-format msgid "# delete_tmp_files=ON/OFF\n" msgstr "# delete_tmp_files=ON/OFF\n" -#: src/attrib.c:1190 +#: src/attrib.c:1200 #, c-format msgid "# editor_format=STRING (eg. %%E +%%N %%F)\n" msgstr "# editor_format=字串 (例如：%%E+%%N %%F)\n" -#: src/attrib.c:1191 +#: src/attrib.c:1201 #, c-format msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "# fcc=字串 (例如：=mailbox)\n" -#: src/attrib.c:1192 +#: src/attrib.c:1202 #, c-format msgid "# followup_to=STRING\n" msgstr "# followup_to=字串\n" -#: src/attrib.c:1193 +#: src/attrib.c:1203 #, c-format msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "# from=字串 (僅附加想è¦çš„發信者 :-line，ä¸ä½¿ç”¨å¼•è¨€)\n" -#: src/attrib.c:1194 +#: src/attrib.c:1204 #, c-format msgid "# group_catchup_on_exit=ON/OFF\n" msgstr "# group_catchup_on_exit=ON/OFF\n" -#: src/attrib.c:1195 +#: src/attrib.c:1205 #, c-format msgid "# group_format=STRING (eg. %%n %%m %%R %%L %%s %%F)\n" msgstr "# group_format=字串 (例如：%%n %%m %%R %%L %%s %%F)\n" -#: src/attrib.c:1196 +#: src/attrib.c:1206 #, c-format msgid "# mail_8bit_header=ON/OFF\n" msgstr "# mail_8 bit_header=ON/OFF\n" -#: src/attrib.c:1197 +#: src/attrib.c:1207 #, c-format msgid "# mail_mime_encoding=supported_encoding" msgstr "# mail_mime_encoding=supported_encoding" -#: src/attrib.c:1205 +#: src/attrib.c:1215 #, c-format msgid "# ispell=STRING\n" msgstr "# ispell=字串\n" -#: src/attrib.c:1207 +#: src/attrib.c:1217 #, c-format msgid "# maildir=STRING (eg. ~/Mail)\n" msgstr "# maildir=字串 (例如：~/Mail)\n" -#: src/attrib.c:1208 +#: src/attrib.c:1218 #, c-format msgid "# mailing_list=STRING (eg. majordomo@example.org)\n" msgstr "# mailing_list=字串 (例如：majordomo@example.org)\n" -#: src/attrib.c:1209 +#: src/attrib.c:1219 #, c-format msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "# mime_types_to_save=字串 (例如：image/*,!image/bmp)\n" -#: src/attrib.c:1210 +#: src/attrib.c:1220 #, c-format msgid "# mark_ignore_tags=ON/OFF\n" msgstr "# mark_ignore_tags=ON/OFF\n" -#: src/attrib.c:1211 +#: src/attrib.c:1221 #, c-format msgid "# mark_saved_read=ON/OFF\n" msgstr "# mark_saved_read=ON/OFF\n" -#: src/attrib.c:1212 +#: src/attrib.c:1222 #, c-format msgid "# mime_forward=ON/OFF\n" msgstr "# mime_forward=ON/OFF\n" -#: src/attrib.c:1214 +#: src/attrib.c:1224 #, c-format msgid "# mm_network_charset=supported_charset" msgstr "# mm_network_charset=支æ´çš„字元集" -#: src/attrib.c:1221 +#: src/attrib.c:1231 #, c-format msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "# undeclared_charset=字串 (é è¨­æ˜¯ US-ASCII)\n" -#: src/attrib.c:1223 +#: src/attrib.c:1233 #, c-format msgid "# news_headers_to_display=STRING\n" msgstr "# news_headers_to_display=字串\n" -#: src/attrib.c:1224 +#: src/attrib.c:1234 #, c-format msgid "# news_headers_to_not_display=STRING\n" msgstr "# news_headers_to_not_display=字串\n" -#: src/attrib.c:1225 +#: src/attrib.c:1235 #, c-format msgid "# news_quote_format=STRING\n" msgstr "# news_quote_format=字串\n" -#: src/attrib.c:1226 +#: src/attrib.c:1236 #, c-format msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "# organization=字串 (如果起始部分與『/ã€è®€å–從檔案)\n" -#: src/attrib.c:1227 +#: src/attrib.c:1237 #, c-format msgid "# pos_first_unread=ON/OFF\n" msgstr "# pos_first_unread=ON/OFF\n" -#: src/attrib.c:1228 +#: src/attrib.c:1238 #, c-format msgid "# post_8bit_header=ON/OFF\n" msgstr "# post_8 bit_header=ON/OFF\n" -#: src/attrib.c:1229 +#: src/attrib.c:1239 #, c-format msgid "# post_mime_encoding=supported_encoding" msgstr "# post_mime_encoding=支æ´çš„編碼" -#: src/attrib.c:1236 +#: src/attrib.c:1246 #, c-format msgid "# post_process_type=NUM\n" msgstr "# post_process_type=數字\n" -#: src/attrib.c:1241 +#: src/attrib.c:1251 #, c-format msgid "# post_process_view=ON/OFF\n" msgstr "# post_process_view=ON/OFF\n" -#: src/attrib.c:1242 +#: src/attrib.c:1252 #, c-format msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "# quick_kill_scope=字串 (äº¦å³ talk.*)\n" -#: src/attrib.c:1243 +#: src/attrib.c:1253 #, c-format msgid "# quick_kill_expire=ON/OFF\n" msgstr "# quick_kill_expire=ON/OFF\n" -#: src/attrib.c:1244 +#: src/attrib.c:1254 #, c-format msgid "# quick_kill_case=ON/OFF\n" msgstr "# quick_kill_case=ON/OFF\n" -#: src/attrib.c:1245 +#: src/attrib.c:1255 #, c-format msgid "# quick_kill_header=NUM\n" msgstr "# quick_kill_header=數字\n" -#: src/attrib.c:1246 src/attrib.c:1255 +#: src/attrib.c:1256 src/attrib.c:1265 #, c-format msgid "# 0=Subject: (case sensitive) 1=Subject: (ignore case)\n" msgstr "# 0=Subject: (大å°å¯«ç›¸ç¬¦) 1=Subject: (忽略大å°å¯«)\n" -#: src/attrib.c:1247 src/attrib.c:1256 +#: src/attrib.c:1257 src/attrib.c:1266 #, c-format msgid "# 2=From: (case sensitive) 3=From: (ignore case)\n" msgstr "# 2=From: (大å°å¯«ç›¸ç¬¦) 3=From: (忽略大å°å¯«)\n" -#: src/attrib.c:1248 src/attrib.c:1257 +#: src/attrib.c:1258 src/attrib.c:1267 #, c-format msgid "# 4=Message-ID: & full References: line\n" msgstr "# 4=Message-ID: & 全部 References: 列\n" -#: src/attrib.c:1249 src/attrib.c:1258 +#: src/attrib.c:1259 src/attrib.c:1268 #, c-format msgid "# 5=Message-ID: & last References: entry only\n" msgstr "# 5=åªæœ‰ Message-ID: & 最後一筆 References: æ¢ç›®\n" -#: src/attrib.c:1250 src/attrib.c:1259 +#: src/attrib.c:1260 src/attrib.c:1269 #, c-format msgid "# 6=Message-ID: entry only 7=Lines:\n" msgstr "# 6=åªæœ‰ Message-ID: æ¢ç›® 7=Lines:\n" -#: src/attrib.c:1251 +#: src/attrib.c:1261 #, c-format msgid "# quick_select_scope=STRING\n" msgstr "# quick_select_scope=字串\n" -#: src/attrib.c:1252 +#: src/attrib.c:1262 #, c-format msgid "# quick_select_expire=ON/OFF\n" msgstr "# quick_select_expire=ON/OFF\n" -#: src/attrib.c:1253 +#: src/attrib.c:1263 #, c-format msgid "# quick_select_case=ON/OFF\n" msgstr "# quick_select_case=ON/OFF\n" -#: src/attrib.c:1254 +#: src/attrib.c:1264 #, c-format msgid "# quick_select_header=NUM\n" msgstr "# quick_select_header=數字\n" -#: src/attrib.c:1260 +#: src/attrib.c:1270 #, c-format msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "# quote_chars=字串 (%%s，%%S 用於縮寫)\n" -#: src/attrib.c:1262 +#: src/attrib.c:1272 #, c-format msgid "# print_header=ON/OFF\n" msgstr "# print_header=ON/OFF\n" -#: src/attrib.c:1264 +#: src/attrib.c:1274 #, c-format msgid "# process_only_unread=ON/OFF\n" msgstr "# process_only_unread=ON/OFF\n" -#: src/attrib.c:1265 +#: src/attrib.c:1275 #, c-format msgid "# prompt_followupto=ON/OFF\n" msgstr "# prompt_followupto=ON/OFF\n" -#: src/attrib.c:1266 +#: src/attrib.c:1276 #, c-format msgid "# savedir=STRING (eg. ~user/News)\n" msgstr "# savedir=字串 (例如：~user/News)\n" -#: src/attrib.c:1267 +#: src/attrib.c:1277 #, c-format msgid "# savefile=STRING (eg. =linux)\n" msgstr "# savefile=字串 (例如：=linux)\n" -#: src/attrib.c:1268 +#: src/attrib.c:1278 #, c-format msgid "# sigfile=STRING (eg. $var/sig)\n" msgstr "# sigfile=字串 (例如：$var/sig)\n" -#: src/attrib.c:1269 +#: src/attrib.c:1279 #, c-format msgid "# show_author=NUM\n" msgstr "# show_author=數字\n" -#: src/attrib.c:1275 +#: src/attrib.c:1285 #, c-format msgid "# show_signatures=ON/OFF\n" msgstr "# show_signatures=ON/OFF\n" -#: src/attrib.c:1276 +#: src/attrib.c:1286 #, c-format msgid "# show_only_unread_arts=ON/OFF\n" msgstr "# show_only_unread_arts=ON/OFF\n" -#: src/attrib.c:1277 +#: src/attrib.c:1287 #, c-format msgid "# sigdashes=ON/OFF\n" msgstr "# sigdashes=ON/OFF\n" -#: src/attrib.c:1278 +#: src/attrib.c:1288 #, c-format msgid "# signature_repost=ON/OFF\n" msgstr "# signature_repost=ON/OFF\n" -#: src/attrib.c:1279 +#: src/attrib.c:1289 #, c-format msgid "# sort_article_type=NUM\n" msgstr "# sort_article_type=數字\n" -#: src/attrib.c:1297 +#: src/attrib.c:1307 #, c-format msgid "# sort_threads_type=NUM\n" msgstr "# sort_threads_type=數字\n" -#: src/attrib.c:1306 +#: src/attrib.c:1316 #, c-format msgid "# start_editor_offset=ON/OFF\n" msgstr "# start_editor_offset=ON/OFF\n" -#: src/attrib.c:1307 +#: src/attrib.c:1317 #, c-format msgid "# tex2iso_conv=ON/OFF\n" msgstr "# tex2iso_conv=ON/OFF\n" -#: src/attrib.c:1308 +#: src/attrib.c:1318 #, c-format msgid "# thread_catchup_on_exit=ON/OFF\n" msgstr "# thread_catchup_on_exit=ON/OFF\n" -#: src/attrib.c:1309 +#: src/attrib.c:1319 #, c-format msgid "# thread_articles=NUM" msgstr "# thread_articles=數字" -#: src/attrib.c:1316 +#: src/attrib.c:1326 #, c-format msgid "# thread_format=STRING (eg. %%n %%m [%%L] %%T %%F)\n" msgstr "# thread_format=字串 (例如：%%n %%m [%%L] %%T %%F)\n" -#: src/attrib.c:1317 +#: src/attrib.c:1327 #, c-format msgid "# thread_perc=NUM\n" msgstr "# thread_perc=數字\n" -#: src/attrib.c:1318 +#: src/attrib.c:1328 #, c-format msgid "# trim_article_body=NUM\n" msgstr "# trim_article_body=數字\n" -#: src/attrib.c:1319 +#: src/attrib.c:1329 #, c-format msgid "# 0 = Don't trim article body\n" msgstr "# 0 = ä¸ä¿®å‰ªæ–‡ç« å…§æ–‡\n" -#: src/attrib.c:1320 +#: src/attrib.c:1330 #, c-format msgid "# 1 = Skip leading blank lines\n" msgstr "# 1 = è·³éŽå‰å°Žç©ºåˆ—\n" -#: src/attrib.c:1321 +#: src/attrib.c:1331 #, c-format msgid "# 2 = Skip trailing blank lines\n" msgstr "# 2 = è·³éŽå°¾éš¨ç©ºåˆ—\n" -#: src/attrib.c:1322 +#: src/attrib.c:1332 #, c-format msgid "# 3 = Skip leading and trailing blank lines\n" msgstr "# 3 = è·³éŽå‰å°Žå’Œå°¾éš¨ç©ºåˆ—\n" -#: src/attrib.c:1323 +#: src/attrib.c:1333 #, c-format msgid "# 4 = Compact multiple blank lines between text blocks\n" msgstr "# 4 = 壓縮文字å€å¡Šä¹‹é–“的多é‡ç©ºåˆ—\n" -#: src/attrib.c:1324 +#: src/attrib.c:1334 #, c-format msgid "" "# 5 = Compact multiple blank lines between text blocks and skip\n" @@ -430,7 +430,7 @@ msgstr "" "# 5 = 壓縮文字å€å¡Šä¹‹é–“的多é‡ç©ºåˆ—並跳éŽ\n" "# å‰å°Žç©ºåˆ—\n" -#: src/attrib.c:1325 +#: src/attrib.c:1335 #, c-format msgid "" "# 6 = Compact multiple blank lines between text blocks and skip\n" @@ -439,7 +439,7 @@ msgstr "" "# 6 = 壓縮文字å€å¡Šä¹‹é–“的多é‡ç©ºåˆ—並跳éŽ\n" "# 尾隨空列\n" -#: src/attrib.c:1326 +#: src/attrib.c:1336 #, c-format msgid "" "# 7 = Compact multiple blank lines between text blocks and skip\n" @@ -448,37 +448,37 @@ msgstr "" "# 7 = 壓縮文字å€å¡Šä¹‹é–“的多é‡ç©ºåˆ—並跳éŽ\n" "# å‰å°Žå’Œå°¾éš¨ç©ºåˆ—\n" -#: src/attrib.c:1327 +#: src/attrib.c:1337 #, c-format msgid "# verbatim_handling=ON/OFF\n" msgstr "# verbatim_handling=ON/OFF\n" -#: src/attrib.c:1329 +#: src/attrib.c:1339 #, fuzzy, c-format msgid "# extquote_handling=ON/OFF\n" msgstr "# verbatim_handling=ON/OFF\n" -#: src/attrib.c:1331 +#: src/attrib.c:1341 #, c-format msgid "# wrap_on_next_unread=ON/OFF\n" msgstr "# wrap_on_next_unread=ON/OFF\n" -#: src/attrib.c:1332 +#: src/attrib.c:1342 #, c-format msgid "# x_body=STRING (eg. ~/.tin/extra-body-text)\n" msgstr "# x_body=字串 (例如：~/.tin/extra-body-text)\n" -#: src/attrib.c:1333 +#: src/attrib.c:1343 #, c-format msgid "# x_comment_to=ON/OFF\n" msgstr "# x_comment_to=ON/OFF\n" -#: src/attrib.c:1334 +#: src/attrib.c:1344 #, c-format msgid "# x_headers=STRING (eg. ~/.tin/extra-headers)\n" msgstr "# x_headers=字串 (例如：~/.tin/extra-headers)\n" -#: src/attrib.c:1335 +#: src/attrib.c:1345 #, c-format msgid "" "#\n" @@ -487,7 +487,7 @@ msgstr "" "#\n" "# è¦æ³¨æ„的是，最好是放到一般環境 (全域範åœ)\n" -#: src/attrib.c:1336 +#: src/attrib.c:1346 #, c-format msgid "" "# entries first followed by group specific entries.\n" @@ -496,7 +496,7 @@ msgstr "" "# æ¢ç›®å…ˆæ–¼ç¾¤çµ„特定的æ¢ç›®ã€‚\n" "#\n" -#: src/attrib.c:1337 +#: src/attrib.c:1347 #, c-format msgid "############################################################################\n" msgstr "############################################################################\n" @@ -788,56 +788,51 @@ msgstr "自動é¸å–文章 (使用『%sã #: src/lang.c:107 #, c-format -msgid "Active file corrupt - %s" -msgstr "ç¾ç”¨æª”案æ壞 - %s" - -#: src/lang.c:108 -#, c-format msgid "" "Article to be posted resulted in errors/warnings. %s=quit, %s=Menu, %s=edit: " msgstr "è¦å¼µè²¼çš„文章導致錯誤/警告。%s=離開，%s=é¸å–®ï¼Œ%s=編輯：" -#: src/lang.c:109 +#: src/lang.c:108 #, c-format msgid "Unrecognized attribute: %s" msgstr "無法辨識的屬性：%s" -#: src/lang.c:110 +#: src/lang.c:109 #, c-format msgid "Bad command. Type '%s' for help." msgstr "ä¸ç•¶çš„命令。輸入『%sã€ä»¥ç²å¾—說明。" -#: src/lang.c:112 +#: src/lang.c:111 msgid "Base article" msgstr "基底文章" -#: src/lang.c:113 +#: src/lang.c:112 msgid "Base article range" msgstr "基底文章範åœ" -#: src/lang.c:114 +#: src/lang.c:113 #, fuzzy, c-format msgid "%s: Updating of index files not supported: cache_overview_files=%s" msgstr "%s：ä¸æ”¯æ´ç´¢å¼•æª”案的更新\n" -#: src/lang.c:115 +#: src/lang.c:114 msgid "*** Beginning of article ***" msgstr "*** 文章開頭 ***" -#: src/lang.c:116 +#: src/lang.c:115 msgid "*** Beginning of page ***" msgstr "*** é é¢é–‹é ­ ***" -#: src/lang.c:118 +#: src/lang.c:117 #, c-format msgid "Cancel (delete) or supersede (overwrite) article [%%s]? (%s/%s/%s): " msgstr "å–消 (刪除) 或å–代 (覆寫) 文章 [%%s]？(%s/%s/%s)：" -#: src/lang.c:119 +#: src/lang.c:118 msgid "Cancelling article..." msgstr "å–消文章…" -#: src/lang.c:121 +#: src/lang.c:120 #, c-format msgid "Cannot create %s" msgstr "無法建立 %s" @@ -1367,21 +1362,16 @@ msgstr "" msgid "Insecure permissions of %s (%o)" msgstr "%s (%o) çš„ä¸å®‰å…¨æ¬Šé™" -#: src/lang.c:242 -#, c-format -msgid "Invalid response to GROUP command, %s" -msgstr "å°æ–¼ GROUP 命令的無效回應，%s" - -#: src/lang.c:247 +#: src/lang.c:244 #, c-format msgid "MIME parse error: Unexpected end of %s/%s article" msgstr "MIME 剖æžéŒ¯èª¤ï¼šæœªé æœŸçš„ %s/%s 文章çµæŸ" -#: src/lang.c:248 +#: src/lang.c:245 msgid "MIME parse error: Start boundary whilst reading headers" msgstr "MIME 剖æžéŒ¯èª¤ï¼šè®€å–標頭時出ç¾èµ·å§‹é‚Šç•Œ" -#: src/lang.c:249 +#: src/lang.c:246 msgid "" "\n" "Error: \"poster\" is not allowed in Newsgroups!\n" @@ -1389,16 +1379,16 @@ msgstr "" "\n" "錯誤：在新èžç¾¤çµ„中ä¸å…許「posterã€ï¼\n" -#: src/lang.c:250 +#: src/lang.c:247 msgid "Can't get a (fully-qualified) domain-name!" msgstr "無法æå– (完全åˆæ ¼çš„) 網域å稱ï¼" -#: src/lang.c:251 +#: src/lang.c:248 #, c-format msgid "No permissions to go into %s\n" msgstr "沒有權é™å¯é€²å…¥ %s\n" -#: src/lang.c:253 +#: src/lang.c:250 msgid "" "\n" "Error: From: line missing.\n" @@ -1406,30 +1396,30 @@ msgstr "" "\n" "錯誤： From: 缺少列。\n" -#: src/lang.c:255 +#: src/lang.c:252 #, c-format msgid "No read permissions for %s\n" msgstr "沒有 %s 的讀å–許å¯æ¬Š\n" -#: src/lang.c:256 +#: src/lang.c:253 #, c-format msgid "File %s does not exist\n" msgstr "檔案 %s ä¸å­˜åœ¨\n" -#: src/lang.c:257 +#: src/lang.c:254 #, c-format msgid "No write permissions for %s\n" msgstr "沒有 %s 的寫入權é™\n" -#: src/lang.c:258 +#: src/lang.c:255 msgid "Can't get user information (/etc/passwd missing?)" msgstr "無法æå–使用者資訊 (缺少 /etc/passwd ?)" -#: src/lang.c:259 +#: src/lang.c:256 msgid "errors" msgstr "錯誤" -#: src/lang.c:261 +#: src/lang.c:258 #, c-format msgid "" "\n" @@ -1438,61 +1428,61 @@ msgstr "" "\n" "錯誤於第 %d 列：ä¸å…許「Sender:ã€æ¨™é ­ (將會為您加入)\n" -#: src/lang.c:263 +#: src/lang.c:260 #, c-format msgid "Server has non of the groups listed in %s" msgstr "伺æœå™¨ä¸å…·ä»»ä½•ä¸€å€‹åˆ—在 %s 中的群組" -#: src/lang.c:264 +#: src/lang.c:261 msgid "error" msgstr "錯誤" -#: src/lang.c:265 +#: src/lang.c:262 msgid "Unknown display level" msgstr "ä¸æ˜Žçš„顯示層級" -#: src/lang.c:266 +#: src/lang.c:263 msgid "" msgstr "" -#: src/lang.c:267 +#: src/lang.c:264 msgid "Exiting..." msgstr "正在離開…" -#: src/lang.c:268 +#: src/lang.c:265 msgid "leaving external mail-reader" msgstr "離開外部郵件閱讀器" -#: src/lang.c:269 +#: src/lang.c:266 #, c-format msgid "Extracting %s..." msgstr "æ­£åœ¨æ“·å– %s…" -#: src/lang.c:271 +#: src/lang.c:268 #, c-format msgid "Error writing %s file. Filesystem full? File reset to previous state." msgstr "寫入 %s 檔案時發生錯誤。檔案系統已滿？檔案é‡ç½®åˆ°ä¸Šä¸€å€‹ç‹€æ…‹ã€‚" -#: src/lang.c:272 +#: src/lang.c:269 #, c-format msgid "Error making backup of %s file. Filesystem full?" msgstr "製作檔案 %s 備份時發生錯誤。檔案系統已滿？" -#: src/lang.c:273 +#: src/lang.c:270 #, c-format msgid "Filtering global rules (%d/%d)..." msgstr "篩é¸å…¨åŸŸè¦å‰‡ (%d/%d)…" -#: src/lang.c:274 +#: src/lang.c:271 msgid "Rule created by: " msgstr "è¦å‰‡å»ºç«‹è€…為：" -#: src/lang.c:275 +#: src/lang.c:272 #, c-format msgid "Enter pattern [%s]> " msgstr "輸入胚騰 [%s]>" -#: src/lang.c:276 +#: src/lang.c:273 #, c-format msgid "" "\n" @@ -1501,20 +1491,21 @@ msgstr "" "\n" "您所è¦æ±‚å°æ–¼æ‚¨æ–‡ç« çš„跟貼為下列 %s：\n" -#: src/lang.c:277 +#: src/lang.c:274 #, c-format msgid " %s\t Answers will be directed to you by mail.\n" msgstr " %s\t 回覆將會直接經由郵件寄給您。\n" -#: src/lang.c:278 +#: src/lang.c:275 msgid "-- forwarded message --\n" msgstr "-- å·²è½‰å¯„è¨Šæ¯ --\n" -#: src/lang.c:279 +#: src/lang.c:276 msgid "-- end of forwarded message --\n" msgstr "-- 已轉寄訊æ¯çµæŸ --\n" -#: src/lang.c:280 +#: src/lang.c:277 +#, fuzzy msgid "" "# Format:\n" "# comment=STRING Optional. Multiple lines allowed. Comments must be " @@ -1541,6 +1532,10 @@ msgid "" "# gnksa=[<>]?NUM Optional. GNKSA parse_from() return code. '<' or '>' " "opt.\n" "# xref=PATTERN Optional. Kill pattern (e.g. alt.flame*)\n" +"# path=PATTERN Optional. Kill pattern (e.g. news.example.org)\n" +"# Be aware that filtering on Path: may significantly " +"slow\n" +"# down the process.\n" "# time=NUM Optional. time_t value when rule expires\n" "#\n" msgstr "" @@ -2555,7 +2550,7 @@ msgstr "沒有上一個表示å¼" msgid "Operation disabled in no-overwrite mode" msgstr "在無覆寫模å¼ä¸­çš„æ“作已åœç”¨" -#. TODO: replace hardcoded key-name in txt_info_postponed +#. TODO: replace hard coded key-name in txt_info_postponed #: src/lang.c:547 #, c-format msgid "%d postponed %s, reuse with ^O...\n" @@ -2583,7 +2578,7 @@ msgstr "TeX2Iso 編碼文章" msgid "incomplete " msgstr "ä¸å®Œæ•´çš„ " -#. TODO: replace hardcoded key-names +#. TODO: replace hard coded key-names #: src/lang.c:554 #, c-format msgid "" @@ -2699,8 +2694,8 @@ msgid "Kill Article Menu" msgstr "ç é™¤æ–‡ç« é¸å–®" #: src/lang.c:587 -#, c-format -msgid "Kill Msg-Id: [%s] (f/l/o/n): " +#, fuzzy, c-format +msgid "Kill Msg-ID: [%s] (f/l/o/n): " msgstr "ç é™¤ Msg-Id： [%s] (f/l/o/n)：" #: src/lang.c:588 @@ -3205,7 +3200,7 @@ msgstr "在正è¦è¡¨ç¤ºå¼ä¸­ç™¼ç”ŸéŒ¯èª msgid "Post a followup..." msgstr "跟貼…" -#. TODO: replace hardcoded key-name in txt_post_error_ask_postpone +#. TODO: replace hard coded key-name in txt_post_error_ask_postpone #: src/lang.c:716 msgid "" "An error has occurred while posting the article. If you think that this\n" @@ -3268,225 +3263,230 @@ msgstr "已標定 %s" msgid "Untagged %s" msgstr "å·²å–消標定 %s" -#: src/lang.c:730 +#: src/lang.c:731 +#, c-format +msgid "Preparing for filtering on Path header (%d/%d)..." +msgstr "" + +#: src/lang.c:733 msgid "Processing mail messages marked for deletion." msgstr "處ç†æ¨™è¨˜ç‚ºåˆªé™¤çš„郵件訊æ¯ã€‚" -#: src/lang.c:731 +#: src/lang.c:734 msgid "Processing saved articles marked for deletion." msgstr "處ç†æ¨™è¨˜ç‚ºåˆªé™¤çš„已儲存文章。" -#: src/lang.c:732 +#: src/lang.c:735 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "接å—跟貼？%s=張貼，%s=忽略，%s=離開：" -#: src/lang.c:733 +#: src/lang.c:736 msgid "Article unchanged, abort mailing?" msgstr "文章未變更，放棄郵寄？" -#: src/lang.c:734 +#: src/lang.c:737 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "您è¦çœ‹åˆ°æ“±ç½®çš„文章 (%d) 嗎？" -#: src/lang.c:736 +#: src/lang.c:739 msgid "Add quick kill filter?" msgstr "加入快速ç é™¤ç¯©é¸å™¨ï¼Ÿ" -#: src/lang.c:737 +#: src/lang.c:740 msgid "Add quick selection filter?" msgstr "加入快速é¸æ“‡ç¯©é¸å™¨ï¼Ÿ" -#: src/lang.c:738 +#: src/lang.c:741 msgid "Do you really want to quit?" msgstr "您真的è¦é›¢é–‹å—Žï¼Ÿ" -#: src/lang.c:739 +#: src/lang.c:742 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "%s=編輯å–消訊æ¯ï¼Œ%s=離開，%s=刪除 (å–消) [%%s]：" -#: src/lang.c:740 +#: src/lang.c:743 msgid "You have tagged articles in this group - quit anyway?" msgstr "您已在這個群組中標定文章 - 無論如何都è¦é›¢é–‹ï¼Ÿ" -#: src/lang.c:741 +#: src/lang.c:744 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=離開，%s=編輯，%s=擱置：" -#: src/lang.c:742 +#: src/lang.c:745 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=離開 %s=編輯 %s=儲存ç é™¤æ述：" -#: src/lang.c:743 +#: src/lang.c:746 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "%s=離開 %s=編輯 %s=儲存é¸å–æ述：" -#: src/lang.c:744 +#: src/lang.c:747 msgid "Do you really want to quit without saving your configuration?" msgstr "您真的è¦é›¢é–‹å»ä¸å„²å­˜æ‚¨çš„組態嗎？" -#: src/lang.c:747 +#: src/lang.c:750 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "ç„¡æ•ˆçš„ç¯„åœ - 有效是『0-9.$ã€ä¾‹å¦‚：1-$" -#: src/lang.c:749 +#: src/lang.c:752 msgid "Do you want to abort this operation?" msgstr "您è¦æ”¾æ£„這個æ“作嗎？" -#: src/lang.c:750 +#: src/lang.c:753 msgid "Do you want to exit tin immediately?" msgstr "您è¦é¦¬ä¸Šé›¢é–‹ tin 嗎？" -#: src/lang.c:752 +#: src/lang.c:755 msgid "Reading ('q' to quit)..." msgstr "è®€å– (『qã€è¡¨ç¤ºé›¢é–‹)…" -#: src/lang.c:753 +#: src/lang.c:756 #, c-format msgid "Reading %sarticles..." msgstr "è®€å– %s 篇文章…" -#: src/lang.c:754 +#: src/lang.c:757 #, c-format msgid "Reading %sattributes file...\n" msgstr "è®€å– %s 屬性檔案…\n" -#: src/lang.c:755 +#: src/lang.c:758 #, c-format msgid "Reading %sconfig file...\n" msgstr "è®€å– %s 組態檔案…\n" -#: src/lang.c:756 +#: src/lang.c:759 msgid "Reading filter file...\n" msgstr "讀å–篩é¸å™¨æª”案…\n" -#: src/lang.c:757 +#: src/lang.c:760 #, c-format msgid "Reading %s groups..." msgstr "è®€å– %s 群組…" -#: src/lang.c:758 +#: src/lang.c:761 msgid "Reading input history file...\n" msgstr "讀å–輸入歷å²æª”案…\n" -#: src/lang.c:759 +#: src/lang.c:762 msgid "Reading keymap file...\n" msgstr "è®€å– keymap 檔案…\n" -#: src/lang.c:760 +#: src/lang.c:763 msgid "Reading groups from active file... " msgstr "從ç¾ç”¨æª”案讀å–群組…" -#: src/lang.c:761 +#: src/lang.c:764 msgid "Reading groups from newsrc file... " msgstr "從 newsrc 檔案讀å–群組…" -#: src/lang.c:762 +#: src/lang.c:765 msgid "Reading newsgroups file... " msgstr "讀å–æ–°èžç¾¤çµ„檔案…" -#: src/lang.c:763 +#: src/lang.c:766 msgid "Reading newsrc file..." msgstr "è®€å– newsrc 檔案…" -#: src/lang.c:764 +#: src/lang.c:767 msgid "References: line " msgstr "References: 列 " -#: src/lang.c:766 +#: src/lang.c:769 #, c-format msgid "(%d:%02d remaining)" msgstr "(%d:%02d 還剩餘)" -#: src/lang.c:768 +#: src/lang.c:771 #, c-format msgid "Bogus group %s removed." msgstr "å‡é€ çš„群組 %s 已移除。" -#: src/lang.c:769 +#: src/lang.c:772 msgid "Removed from the previous rule: " msgstr "已從上一個è¦å‰‡ç§»é™¤ï¼š" -#: src/lang.c:770 +#: src/lang.c:773 #, c-format msgid "Error: rename %s to %s" msgstr "錯誤：é‡æ–°å‘½å %s 為 %s" -#: src/lang.c:771 +#: src/lang.c:774 msgid "Reply to author..." msgstr "回覆給作者…" -#: src/lang.c:772 +#: src/lang.c:775 msgid "Repost" msgstr "é‡æ–°å¼µè²¼" -#: src/lang.c:773 +#: src/lang.c:776 msgid "Reposting article..." msgstr "é‡æ–°å¼µè²¼æ–‡ç« â€¦" -#: src/lang.c:774 +#: src/lang.c:777 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "é‡æ–°å¼µè²¼æ–‡ç« åˆ°ç¾¤çµ„ [%s]>" -#: src/lang.c:775 +#: src/lang.c:778 msgid "Reset newsrc?" msgstr "é‡ç½® newsrc？" -#: src/lang.c:776 +#: src/lang.c:779 msgid "Responses have been directed to the following newsgroups" msgstr "回應已被導å‘下列新èžç¾¤çµ„" -#: src/lang.c:777 +#: src/lang.c:780 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " msgstr "回應已被導å‘張貼者。%s=郵寄，%s=張貼，%s=離開：" -#: src/lang.c:779 +#: src/lang.c:782 msgid "Press to continue..." msgstr "按下 以繼續…" -#: src/lang.c:781 +#: src/lang.c:784 #, c-format msgid "Select From [%s] (y/n): " msgstr "é¸å–自 [%s] (y/n)：" -#: src/lang.c:782 +#: src/lang.c:785 msgid "Select Lines: (num): " msgstr "é¸å–多列：(num)：" -#: src/lang.c:783 +#: src/lang.c:786 msgid "Auto-select Article Menu" msgstr "自動é¸å–文章é¸å–®" -#: src/lang.c:784 -#, c-format -msgid "Select Msg-Id [%s] (f/l/o/n): " +#: src/lang.c:787 +#, fuzzy, c-format +msgid "Select Msg-ID [%s] (f/l/o/n): " msgstr "é¸å– Msg-Id [%s] (f/l/o/n)：" -#: src/lang.c:785 +#: src/lang.c:788 msgid "Select pattern scope: " msgstr "é¸å–胚騰範åœï¼š" -#: src/lang.c:786 +#: src/lang.c:789 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "é¸å–主旨 [%s] (y/n)：" -#: src/lang.c:787 +#: src/lang.c:790 msgid "Select text pattern : " msgstr "é¸å–文字胚騰：" -#: src/lang.c:788 +#: src/lang.c:791 msgid "Select time in days : " msgstr "é¸å–時間天數 ：" -#: src/lang.c:789 +#: src/lang.c:792 #, c-format msgid "" "# %s server configuration file\n" @@ -3507,54 +3507,54 @@ msgstr "" "############################################################################\n" "\n" -#: src/lang.c:795 +#: src/lang.c:798 msgid "Showing unread groups only" msgstr "åªé¡¯ç¤ºæœªè®€ç¾¤çµ„" -#: src/lang.c:796 +#: src/lang.c:799 msgid "Subject: line (ignore case) " msgstr "Subject: 列 (忽略大å°å¯«) " -#: src/lang.c:797 +#: src/lang.c:800 msgid "Subject: line (case sensitive)" msgstr "Subject: 列 (大å°å¯«ç›¸ç¬¦)" -#: src/lang.c:798 +#: src/lang.c:801 msgid "Save" msgstr "儲存" -#: src/lang.c:799 +#: src/lang.c:802 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "儲存『%sã€(%s/%s)？" -#: src/lang.c:800 +#: src/lang.c:803 msgid "Save configuration before continuing?" msgstr "繼續之å‰å…ˆå„²å­˜çµ„態？" -#: src/lang.c:801 +#: src/lang.c:804 msgid "Save filename> " msgstr "儲存檔å>" -#: src/lang.c:802 +#: src/lang.c:805 msgid "Saved" msgstr "已儲存" -#: src/lang.c:803 +#: src/lang.c:806 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "%4d 未讀 (%4d 熱門) %s æ–¼ %s\n" -#: src/lang.c:804 +#: src/lang.c:807 #, c-format msgid "Saved %s...\n" msgstr "已儲存 %s…\n" -#: src/lang.c:805 +#: src/lang.c:808 msgid "Nothing was saved" msgstr "沒有任何æ±è¥¿è¢«å„²å­˜" -#: src/lang.c:806 +#: src/lang.c:809 #, c-format msgid "" "\n" @@ -3563,182 +3563,182 @@ msgstr "" "\n" "%s %d %s 來自 %d %s\n" -#: src/lang.c:807 +#: src/lang.c:810 #, c-format msgid "-- %s saved to %s%s --" msgstr "-- %s 儲存到 %s%s --" -#: src/lang.c:808 +#: src/lang.c:811 #, c-format msgid "-- %s saved to %s - %s --" msgstr "-- %s 儲存到 %s - %s --" -#: src/lang.c:809 +#: src/lang.c:812 msgid "Saving..." msgstr "儲存中…" -#: src/lang.c:810 +#: src/lang.c:813 #, c-format msgid "%s: Screen initialization failed" msgstr "%s：螢幕åˆå§‹åŒ–失敗" -#: src/lang.c:812 +#: src/lang.c:815 #, c-format msgid "%s: screen is too small\n" msgstr "%s：螢幕太å°\n" -#: src/lang.c:814 +#: src/lang.c:817 #, fuzzy, c-format msgid "screen is too small, %s is exiting" msgstr "螢幕太å°ï¼Œ%s 正在離開\n" -#: src/lang.c:815 +#: src/lang.c:818 msgid "Delete scope?" msgstr "刪除範åœï¼Ÿ" -#: src/lang.c:816 +#: src/lang.c:819 msgid "Enter scope> " msgstr "輸入範åœ>" -#: src/lang.c:817 +#: src/lang.c:820 msgid "Select new position> " msgstr "é¸å–æ–°ä½ç½®>" -#: src/lang.c:818 +#: src/lang.c:821 msgid "New position cannot be a global scope" msgstr "æ–°ä½ç½®ä¸å¯æ˜¯å…¨åŸŸç¯„åœ" -#: src/lang.c:819 +#: src/lang.c:822 msgid "Global scope, operation not allowed" msgstr "全域範åœï¼Œæ“作ä¸å…許" -#: src/lang.c:820 +#: src/lang.c:823 msgid "Rename scope> " msgstr "é‡æ–°å‘½å範åœ>" -#: src/lang.c:821 +#: src/lang.c:824 msgid "Select scope> " msgstr "é¸å–範åœ>" -#: src/lang.c:822 +#: src/lang.c:825 msgid "Scopes Menu" msgstr "範åœé¸å–®" -#: src/lang.c:823 +#: src/lang.c:826 msgid "Scopes Menu Commands" msgstr "範åœåŠŸèƒ½è¡¨æŒ‡ä»¤" -#: src/lang.c:824 +#: src/lang.c:827 #, c-format msgid "Search backwards [%s]> " msgstr "å‘後æœå°‹ [%s]>" -#: src/lang.c:825 +#: src/lang.c:828 #, c-format msgid "Search body [%s]> " msgstr "æœå°‹å…§æ–‡ [%s]>" -#: src/lang.c:826 +#: src/lang.c:829 #, c-format msgid "Search forwards [%s]> " msgstr "å‘å‰æœå°‹ [%s]>" -#: src/lang.c:827 +#: src/lang.c:830 msgid "Searching..." msgstr "æœå°‹ä¸­â€¦" -#: src/lang.c:828 +#: src/lang.c:831 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "æœå°‹æ–‡ç«  %2$d 中的 %1$d (『qã€ä»¥æ”¾æ£„)…" -#: src/lang.c:829 +#: src/lang.c:832 msgid "Select article> " msgstr "é¸å–文章>" -#: src/lang.c:830 +#: src/lang.c:833 msgid "" "Select option number before text or use arrow keys and . 'q' to quit." msgstr "é¸å–文字å‰æ–¹çš„é¸é …數字或使用方å‘éµå’Œ 。『qã€ä»¥é›¢é–‹ã€‚" -#: src/lang.c:831 +#: src/lang.c:834 msgid "Select group> " msgstr "é¸å–群組>" -#: src/lang.c:832 +#: src/lang.c:835 #, c-format msgid "Enter selection pattern [%s]> " msgstr "輸入é¸æ“‡èƒšé¨° [%s]>" -#: src/lang.c:833 +#: src/lang.c:836 msgid "Select thread> " msgstr "é¸å–討論串> " -#: src/lang.c:834 +#: src/lang.c:837 #, c-format msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" msgstr "%s %s %s (「%sã€) [%s]：發é€è©³ç´°çš„錯誤報告給 %s\n" -#: src/lang.c:835 +#: src/lang.c:838 msgid "servers active-file" msgstr "伺æœå™¨ç›®å‰æª”案" -#: src/lang.c:836 +#: src/lang.c:839 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "無法移入新的新èžç¾¤çµ„。請先訂閱…" -#: src/lang.c:837 +#: src/lang.c:840 msgid "" msgstr "" -#: src/lang.c:838 +#: src/lang.c:841 #, c-format msgid "Starting: (%s)" msgstr "開始：(%s)" -#: src/lang.c:839 +#: src/lang.c:842 #, c-format msgid "List Thread (%d of %d)" msgstr "列出討論串 (%2$d 中的 %1$d)" -#: src/lang.c:840 +#: src/lang.c:843 #, c-format msgid "Thread (%.*s)" msgstr "討論串 (%.*s)" -#: src/lang.c:841 +#: src/lang.c:844 msgid "Enter wildcard subscribe pattern> " msgstr "輸入è¬ç”¨å­—元訂閱胚騰>" -#: src/lang.c:842 +#: src/lang.c:845 #, c-format msgid "subscribed to %d groups" msgstr "已訂閱 %d 群組" -#: src/lang.c:843 +#: src/lang.c:846 #, c-format msgid "Subscribed to %s" msgstr "已訂閱 %s" -#: src/lang.c:844 +#: src/lang.c:847 msgid "Subscribing... " msgstr "訂閱…" -#: src/lang.c:845 +#: src/lang.c:848 #, c-format msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " msgstr "é‡æ–°å¼µè²¼æˆ–å–代文章 [%%s]？(%s/%s/%s)：" -#: src/lang.c:846 +#: src/lang.c:849 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "å–代文章於群組 [%s]>" -#: src/lang.c:847 +#: src/lang.c:850 msgid "Superseding article ..." msgstr "å–代文章…" -#: src/lang.c:848 +#: src/lang.c:851 #, c-format msgid "" "\n" @@ -3747,24 +3747,24 @@ msgstr "" "\n" "å·²åœæ­¢ã€‚輸入『fgã€ä»¥é‡æ–°å•Ÿå‹• %s\n" -#: src/lang.c:850 +#: src/lang.c:853 #, c-format msgid "%d days" msgstr "%d 天" -#: src/lang.c:851 +#: src/lang.c:854 msgid "" msgstr "" -#: src/lang.c:852 +#: src/lang.c:855 msgid "TeX " msgstr "TeX " -#: src/lang.c:853 +#: src/lang.c:856 msgid "# Default action/prompt strings\n" msgstr "# é è¨­çš„動作/æ示字串\n" -#: src/lang.c:854 +#: src/lang.c:857 msgid "" "# Defaults for quick (1 key) kill & auto-selection filters\n" "# header=NUM 0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n" @@ -3782,108 +3782,108 @@ msgstr "" "# case=ON/OFF ON=篩é¸å™¨å¤§å°å¯«é ˆç›¸ç¬¦ OFF=忽略大å°å¯«\n" "# expire=ON/OFF ON=é™åˆ¶åˆ° default_filter_days OFF=ä¸æœƒéŽæœŸ\n" -#: src/lang.c:867 +#: src/lang.c:870 msgid "" "# If ON use print current subject or newsgroup description in the last line\n" msgstr "# 如果為 ON å°±å°å‡ºç›®å‰çš„主旨或最後一列中的新èžç¾¤çµ„æè¿°\n" -#: src/lang.c:868 +#: src/lang.c:871 msgid "# Host & time info used for detecting new groups (don't touch)\n" msgstr "# 主機 & 時間資訊用於åµæ¸¬æ–°ç¾¤çµ„ (ä¸å½±éŸ¿)\n" -#: src/lang.c:869 +#: src/lang.c:872 msgid "There is no news\n" msgstr "沒有任何新èž\n" -#: src/lang.c:870 +#: src/lang.c:873 msgid "Thread" msgstr "討論串" -#: src/lang.c:871 +#: src/lang.c:874 msgid "Thread Level Commands" msgstr "討論串層級命令" -#: src/lang.c:872 +#: src/lang.c:875 msgid "Thread deselected" msgstr "討論串已å–消é¸å–" -#: src/lang.c:873 +#: src/lang.c:876 msgid "Thread selected" msgstr "討論串已é¸å–" -#: src/lang.c:875 +#: src/lang.c:878 msgid "threads" msgstr "討論串" -#: src/lang.c:877 +#: src/lang.c:880 msgid "thread" msgstr "討論串" -#: src/lang.c:878 +#: src/lang.c:881 #, c-format msgid "Thread %4s of %4s" msgstr "討論串 %2$4s 中的 %1$4s" -#: src/lang.c:879 +#: src/lang.c:882 msgid "Threading articles..." msgstr "討論串文章…" -#: src/lang.c:880 +#: src/lang.c:883 #, c-format msgid "Toggled word highlighting %s" msgstr "已切æ›å­—詞高亮度顯示 %s" -#: src/lang.c:881 +#: src/lang.c:884 msgid "Toggled rot13 encoding" msgstr "å·²åˆ‡æ› rot13 編碼" -#: src/lang.c:882 +#: src/lang.c:885 #, c-format msgid "Toggled german TeX encoding %s" msgstr "已切æ›å¾·èªž TeX 編碼 %s" -#: src/lang.c:883 +#: src/lang.c:886 #, c-format msgid "Toggled tab-width to %d" msgstr "已切æ›è·³æ ¼å¯¬åº¦ç‚º %d" -#: src/lang.c:885 +#: src/lang.c:888 #, c-format msgid "%d Trying to dotlock %s" msgstr "%d 嘗試點鎖定 %s" -#: src/lang.c:886 +#: src/lang.c:889 #, c-format msgid "%d Trying to lock %s" msgstr "%d 嘗試鎖定 %s" -#: src/lang.c:888 +#: src/lang.c:891 msgid " h=help" msgstr " h=求助" -#: src/lang.c:890 +#: src/lang.c:893 msgid "Unlimited" msgstr "沒有é™åˆ¶" -#: src/lang.c:891 +#: src/lang.c:894 msgid "Enter wildcard unsubscribe pattern> " msgstr "輸入å–消訂閱的è¬ç”¨å­—元胚騰>" -#: src/lang.c:892 +#: src/lang.c:895 #, c-format msgid "Error decoding %s : %s" msgstr "解碼 %s 時發生錯誤：%s" -#: src/lang.c:893 +#: src/lang.c:896 msgid "No end." msgstr "沒有çµæŸã€‚" -#: src/lang.c:894 +#: src/lang.c:897 #, c-format msgid "%s successfully decoded." msgstr "%s å·²æˆåŠŸè§£ç¢¼ã€‚" -#: src/lang.c:895 +#: src/lang.c:898 #, c-format msgid "" "%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" @@ -3892,37 +3892,32 @@ msgstr "" "%*s[-- %s/%s，%suuencoded 檔案，%d 列，å稱：%s --]\n" "\n" -#: src/lang.c:896 +#: src/lang.c:899 msgid "unread " msgstr "未讀 " -#: src/lang.c:897 +#: src/lang.c:900 #, c-format msgid "unsubscribed from %d groups" msgstr "已從 %d 群組å–消訂閱" -#: src/lang.c:898 +#: src/lang.c:901 #, c-format msgid "Unsubscribed from %s" msgstr "已從 %s å–消訂閱" -#: src/lang.c:899 +#: src/lang.c:902 msgid "Unsubscribing... " msgstr "å–消訂閱…" -#: src/lang.c:900 +#: src/lang.c:903 msgid "Unthreading articles..." msgstr "展開討論串文章…" -#: src/lang.c:901 +#: src/lang.c:904 msgid "Updated" msgstr "已更新" -#: src/lang.c:903 -#, c-format -msgid "unparseable \"LIST COUNTS\" line: \"%s\"" -msgstr "無法解æžçš„「清單計數ã€åˆ—：「%sã€" - #: src/lang.c:905 msgid "Updating" msgstr "æ›´æ–°" @@ -4080,11 +4075,16 @@ msgid "%s only useful for batch mode ope msgstr "%s åªæœ‰åœ¨æ‰¹æ¬¡æ¨¡å¼æ“作時有用\n" #: src/lang.c:939 +#, fuzzy, c-format +msgid "%s only useful for batch or debug mode operations\n" +msgstr "%s åªæœ‰åœ¨æ‰¹æ¬¡æ¨¡å¼æ“作時有用\n" + +#: src/lang.c:940 #, c-format msgid "Useless combination %s and %s. Ignoring %s.\n" msgstr "ç„¡ç”¨çš„çµ„åˆ %s å’Œ %s。忽略 %s。\n" -#: src/lang.c:941 +#: src/lang.c:942 #, c-format msgid "" "\n" @@ -4093,12 +4093,12 @@ msgstr "" "\n" "%s%d è¶…å‡ºç¯„åœ (0 - %d)。é‡ç½®ç‚º 0" -#: src/lang.c:942 +#: src/lang.c:943 #, c-format msgid "View '%s' (%s/%s)?" msgstr "檢視『%sã€(%s/%s)？" -#: src/lang.c:944 +#: src/lang.c:945 #, c-format msgid "" "\n" @@ -4109,7 +4109,7 @@ msgstr "" "警告：張貼超出 %d 欄ä½ã€‚第 %d 列是第一個長列：\n" "%-100s\n" -#: src/lang.c:945 +#: src/lang.c:946 msgid "" "\n" "Warning: article unchanged after editing\n" @@ -4117,7 +4117,7 @@ msgstr "" "\n" "警告：文章編輯之後未變更\n" -#: src/lang.c:946 +#: src/lang.c:947 msgid "" "\n" "Warning: \"Subject:\" contains only whitespaces.\n" @@ -4125,7 +4125,7 @@ msgstr "" "\n" "警告：「Subject:ã€åªå«ç©ºç™½ã€‚\n" -#: src/lang.c:947 +#: src/lang.c:948 msgid "" "\n" "Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:" @@ -4134,7 +4134,7 @@ msgstr "" "\n" "警告：「Subject:ã€ä»¥ã€ŒRe：ã€é–‹å§‹ä½†æ˜¯æ²’有「References:ã€ã€‚\n" -#: src/lang.c:949 +#: src/lang.c:950 msgid "" "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" @@ -4144,7 +4144,7 @@ msgstr "" "警告：文章有「References:ã€ä½†æ˜¯ã€ŒSubject:ã€ä¸¦éž\n" " 以「Re:ã€é–‹å§‹ä¸”ä¸åŒ…å«ã€Œ(was:ã€ã€‚\n" -#: src/lang.c:952 +#: src/lang.c:953 msgid "" "Read carefully!\n" "\n" @@ -4166,7 +4166,7 @@ msgstr "" "這是您å³å°‡å–消的文章：\n" "\n" -#: src/lang.c:956 +#: src/lang.c:957 msgid "" "\n" "Warning: You are using a non-plain transfer encoding (such as base64 or\n" @@ -4180,7 +4180,7 @@ msgstr "" " 文章。如果æŸå€‹ç°½å被該 inews 程å¼æ‰€é™„加，它將\n" " 無法被é©ç•¶åœ°ç·¨ç¢¼ã€‚\n" -#: src/lang.c:961 +#: src/lang.c:962 msgid "" "\n" "Warning: \"example\" is a reserved hierarchy!\n" @@ -4188,7 +4188,7 @@ msgstr "" "\n" "警告：「exampleã€æ˜¯è¢«ä¿ç•™çš„階層çµæ§‹ï¼\n" -#: src/lang.c:962 +#: src/lang.c:963 #, c-format msgid "" "\n" @@ -4203,7 +4203,7 @@ msgstr "" "在您 %s 檔案中的æŸäº›å€¼å·²æœ‰è®Šæ›´ï¼\n" "è«‹åƒé–± WHATSNEW …等等\n" -#: src/lang.c:964 +#: src/lang.c:965 #, c-format msgid "" "\n" @@ -4216,7 +4216,7 @@ msgstr "" "您正在從較新的版本é™ç´šåˆ° tin %sï¼\n" "在您 %s 檔案中的æŸäº›å€¼å¯èƒ½æœƒè¢«å¿½ç•¥ï¼Œå…¶ä»–值也å¯èƒ½å·²æœ‰è®Šæ›´ï¼\n" -#: src/lang.c:967 +#: src/lang.c:968 #, c-format msgid "" "Warning: tin wrote fewer groups to your\n" @@ -4231,7 +4231,7 @@ msgstr "" "並未å–消訂閱 %ld %s，那麼這就代表發生了錯誤，而您應該\n" "æ–¼å†æ¬¡å•Ÿå‹• tin 之å‰å…ˆå‚™ä»½æ‚¨çš„ %sï¼\n" -#: src/lang.c:971 +#: src/lang.c:972 #, c-format msgid "" "\n" @@ -4240,12 +4240,12 @@ msgstr "" "\n" "警告：找到 %d 個『-- \\nã€åˆ—，這也許會使æŸäº›äººæ„Ÿåˆ°å›°æƒ‘。\n" -#: src/lang.c:972 +#: src/lang.c:973 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "警告：åªæœ‰ %2$d 中的 %1$d 篇文章被儲存" -#: src/lang.c:973 +#: src/lang.c:974 #, c-format msgid "" "\n" @@ -4259,13 +4259,13 @@ msgstr "" "警告：您的簽åé•·åº¦å·²è¶…éŽ %d 列。 由於簽å通常\n" " ä¸æœƒç”¨ä¾†å‚³è¼¸ä»»ä½•æœ‰ç”¨çš„資訊，它們應該è¦æ„ˆçŸ­æ„ˆå¥½ã€‚\n" -#: src/lang.c:977 +#: src/lang.c:978 #, c-format msgid "" "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " msgstr "警告：這個郵件地å€å¯èƒ½åŒ…å«åžƒåœ¾é™·é˜±ã€‚%s=繼續，%s=放棄？" -#: src/lang.c:978 +#: src/lang.c:979 msgid "" "\n" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" @@ -4273,37 +4273,37 @@ msgstr "" "\n" "警告：簽å應該以『-- \\nã€èµ·å§‹è€Œéžä»¥ã€Ž--\\nã€ã€‚\n" -#: src/lang.c:979 +#: src/lang.c:980 msgid "Writing attributes file..." msgstr "寫入屬性檔案…" -#: src/lang.c:981 +#: src/lang.c:982 #, c-format msgid "%d Responses" msgstr "%d 篇回應" -#: src/lang.c:983 +#: src/lang.c:984 #, c-format msgid "Added %d %s" msgstr "已加入 %d %s" -#: src/lang.c:984 +#: src/lang.c:985 msgid "No unsubscribed groups to show" msgstr "沒有已å–消訂閱的群組å¯é¡¯ç¤º" -#: src/lang.c:985 +#: src/lang.c:986 msgid "Showing subscribed to groups only" msgstr "åªé¡¯ç¤ºå·²è¨‚閱群組" -#: src/lang.c:986 +#: src/lang.c:987 msgid "Yes " msgstr "是 " -#: src/lang.c:987 +#: src/lang.c:988 msgid " You have mail" msgstr " 您有郵件" -#: src/lang.c:992 +#: src/lang.c:993 #, c-format msgid "" "\n" @@ -4324,11 +4324,11 @@ msgstr "" " 變更 MM_NETWORK_CHARSET 的設定為é©ç•¶çš„值，\n" " 以用於您的張貼。\n" -#: src/lang.c:1003 +#: src/lang.c:1004 msgid " -D mode debug mode" msgstr " -D æ¨¡å¼ é™¤éŒ¯æ¨¡å¼" -#: src/lang.c:1007 +#: src/lang.c:1008 msgid "" "Read carefully!\n" "\n" @@ -4355,11 +4355,11 @@ msgstr "" "這是您å³å°‡è¦å–消的文章：\n" "\n" -#: src/lang.c:1016 +#: src/lang.c:1017 msgid "toggle color" msgstr "切æ›é¡è‰²" -#: src/lang.c:1017 +#: src/lang.c:1018 msgid "" "# Changing colors of several screen parts\n" "# Possible values are:\n" @@ -4405,11 +4405,11 @@ msgstr "" "# 15 = 亮白色\n" "\n" -#: src/lang.c:1037 +#: src/lang.c:1038 msgid " -a toggle color flag" msgstr " -a 切æ›é¡è‰²æ——標" -#: src/lang.c:1041 +#: src/lang.c:1042 msgid "" "\n" "Error: Followup-To set to more than one newsgroup!\n" @@ -4417,7 +4417,7 @@ msgstr "" "\n" "錯誤：跟貼被設定超éŽä¸€å€‹æ–°èžç¾¤çµ„ï¼\n" -#: src/lang.c:1042 +#: src/lang.c:1043 #, c-format msgid "" "\n" @@ -4426,7 +4426,7 @@ msgstr "" "\n" "錯誤：「%sã€è¢«é‡æ–°å‘½å，使用「%sã€åšç‚ºæ›¿ä»£ï¼\n" -#: src/lang.c:1043 +#: src/lang.c:1044 #, c-format msgid "" "\n" @@ -4435,7 +4435,7 @@ msgstr "" "\n" "錯誤：跨æ¿å¼µè²¼åˆ° %d æ–°èžç¾¤çµ„而沒有跟貼列ï¼\n" -#: src/lang.c:1044 +#: src/lang.c:1045 #, c-format msgid "" "\n" @@ -4444,7 +4444,7 @@ msgstr "" "\n" "錯誤：「%sã€ä¸¦éžæœ‰æ•ˆæ–°èžç¾¤çµ„ï¼\n" -#: src/lang.c:1046 +#: src/lang.c:1047 msgid "" "\n" "Warning: Followup-To set to more than one newsgroup!\n" @@ -4452,7 +4452,7 @@ msgstr "" "\n" "警告：跟貼被設定超éŽä¸€å€‹æ–°èžç¾¤çµ„ï¼\n" -#: src/lang.c:1047 +#: src/lang.c:1048 #, c-format msgid "" "\n" @@ -4461,7 +4461,7 @@ msgstr "" "\n" "警告：「%sã€è¢«é‡æ–°å‘½å，您應該使用「%sã€åšç‚ºæ›¿ä»£ï¼\n" -#: src/lang.c:1048 +#: src/lang.c:1049 #, c-format msgid "" "\n" @@ -4470,7 +4470,7 @@ msgstr "" "\n" "警告：跨æ¿å¼µè²¼åˆ° %d æ–°èžç¾¤çµ„而沒有跟貼列ï¼\n" -#: src/lang.c:1049 +#: src/lang.c:1050 #, c-format msgid "" "\n" @@ -4479,7 +4479,7 @@ msgstr "" "\n" "警告：「%sã€ä¸åœ¨æ‚¨çš„ newsrc 之中，在這個站臺它也許會無效ï¼\n" -#: src/lang.c:1050 +#: src/lang.c:1051 #, c-format msgid "" "\n" @@ -4488,155 +4488,150 @@ msgstr "" "\n" "警告：「%sã€ä¸¦éžé€™å€‹ç«™è‡ºä¸Šçš„有效新èžç¾¤çµ„ï¼\n" -#: src/lang.c:1054 +#: src/lang.c:1055 #, c-format msgid "%d files successfully written from %d articles. %d %s occurred." msgstr "%d 個檔案æˆåŠŸåœ°å¾ž %d 篇文章寫入。%d %s 已發生。" -#: src/lang.c:1055 +#: src/lang.c:1056 msgid "Missing parts." msgstr "缺少部分。" -#: src/lang.c:1056 +#: src/lang.c:1057 msgid "No beginning." msgstr "沒有起始部分。" -#: src/lang.c:1057 +#: src/lang.c:1058 msgid "No data." msgstr "沒有資料。" -#: src/lang.c:1058 +#: src/lang.c:1059 msgid "Unknown error." msgstr "ä¸æ˜ŽéŒ¯èª¤ã€‚" -#: src/lang.c:1061 +#: src/lang.c:1062 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "\t%s 的總和檢查碼 (%ld %s)" -#: src/lang.c:1066 +#: src/lang.c:1067 msgid "Reading mail active file... " msgstr "讀å–郵件ç¾ç”¨æª”案…" -#: src/lang.c:1067 +#: src/lang.c:1068 msgid "Reading mailgroups file... " msgstr "讀å–郵件群組檔案…" -#: src/lang.c:1071 +#: src/lang.c:1072 msgid "perform PGP operations on article" msgstr "å°æ–¼æ–‡ç« æ–½è¡Œ PGP æ“作" -#: src/lang.c:1072 +#: src/lang.c:1073 msgid "Add key(s) to public keyring?" msgstr "將密鑰加入公用鑰匙圈？" -#: src/lang.c:1073 +#: src/lang.c:1074 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "%s=加密，%s=ç°½å，%s=兩者，%s=離開：" -#: src/lang.c:1074 +#: src/lang.c:1075 #, c-format msgid "%s=sign, %s=sign & include public key, %s=quit: " msgstr "%s=ç°½å，%s=ç°½å & 包å«å…¬é–‹é‡‘鑰，%s=離開：" -#: src/lang.c:1075 +#: src/lang.c:1076 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "PGP 尚未設置 (無法開啟 %s)" -#: src/lang.c:1076 +#: src/lang.c:1077 msgid "Article not signed and no public keys found" msgstr "文章未被簽å且找ä¸åˆ°ä»»ä½•å…¬é–‹é‡‘é‘°" -#: src/lang.c:1078 +#: src/lang.c:1079 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "%s=離開，%s=編輯，%s=拼寫檢查，%s=pgp，%s=é¸å–®ï¼Œ%s=張貼，%s=擱置：" -#: src/lang.c:1079 +#: src/lang.c:1080 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " msgstr "%s=離開，%s=編輯，%s=拼寫檢查，%s=pgp，%s=ç™¼é€ [%%s]：" -#: src/lang.c:1080 +#: src/lang.c:1081 #, c-format msgid "" "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" "%s=離開，%s=編輯，%s=拼寫檢查，%s=pgp，%s=é¸å–®ï¼Œ%s=張貼，%s=擱置 [%%s]：" -#: src/lang.c:1082 +#: src/lang.c:1083 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "%s=離開，%s=編輯，%s=pgp，%s=é¸å–®ï¼Œ%s=張貼，%s=擱置：" -#: src/lang.c:1083 +#: src/lang.c:1084 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "%s=離開，%s=編輯，%s=pgp，%s=ç™¼é€ [%%s]：" -#: src/lang.c:1084 +#: src/lang.c:1085 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=離開，%s=編輯，%s=pgp，%s=é¸å–®ï¼Œ%s=張貼，%s=擱置 [%%s]：" -#: src/lang.c:1088 +#: src/lang.c:1089 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " msgstr "%s=離開，%s=編輯，%s=拼寫檢查，%s=é¸å–®ï¼Œ%s=張貼，%s=擱置：" -#: src/lang.c:1089 +#: src/lang.c:1090 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "%s=離開，%s=編輯，%s=拼寫檢查，%s=ç™¼é€ [%%s]：" -#: src/lang.c:1090 +#: src/lang.c:1091 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=離開，%s=編輯，%s=拼寫檢查，%s=é¸å–®ï¼Œ%s=張貼，%s=擱置 [%%s]：" -#: src/lang.c:1092 +#: src/lang.c:1093 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "%s=離開，%s=編輯，%s=é¸å–®ï¼Œ%s=張貼，%s=擱置：" -#: src/lang.c:1093 +#: src/lang.c:1094 #, c-format msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "%s=離開，%s=編輯，%s=ç™¼é€ [%%s]：" -#: src/lang.c:1094 +#: src/lang.c:1095 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=離開，%s=編輯，%s=é¸å–®ï¼Œ%s=張貼，%s=擱置 [%%s]：" -#: src/lang.c:1103 +#: src/lang.c:1104 msgid "Try cache_overview_files to speed up things.\n" msgstr "嘗試 cache_overview_files 以加速。\n" -#: src/lang.c:1104 +#: src/lang.c:1105 msgid "Tin will use local index files instead.\n" msgstr "Tin 將使用本地索引檔案åšç‚ºæ›¿ä»£ã€‚\n" -#: src/lang.c:1105 +#: src/lang.c:1106 msgid "Cannot find NNTP server name" msgstr "找ä¸åˆ° NNTP 伺æœå™¨å稱" -#: src/lang.c:1106 +#: src/lang.c:1107 #, c-format msgid "Connecting to %s:%u..." msgstr "連線到 %s:%u…" -#: src/lang.c:1107 -msgid "Disconnecting from server...\n" -msgstr "從伺æœå™¨ä¸­æ–·é€£ç·šâ€¦\n" - #: src/lang.c:1108 -#, c-format -msgid "" -"Wrong newsgroup name (\"%s\") in response of \"GROUP %s\" command: \"%s\"" -msgstr "錯誤新èžç¾¤çµ„å稱 (「%sã€) 於「群組 %sã€å‘½ä»¤ï¼šã€Œ%sã€çš„回應之中" +#, fuzzy +msgid "Disconnecting from server..." +msgstr "從伺æœå™¨ä¸­æ–·é€£ç·šâ€¦\n" #: src/lang.c:1109 #, c-format @@ -5409,65 +5404,69 @@ msgstr "NFC" msgid "NFD" msgstr "NFD" -#: src/lang.c:1586 +#: src/lang.c:1580 +msgid "NFKC case fold" +msgstr "" + +#: src/lang.c:1589 msgid "Display Options" msgstr "顯示é¸é …" -#: src/lang.c:1593 +#: src/lang.c:1596 msgid "Color Options" msgstr "é¡è‰²é¸é …" -#: src/lang.c:1599 +#: src/lang.c:1602 msgid "Highlight Options" msgstr "çªé¡¯é¸é …" -#: src/lang.c:1606 +#: src/lang.c:1609 msgid "Article-Limiting Options" msgstr "文章é™åˆ¶é¸é …" -#: src/lang.c:1612 +#: src/lang.c:1615 msgid "Posting/Mailing Options" msgstr "張貼/郵寄é¸é …" -#: src/lang.c:1618 +#: src/lang.c:1621 msgid "Saving/Printing Options" msgstr "儲存/列å°é¸é …" -#: src/lang.c:1624 +#: src/lang.c:1627 msgid "Expert Options" msgstr "專家é¸é …" -#: src/lang.c:1630 +#: src/lang.c:1633 msgid "Filtering Options" msgstr "篩é¸é¸é …" -#: src/lang.c:1635 src/lang.c:1666 src/lang.c:1672 src/lang.c:1699 -#: src/lang.c:1751 src/lang.c:1757 src/lang.c:1767 src/lang.c:1778 -#: src/lang.c:1796 src/lang.c:1865 src/lang.c:2066 src/lang.c:2072 -#: src/lang.c:2078 src/lang.c:2084 src/lang.c:2096 src/lang.c:2103 -#: src/lang.c:2157 src/lang.c:2166 src/lang.c:2172 src/lang.c:2179 -#: src/lang.c:2186 src/lang.c:2193 src/lang.c:2200 src/lang.c:2207 -#: src/lang.c:2214 src/lang.c:2221 src/lang.c:2228 src/lang.c:2235 -#: src/lang.c:2242 src/lang.c:2249 src/lang.c:2256 src/lang.c:2263 -#: src/lang.c:2270 src/lang.c:2277 src/lang.c:2284 src/lang.c:2291 -#: src/lang.c:2298 src/lang.c:2305 src/lang.c:2312 src/lang.c:2319 -#: src/lang.c:2326 src/lang.c:2333 src/lang.c:2340 src/lang.c:2348 -#: src/lang.c:2364 src/lang.c:2371 src/lang.c:2378 src/lang.c:2385 -#: src/lang.c:2391 src/lang.c:2397 src/lang.c:2414 src/lang.c:2426 -#: src/lang.c:2461 src/lang.c:2514 src/lang.c:2528 src/lang.c:2534 -#: src/lang.c:2559 src/lang.c:2577 src/lang.c:2594 src/lang.c:2606 -#: src/lang.c:2639 src/lang.c:2675 src/lang.c:2695 src/lang.c:2730 -#: src/lang.c:2740 src/lang.c:2747 src/lang.c:2773 src/lang.c:2797 -#: src/lang.c:2870 src/lang.c:2884 src/lang.c:2892 src/lang.c:2906 -#: src/lang.c:2912 src/lang.c:2950 +#: src/lang.c:1638 src/lang.c:1669 src/lang.c:1675 src/lang.c:1702 +#: src/lang.c:1754 src/lang.c:1760 src/lang.c:1770 src/lang.c:1781 +#: src/lang.c:1799 src/lang.c:1868 src/lang.c:2069 src/lang.c:2075 +#: src/lang.c:2081 src/lang.c:2087 src/lang.c:2099 src/lang.c:2106 +#: src/lang.c:2160 src/lang.c:2169 src/lang.c:2175 src/lang.c:2182 +#: src/lang.c:2189 src/lang.c:2196 src/lang.c:2203 src/lang.c:2210 +#: src/lang.c:2217 src/lang.c:2224 src/lang.c:2231 src/lang.c:2238 +#: src/lang.c:2245 src/lang.c:2252 src/lang.c:2259 src/lang.c:2266 +#: src/lang.c:2273 src/lang.c:2280 src/lang.c:2287 src/lang.c:2294 +#: src/lang.c:2301 src/lang.c:2308 src/lang.c:2315 src/lang.c:2322 +#: src/lang.c:2329 src/lang.c:2336 src/lang.c:2343 src/lang.c:2351 +#: src/lang.c:2367 src/lang.c:2374 src/lang.c:2381 src/lang.c:2388 +#: src/lang.c:2394 src/lang.c:2400 src/lang.c:2417 src/lang.c:2429 +#: src/lang.c:2464 src/lang.c:2517 src/lang.c:2531 src/lang.c:2537 +#: src/lang.c:2562 src/lang.c:2580 src/lang.c:2597 src/lang.c:2609 +#: src/lang.c:2642 src/lang.c:2678 src/lang.c:2698 src/lang.c:2733 +#: src/lang.c:2743 src/lang.c:2750 src/lang.c:2776 src/lang.c:2800 +#: src/lang.c:2877 src/lang.c:2892 src/lang.c:2900 src/lang.c:2914 +#: src/lang.c:2920 src/lang.c:2958 msgid " toggles, sets, cancels." msgstr " 切æ›ï¼Œ 設定， å–消。" -#: src/lang.c:1636 +#: src/lang.c:1639 msgid "Show mini menu & posting etiquette" msgstr "顯示迷你é¸å–® & 張貼禮儀" -#: src/lang.c:1637 +#: src/lang.c:1640 msgid "" "# If ON show a mini menu of useful commands at each level\n" "# and posting etiquette after composing an article\n" @@ -5475,15 +5474,15 @@ msgstr "" "# 如果開啟就在æ¯å€‹å±¤ç´šä¸­é¡¯ç¤ºå¸¸ç”¨å‘½ä»¤çš„è¿·ä½ é¸å–®\n" "# 並於撰寫文章之後顯示張貼禮儀\n" -#: src/lang.c:1642 +#: src/lang.c:1645 msgid "Show short description for each newsgroup. toggles & sets." msgstr "顯示æ¯å€‹æ–°èžç¾¤çµ„的簡短æ述。 åˆ‡æ› & 設定。" -#: src/lang.c:1643 +#: src/lang.c:1646 msgid "Show description of each newsgroup" msgstr "顯示æ¯å€‹æ–°èžç¾¤çµ„çš„æè¿°" -#: src/lang.c:1644 +#: src/lang.c:1647 msgid "" "# If ON show group description text after newsgroup name at\n" "# group selection level\n" @@ -5491,19 +5490,19 @@ msgstr "" "# 如果開啟就在群組é¸æ“‡å±¤ç´šä¸­æ–¼æ–°èžç¾¤çµ„å稱之後\n" "# 顯示群組æ述文字\n" -#: src/lang.c:1649 +#: src/lang.c:1652 #, fuzzy msgid "" "Show From (author) fields in group & thread level. toggles & " "sets." msgstr "在群組é¸å–®ä¸­é¡¯ç¤ºä¸»æ—¨ & 發信者 (作者) 欄ä½ã€‚ åˆ‡æ› & 設定。" -#: src/lang.c:1650 +#: src/lang.c:1653 #, fuzzy msgid "In group and thread level, show author by" msgstr "在群組é¸å–®ä¸­ï¼Œé¡¯ç¤ºä½œè€…" -#: src/lang.c:1651 +#: src/lang.c:1654 #, fuzzy msgid "" "# Part of From field to display in group and thread level\n" @@ -5520,31 +5519,31 @@ msgstr "" "# * 2 = å…¨å\n" "# 3 = 兩者\n" -#: src/lang.c:1660 +#: src/lang.c:1663 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "繪製 -> 或高亮度æ¢ç”¨æ–¼é¸æ“‡ã€‚ åˆ‡æ› & 設定。" -#: src/lang.c:1661 +#: src/lang.c:1664 msgid "Draw -> instead of highlighted bar" msgstr "繪製 -> 以代替高亮度æ¢" -#: src/lang.c:1662 +#: src/lang.c:1665 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "# 如果開啟就使用 -> å¦å‰‡é«˜äº®åº¦æ¢ç”¨æ–¼é¸æ“‡\n" -#: src/lang.c:1667 +#: src/lang.c:1670 msgid "Use inverse video for page headers" msgstr "使用å白顯示用於é é¢æ¨™é ­" -#: src/lang.c:1668 +#: src/lang.c:1671 msgid "# If ON use inverse video for page headers at different levels\n" msgstr "# 如果開啟就於ä¸åŒçš„層級使用å白顯示用於é é¢æ¨™é ­\n" -#: src/lang.c:1673 +#: src/lang.c:1676 msgid "Thread articles by" msgstr "討論串文章ä¾æ“š" -#: src/lang.c:1674 +#: src/lang.c:1677 msgid "" "# Thread articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5564,15 +5563,15 @@ msgstr "" "# 4 = 多部件主旨\n" "# 5 = 百分比匹é…\n" -#: src/lang.c:1685 +#: src/lang.c:1688 msgid "Enter percentage match required to thread together. sets." msgstr "輸入將討論串起所必需的百分比匹é…。 設定。" -#: src/lang.c:1686 +#: src/lang.c:1689 msgid "Thread percentage match" msgstr "討論串百分比匹é…" -#: src/lang.c:1688 +#: src/lang.c:1691 #, no-c-format msgid "" "# Thread percentage match...\n" @@ -5595,11 +5594,11 @@ msgstr "" "# 討論串中。例如：『happyã€å’Œã€Žharpyã€æœƒåŒ¹é…，但是『harpieã€ã€ã€Žhappieã€å’Œ\n" "#『harppyã€æœƒè·Ÿã€Žhappyã€åˆ†åœ¨ä¸åŒçš„討論串\n" -#: src/lang.c:1700 +#: src/lang.c:1703 msgid "Score of a thread" msgstr "討論串的分數" -#: src/lang.c:1701 +#: src/lang.c:1704 msgid "" "# Thread score\n" "# Possible values are (the default is marked with *):\n" @@ -5613,16 +5612,16 @@ msgstr "" "# 1 = 總和\n" "# 2 = å¹³å‡\n" -#: src/lang.c:1709 +#: src/lang.c:1712 msgid "" "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "排åºæ–‡ç« ä¾æ“šä¸»é¡Œã€ç™¼ä¿¡è€…ã€æ—¥æœŸæˆ–分數。 åˆ‡æ› & 設定。" -#: src/lang.c:1710 +#: src/lang.c:1713 msgid "Sort articles by" msgstr "排åºæ–‡ç« ä¾æ“š" -#: src/lang.c:1711 +#: src/lang.c:1714 msgid "" "# Sort articles by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5652,15 +5651,15 @@ msgstr "" "# 9 = 列數éžé™\n" "# 10 = 列數éžå‡\n" -#: src/lang.c:1727 +#: src/lang.c:1730 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "排åºè¨Žè«–串ä¸ä¾æ“šä»»ä½•æ±è¥¿æˆ–ä¾æ“šåˆ†æ•¸ã€‚ åˆ‡æ› & 設定。" -#: src/lang.c:1728 +#: src/lang.c:1731 msgid "Sort threads by" msgstr "排åºè¨Žè«–串ä¾æ“š" -#: src/lang.c:1729 +#: src/lang.c:1732 msgid "" "# Sort thread by ...\n" "# Possible values are (the default is marked with *):\n" @@ -5678,44 +5677,44 @@ msgstr "" "# 3 = 最近一次張貼日期éžé™\n" "# 4 = 最近一次張貼日期éžå‡\n" -#: src/lang.c:1739 +#: src/lang.c:1742 msgid "" "Put cursor at first/last unread art in groups. toggles & sets." msgstr "將游標放在群組中第一/最後一篇未讀文章。 åˆ‡æ› & 設定。" -#: src/lang.c:1740 +#: src/lang.c:1743 msgid "Go to first unread article in group" msgstr "å‰å¾€ç¾¤çµ„中第一篇未讀的文章" -#: src/lang.c:1741 +#: src/lang.c:1744 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "# 如果開啟就將游標放在群組中第一篇未讀文章，å¦å‰‡æ˜¯æœ€å¾Œä¸€ç¯‡æ–‡ç« \n" -#: src/lang.c:1745 +#: src/lang.c:1748 msgid "Show all articles or only unread articles. toggles & sets." msgstr "顯示所有文章或åªæœ‰æœªè®€æ–‡ç« ã€‚ åˆ‡æ› & 設定。" -#: src/lang.c:1746 +#: src/lang.c:1749 msgid "Show only unread articles" msgstr "åªé¡¯ç¤ºæœªè®€æ–‡ç« " -#: src/lang.c:1747 +#: src/lang.c:1750 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "# 如果開啟就åªé¡¯ç¤ºæ–°çš„/未讀文章，å¦å‰‡å…¨éƒ¨é¡¯ç¤ºã€‚\n" -#: src/lang.c:1752 +#: src/lang.c:1755 msgid "Show only groups with unread arts" msgstr "åªé¡¯ç¤ºæœ‰æœªè®€æ–‡ç« çš„群組" -#: src/lang.c:1753 +#: src/lang.c:1756 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "# 如果開啟就åªé¡¯ç¤ºåŒ…å«æœªè®€æ–‡ç« çš„訂閱群組。\n" -#: src/lang.c:1758 +#: src/lang.c:1761 msgid "Filter which articles" msgstr "篩é¸å“ªäº›æ–‡ç« " -#: src/lang.c:1759 +#: src/lang.c:1762 msgid "" "# Filter which articles\n" "# Possible values are (the default is marked with *):\n" @@ -5729,11 +5728,11 @@ msgstr "" "# 1 = ç é™¤æ‰€æœ‰æ–‡ç« ä¸¦åœ¨è¨Žè«–串中顯示時以 K 標記\n" "# 2 = ç é™¤æ‰€æœ‰æ–‡ç« ä¸¦æ°¸ä¸é¡¯ç¤ºå®ƒå€‘\n" -#: src/lang.c:1768 +#: src/lang.c:1771 msgid "Go to the next unread article with" msgstr "å‰å¾€ä¸‹ä¸€ç¯‡æœªè®€æ–‡ç« è—‰ç”±" -#: src/lang.c:1769 +#: src/lang.c:1772 msgid "" "# Go to the unread article with following key(s)\n" "# Possible values are (the default is marked with *):\n" @@ -5749,11 +5748,11 @@ msgstr "" "# * 2 = TAB\n" "# 3 = PAGE DOWN 或 TAB\n" -#: src/lang.c:1779 +#: src/lang.c:1782 msgid "How to treat blank lines" msgstr "如何å°å¾…空列" -#: src/lang.c:1780 +#: src/lang.c:1783 msgid "" "# Trim the article body, remove unnecessary blank lines.\n" "# Possible values are (the default is marked with *):\n" @@ -5783,24 +5782,24 @@ msgstr "" "# 7 = 壓縮文字å€å¡Šé–“的多é‡ç©ºåˆ—和跳éŽ\n" "# å‰å°Žå’Œå°¾éš¨ç©ºåˆ—\n" -#: src/lang.c:1797 +#: src/lang.c:1800 msgid "List thread using right arrow key" msgstr "使用å‘å³éµåˆ—出討論串" -#: src/lang.c:1798 +#: src/lang.c:1801 msgid "" "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "# 如果開啟當使用å‘å³éµè¼¸å…¥å®ƒæ™‚就自動列出討論串。\n" -#: src/lang.c:1802 +#: src/lang.c:1805 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "輸入字元以指出已刪除文章。 設定， å–消。" -#: src/lang.c:1803 +#: src/lang.c:1806 msgid "Character to show deleted articles" msgstr "用來顯示已刪除文章的字元" -#: src/lang.c:1804 +#: src/lang.c:1807 msgid "" "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" @@ -5808,16 +5807,16 @@ msgstr "" "# 用來顯示文章被刪除的字元 (é è¨­ã€ŽDã€)\n" "# _ 被轉æ›ç‚ºã€Ž ã€\n" -#: src/lang.c:1809 +#: src/lang.c:1812 msgid "" "Enter character to indicate articles in a range. sets, cancels." msgstr "輸入字元以指出在範åœä¸­çš„文章。 設定， å–消。" -#: src/lang.c:1810 +#: src/lang.c:1813 msgid "Character to show inrange articles" msgstr "用來顯示範åœä¸­æ–‡ç« çš„å­—å…ƒ" -#: src/lang.c:1811 +#: src/lang.c:1814 msgid "" "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" @@ -5825,17 +5824,17 @@ msgstr "" "# 用來顯示文章在範åœä¸­çš„å­—å…ƒ (é è¨­ã€Ž#ã€)\n" "# _ 被轉æ›ç‚ºã€Ž ã€\n" -#: src/lang.c:1816 +#: src/lang.c:1819 msgid "" "Enter character to indicate that article will return. sets, " "cancels." msgstr "輸入字元以指出該文章將回傳。 設定， å–消。" -#: src/lang.c:1817 +#: src/lang.c:1820 msgid "Character to show returning arts" msgstr "用來顯示回傳文章的字元" -#: src/lang.c:1818 +#: src/lang.c:1821 msgid "" "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" @@ -5843,16 +5842,16 @@ msgstr "" "# 用來顯示該文章將回傳的字元 (é è¨­ã€Ž-ã€)\n" "# _ 被轉æ›ç‚ºã€Ž ã€\n" -#: src/lang.c:1823 +#: src/lang.c:1826 msgid "" "Enter character to indicate selected articles. sets, cancels." msgstr "輸入字元以指出已é¸æ–‡ç« ã€‚ 設定， å–消。" -#: src/lang.c:1824 +#: src/lang.c:1827 msgid "Character to show selected articles" msgstr "用來顯示已é¸æ–‡ç« çš„å­—å…ƒ" -#: src/lang.c:1825 +#: src/lang.c:1828 msgid "" "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" @@ -5860,15 +5859,15 @@ msgstr "" "# 用來顯示該文章已被自動é¸å–çš„å­—å…ƒ (é è¨­ã€Ž*ã€)\n" "# _ 被轉æ›ç‚ºã€Ž ã€\n" -#: src/lang.c:1830 +#: src/lang.c:1833 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "輸入字元以指出最近文章。 設定， å–消。" -#: src/lang.c:1831 +#: src/lang.c:1834 msgid "Character to show recent articles" msgstr "用來顯示最近文章的字元" -#: src/lang.c:1832 +#: src/lang.c:1835 msgid "" "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" @@ -5876,15 +5875,15 @@ msgstr "" "# 用來顯示是最近文章的字元 (é è¨­ã€Žoã€)\n" "# _ 被轉æ›ç‚ºã€Ž ã€\n" -#: src/lang.c:1837 +#: src/lang.c:1840 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "輸入字元以指出未讀文章。 設定， å–消。" -#: src/lang.c:1838 +#: src/lang.c:1841 msgid "Character to show unread articles" msgstr "用來顯示未讀文章的字元" -#: src/lang.c:1839 +#: src/lang.c:1842 msgid "" "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" @@ -5892,15 +5891,15 @@ msgstr "" "# 用來顯示該文章未讀的字元 (é è¨­ã€Ž+ã€)\n" "# _ 被轉æ›ç‚ºã€Ž ã€\n" -#: src/lang.c:1844 +#: src/lang.c:1847 msgid "Enter character to indicate read articles. sets, cancels." msgstr "輸入字元以指出已讀文章。 設定， å–消。" -#: src/lang.c:1845 +#: src/lang.c:1848 msgid "Character to show read articles" msgstr "用來顯示已讀文章的字元" -#: src/lang.c:1846 +#: src/lang.c:1849 msgid "" "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" @@ -5908,15 +5907,15 @@ msgstr "" "# 用來顯示該文章已讀å–å­—å…ƒ (é è¨­ã€Ž ã€)\n" "# _ 被轉æ›ç‚ºã€Ž ã€\n" -#: src/lang.c:1851 +#: src/lang.c:1854 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "輸入字元以指出被ç é™¤æ–‡ç« ã€‚ 設定， å–消。" -#: src/lang.c:1852 +#: src/lang.c:1855 msgid "Character to show killed articles" msgstr "用來顯示被ç é™¤æ–‡ç« çš„å­—å…ƒ" -#: src/lang.c:1853 +#: src/lang.c:1856 msgid "" "# Character used to show that an art was killed (default 'K')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" @@ -5924,16 +5923,16 @@ msgstr "" "# 用來顯示該文章被ç é™¤çš„å­—å…ƒ (é è¨­ã€ŽKã€)\n" "# kill_level 必須根據ä¸åŒæƒ…æ³è€Œè¨­å®šï¼Œ_ 被轉æ›ç‚ºã€Ž ã€\n" -#: src/lang.c:1858 +#: src/lang.c:1861 msgid "" "Enter character to indicate read selected articles. sets, cancels." msgstr "輸入字元以指出讀å–所é¸æ–‡ç« ã€‚ 設定， å–消。" -#: src/lang.c:1859 +#: src/lang.c:1862 msgid "Character to show readselected arts" msgstr "用來顯示讀å–所é¸æ–‡ç« çš„å­—å…ƒ" -#: src/lang.c:1860 +#: src/lang.c:1863 msgid "" "# Character used to show that an art was selected before read (default ':')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" @@ -5941,11 +5940,11 @@ msgstr "" "# 用來顯示該文章讀å–之å‰å·²è¢«é¸çš„å­—å…ƒ (é è¨­ã€Ž:ã€)\n" "# kill_level 必須根據ä¸åŒæƒ…æ³è€Œè¨­å®šï¼Œ_ 被轉æ›ç‚ºã€Ž ã€\n" -#: src/lang.c:1866 +#: src/lang.c:1869 msgid "Abbreviate long newsgroup names" msgstr "將較長新èžç¾¤çµ„å稱縮寫" -#: src/lang.c:1867 +#: src/lang.c:1870 msgid "" "# If ON abbreviate (if necessary) long newsgroup names at group selection\n" "# level and article level like this:\n" @@ -5955,17 +5954,17 @@ msgstr "" "# 層級和文章層級會如下所示：\n" "# news.software.readers -> n.software.readers -> n.s.readers -> n.s.r。\n" -#: src/lang.c:1873 +#: src/lang.c:1876 msgid "" "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" msgstr "0 = æ•´é æ²å‹•ï¼Œ-1 = 顯示上é æœ€å¾Œä¸€åˆ—為下é ç¬¬ä¸€åˆ—，-2 = åŠé æ²å‹•" -#: src/lang.c:1874 +#: src/lang.c:1877 msgid "Number of lines to scroll in pager" msgstr "é é¢åˆ‡æ›æ™‚æ²å‹•çš„列數" -#: src/lang.c:1875 +#: src/lang.c:1878 msgid "" "# Number of lines that cursor-up/down will scroll in article pager\n" "# Possible values are (the default is marked with *):\n" @@ -5983,28 +5982,28 @@ msgstr "" "# * 1 = æ²å‹•ä¸€åˆ—\n" "# 2 或更大 = æ²å‹• 2 或更多列 (åªæœ‰åœ¨é é¢åˆ‡æ›æ™‚)\n" -#: src/lang.c:1885 +#: src/lang.c:1888 msgid "Display signatures. toggles & sets." msgstr "顯示簽å。 åˆ‡æ› & 設定。" -#: src/lang.c:1886 +#: src/lang.c:1889 msgid "Display signatures" msgstr "顯示簽å" -#: src/lang.c:1887 +#: src/lang.c:1890 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "# 如果關閉於顯示文章時就ä¸é¡¯ç¤ºç°½å\n" -#: src/lang.c:1891 +#: src/lang.c:1894 msgid "" "Display uuencoded data as tagged attachments. toggles & sets." msgstr "å°‡ uuencoded 資料顯示為已標定附件。 åˆ‡æ› & 設定。" -#: src/lang.c:1892 +#: src/lang.c:1895 msgid "Display uue data as an attachment" msgstr "å°‡ uue 資料åšç‚ºé™„件顯示" -#: src/lang.c:1893 +#: src/lang.c:1896 msgid "" "# Handling of uuencoded data in the pager\n" "# Possible values are (the default is marked with *):\n" @@ -6023,16 +6022,16 @@ msgstr "" "# 2 = éš±è—所有，類似 1，但是任何看來åƒæ˜¯ uuencoded 資料的列，都將\n" "# 被折疊為一標定列。\n" -#: src/lang.c:1903 +#: src/lang.c:1906 msgid "" "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "è§£ç¢¼å¾·èªžæ¨£å¼ TeX 變音編碼為 ISO。 åˆ‡æ› & 設定。" -#: src/lang.c:1904 +#: src/lang.c:1907 msgid "Display \"a as Umlaut-a" msgstr "顯示 \"a 為變音 a" -#: src/lang.c:1905 +#: src/lang.c:1908 msgid "" "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" @@ -6040,15 +6039,15 @@ msgstr "" "# å¦‚æžœé–‹å•Ÿå°±è§£ç¢¼å¾·èªžæ¨£å¼ TeX 變音編碼為 ISO 並\n" "# 顯示 \"a 為變音 a ...等等\n" -#: src/lang.c:1910 src/lang.c:1920 +#: src/lang.c:1913 src/lang.c:1923 msgid "Space separated list of header fields" msgstr "以空格分隔的標頭欄ä½æ¸…å–®" -#: src/lang.c:1911 +#: src/lang.c:1914 msgid "Display these header fields (or *)" msgstr "é¡¯ç¤ºé€™äº›æ¨™é ­æ¬„ä½ (或 *)" -#: src/lang.c:1912 +#: src/lang.c:1915 msgid "" "# Which news headers you wish to see. If you want to see _all_ the headers,\n" "# place an '*' as this value. This is the only way a wildcard can be used.\n" @@ -6063,11 +6062,11 @@ msgstr "" "#『X-ã€(åƒæ˜¯ X-Alan 或 X-Pape)。您å¯ä»¥è—‰ç”±ä»¥ç©ºæ ¼åˆ†éš”而列出\n" "# 超éŽä¸€å€‹ã€‚沒有定義任何值將會關閉這個é¸é …。\n" -#: src/lang.c:1921 +#: src/lang.c:1924 msgid "Do not display these header fields" msgstr "ä¸é¡¯ç¤ºé€™äº›æ¨™é ­æ¬„ä½" -#: src/lang.c:1922 +#: src/lang.c:1925 msgid "" "# Same as 'news_headers_to_display' except it denotes the opposite.\n" "# An example of using both options might be if you thought X- headers were\n" @@ -6086,40 +6085,40 @@ msgstr "" "# news_headers_to_not_display=X-Alan X-Pape\n" "# 沒有定義任何值就表示關閉這個é¸é …。\n" -#: src/lang.c:1932 +#: src/lang.c:1935 msgid "" "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "您è¦å•Ÿç”¨å¤šéƒ¨ä»¶/替代文章的自動處ç†å—Žï¼Ÿ" -#: src/lang.c:1933 +#: src/lang.c:1936 msgid "Skip multipart/alternative parts" msgstr "è·³éŽå¤šéƒ¨ä»¶/替代部分" -#: src/lang.c:1934 +#: src/lang.c:1937 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "# 如果開啟就自動截除多部件/替代訊æ¯\n" -#: src/lang.c:1938 +#: src/lang.c:1941 msgid "Enable detection of verbatim blocks? toggles & sets." msgstr "啟用字é¢å€å¡Šçš„åµæ¸¬ï¼Ÿ åˆ‡æ› & 設定。" -#: src/lang.c:1939 +#: src/lang.c:1942 msgid "Detection of verbatim blocks" msgstr "å­—é¢å€å¡Šçš„åµæ¸¬" -#: src/lang.c:1940 +#: src/lang.c:1943 msgid "# If ON detect verbatim blocks in articles\n" msgstr "# 如果開啟就在文章中åµæ¸¬å­—é¢å€å¡Š\n" -#: src/lang.c:1945 +#: src/lang.c:1948 msgid "A regex used to decide which lines to show in col_quote." msgstr "用來決定在 col_quote 中è¦é¡¯ç¤ºå“ªäº›åˆ—çš„ regex。" -#: src/lang.c:1946 +#: src/lang.c:1949 msgid "Regex used to show quoted lines" msgstr "用來顯示引言列的 regex" -#: src/lang.c:1947 +#: src/lang.c:1950 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" @@ -6129,15 +6128,15 @@ msgstr "" "# æ­£è¦è¡¨ç¤ºå¼ã€‚引言列將以 col_quote 顯示。\n" "# 如果您ä¿ç•™å®ƒç‚ºç©ºç™½ï¼Œtin 將使用內建的é è¨­å€¼ã€‚\n" -#: src/lang.c:1953 +#: src/lang.c:1956 msgid "A regex used to decide which lines to show in col_quote2." msgstr "用來決定è¦ä»¥ col_quote2 顯示哪些列的 regex。" -#: src/lang.c:1954 +#: src/lang.c:1957 msgid "Regex used to show twice quoted l." msgstr "用來顯示第二層引言列的 regex。" -#: src/lang.c:1955 +#: src/lang.c:1958 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" @@ -6147,15 +6146,15 @@ msgstr "" "# æ­£è¦è¡¨ç¤ºå¼ã€‚第二層引言列將以 col_quote2 顯示。\n" "# 如果您ä¿ç•™å®ƒç‚ºç©ºç™½ï¼Œtin 將使用內建的é è¨­å€¼ã€‚\n" -#: src/lang.c:1961 +#: src/lang.c:1964 msgid "A regex used to decide which lines to show in col_quote3." msgstr "用來決定è¦ä»¥ col_quote3 顯示哪些列的 regex。" -#: src/lang.c:1962 +#: src/lang.c:1965 msgid "Regex used to show >= 3 times q.l." msgstr "用來顯示 >= 3 層引言列的 regex。" -#: src/lang.c:1963 +#: src/lang.c:1966 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" @@ -6165,32 +6164,32 @@ msgstr "" "# æ­£è¦è¡¨ç¤ºå¼ã€‚>= 3 層引言列將以 col_quote3 顯示。\n" "# 如果您ä¿ç•™å®ƒç‚ºç©ºç™½ï¼Œtin 將使用內建的é è¨­å€¼ã€‚\n" -#: src/lang.c:1969 +#: src/lang.c:1972 #, fuzzy msgid "Enable detection of external quotes? toggles & sets." msgstr "啟用字é¢å€å¡Šçš„åµæ¸¬ï¼Ÿ åˆ‡æ› & 設定。" -#: src/lang.c:1970 +#: src/lang.c:1973 #, fuzzy msgid "Detection of external quotes" msgstr "å­—é¢å€å¡Šçš„åµæ¸¬" -#: src/lang.c:1971 +#: src/lang.c:1974 #, fuzzy msgid "# If ON detect quoted text from external sources in articles\n" msgstr "# 如果開啟就在文章中åµæ¸¬å­—é¢å€å¡Š\n" -#: src/lang.c:1975 +#: src/lang.c:1978 #, fuzzy msgid "A regex used to decide which lines to show in col_extquote." msgstr "用來決定在 col_quote 中è¦é¡¯ç¤ºå“ªäº›åˆ—çš„ regex。" -#: src/lang.c:1976 +#: src/lang.c:1979 #, fuzzy msgid "Regex used to show quotes from external sources" msgstr "用來顯示引言列的 regex" -#: src/lang.c:1977 +#: src/lang.c:1980 #, fuzzy msgid "" "# A regular expression that tin will use to decide which lines are\n" @@ -6201,15 +6200,15 @@ msgstr "" "# æ­£è¦è¡¨ç¤ºå¼ã€‚第二層引言列將以 col_quote2 顯示。\n" "# 如果您ä¿ç•™å®ƒç‚ºç©ºç™½ï¼Œtin 將使用內建的é è¨­å€¼ã€‚\n" -#: src/lang.c:1984 +#: src/lang.c:1987 msgid "A regex used to decide which words to show in col_markslashes." msgstr "用來決定è¦ä»¥ col_markslashes 顯示哪些字詞的 regex。" -#: src/lang.c:1985 +#: src/lang.c:1988 msgid "Regex used to highlight /slashes/" msgstr "用來高亮度標示 /斜線/ çš„ regex" -#: src/lang.c:1986 +#: src/lang.c:1989 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '/' are to be shown in col_markslashes.\n" @@ -6219,15 +6218,15 @@ msgstr "" "# 將以 col_markslashes 顯示的正è¦è¡¨ç¤ºå¼ã€‚\n" "# 如果您ä¿ç•™å®ƒç‚ºç©ºç™½ï¼Œtin 將使用內建的é è¨­å€¼ã€‚\n" -#: src/lang.c:1992 +#: src/lang.c:1995 msgid "A regex used to decide which words to show in col_markstars." msgstr "用來決定è¦ä»¥ col_markstars 顯示哪些字詞的 regex。" -#: src/lang.c:1993 +#: src/lang.c:1996 msgid "Regex used to highlight *stars*" msgstr "用來高亮度顯示 *星號* çš„ regex" -#: src/lang.c:1994 +#: src/lang.c:1997 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '*' are to be shown in col_markstars.\n" @@ -6237,15 +6236,15 @@ msgstr "" "# 將以 col_markstars 顯示的正è¦è¡¨ç¤ºå¼ã€‚\n" "# 如果您ä¿ç•™å®ƒç‚ºç©ºç™½ï¼Œtin 將使用內建的é è¨­å€¼ã€‚\n" -#: src/lang.c:2000 +#: src/lang.c:2003 msgid "A regex used to decide which words to show in col_markstroke." msgstr "用來決定è¦ä»¥ col_markstroke 顯示哪些字詞的 regex。" -#: src/lang.c:2001 +#: src/lang.c:2004 msgid "Regex used to highlight -strokes-" msgstr "用來高亮度顯示 -æ©«ç·š- çš„ regex" -#: src/lang.c:2002 +#: src/lang.c:2005 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '-' are to be shown in col_markstroke.\n" @@ -6255,15 +6254,15 @@ msgstr "" "# 將以 col_markstroke 顯示的正è¦è¡¨ç¤ºå¼ã€‚\n" "# 如果您ä¿ç•™å®ƒç‚ºç©ºç™½ï¼Œtin 將使用內建的é è¨­å€¼ã€‚\n" -#: src/lang.c:2008 +#: src/lang.c:2011 msgid "A regex used to decide which words to show in col_markdash." msgstr "用來決定è¦ä»¥ col_markdash 顯示哪些字詞的 regex。" -#: src/lang.c:2009 +#: src/lang.c:2012 msgid "Regex used to highlight _underline_" msgstr "用來高亮度顯示 _底線_ çš„ regex" -#: src/lang.c:2010 +#: src/lang.c:2013 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '_' are to be shown in col_markdash.\n" @@ -6273,15 +6272,15 @@ msgstr "" "# 將以 col_markdash 顯示的正è¦è¡¨ç¤ºå¼ã€‚\n" "# 如果您ä¿ç•™å®ƒç‚ºç©ºç™½ï¼Œtin 將使用內建的é è¨­å€¼ã€‚\n" -#: src/lang.c:2016 +#: src/lang.c:2019 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "用來尋找è¦ç§»é™¤çš„主旨å‰ç¶´çš„ regex。 使用『|ã€åšç‚ºåˆ†éš”符號。" -#: src/lang.c:2017 +#: src/lang.c:2020 msgid "Regex with Subject prefixes" msgstr "主旨å‰ç¶´çš„ regex" -#: src/lang.c:2018 +#: src/lang.c:2021 msgid "" "# A regular expression that tin will use to find Subject prefixes\n" "# which will be removed before showing the header.\n" @@ -6289,15 +6288,15 @@ msgstr "" "# tin 將用來尋找主旨å‰ç¶´çš„æ­£è¦è¡¨ç¤ºå¼\n" "# 於顯示標頭之å‰å°‡è¢«ç§»é™¤ã€‚\n" -#: src/lang.c:2023 +#: src/lang.c:2026 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "用來尋找è¦ç§»é™¤çš„主旨字尾的 regex。 使用『|ã€åšç‚ºåˆ†éš”符號。" -#: src/lang.c:2024 +#: src/lang.c:2027 msgid "Regex with Subject suffixes" msgstr "主旨字尾的 regex" -#: src/lang.c:2025 +#: src/lang.c:2028 msgid "" "# A regular expression that tin will use to find Subject suffixes\n" "# which will be removed when replying or posting followup.\n" @@ -6305,49 +6304,50 @@ msgstr "" "# tin 將用來尋找主旨字尾的正è¦è¡¨ç¤ºå¼\n" "# 於回覆或跟貼時將被移除。\n" -#: src/lang.c:2030 +#: src/lang.c:2033 msgid "A regex used to find the begin of a verbatim block." msgstr "用來找尋字é¢å€å¡Šé–‹å§‹çš„ regex。" -#: src/lang.c:2031 +#: src/lang.c:2034 msgid "Regex for begin of a verbatim block" msgstr "用於字é¢å€å¡Šé–‹å§‹çš„ regex" -#: src/lang.c:2032 +#: src/lang.c:2035 msgid "" "# A regular expression that tin will use to find the begin of\n" "# a verbatim block.\n" msgstr "# tin 將用來找尋字é¢å€å¡Šé–‹å§‹çš„æ­£è¦è¡¨ç¤ºå¼ã€‚\n" -#: src/lang.c:2037 +#: src/lang.c:2040 msgid "A regex used to find the end of a verbatim block." msgstr "用來找尋字é¢å€å¡ŠçµæŸçš„ regex。" -#: src/lang.c:2038 +#: src/lang.c:2041 msgid "Regex for end of a verbatim block" msgstr "用於字é¢å€å¡ŠçµæŸçš„ regex" -#: src/lang.c:2039 +#: src/lang.c:2042 msgid "" "# A regular expression that tin will use to find the end of\n" "# a verbatim block.\n" msgstr "# tin 將用來找尋字é¢å€å¡ŠçµæŸçš„æ­£è¦è¡¨ç¤ºå¼ã€‚\n" -#: src/lang.c:2044 +#: src/lang.c:2047 msgid "" "Enter name and options for external MIME viewer, --internal for built-in " "viewer" msgstr "輸入外部 MIME 檢視器的å稱和é¸é …，--internal 表示內建檢視器" -#: src/lang.c:2045 +#: src/lang.c:2048 msgid "MIME binary content viewer" msgstr "MIME 二進ä½å…§å®¹æª¢è¦–器" -#: src/lang.c:2046 +#: src/lang.c:2049 +#, fuzzy 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 " +"# Otherwise specify an external viewer program (eg. metamail) or leave " "blank\n" "# for no automatic viewing\n" msgstr "" @@ -6356,15 +6356,15 @@ msgstr "" "# å¦å‰‡è«‹æŒ‡å®šå¤–éƒ¨æª¢è¦–å™¨ç¨‹å¼ (例：metamail) 或ä¿æŒç©ºç™½ä»¥\n" "# 表示ä¸è¦è‡ªå‹•æª¢è¦–\n" -#: src/lang.c:2053 +#: src/lang.c:2056 msgid "Confirm before starting non-text viewing program" msgstr "å•Ÿå‹•éžç´”文字檢視程å¼ä¹‹å‰å…ˆç¢ºèª" -#: src/lang.c:2054 +#: src/lang.c:2057 msgid "Ask before using MIME viewer" msgstr "使用 MIME 檢視器之å‰å…ˆè©¢å•" -#: src/lang.c:2055 +#: src/lang.c:2058 msgid "" "# If ON tin will ask before using metamail to display MIME messages\n" "# this only happens if metamail_prog is set to something\n" @@ -6372,84 +6372,84 @@ msgstr "" "# 如果開啟，tin 將於使用 metamail 顯示 MIME 訊æ¯ä¹‹å‰å…ˆè©¢å•\n" "# åªæœ‰ç•¶ metamail_prog 已設定為æŸå€‹å€¼æ™‚，這æ‰æœƒç™¼ç”Ÿ\n" -#: src/lang.c:2060 +#: src/lang.c:2063 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "離開時詢å•æ˜¯å¦å°‡ç¾¤çµ„標記為已讀。 åˆ‡æ› & 設定。" -#: src/lang.c:2061 +#: src/lang.c:2064 msgid "Catchup read groups when quitting" msgstr "離開時將已讀群組設回未讀" -#: src/lang.c:2062 +#: src/lang.c:2065 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "# 如果開啟就詢å•ä½¿ç”¨è€…是å¦æ‰€æœ‰å·²è®€ç¾¤çµ„應該都被標記為已讀\n" -#: src/lang.c:2067 +#: src/lang.c:2070 msgid "Catchup group using left key" msgstr "使用å‘å·¦éµå°‡ç¾¤çµ„設回未讀" -#: src/lang.c:2068 +#: src/lang.c:2071 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "# 如果開啟則當以å‘å·¦éµé›¢é–‹æ™‚，將群組/討論串設回未讀。\n" -#: src/lang.c:2073 +#: src/lang.c:2076 msgid "Catchup thread by using left key" msgstr "使用å‘å·¦éµå°‡è¨Žè«–串設回未讀" -#: src/lang.c:2079 +#: src/lang.c:2082 msgid "Which actions require confirmation" msgstr "哪些動作需è¦ç¢ºèª" -#: src/lang.c:2080 +#: src/lang.c:2083 msgid "# What should we ask confirmation for.\n" msgstr "# 我們應該å°æ–¼ä»€éº¼è©¢å•ç¢ºèªã€‚\n" -#: src/lang.c:2085 +#: src/lang.c:2088 msgid "'Mark as (un)read' ignores tags" msgstr "『標記為(未)已讀ã€å¿½ç•¥æ¨™å®š" -#: src/lang.c:2086 +#: src/lang.c:2089 msgid "" "# If ON the 'Mark as (un)read' function marks only the current article.\n" msgstr "# 如果開啟則『標記為(未)已讀ã€åŠŸèƒ½åªæœƒæ¨™è¨˜ç›®å‰çš„文章。\n" -#: src/lang.c:2090 +#: src/lang.c:2093 msgid "Program to run to open URLs, sets, cancels." msgstr "執行以開啟網å€çš„程å¼ï¼Œ 設定， å–消。" -#: src/lang.c:2091 +#: src/lang.c:2094 msgid "Program that opens URLs" msgstr "開啟網å€çš„程å¼" -#: src/lang.c:2092 +#: src/lang.c:2095 msgid "# The program used to open URLs. The actual URL will be appended\n" msgstr "# 用來開啟網å€çš„程å¼ã€‚將會附加實際的網å€\n" -#: src/lang.c:2097 +#: src/lang.c:2100 msgid "Use mouse in xterm" msgstr "在 xterm 中使用滑鼠" -#: src/lang.c:2098 +#: src/lang.c:2101 msgid "# If ON enable mouse button support on xterm terminals\n" msgstr "# 如果開啟就啟用 xterm 終端機å°æ–¼æ»‘鼠按鈕的支æ´\n" -#: src/lang.c:2104 +#: src/lang.c:2107 msgid "Use scroll keys on keypad" msgstr "使用數字éµç›¤ä¸Šçš„æ²å‹•éµ" -#: src/lang.c:2105 +#: src/lang.c:2108 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "# 如果開啟就在有支æ´æ²å‹•éµçš„終端機上啟用它\n" -#: src/lang.c:2110 +#: src/lang.c:2113 msgid "Enter maximum number of article to get. sets." msgstr "輸入è¦æå–文章的最大值數é‡ã€‚ 設定。" -#: src/lang.c:2111 +#: src/lang.c:2114 msgid "Number of articles to get" msgstr "è¦æå–文章的數é‡" -#: src/lang.c:2112 +#: src/lang.c:2115 msgid "" "# Number of articles to get (0=no limit), if negative sets maximum number\n" "# of already read articles to be read before first unread one\n" @@ -6457,28 +6457,28 @@ msgstr "" "# è¦æå–æ–‡ç« çš„æ•¸é‡ (0=ç„¡é™åˆ¶)，如果為負就設定\n" "# 為第一篇未讀文章之å‰è¦è®€å–的已讀文章最大值\n" -#: src/lang.c:2117 +#: src/lang.c:2120 msgid "Enter number of days article is considered recent. sets." msgstr "輸入被èªç‚ºæœ€è¿‘文章的日數。 設定。" -#: src/lang.c:2118 +#: src/lang.c:2121 msgid "Article recentness time limit" msgstr "最近文章的時間é™åˆ¶" -#: src/lang.c:2119 +#: src/lang.c:2122 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "# 被èªç‚ºæ˜¯æœ€è¿‘文章所需的日數，(0=關閉)\n" -#: src/lang.c:2123 +#: src/lang.c:2126 msgid "" "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "WILDMAT 用於一般è¬ç”¨å­—元，REGEX 用於完整正è¦è¡¨ç¤ºå¼åŒ¹é…。" -#: src/lang.c:2124 +#: src/lang.c:2127 msgid "Wildcard matching" msgstr "è¬ç”¨å­—元匹é…" -#: src/lang.c:2125 +#: src/lang.c:2128 msgid "" "# Wildcard matching\n" "# Possible values are (the default is marked with *):\n" @@ -6490,59 +6490,59 @@ msgstr "" "# * 0 = wildmat\n" "# 1 = regex\n" -#: src/lang.c:2132 +#: src/lang.c:2135 msgid "Enter minimal score before an article is marked killed. sets." msgstr "輸入文章被標記ç é™¤ä¹‹å‰çš„最少分數。 設定。" -#: src/lang.c:2133 +#: src/lang.c:2136 msgid "Score limit (kill)" msgstr "分數é™åˆ¶ (ç é™¤)" -#: src/lang.c:2134 +#: src/lang.c:2137 msgid "# Score limit before an article is marked killed\n" msgstr "# 文章被標記ç é™¤ä¹‹å‰çš„分數é™åˆ¶\n" -#: src/lang.c:2138 +#: src/lang.c:2141 msgid "Enter default score to kill articles. sets." msgstr "輸入ç é™¤æ–‡ç« çš„é è¨­åˆ†æ•¸ã€‚ 設定。" -#: src/lang.c:2139 +#: src/lang.c:2142 msgid "Default score to kill articles" msgstr "ç é™¤æ–‡ç« çš„é è¨­åˆ†æ•¸" -#: src/lang.c:2140 +#: src/lang.c:2143 msgid "# Default score to kill articles\n" msgstr "# ç é™¤æ–‡ç« çš„é è¨­åˆ†æ•¸\n" -#: src/lang.c:2144 +#: src/lang.c:2147 msgid "Enter minimal score before an article is marked hot. sets." msgstr "輸入文章被標記熱門之å‰çš„最少分數。 設定。" -#: src/lang.c:2145 +#: src/lang.c:2148 msgid "Score limit (select)" msgstr "分數é™åˆ¶ (é¸å–)" -#: src/lang.c:2146 +#: src/lang.c:2149 msgid "# Score limit before an article is marked hot\n" msgstr "# 文章被標記熱門之å‰çš„分數é™åˆ¶\n" -#: src/lang.c:2150 +#: src/lang.c:2153 msgid "Enter default score to select articles. sets." msgstr "輸入é¸å–文章的é è¨­åˆ†æ•¸ã€‚ 設定。" -#: src/lang.c:2151 +#: src/lang.c:2154 msgid "Default score to select articles" msgstr "é¸å–文章的é è¨­åˆ†æ•¸" -#: src/lang.c:2152 +#: src/lang.c:2155 msgid "# Default score to select articles\n" msgstr "# é¸å–文章的é è¨­åˆ†æ•¸\n" -#: src/lang.c:2158 +#: src/lang.c:2161 msgid "Use slrnface to show ''X-Face:''s" msgstr "使用 slrnface 以顯示『X-Face:ã€" -#: src/lang.c:2159 +#: src/lang.c:2162 msgid "" "# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n" "# Only useful when running in an xterm.\n" @@ -6550,19 +6550,19 @@ msgstr "" "# 如果開啟就使用 slrnface(1) 以解譯『X-Face:ã€æ¨™é ­ã€‚\n" "# åªæœ‰åœ¨ xterm 中執行時æ‰æœ‰ä½œç”¨ã€‚\n" -#: src/lang.c:2167 +#: src/lang.c:2170 msgid "Use ANSI color" msgstr "使用 ANSI é¡è‰²" -#: src/lang.c:2168 +#: src/lang.c:2171 msgid "# If ON using ANSI-color\n" msgstr "# 如果開啟就使用 ANSI é¡è‰²\n" -#: src/lang.c:2173 +#: src/lang.c:2176 msgid "Standard foreground color" msgstr "標準å‰æ™¯é¡è‰²" -#: src/lang.c:2174 +#: src/lang.c:2177 msgid "" "# Standard foreground color\n" "# Default: -1 (default color)\n" @@ -6570,11 +6570,11 @@ msgstr "" "# 標準å‰æ™¯é¡è‰²\n" "# é è¨­ï¼š-1 (é è¨­é¡è‰²)\n" -#: src/lang.c:2180 +#: src/lang.c:2183 msgid "Standard background color" msgstr "標準背景é¡è‰²" -#: src/lang.c:2181 +#: src/lang.c:2184 msgid "" "# Standard background color\n" "# Default: -1 (default color)\n" @@ -6582,11 +6582,11 @@ msgstr "" "# 標準背景é¡è‰²\n" "# é è¨­ï¼š-1 (é è¨­é¡è‰²)\n" -#: src/lang.c:2187 +#: src/lang.c:2190 msgid "Color for inverse text (background)" msgstr "å白文字的é¡è‰² (背景)" -#: src/lang.c:2188 +#: src/lang.c:2191 msgid "" "# Color of background for inverse text\n" "# Default: 4 (blue)\n" @@ -6594,11 +6594,11 @@ msgstr "" "# å白文字的背景é¡è‰²\n" "# é è¨­ï¼š4 (è—色)\n" -#: src/lang.c:2194 +#: src/lang.c:2197 msgid "Color for inverse text (foreground)" msgstr "å白文字的é¡è‰² (å‰æ™¯)" -#: src/lang.c:2195 +#: src/lang.c:2198 msgid "" "# Color of foreground for inverse text\n" "# Default: 7 (white)\n" @@ -6606,11 +6606,11 @@ msgstr "" "# å白文字的å‰æ™¯é¡è‰²\n" "# é è¨­ï¼š7 (白色)\n" -#: src/lang.c:2201 +#: src/lang.c:2204 msgid "Color of text lines" msgstr "文字列的é¡è‰²" -#: src/lang.c:2202 +#: src/lang.c:2205 msgid "" "# Color of text lines\n" "# Default: -1 (default color)\n" @@ -6618,11 +6618,11 @@ msgstr "" "# 文字列的é¡è‰²\n" "# é è¨­ï¼š-1 (é è¨­é¡è‰²)\n" -#: src/lang.c:2208 +#: src/lang.c:2211 msgid "Color of mini help menu" msgstr "迷你說明é¸å–®çš„é¡è‰²" -#: src/lang.c:2209 +#: src/lang.c:2212 msgid "" "# Color of mini help menu\n" "# Default: 3 (brown)\n" @@ -6630,11 +6630,11 @@ msgstr "" "# 迷你說明é¸å–®çš„é¡è‰²\n" "# é è¨­ï¼š3 (棕色)\n" -#: src/lang.c:2215 +#: src/lang.c:2218 msgid "Color of help text" msgstr "說明文字的é¡è‰²" -#: src/lang.c:2216 +#: src/lang.c:2219 msgid "" "# Color of help pages\n" "# Default: -1 (default color)\n" @@ -6642,11 +6642,11 @@ msgstr "" "# 說明é é¢çš„é¡è‰²\n" "# é è¨­ï¼š-1 (é è¨­é¡è‰²)\n" -#: src/lang.c:2222 +#: src/lang.c:2225 msgid "Color of status messages" msgstr "狀態訊æ¯çš„é¡è‰²" -#: src/lang.c:2223 +#: src/lang.c:2226 msgid "" "# Color of messages in last line\n" "# Default: 6 (cyan)\n" @@ -6654,11 +6654,11 @@ msgstr "" "# 最後一列中訊æ¯çš„é¡è‰²\n" "# é è¨­ï¼š6 (é’色)\n" -#: src/lang.c:2229 +#: src/lang.c:2232 msgid "Color of quoted lines" msgstr "引言列的é¡è‰²" -#: src/lang.c:2230 +#: src/lang.c:2233 msgid "" "# Color of quote-lines\n" "# Default: 2 (green)\n" @@ -6666,11 +6666,11 @@ msgstr "" "# 引言列的é¡è‰²\n" "# é è¨­ï¼š2 (綠色)\n" -#: src/lang.c:2236 +#: src/lang.c:2239 msgid "Color of twice quoted line" msgstr "第二層引言列的é¡è‰²" -#: src/lang.c:2237 +#: src/lang.c:2240 msgid "" "# Color of twice quoted lines\n" "# Default: 3 (brown)\n" @@ -6678,11 +6678,11 @@ msgstr "" "# 第二層引言列的é¡è‰²\n" "# é è¨­ï¼š3 (棕色)\n" -#: src/lang.c:2243 +#: src/lang.c:2246 msgid "Color of =>3 times quoted line" msgstr "=>3 層引言列的é¡è‰²" -#: src/lang.c:2244 +#: src/lang.c:2247 msgid "" "# Color of >=3 times quoted lines\n" "# Default: 4 (blue)\n" @@ -6690,11 +6690,11 @@ msgstr "" "# =>3 層引言列的é¡è‰²\n" "# é è¨­ï¼š4 (è—色)\n" -#: src/lang.c:2250 +#: src/lang.c:2253 msgid "Color of article header lines" msgstr "文章標頭列的é¡è‰²" -#: src/lang.c:2251 +#: src/lang.c:2254 msgid "" "# Color of header-lines\n" "# Default: 2 (green)\n" @@ -6702,11 +6702,11 @@ msgstr "" "# 標頭列的é¡è‰²\n" "# é è¨­ï¼š2 (綠色)\n" -#: src/lang.c:2257 +#: src/lang.c:2260 msgid "Color of actual news header fields" msgstr "實際新èžæ¨™é ­æ¬„ä½çš„é¡è‰²" -#: src/lang.c:2258 +#: src/lang.c:2261 msgid "" "# Color of actual news header fields\n" "# Default: 9 (light red)\n" @@ -6714,11 +6714,11 @@ msgstr "" "# 實際新èžæ¨™é ­æ¬„ä½çš„é¡è‰²\n" "# é è¨­ï¼š9 (淺紅色)\n" -#: src/lang.c:2264 +#: src/lang.c:2267 msgid "Color of article subject lines" msgstr "文章主旨列的é¡è‰²" -#: src/lang.c:2265 +#: src/lang.c:2268 msgid "" "# Color of article subject\n" "# Default: 6 (cyan)\n" @@ -6726,12 +6726,12 @@ msgstr "" "# 文章主旨列的é¡è‰²\n" "# é è¨­ï¼š6 (é’色)\n" -#: src/lang.c:2271 +#: src/lang.c:2274 #, fuzzy msgid "Color of external quotes" msgstr "文字列的é¡è‰²" -#: src/lang.c:2272 +#: src/lang.c:2275 #, fuzzy msgid "" "# Color of quoted text from external sources\n" @@ -6740,11 +6740,11 @@ msgstr "" "# å­—é¢å€å¡Šçš„é¡è‰²\n" "# é è¨­ï¼š5 (粉紅)\n" -#: src/lang.c:2278 +#: src/lang.c:2281 msgid "Color of response counter" msgstr "回應計數器的é¡è‰²" -#: src/lang.c:2279 +#: src/lang.c:2282 msgid "" "# Color of response counter\n" "# Default: 2 (green)\n" @@ -6752,11 +6752,11 @@ msgstr "" "# 回應計數器的é¡è‰²\n" "# é è¨­ï¼š2 (綠色)\n" -#: src/lang.c:2285 +#: src/lang.c:2288 msgid "Color of sender (From:)" msgstr "傳é€è€…çš„é¡è‰² ( From: )" -#: src/lang.c:2286 +#: src/lang.c:2289 msgid "" "# Color of sender (From:)\n" "# Default: 2 (green)\n" @@ -6764,11 +6764,11 @@ msgstr "" "# 傳é€è€…çš„é¡è‰² ( From: )\n" "# é è¨­ï¼š2 (綠色)\n" -#: src/lang.c:2292 +#: src/lang.c:2295 msgid "Color of help/mail sign" msgstr "說明/郵件簽åçš„é¡è‰²" -#: src/lang.c:2293 +#: src/lang.c:2296 msgid "" "# Color of Help/Mail-Sign\n" "# Default: 4 (blue)\n" @@ -6776,11 +6776,11 @@ msgstr "" "# 說明/郵件簽åçš„é¡è‰²\n" "# é è¨­ï¼š4 (è—色)\n" -#: src/lang.c:2299 +#: src/lang.c:2302 msgid "Color of signatures" msgstr "ç°½åçš„é¡è‰²" -#: src/lang.c:2300 +#: src/lang.c:2303 msgid "" "# Color of signature\n" "# Default: 4 (blue)\n" @@ -6788,11 +6788,11 @@ msgstr "" "# ç°½åçš„é¡è‰²\n" "# é è¨­ï¼š4 (è—色)\n" -#: src/lang.c:2306 +#: src/lang.c:2309 msgid "Color of highlighted URLs" msgstr "高亮度網å€çš„é¡è‰²" -#: src/lang.c:2307 +#: src/lang.c:2310 msgid "" "# Color of highlighted URLs\n" "# Default: -1 (default color)\n" @@ -6800,11 +6800,11 @@ msgstr "" "# 高亮度網å€çš„é¡è‰²\n" "# é è¨­ï¼š-1 (é è¨­é¡è‰²)\n" -#: src/lang.c:2313 +#: src/lang.c:2316 msgid "Color of verbatim blocks" msgstr "å­—é¢å€å¡Šçš„é¡è‰²" -#: src/lang.c:2314 +#: src/lang.c:2317 msgid "" "# Color of verbatim blocks\n" "# Default: 5 (pink)\n" @@ -6812,11 +6812,11 @@ msgstr "" "# å­—é¢å€å¡Šçš„é¡è‰²\n" "# é è¨­ï¼š5 (粉紅)\n" -#: src/lang.c:2320 +#: src/lang.c:2323 msgid "Color of highlighting with *stars*" msgstr "高亮度顯示 *星號* çš„é¡è‰²" -#: src/lang.c:2321 +#: src/lang.c:2324 msgid "" "# Color of word highlighting with *stars*\n" "# Default: 11 (yellow)\n" @@ -6824,11 +6824,11 @@ msgstr "" "# 高亮度顯示 *星號* å­—è©žçš„é¡è‰²\n" "# é è¨­ï¼š11 (黃色)\n" -#: src/lang.c:2327 +#: src/lang.c:2330 msgid "Color of highlighting with _dash_" msgstr "高亮度顯示 _底線_ çš„é¡è‰²" -#: src/lang.c:2328 +#: src/lang.c:2331 msgid "" "# Color of word highlighting with _dash_\n" "# Default: 13 (light pink)\n" @@ -6836,11 +6836,11 @@ msgstr "" "# 高亮度顯示 _底線_ å­—è©žçš„é¡è‰²\n" "# é è¨­ï¼š13 (淺粉紅)\n" -#: src/lang.c:2334 +#: src/lang.c:2337 msgid "Color of highlighting with /slash/" msgstr "高亮度顯示 /斜線/ çš„é¡è‰²" -#: src/lang.c:2335 +#: src/lang.c:2338 msgid "" "# Color of word highlighting with /slash/\n" "# Default: 14 (light cyan)\n" @@ -6848,11 +6848,11 @@ msgstr "" "# 高亮度顯示 /斜線/ å­—è©žçš„é¡è‰²\n" "# é è¨­ï¼š14 (æ·ºè—綠色)\n" -#: src/lang.c:2341 +#: src/lang.c:2344 msgid "Color of highlighting with -stroke-" msgstr "高亮度顯示 -æ©«ç·š- çš„é¡è‰²" -#: src/lang.c:2342 +#: src/lang.c:2345 msgid "" "# Color of word highlighting with -stroke-\n" "# Default: 12 (light blue)\n" @@ -6860,11 +6860,11 @@ msgstr "" "# 高亮度顯示 -æ©«ç·š- å­—è©žçš„é¡è‰²\n" "# é è¨­ï¼š12 (æ·ºè—色)\n" -#: src/lang.c:2349 +#: src/lang.c:2352 msgid "Attr. of highlighting with *stars*" msgstr "高亮度顯示 *星號* 的屬性" -#: src/lang.c:2350 +#: src/lang.c:2353 msgid "" "# Attributes of word highlighting on mono terminals\n" "# Possible values are:\n" @@ -6892,11 +6892,11 @@ msgstr "" "# 高亮度顯示 *星號* 字詞的屬性\n" "# é è¨­ï¼š6 (ç²—é«”)\n" -#: src/lang.c:2365 +#: src/lang.c:2368 msgid "Attr. of highlighting with _dash_" msgstr "高亮度顯示 _底線_ 的屬性" -#: src/lang.c:2366 +#: src/lang.c:2369 msgid "" "# Attribute of word highlighting with _dash_\n" "# Default: 2 (best highlighting)\n" @@ -6904,11 +6904,11 @@ msgstr "" "# 高亮度顯示 _底線_ 字詞的屬性\n" "# é è¨­ï¼š2 (最好高亮度顯示)\n" -#: src/lang.c:2372 +#: src/lang.c:2375 msgid "Attr. of highlighting with /slash/" msgstr "高亮度顯示 /斜線/ 的屬性" -#: src/lang.c:2373 +#: src/lang.c:2376 msgid "" "# Attribute of word highlighting with /slash/\n" "# Default: 5 (half bright)\n" @@ -6916,11 +6916,11 @@ msgstr "" "# 高亮度顯示 /斜線/ 字詞的屬性\n" "# é è¨­ï¼š5 (åŠæ˜Žäº®)\n" -#: src/lang.c:2379 +#: src/lang.c:2382 msgid "Attr. of highlighting with -stroke-" msgstr "高亮度顯示 -æ©«ç·š- 的屬性" -#: src/lang.c:2380 +#: src/lang.c:2383 msgid "" "# Attribute of word highlighting with -stroke-\n" "# Default: 3 (reverse video)\n" @@ -6928,27 +6928,27 @@ msgstr "" "# 高亮度顯示 /斜線/ 字詞的屬性\n" "# é è¨­ï¼š3 (å白顯示)\n" -#: src/lang.c:2386 +#: src/lang.c:2389 msgid "URL highlighting in message body" msgstr "在訊æ¯å…§æ–‡ä¸­é«˜äº®åº¦é¡¯ç¤ºç¶²å€" -#: src/lang.c:2387 +#: src/lang.c:2390 msgid "# Enable URL highlighting?\n" msgstr "# 啟用高亮度顯示網å€ï¼Ÿ\n" -#: src/lang.c:2392 +#: src/lang.c:2395 msgid "Word highlighting in message body" msgstr "在訊æ¯å…§æ–‡ä¸­é«˜äº®åº¦é¡¯ç¤ºå­—è©ž" -#: src/lang.c:2393 +#: src/lang.c:2396 msgid "# Enable word highlighting?\n" msgstr "# 啟用高亮度顯示字詞？\n" -#: src/lang.c:2398 +#: src/lang.c:2401 msgid "What to display instead of mark" msgstr "è¦é¡¯ç¤ºä»€éº¼ä»¥ä»£æ›¿æ¨™è¨˜" -#: src/lang.c:2399 +#: src/lang.c:2402 msgid "" "# Should the leading and ending stars and dashes also be displayed,\n" "# even when they are highlighting marks?\n" @@ -6964,56 +6964,56 @@ msgstr "" "# 1 = 是，顯示標記\n" "# * 2 = å°å‡ºç©ºæ ¼åšç‚ºæ›¿ä»£\n" -#: src/lang.c:2408 +#: src/lang.c:2411 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "輸入在é é¢åˆ‡æ›ä¸­ç”¨ä¾†å°‡æ–‡ç« æ›åˆ—的欄號。 設定。" -#: src/lang.c:2409 +#: src/lang.c:2412 msgid "Page line wrap column" msgstr "é é¢è‡ªå‹•æ›åˆ—欄號" -#: src/lang.c:2410 +#: src/lang.c:2413 msgid "# Wrap article lines at column\n" msgstr "# 文章æ›åˆ—於欄號\n" -#: src/lang.c:2415 +#: src/lang.c:2418 msgid "Wrap around threads on next unread" msgstr "於下一篇未讀回到開始部分討論串" -#: src/lang.c:2416 +#: src/lang.c:2419 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "# 如果開啟就於æœå°‹ä¸‹ä¸€ç¯‡æœªè®€æ–‡ç« æ™‚回到開始部分討論串\n" -#: src/lang.c:2420 +#: src/lang.c:2423 msgid "Enter default mail address (and fullname). sets." msgstr "輸入é è¨­éƒµä»¶åœ°å€ (以åŠå…¨å)。 設定。" -#: src/lang.c:2421 src/lang.c:2931 +#: src/lang.c:2424 src/lang.c:2939 msgid "Mail address (and fullname)" msgstr "éƒµä»¶åœ°å€ (以åŠå…¨å)" -#: src/lang.c:2422 +#: src/lang.c:2425 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "# ä½¿ç”¨è€…éƒµä»¶åœ°å€ (以åŠå…¨å)，如果ä¸æ˜¯ 使用者å稱@主機 (å…¨å)\n" -#: src/lang.c:2427 +#: src/lang.c:2430 msgid "Show empty Followup-To in editor" msgstr "在編輯器中顯示空的跟貼" -#: src/lang.c:2428 +#: src/lang.c:2431 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "# 如果開啟就於編輯文章時顯示空的跟貼標頭\n" -#: src/lang.c:2432 +#: src/lang.c:2435 msgid "" "Enter path/! command/--none to create your default signature. sets." msgstr "輸入 path/! command/--none 以建立您的é è¨­ç°½å。 設定。" -#: src/lang.c:2433 +#: src/lang.c:2436 msgid "Create signature from path/command" msgstr "從路徑/命令建立簽å" -#: src/lang.c:2434 +#: src/lang.c:2437 #, fuzzy, c-format msgid "" "# Signature path (random sigs)/file to be used when posting/replying\n" @@ -7027,41 +7027,41 @@ msgstr "" "# sigfile=!命令 執行外部命令以產生簽å\n" "# sigfile=--none ä¸é™„加簽å\n" -#: src/lang.c:2442 +#: src/lang.c:2445 msgid "" "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "將單ç¨ä¸€åˆ—的「--ã€å‰ç½®æ–¼ç°½å。 åˆ‡æ› & 設定。" -#: src/lang.c:2443 +#: src/lang.c:2446 msgid "Prepend signature with \"-- \"" msgstr "將「--ã€å‰ç½®æ–¼ç°½å" -#: src/lang.c:2444 +#: src/lang.c:2447 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "# 如果開啟就將虛線『\\n-- \\nã€å‰ç½®æ–¼ç°½å\n" -#: src/lang.c:2448 +#: src/lang.c:2451 msgid "Add signature when reposting articles. toggles & sets." msgstr "é‡æ–°å¼µè²¼æ–‡ç« æ™‚加入簽å。 åˆ‡æ› & 設定。" -#: src/lang.c:2449 +#: src/lang.c:2452 msgid "Add signature when reposting" msgstr "é‡æ–°å¼µè²¼æ™‚加入簽å" -#: src/lang.c:2450 +#: src/lang.c:2453 msgid "# If ON add signature to reposted articles\n" msgstr "# 如果開啟就將簽å加入é‡æ–°å¼µè²¼çš„文章\n" -#: src/lang.c:2454 +#: src/lang.c:2457 #, c-format msgid "Enter quotation marks, %s or %S for author's initials." msgstr "輸入引言符號ã€%s 或 %S åšç‚ºä½œè€…的縮寫。" -#: src/lang.c:2455 +#: src/lang.c:2458 msgid "Characters used as quote-marks" msgstr "åšç‚ºå¼•è¨€ç¬¦è™Ÿä½¿ç”¨çš„å­—å…ƒ" -#: src/lang.c:2456 +#: src/lang.c:2459 #, c-format msgid "" "# Characters used in quoting to followups and replies.\n" @@ -7070,11 +7070,11 @@ msgstr "" "# 字元已用於引言到跟隨和回覆。\n" "#『_ã€è¢«ç½®æ›ç”±ã€Ž ã€ï¼Œ%s，%S 被置æ›ä¾ä½œè€…設定縮寫。\n" -#: src/lang.c:2462 +#: src/lang.c:2465 msgid "Quoting behavior" msgstr "引言行為" -#: src/lang.c:2463 +#: src/lang.c:2466 msgid "" "# How quoting should be handled when following up or replying.\n" "# Possible values are (the default is marked with *):\n" @@ -7098,16 +7098,16 @@ msgstr "" "# 6 = 引用簽å，引用空列\n" "# 7 = 壓縮引言，引用簽å，引用空列\n" -#: src/lang.c:2476 src/lang.c:2484 src/lang.c:2490 +#: src/lang.c:2479 src/lang.c:2487 src/lang.c:2493 msgid "" "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "%A åœ°å€ %D 日期 %F 地å€+å稱 %G 群組å稱 %M 訊æ¯è­˜åˆ¥è™Ÿ %N å稱 %C åå­—" -#: src/lang.c:2477 +#: src/lang.c:2480 msgid "Quote line when following up" msgstr "跟貼時的引言列" -#: src/lang.c:2478 +#: src/lang.c:2481 msgid "" "# Format of quote line when mailing/posting/following-up an article\n" "# %A Address %D Date %F Addr+Name %G Groupname %M Message-ID\n" @@ -7117,38 +7117,38 @@ msgstr "" "# %A ä½å€ %D 日期 %F Addr+å稱 %G 群組å稱 %M 訊æ¯è­˜åˆ¥è™Ÿ\n" "# %N å…¨å %C åå­— %I 縮寫\n" -#: src/lang.c:2485 +#: src/lang.c:2488 msgid "Quote line when cross-posting" msgstr "è·¨æ¿å¼µè²¼æ™‚的引言列" -#: src/lang.c:2491 +#: src/lang.c:2494 msgid "Quote line when mailing" msgstr "郵寄時的引言列" -#: src/lang.c:2496 +#: src/lang.c:2499 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "å¦‚æžœé–‹å•Ÿå°±åŒ…å« User-Agent: 標頭。 åˆ‡æ› & 設定。" -#: src/lang.c:2497 +#: src/lang.c:2500 msgid "Insert 'User-Agent:' header" msgstr "æ’入『User-Agent:ã€æ¨™é ­" -#: src/lang.c:2498 +#: src/lang.c:2501 msgid "# If ON include advertising User-Agent: header\n" msgstr "# 如果開啟就包å«åšç‚ºé€šå‘Šçš„ User-Agent: 標頭\n" -#: src/lang.c:2503 +#: src/lang.c:2506 msgid "" "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" "輸入用於 MIME 的字元集å稱 (例如：US-ASCII, ISO-8859-1, EUC-KR)， 以設" "定。" -#: src/lang.c:2504 +#: src/lang.c:2507 msgid "MM_CHARSET" msgstr "MM_CHARSET" -#: src/lang.c:2505 +#: src/lang.c:2508 msgid "" "# Charset supported locally which is also used for MIME header and\n" "# Content-Type header.\n" @@ -7164,40 +7164,40 @@ msgstr "" "# 如果 MIME_STRICT_CHARSET 於編譯時期被定義，那麼 mm_charset 以外的\n" "# 字元集將被èªç‚ºç„¡æ³•é¡¯ç¤ºï¼Œä¸¦ä¸”以『？ã€çš„æ–¹å¼è¡¨è¿°ã€‚\n" -#: src/lang.c:2515 +#: src/lang.c:2518 msgid "MM_NETWORK_CHARSET" msgstr "MM_NETWORK_CHARSET" -#: src/lang.c:2516 +#: src/lang.c:2519 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "# 在貼文中åšç‚º MIME (內容類型) 標頭的字元集。\n" -#: src/lang.c:2520 +#: src/lang.c:2523 msgid "" "Enter local charset name (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "輸入本地字元集å稱 (例如：US-ASCII, ISO-8859-1, EUC-KR)， 以設定。" -#: src/lang.c:2521 +#: src/lang.c:2524 msgid "MM_LOCAL_CHARSET" msgstr "MM_LOCAL_CHARSET" -#: src/lang.c:2522 +#: src/lang.c:2525 msgid "# Charset supported locally.\n" msgstr "# 本地支æ´çš„字元集。\n" -#: src/lang.c:2529 +#: src/lang.c:2532 msgid "Mailbox format" msgstr "信箱格å¼" -#: src/lang.c:2530 +#: src/lang.c:2533 msgid "# Format of the mailbox.\n" msgstr "# 信箱的格å¼ã€‚\n" -#: src/lang.c:2535 +#: src/lang.c:2538 msgid "MIME encoding in news messages" msgstr "在新èžè¨Šæ¯ä¸­çš„ MIME 編碼" -#: src/lang.c:2536 +#: src/lang.c:2539 msgid "" "# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n" "# for mails and posts, if necessary. QP is efficient for most European\n" @@ -7211,15 +7211,15 @@ msgstr "" "# 而 Base64 å°æ–¼åŒ…å«å¾ˆå¤š 8 ä½å…ƒå­—元的多數 8 ä½å…ƒæ±äºžè«¸èªžã€\n" "# 希臘語以åŠä¿„語字元集來說更為é©ç•¶ã€‚\n" -#: src/lang.c:2544 src/lang.c:2565 +#: src/lang.c:2547 src/lang.c:2568 msgid "Don't change unless you know what you are doing. cancels." msgstr "ä¸è¦è®Šæ›´ï¼Œé™¤éžæ‚¨çŸ¥é“您在åšä»€éº¼ã€‚ å–消。" -#: src/lang.c:2545 +#: src/lang.c:2548 msgid "Use 8bit characters in news headers" msgstr "在新èžæ¨™é ­ä¸­ä½¿ç”¨ 8 ä½å…ƒå­—å…ƒ" -#: src/lang.c:2546 +#: src/lang.c:2549 msgid "" "# If ON, 8bit characters in news headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -7231,28 +7231,28 @@ msgstr "" "# é™¤éž post_mime_encoding åŒæ¨£ä¹Ÿè¢«è¨­å®šç‚º 8 ä½å…ƒï¼Œ\n" "# å¦å‰‡æ¨™é ­ä¸­çš„ 8 ä½å…ƒå­—元將無視於此åƒæ•¸è€Œè¢«ç·¨ç¢¼ã€‚\n" -#: src/lang.c:2553 +#: src/lang.c:2556 msgid "" "Auto-view post-processed files toggles, sets, cancels." msgstr "自動檢視處ç†å¾Œæª”案 切æ›ï¼Œ 設定， å–消。" -#: src/lang.c:2554 +#: src/lang.c:2557 msgid "View post-processed files" msgstr "檢視處ç†å¾Œæª”案" -#: src/lang.c:2555 +#: src/lang.c:2558 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "# 如果設定，處ç†ä¹‹å¾Œçš„檔案將在檢視器中被開啟\n" -#: src/lang.c:2560 +#: src/lang.c:2563 msgid "MIME encoding in mail messages" msgstr "郵件訊æ¯ä¸­çš„ MIME 編碼" -#: src/lang.c:2566 +#: src/lang.c:2569 msgid "Use 8bit characters in mail headers" msgstr "郵件標頭中使用 8 ä½å…ƒå­—å…ƒ" -#: src/lang.c:2567 +#: src/lang.c:2570 msgid "" "# If ON, 8bit characters in mail headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -7269,25 +7269,25 @@ msgstr "" "# ç¦æ­¢éƒµä»¶æ¨™é ­ä¸­çš„ 8 ä½å…ƒå­—元，因此建議您ä¸è¦å°‡å®ƒé–‹å•Ÿï¼Œ\n" "# 除éžæ‚¨æœ‰æŸäº›å¼·åˆ¶çš„原因。\n" -#: src/lang.c:2578 +#: src/lang.c:2581 msgid "Strip blanks from ends of lines" msgstr "從列尾截除空白" -#: src/lang.c:2579 +#: src/lang.c:2582 msgid "" "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" msgstr "# 如果開啟就從列尾截除空白，以便在較慢終端機上能較快顯示。\n" -#: src/lang.c:2585 +#: src/lang.c:2588 msgid "If ON, use transliteration. toggles & sets." msgstr "如果開啟就使用實字轉譯。 åˆ‡æ› & 設定。" -#: src/lang.c:2586 +#: src/lang.c:2589 msgid "Transliteration" msgstr "實字轉譯" -#: src/lang.c:2587 +#: src/lang.c:2590 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" @@ -7297,11 +7297,11 @@ msgstr "" "# 在目標字元集中被表述時，它å¯ä»¥é€éŽä¸€å€‹\n" "# 或多個外觀類似的字元所近似顯示。\n" -#: src/lang.c:2595 +#: src/lang.c:2598 msgid "Send you a Cc/Bcc automatically" msgstr "自動發é€çµ¦æ‚¨ä¸€ä»½å‰¯æœ¬/密件副本" -#: src/lang.c:2596 +#: src/lang.c:2599 msgid "" "# Put your name in the Cc: and/or Bcc: field when mailing an article.\n" "# Possible values are (the default is marked with *):\n" @@ -7317,25 +7317,25 @@ msgstr "" "# 2 = 密件副本\n" "# 3 = 副本和密件副本\n" -#: src/lang.c:2607 +#: src/lang.c:2610 msgid "Hash algorithm for Cancel-Lock/Cancel-Key" msgstr "" -#: src/lang.c:2608 +#: src/lang.c:2611 msgid "" "# Hash algorithm for Cancel-Lock/Cancel-Key (default 'sha1')\n" "# Use 'none' to not generate Cancel-Lock headers.\n" msgstr "" -#: src/lang.c:2614 +#: src/lang.c:2617 msgid "Enter address elements about which you want to be warned. sets." msgstr "輸入您想è¦ç²å¾—相關警告的地å€å› ç´ ã€‚ 設定。" -#: src/lang.c:2615 +#: src/lang.c:2618 msgid "Spamtrap warning address parts" msgstr "垃圾郵件抓å–警告的地å€éƒ¨åˆ†" -#: src/lang.c:2616 +#: src/lang.c:2619 msgid "" "# A comma-delimited list of address-parts you want to be warned\n" "# about when trying to reply by email.\n" @@ -7343,27 +7343,27 @@ msgstr "" "# 當您嘗試以電å­éƒµä»¶å›žè¦†æ™‚\n" "# 想è¦ç²å¾—相關警告而以逗號分隔的地å€éƒ¨åˆ†æ¸…單。\n" -#: src/lang.c:2621 +#: src/lang.c:2624 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "輸入篩é¸å™¨æ¢ç›®ä¿æŒæœ‰æ•ˆçš„é è¨­å¤©æ•¸ã€‚ 設定。" -#: src/lang.c:2622 +#: src/lang.c:2625 msgid "No. of days a filter entry is valid" msgstr "篩é¸å™¨æ¢ç›®æœ‰æ•ˆå¤©æ•¸" -#: src/lang.c:2623 +#: src/lang.c:2626 msgid "# Number of days a short term filter will be active\n" msgstr "# 短期篩é¸å™¨ä¿æŒä½œç”¨çš„天數\n" -#: src/lang.c:2627 +#: src/lang.c:2630 msgid "Add posted articles to filter. toggles & sets." msgstr "加入已張貼文章到篩é¸å™¨ã€‚ åˆ‡æ› & 設定。" -#: src/lang.c:2628 +#: src/lang.c:2631 msgid "Add posted articles to filter" msgstr "加入已張貼文章到篩é¸å™¨" -#: src/lang.c:2629 +#: src/lang.c:2632 msgid "" "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" @@ -7371,23 +7371,23 @@ msgstr "" "# 如果開啟就加入開始新討論串的已張貼文章到篩é¸å™¨\n" "# åšç‚ºé«˜äº®åº¦é¡¯ç¤ºè·Ÿè²¼\n" -#: src/lang.c:2633 +#: src/lang.c:2636 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "將以 mailbox æ ¼å¼å„²å­˜çš„文章/討論串目錄ä½ç½®ã€‚" -#: src/lang.c:2634 +#: src/lang.c:2637 msgid "Mail directory" msgstr "郵件目錄" -#: src/lang.c:2635 +#: src/lang.c:2638 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "# (-m) 以 mailbox æ ¼å¼å„²å­˜çš„文章/討論串目錄ä½ç½®\n" -#: src/lang.c:2640 +#: src/lang.c:2643 msgid "Save articles in batch mode (-S)" msgstr "以批次模å¼å„²å­˜æ–‡ç«  (-S)" -#: src/lang.c:2641 +#: src/lang.c:2644 msgid "" "# If ON articles/threads will be saved in batch mode when save -S\n" "# or mail (-M/-N) is specified on the command line\n" @@ -7395,29 +7395,29 @@ msgstr "" "# 如果開啟就於命令列上指定儲存 -S 或郵寄 (-M/-N) 時\n" "# 以批次模å¼å„²å­˜æ–‡ç« /討論串\n" -#: src/lang.c:2646 +#: src/lang.c:2649 msgid "The directory where you want articles/threads saved." msgstr "您想è¦å„²å­˜æ–‡ç« /討論串的目錄ä½ç½®ã€‚" -#: src/lang.c:2647 +#: src/lang.c:2650 msgid "Directory to save arts/threads in" msgstr "è¦å„²å­˜æ–‡ç« /討論串的目錄" -#: src/lang.c:2648 +#: src/lang.c:2651 msgid "# Directory where articles/threads are saved\n" msgstr "# 儲存文章/討論串的目錄ä½ç½®\n" -#: src/lang.c:2652 +#: src/lang.c:2655 msgid "" "Auto save article/thread by Archive-name: header. toggles & " "sets." msgstr "ä¾ Archive-name: 標頭來自動儲存文章/討論串。 åˆ‡æ› & 設定。" -#: src/lang.c:2653 +#: src/lang.c:2656 msgid "Use Archive-name: header for save" msgstr "儲存使用 Archive-name: 標頭" -#: src/lang.c:2654 +#: src/lang.c:2657 msgid "" "# If ON articles/threads with Archive-name: in mail header will\n" "# be automatically saved with the Archive-name & part/patch no.\n" @@ -7425,29 +7425,29 @@ msgstr "" "# 如果開啟就將在郵件標頭中具有 Archive-name: 的文章/討論串\n" "# 以存檔å稱 & 部分/修補程å¼è™Ÿç¢¼è‡ªå‹•å„²å­˜\n" -#: src/lang.c:2659 +#: src/lang.c:2662 msgid "" "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "將已儲存的文章/討論串標記為已讀。 切æ›ï¼Œ 設定， å–消。" -#: src/lang.c:2660 +#: src/lang.c:2663 msgid "Mark saved articles/threads as read" msgstr "將已儲存的文章/討論串標記為已讀" -#: src/lang.c:2661 +#: src/lang.c:2664 msgid "# If ON mark articles that are saved as read\n" msgstr "# 如果開啟就標記已儲存的文章為已讀\n" -#: src/lang.c:2665 +#: src/lang.c:2668 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "å°æ–¼å·²å„²å­˜çš„æ–‡ç« é€²è¡Œå¾ŒçºŒè™•ç† (例如：擷å–附件)。" -#: src/lang.c:2666 +#: src/lang.c:2669 msgid "Post process saved articles" msgstr "後續處ç†å·²å„²å­˜çš„文章" -#: src/lang.c:2667 +#: src/lang.c:2670 msgid "" "# Perform post processing (saving binary attachments) from saved articles.\n" "# Possible values are (the default is marked with *):\n" @@ -7461,62 +7461,62 @@ msgstr "" "# 1 = åªæ“·å–命令殼歸檔 (shar)\n" "# 2 = 是\n" -#: src/lang.c:2676 +#: src/lang.c:2679 msgid "Process only unread articles" msgstr "åªè™•ç†æœªè®€æ–‡ç« " -#: src/lang.c:2677 +#: src/lang.c:2680 msgid "" "# If ON only save/print/pipe/mail unread articles (tagged articles " "excepted)\n" msgstr "# å¦‚æžœé–‹å•Ÿå°±åª å„²å­˜/列å°/管線/郵寄 未讀文章 (除了已標定文章)\n" -#: src/lang.c:2682 +#: src/lang.c:2685 msgid "Print all or just part of header. toggles & sets." msgstr "列å°æ‰€æœ‰æˆ–是僅僅部分的標頭。 åˆ‡æ› & 設定。" -#: src/lang.c:2683 +#: src/lang.c:2686 msgid "Print all headers when printing" msgstr "列å°æ™‚列å°æ‰€æœ‰æ¨™é ­" -#: src/lang.c:2684 +#: src/lang.c:2687 msgid "" "# If ON print all of article header otherwise just the important lines\n" msgstr "# 如果開啟就列å°æ‰€æœ‰çš„文章標頭，å¦å‰‡åƒ…列å°é‡è¦åˆ—\n" -#: src/lang.c:2688 +#: src/lang.c:2691 msgid "" "The printer program with options that is to be used to print articles/" "threads." msgstr "將被用來列å°æ–‡ç« /討論串的列å°ç¨‹å¼ä»¥åŠé¸é …。" -#: src/lang.c:2689 +#: src/lang.c:2692 msgid "Printer program with options" msgstr "列å°ç¨‹å¼ä»¥åŠé¸é …" -#: src/lang.c:2690 +#: src/lang.c:2693 msgid "# Print program with parameters used to print articles/threads\n" msgstr "# 用來列å°æ–‡ç« /討論串的列å°ç¨‹å¼ä»¥åŠåƒæ•¸\n" -#: src/lang.c:2696 +#: src/lang.c:2699 msgid "Force redraw after certain commands" msgstr "特定命令之後強制é‡ç¹ª" -#: src/lang.c:2697 +#: src/lang.c:2700 msgid "" "# If ON a screen redraw will always be done after certain external commands\n" msgstr "# 如果開啟就於特定外部命令之後將一律完æˆèž¢å¹•é‡ç¹ª\n" -#: src/lang.c:2701 +#: src/lang.c:2704 msgid "" "Start editor with line offset. toggles, sets, cancels." msgstr "啟始編輯器以åŠåˆ—å移。 切æ›ï¼Œ 設定， å–消。" -#: src/lang.c:2702 +#: src/lang.c:2705 msgid "Start editor with line offset" msgstr "啟始編輯器以åŠåˆ—å移" -#: src/lang.c:2703 +#: src/lang.c:2706 msgid "" "# If ON editor will be started with cursor offset into the file\n" "# otherwise the cursor will be positioned at the first line\n" @@ -7524,15 +7524,15 @@ msgstr "" "# 如果開啟就啟始編輯器以åŠé€²å…¥æª”案後的游標å移\n" "# å¦å‰‡æ¸¸æ¨™å°‡è¢«å®šä½æ–¼ç¬¬ä¸€åˆ—\n" -#: src/lang.c:2708 +#: src/lang.c:2711 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "輸入 %E åšç‚ºç·¨è¼¯å™¨ï¼Œ%F åšç‚ºæª”å，%N åšç‚ºåˆ—號， 以設定。" -#: src/lang.c:2709 +#: src/lang.c:2712 msgid "Invocation of your editor" msgstr "調用您的編輯器" -#: src/lang.c:2710 +#: src/lang.c:2713 msgid "" "# Format of editor line including parameters\n" "# %E Editor %F Filename %N Linenumber\n" @@ -7540,16 +7540,16 @@ msgstr "" "# æ ¼å¼çš„編輯器列包å«åƒæ•¸\n" "# %E 編輯器 %F 檔å %N Linenumber\n" -#: src/lang.c:2715 +#: src/lang.c:2718 msgid "" "Enter name and options for external-inews, --internal for internal inews" msgstr "輸入用於外部 inews çš„å稱和é¸é …，--internal 用於內部 inews" -#: src/lang.c:2716 +#: src/lang.c:2719 msgid "External inews" msgstr "外部 inews" -#: src/lang.c:2717 +#: src/lang.c:2720 msgid "" "# If --internal use the built in mini inews for posting via NNTP\n" "# otherwise use an external inews program\n" @@ -7557,17 +7557,17 @@ msgstr "" "# 如果設定 --internal 就使用內建的迷你 inews åšç‚ºé€éŽ NNTP 張貼\n" "# å¦å‰‡ä½¿ç”¨å¤–部 inews 程å¼\n" -#: src/lang.c:2721 +#: src/lang.c:2724 msgid "" "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" "輸入 %M åšç‚ºéƒµä»¶ç¨‹å¼ï¼Œ%S åšç‚ºä¸»æ—¨ï¼Œ%T åšç‚ºæ”¶ä»¶è€…，%F åšç‚ºæª”å， 以設定。" -#: src/lang.c:2722 +#: src/lang.c:2725 msgid "Invocation of your mail command" msgstr "調用您的郵寄命令" -#: src/lang.c:2723 +#: src/lang.c:2726 msgid "" "# Format of mailer line including parameters\n" "# %M Mailer %S Subject %T To %F Filename\n" @@ -7579,11 +7579,11 @@ msgstr "" "# 我。以使用 elm åšç‚ºæ‚¨çš„郵件程å¼ï¼š elm -s「%Sã€ã€Œ%Tã€<%F\n" "# 我。elm äº’å‹•å¼ ï¼š elm -i %F -s「%Sã€ã€Œ%Tã€\n" -#: src/lang.c:2731 +#: src/lang.c:2734 msgid "Use interactive mail reader" msgstr "使用互動å¼éƒµä»¶é–±è®€å™¨" -#: src/lang.c:2732 +#: src/lang.c:2735 msgid "" "# Interactive mailreader\n" "# Possible values are (the default is marked with *):\n" @@ -7597,33 +7597,33 @@ msgstr "" "# 1 = 使用互動å¼éƒµä»¶é–±è®€å™¨ä»¥åŠæª”案中的標頭\n" "# 2 = 使用互動å¼éƒµä»¶é–±è®€å™¨è€Œç„¡éœ€æª”案中的標頭\n" -#: src/lang.c:2741 +#: src/lang.c:2744 msgid "Remove ~/.article after posting" msgstr "張貼之後移除 ~/.article" -#: src/lang.c:2742 +#: src/lang.c:2745 msgid "# If ON remove ~/.article after posting.\n" msgstr "# 如果開啟就於張貼之後移除 ~/.article。\n" -#: src/lang.c:2748 +#: src/lang.c:2751 msgid "Use UTF-8 graphics (thread tree etc.)" msgstr "使用 UTF-8 圖形 (樹狀討論串等等…)" -#: src/lang.c:2749 +#: src/lang.c:2752 msgid "" "# If ON use UTF-8 characters for indicator '->', tree and ellipsis '...'.\n" msgstr "" "# 如果開啟就使用 UTF-8 å­—å…ƒåšç‚ºæŒ‡ç¤ºå™¨ã€Ž->ã€ã€æ¨¹ç‹€çµæ§‹å’Œçœç•¥ç¬¦è™Ÿã€Žâ€¦ã€ã€‚\n" -#: src/lang.c:2754 +#: src/lang.c:2757 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "用於所有已張貼文章的檔å， 設定，沒有檔å=ä¸å„²å­˜ã€‚" -#: src/lang.c:2755 +#: src/lang.c:2758 msgid "Filename for posted articles" msgstr "用於已張貼文章的檔å" -#: src/lang.c:2756 +#: src/lang.c:2759 msgid "" "# Filename where to keep all postings (default posted)\n" "# If no filename is set then postings will not be saved\n" @@ -7631,36 +7631,36 @@ msgstr "" "# ä¿ç•™æ‰€æœ‰è²¼æ–‡ (é è¨­ç‚ºå·²å¼µè²¼) 的檔案ä½ç½®\n" "# 如果沒有設定檔å則ä¸æœƒå„²å­˜è²¼æ–‡\n" -#: src/lang.c:2761 +#: src/lang.c:2764 msgid "" "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "ä¿ç•™æ‰€æœ‰å¼µè²¼å¤±æ•—的文章於 ~/dead.articles。 åˆ‡æ› & 設定。" -#: src/lang.c:2762 +#: src/lang.c:2765 msgid "Keep failed arts in ~/dead.articles" msgstr "ä¿ç•™å¼µè²¼å¤±æ•—的文章於 ~/dead.articles" -#: src/lang.c:2763 +#: src/lang.c:2766 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "# 如果開啟就ä¿ç•™æ‰€æœ‰å¼µè²¼å¤±æ•—的貼文於 ~/dead.articles\n" -#: src/lang.c:2767 +#: src/lang.c:2770 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "您è¦å¾ž .newsrc 截除已å–消訂閱的群組" -#: src/lang.c:2768 +#: src/lang.c:2771 msgid "No unsubscribed groups in newsrc" msgstr "在 newsrc 中沒有已å–消訂閱的群組" -#: src/lang.c:2769 +#: src/lang.c:2772 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "# 如果開啟就從 newsrc 截除已å–消訂閱的群組\n" -#: src/lang.c:2774 +#: src/lang.c:2777 msgid "Remove bogus groups from newsrc" msgstr "從 newsrc 移除å‡é€ çš„群組" -#: src/lang.c:2775 +#: src/lang.c:2778 msgid "" "# What to do with bogus groups in newsrc file\n" "# Possible values are (the default is marked with *):\n" @@ -7674,64 +7674,64 @@ msgstr "" "# 1 = 移除\n" "# 2 = 以 D 高亮度顯示於é¸æ“‡èž¢å¹•\n" -#: src/lang.c:2784 +#: src/lang.c:2787 msgid "" "Enter number of seconds to wait for a response from the server. sets." msgstr "輸入從伺æœå™¨ç­‰å¾…回應的秒數。 表示設定。" -#: src/lang.c:2785 +#: src/lang.c:2788 msgid "NNTP read timeout in seconds" msgstr "NNTP 讀å–逾時的秒數" -#: src/lang.c:2786 +#: src/lang.c:2789 msgid "" "# Time in seconds to wait for a response from the server (0=no timeout)\n" msgstr "# 從伺æœå™¨ç­‰å¾…回應的秒數時間 (0=沒有逾時é™åˆ¶)\n" -#: src/lang.c:2791 +#: src/lang.c:2794 msgid "Enter number of seconds until active file will be reread. sets." msgstr "輸入é‡æ–°è®€å–ç¾ç”¨æª”案的間隔秒數。 設定。" -#: src/lang.c:2792 +#: src/lang.c:2795 msgid "Interval in secs to reread active" msgstr "é‡æ–°è®€å–ç¾ç”¨æª”案的間隔(以秒為單ä½)" -#: src/lang.c:2793 +#: src/lang.c:2796 msgid "" "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "# é‡æ–°è®€å–ç¾ç”¨æª”案的時間間隔秒數 (0=æ°¸ä¸)\n" -#: src/lang.c:2798 +#: src/lang.c:2801 msgid "Reconnect to server automatically" msgstr "自動é‡æ–°é€£ç·šåˆ°ä¼ºæœå™¨" -#: src/lang.c:2799 +#: src/lang.c:2802 msgid "" "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "# 如果開啟就於連接中斷時自動é‡æ–°é€£ç·šåˆ° NNTP 伺æœå™¨\n" -#: src/lang.c:2803 +#: src/lang.c:2806 msgid "" "Create local copies of NNTP overview files. toggles & sets." msgstr "建立 NNTP 概觀檔案的本地複本。 åˆ‡æ› & 設定。" -#: src/lang.c:2804 +#: src/lang.c:2807 msgid "Cache NNTP overview files locally" msgstr "產生 NNTP 概觀檔案的本地快å–" -#: src/lang.c:2805 +#: src/lang.c:2808 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "# 如果開啟就建立 NNTP 概觀檔案的本地複本。\n" -#: src/lang.c:2809 src/lang.c:2824 src/lang.c:2844 src/lang.c:2863 +#: src/lang.c:2812 src/lang.c:2827 src/lang.c:2847 src/lang.c:2866 msgid "Enter format string. sets, cancels." msgstr "輸入格å¼å­—串。 設定， å–消。" -#: src/lang.c:2810 +#: src/lang.c:2813 msgid "Format string for selection level" msgstr "é¸æ“‡å±¤ç´šçš„æ ¼å¼å­—串" -#: src/lang.c:2811 +#: src/lang.c:2814 msgid "" "# Format string for selection level representation\n" "# Default: %f %n %U %G %d\n" @@ -7755,11 +7755,11 @@ msgstr "" "# %n 數字，螢幕上的列號\n" "# %U 未讀計數\n" -#: src/lang.c:2825 +#: src/lang.c:2828 msgid "Format string for group level" msgstr "用於群組層級的格å¼å­—串" -#: src/lang.c:2826 +#: src/lang.c:2829 msgid "" "# Format string for group level representation\n" "# Default: %n %m %R %L %s %F\n" @@ -7793,11 +7793,11 @@ msgstr "" "# %s 主旨 (åªæœ‰åœ¨ç¾¤çµ„等級)\n" "# %S 分數\n" -#: src/lang.c:2845 +#: src/lang.c:2848 msgid "Format string for thread level" msgstr "# 用於討論串層級的格å¼å­—串" -#: src/lang.c:2846 +#: src/lang.c:2849 msgid "" "# Format string for thread level representation\n" "# Default: %n %m [%L] %T %F\n" @@ -7829,19 +7829,20 @@ msgstr "" "# %S 分數\n" "# %T 討論串樹 (åªæœ‰åœ¨è¨Žè«–串等級)\n" -#: src/lang.c:2864 +#: src/lang.c:2867 msgid "Format string for display of dates" msgstr "用於顯示日期的格å¼å­—串" -#: src/lang.c:2865 +#: src/lang.c:2868 msgid "# Format string for date representation\n" msgstr "# 用於日期表示的格å¼å­—串\n" -#: src/lang.c:2871 +#: src/lang.c:2878 msgid "Unicode normalization form" msgstr "è¬åœ‹ç¢¼æ­£è¦åŒ–å½¢å¼" -#: src/lang.c:2872 +#: src/lang.c:2879 +#, fuzzy msgid "" "# Unicode normalization form\n" "# Possible values are:\n" @@ -7850,6 +7851,7 @@ msgid "" "# 2 = NFKD\n" "# 3 = NFC\n" "# 4 = NFD\n" +"# 5 = NFKC_CF\n" msgstr "" "# è¬åœ‹ç¢¼æ­£è¦åŒ–å½¢å¼\n" "# å¯èƒ½çš„值為：\n" @@ -7859,19 +7861,19 @@ msgstr "" "# 3 = NFC\n" "# 4 = NFD\n" -#: src/lang.c:2885 +#: src/lang.c:2893 msgid "Render BiDi" msgstr "潤算雙å‘文字" -#: src/lang.c:2886 +#: src/lang.c:2894 msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "# 如果開啟就由 tin 潤算雙å‘文字\n" -#: src/lang.c:2893 +#: src/lang.c:2901 msgid "Function for sorting articles" msgstr "用於排åºæ–‡ç« çš„函å¼" -#: src/lang.c:2894 +#: src/lang.c:2902 msgid "" "# Function for sorting articles\n" "# Possible values are (the default is marked with *):\n" @@ -7883,182 +7885,182 @@ msgstr "" "# * 0 = 快速排åº\n" "# 1 = å †ç©æŽ’åº\n" -#: src/lang.c:2907 +#: src/lang.c:2915 msgid "Automatically GroupMarkUnselArtRead" msgstr "自動 GroupMarkUnselArtRead" -#: src/lang.c:2913 +#: src/lang.c:2921 msgid "Delete post-process files" msgstr "刪除後續處ç†æª”案" -#: src/lang.c:2918 +#: src/lang.c:2926 msgid "Filename for all mailed articles, sets, no filename=do not save." msgstr "用於所有已郵寄文章的檔å， 設定，沒有檔å=ä¸å„²å­˜ã€‚" -#: src/lang.c:2919 +#: src/lang.c:2927 msgid "Mailbox to save sent mails" msgstr "è¦å„²å­˜å·²ç™¼é€éƒµä»¶çš„ä¿¡ç®±" -#: src/lang.c:2924 +#: src/lang.c:2932 msgid "Set Followup-To: header to this group(s). sets, cancels." msgstr "設定 Followup-To: 標頭為這個群組。 設定， å–消。" -#: src/lang.c:2925 +#: src/lang.c:2933 msgid "Followup-To: header" msgstr "Followup-To: 標頭" -#: src/lang.c:2930 +#: src/lang.c:2938 msgid "Enter default mail address (and fullname). sets, cancels." msgstr "輸入é è¨­éƒµä»¶åœ°å€ (附全å)。 設定， å–消。" -#: src/lang.c:2937 +#: src/lang.c:2945 msgid "" "Path and options for ispell-like spell-checker. sets, cancels." msgstr "åšç‚ºé¡žä¼¼ ispell 拼寫檢查器的路徑和é¸é …。 設定， å–消。" -#: src/lang.c:2938 +#: src/lang.c:2946 msgid "Ispell program" msgstr "Ispell 程å¼" -#: src/lang.c:2944 +#: src/lang.c:2952 msgid "When group is a mailing list, send responses to this email address." msgstr "當群組是個郵éžè«–壇時，發é€å›žæ‡‰åˆ°é€™å€‹é›»å­éƒµä»¶åœ°å€ã€‚" -#: src/lang.c:2945 +#: src/lang.c:2953 msgid "Mailing list address" msgstr "郵éžè«–壇地å€" -#: src/lang.c:2951 +#: src/lang.c:2959 msgid "Forward articles as attachment" msgstr "åšç‚ºè½‰å¯„文章的附件" -#: src/lang.c:2956 +#: src/lang.c:2964 msgid "" "A comma separated list of MIME major/minor Content-Types. cancels." msgstr "逗號分隔的 MIME 主è¦/次è¦å…§å®¹é¡žåž‹æ¸…單。 å–消。" -#: src/lang.c:2957 +#: src/lang.c:2965 msgid "Which MIME types will be saved" msgstr "將被儲存的 MIME é¡žåž‹" -#: src/lang.c:2962 +#: src/lang.c:2970 msgid "Value of the Organization: header. sets, cancels." msgstr "Organization: 標頭的值。 設定， å–消。" -#: src/lang.c:2963 +#: src/lang.c:2971 msgid "Organization: header" msgstr "Organization: 標頭" -#: src/lang.c:2968 +#: src/lang.c:2976 msgid "Filename for saved articles. sets, cancels." msgstr "用於已儲存文章的檔å。 設定， å–消。" -#: src/lang.c:2969 +#: src/lang.c:2977 msgid "savefile" msgstr "儲存檔案" -#: src/lang.c:2974 src/lang.c:2998 +#: src/lang.c:2982 src/lang.c:3006 msgid "Scope for the filter rule. sets, cancels." msgstr "用於篩é¸å™¨è¦å‰‡çš„範åœã€‚ 設定， å–消。" -#: src/lang.c:2975 +#: src/lang.c:2983 msgid "Quick (1 key) select filter scope" msgstr "快速 (1 éµ) é¸å–篩é¸å™¨ç¯„åœ" -#: src/lang.c:2980 src/lang.c:3004 +#: src/lang.c:2988 src/lang.c:3012 msgid "Header for filter rule. sets, cancels." msgstr "用於篩é¸å™¨è¦å‰‡çš„標頭。 設定， å–消。" -#: src/lang.c:2981 +#: src/lang.c:2989 msgid "Quick (1 key) select filter header" msgstr "快速 (1 éµ) é¸å–篩é¸å™¨æ¨™é ­" -#: src/lang.c:2986 src/lang.c:3010 +#: src/lang.c:2994 src/lang.c:3018 msgid "ON = case sensitive, OFF = ignore case. sets, cancels." msgstr "ON = 大å°å¯«ç›¸ç¬¦ï¼ŒOFF = 忽略大å°å¯«ã€‚ 設定， å–消。" -#: src/lang.c:2987 +#: src/lang.c:2995 msgid "Quick (1 key) select filter case" msgstr "快速 (1 éµ) é¸å–篩é¸å™¨å¤§å°å¯«" -#: src/lang.c:2992 src/lang.c:3016 +#: src/lang.c:3000 src/lang.c:3024 msgid "ON = expire, OFF = don't ever expire. sets, cancels." msgstr "ON = éŽæœŸï¼ŒOFF = ä¸æœƒéŽæœŸã€‚ 設定， å–消。" -#: src/lang.c:2993 +#: src/lang.c:3001 msgid "Quick (1 key) select filter expire" msgstr "快速 (1 éµ) é¸å–篩é¸å™¨éŽæœŸ" -#: src/lang.c:2999 +#: src/lang.c:3007 msgid "Quick (1 key) kill filter scope" msgstr "快速 (1 éµ) ç é™¤ç¯©é¸å™¨ç¯„åœ" -#: src/lang.c:3005 +#: src/lang.c:3013 msgid "Quick (1 key) kill filter header" msgstr "快速 (1 éµ) ç é™¤ç¯©é¸å™¨æ¨™é ­" -#: src/lang.c:3011 +#: src/lang.c:3019 msgid "Quick (1 key) kill filter case" msgstr "快速 (1 éµ) ç é™¤ç¯©é¸å™¨å¤§å°å¯«" -#: src/lang.c:3017 +#: src/lang.c:3025 msgid "Quick (1 key) kill filter expire" msgstr "快速 (1 éµ) ç é™¤ç¯©é¸å™¨éŽæœŸ" -#: src/lang.c:3023 +#: src/lang.c:3031 msgid "Assume this charset if no charset declaration is present, to set." msgstr "如果ä¸å­˜åœ¨ä»»ä½•å­—元集宣告就å‡è¨­ç‚ºé€™å€‹å­—元集， 以設定。" -#: src/lang.c:3024 +#: src/lang.c:3032 msgid "UNDECLARED_CHARSET" msgstr "未宣告字元集" -#: src/lang.c:3030 +#: src/lang.c:3038 msgid "" "Add this text at the start of the message body. sets, cancels." msgstr "加入這個文字於訊æ¯å…§æ–‡çš„開始。 設定， å–消。" -#: src/lang.c:3031 +#: src/lang.c:3039 msgid "X_Body" msgstr "X_Body" -#: src/lang.c:3036 +#: src/lang.c:3044 msgid "Insert this header when posting. sets, cancels." msgstr "張貼時æ’入這個標頭。 設定， å–消。" -#: src/lang.c:3037 +#: src/lang.c:3045 msgid "X_Headers" msgstr "X_Headers" -#: src/lang.c:3042 +#: src/lang.c:3050 msgid "" "Automatically insert an X-Comment-To: header? toggles & sets." msgstr "自動æ’å…¥ X-Comment-To: 標頭？ åˆ‡æ› & 設定。" -#: src/lang.c:3043 +#: src/lang.c:3051 msgid "Insert 'X-Comment-To:' header" msgstr "æ’入『X-Comment-To:ã€æ¨™é ­" #. TODO: lang.c -#: src/main.c:801 +#: src/main.c:812 msgid "reading from local spool" msgstr "" -#: src/misc.c:3868 +#: src/misc.c:3878 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "版本：%s %s 釋出 %s (「%sã€) %s %s\n" -#: src/misc.c:3871 +#: src/misc.c:3881 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "版本：%s %s 釋出 %s (「%sã€)\n" -#: src/newsrc.c:453 +#: src/newsrc.c:457 msgid "Unreachable?\n" msgstr "無法連線？\n" -#: src/nntplib.c:817 +#: src/nntplib.c:822 #, c-format msgid "" "\n" @@ -8067,30 +8069,30 @@ msgstr "" "\n" "伺æœå™¨å·²é€¾æ™‚，嘗試é‡æ–°é€£ç·š # %d\n" -#: src/nntplib.c:844 +#: src/nntplib.c:849 #, fuzzy msgid "NNTP connection error. Exiting..." msgstr "連線到 NNTP 伺æœå™¨ %s 時失敗。離開…" -#: src/nntplib.c:856 src/nntplib.c:1835 +#: src/nntplib.c:861 src/nntplib.c:1852 msgid "Rejoin current group\n" msgstr "é‡æ–°é€£çµç›®å‰çš„群組\n" -#: src/nntplib.c:864 src/nntplib.c:1843 +#: src/nntplib.c:869 src/nntplib.c:1860 #, c-format msgid "Read (%s)\n" msgstr "已讀 (%s)\n" -#: src/nntplib.c:866 +#: src/nntplib.c:871 #, c-format msgid "Resend last command (%s)\n" msgstr "é‡æ–°ç™¼é€æœ€è¿‘的命令 (%s)\n" -#: src/nntplib.c:1482 +#: src/nntplib.c:1500 msgid "CAPABILITIES did not announce READER" msgstr "能力中並未宣告包å«é–±è®€å™¨" -#: src/nntplib.c:1989 +#: src/nntplib.c:2006 msgid "MOTD: " msgstr "MOTD: " @@ -8158,7 +8160,7 @@ msgstr "[- 無法使用 -]" #. * preamble #. * TODO: -> lang.c #. -#: src/rfc2047.c:1308 +#: src/rfc2047.c:1322 #, c-format msgid "" "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" @@ -8240,6 +8242,19 @@ msgstr "Slrnface ä¸æ­£å¸¸åœ°é›¢é–‹ï¼Œä» msgid "Slrnface failed: %s." msgstr "Slrnface 失敗：%s。" +#~ msgid "Active file corrupt - %s" +#~ msgstr "ç¾ç”¨æª”案æ壞 - %s" + +#~ msgid "Invalid response to GROUP command, %s" +#~ msgstr "å°æ–¼ GROUP 命令的無效回應，%s" + +#~ msgid "unparseable \"LIST COUNTS\" line: \"%s\"" +#~ msgstr "無法解æžçš„「清單計數ã€åˆ—：「%sã€" + +#~ msgid "" +#~ "Wrong newsgroup name (\"%s\") in response of \"GROUP %s\" command: \"%s\"" +#~ msgstr "錯誤新èžç¾¤çµ„å稱 (「%sã€) 於「群組 %sã€å‘½ä»¤ï¼šã€Œ%sã€çš„回應之中" + #~ msgid "Enter maximum length of newsgroup names displayed. sets." #~ msgstr "輸入顯示新èžç¾¤çµ„å稱的最大長度。 設定。" diff -Nurp '--exclude=.bzr*' tin-2.4.2/po4a.conf tin-2.4.3/po4a.conf --- tin-2.4.2/po4a.conf 2017-05-03 19:47:33.000000000 +0200 +++ tin-2.4.3/po4a.conf 2018-06-05 11:00:04.097283941 +0200 @@ -3,7 +3,8 @@ [options] \ opt:"-k 0 -M US-ASCII" \ opt_de:"-L UTF-8 -A UTF-8" \ - opt_en_GB:"-L ISO-8859-1 -A ISO-8859-1" + opt_en_GB:"-L ISO-8859-1 -A ISO-8859-1" \ + opt_es:"-L UTF-8 -A UTF-8" [type: man] doc/tin.1 \ $lang:doc/l10n/$lang/tin.1 \ diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/Makefile.in tin-2.4.3/src/Makefile.in --- tin-2.4.2/src/Makefile.in 2017-12-08 08:55:34.000000000 +0100 +++ tin-2.4.3/src/Makefile.in 2018-12-07 08:35:23.460301429 +0100 @@ -1,9 +1,9 @@ # Source Makefile for tin # - for configuration options read the ../doc/INSTALL file. # -# Updated: 2012-02-20 +# Updated: 2018-01-10 # -# Copyright (c) 1995-2018 Thomas E. Dickey +# Copyright (c) 1995-2019 Thomas E. Dickey # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -51,9 +51,8 @@ PRELIB = @LIB_PREFIX@ x = @EXEEXT@ o = .@OBJEXT@ -DEBUG = @ENABLE_DEBUG@ -DDEBUG #-DPROFILE -FEATURES = # -DEVIL_INSIDE - +DEBUG = @ENABLE_DEBUG@ -DDEBUG # -DPROFILE +FEATURES = # -DALLOW_FWS_IN_NEWSGROUPLIST # -DEVIL_INSIDE INTL_CPPFLAGS = -DLOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" PCRE_CPPFLAGS = @PCREDIR_CPPFLAGS@ @PCREDIR_MAKE@ -I$(top_builddir)/pcre -I$(top_srcdir)/pcre @@ -84,7 +83,7 @@ INS_SYSDEF_DIR = @TIN_DEFAULTS_DIR@ INS_MANUAL_EXT = 1 INS_OLD_SUFFIX = old -MAN_LINGUAS = de en_GB +MAN_LINGUAS = de en_GB es # Project PROJECT = `echo @PACKAGE@|sed '@program_transform_name@'` @@ -406,7 +405,7 @@ uninstall_helpers : install : $(DESTDIR)$(INS_BINARY_DIR) @$(MAKE) all @$(ECHO) "Installing $(EXE) v$(VER) to $(DESTDIR)$(INS_BINARY_DIR)/$(PROJEXE) ..." - @$(INSTALL) -s $(BINDIR)/$(EXE) $(DESTDIR)$(INS_BINARY_DIR)/$(PROJEXE) + @$(INSTALL) $(BINDIR)/$(EXE) $(DESTDIR)$(INS_BINARY_DIR)/$(PROJEXE) @( $(CD) $(DESTDIR)$(INS_BINARY_DIR) && $(RM) -f r$(PROJEXE) && $(LN) $(PROJEXE) r$(PROJEXE) ) @$(MAKE) install_helpers @$(MAKE) install_manpage diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/active.c tin-2.4.3/src/active.c --- tin-2.4.2/src/active.c 2017-12-08 08:54:35.000000000 +0100 +++ tin-2.4.3/src/active.c 2018-11-23 18:09:45.275221600 +0100 @@ -3,10 +3,10 @@ * Module : active.c * Author : I. Lea * Created : 1992-02-16 - * Updated : 2016-10-10 + * Updated : 2018-11-22 * Notes : * - * Copyright (c) 1992-2018 Iain Lea + * Copyright (c) 1992-2019 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -92,7 +92,7 @@ need_reread_active_file( /* * Resync active file when reread_active_file_secs have passed or - * force_reread_actve_file is set. + * force_reread_active_file is set. * Return TRUE if a reread was performed */ t_bool @@ -234,10 +234,10 @@ parse_active_line( if (!p || !q || !r || !lineok) { #ifdef DEBUG - if (debug & DEBUG_NNTP) - debug_print_file("NNTP", txt_bad_active_file, line); + /* TODO: This also logs broken non NNTP active lines (i.e. mail.active) to NNTP */ + if (debug & DEBUG_NNTP && verbose > 1) + debug_print_file("NNTP", "Active file corrupt - %s", line); #endif /* DEBUG */ - error_message(2, _(txt_bad_active_file), line); return FALSE; } @@ -281,10 +281,9 @@ parse_count_line( if (!p || !q || !r || !s || !lineok) { # ifdef DEBUG - if (debug & DEBUG_NNTP) - debug_print_file("NNTP", _(txt_unparseable_counts), line); + if (debug & DEBUG_NNTP && verbose > 1) + debug_print_file("NNTP", "unparseable \"LIST COUNTS\" line: \"%s\"", line); # endif /* DEBUG */ - error_message(2, _(txt_unparseable_counts), line); return FALSE; } @@ -306,7 +305,7 @@ parse_count_line( * We can't know the 'moderator' status and always return 'y' * But we don't change if the 'moderator' status is already checked by * read_active_file() - * Returnes TRUE if NNTP is enabled and authentication is needed + * Returns TRUE if NNTP is enabled and authentication is needed */ #ifdef NNTP_ABLE static t_bool @@ -331,7 +330,6 @@ do_read_newsrc_active_file( int index_o = 0; #endif /* NNTP_ABLE */ - rewind(fp); if (!batch_mode || verbose) @@ -363,7 +361,7 @@ do_read_newsrc_active_file( ngnames[index_i] = my_strdup(ptr); snprintf(buf, sizeof(buf), "GROUP %s", ngnames[index_i]); # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "read_newsrc_active_file() %s", buf); # endif /* DEBUG */ put_server(buf); @@ -385,7 +383,7 @@ do_read_newsrc_active_file( for (i = 0; i < window - 1; i++) { snprintf(buf, sizeof(buf), "GROUP %s", ngnames[j]); # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "read_newsrc_active_file() %s", buf); # endif /* DEBUG */ put_server(buf); @@ -407,16 +405,14 @@ do_read_newsrc_active_file( snprintf(fmt, sizeof(fmt), "%%"T_ARTNUM_SFMT" %%"T_ARTNUM_SFMT" %%"T_ARTNUM_SFMT" %%%ds", NNTP_GRPLEN); if (sscanf(line, fmt, &count, &min, &max, ngname) != 4) { - error_message(2, _(txt_error_invalid_response_to_group), line); # ifdef DEBUG - if (debug & DEBUG_NNTP) /* TODO: -> lang.c */ + if (debug & DEBUG_NNTP && verbose > 1) debug_print_file("NNTP", "Invalid response to \"GROUP %s\": \"%s\"", ngnames[index_o], line); # endif /* DEBUG */ } if (strcmp(ngname, ngnames[index_o]) != 0) { - error_message(2, _(txt_error_wrong_newsgroupname_in_group_response), ngname, ngnames[index_o], line); # ifdef DEBUG - if (debug & DEBUG_NNTP) /* TODO: -> lang.c */ + if (debug & DEBUG_NNTP && verbose > 1) debug_print_file("NNTP", "Groupname mismatch in response to \"GROUP %s\": \"%s\"", ngnames[index_o], line); # endif /* DEBUG */ } @@ -446,7 +442,7 @@ do_read_newsrc_active_file( default: # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "NOT_OK %s", line); # endif /* DEBUG */ free(ngnames[index_o]); @@ -610,7 +606,7 @@ read_active_file( while ((ptr = tin_fgets(fp, FALSE)) != NULL) { #if defined(DEBUG) && defined(NNTP_ABLE) - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose) /* long multiline response */ debug_print_file("NNTP", "<<<%s%s", logtime(), ptr); #endif /* DEBUG && NNTP_ABLE */ @@ -688,7 +684,7 @@ read_active_counts( while ((ptr = tin_fgets(fp, FALSE)) != NULL) { # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose) /* long multiline response */ debug_print_file("NNTP", "<<<%s%s", logtime(), ptr); # endif /* DEBUG */ @@ -785,7 +781,7 @@ read_news_active_file( #ifdef NNTP_ABLE # ifndef DISABLE_PIPELINING /* - * prefer LIST COUNTS, otherwise use LIST ACIVE (-l) or GROUP (-n) + * prefer LIST COUNTS, otherwise use LIST ACTIVE (-l) or GROUP (-n) * or both (-ln); LIST COUNTS/ACTIVE grplist is used up to * PIPELINE_LIMIT groups in newsrc */ @@ -800,7 +796,7 @@ read_news_active_file( t_bool need_auth = FALSE; *buff = '\0'; - /* we can't use for_each_group(i) yet, so we have to prase the newsrc */ + /* we can't use for_each_group(i) yet, so we have to parse the newsrc */ if ((fp = fopen(newsrc, "r")) != NULL) { while (tin_fgets(fp, FALSE) != NULL) j++; @@ -851,7 +847,7 @@ read_news_active_file( } else { while ((ptr = tin_fgets(FAKE_NNTP_FP, FALSE)) != NULL) { # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose) /* long multiline response */ debug_print_file("NNTP", "<<<%s%s", logtime(), ptr); # endif /* DEBUG */ if (nntp_caps.type == CAPABILITIES && nntp_caps.list_counts) { @@ -904,7 +900,7 @@ read_news_active_file( newgrps = check_for_any_new_groups(); /* - * finally we have a list of all groups an can set the attributes + * finally we have a list of all groups and can set the attributes */ assign_attributes_to_groups(); @@ -987,7 +983,7 @@ check_for_any_new_groups( } #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "Newnews old=[%lu] new=[%lu]", (unsigned long int) old_newnews_time, (unsigned long int) new_newnews_time); #endif /* DEBUG */ @@ -1088,7 +1084,7 @@ subscribe_new_group( /* * as subscribe_new_group() is called from check_for_any_new_groups() * which has pending data on the socket if reading via NNTP we are not - * allowed to issue any NNTP comands yet + * allowed to issue any NNTP commands yet */ subscribe(&active[my_group[idx]], SUBSCRIBED, bool_not(read_news_via_nntp)); /* @@ -1128,7 +1124,7 @@ match_group_list( separator = strchr(group_list, ','); group_len = MIN(((separator == NULL) ? list_len : (size_t) (separator - group_list)), sizeof(pattern) - 1); - if ((negate = ('!' == *group_list))) { + if ((negate = (*group_list == '!'))) { /* * a '!' before the pattern inverts sense of match */ @@ -1150,7 +1146,7 @@ match_group_list( /* * now examine next entry if any */ - if ((char) 0 != group_list[group_len]) + if (group_list[group_len] != '\0') group_len++; /* skip the separator */ group_list += group_len; @@ -1209,7 +1205,7 @@ load_newnews_info( newnews[i].time = new_time; #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "ACTIVE host=[%s] time=[%lu]", newnews[i].host, (unsigned long int) newnews[i].time); #endif /* DEBUG */ } diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/art.c tin-2.4.3/src/art.c --- tin-2.4.2/src/art.c 2017-12-08 08:54:35.000000000 +0100 +++ tin-2.4.3/src/art.c 2018-12-18 17:06:16.030732257 +0100 @@ -3,10 +3,10 @@ * Module : art.c * Author : I.Lea & R.Skrenta * Created : 1991-04-01 - * Updated : 2017-02-03 + * Updated : 2018-12-18 * Notes : * - * Copyright (c) 1991-2018 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2019 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -77,7 +77,7 @@ static int last_date_comp_base_desc(t_co static int lines_comp_asc(t_comptype p1, t_comptype p2); static int lines_comp_desc(t_comptype p1, t_comptype p2); static int read_art_headers(struct t_group *group, int total, t_artnum top); -static int read_overview(struct t_group *group, t_artnum min, t_artnum max, t_artnum *top, t_bool local); +static int read_overview(struct t_group *group, t_artnum min, t_artnum max, t_artnum *top, t_bool local, t_bool *rebuild_cache); static int score_comp_asc(t_comptype p1, t_comptype p2); static int score_comp_desc(t_comptype p1, t_comptype p2); static int score_comp_base(t_comptype p1, t_comptype p2); @@ -94,6 +94,10 @@ static void thread_by_multipart(void); static void thread_by_percentage(struct t_group *group); static void thread_by_subject(void); static void write_overview(struct t_group *group); +#ifdef NNTP_ABLE + static struct t_article_range *build_range_list(t_artnum min, t_artnum max, int *range_cnt); + static t_bool get_path_header(int cur, int cnt, struct t_group *group, t_artnum min, t_artnum max); +#endif /* NNTP_ABLE */ /* @@ -104,8 +108,7 @@ void show_art_msg( const char *group) { -/* what if cCOLS < (strlen)+18? */ - wait_message(0, _(txt_group), cCOLS - strlen(_(txt_group)) + 2 - 3, group); + wait_message(0, _(txt_group), cCOLS - (strwidth(_(txt_group)) > cCOLS ? cCOLS : strwidth(_(txt_group)) + 2 - 3), group); } @@ -223,10 +226,10 @@ setup_hard_base( * nntpcache, leafnode and SurgeNews. Usually this should not be * needed. * - * For getart_limit recheck lowwatermark as at leat giganews gives + * For getart_limit recheck lowwatermark as at least giganews gives * very different results for LIST ACTIVE (3 year retention for all) * and GROUP (based on the clients contract). - * Calculate range and prepare base[] not to loose unread arts. + * Calculate range and prepare base[] not to lose unread arts. */ if (nntp_caps.broken_listgroup || (!skip_listgroup && getart_limit && nntp_caps.type == CAPABILITIES && nntp_caps.reader)) { snprintf(buf, sizeof(buf), "GROUP %s", group->name); @@ -262,7 +265,7 @@ setup_hard_base( /* RFC 3977 allows ranges in LISTGROUP */ if (getart_limit > 0) snprintf(buf, sizeof(buf), "LISTGROUP %s %"T_ARTNUM_PFMT"-%"T_ARTNUM_PFMT"", group->name, j, group->xmax); - else /* getart_limit < 0; fetch till newsest art */ + else /* getart_limit < 0; fetch till newest art */ snprintf(buf, sizeof(buf), "LISTGROUP %s %"T_ARTNUM_PFMT"-", group->name, j); } else /* for RFC 977 just use GROUP */ @@ -276,7 +279,7 @@ setup_hard_base( char *ptr; # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "setup_hard_base(%s)", buf); # endif /* DEBUG */ @@ -309,7 +312,7 @@ setup_hard_base( return -1; # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "setup_hard_base(%s)", buf); # endif /* DEBUG */ total = count; @@ -399,6 +402,8 @@ index_group( t_artnum min, new_min, max; t_bool caching_xover; t_bool filtered; + t_bool path_in_nov = FALSE; + t_bool rebuild_cache = FALSE; if (group == NULL) return TRUE; @@ -461,13 +466,13 @@ index_group( /* * Read in the existing overview data for min..max * This read has local=TRUE set if locally caching XOVER records to ensure - * we pull in any private overview caches in preference to using using OVER + * we pull in any private overview caches in preference to using OVER * * When reading local spool, this will pull in the system wide overview * cache (if found) otherwise the private overview cache will be read */ caching_xover = (tinrc.cache_overview_files && nntp_caps.over_cmd && group->type == GROUP_TYPE_NEWS); - if ((changed = read_overview(group, min, max, &last_read_article, caching_xover)) == -1) + if ((changed = read_overview(group, min, max, &last_read_article, caching_xover, &rebuild_cache)) == -1) return FALSE; /* user aborted indexing */ /* @@ -477,7 +482,7 @@ index_group( if ((last_read_article < max) && caching_xover) { new_min = (last_read_article >= min) ? last_read_article + 1 : min; - if ((i = read_overview(group, new_min, max, &last_read_article, FALSE)) == -1) + if ((i = read_overview(group, new_min, max, &last_read_article, FALSE, &rebuild_cache)) == -1) return FALSE; /* user aborted indexing */ else changed += i; @@ -543,13 +548,15 @@ index_group( if (group->attribute->show_only_unread_arts) arts[i].keep_in_base = FALSE; } + if (!path_in_nov && arts[i].path && *arts[i].path != '\0') + path_in_nov = TRUE; } /* * Only rewrite the index if it has changed * TODO review the exact logic behind "|| caching_xover" */ - if (changed || caching_xover) + if (changed || caching_xover || rebuild_cache) write_overview(group); /* @@ -738,7 +745,7 @@ read_art_headers( } } - snprintf(group_msg, sizeof(group_msg), _(txt_group), cCOLS - strlen(_(txt_group)) + 2 - 3, group->name); + snprintf(group_msg, sizeof(group_msg), _(txt_group), cCOLS - MIN(cCOLS - 1, strwidth(_(txt_group))) + 2 - 3, group->name); for (i = 0; i < grpmenu.max; i++) { /* for each article number */ art = base[i]; @@ -778,16 +785,17 @@ read_art_headers( if (!res) { #ifdef DEBUG - if (debug & DEBUG_NNTP) { + if (debug & DEBUG_FILTER) { /* we currently have no "local spool" debug level */ char buf[PATH_LEN]; snprintf(buf, sizeof(buf), "FAILED parse_headers(%"T_ARTNUM_PFMT")", art); - debug_print_file("NNTP", "read_art_headers() %s", buf); + debug_print_file("ARTS", "read_art_headers() %s", buf); } #endif /* DEBUG */ arts[top_art].artnum = T_ARTNUM_CONST(0); arts[top_art].date = (time_t) 0; FreeAndNull(arts[top_art].xref); + FreeAndNull(arts[top_art].path); FreeAndNull(arts[top_art].refs); FreeAndNull(arts[top_art].msgid); if (arts[top_art].archive) { @@ -958,8 +966,8 @@ thread_by_percentage( /* - * This was brought over from tags.c, however this version doesn't not - * opperate on base_index + * This was brought over from tags.c, however this version doesn't + * operate on base_index * * Parses a subject header of the type "multipart message subject (01/42)" * into a MultiPartInfo struct, or fails if the message subject isn't in the @@ -992,7 +1000,7 @@ global_get_multipart_info( /* * Again this was taken from tags.c, but works on global indices into arts - * rather then on base_index. + * rather than on base_index. */ static int global_look_for_multipart_info( @@ -1174,7 +1182,7 @@ thread_by_multipart( * information before threading which happens anyway expect when using * THREAD_NONE (I don't immediately see how this is useful) */ -/* TODO: rewrite that user can easly combine different 'threading' +/* TODO: rewrite that user can easily combine different 'threading' * methods, i.e: * - thread_by_multipart() + collate_subjects() */ @@ -1384,7 +1392,8 @@ parse_headers( /* * as Archive-name: is placed in the body it's safe to exit - * the loop if it was found. + * the loop if it was found. Don't mix up with Archive: from + * RFC 5536. */ if (lineno++ > max_lineno || h->archive) break; @@ -1455,6 +1464,14 @@ parse_headers( } break; + /* for Path:-filter when reading from local spool */ + case 'P': /* Path: */ + if (!h->path) { + if ((hdr = parse_header(ptr + 1, "ath", FALSE, FALSE, FALSE))) + h->path = my_strdup(hdr); + } + break; + case 'R': /* References: optional */ if (!h->refs) { if ((hdr = parse_header(ptr + 1, "eferences", FALSE, FALSE, FALSE))) @@ -1502,7 +1519,7 @@ parse_headers( * The son of RFC 1036 states that the following hdrs are mandatory. It * also states that Subject, Newsgroups and Path are too. Ho hum. * - * What about readinng mail from local spool via ~/.tin/active.mail, + * What about reading mail from local spool via ~/.tin/active.mail, * they might not have a Message-ID but got_received is very likely to * be true. */ @@ -1519,6 +1536,270 @@ parse_headers( return FALSE; } +#ifdef NNTP_ABLE +/* + * Loop over arts[] and find ranges without Path: header + * If there are any try to optimize the ranges regarding traffic consumption + * Start optimization if at least MIN_CNT ranges exist + * If there are more than MAX_CNT ranges after optimization, fetch all in one + * big range + */ +#define MIN_CNT 10 +#define MAX_CNT 50 +static struct t_article_range * +build_range_list( + t_artnum min, + t_artnum max, + int *range_cnt) +{ + int i, gap_cnt = 0; + struct t_article_range *res = NULL, *gap_list, *curr, *from; + t_artnum new_end; + + new_end = T_ARTNUM_CONST(0); + gap_list = my_malloc(sizeof(struct t_article_range)); + curr = gap_list; + curr->start = min; + curr->end = max; + curr->cnt = T_ARTNUM_CONST(0); + curr->next = NULL; + + for_each_art(i) { + if (arts[i].artnum < min) + continue; + if (arts[i].artnum > max) + break; + if (arts[i].path) { + for (; i < top_art && arts[i].path; i++) + ; + /* + * the current art has no path -> we use this one + * if we reached top_art all arts have path + * so we use max + */ + curr->start = i == top_art ? max : arts[i--].artnum; + } else { + for (; i < top_art && !arts[i].path; i++) + ; + /* the current art has path -> we use the last one */ + new_end = curr->end = arts[--i].artnum; + } + if (new_end) { + curr->cnt = curr->end - curr->start + 1; + curr->next = my_malloc(sizeof(struct t_article_range)); + curr = curr->next; + curr->start = new_end; + curr->end = max; + curr->cnt = T_ARTNUM_CONST(0); + curr->next = NULL; + new_end = T_ARTNUM_CONST(0); + } + } + + curr = gap_list; + while (curr && curr->cnt) { + ++gap_cnt; +# ifdef DEBUG + if ((debug & DEBUG_NNTP) && verbose > 1) + debug_print_file("NNTP", "range #%d without path in overview cache: start: %"T_ARTNUM_PFMT" end: %"T_ARTNUM_PFMT" cnt: %"T_ARTNUM_PFMT"", gap_cnt, curr->start, curr->end, curr->cnt); +# endif /* DEBUG */ + curr = curr->next; + } + + /* + * Optimize only if there are at least MIN_CNT ranges + */ + if (gap_cnt >= MIN_CNT) { + res = my_malloc(sizeof(struct t_article_range)); + res->start = T_ARTNUM_CONST(0); + res->end = T_ARTNUM_CONST(0); + res->cnt = T_ARTNUM_CONST(0); + res->next = NULL; + + from = gap_list; + curr = res; + while (from) { + curr->start = from->start; + curr->end = from->end; + curr->cnt = from->cnt; + if ((from = from->next)) { + /* + * If the next range is grater then the gap between the current + * one and the next one we build a new range including the + * current one, the next one and the gap between + */ + while (from && from->cnt >= from->start - curr->end - 1) { + curr->end = from->end; + from = from->next; + } + curr->cnt = curr->end - curr->start + 1; + curr->next = my_malloc(sizeof(struct t_article_range)); + curr = curr->next; + curr->start = T_ARTNUM_CONST(0); + curr->end = T_ARTNUM_CONST(0); + curr->cnt = T_ARTNUM_CONST(0); + curr->next = NULL; + } + } + } + + /* + * If there are less then MIN_CNT ranges + * no res is build -> return the original list + */ + if (res) { + while (gap_list) { + curr = gap_list; + gap_list = curr->next; + free(curr); + } + } else + res = gap_list; + + curr = res; + gap_cnt = 0; + while (curr && curr->cnt) { + ++gap_cnt; +# ifdef DEBUG + if ((debug & DEBUG_NNTP) && verbose > 1) + debug_print_file("NNTP", "optimized range #%d: start: %"T_ARTNUM_PFMT" end: %"T_ARTNUM_PFMT" cnt: %"T_ARTNUM_PFMT"", gap_cnt, curr->start, curr->end, curr->cnt); +# endif /* DEBUG */ + curr = curr->next; + } + + if (gap_cnt >= MAX_CNT) { + curr = res; + while (curr->next && curr->next->cnt) { + res->end = curr->next->end; + curr->next->cnt = 0; + curr = curr->next; + } + res->cnt = res->end - res->start + 1; + gap_cnt = 1; +# ifdef DEBUG + if ((debug & DEBUG_NNTP) && verbose > 1) { + debug_print_file("NNTP", "more then %d ranges after optimization, fetch all at once instead: start: %"T_ARTNUM_PFMT" end: %"T_ARTNUM_PFMT" cnt: %"T_ARTNUM_PFMT"", MAX_CNT, res->start, res->end, res->cnt); + } +# endif /* DEBUG */ + } + *range_cnt = gap_cnt; + + return res; +} + + +/* + * Fetch the Path header in case we want to filter on that in the given group + * + * Try [X]HDR first, then XPAT + */ +static t_bool +get_path_header( + int cur, + int cnt, + struct t_group *group, + t_artnum min, + t_artnum max) +{ + FILE *fp = NULL; + char *prep_msg; + char *buf, *ptr; + char cmd[NNTP_STRLEN]; + t_artnum artnum, i; + t_bool found = FALSE; + static t_bool supported = TRUE; /* assume HDR || XPAT works */ + + if (!read_news_via_nntp || !supported || group->type != GROUP_TYPE_NEWS) + return FALSE; + +# ifdef DEBUG + if ((debug & DEBUG_NNTP) && verbose > 1) + debug_print_file("NNTP", "%s: Filtering on Path header requested.", group->name); +# endif /* DEBUG */ + + if (nntp_caps.type == CAPABILITIES && nntp_caps.list_headers && !*nntp_caps.headers_range && nntp_caps.hdr_cmd[0] != 'X') { + int j = new_nntp_command("LIST HEADERS RANGE", 215, cmd, sizeof(cmd)); + switch (j) { + case 215: + while ((ptr = tin_fgets(FAKE_NNTP_FP, FALSE)) != NULL) { +# ifdef DEBUG + if (debug & DEBUG_NNTP) + debug_print_file("NNTP", "<<<%s%s", logtime(), ptr); +# endif /* DEBUG */ + nntp_caps.headers_range = my_realloc(nntp_caps.headers_range, strlen(nntp_caps.headers_range) + strlen(ptr) + 2); + strcat(nntp_caps.headers_range, ptr); + strcat(nntp_caps.headers_range, "\n"); + } + break; + + default: + break; + } + } + + /* does HDR return Path? */ + if (nntp_caps.headers_range && (ptr = strtok(nntp_caps.headers_range, "\n")) != NULL) { + do { + if ((*ptr == ':' && *(ptr + 1) == '\0') || !strncasecmp(ptr, "Path", 4)) + found = TRUE; + } while (!found && *ptr && (ptr = strtok(NULL, "\n")) != NULL); + } + + if ((nntp_caps.hdr || nntp_caps.hdr_cmd) && (!(nntp_caps.type == CAPABILITIES) || found)) { + if (min == max) + snprintf(cmd, sizeof(cmd), "%s Path %"T_ARTNUM_PFMT, nntp_caps.hdr_cmd, min); + else + snprintf(cmd, sizeof(cmd), "%s Path %"T_ARTNUM_PFMT"-%"T_ARTNUM_PFMT, nntp_caps.hdr_cmd, min, max); + fp = nntp_command(cmd, nntp_caps.hdr_cmd[0] == 'X' ? OK_XHDR : OK_HDR, NULL, 0); + if (!nntp_caps.hdr && fp) + nntp_caps.hdr = TRUE; + } else if (nntp_caps.xpat) { + if (min == max) + snprintf(cmd, sizeof(cmd), "XPAT Path %"T_ARTNUM_PFMT" *", min); + else + snprintf(cmd, sizeof(cmd), "XPAT Path %"T_ARTNUM_PFMT"-%"T_ARTNUM_PFMT" *", min, max); + fp = nntp_command(cmd, OK_XPAT, NULL, 0); + } + + if (fp) { + prep_msg = fmt_string(_(txt_prep_for_filter_on_path), cur, cnt); + while ((buf = tin_fgets(fp, FALSE)) != NULL && buf[0] != '.') { +# ifdef DEBUG + if ((debug & DEBUG_NNTP) && verbose) + debug_print_file("NNTP", "<<<%s%s", logtime(), buf); +# endif /* DEBUG */ + if ((ptr = tin_strtok(buf, " ")) == NULL) + continue; + artnum = atoartnum(ptr); + if ((ptr = tin_strtok(NULL, " ")) == NULL) + continue; + for_each_art(i) { + if (arts[i].artnum == artnum) { + FreeIfNeeded(arts[i].path); + arts[i].path = my_strdup(ptr); + } + } + if (++artnum % MODULO_COUNT_NUM == 0) + show_progress(prep_msg, artnum - min, max - min); + } + free(prep_msg); + return supported; + } + + /* !fp */ + supported = FALSE; + if (nntp_caps.xpat) + nntp_caps.xpat = FALSE; + /* as nntp_caps.hdr may work with other headers we don't disable it*/ + +#ifdef DEBUG + if ((debug & DEBUG_NNTP) && verbose > 1) + debug_print_file("NNTP", "%s: Neither \"[X]HDR Path\" nor \"XPAT Path\" are supportet.", group->name); +#endif /* DEBUG */ + return supported; +} +#endif /* NNTP_ABLE */ + /* * Read in an overview index file. Fields are separated by TAB. @@ -1545,7 +1826,8 @@ read_overview( t_artnum min, t_artnum max, t_artnum *top, - t_bool local) + t_bool local, + t_bool *rebuild_cache) { FILE *fp; char *ptr; @@ -1557,6 +1839,7 @@ read_overview( unsigned int count; int expired = 0; t_artnum artnum; + t_bool path_found = FALSE, path_in_ofmt = FALSE; struct t_article *art; size_t over_fields = 1; @@ -1569,13 +1852,16 @@ read_overview( if (group->xmax > max) group->xmax = max; - group_msg = fmt_string(_(txt_group), cCOLS - strlen(_(txt_group)) + 2 - 3, group->name); + group_msg = fmt_string(_(txt_group), cCOLS - MIN(cCOLS - 1, strwidth(_(txt_group))) + 2 - 3, group->name); /* get the number of fields per over-record as announced by LIST OVERVIEW.FMT */ if (ofmt) { - for (; ofmt[over_fields].name; over_fields++) - ; + for (; ofmt[over_fields].name; over_fields++) { + if (local && !path_in_ofmt && !strcasecmp(ofmt[over_fields].name, "Path:")) + path_in_ofmt = TRUE; + } } + if (!--over_fields) { /* e.g. nntp_caps.type == CAPABILITIES && !nntp_caps.list_overview_fmt -> assume defaults */ ofmt = my_realloc(ofmt, sizeof(struct t_overview_fmt) * (8 + 1)); ofmt[0].type = OVER_T_INT; @@ -1600,6 +1886,11 @@ read_overview( } while ((buf = tin_fgets(fp, FALSE)) != NULL) { +#ifdef DEBUG + if ((debug & DEBUG_NNTP) && fp == FAKE_NNTP_FP && verbose) + debug_print_file("NNTP", "<<<%s%s", logtime(), buf); +#endif /* DEBUG */ + if (need_resize) { handle_resize((need_resize == cRedraw) ? TRUE : FALSE); need_resize = cNo; @@ -1662,7 +1953,7 @@ read_overview( /* skip unexpected tailing fields */ if (count > over_fields) { #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "%s(%"T_ARTNUM_PFMT") Unexpected overview-field %d of %d: %s", nntp_caps.over_cmd, artnum, count, over_fields, ptr); #endif /* DEBUG */ @@ -1670,7 +1961,7 @@ read_overview( if (count == over_fields + 1) { if (!strncasecmp(ptr, "Xref: ", 6)) { #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "%s: found unexpected Xref: on semi std. position", nntp_caps.over_cmd); #endif /* DEBUG */ over_fields++; @@ -1680,6 +1971,18 @@ read_overview( ofmt[over_fields + 1].type = OVER_T_ERROR; ofmt[over_fields + 1].name = NULL; xref_supported = TRUE; + } else if (local && !strncasecmp(ptr, "Path: ", 6)) { +#ifdef DEBUG + if ((debug & DEBUG_NNTP) && verbose > 1) + debug_print_file("NNTP", "%s: found Path:", nntp_caps.over_cmd); +#endif /* DEBUG */ + over_fields++; + ofmt = my_realloc(ofmt, sizeof(struct t_overview_fmt) * (over_fields + 2)); /* + 2 = artnum and end-marker */ + ofmt[over_fields].type = OVER_T_FSTRING; + ofmt[over_fields].name = my_strdup("Path:"); + ofmt[over_fields + 1].type = OVER_T_ERROR; + ofmt[over_fields + 1].name = NULL; + xref_supported = TRUE; } else continue; } else @@ -1696,7 +1999,7 @@ read_overview( else { art->subject = hash_str(""); #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "%s(%"T_ARTNUM_PFMT") empty overview-field %s", nntp_caps.over_cmd, artnum, ofmt[count].name); #endif /* DEBUG */ } @@ -1712,7 +2015,7 @@ read_overview( } else { art->from = hash_str(""); #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "%s(%"T_ARTNUM_PFMT") empty overview-field %s", nntp_caps.over_cmd, artnum, ofmt[count].name); #endif /* DEBUG */ } @@ -1722,7 +2025,7 @@ read_overview( if (!strcasecmp(ofmt[count].name, "Date:")) { art->date = parsedate(ptr, (TIMEINFO *) 0); #ifdef DEBUG - if ((debug & DEBUG_NNTP) && art->date == (time_t) -1) + if ((debug & DEBUG_NNTP) && verbose > 1 && art->date == (time_t) -1) debug_print_file("NNTP", "%s(%"T_ARTNUM_PFMT") bogus overview-field %s %s", nntp_caps.over_cmd, artnum, ofmt[count].name, ptr); #endif /* DEBUG */ continue; @@ -1735,7 +2038,7 @@ read_overview( } else { art->msgid = NULL; #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "%s(%"T_ARTNUM_PFMT") empty overview-field %s", nntp_caps.over_cmd, artnum, ofmt[count].name); #endif /* DEBUG */ } @@ -1750,13 +2053,31 @@ read_overview( art->refs = NULL; continue; } + + /* + * non std. fields when doing + * expensive overview parsing (very + * rare, just happens if RFC 3977 + * 8.4.2 is violated) go here + */ + /* for Path:-filter */ + if (!strcasecmp(ofmt[count].name, "Path:")) { + if (!path_found) + path_found = TRUE; + if (*ptr) { + FreeIfNeeded(art->path); /* if field is listed more than once in overview.fmt */ + art->path = my_strdup(ptr); + } else + art->path = NULL; + continue; + } } /* metadata fields */ if (ofmt[count].type == OVER_T_INT) { if (!strcasecmp(ofmt[count].name, "Bytes:")) { if (*ptr) { #ifdef DEBUG - if ((debug & DEBUG_NNTP) && !isdigit((unsigned char) *ptr)) + if ((debug & DEBUG_NNTP) && verbose > 1 && !isdigit((unsigned char) *ptr)) debug_print_file("NNTP", "%s(%"T_ARTNUM_PFMT") overview field %d (%s) mismatch: %s", nntp_caps.over_cmd, artnum, count, ofmt[count].name, ptr); #endif /* DEBUG */ } @@ -1770,7 +2091,7 @@ read_overview( else { art->line_count = 0; #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "%s(%"T_ARTNUM_PFMT") overview field %d (%s) mismatch: %s", nntp_caps.over_cmd, artnum, count, ofmt[count].name, ptr); #endif /* DEBUG */ } @@ -1787,7 +2108,7 @@ read_overview( else { art->subject = hash_str(""); #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "%s(%"T_ARTNUM_PFMT") empty overview-field %s", nntp_caps.over_cmd, artnum, ofmt[count].name); #endif /* DEBUG */ } @@ -1802,7 +2123,7 @@ read_overview( } else { art->from = hash_str(""); #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "%s(%"T_ARTNUM_PFMT") empty overview-field %s", nntp_caps.over_cmd, artnum, ofmt[count].name); #endif /* DEBUG */ } @@ -1811,7 +2132,7 @@ read_overview( case 3: /* Date: */ art->date = parsedate(ptr, (TIMEINFO *) 0); #ifdef DEBUG - if ((debug & DEBUG_NNTP) && art->date == (time_t) -1) + if ((debug & DEBUG_NNTP) && verbose > 1 && art->date == (time_t) -1) debug_print_file("NNTP", "%s(%"T_ARTNUM_PFMT") bogus overview-field %s %s", nntp_caps.over_cmd, artnum, ofmt[count].name, ptr); #endif /* DEBUG */ break; @@ -1822,7 +2143,7 @@ read_overview( else { art->msgid = NULL; #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "%s(%"T_ARTNUM_PFMT") empty overview-field %s", nntp_caps.over_cmd, artnum, ofmt[count].name); #endif /* DEBUG */ } @@ -1838,7 +2159,7 @@ read_overview( case 6: /* :bytes || Bytes: */ if (*ptr) { #ifdef DEBUG - if ((debug & DEBUG_NNTP) && !isdigit((unsigned char) *ptr)) + if ((debug & DEBUG_NNTP) && verbose > 1 && !isdigit((unsigned char) *ptr)) debug_print_file("NNTP", "%s(%"T_ARTNUM_PFMT") overview field %d (%s) mismatch: %s", nntp_caps.over_cmd, artnum, count, ofmt[count].name, ptr); #endif /* DEBUG */ } @@ -1851,7 +2172,7 @@ read_overview( else { art->line_count = 0; #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "%s(%"T_ARTNUM_PFMT") overview field %d (%s) mismatch: %s", nntp_caps.over_cmd, artnum, count, ofmt[count].name, ptr); #endif /* DEBUG */ } @@ -1874,21 +2195,39 @@ read_overview( } #ifdef DEBUG else { - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "%s(%"T_ARTNUM_PFMT") bogus overview-field %s %s", nntp_caps.over_cmd, artnum, ofmt[count].name, ptr); } #endif /* DEBUG */ continue; } -#if 0 /* code example for hadnling addition overview fields */ - if (!strcasecmp(ofmt[count].name, "Path:")) { + /* + * handling of addition overview fields + * goes here + */ +#ifdef DEBUG + if ((debug & DEBUG_NNTP) && verbose > 1) + debug_print_file("NNTP", "%s(%"T_ARTNUM_PFMT") extra overview-field \"%s\" at position %d %s", nntp_caps.over_cmd, artnum, ofmt[count].name, count, ptr); +#endif /* DEBUG */ + /* if we're lucky we've Path in NOV */ + /* + * if reading locally cached overview data try + * path regardless of the server OVERVIEW.FMT + */ + if (local || !strcasecmp(ofmt[count].name, "Path:")) { + if ((q = parse_header(ptr, "Path", FALSE, FALSE, FALSE)) != NULL) { + if (!path_found) + path_found = TRUE; + FreeIfNeeded(art->path); + art->path = my_strdup(q); #ifdef DEBUG - if (debug & DEBUG_NNTP) - debug_print_file("NNTP", "%s(%"T_ARTNUM_PFMT") extra overview-field \"%s\" at position %d %s", nntp_caps.over_cmd, artnum, ofmt[count].name, count, ptr); + if ((debug & DEBUG_NNTP) && verbose > 1 && strcasecmp(ofmt[count].name, "Path:")) + debug_print_file("NNTP", "\tUsing as \"Path:\" not \"%s\"", ofmt[count].name); #endif /* DEBUG */ + + } continue; } -#endif /* 0 */ } continue; } @@ -1902,7 +2241,7 @@ read_overview( if (!art->msgid && group->type == GROUP_TYPE_NEWS) continue; - /* we might loose accuracy here, but that shouldn't hurt */ + /* we might lose accuracy here, but that shouldn't hurt */ if (artnum % MODULO_COUNT_NUM == 0) show_progress(group_msg, artnum - min, max - min); @@ -1918,35 +2257,48 @@ read_overview( #if defined(NNTP_ABLE) && defined(XHDR_XREF) if (read_news_via_nntp && !read_saved_news && !xref_supported && nntp_caps.hdr_cmd) { char cbuf[HEADER_LEN]; + int i; static t_bool found; static t_bool first = TRUE; if (first) { found = TRUE; /* - * TODO: do once at start and cache full result - * if "LIST HEADERS RANGE" failed try "LIST HEADERS"? + * TODO: if "LIST HEADERS RANGE" failed try "LIST HEADERS"? */ if (nntp_caps.type == CAPABILITIES && nntp_caps.list_headers) { - int i = new_nntp_command("LIST HEADERS RANGE", 215, cbuf, sizeof(cbuf)); + if (!*nntp_caps.headers_range) { + i = new_nntp_command("LIST HEADERS RANGE", 215, cbuf, sizeof(cbuf)); - found = FALSE; - switch (i) { - case 215: - while ((ptr = tin_fgets(FAKE_NNTP_FP, FALSE)) != NULL) { + found = FALSE; + switch (i) { + case 215: + while ((ptr = tin_fgets(FAKE_NNTP_FP, FALSE)) != NULL) { # ifdef DEBUG - if (debug & DEBUG_NNTP) - debug_print_file("NNTP", "<<<%s%s", logtime(), ptr); + if (debug & DEBUG_NNTP) + debug_print_file("NNTP", "<<<%s%s", logtime(), ptr); # endif /* DEBUG */ - if (!found && ((*ptr == ':' && *(ptr + 1) == '\0') || !strncasecmp(ptr, "Xref", 4))) - found = TRUE; - } - break; + if (!found && ((*ptr == ':' && *(ptr + 1) == '\0') || !strncasecmp(ptr, "Xref", 4))) + found = TRUE; + nntp_caps.headers_range = my_realloc(nntp_caps.headers_range, strlen(nntp_caps.headers_range) + strlen(ptr) + 2); + strcat(nntp_caps.headers_range, ptr); + strcat(nntp_caps.headers_range, "\n"); + } + break; - default: - break; + default: + break; + } + first = FALSE; + } else { + found = FALSE; + if (nntp_caps.headers_range && (ptr = strtok(nntp_caps.headers_range, "\n" )) != NULL) { + do { + if ((*ptr == ':' && *(ptr + 1) == '\0') || !strncasecmp(ptr, "Xref", 4)) + found = TRUE; + } while (!found && *ptr && (ptr = strtok(NULL, "\n")) != NULL); + } } - first = FALSE; } } @@ -1955,6 +2307,11 @@ read_overview( group_msg = fmt_string("%s XREF loop", nntp_caps.hdr_cmd); /* TODO: find a better message, move to lang.c */ if ((fp = nntp_command(cbuf, nntp_caps.hdr ? OK_HDR : OK_HEAD, NULL, 0)) != NULL) { /* RFC 2980 (XHDR) uses 221; RFC 3977 (HDR) uses 225 */ while ((ptr = tin_fgets(fp, FALSE)) != NULL) { +# ifdef DEBUG + if ((debug & DEBUG_NNTP) && verbose) + debug_print_file("NNTP", "<<<%s%s", logtime(), ptr); +# endif /* DEBUG */ + artnum = atoartnum(ptr); if (artnum <= 0 || artnum < group->xmin || artnum > group->xmax) continue; @@ -1971,7 +2328,7 @@ read_overview( *q = '\0'; art->xref = my_strdup(ptr); } - /* we might loose accuracy here, but that shouldn't hurt */ + /* we might lose accuracy here, but that shouldn't hurt */ if (artnum % MODULO_COUNT_NUM == 0) show_progress(group_msg, artnum - min, max - min); } @@ -1981,6 +2338,53 @@ read_overview( } #endif /* NNTP_ABLE && XHDR_XREF */ + if (local) { +#ifdef NNTP_ABLE + if (filter_on_path(group)) { + struct t_article_range *ranges, *curr; + t_bool supported = TRUE; + int curr_range, range_cnt; + + /* + * Get the ranges without Path: header and try to fetch the + * headers + */ + if ((ranges = build_range_list(min, *top, &range_cnt))) { + curr = ranges; + curr_range = 1; + while (curr && supported) { + if (curr->cnt) + supported = get_path_header(curr_range++, range_cnt, group, curr->start, curr->end); + curr = curr->next; + } + if (!supported && path_in_ofmt) { + /* + * fetching Path: headers via [X]HDR or XPAT has failed + * Path: is in the servers overview so let the next + * read_overview() fetch them + */ + free_art_array(); + free_msgids(); + top_art = 0; + *top = T_ARTNUM_CONST(0); + expired = 0; + } + *rebuild_cache = TRUE; + while (ranges) { + curr = ranges; + ranges = curr->next; + free(curr); + } + } + } +#endif /* NNTP_ABLE */ + } else + if (!path_found && filter_on_path(group)) { +#ifdef NNTP_ABLE + if (!get_path_header(1, 1, group, min, *top)) +#endif /* NNTP_ABLE */ + wait_message(2, _(txt_cannot_filter_on_path)); + } return expired; } @@ -2003,10 +2407,10 @@ read_overview( * the data (from/subject) in the original charset (we don't store * that info). this has the advantage that we can avoid raw 8bit data * in our overviews, but the disadvantage that we might store the data - * with a wrong charset and thus lose information. a simmiliar problem + * with a wrong charset and thus lose information. a similar problem * exists with the data for the from:-line, we don't store it in the * original format, whenever our from-parser (partially) fails we'll - * lose information in our overviews (but those couldn't be handeled + * lose information in our overviews (but those couldn't be handled * by tin anyway, so this is not a real problem). * long-term solution: store the original data in the overview * (tin has to handle raw 8bit data and other ugly stuff in the @@ -2072,7 +2476,7 @@ write_overview( * here and in print_from() in the CHARSET_CONVERSION case. * note that this requires something like * buffer_to_network(article->subject, "UTF-8"); - * right bfore the rfc1522_encode() call. + * right before the rfc1522_encode() call. * * if we would cache the original undecoded data, we could * ignore stuff like this. @@ -2124,6 +2528,9 @@ write_overview( if (article->xref) fprintf(fp, "\tXref: %s", article->xref); + if (article->path) + fprintf(fp, "\tPath: %s", article->path); + fprintf(fp, "\n"); free(p); if (article->refs) { diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/attrib.c tin-2.4.3/src/attrib.c --- tin-2.4.2/src/attrib.c 2017-12-08 08:54:35.000000000 +0100 +++ tin-2.4.3/src/attrib.c 2018-11-23 16:32:14.915448964 +0100 @@ -3,10 +3,10 @@ * Module : attrib.c * Author : I. Lea * Created : 1993-12-01 - * Updated : 2017-08-02 + * Updated : 2017-08-06 * Notes : Group attribute routines * - * Copyright (c) 1993-2018 Iain Lea + * Copyright (c) 1993-2019 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -321,6 +321,10 @@ read_attributes_file( if ((fp = fopen(file, "r")) != NULL) { scope[0] = '\0'; + /* + * TODO: use tin_fgets() instead to handle long lines + * (e.g. buggy translation) + */ while (fgets(line, (int) sizeof(line), fp) != NULL) { if (line[0] == '\n') continue; @@ -590,8 +594,14 @@ read_attributes_file( if (found) found = FALSE; - else + else { + /* TODO: even without DEBUG? */ error_message(1, _(txt_bad_attrib), line); +#ifdef DEBUG + if (debug & (DEBUG_ATTRIB)) + debug_print_file("ATTRIBUTES", txt_bad_attrib, line); +#endif /* DEBUG */ + } } fclose(fp); @@ -1338,7 +1348,7 @@ write_attributes_file( /* * determine the file offset - * this is nesessary because a changed locale setting + * this is necessary because a changed locale setting * may lead to an invalid offset */ if ((fpos = ftell(fp)) <= 0) { diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/auth.c tin-2.4.3/src/auth.c --- tin-2.4.2/src/auth.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/auth.c 2018-11-23 16:32:14.939449937 +0100 @@ -3,11 +3,11 @@ * Module : auth.c * Author : Dirk Nimmich * Created : 1997-04-05 - * Updated : 2017-10-18 + * Updated : 2018-06-04 * Notes : Routines to authenticate to a news server via NNTP. * DON'T USE get_respcode() THROUGHOUT THIS CODE. * - * Copyright (c) 1997-2018 Dirk Nimmich + * Copyright (c) 1997-2019 Dirk Nimmich * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -97,7 +97,7 @@ read_newsauth_file( if (S_ISREG(statbuf.st_mode) && (statbuf.st_mode|S_IRUSR|S_IWUSR) != (S_IRUSR|S_IWUSR|S_IFREG)) { error_message(4, _(txt_error_insecure_permissions), filename, statbuf.st_mode); /* - * TODO: fix permssions? + * TODO: fix permissions? * fchmod(fd, S_IRUSR|S_IWUSR); */ } @@ -135,7 +135,7 @@ read_newsauth_file( if ((ptr != NULL) && (ptr > _authpass)) { _authpass++; *ptr++ = '\0'; /* cut off trailing " */ - } else /* no matching ", proceede as normal */ + } else /* no matching ", proceed as normal */ ptr = _authpass; } @@ -145,7 +145,7 @@ read_newsauth_file( if (ptr != NULL) { /* a 3rd argument follows */ while (*ptr == ' ' || *ptr == '\t') /* skip any blanks */ *ptr++ = '\0'; - if (*ptr != '\0') /* if its not just empty */ + if (*ptr != '\0') /* if it is not just empty */ strcpy(authuser, ptr); /* so will replace default user */ } strcpy(authpass, _authpass); @@ -176,7 +176,7 @@ do_authinfo_user( snprintf(line, sizeof(line), "AUTHINFO USER %s", authuser); # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "authorization %s", line); # endif /* DEBUG */ put_server(line); @@ -185,7 +185,7 @@ do_authinfo_user( if ((authpass == NULL) || (*authpass == '\0')) { # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose >1) debug_print_file("NNTP", "authorization failed: no password"); # endif /* DEBUG */ error_message(2, _(txt_auth_failed_nopass), server); @@ -194,7 +194,7 @@ do_authinfo_user( snprintf(line, sizeof(line), "AUTHINFO PASS %s", authpass); # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "authorization %s", line); # endif /* DEBUG */ put_server(line); @@ -209,7 +209,7 @@ do_authinfo_user( * NNTP user authorization. Returns TRUE if authorization succeeded, * FALSE if not. * - * tries AUTHINFO SASL PLAIN (if available) fist and if not succcessfull + * tries AUTHINFO SASL PLAIN (if available) fist and if not successful * AUTHINFO USER/PASS * * If username/passwd already given, and server wasn't changed, retry those. @@ -290,7 +290,7 @@ authinfo_plain( if (ret == OK_AUTH) { # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "authorization succeeded"); # endif /* DEBUG */ initialized = TRUE; @@ -299,7 +299,7 @@ authinfo_plain( } # ifdef DEBUG else { - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "read_newsauth_file(\"%s\", \"%s\", \"%s\") failed", server, authuser, authpass); } # endif /* DEBUG */ @@ -334,7 +334,7 @@ authinfo_plain( # endif /* USE_CURSES */ if (!prompt_default_string(_(txt_auth_user), authuser, sizeof(authusername) - 1, authusername, HIST_NONE)) { # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "authorization failed: no username"); # endif /* DEBUG */ return FALSE; @@ -388,12 +388,12 @@ authinfo_plain( /* * TODO: * nntp_caps.type == CAPABILITIES && nntp_caps.authinfo_state - * can we change the sate here? and if so how? SARTTLS? MODE + * can we change the state here? and if so how? SARTTLS? MODE * READER? */ # ifdef DEBUG - if (debug & DEBUG_NNTP) - debug_print_file("NNTP", "authorization not allowed in current sate"); + if ((debug & DEBUG_NNTP) && verbose > 1) + debug_print_file("NNTP", "authorization not allowed in current state"); # endif /* DEBUG */ /* * we return OK_AUTH here once so tin doesn't exit just because a @@ -405,7 +405,7 @@ authinfo_plain( } # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "authorization %s", (ret == OK_AUTH ? "succeeded" : "failed")); # endif /* DEBUG */ @@ -426,7 +426,24 @@ authenticate( char *user, t_bool startup) { - return authinfo_plain(server, user, startup); + char line[NNTP_STRLEN]; + t_bool ret; + + ret = authinfo_plain(server, user, startup); + + if (ret && nntp_caps.type == CAPABILITIES) { + /* resend CAPABILITIES, but "manually" to avoid AUTH loop */ + snprintf(line, sizeof(line), "%s", "CAPABILITIES"); +# ifdef DEBUG + if ((debug & DEBUG_NNTP) && verbose > 1) + debug_print_file("NNTP", "authenticate(%s)", line); +# endif /* DEBUG */ + put_server(line); + + check_extensions(get_only_respcode(line, sizeof(line))); + } + + return ret; } @@ -487,7 +504,7 @@ do_authinfo_sasl_plain( # endif /* CHARSET_CONVERSION */ # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "do_authinfo_sasl_plain(\"%s\", \"%s\")", BlankIfNull(authuser), BlankIfNull(authpass)); # endif /* DEBUG */ @@ -503,7 +520,7 @@ do_authinfo_sasl_plain( snprintf(line, sizeof(line), "AUTHINFO SASL PLAIN %s", foo); FreeIfNeeded(foo); # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "authorization %s", line); # endif /* DEBUG */ put_server(line); diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/charset.c tin-2.4.3/src/charset.c --- tin-2.4.2/src/charset.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/charset.c 2018-11-23 16:32:14.967451071 +0100 @@ -6,7 +6,7 @@ * Updated : 2017-10-18 * Notes : ISO to ascii charset conversion routines * - * Copyright (c) 1993-2018 Markus Kuhn + * Copyright (c) 1993-2019 Markus Kuhn * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/color.c tin-2.4.3/src/color.c --- tin-2.4.2/src/color.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/color.c 2018-11-23 16:32:14.991452043 +0100 @@ -11,7 +11,7 @@ * Notes : This are the basic function for ansi-color * and word highlighting * - * Copyright (c) 1995-2018 Roland Rosenfeld + * Copyright (c) 1995-2019 Roland Rosenfeld * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/config.c tin-2.4.3/src/config.c --- tin-2.4.2/src/config.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/config.c 2018-11-23 16:32:15.019453177 +0100 @@ -3,10 +3,10 @@ * Module : config.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2017-08-23 + * Updated : 2018-11-22 * Notes : Configuration file routines * - * Copyright (c) 1991-2018 Iain Lea + * Copyright (c) 1991-2019 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1631,15 +1631,11 @@ match_string( char *dst, size_t dstlen) { - char *ptr; size_t patlen = strlen(pat); - if (STRNCMPEQ(line, pat, patlen) && (strlen(line) > patlen /* + 1 */)) { - if (dst != NULL && dstlen >= 1) { - strncpy(dst, &line[patlen], dstlen); - if ((ptr = strrchr(dst, '\n')) != NULL) - *ptr = '\0'; - } + if (STRNCMPEQ(line, pat, patlen) && (strlen(line) > patlen)) { + if (dst != NULL && dstlen >= 1) + my_strncpy(dst, &line[patlen], dstlen - 1); return TRUE; } return FALSE; @@ -1658,13 +1654,14 @@ match_item( char *nline = my_strdup(line); size_t patlen = strlen(pat); - nline[strlen(nline) - 1] = '\0'; /* remove tailing \n */ + if ((ptr = strchr(nline, '\n')) != NULL) /* terminate on \n */ + *ptr = '\0'; if (!strcasecmp(nline, pat)) { - strncpy(dst, &nline[patlen], dstlen); - if ((ptr = strrchr(dst, '\n')) != NULL) - *ptr = '\0'; - + if (dst != NULL) { + strncpy(dst, &nline[patlen], dstlen); + dst[dstlen ? (dstlen - 1) : 0] = '\0'; + } free(nline); return TRUE; } @@ -1779,7 +1776,7 @@ static t_bool rc_update( FILE *fp) { - char buf[1024]; + char buf[LEN]; int show_info = 1; t_bool auto_bcc = FALSE; t_bool auto_cc = FALSE; @@ -2022,7 +2019,7 @@ static t_bool rc_post_update( FILE *fp) { - char buf[1024]; + char buf[LEN]; int groupname_max_length = 0; if (!fp) @@ -2126,8 +2123,8 @@ read_server_config( joinpath(local_newsgroups_file, sizeof(local_newsgroups_file), serverdir, NEWSGROUPS_FILE); if ((fp = fopen(file, "r")) == NULL) return; - while (NULL != (line = tin_fgets(fp, FALSE))) { - if (('#' == *line) || ('\0' == *line)) + while ((line = tin_fgets(fp, FALSE)) != NULL) { + if ((*line == '#') || (*line == '\0')) continue; if (match_string(line, "last_newnews=", newnews_info, sizeof(newnews_info))) { @@ -2140,12 +2137,9 @@ read_server_config( continue; } if (match_string(line, "version=", NULL, 0)) { - if (RC_CHECK != upgrade) - /* ignore duplicate version lines; last match counts */ + if (upgrade != RC_CHECK) /* ignore duplicate version lines; last match counts */ continue; - upgrade = check_upgrade(line, "version=", SERVERCONFIG_VERSION); - if (RC_IGNORE == upgrade) - /* Expected version number; nothing to do -> continue */ + if ((upgrade = check_upgrade(line, "version=", SERVERCONFIG_VERSION)) == RC_IGNORE) /* Expected version number; nothing to do -> continue */ continue; /* Nothing to do yet for RC_UPGRADE and RC_DOWNGRADE */ @@ -2185,8 +2179,8 @@ write_server_config( if ((no_write || post_article_and_exit || post_postponed_and_exit) && file_size(file) != -1L) return; - if (-1 == stat(serverdir, &statbuf)) { - if (-1 == my_mkdir(serverdir, (mode_t) (S_IRWXU))) + if (stat(serverdir, &statbuf) == -1) { + if (my_mkdir(serverdir, (mode_t) (S_IRWXU)) == -1) /* Can't create directory TODO: Add error handling */ return; } diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/cook.c tin-2.4.3/src/cook.c --- tin-2.4.2/src/cook.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/cook.c 2018-11-23 16:32:15.043454149 +0100 @@ -3,10 +3,10 @@ * Module : cook.c * Author : J. Faultless * Created : 2000-03-08 - * Updated : 2016-02-28 + * Updated : 2018-11-22 * Notes : Split from page.c * - * Copyright (c) 2000-2018 Jason Faultless + * Copyright (c) 2000-2019 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -457,7 +457,7 @@ process_text_body_part( /* * FIXME: Some code in cook.c expects a '\n' at the end * of the line. As tin_fgets() strips trailing '\n', re-add it. - * This should problably be fixed in that other code. + * This should probably be fixed in that other code. */ strcat(line, "\n"); @@ -491,7 +491,7 @@ process_text_body_part( len_blank = 1; tmpline = line; /* check if line contains only whitespace */ - while ((' ' == *tmpline) || ('\t' == *tmpline)) { + while ((*tmpline == ' ') || (*tmpline == '\t')) { len_blank++; tmpline++; } @@ -836,7 +836,7 @@ cook_article( static const char *struct_header[] = { "Approved: ", "From: ", "Originator: ", "Reply-To: ", "Sender: ", "X-Cancelled-By: ", "X-Comment-To: ", - "X-Submissions-To: ", "To: ", "Cc: ", "Bcc: ", "X-Originator: ", 0 }; + "X-Submissions-To: ", "To: ", "Cc: ", "Bcc: ", "X-Originator: ", NULL }; art = artinfo; /* Global saves lots of passing artinfo around */ diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/debug.c tin-2.4.3/src/debug.c --- tin-2.4.2/src/debug.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/debug.c 2018-11-23 16:32:15.091456094 +0100 @@ -3,10 +3,10 @@ * Module : debug.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2016-02-26 + * Updated : 2018-07-03 * Notes : debug routines * - * Copyright (c) 1991-2018 Iain Lea + * Copyright (c) 1991-2019 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -45,7 +45,7 @@ # endif /* !NEWSRC_H */ #endif /* DEBUG */ -int debug; +unsigned short debug; #ifdef DEBUG /* @@ -208,7 +208,7 @@ debug_print_attributes( struct t_attribute *attr, FILE *fp) { - if (attr == 0) + if (attr == NULL) return; fprintf(fp, "global=[%u] show=[%u] thread=[%u] sort=[%u] author=[%u] auto_select=[%u] auto_save=[%u] batch_save=[%u] process=[%u]\n", @@ -341,6 +341,7 @@ debug_print_file( va_start(ap, fmt); buf = fmt_message(fmt, ap); + va_end(ap); joinpath(file, sizeof(file), TMPDIR, fname); @@ -350,7 +351,6 @@ debug_print_file( fclose(fp); } free(buf); - va_end(ap); } diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/envarg.c tin-2.4.3/src/envarg.c --- tin-2.4.2/src/envarg.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/envarg.c 2018-11-23 16:32:15.115457065 +0100 @@ -6,7 +6,7 @@ * Updated : 1993-03-10 * Notes : Adds default options from environment to command line * - * Copyright (c) 1991-2018 Bill Davidson + * Copyright (c) 1991-2019 Bill Davidson * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/feed.c tin-2.4.3/src/feed.c --- tin-2.4.2/src/feed.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/feed.c 2018-11-23 16:32:15.143458200 +0100 @@ -3,10 +3,10 @@ * Module : feed.c * Author : I. Lea * Created : 1991-08-31 - * Updated : 2017-03-28 + * Updated : 2018-11-22 * Notes : provides same interface to mail,pipe,print,save & repost commands * - * Copyright (c) 1991-2018 Iain Lea + * Copyright (c) 1991-2019 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -627,7 +627,7 @@ feed_articles( switch (function) { /* Setup mail - get address to mail to */ case FEED_MAIL: - prompt = fmt_string(_(txt_mail_art_to), cCOLS - (strlen(_(txt_mail_art_to)) + 30), tinrc.default_mail_address); + prompt = fmt_string(_(txt_mail_art_to), cCOLS - (strwidth(_(txt_mail_art_to)) > cCOLS - 30 ? cCOLS - 30 : strwidth(_(txt_mail_art_to)) + 30), tinrc.default_mail_address); if (!(prompt_string_default(prompt, tinrc.default_mail_address, _(txt_no_mail_address), HIST_MAIL_ADDRESS))) { free(prompt); return -1; @@ -638,7 +638,7 @@ feed_articles( #ifndef DONT_HAVE_PIPING /* Setup pipe - get pipe-to command and open the pipe */ case FEED_PIPE: - prompt = fmt_string(_(txt_pipe_to_command), cCOLS - (strlen(_(txt_pipe_to_command)) + 30), tinrc.default_pipe_command); + prompt = fmt_string(_(txt_pipe_to_command), cCOLS - (strwidth(_(txt_pipe_to_command)) > cCOLS - 30 ? cCOLS - 30 : strwidth(_(txt_pipe_to_command)) + 30), tinrc.default_pipe_command); if (!(prompt_string_default(prompt, tinrc.default_pipe_command, _(txt_no_command), HIST_PIPE_COMMAND))) { free(prompt); return -1; @@ -899,7 +899,7 @@ feed_articles( * Invoke post-processing if needed * Work out what (if anything) needs to be redrawn */ - if (INTERACTIVE_NONE == tinrc.interactive_mailer) + if (tinrc.interactive_mailer == INTERACTIVE_NONE) redraw_screen |= mail_check(); /* in case of sending to oneself */ switch (function) { @@ -1004,7 +1004,7 @@ got_epipe_while_piping: */ switch (function) { case FEED_MAIL: - if (INTERACTIVE_NONE != tinrc.interactive_mailer) + if (tinrc.interactive_mailer != INTERACTIVE_NONE) info_message(_(txt_external_mail_done)); else info_message(_(txt_articles_mailed), counter.success, PLURAL(counter.success, txt_article)); @@ -1064,6 +1064,7 @@ print_file( t_bool ok; # ifdef DONT_HAVE_PIPING char cmd[PATH_LEN], file[PATH_LEN]; + int i; # endif /* DONT_HAVE_PIPING */ # ifdef DONT_HAVE_PIPING @@ -1095,11 +1096,14 @@ print_file( # ifdef DONT_HAVE_PIPING fclose(fp); - strncpy(cmd, command, sizeof(cmd) - 2); - strcat(cmd, " "); - strncat(cmd, file, sizeof(cmd) - strlen(cmd) - 1); - cmd[sizeof(cmd) - 1] = '\0'; - invoke_cmd(cmd); + i = snprintf(cmd, sizeof(cmd), "%s %s", command, file); + if (i > 0 && i < (int) sizeof(cmd)) + invoke_cmd(cmd); + else { + perror_message(_(txt_command_failed), cmd); + unlink(file); + return FALSE; + } unlink(file); # else fflush(fp); diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/filter.c tin-2.4.3/src/filter.c --- tin-2.4.2/src/filter.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/filter.c 2018-11-23 16:32:15.167459171 +0100 @@ -3,10 +3,10 @@ * Module : filter.c * Author : I. Lea * Created : 1992-12-28 - * Updated : 2017-03-28 + * Updated : 2018-02-11 * Notes : Filter articles. Kill & auto selection are supported. * - * Copyright (c) 1991-2018 Iain Lea + * Copyright (c) 1991-2019 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -254,6 +254,7 @@ set_filter( ptr->gnksa_num = 0; ptr->score = 0; ptr->xref = NULL; + ptr->path = NULL; ptr->time = (time_t) 0; ptr->next = (struct t_filter *) 0; } @@ -273,6 +274,7 @@ free_filter_item( FreeAndNull(ptr->from); FreeAndNull(ptr->msgid); FreeAndNull(ptr->xref); + FreeAndNull(ptr->path); } @@ -313,6 +315,7 @@ read_filter_file( char buffer[HEADER_LEN]; char gnksa[HEADER_LEN]; char xref[HEADER_LEN]; + char path[HEADER_LEN]; char scbuf[PATH_LEN]; int i = 0; int icase = 0; @@ -411,6 +414,7 @@ read_filter_file( msgid[0] = '\0'; buffer[0] = '\0'; xref[0] = '\0'; + path[0] = '\0'; icase = 0; secs = 0L; break; @@ -495,6 +499,23 @@ read_filter_file( } break; + case 'p': + if (match_string(buf + 1, "ath=", path, sizeof(path))) { + str_trim(path); + if (ptr && !expired_time) { + if (tinrc.wildcard && ptr[i].path != NULL) { + /* merge with already read value */ + ptr[i].path = my_realloc(ptr[i].path, strlen(ptr[i].path) + strlen(path) + 2); + strcat(ptr[i].path, "|"); + strcat(ptr[i].path, path); + } else { + FreeIfNeeded(ptr[i].path); + ptr[i].path = my_strdup(path); + } + } + } + break; + case 'r': if (match_string(buf + 1, "efs_only=", msgid, sizeof(msgid))) { if (ptr && !expired_time) { @@ -583,7 +604,7 @@ read_filter_file( case 'x': /* - * TODO: fromat has changed in FILTER_VERSION 1.0.0, + * TODO: format 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))) { @@ -840,6 +861,9 @@ write_filter_array( if (ptr->filter[i].xref != NULL) fprintf(fp, "xref=%s\n", ptr->filter[i].xref); + if (ptr->filter[i].path != NULL) + fprintf(fp, "path=%s\n", ptr->filter[i].path); + if (ptr->filter[i].time) { char timestring[25]; if (my_strftime(timestring, sizeof(timestring) - 1, "%Y-%m-%d %H:%M:%S UTC", gmtime(&(ptr->filter[i].time)))) @@ -909,7 +933,7 @@ get_choice( default: break; } - } while (ch != '\n' && ch != '\r' && ch != iKeyAbort); /* TODO: replace hardcoded keynames */ + } while (ch != '\n' && ch != '\r' && ch != iKeyAbort); /* TODO: replace hard coded keynames */ if (ch == iKeyAbort) return -1; @@ -1641,6 +1665,7 @@ add_filter_rule( ptr[i].gnksa_num = 0; ptr[i].score = rule->score; ptr[i].xref = NULL; + ptr[i].path = NULL; if (rule->comment != NULL) ptr[i].comment = copy_filter_comment(rule->comment, ptr[i].comment); @@ -1797,7 +1822,7 @@ unfilter_articles( * Filter any articles in specified group. * Apply global filter rules followed by group filter rules. * In global rules check if scope field set to determine if - * filter applys to current group. + * filter applies to current group. */ t_bool filter_articles( @@ -1811,6 +1836,7 @@ filter_articles( struct regex_cache *regex_cache_from = NULL; struct regex_cache *regex_cache_msgid = NULL; struct regex_cache *regex_cache_xref = NULL; + struct regex_cache *regex_cache_path = NULL; t_bool filtered = FALSE; t_bool error = FALSE; @@ -1845,6 +1871,7 @@ filter_articles( regex_cache_from = my_malloc(msiz); regex_cache_msgid = my_malloc(msiz); regex_cache_xref = my_malloc(msiz); + regex_cache_path = my_malloc(msiz); for (j = 0; j < num; j++) { regex_cache_subj[j].re = NULL; regex_cache_subj[j].extra = NULL; @@ -1854,6 +1881,8 @@ filter_articles( regex_cache_msgid[j].extra = NULL; regex_cache_xref[j].re = NULL; regex_cache_xref[j].extra = NULL; + regex_cache_path[j].re = NULL; + regex_cache_path[j].extra = NULL; } } @@ -2105,6 +2134,26 @@ filter_articles( free(k); } } + + /* + * Filter on Path: lines + */ + if (arts[i].path && *arts[i].path) { + if (ptr[j].path != NULL) { + switch (test_regex(arts[i].path, ptr[j].path, ptr[j].icase, ®ex_cache_path[j])) { + case 1: + SET_FILTER(group, i, j); + break; + + case -1: + error = TRUE; + break; + + default: + break; + } + } + } } } } @@ -2122,11 +2171,14 @@ filter_articles( FreeIfNeeded(regex_cache_msgid[j].extra); FreeIfNeeded(regex_cache_xref[j].re); FreeIfNeeded(regex_cache_xref[j].extra); + FreeIfNeeded(regex_cache_path[j].re); + FreeIfNeeded(regex_cache_path[j].extra); } free(regex_cache_subj); free(regex_cache_from); free(regex_cache_msgid); free(regex_cache_xref); + free(regex_cache_path); } /* @@ -2156,6 +2208,33 @@ filter_articles( } +/* + * Check if we have to filter on Path: for the given group + */ +t_bool +filter_on_path( + struct t_group *group) +{ + int i; + struct t_filter *flt; + t_bool ret = FALSE; + + if (group->glob_filter->num == 0) + return ret; + + if (set_filter_scope(group)) { + flt = group->glob_filter->filter; + for (i = 0; i < group->glob_filter->num; i++) { + if (flt[i].inscope && flt[i].path) { + ret = TRUE; + break; + } + } + } + return ret; +} + + static int set_filter_scope( struct t_group *group) diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/getline.c tin-2.4.3/src/getline.c --- tin-2.4.2/src/getline.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/getline.c 2018-11-23 16:32:15.195460305 +0100 @@ -3,7 +3,7 @@ * Module : getline.c * Author : Chris Thewalt & Iain Lea * Created : 1991-11-09 - * Updated : 2013-11-15 + * Updated : 2018-02-06 * 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 @@ -92,6 +92,7 @@ tin_getline( int which_hist) { int c, i, loc, tmp, gl_max; + char *tprompt; #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) wint_t wc; #else @@ -106,10 +107,12 @@ tin_getline( if (prompt == NULL) prompt = ""; + tprompt = strunc(prompt, cCOLS - 6); + gl_buf[0] = 0; /* used as end of input indicator */ gl_fixup(-1, 0); /* this resets gl_fixup */ - gl_width = cCOLS - strlen(prompt); - gl_prompt = prompt; + gl_width = cCOLS - MIN(cCOLS - 6, strwidth(tprompt)); + gl_prompt = tprompt; gl_pos = gl_cnt = 0; if (max_chars == 0) { @@ -120,7 +123,7 @@ tin_getline( } else gl_max = max_chars; - my_fputs(prompt, stdout); + my_fputs(tprompt, stdout); cursoron(); my_flush(); @@ -228,6 +231,7 @@ tin_getline( default: input_context = cNone; + free(tprompt); return NULL; } break; @@ -239,6 +243,7 @@ tin_getline( wcstombs(buf, gl_buf, BUF_SIZE - 1); #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ input_context = cNone; + free(tprompt); return buf; case CTRL_A: @@ -257,6 +262,7 @@ tin_getline( wcstombs(buf, gl_buf, BUF_SIZE - 1); #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ input_context = cNone; + free(tprompt); return buf; } else gl_del(0); @@ -318,6 +324,7 @@ tin_getline( wcstombs(buf, gl_buf, BUF_SIZE - 1); #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ input_context = cNone; + free(tprompt); return buf; } diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/global.c tin-2.4.3/src/global.c --- tin-2.4.2/src/global.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/global.c 2018-11-23 16:32:15.219461277 +0100 @@ -4,9 +4,9 @@ * Author : Jason Faultless * Created : 1999-12-12 * Updated : 2005-10-19 - * Notes : Generic nagivation and key handling routines + * Notes : Generic navigation and key handling routines * - * Copyright (c) 1999-2018 Jason Faultless + * Copyright (c) 1999-2019 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/group.c tin-2.4.3/src/group.c --- tin-2.4.2/src/group.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/group.c 2018-11-23 16:32:15.243462249 +0100 @@ -3,10 +3,10 @@ * Module : group.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2017-09-18 + * Updated : 2017-10-24 * Notes : * - * Copyright (c) 1991-2018 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2019 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -620,7 +620,7 @@ group_page( * This loop looks for any article in the thread that * isn't already tagged. */ - for (ii = n; ii != -1 && tagged; ii = arts[ii].thread) { + for (ii = n; ii != -1; ii = arts[ii].thread) { if (arts[ii].tagged == 0) { tagged = FALSE; break; @@ -1666,7 +1666,7 @@ prompt_getart_limit( t_bool ret = FALSE; clear_message(); - if ((p = tin_getline(_(txt_enter_getart_limit), 2, 0, 0, FALSE, HIST_OTHER)) != NULL) { + if ((p = tin_getline(_(txt_enter_getart_limit), 2, NULL, 0, FALSE, HIST_OTHER)) != NULL) { tinrc.getart_limit = atoi(p); ret = TRUE; } diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/hashstr.c tin-2.4.3/src/hashstr.c --- tin-2.4.2/src/hashstr.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/hashstr.c 2018-11-23 16:32:15.271463384 +0100 @@ -6,7 +6,7 @@ * Updated : 2003-09-19 * Notes : * - * Copyright (c) 1991-2018 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2019 Iain Lea , Rich Skrenta * All rights reserved. * diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/header.c tin-2.4.3/src/header.c --- tin-2.4.2/src/header.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/header.c 2018-11-23 16:32:15.295464355 +0100 @@ -3,9 +3,9 @@ * Module : header.c * Author : Urs Janssen * Created : 1997-03-10 - * Updated : 2016-07-29 + * Updated : 2018-11-23 * - * Copyright (c) 1997-2018 Urs Janssen + * Copyright (c) 1997-2019 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -151,7 +151,7 @@ get_fqdn( } # ifdef HAVE_INET_ADDR - if ('0' <= *name && *name <= '9') { + if (*name >= '0' && *name <= '9') { in_addr_t addr = inet_addr(name); if ((hp = gethostbyaddr((char *) &addr, 4, AF_INET))) diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/heapsort.c tin-2.4.3/src/heapsort.c --- tin-2.4.2/src/heapsort.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/heapsort.c 2018-11-23 16:32:15.319465328 +0100 @@ -94,12 +94,12 @@ * Select the top of the heap and 'heapify'. Since by far the most expensive * action is the call to the compar function, a considerable optimization * in the average case can be achieved due to the fact that k, the displaced - * elememt, is usually quite small, so it would be preferable to first + * element, is usually quite small, so it would be preferable to first * heapify, always maintaining the invariant that the larger child is copied * over its parent's record. * * Then, starting from the *bottom* of the heap, finding k's correct place, - * again maintianing the invariant. As a result of the invariant no element + * again maintaining the invariant. As a result of the invariant no element * is 'lost' when k is assigned its correct place in the heap. * * The time savings from this optimization are on the order of 15-20% for the diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/help.c tin-2.4.3/src/help.c --- tin-2.4.2/src/help.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/help.c 2018-11-23 16:32:15.343466299 +0100 @@ -3,10 +3,10 @@ * Module : help.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2017-03-28 + * Updated : 2018-02-02 * Notes : * - * Copyright (c) 1991-2018 Iain Lea + * Copyright (c) 1991-2019 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -671,11 +671,10 @@ make_help_page( if (keys.list[i].function == helppage->func && keys.list[i].key) { buf = my_realloc(buf, LEN); snprintf(buf, LEN, "%s\t %s", printascii(key, keys.list[i].key), _(helppage->helptext)); - buf[LEN - 1] = '\0'; expand_ctrl_chars(&buf, &length, 8); if (strcmp(last, buf)) { fprintf(fp, "%s\n", buf); - strncpy(last, buf, LEN); + strncpy(last, buf, LEN - 1); } } } diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/inews.c tin-2.4.3/src/inews.c --- tin-2.4.2/src/inews.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/inews.c 2018-11-23 16:32:15.367467272 +0100 @@ -3,10 +3,10 @@ * Module : inews.c * Author : I. Lea * Created : 1992-03-17 - * Updated : 2017-08-13 + * Updated : 2018-11-22 * Notes : NNTP built in version of inews * - * Copyright (c) 1991-2018 Iain Lea + * Copyright (c) 1991-2019 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -398,14 +398,14 @@ submit_news_file( rfc15211522_encode(name, txt_mime_encodings[(group ? group->attribute->post_mime_encoding : tinrc.post_mime_encoding)], group, (group ? group->attribute->post_8bit_header : tinrc.post_8bit_header), ismail); #ifdef NNTP_INEWS - if (read_news_via_nntp && !read_saved_news && 0 == strcasecmp(tinrc.inews_prog, INTERNAL_CMD)) + if (read_news_via_nntp && !read_saved_news && !strcasecmp(tinrc.inews_prog, INTERNAL_CMD)) ret_code = submit_inews(name, group, a_message_id); else #endif /* NNTP_INEWS */ { #ifdef M_UNIX /* use tinrc.inews_prog or 'inewsdir/inews -h' 'inews -h' */ - if (0 != strcasecmp(tinrc.inews_prog, INTERNAL_CMD)) + if (strcasecmp(tinrc.inews_prog, INTERNAL_CMD)) STRCPY(buf, tinrc.inews_prog); else { if (*inewsdir) @@ -422,7 +422,7 @@ submit_news_file( ret_code = invoke_cmd(buf); #ifdef NNTP_INEWS - if (!ret_code && read_news_via_nntp && !read_saved_news && 0 != strcasecmp(tinrc.inews_prog, INTERNAL_CMD)) { + if (!ret_code && read_news_via_nntp && !read_saved_news && strcasecmp(tinrc.inews_prog, INTERNAL_CMD)) { if (prompt_yn(_(txt_post_via_builtin_inews), TRUE)) { ret_code = submit_inews(name, group, a_message_id); if (ret_code) { @@ -481,7 +481,7 @@ sender_needed( from_at_pos = strchr(from_addr, '@'); if ((sender_at_pos = strchr(sender_addr, '@'))) sender_dot_pos = strchr(sender_at_pos, '.'); - else /* this case is catched by the gnksa_do_check_from() code above; anyway ... */ + else /* this case is caught by the gnksa_do_check_from() code above; anyway ... */ return -2; if (from_at_pos == NULL || sender_dot_pos == NULL) /* as we build From and check Sender above this shouldn't happen at all */ diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/init.c tin-2.4.3/src/init.c --- tin-2.4.2/src/init.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/init.c 2018-11-23 16:32:15.391468243 +0100 @@ -3,10 +3,10 @@ * Module : init.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2017-08-13 + * Updated : 2018-02-15 * Notes : * - * Copyright (c) 1991-2018 Iain Lea + * Copyright (c) 1991-2019 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -147,7 +147,7 @@ t_bool read_local_newsgroups_file; /* re t_bool read_news_via_nntp = FALSE; /* read news locally or via NNTP */ t_bool read_saved_news = FALSE; /* tin -R read saved news from tin -S */ t_bool show_description = TRUE; /* current copy of tinrc flag */ -t_bool verbose = FALSE; /* update index files only mode */ +int verbose = 0; /* batch or debug mode */ t_bool word_highlight; /* word highlighting on/off */ t_bool xref_supported = TRUE; #ifdef HAVE_COLOR @@ -528,6 +528,8 @@ struct t_capabilities nntp_caps = { FALSE, /* LIST: "LIST ACTIVE.TIMES" */ FALSE, /* LIST: "LIST DISTRIB.PATS" */ FALSE, /* LIST: "LIST HEADERS" */ + NULL, /* list of headers by range */ + NULL, /* list of headers by id */ FALSE, /* LIST: "LIST NEWSGROUPS" */ FALSE, /* LIST: "LIST OVERVIEW.FMT" */ FALSE, /* LIST: "LIST MOTD" */ @@ -1028,7 +1030,7 @@ postinit_regexp( * try to be clever, if we still use the initial default value * convert it to our needs * - * TODO: a global soultion + * TODO: a global solution */ #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) if (IS_LOCAL_CHARSET("UTF-8") && utf8_pcre()) { diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/joinpath.c tin-2.4.3/src/joinpath.c --- tin-2.4.2/src/joinpath.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/joinpath.c 2018-11-23 16:32:15.415469216 +0100 @@ -6,7 +6,7 @@ * Updated : 2008-12-04 * Notes : * - * Copyright (c) 1997-2018 Thomas Dickey + * Copyright (c) 1997-2019 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/keymap.c tin-2.4.3/src/keymap.c --- tin-2.4.2/src/keymap.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/keymap.c 2018-11-23 16:32:15.443470350 +0100 @@ -3,10 +3,10 @@ * Module : keymap.c * Author : D. Nimmich, J. Faultless * Created : 2000-05-25 - * Updated : 2017-03-28 + * Updated : 2018-01-30 * Notes : This file contains key mapping routines and variables. * - * Copyright (c) 2000-2018 Dirk Nimmich + * Copyright (c) 2000-2019 Dirk Nimmich * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -274,7 +274,7 @@ printascii( #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ { if (ch == 0) - strcpy(buf, _("NULL")); + snprintf(buf, MAXKEYLEN, "%s", _("NULL")); #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) else if (iswgraph(ch)) { /* Regular printables */ int i = wctomb(buf, ch); @@ -291,11 +291,11 @@ printascii( } #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ else if (ch == '\t') { /* TAB */ - strcpy(buf, _(txt_tab)); + snprintf(buf, MAXKEYLEN, "%s", _(txt_tab)); } else if ((ch == '\n') || (ch == '\r')) { /* LF, CR */ - strcpy(buf, _(txt_cr)); + snprintf(buf, MAXKEYLEN, "%s", _(txt_cr)); } else if (ch == ESC) { /* Escape */ - strcpy(buf, _(txt_esc)); + snprintf(buf, MAXKEYLEN, "%s", _(txt_esc)); #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) } else if (iswcntrl(ch)) { /* Control keys */ #else @@ -305,7 +305,7 @@ printascii( buf[1] = ((int) ch & 0xFF) + '@'; buf[2] = '\0'; } else if (ch == ' ') /* SPACE */ - strcpy(buf, _(txt_space)); + snprintf(buf, MAXKEYLEN, "%s", _(txt_space)); else strcpy(buf, "???"); /* Never happens? */ @@ -335,7 +335,7 @@ read_keymap_file( * * locale is first match from LC_ALL, LC_CTYPE, LC_MESSAGES, LANG * - * TODO: LC_CTYPE has higgher priority than LC_MESSAGES, does this make sense? + * TODO: LC_CTYPE has higher priority than LC_MESSAGES, does this make sense? */ /* get locale suffix */ map = my_strdup(get_val("LC_ALL", get_val("LC_CTYPE", get_val("LC_MESSAGES", get_val("LANG", ""))))); diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/lang.c tin-2.4.3/src/lang.c --- tin-2.4.2/src/lang.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/lang.c 2018-11-23 16:32:15.471471484 +0100 @@ -3,10 +3,10 @@ * Module : lang.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2017-08-13 + * Updated : 2018-11-22 * Notes : * - * Copyright (c) 1991-2018 Iain Lea + * Copyright (c) 1991-2019 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -104,7 +104,6 @@ constext txt_autosubscribed[] = N_("\nAu constext txt_autosubscribing_groups[] = N_("Autosubscribing groups...\n"); constext txt_autoselecting_articles[] = N_("Autoselecting articles (use '%s' to see all unread) ..."); -constext txt_bad_active_file[] = N_("Active file corrupt - %s"); constext txt_bad_article[] = N_("Article to be posted resulted in errors/warnings. %s=quit, %s=Menu, %s=edit: "); constext txt_bad_attrib[] = N_("Unrecognized attribute: %s"); constext txt_bad_command[] = N_("Bad command. Type '%s' for help."); @@ -119,6 +118,7 @@ constext txt_cancel_article[] = N_("Canc constext txt_cancelling_art[] = N_("Cancelling article..."); constext txt_cannot_create_uniq_name[] = "Can't create unique tempfile-name"; constext txt_cannot_create[] = N_("Cannot create %s"); +constext txt_cannot_filter_on_path[] = "Can't filter on Path"; #ifdef DEBUG constext txt_cannot_find_base_art[] = N_("Can't find base article %d"); #endif /* DEBUG */ @@ -238,9 +238,6 @@ constext txt_error_header_line_not_7bit[ constext txt_error_header_line_space[] = N_("\nError: Header on line %d does not have a space after the colon:\n%s\n"); constext txt_error_header_duplicate[] = N_("\nError: There are multiple (%d) \"%s:\" lines in the header.\n"); constext txt_error_insecure_permissions[] = N_("Insecure permissions of %s (%o)"); -#ifdef NNTP_ABLE - constext txt_error_invalid_response_to_group[] = N_("Invalid response to GROUP command, %s"); -#endif /* NNTP_ABLE */ #if defined(HAVE_SETLOCALE) && !defined(NO_LOCALE) constext txt_error_locale[] = "Can't set the specified locale!"; #endif /* HAVE_SETLOCALE && !NO_LOCALE */ @@ -297,6 +294,9 @@ constext txt_filter_file[] = N_("# Forma # lines=[<>]?NUM Optional. Lines: line. '<' or '>' are optional.\n\ # gnksa=[<>]?NUM Optional. GNKSA parse_from() return code. '<' or '>' opt.\n\ # xref=PATTERN Optional. Kill pattern (e.g. alt.flame*)\n\ +# path=PATTERN Optional. Kill pattern (e.g. news.example.org)\n\ +# Be aware that filtering on Path: may significantly slow\n\ +# down the process.\n\ # time=NUM Optional. time_t value when rule expires\n#\n"); constext txt_filter_score[] = N_("Enter score for rule (default=%d): "); constext txt_filter_score_help[] = N_("Enter the score weight (range 0 < score <= %d)"); /* SCORE_MAX */ @@ -543,14 +543,14 @@ constext txt_info_not_multipart_message[ constext txt_info_not_subscribed[] = N_("You are not subscribed to this group"); constext txt_info_no_previous_expression[] = N_("No previous expression"); constext txt_info_no_write[] = N_("Operation disabled in no-overwrite mode"); -/* TODO: replace hardcoded key-name in txt_info_postponed */ +/* TODO: replace hard coded key-name in txt_info_postponed */ constext txt_info_postponed[] = N_("%d postponed %s, reuse with ^O...\n"); constext txt_info_x_conversion_note[] = N_("X-Conversion-Note: multipart/alternative contents have been removed.\n\ To get the whole article, turn alternative handling OFF in the Option Menu\n"); constext txt_is_mailbox[] = N_("Save filename for %s/%s is a mailbox. Attachment not saved"); constext txt_is_tex_encoded[] = N_("TeX2Iso encoded article"); constext txt_incomplete[] = N_("incomplete "); -/* TODO: replace hardcoded key-names */ +/* TODO: replace hard coded key-names */ constext txt_intro_page[] = N_("\nWelcome to %s, a full screen threaded Netnews reader. It can read news locally\n\ (ie. /news) or remotely (-r option) from a NNTP (Network News Transport\n\ Protocol) server. -h lists the available command line options.\n\n\ @@ -584,7 +584,7 @@ constext txt_keymap_upgraded[] = N_("Key constext txt_kill_from[] = N_("Kill From: [%s] (y/n): "); constext txt_kill_lines[] = N_("Kill Lines: (num): "); constext txt_kill_menu[] = N_("Kill Article Menu"); -constext txt_kill_msgid[] = N_("Kill Msg-Id: [%s] (f/l/o/n): "); +constext txt_kill_msgid[] = N_("Kill Msg-ID: [%s] (f/l/o/n): "); constext txt_kill_scope[] = N_("Kill pattern scope : "); constext txt_kill_subj[] = N_("Kill Subject: [%s] (y/n): "); constext txt_kill_text[] = N_("Kill text pattern : "); @@ -712,7 +712,7 @@ constext txt_pcre_error_at[] = N_("Error constext txt_pcre_error_num[] = N_("Error in regex: pcre internal error %d"); constext txt_pcre_error_text[] = N_("Error in regex: study - pcre internal error %s"); constext txt_post_a_followup[] = N_("Post a followup..."); -/* TODO: replace hardcoded key-name in txt_post_error_ask_postpone */ +/* TODO: replace hard coded key-name in txt_post_error_ask_postpone */ constext txt_post_error_ask_postpone[] = N_("An error has occurred while posting the article. If you think that this\n\ error is temporary or otherwise correctable, you can postpone the article\n\ and pick it up again with ^O later.\n"); @@ -727,6 +727,9 @@ constext txt_postpone_repost[] = N_("Pos constext txt_prefix_hot[] = N_("Hot %s"); constext txt_prefix_tagged[] = N_("Tagged %s"); constext txt_prefix_untagged[] = N_("Untagged %s"); +#ifdef NNTP_ABLE + constext txt_prep_for_filter_on_path[] = N_("Preparing for filtering on Path header (%d/%d)..."); +#endif /* NNTP_ABLE */ constext txt_processing_mail_arts[] = N_("Processing mail messages marked for deletion."); constext txt_processing_saved_arts[] = N_("Processing saved articles marked for deletion."); constext txt_prompt_fup_ignore[] = N_("Accept Followup-To? %s=post, %s=ignore, %s=quit: "); @@ -781,7 +784,7 @@ constext txt_return_key[] = N_("Press num): "); constext txt_select_menu[] = N_("Auto-select Article Menu"); -constext txt_select_msgid[] = N_("Select Msg-Id [%s] (f/l/o/n): "); +constext txt_select_msgid[] = N_("Select Msg-ID [%s] (f/l/o/n): "); constext txt_select_scope[] = N_("Select pattern scope: "); constext txt_select_subj[] = N_("Select Subject [%s] (y/n): "); constext txt_select_text[] = N_("Select text pattern : "); @@ -899,9 +902,6 @@ constext txt_unsubscribed_to[] = N_("Uns constext txt_unsubscribing[] = N_("Unsubscribing... "); constext txt_unthreading_arts[] = N_("Unthreading articles..."); constext txt_updated[] = N_("Updated"); -#ifdef NNTP_ABLE - constext txt_unparseable_counts[] = N_("unparseable \"LIST COUNTS\" line: \"%s\""); -#endif /* NNTP_ABLE */ constext txt_updating[] = N_("Updating"); constext txt_url_menu[] = N_("URL Menu"); constext txt_url_menu_com[] = N_("URL Menu Commands"); @@ -936,6 +936,7 @@ constext txt_usage_verbose[] = N_(" -v constext txt_usage_version[] = N_(" -V print version & date information"); constext txt_useful_without_batch_mode[] = N_("%s only useful without batch mode operations\n"); constext txt_useful_with_batch_mode[] = N_("%s only useful for batch mode operations\n"); +constext txt_useful_with_batch_or_debug_mode[] = N_("%s only useful for batch or debug mode operations\n"); constext txt_useless_combination[] = N_("Useless combination %s and %s. Ignoring %s.\n"); constext txt_value_out_of_range[] = N_("\n%s%d out of range (0 - %d). Reset to 0"); @@ -1096,7 +1097,7 @@ Warning: Posting is in %s and contains c #endif /* HAVE_PGP_GPG */ #ifdef M_UNIX - constext txt_copyright_notice[] = "%s (c) Copyright 1991-2018 Iain Lea."; + constext txt_copyright_notice[] = "%s (c) Copyright 1991-2019 Iain Lea."; #endif /* M_UNIX */ #ifdef NNTP_ABLE @@ -1104,8 +1105,7 @@ Warning: Posting is in %s and contains c constext txt_caching_on[] = N_("Tin will use local index files instead.\n"); constext txt_cannot_get_nntp_server_name[] = N_("Cannot find NNTP server name"); constext txt_connecting_port[] = N_("Connecting to %s:%u..."); - constext txt_disconnecting[] = N_("Disconnecting from server...\n"); - constext txt_error_wrong_newsgroupname_in_group_response[] = N_("Wrong newsgroup name (\"%s\") in response of \"GROUP %s\" command: \"%s\""); + constext txt_disconnecting[] = N_("Disconnecting from server..."); constext txt_failed_to_connect_to_server[] = N_("Failed to connect to NNTP server %s. Exiting..."); constext txt_nntp_ok_goodbye[] = N_("205 Closing connection"); constext txt_no_xover_support[] = N_("Your server does not support the NNTP XOVER or OVER command.\n"); @@ -1168,7 +1168,7 @@ Tin will try to use XHDR XREF instead (s constext txt_piping_not_enabled[] = N_("Piping not enabled."); #endif /* !DONT_HAVE_PIPING */ -#ifndef FOLLOW_USEFOR_DRAFT +#ifndef ALLOW_FWS_IN_NEWSGROUPLIST constext txt_error_header_line_comma[] = N_("\n\ Error: The \"%s:\" line has spaces in it that MUST be removed.\n\ The only allowable space is the one separating the colon (:)\n\ @@ -1185,7 +1185,7 @@ Warning: The \"%s:\" line is continued i To avoid trouble please write all newsgroups into a single line.\n"); constext txt_warn_header_line_comma[] = N_("\n\ Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n"); -#endif /* !FOLLOW_USEFOR_DRAFT */ +#endif /* !ALLOW_FWS_IN_NEWSGROUPLIST */ #ifndef NO_ETIQUETTE constext txt_warn_posting_etiquette[] = N_("\n\ @@ -1576,6 +1576,9 @@ constext *txt_normalization_forms[] = { N_("NFKD"), N_("NFC"), N_("NFD"), +# ifdef HAVE_UNICODE_UNORM2_H + N_("NFKC case fold"), +# endif /* HAVE_UNICODE_UNORM2_H */ # endif /* HAVE_UNICODE_NORMALIZATION >= 2 */ NULL }; @@ -2045,7 +2048,7 @@ struct opttxt txt_metamail_prog = { 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\ +# Otherwise specify an external viewer program (eg. metamail) or leave blank\n\ # for no automatic viewing\n") }; @@ -2865,6 +2868,10 @@ struct opttxt txt_date_format = { N_("# Format string for date representation\n") }; +/* + * TODO: needs different text for HAVE_UNICODE_NORMALIZATION < 2 and/or + * !HAVE_UNICODE_UNORM2_H + */ #ifdef HAVE_UNICODE_NORMALIZATION struct opttxt txt_normalization_form = { N_(" toggles, sets, cancels."), @@ -2875,7 +2882,8 @@ struct opttxt txt_normalization_form = { # 1 = NFKC\n\ # 2 = NFKD\n\ # 3 = NFC\n\ -# 4 = NFD\n") +# 4 = NFD\n\ +# 5 = NFKC_CF\n") }; #endif /* HAVE_UNICODE_NORMALIZATION */ diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/list.c tin-2.4.3/src/list.c --- tin-2.4.2/src/list.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/list.c 2018-11-23 16:32:15.523473590 +0100 @@ -3,10 +3,10 @@ * Module : list.c * Author : I. Lea * Created : 1993-12-18 - * Updated : 2008-11-28 + * Updated : 2018-11-22 * Notes : Low level functions handling the active[] list and its group_hash index * - * Copyright (c) 1993-2018 Iain Lea + * Copyright (c) 1993-2019 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -154,7 +154,7 @@ find_group_index( if (ignore_case) { i = group_hash[h]; while (i >= 0) { - if (0 == strcasecmp(group, active[i].name)) + if (!strcasecmp(group, active[i].name)) return i; i = active[i].next; } diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/lock.c tin-2.4.3/src/lock.c --- tin-2.4.2/src/lock.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/lock.c 2018-11-23 16:32:15.547474562 +0100 @@ -6,7 +6,7 @@ * Updated : 2013-11-17 * Notes : * - * Copyright (c) 1998-2018 Urs Janssen + * Copyright (c) 1998-2019 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/mail.c tin-2.4.3/src/mail.c --- tin-2.4.2/src/mail.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/mail.c 2018-11-23 16:32:15.571475534 +0100 @@ -3,10 +3,10 @@ * Module : mail.c * Author : I. Lea * Created : 1992-10-02 - * Updated : 2016-07-29 + * Updated : 2018-02-15 * Notes : Mail handling routines for creating pseudo newsgroups * - * Copyright (c) 1992-2018 Iain Lea + * Copyright (c) 1992-2019 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -90,7 +90,7 @@ read_mail_active_file( void) { FILE *fp; - char buf[LEN]; + char *buf; char my_spooldir[PATH_LEN]; char buf2[PATH_LEN]; t_artnum min, max; @@ -115,7 +115,7 @@ read_mail_active_file( return; } - while (fgets(buf, (int) sizeof(buf), fp) != NULL) { + while ((buf = tin_fgets(fp, FALSE))) { if (!parse_active_line(buf, &max, &min, my_spooldir) || *buf == '\0') continue; @@ -276,7 +276,7 @@ open_newsgroups_fp( struct stat buf; # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "open_newsgroups_fp Using local copy of newsgroups file"); # endif /* DEBUG */ if (!fstat(fileno(result), &buf)) { @@ -338,7 +338,7 @@ open_newsgroups_fp( } while ((ptr = tin_fgets(FAKE_NNTP_FP, FALSE)) != NULL) { # ifdef DEBUG - if (debug & DEBUG_NNTP) + if (debug & DEBUG_NNTP && verbose) debug_print_file("NNTP", "<<<%s%s", logtime(), ptr); # endif /* DEBUG */ fprintf(result, "%s\n", str_trim(ptr)); @@ -364,7 +364,7 @@ open_newsgroups_fp( } while ((ptr = tin_fgets(FAKE_NNTP_FP, FALSE)) != NULL) { # ifdef DEBUG - if (debug & DEBUG_NNTP) + if (debug & DEBUG_NNTP && verbose) debug_print_file("NNTP", "<<<%s%s", logtime(), ptr); # endif /* DEBUG */ fprintf(result, "%s\n", str_trim(ptr)); @@ -384,7 +384,7 @@ open_newsgroups_fp( if (result != NULL) { if (!no_more_wildmat) return result; - else /* AUTH request while pipeling or some error */ + else /* AUTH request while pipelining or some error */ fclose(result); } } @@ -462,6 +462,10 @@ read_groups_descriptions( struct t_group *group; while ((ptr = tin_fgets(fp, FALSE)) != NULL) { +#ifdef DEBUG + if ((debug & DEBUG_NNTP) && fp == FAKE_NNTP_FP && verbose) + debug_print_file("NNTP", "<<<%s%s", logtime(), ptr); +#endif /* DEBUG */ if (*ptr == '#' || *ptr == '\0') continue; diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/main.c tin-2.4.3/src/main.c --- tin-2.4.2/src/main.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/main.c 2018-11-23 16:32:15.595476506 +0100 @@ -3,10 +3,10 @@ * Module : main.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2017-02-22 + * Updated : 2018-02-15 * Notes : * - * Copyright (c) 1991-2018 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2019 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -146,6 +146,15 @@ main( init_group_hash(); /* + * Set cCOLS temporarily to trim (localized) messages + * It does not matter if this value is greater than the actual + * terminal size + * + * cCOLS will be set later to the real terminal width + */ + cCOLS = 80; + + /* * Process envargs & command line options * These override the configured in values */ @@ -311,7 +320,7 @@ main( tin_done(EXIT_SUCCESS, NULL); } - /* TODO: replace hardcoded key-name in txt_info_postponed */ + /* TODO: replace hard coded key-name in txt_info_postponed */ if ((count = count_postponed_articles())) wait_message(3, _(txt_info_postponed), count, PLURAL(count, txt_article)); @@ -375,7 +384,7 @@ main( * or * Save any new articles to savedir structure for later reading * - * TODO: should we temporarely set + * TODO: should we temporarily set * getart_limit=-1,thread_articles=0,sort_article_type=0 * for speed reasons? */ @@ -518,7 +527,7 @@ read_cmd_line_options( case 'D': /* debug mode */ #ifdef DEBUG - debug = atoi(optarg); + debug = atoi(optarg) & 0xff; debug_delete_files(); #else error_message(2, _(txt_option_not_enabled), "-DDEBUG"); @@ -665,8 +674,8 @@ read_cmd_line_options( update_index = TRUE; break; - case 'v': /* verbose mode */ - verbose = TRUE; + case 'v': /* verbose mode, can be used multiple times */ + verbose++; break; case 'V': @@ -745,10 +754,6 @@ read_cmd_line_options( * Sort out option conflicts */ if (!batch_mode) { - if (verbose) { - wait_message(2, _(txt_useful_with_batch_mode), "-v"); - verbose = FALSE; - } if (catchup) { wait_message(2, _(txt_useful_with_batch_mode), "-c"); catchup = FALSE; @@ -759,6 +764,12 @@ read_cmd_line_options( read_saved_news = FALSE; } } + if (!(batch_mode || debug)) { + if (verbose) { + wait_message(2, _(txt_useful_with_batch_or_debug_mode), "-v"); + verbose = FALSE; + } + } if (post_postponed_and_exit && force_no_post) { wait_message(2, _(txt_useless_combination), "-o", "-x", "-x"); force_no_post = FALSE; diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/makecfg.c tin-2.4.3/src/makecfg.c --- tin-2.4.2/src/makecfg.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/makecfg.c 2018-11-23 16:32:15.623477640 +0100 @@ -6,7 +6,7 @@ * Updated : 2016-11-18 * Notes : #defines and structs for options_menu.c * - * Copyright (c) 1997-2018 Thomas E. Dickey + * Copyright (c) 1997-2019 Thomas E. Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/memory.c tin-2.4.3/src/memory.c --- tin-2.4.2/src/memory.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/memory.c 2018-11-23 16:32:15.647478612 +0100 @@ -3,10 +3,10 @@ * Module : memory.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2016-08-06 + * Updated : 2018-07-02 * Notes : * - * Copyright (c) 1991-2018 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2019 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -62,7 +62,7 @@ int *my_group; /* .newsrc --> active[ t_artnum *base; /* base articles for each thread */ struct t_group *active; /* active newsgroups */ struct t_scope *scopes = NULL; /* attributes stores in .tin/attributes */ -struct t_newnews *newnews; /* active file sizes on differnet servers */ +struct t_newnews *newnews; /* active file sizes on different servers */ struct t_article *arts; /* articles headers in current group */ struct t_save *save; /* sorts articles before saving them */ @@ -137,7 +137,7 @@ expand_art( max_art += max_art >> 1; /* increase by 50% */ arts = my_realloc(arts, sizeof(*arts) * max_art); for (; i < max_art; i++) /* use memset() instead? */ - arts[i].subject = arts[i].from = arts[i].xref = arts[i].refs = arts[i].msgid = NULL; + arts[i].subject = arts[i].from = arts[i].xref = arts[i].path = arts[i].refs = arts[i].msgid = NULL; } @@ -300,6 +300,8 @@ free_all_arrays( FreeAndNull(newnews); } + FreeAndNull(nntp_caps.headers_range); + FreeAndNull(nntp_caps.headers_id); FreeAndNull(nntp_caps.implementation); if (ofmt) { /* ofmt might not be allocated yet on early abort */ @@ -310,6 +312,7 @@ free_all_arrays( } tin_fgets(NULL, FALSE); + rfc1522_decode(NULL); free(tin_progname); } @@ -325,6 +328,7 @@ free_art_array( arts[i].artnum = T_ARTNUM_CONST(0); arts[i].date = (time_t) 0; FreeAndNull(arts[i].xref); + FreeAndNull(arts[i].path); /* * .refs & .msgid are usually free()d in build_references() @@ -575,7 +579,17 @@ my_realloc1( return NULL; } - p = ((!p) ? (malloc(size)) : realloc(p, size)); + if (p) { + void *q = realloc(p, size); + + if (q != NULL) + p = q; + else { + free(p); + p = NULL; + } + } else + p = malloc(size); if (p == NULL) { error_message(2, txt_out_of_memory, tin_progname, (unsigned long) size, file, line); diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/mimetypes.c tin-2.4.3/src/mimetypes.c --- tin-2.4.2/src/mimetypes.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/mimetypes.c 2018-11-23 16:32:15.671479584 +0100 @@ -6,7 +6,7 @@ * Updated : 2017-03-28 * Notes : mime.types handling * - * Copyright (c) 2000-2018 Jason Faultless + * Copyright (c) 2000-2019 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/misc.c tin-2.4.3/src/misc.c --- tin-2.4.2/src/misc.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/misc.c 2018-11-24 13:48:09.250313803 +0100 @@ -3,10 +3,10 @@ * Module : misc.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2017-09-18 + * Updated : 2018-11-23 * Notes : * - * Copyright (c) 1991-2018 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2019 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -248,7 +248,7 @@ backup_file( * prefix (= quote_chars), initials of the articles author * with_sig is set if the signature should be quoted * - * TODO: rewrite from scratch, the code is awfull + * TODO: rewrite from scratch, the code is awful */ void copy_body( @@ -459,7 +459,7 @@ invoke_ispell( fputs(buf, fp_head); if (buf[0] == '\n' || buf[0] == '\r') { fclose(fp_head); - fp_head = 0; + fp_head = NULL; break; } } @@ -919,7 +919,7 @@ mail_check( mailbox_name = get_val("MAIL", mailbox); - if (mailbox_name != 0 && stat(mailbox_name, &buf) >= 0) { + if (mailbox_name != NULL && stat(mailbox_name, &buf) >= 0) { if ((int) (buf.st_mode & S_IFMT) == (int) S_IFDIR) { /* maildir setup */ char *maildir_box; size_t maildir_box_len = strlen(mailbox_name) + strlen(MAILDIR_NEW) + 2; @@ -1127,7 +1127,7 @@ show_color_status( * Check for lock file to stop multiple copies of tin -u running and if it * does not exist create it so this is the only copy running * - * FIXME: get ridd of hardcoded pid-length as pid_t might be long + * FIXME: get rid of hard coded pid-length as pid_t might be long */ void create_index_lock_file( @@ -1180,7 +1180,7 @@ strfquote( size_t maxsize, char *format) { - char *endp = s + maxsize; + char *endp; char *start = s; char tbuf[LEN]; int i, j; @@ -1192,6 +1192,7 @@ strfquote( if (strchr(format, '%') == NULL && strlen(format) + 1 >= maxsize) return 0; + endp = s + maxsize; for (; *format && s < endp - 1; format++) { tbuf[0] = '\0'; @@ -1339,7 +1340,7 @@ strfeditor( size_t maxsize, char *format) { - char *endp = s + maxsize; + char *endp; char *start = s; char tbuf[PATH_LEN]; int i; @@ -1350,6 +1351,7 @@ strfeditor( if (strchr(format, '%') == NULL && strlen(format) + 1 >= maxsize) return 0; + endp = s + maxsize; for (; *format && s < endp - 1; format++) { tbuf[0] = '\0'; @@ -1493,11 +1495,11 @@ _strfpath( struct t_group *group, t_bool expand_all) { - char *endp = str + maxsize; - const char *startp = format; + char *endp; + char *envptr; char defbuf[PATH_LEN]; char tbuf[PATH_LEN]; - char *envptr; + const char *startp = format; int i; struct passwd *pwd; t_bool is_mailbox = FALSE; @@ -1508,6 +1510,7 @@ _strfpath( if (strlen(format) + 1 >= maxsize) return 0; + endp = str + maxsize; for (; *format && str < endp - 1; format++) { tbuf[0] = '\0'; @@ -1783,7 +1786,7 @@ strfmailer( size_t maxsize, const char *format) { - char *endp = dest + maxsize; + char *endp; char *start = dest; char tbuf[PATH_LEN]; int quote_area = no_quote; @@ -1798,9 +1801,9 @@ strfmailer( /* * TODO: shouldn't we better check for no % OR format > maxsize? - * as no replacemnt doesn't make sense (hardcoded To, Subject - * and filename) and the resulting string usuly is longer after - * replacemnts were done (nobody uses enough %% to make the + * as no replacement doesn't make sense (hard coded To, Subject + * and filename) and the resulting string usually is longer after + * replacements were done (nobody uses enough %% to make the * result shorter than the input). */ if (strchr(format, '%') == NULL && strlen(format) + 1 >= maxsize) @@ -1810,6 +1813,7 @@ strfmailer( * walk through format until end of format or end of available space * and replace place holders */ + endp = dest + maxsize; for (; *format && dest < endp - 1; format++) { tbuf[0] = '\0'; @@ -1893,7 +1897,7 @@ strfmailer( case 'S': /* Subject */ /* don't MIME encode Subject if using external mail client */ - if (INTERACTIVE_NONE != tinrc.interactive_mailer) + if (tinrc.interactive_mailer != INTERACTIVE_NONE) strncpy(tbuf, escape_shell_meta(subject, quote_area), sizeof(tbuf) - 1); else { #ifdef CHARSET_CONVERSION @@ -1910,7 +1914,7 @@ strfmailer( case 'T': /* To */ /* don't MIME encode To if using external mail client */ - if (INTERACTIVE_NONE != tinrc.interactive_mailer) + if (tinrc.interactive_mailer != INTERACTIVE_NONE) strncpy(tbuf, escape_shell_meta(to, quote_area), sizeof(tbuf) - 1); else { #ifdef CHARSET_CONVERSION @@ -1927,7 +1931,7 @@ strfmailer( case 'U': /* User */ /* don't MIME encode User if using external mail client */ - if (INTERACTIVE_NONE != tinrc.interactive_mailer) + if (tinrc.interactive_mailer != INTERACTIVE_NONE) strncpy(tbuf, userid, sizeof(tbuf) - 1); else { #ifdef CHARSET_CONVERSION @@ -3000,7 +3004,7 @@ gnksa_dequote_plainphrase( case '=': *(wpos++) = *(rpos++); - if ('?' == *rpos) { + if (*rpos == '?') { state = 2; *(wpos++) = *(rpos++); } else @@ -3111,7 +3115,7 @@ gnksa_dequote_plainphrase( switch (*rpos) { case '?': *(wpos++) = *(rpos++); - if ('=' == *rpos) { + if (*rpos == '=') { state = initialstate; *(wpos++) = *(rpos++); } else @@ -3139,7 +3143,7 @@ gnksa_dequote_plainphrase( case '=': *(wpos++) = *(rpos++); - if ('?' == *rpos) { + if (*rpos == '?') { state = 2; *(wpos++) = *(rpos++); } else @@ -3180,12 +3184,12 @@ gnksa_check_domain_literal( x1 = x2 = x3 = x4 = 666; term = '\0'; - if ('[' == *domain) { /* literal bracketed */ + if (*domain == '[') { /* literal bracketed */ n = sscanf(domain, "[%u.%u.%u.%u%c", &x1, &x2, &x3, &x4, &term); - if (5 != n) + if (n != 5) return GNKSA_BAD_DOMAIN_LITERAL; - if (']' != term) + if (term != ']') return GNKSA_BAD_DOMAIN_LITERAL; } else { /* literal not bracketed */ @@ -3194,25 +3198,25 @@ gnksa_check_domain_literal( #else n = sscanf(domain, "%u.%u.%u.%u%c", &x1, &x2, &x3, &x4, &term); /* there should be no terminating character present */ - if (4 != n) + if (n != 4) return GNKSA_BAD_DOMAIN_LITERAL; #endif /* REQUIRE_BRACKETS_IN_DOMAIN_LITERAL */ } /* check ip parts for legal range */ - if ((255 < x1) || (255 < x2) || (255 < x3) || (255 < x4)) + if ((x1 > 255) || (x2 > 255) || (x3 > 255) || (x4 > 255)) return GNKSA_BAD_DOMAIN_LITERAL; /* check for private ip or localhost - see RFC 5735, RFC 5737 */ if ((!disable_gnksa_domain_check) - && ((0 == x1) /* local network */ - || (10 == x1) /* private class A */ - || ((172 == x1) && (16 == (x2 & 0xf0))) /* private /12 */ - || ((192 == x1) && (168 == x2)) /* private class B */ - || ((192 == x1) && (0 == x2) && (2 == x3)) /* TEST NET-1 */ - || ((198 == x1) && (51 == x2) && (100 == x3)) /* TEST NET-2 */ - || ((203 == x1) && (0 == x2) && (113 == x3)) /* TEST NET-3 */ - || (127 == x1))) /* loopback */ + && ((x1 == 0) /* local network */ + || (x1 == 10) /* private class A */ + || ((x1 == 172) && ((x2 & 0xf0) == 16)) /* private /12 */ + || ((x1 == 192) && (x2 == 168)) /* private class B */ + || ((x1 == 192) && (x2 == 0) && (x3 == 2)) /* TEST NET-1 */ + || ((x1 == 198) && (x2 == 51) && (x3 == 100)) /* TEST NET-2 */ + || ((x1 == 203) && (x2 == 0) && (x3 == 113)) /* TEST NET-3 */ + || (x1 == 127))) /* loopback */ return GNKSA_LOCAL_DOMAIN_LITERAL; return GNKSA_OK; @@ -3229,16 +3233,15 @@ gnksa_check_domain( int result; /* check for domain literal */ - if ('[' == *domain) /* check value of domain literal */ + if (*domain == '[') /* check value of domain literal */ return gnksa_check_domain_literal(domain); /* check for leading or trailing dot */ - if (('.' == *domain) || ('.' == *(domain + strlen(domain) - 1))) + if ((*domain == '.') || (*(domain + strlen(domain) - 1) == '.')) return GNKSA_ZERO_LENGTH_LABEL; /* look for TLD start */ - aux = strrchr(domain, '.'); - if (NULL == aux) + if ((aux = strrchr(domain, '.')) == NULL) return GNKSA_SINGLE_DOMAIN; aux++; @@ -3247,7 +3250,7 @@ gnksa_check_domain( switch ((int) strlen(aux)) { case 1: /* no numeric components allowed */ - if (('0' <= *aux) && ('9' >= *aux)) + if ((*aux >= '0') && (*aux <= '9')) return gnksa_check_domain_literal(domain); /* single letter TLDs do not exist */ @@ -3257,12 +3260,12 @@ gnksa_check_domain( case 2: /* no numeric components allowed */ - if (('0' <= *aux) && ('9' >= *aux) - && ('0' <= *(aux + 1)) && ('9' >= *(aux + 1))) + if ((*aux >= '0') && (*aux <= '9') + && (*(aux + 1) >= '0') && (*(aux + 1) <= '9')) return gnksa_check_domain_literal(domain); - if (('a' <= *aux) && ('z' >= *aux) - && ('a' <= *(aux + 1)) && ('z' >= *(aux + 1))) { + if ((*aux >= 'a') && (*aux <= 'z') + && (*(aux + 1) >= 'a') && (*(aux + 1) <= 'z')) { i = ((*aux - 'a') * 26) + (*(aux + 1)) - 'a'; if (!gnksa_country_codes[i]) return GNKSA_UNKNOWN_DOMAIN; @@ -3272,9 +3275,9 @@ gnksa_check_domain( case 3: /* no numeric components allowed */ - if (('0' <= *aux) && ('9' >= *aux) - && ('0' <= *(aux + 1)) && ('9' >= *(aux + 1)) - && ('0' <= *(aux + 2)) && ('9' >= *(aux + 2))) + if ((*aux >= '0') && (*aux <= '9') + && (*(aux + 1) >= '0') && (*(aux + 1) <= '9') + && (*(aux + 2) >= '0') && (*(aux + 2) <= '9')) return gnksa_check_domain_literal(domain); /* FALLTHROUGH */ default: @@ -3286,7 +3289,7 @@ gnksa_check_domain( } if (disable_gnksa_domain_check) result = GNKSA_OK; - if (GNKSA_OK != result) + if (result != GNKSA_OK) return result; break; } @@ -3294,18 +3297,18 @@ gnksa_check_domain( /* check for illegal labels */ last = domain; for (aux = domain; *aux; aux++) { - if ('.' == *aux) { + if (*aux == '.') { if (aux - last - 1 > 63) return GNKSA_ILLEGAL_LABEL_LENGTH; - if ('.' == *(aux + 1)) + if (*(aux + 1) == '.') return GNKSA_ZERO_LENGTH_LABEL; - if (('-' == *(aux + 1)) || ('-' == *(aux - 1))) + if ((*(aux + 1) == '-') || (*(aux - 1) == '-')) return GNKSA_ILLEGAL_LABEL_HYPHEN; #ifdef ENFORCE_RFC1034 - if (('0' <= *(aux + 1)) && ('9' >= *(aux + 1))) + if ((*(aux + 1) >= '0') && (*(aux + 1) <= '9')) return GNKSA_ILLEGAL_LABEL_BEGNUM; #endif /* ENFORCE_RFC1034 */ last = aux; @@ -3336,11 +3339,11 @@ gnksa_check_localpart( return GNKSA_LOCALPART_MISSING; /* check for zero-length domain parts */ - if (('.' == *localpart) || ('.' == *(localpart + strlen(localpart) -1))) + if ((*localpart == '.') || (*(localpart + strlen(localpart) - 1) == '.')) return GNKSA_ZERO_LENGTH_LOCAL_WORD; for (aux = localpart; *aux; aux++) { - if (('.' == *aux) && ('.' == *(aux + 1))) + if ((*aux == '.') && (*(aux + 1) == '.')) return GNKSA_ZERO_LENGTH_LOCAL_WORD; } @@ -3378,7 +3381,7 @@ gnksa_split_from( /* skip trailing whitespace */ addr_end = work + strlen(work) - 1; - while (addr_end >= work && (' ' == *addr_end || '\t' == *addr_end)) + while (addr_end >= work && (*addr_end == ' ' || *addr_end == '\t')) addr_end--; if (addr_end < work) { @@ -3389,7 +3392,7 @@ gnksa_split_from( *(addr_end + 1) = '\0'; *(addr_end + 2) = '\0'; - if ('>' == *addr_end) { + if (*addr_end == '>') { /* route-address used */ *addrtype = GNKSA_ADDRTYPE_ROUTE; @@ -3398,7 +3401,7 @@ gnksa_split_from( while (('<' != *addr_begin) && (addr_begin > work)) addr_begin--; - if ('<' != *addr_begin) /* syntax error in mail address */ + if (*addr_begin != '<') /* syntax error in mail address */ return GNKSA_LANGLE_MISSING; /* copy route address */ @@ -3410,10 +3413,10 @@ gnksa_split_from( addr_begin = work; /* strip surrounding whitespace */ - while (addr_end >= work && (' ' == *addr_end || '\t' == *addr_end)) + while (addr_end >= work && (*addr_end == ' '|| *addr_end == '\t')) addr_end--; - while ((' ' == *addr_begin) || ('\t' == *addr_begin)) + while ((*addr_begin == ' ') || (*addr_begin == '\t')) addr_begin++; *++addr_end = '\0'; @@ -3426,12 +3429,12 @@ gnksa_split_from( /* get address part */ /* skip leading whitespace */ addr_begin = work; - while ((' ' == *addr_begin) || ('\t' == *addr_begin)) + while ((*addr_begin == ' ') || (*addr_begin == '\t')) addr_begin++; /* scan forward to next whitespace or null */ addr_end = addr_begin; - while ((' ' != *addr_end) && ('\t' != *addr_end) && (*addr_end)) + while ((*addr_end != ' ') && (*addr_end != '\t') && (*addr_end)) addr_end++; *addr_end = '\0'; @@ -3442,19 +3445,19 @@ gnksa_split_from( addr_begin = addr_end + 1; addr_end = addr_begin + strlen(addr_begin) -1; /* strip surrounding whitespace */ - while ((' ' == *addr_end) || ('\t' == *addr_end)) + while ((*addr_end == ' ') || (*addr_end == '\t')) addr_end--; - while ((' ' == *addr_begin) || ('\t' == *addr_begin)) + while ((*addr_begin == ' ') || (*addr_begin == '\t')) addr_begin++; /* any realname at all? */ if (*addr_begin) { /* check for parentheses */ - if ('(' != *addr_begin) + if (*addr_begin != '(') return GNKSA_LPAREN_MISSING; - if (')' != *addr_end) + if (*addr_end != ')') return GNKSA_RPAREN_MISSING; /* copy realname */ @@ -3464,7 +3467,7 @@ gnksa_split_from( } /* - * if we allow <> as From: we must disallow <> as Mesage-ID, + * if we allow <> as From: we must disallow <> as Message-ID, * see code in post.c:check_article_to_be_posted() */ #if 0 @@ -3502,7 +3505,7 @@ gnksa_do_check_from( /* split from */ code = gnksa_split_from(from, address, realname, &addrtype); - if ('\0' == *address) /* address missing or not extractable */ + if (*address == '\0') /* address missing or not extractable */ return code; #ifdef DEBUG @@ -3513,7 +3516,7 @@ gnksa_do_check_from( /* parse address */ addr_begin = strrchr(address, '@'); - if (NULL != addr_begin) { + if (addr_begin != NULL) { /* temporarily terminate string at separator position */ *addr_begin++ = '\0'; @@ -3525,12 +3528,12 @@ gnksa_do_check_from( /* convert FQDN part to lowercase */ str_lwr(addr_begin); - if (GNKSA_OK != (result = gnksa_check_domain(addr_begin)) - && (GNKSA_OK == code)) /* error detected */ + if ((result = gnksa_check_domain(addr_begin)) != GNKSA_OK + && (code == GNKSA_OK)) /* error detected */ code = result; - if (GNKSA_OK != (result = gnksa_check_localpart(address)) - && (GNKSA_OK == code)) /* error detected */ + if ((result = gnksa_check_localpart(address)) != GNKSA_OK + && (code == GNKSA_OK)) /* error detected */ code = result; /* restore separator character */ @@ -3543,15 +3546,15 @@ gnksa_do_check_from( #endif /* DEBUG */ /* check realname */ - if (GNKSA_OK != (result = gnksa_dequote_plainphrase(realname, decoded, addrtype))) { - if (GNKSA_OK == code) /* error detected */ + if ((result = gnksa_dequote_plainphrase(realname, decoded, addrtype)) != GNKSA_OK) { + if (code == GNKSA_OK) /* error detected */ code = result; } else /* copy dequoted realname to result variable */ strcpy(realname, decoded); #ifdef DEBUG if (debug & DEBUG_MISC) { /* TODO: dump to a file instead of wait_message() */ - if (GNKSA_OK != code) + if (code != GNKSA_OK) wait_message(2, "From:=[%s], GNKSA=[%d]", from, code); else wait_message(0, "GNKSA=[%d]", code); @@ -3610,7 +3613,7 @@ strip_line( #if defined(CHARSET_CONVERSION) || (defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE)) /* - * 'check' a given UTF-8 strig and '?'-out illegal sequences + * 'check' a given UTF-8 string and '?'-out illegal sequences * TODO: is this check complete? * * UTF-8 = ASCII / UTF-8-non-ascii @@ -3757,30 +3760,37 @@ idna_decode( char *in) { char *out = my_strdup(in); + + /* decoding needed? */ + if (!strstr(in, "xn--")) + return out; + #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) /* IDNA 2008 */ # if defined(HAVE_LIBIDNKIT) && defined(HAVE_IDN_DECODENAME) - idn_result_t res; - char *q, *r = NULL; + { + idn_result_t res; + char *q, *r = NULL; - if ((q = strrchr(out, '@'))) { - q++; - r = strrchr(in, '@'); - r++; - } else { - r = in; - q = out; - } - if ((res = idn_decodename(IDN_DECODE_LOOKUP, r, q, out + strlen(out) - q + 1)) == idn_success) - return out; - else { /* IDNA 2008 failed, try again with IDNA 2003 if available */ - free(out); - out = my_strdup(in); - } + if ((q = strrchr(out, '@'))) { + q++; + r = strrchr(in, '@'); + r++; + } else { + r = in; + q = out; + } + if ((res = idn_decodename(IDN_DECODE_LOOKUP, r, q, out + strlen(out) - q + 1)) == idn_success) + return out; + else { /* IDNA 2008 failed, try again with IDNA 2003 if available */ + free(out); + out = my_strdup(in); + } # ifdef DEBUG - if (debug & DEBUG_MISC) - wait_message(2, "idn_decodename(%s): %s", r, idn_result_tostring(res)); + if (debug & DEBUG_MISC) + wait_message(2, "idn_decodename(%s): %s", r, idn_result_tostring(res)); # endif /* DEBUG */ + } # endif /* HAVE_LIBIDNKIT && HAVE_IDN_DECODENAME */ /* IDNA 2003 */ @@ -3826,7 +3836,7 @@ idna_decode( # if defined(HAVE_LIBIDN) && defined(HAVE_IDNA_TO_UNICODE_LZLZ) if (stringprep_check_version("0.3.0")) { char *t, *s = NULL; - int rs = IDNA_SUCCESS; + int rs; if ((t = strrchr(out, '@'))) t++; @@ -4098,11 +4108,11 @@ tin_version_info( #else "-REQUIRE_BRACKETS_IN_DOMAIN_LITERAL " #endif /* REQUIRE_BRACKETS_IN_DOMAIN_LITERAL */ -#ifdef FOLLOW_USEFOR_DRAFT - "+FOLLOW_USEFOR_DRAFT" +#ifdef ALLOW_FWS_IN_NEWSGROUPLIST + "+ALLOW_FWS_IN_NEWSGROUPLIST" #else - "-FOLLOW_USEFOR_DRAFT" -#endif /* FOLLOW_USEFOR_DRAFT */ + "-ALLOW_FWS_IN_NEWSGROUPLIST" +#endif /* ALLOW_FWS_IN_NEWSGROUPLIST */ "\n"); wlines += 11; fflush(fp); diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/my_tmpfile.c tin-2.4.3/src/my_tmpfile.c --- tin-2.4.2/src/my_tmpfile.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/my_tmpfile.c 2018-11-23 16:32:15.723481690 +0100 @@ -6,7 +6,7 @@ * Updated : 2014-05-13 * Notes : * - * Copyright (c) 2001-2018 Urs Janssen + * Copyright (c) 2001-2019 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ /* * my_tmpfile(filename, name_size, base_dir) * - * try to create a uniq tmp-file descriptor + * try to create a unique tmp-file descriptor * * return codes: * >0 = file descriptor of tmpfile diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/newsrc.c tin-2.4.3/src/newsrc.c --- tin-2.4.2/src/newsrc.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/newsrc.c 2018-11-24 13:42:43.565154665 +0100 @@ -3,10 +3,10 @@ * Module : newsrc.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2017-05-23 + * Updated : 2018-11-23 * Notes : ArtCount = (ArtMax - ArtMin) + 1 [could have holes] * - * Copyright (c) 1991-2018 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2019 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -72,7 +72,7 @@ static void print_bitmap_seq(FILE *fp, s * accordingly. Bogus groups will _not_ be subscribed to as a design * principle. * - * Returns the numer of lines read(useful for a check newsrc >= oldnewsrc) + * Returns the number of lines read(useful for a check newsrc >= oldnewsrc) * < 0 error * >=0 number of lines read */ @@ -343,7 +343,7 @@ auto_subscribe_groups( /* TODO: test me! */ while ((ptr = tin_fgets(fp_subs, FALSE)) != NULL) { if (ptr[0] != '#') { - if (group_find(ptr, FALSE) != 0) + if (group_find(ptr, FALSE) != NULL) fprintf(fp_newsrc, "%s:\n", ptr); } } @@ -384,8 +384,8 @@ backup_newsrc( joinpath(dirbuf, sizeof(dirbuf), rcdir, filebuf); joinpath(filebuf, sizeof(filebuf), dirbuf, OLDNEWSRC_FILE); - if (-1 == stat(dirbuf, &statbuf)) { - if (-1 == my_mkdir(dirbuf, (mode_t) (S_IRWXU))) + if (stat(dirbuf, &statbuf) == -1) { + if (my_mkdir(dirbuf, (mode_t) (S_IRWXU)) == -1) /* Can't create directory: Fall back on Homedir */ joinpath(filebuf, sizeof(filebuf), homedir, OLDNEWSRC_FILE); } @@ -419,15 +419,19 @@ group_get_art_info( snprintf(line, sizeof(line), "GROUP %s", groupname); # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "group_get_art_info %s", line); # endif /* DEBUG */ put_server(line); switch (get_respcode(line, sizeof(line))) { case OK_GROUP: - if (sscanf(line, "%"T_ARTNUM_SFMT" %"T_ARTNUM_SFMT" %"T_ARTNUM_SFMT, art_count, art_min, art_max) != 3) - error_message(2, _(txt_error_invalid_response_to_group), line); + if (sscanf(line, "%"T_ARTNUM_SFMT" %"T_ARTNUM_SFMT" %"T_ARTNUM_SFMT, art_count, art_min, art_max) != 3) { +# ifdef DEBUG + if ((debug & DEBUG_NNTP) && verbose > 1) + debug_print_file("NNTP", "Invalid response to GROUP command, %s", line); +# endif /* DEBUG */ + } break; case ERR_NOGROUP: @@ -444,7 +448,7 @@ group_get_art_info( default: # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "NOT_OK %s", line); # endif /* DEBUG */ return -1; @@ -1231,7 +1235,7 @@ pos_group_in_newsrc( while ((line = tin_fgets(fp_in, FALSE)) != NULL) { if (STRNCMPEQ(group->name, line, group_len) && line[group_len] == SUBSCRIBED) { - FreeAndNull(newsgroup); + FreeIfNeeded(newsgroup); newsgroup = my_strdup(line); /* Take a copy of this line */ found = TRUE; continue; @@ -1301,10 +1305,8 @@ pos_group_in_newsrc( subscribed_pos++; } - if (!repositioned) { + if (!repositioned) write_newsrc_line(fp_out, newsgroup); - repositioned = TRUE; - } /* * append unsubscribed groups file to newnewsrc @@ -1325,10 +1327,8 @@ pos_group_in_newsrc( fclose(fp_out); } } else { - if (repositioned) { - rename_file(newnewsrc, newsrc); - ret_code = TRUE; - } + rename_file(newnewsrc, newsrc); + ret_code = TRUE; } fp_out = NULL; newnewsrc_created = FALSE; diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/nntplib.c tin-2.4.3/src/nntplib.c --- tin-2.4.2/src/nntplib.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/nntplib.c 2018-12-03 23:55:52.983934276 +0100 @@ -3,7 +3,7 @@ * Module : nntplib.c * Author : S. Barber & I. Lea * Created : 1991-01-12 - * Updated : 2017-11-06 + * Updated : 2018-12-03 * 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 @@ -58,7 +58,6 @@ static TCP *nntp_rd_fp = NULL; static int mode_reader(t_bool *sec); static int reconnect(int retry); static int server_init(char *machine, const char *cservice, unsigned short port, char *text, size_t mlen); - static int check_extensions(void); static void close_server(void); static void list_motd(void); # ifdef INET6 @@ -188,7 +187,7 @@ getserverbyfile( * * Parameters: "machine" is the machine to connect to. * "service" is the service to connect to on the machine. - * "port" is the servive port to connect to. + * "port" is the service port to connect to. * * Returns: server's initial response code * or -errno @@ -593,7 +592,7 @@ get_tcp6_socket( { char mymachine[MAXHOSTNAMELEN + 1]; char myport[12]; - int s = -1, err; + int s = -1, err, ec = 0, es = 0; struct addrinfo hints, *res, *res0; snprintf(mymachine, sizeof(mymachine), "%s", machine); @@ -620,22 +619,28 @@ get_tcp6_socket( } err = -1; for (res = res0; res; res = res->ai_next) { - if ((s = socket(res->ai_family, res->ai_socktype, res->ai_protocol)) < 0) + if ((s = socket(res->ai_family, res->ai_socktype, res->ai_protocol)) < 0) { + es = errno; continue; - if (connect(s, res->ai_addr, res->ai_addrlen) != 0) + } + if (connect(s, res->ai_addr, res->ai_addrlen) != 0) { + ec = errno; s_close(s); + } else { - err = 0; + es = ec = err = 0; break; } } if (res0 != NULL) freeaddrinfo(res0); if (err < 0) { - /* - * TODO: issue a more useful error-message - */ my_fprintf(stderr, "%s", _(txt_error_socket_or_connect_problem)); + if (es) + my_fprintf(stderr, "\tsocket(2): %s\n", strerror(es)); + if (ec) + my_fprintf(stderr, "\tconnect(2): %s\n", strerror(ec)); + sleep(3); return -1; } return s; @@ -837,7 +842,7 @@ reconnect( if (retry > NNTP_TRY_RECONNECT) { # ifdef DEBUG /* TODO: -> lang.c */ - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "reconnect(%d) limit %d reached, giving up.", retry, NNTP_TRY_RECONNECT); # endif /* DEBUG */ } @@ -949,8 +954,8 @@ get_server( * Use standard NNTP closing message and response code if user is * quitting tin and leave loop. */ - strncpy(string, _(txt_nntp_ok_goodbye), size - 2); - strcat(string, cCRLF); /* tin_fgets() needs CRLF */ + strncpy(string, _(txt_nntp_ok_goodbye), size - 3); + strcat(string, "\r\n"); /* tin_fgets() needs CRLF */ break; } } @@ -980,8 +985,14 @@ close_server( if (nntp_wr_fp == NULL || nntp_rd_fp == NULL) return; - if (!batch_mode || verbose) - my_fputs(_(txt_disconnecting), stdout); + if (!batch_mode || verbose) { + char *msg; + + msg = strunc(_(txt_disconnecting), cCOLS - 1); + my_fputs(msg, stdout); + my_fputc('\n', stdout); + free(msg); + } nntp_command("QUIT", OK_GOODBYE, NULL, 0); quitting = TRUE; /* Don't reconnect just for this */ @@ -999,9 +1010,9 @@ close_server( * * Sets up: t_capabilities nntp_caps */ -static int +int check_extensions( - void) + int rvl) { char *d; char *ptr; @@ -1010,7 +1021,9 @@ check_extensions( int ret = 0; buf[0] = '\0'; - i = new_nntp_command("CAPABILITIES", INF_CAPABILITIES, buf, sizeof(buf)); + + /* rvl > 0 = manually send "CAPABILITIES" to avoid endless AUTH loop */ + i = rvl ? rvl : new_nntp_command("CAPABILITIES", INF_CAPABILITIES, buf, sizeof(buf)); switch (i) { case INF_CAPABILITIES: /* clear capabilities */ @@ -1023,6 +1036,8 @@ check_extensions( nntp_caps.list_active_times = FALSE; nntp_caps.list_distrib_pats = FALSE; nntp_caps.list_headers = FALSE; + FreeAndNull(nntp_caps.headers_range); + FreeAndNull(nntp_caps.headers_id); nntp_caps.list_newsgroups = FALSE; nntp_caps.list_overview_fmt = FALSE; nntp_caps.list_motd = FALSE; @@ -1030,7 +1045,7 @@ check_extensions( nntp_caps.list_distributions = FALSE; nntp_caps.list_moderators = FALSE; nntp_caps.list_counts = FALSE; - nntp_caps.xpat = TRUE; /* only used in select.c:lookup_msgid(); toggles to false if fails, INN > 2.7.0 announces it */ + nntp_caps.xpat = TRUE; /* toggles to false if fails, INN > 2.7.0 announces it */ nntp_caps.hdr = FALSE; nntp_caps.hdr_cmd = NULL; nntp_caps.over = FALSE; @@ -1147,6 +1162,8 @@ check_extensions( else if (!strncasecmp(ptr, &xhdr_cmds[1], strlen(&xhdr_cmds[1]))) { nntp_caps.hdr_cmd = &xhdr_cmds[1]; nntp_caps.list_headers = nntp_caps.hdr = TRUE; + nntp_caps.headers_range = my_strdup(""); + nntp_caps.headers_id = my_strdup(""); } else if (!strncasecmp(ptr, "AUTHINFO", 8)) { d = ptr + 8; d = strpbrk(d, " \t"); @@ -1224,7 +1241,7 @@ check_extensions( /* * XanaNewz 2 Server Version 2.0.0.3 doesn't know CAPABILITIES - * but respondes with 400 _without_ closing the connection. If + * but responds with 400 _without_ closing the connection. If * you use tin on a XanaNewz 2 Server comment out the following * case. */ @@ -1255,8 +1272,8 @@ mode_reader( if (!nntp_caps.reader) { char line[NNTP_STRLEN]; # ifdef DEBUG - if (debug & DEBUG_NNTP) - debug_print_file("NNTP", "mode_reader() MODE READER"); + if ((debug & DEBUG_NNTP) && verbose > 1) + debug_print_file("NNTP", "mode_reader(MODE READER)"); # endif /* DEBUG */ DEBUG_IO((stderr, "nntp_command(MODE READER)\n")); put_server("MODE READER"); @@ -1332,7 +1349,7 @@ nntp_open( return 0; # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "nntp_open() BEGIN"); # endif /* DEBUG */ @@ -1350,7 +1367,7 @@ nntp_open( } # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "nntp_open() %s:%d", nntp_server, nntp_tcp_port); # endif /* DEBUG */ @@ -1361,7 +1378,7 @@ nntp_open( my_fputc('\n', stdout); # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "nntp_open() %s", line); # endif /* DEBUG */ @@ -1420,7 +1437,7 @@ nntp_open( * RFC 4643). */ if (nntp_caps.type != BROKEN) - check_extensions(); + check_extensions(0); /* * If the user wants us to authenticate on connection startup, do it now. @@ -1435,8 +1452,8 @@ nntp_open( char buf[NNTP_STRLEN]; # ifdef DEBUG - if (debug & DEBUG_NNTP) - debug_print_file("NNTP", "nntp_open() MODE READER"); + if ((debug & DEBUG_NNTP) && verbose > 1) + debug_print_file("NNTP", "nntp_open(MODE READER)"); # endif /* DEBUG */ put_server("MODE READER"); switch (get_only_respcode(buf, sizeof(buf))) { @@ -1449,21 +1466,18 @@ nntp_open( default: break; } - check_extensions(); + check_extensions(0); } } if (force_auth_on_conn_open) { # ifdef DEBUG - if (debug & DEBUG_NNTP) - debug_print_file("NNTP", "nntp_open() authenticate(force_auth_on_conn_open)"); + if ((debug & DEBUG_NNTP) && verbose > 1) + debug_print_file("NNTP", "nntp_open(authenticate(force_auth_on_conn_open))"); # endif /* DEBUG */ if (!authenticate(nntp_server, userid, FALSE)) /* 3rd parameter is FALSE as we need to get prompted for username password here */ return -1; - - if (nntp_caps.type == CAPABILITIES) - check_extensions(); } if ((nntp_caps.type == CAPABILITIES && nntp_caps.mode_reader) || nntp_caps.type != CAPABILITIES) { @@ -1474,11 +1488,15 @@ nntp_open( return ret; } if (nntp_caps.type == CAPABILITIES) - check_extensions(); + check_extensions(0); } if (nntp_caps.type == CAPABILITIES) { if (!nntp_caps.reader) { +# ifdef DEBUG + if ((debug & DEBUG_NNTP) && verbose > 1) + debug_print_file("NNTP", "CAPABILITIES did not announce READER"); +# endif /* DEBUG */ error_message(2, _("CAPABILITIES did not announce READER")); /* TODO: -> lang.c */ return -1; /* give up */ } @@ -1550,7 +1568,7 @@ nntp_open( case OK_XOVER: /* unexpected multiline ok, e.g.: Synchronet 3.13 NNTP Service 1.92 or on reconnect if last cmd was GROUP */ nntp_caps.over_cmd = &xover_cmds[i]; # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "nntp_open() %s skipping data", &xover_cmds[i]); # endif /* DEBUG */ while (tin_fgets(FAKE_NNTP_FP, FALSE)) @@ -1573,7 +1591,7 @@ nntp_open( case 221: /* unexpected multiline ok, e.g.: SoftVelocity Discussions 2.5q */ nntp_caps.hdr_cmd = &xhdr_cmds[i]; # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "nntp_open() %s skipping data", &xhdr_cmds[i]); # endif /* DEBUG */ while (tin_fgets(FAKE_NNTP_FP, FALSE)) @@ -1587,7 +1605,7 @@ nntp_open( break; } } - /* no XPAT probing here, we do it in select.c:lookup_msgid() as that's the only place we use it */ + /* no XPAT probing here, we do when it's needed */ nntp_caps.xpat = TRUE; # if 0 switch (new_nntp_command("XPAT Newsgroups <0> *", ERR_NOART, line, sizeof(line))) { @@ -1611,7 +1629,7 @@ nntp_open( case OK_XOVER: /* unexpected multiline ok, e.g.: Synchronet 3.13 NNTP Service 1.92 or on reconnect if last cmd was GROUP */ nntp_caps.over_cmd = xover_cmds; # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "nntp_open() %s skipping data", xover_cmds); # endif /* DEBUG */ while (tin_fgets(FAKE_NNTP_FP, FALSE)) @@ -1634,7 +1652,7 @@ nntp_open( case 221: /* unexpected multiline ok, e.g.: SoftVelocity Discussions 2.5q */ nntp_caps.hdr_cmd = xhdr_cmds; # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "nntp_open() %s skipping data", xhdr_cmds); # endif /* DEBUG */ while (tin_fgets(FAKE_NNTP_FP, FALSE)) @@ -1696,7 +1714,7 @@ nntp_close( #ifdef NNTP_ABLE if (read_news_via_nntp && !read_saved_news) { # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "nntp_close() END"); # endif /* DEBUG */ close_server(); @@ -1728,8 +1746,8 @@ get_only_respcode( if (tin_errno || ptr == NULL) { # ifdef DEBUG - if (debug & DEBUG_NNTP) - debug_print_file("NNTP", "<<<%sError: tin_error<>0 or ptr==NULL in get_only_respcode()", logtime()); + if ((debug & DEBUG_NNTP) && verbose > 1) + debug_print_file("NNTP", "Error: tin_error<>0 or ptr==NULL in get_only_respcode()"); # endif /* DEBUG */ return -1; } @@ -1755,7 +1773,7 @@ get_only_respcode( * If so, retrying will force a reconnect. */ # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "get_only_respcode() timeout"); # endif /* DEBUG */ put_server(last_put); @@ -1763,8 +1781,8 @@ get_only_respcode( if (tin_errno || ptr == NULL) { # ifdef DEBUG - if (debug & DEBUG_NNTP) - debug_print_file("NNTP", "<<<%sError: tin_errno<>0 or ptr==NULL in get_only_respcode(retry)", logtime()); + if ((debug & DEBUG_NNTP) && verbose > 1) + debug_print_file("NNTP", "Error: tin_errno<>0 or ptr==NULL in get_only_respcode(retry)"); # endif /* DEBUG */ return -1; } @@ -1796,7 +1814,7 @@ get_only_respcode( * necessary after a timeout. * * TODO: make this handle 401 and 483 (RFC 3977) return codes. - * as 401 requires to examine the returned text besides the + * as 401 requires the examination of the returned text besides the * return value, we have to "fix" all nntp_command(..., NULL, 0) and * get_only_respcode(NULL, 0) calls to do this properly. */ @@ -1815,7 +1833,7 @@ get_respcode( * Server requires authentication. */ # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "get_respcode() authentication"); # endif /* DEBUG */ STRCPY(savebuf, last_put); @@ -1823,10 +1841,9 @@ get_respcode( if (!authenticate(nntp_server, userid, FALSE)) tin_done(EXIT_FAILURE, _(txt_auth_failed), nntp_caps.type == CAPABILITIES ? ERR_AUTHFAIL : ERR_ACCESS); - if (nntp_caps.type == CAPABILITIES) { - check_extensions(); + if (nntp_caps.type == CAPABILITIES) can_post = nntp_caps.post && !force_no_post; - } else { + else { put_server("MODE READER"); if (get_only_respcode(message, mlen) == OK_CANPOST) can_post = TRUE && !force_no_post; @@ -1849,8 +1866,8 @@ get_respcode( if (tin_errno) { # ifdef DEBUG - if (debug & DEBUG_NNTP) - debug_print_file("NNTP", "<<<%sError: tin_errno <> 0", logtime()); + if ((debug & DEBUG_NNTP) && verbose > 1) + debug_print_file("NNTP", "Error: tin_errno <> 0"); # endif /* DEBUG */ return -1; } @@ -1889,7 +1906,7 @@ nntp_command( { DEBUG_IO((stderr, "nntp_command(%s)\n", command)); # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "nntp_command(%s)", command); # endif /* DEBUG */ put_server(command); @@ -1897,7 +1914,7 @@ DEBUG_IO((stderr, "nntp_command(%s)\n", if (!bool_equal(dangerous_signal_exit, TRUE)) { if (get_respcode(message, mlen) != success) { # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "nntp_command(%s) NOT_OK", command); # endif /* DEBUG */ /* error_message(2, "%s", message); */ @@ -1905,7 +1922,7 @@ DEBUG_IO((stderr, "nntp_command(%s)\n", } } # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "nntp_command(%s) OK", command); # endif /* DEBUG */ return FAKE_NNTP_FP; @@ -1928,7 +1945,7 @@ new_nntp_command( DEBUG_IO((stderr, "new_nntp_command(%s)\n", command)); # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "new_nntp_command(%s)", command); # endif /* DEBUG */ put_server(command); @@ -1936,14 +1953,14 @@ DEBUG_IO((stderr, "new_nntp_command(%s)\ if (!bool_equal(dangerous_signal_exit, TRUE)) { if ((respcode = get_respcode(message, mlen)) != success) { # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "new_nntp_command(%s) NOT_OK - Expected: %d, got: %d", command, success, respcode); # endif /* DEBUG */ return respcode; } } # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "new_nntp_command(%s) OK", command); # endif /* DEBUG */ return respcode; diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/nrctbl.c tin-2.4.3/src/nrctbl.c --- tin-2.4.2/src/nrctbl.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/nrctbl.c 2018-11-23 16:32:15.799484769 +0100 @@ -9,7 +9,7 @@ * and the name of the newsrc file for a given * alias of the server. * - * Copyright (c) 1996-2018 Sven Paulus + * Copyright (c) 1996-2019 Sven Paulus * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -242,7 +242,7 @@ get_newsrcname( case 'a': /* - * FIXME this (e.g. the location of the alternativce name) + * FIXME this (e.g. the location of the alternative name) * is not documented in the man page */ snprintf(name_found, sizeof(name_found), ".newsrc-%s", nntpserver_name); diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/options_menu.c tin-2.4.3/src/options_menu.c --- tin-2.4.2/src/options_menu.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/options_menu.c 2018-11-23 16:32:15.827485903 +0100 @@ -6,7 +6,7 @@ * Updated : 2017-08-13 * Notes : Split from config.c * - * Copyright (c) 2004-2018 Michael Bienia + * Copyright (c) 2004-2019 Michael Bienia * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -2916,7 +2916,7 @@ find_scope( return 0; for (i = 1; i < num_scope; i++) { - if ((!scopes[i].global && strcasecmp(scope, scopes[i].scope) == 0)) + if (!scopes[i].global && strcasecmp(scope, scopes[i].scope) == 0) return i; } @@ -2936,7 +2936,7 @@ move_scope( int new_pos; clear_message(); - if ((p = tin_getline(_(txt_scope_new_position), 1, 0, 0, FALSE, HIST_OTHER)) != NULL) + if ((p = tin_getline(_(txt_scope_new_position), 1, NULL, 0, FALSE, HIST_OTHER)) != NULL) new_pos = atoi(p); else new_pos = curr_pos; diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/page.c tin-2.4.3/src/page.c --- tin-2.4.2/src/page.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/page.c 2018-11-23 16:32:15.855487037 +0100 @@ -3,10 +3,10 @@ * Module : page.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2017-03-30 + * Updated : 2018-11-22 * Notes : * - * Copyright (c) 1991-2018 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2019 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -59,7 +59,7 @@ static t_url *url_list; t_openartinfo pgart = /* Global context of article open in the pager */ { - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, FALSE, 0 }, + { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, FALSE, NULL}, FALSE, 0, NULL, NULL, NULL, NULL, }; @@ -1055,8 +1055,21 @@ print_message_page( if ((line = tin_fgets(file, FALSE)) == NULL) break; /* ran out of message */ - if ((help_level == INFO_PAGER) && ((int) strlen(line) >= cCOLS - 1)) + if ((help_level == INFO_PAGER) && (strwidth(line) >= cCOLS - 1)) +#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + { + char *tmp, *f, *t; + + f = tmp = strunc(line, cCOLS - 1); + t = line; + while (*f) + *t++ = *f++; + *t = '\0'; + free(tmp); + } +#else line[cCOLS - 1] = '\0'; +#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ /* * use the offsets gained while doing line wrapping to @@ -1205,20 +1218,22 @@ draw_page( * Print an appropriate footer */ if (curr_line + ARTLINES >= artlines) { - char buf[LEN]; + char buf[LEN], *buf2; int len; STRCPY(buf, (arts[this_resp].thread != -1) ? _(txt_next_resp) : _(txt_last_resp)); - len = strwidth(buf); + buf2 = strunc(buf, cCOLS - 1); + len = strwidth(buf2); clear_message(); MoveCursor(cLINES, cCOLS - len - (1 + BLANK_PAGE_COLS)); #ifdef HAVE_COLOR fcol(tinrc.col_normal); #endif /* HAVE_COLOR */ StartInverse(); - my_fputs(buf, stdout); + my_fputs(buf2, stdout); EndInverse(); my_flush(); + free(buf2); } else draw_percent_mark(curr_line + ARTLINES, artlines); @@ -1246,7 +1261,7 @@ invoke_metamail( #endif /* !DONT_HAVE_PIPING */ ptr = tinrc.metamail_prog; - if (('\0' == *ptr) || (0 == strcmp(ptr, INTERNAL_CMD)) || (NULL != getenv("NOMETAMAIL"))) + if ((*ptr == '\0') || (!strcmp(ptr, INTERNAL_CMD)) || (getenv("NOMETAMAIL") != NULL)) return; if ((offset = ftell(fp)) == -1) { @@ -1292,7 +1307,7 @@ static void draw_page_header( const char *group) { - char *buf; + char *buf, *tmp; int i; int whichresp, x_resp; int len, right_len, center_pos, cur_pos; @@ -1300,7 +1315,7 @@ draw_page_header( #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) wchar_t *fmt_resp, *fmt_thread, *wtmp, *wtmp2, *wbuf; #else - char *tmp, *tmp2; + char *tmp2; #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ whichresp = which_response(this_resp); @@ -1321,7 +1336,7 @@ draw_page_header( /* * determine the needed space for the text at the right hand margin - * the formating info (%4s) needs 3 positions but we need 4 positions + * the formatting info (%4s) needs 3 positions but we need 4 positions * on the screen for each counter. */ if (fmt_thread && fmt_resp) @@ -1336,6 +1351,12 @@ draw_page_header( FreeIfNeeded(fmt_resp); /* + * limit right_len to cCOLS / 3 + */ + if (right_len > cCOLS / 3 + 1) + right_len = cCOLS / 3 + 1; + + /* * first line */ cur_pos = 0; @@ -1387,7 +1408,9 @@ draw_page_header( /* thread info */ /* can't eval tin_ltoa() more than once in a statement due to statics */ strcpy(buf, tin_ltoa(which_thread(this_resp) + 1, 4)); - my_printf(_(txt_thread_x_of_n), buf, tin_ltoa(grpmenu.max, 4)); + tmp = strunc(_(txt_thread_x_of_n), cCOLS / 3 - 1); + my_printf(tmp, buf, tin_ltoa(grpmenu.max, 4)); + free(tmp); my_fputs(cCRLF, stdout); @@ -1414,8 +1437,11 @@ draw_page_header( { wchar_t *fmt; - if ((fmt = char2wchar_t(_(txt_lines))) != NULL) { - wtmp = my_malloc(sizeof(wchar_t) * line_len); + if ((wtmp = char2wchar_t(_(txt_lines))) != NULL) { + int tex_space = pgart.tex2iso ? 5 : 0; + + fmt = wstrunc(wtmp, cCOLS / 3 - 1 - tex_space); + wtmp = my_realloc(wtmp, sizeof(wchar_t) * line_len); swprintf(wtmp, line_len, fmt, buf); my_fputws(wtmp, stdout); cur_pos += wcswidth(wtmp, wcslen(wtmp)); @@ -1431,9 +1457,11 @@ draw_page_header( /* tex2iso */ if (pgart.tex2iso) { if ((wtmp = char2wchar_t(_(txt_tex))) != NULL) { - my_fputws(wtmp, stdout); - cur_pos += wcswidth(wtmp, wcslen(wtmp)); + wtmp2 = wstrunc(wtmp, 5); + my_fputws(wtmp2, stdout); + cur_pos += wcswidth(wtmp2, wcslen(wtmp2)); free(wtmp); + free(wtmp2); } } @@ -1471,16 +1499,23 @@ draw_page_header( for (; cur_pos < cCOLS - right_len - 1; cur_pos++) my_fputc(' ', stdout); - if (whichresp) - my_printf(_(txt_art_x_of_n), whichresp + 1, x_resp + 1); - else { + if (whichresp) { + tmp = strunc(_(txt_art_x_of_n), cCOLS / 3 - 1); + my_printf(tmp, whichresp + 1, x_resp + 1); + free(tmp); + } else { /* TODO: ngettext */ - if (!x_resp) - my_printf("%s", _(txt_no_responses)); - else if (x_resp == 1) - my_printf("%s", _(txt_1_resp)); - else - my_printf(_(txt_x_resp), x_resp); + if (!x_resp) { + tmp = strunc(_(txt_no_responses), cCOLS / 3 - 1); + my_printf("%s", tmp); + } else if (x_resp == 1) { + tmp = strunc(_(txt_1_resp), cCOLS / 3 - 1); + my_printf("%s", tmp); + } else { + tmp = strunc(_(txt_x_resp), cCOLS / 3 - 1); + my_printf(tmp, x_resp); + } + free(tmp); } my_fputs(cCRLF, stdout); @@ -1524,13 +1559,7 @@ draw_page_header( * TODO: IDNA decoding, see also comment in * cook.c:cook_article() */ - if ((wtmp = char2wchar_t(_(txt_at_s))) != NULL) { - len = wcswidth(wtmp, wcslen(wtmp)); - free(wtmp); - } else - len = 0; - if (note_h->org && cCOLS - cur_pos - 1 >= len - 2 + 3) { - /* we have enough space to print at least " at ..." */ + if (note_h->org) { snprintf(buf, line_len, _(txt_at_s), note_h->org); if ((wtmp = char2wchar_t(buf)) != NULL) { @@ -1554,7 +1583,7 @@ draw_page_header( #else /* !MULTIBYTE_ABLE || NO_LOCALE */ /* * determine the needed space for the text at the right hand margin - * the formating info (%4s) needs 3 positions but we need 4 positions + * the formatting info (%4s) needs 3 positions but we need 4 positions * on the screen for each counter */ right_len = MAX((strlen(_(txt_thread_x_of_n)) - 6 + 8), (strlen(_(txt_art_x_of_n)) - 6 + 8)); @@ -1970,7 +1999,7 @@ toggle_raw( pgart.rawl = my_malloc(sizeof(t_lineinfo) * chunk); offset = ftell(pgart.raw); - while (NULL != (line = tin_fgets(pgart.raw, FALSE))) { + while ((line = tin_fgets(pgart.raw, FALSE)) != NULL) { int space; #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) int num_bytes; diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/pgp.c tin-2.4.3/src/pgp.c --- tin-2.4.2/src/pgp.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/pgp.c 2018-11-23 16:32:15.907489143 +0100 @@ -6,7 +6,7 @@ * Updated : 2017-03-28 * Notes : PGP support * - * Copyright (c) 1995-2018 Steven J. Madsen + * Copyright (c) 1995-2019 Steven J. Madsen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/post.c tin-2.4.3/src/post.c --- tin-2.4.2/src/post.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/post.c 2018-12-17 09:56:18.030402274 +0100 @@ -3,10 +3,10 @@ * Module : post.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2017-08-13 + * Updated : 2018-11-22 * Notes : mail/post/replyto/followup/repost & cancel articles * - * Copyright (c) 1991-2018 Iain Lea + * Copyright (c) 1991-2019 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -251,7 +251,7 @@ prompt_rejected( /* FIXME (what does this mean?) fix screen pos. */ Raw(FALSE); - /* TODO: replace hardcoded key-name in txt_post_error_ask_postpone */ + /* TODO: replace hard coded key-name in txt_post_error_ask_postpone */ my_fprintf(stderr, "\n\n%s\n\n", _(txt_post_error_ask_postpone)); my_fflush(stderr); Raw(TRUE); @@ -720,7 +720,7 @@ append_mail( * - check for special newsgroups: to, ctl, all, control, junk * [RFC 5536 3.1.4] * - check for Supersedes in Control messages [RFC 5536 3.2.3] - * - check for 'illegal' distribultion: all [RFC 5536 3.2.4] + * - check for 'illegal' distribution: all [RFC 5536 3.2.4] * * Check the article file for correct header syntax and if there * is a blank between the header information and the text. @@ -742,11 +742,11 @@ append_mail( * 11. Warn if transfer encoding is base64 or quoted-printable and using * external inews * 12. Check that Subject, Newsgroups and if present Followup-To - * headers are uniq + * headers are unique * 13. Display an 'are you sure' message before posting article */ #define CA_ERROR_HEADER_LINE_BLANK 0x0000001 -#define CA_ERROR_MISSING_BODY_SEPERATOT 0x0000002 +#define CA_ERROR_MISSING_BODY_SEPARATOR 0x0000002 #define CA_ERROR_MISSING_FROM 0x0000004 #define CA_ERROR_DUPLICATED_FROM 0x0000008 #define CA_ERROR_MISSING_SUBJECT 0x0000010 @@ -766,12 +766,12 @@ append_mail( #define CA_ERROR_DISTRIBUTIOIN_NOT_7BIT 0x0040000 #define CA_ERROR_NEWSGROUPS_POSTER 0x0080000 #define CA_ERROR_FOLLOWUP_TO_POSTER 0x0100000 -#ifndef FOLLOW_USEFOR_DRAFT +#ifndef ALLOW_FWS_IN_NEWSGROUPLIST # define CA_ERROR_SPACE_IN_NEWSGROUPS 0x0200000 # define CA_ERROR_NEWLINE_IN_NEWSGROUPS 0x0400000 # define CA_ERROR_SPACE_IN_FOLLOWUP_TO 0x0800000 # define CA_ERROR_NEWLINE_IN_FOLLOWUP_TO 0x1000000 -#endif /* !FOLLOW_USEFOR_DRAFT */ +#endif /* !ALLOW_FWS_IN_NEWSGROUPLIST */ #define CA_WARNING_SPACES_ONLY_SUBJECT 0x000001 #define CA_WARNING_RE_WITHOUT_REFERENCES 0x000002 #define CA_WARNING_REFERENCES_WITHOUT_RE 0x000004 @@ -784,12 +784,12 @@ append_mail( #ifdef CHARSET_CONVERSION # define CA_WARNING_CHARSET_CONVERSION 0x000200 #endif /* CHARSET_CONVERSION */ -#ifdef FOLLOW_USEFOR_DRAFT +#ifdef ALLOW_FWS_IN_NEWSGROUPLIST # define CA_WARNING_SPACE_IN_NEWSGROUPS 0x000400 # define CA_WARNING_NEWLINE_IN_NEWSGROUPS 0x000800 # define CA_WARNING_SPACE_IN_FOLLOWUP_TO 0x001000 # define CA_WARNING_NEWLINE_IN_FOLLOWUP_TO 0x002000 -#endif /* FOLLOW_USEFOR_DRAFT */ +#endif /* ALLOW_FWS_IN_NEWSGROUPLIST */ /* * TODO: cleanup! @@ -956,7 +956,7 @@ check_article_to_be_posted( #else cp2 = rfc1522_encode(line, tinrc.mm_charset, FALSE); #endif /* CHARSET_CONVERSION */ - if (GNKSA_OK != (i = gnksa_check_from(cp2 + (cp - line) + 1))) { + if ((i = gnksa_check_from(cp2 + (cp - line) + 1)) != GNKSA_OK) { StartInverse(); my_fprintf(stderr, "%s", _(txt_error_bad_approved)); my_fprintf(stderr, gnksa_strerror(i), i); @@ -976,7 +976,7 @@ check_article_to_be_posted( #else cp2 = rfc1522_encode(line, tinrc.mm_charset, FALSE); #endif /* CHARSET_CONVERSION */ - if (GNKSA_OK != (i = gnksa_check_from(cp2 + (cp - line) + 1))) { + if ((i = gnksa_check_from(cp2 + (cp - line) + 1)) != GNKSA_OK) { StartInverse(); my_fprintf(stderr, "%s", _(txt_error_bad_from)); my_fprintf(stderr, gnksa_strerror(i), i); @@ -995,7 +995,7 @@ check_article_to_be_posted( #else cp2 = rfc1522_encode(line, tinrc.mm_charset, FALSE); #endif /* CHARSET_CONVERSION */ - if (GNKSA_OK != (i = gnksa_check_from(cp2 + (cp - line) + 1))) { + if ((i = gnksa_check_from(cp2 + (cp - line) + 1)) != GNKSA_OK) { StartInverse(); my_fprintf(stderr, "%s", _(txt_error_bad_replyto)); my_fprintf(stderr, gnksa_strerror(i), i); @@ -1014,7 +1014,7 @@ check_article_to_be_posted( #else cp2 = rfc1522_encode(line, tinrc.mm_charset, FALSE); #endif /* CHARSET_CONVERSION */ - if (GNKSA_OK != (i = gnksa_check_from(cp2 + (cp - line) + 1))) { + if ((i = gnksa_check_from(cp2 + (cp - line) + 1)) != GNKSA_OK) { StartInverse(); my_fprintf(stderr, "%s", _(txt_error_bad_to)); my_fprintf(stderr, gnksa_strerror(i), i); @@ -1089,18 +1089,18 @@ check_article_to_be_posted( for (cp = line + 11; *cp == ' '; cp++) ; if (strchr(cp, ' ') || strchr(cp, '\t')) { -#ifdef FOLLOW_USEFOR_DRAFT +#ifdef ALLOW_FWS_IN_NEWSGROUPLIST warnings_catbp |= CA_WARNING_SPACE_IN_NEWSGROUPS; #else errors_catbp |= CA_ERROR_SPACE_IN_NEWSGROUPS; -#endif /* FOLLOW_USEFOR_DRAFT */ +#endif /* ALLOW_FWS_IN_NEWSGROUPLIST */ } if (strchr(cp, '\n')) { -#ifdef FOLLOW_USEFOR_DRAFT +#ifdef ALLOW_FWS_IN_NEWSGROUPLIST warnings_catbp |= CA_WARNING_NEWLINE_IN_NEWSGROUPS; #else errors_catbp |= CA_ERROR_NEWLINE_IN_NEWSGROUPS; -#endif /* FOLLOW_USEFOR_DRAFT */ +#endif /* ALLOW_FWS_IN_NEWSGROUPLIST */ unfold_header(line); } @@ -1154,18 +1154,18 @@ check_article_to_be_posted( if (strlen(cp)) /* Followup-To not empty */ found_followup_to_lines++; if (strchr(cp, ' ') || strchr(cp, '\t')) { -#ifdef FOLLOW_USEFOR_DRAFT +#ifdef ALLOW_FWS_IN_NEWSGROUPLIST warnings_catbp |= CA_WARNING_SPACE_IN_FOLLOWUP_TO; #else errors_catbp |= CA_ERROR_SPACE_IN_FOLLOWUP_TO; -#endif /* FOLLOW_USEFOR_DRAFT */ +#endif /* ALLOW_FWS_IN_NEWSGROUPLIST */ } if (strchr(cp, '\n')) { -#ifdef FOLLOW_USEFOR_DRAFT +#ifdef ALLOW_FWS_IN_NEWSGROUPLIST warnings_catbp |= CA_WARNING_NEWLINE_IN_FOLLOWUP_TO; #else errors_catbp |= CA_ERROR_NEWLINE_IN_FOLLOWUP_TO; -#endif /* FOLLOW_USEFOR_DRAFT */ +#endif /* ALLOW_FWS_IN_NEWSGROUPLIST */ unfold_header(line); } @@ -1370,7 +1370,7 @@ check_article_to_be_posted( #endif /* CHARSET_CONVERSION */ if (!end_of_header) - errors_catbp |= CA_ERROR_MISSING_BODY_SEPERATOT; + errors_catbp |= CA_ERROR_MISSING_BODY_SEPARATOR; /* * check for MIME Content-Type and Content-Transfer-Encoding @@ -1418,7 +1418,7 @@ check_article_to_be_posted( * signature it will not be encoded. We might additionally check if there's * a file named ~/.signature and skip the warning if it is not present. */ - if ((((*c_group ? (*c_group)->attribute->post_mime_encoding : tinrc.post_mime_encoding) == MIME_ENCODING_QP) || ((*c_group ? (*c_group)->attribute->post_mime_encoding : tinrc.post_mime_encoding) == MIME_ENCODING_BASE64)) && 0 != strcasecmp(tinrc.inews_prog, INTERNAL_CMD)) + if ((((*c_group ? (*c_group)->attribute->post_mime_encoding : tinrc.post_mime_encoding) == MIME_ENCODING_QP) || ((*c_group ? (*c_group)->attribute->post_mime_encoding : tinrc.post_mime_encoding) == MIME_ENCODING_BASE64)) && strcasecmp(tinrc.inews_prog, INTERNAL_CMD)) warnings_catbp |= CA_WARNING_ENCODING_EXTERNAL_INEWS; /* give most error messages */ @@ -1428,7 +1428,7 @@ check_article_to_be_posted( /* missing headers */ if (errors_catbp & CA_ERROR_HEADER_LINE_BLANK) my_fprintf(stderr, "%s", _(txt_error_header_line_blank)); - if (errors_catbp & CA_ERROR_MISSING_BODY_SEPERATOT) + if (errors_catbp & CA_ERROR_MISSING_BODY_SEPARATOR) my_fprintf(stderr, "%s", _(txt_error_header_and_body_not_separate)); if (errors_catbp & CA_ERROR_MISSING_FROM) my_fprintf(stderr, _(txt_error_header_line_missing), "From"); @@ -1453,7 +1453,7 @@ check_article_to_be_posted( if (errors_catbp & CA_ERROR_EMPTY_NEWSGROUPS) my_fprintf(stderr, _(txt_error_header_line_empty), "Newsgroups"); -#ifndef FOLLOW_USEFOR_DRAFT +#ifndef ALLOW_FWS_IN_NEWSGROUPLIST /* illegal space in headers */ if (errors_catbp & CA_ERROR_SPACE_IN_NEWSGROUPS) my_fprintf(stderr, _(txt_error_header_line_comma), "Newsgroups"); @@ -1465,7 +1465,7 @@ check_article_to_be_posted( my_fprintf(stderr, _(txt_error_header_line_groups_contd), "Newsgroups"); if (errors_catbp & CA_ERROR_NEWLINE_IN_FOLLOWUP_TO) my_fprintf(stderr, _(txt_error_header_line_groups_contd), "Followup-To"); -#endif /* !FOLLOW_USEFOR_DRAFT */ +#endif /* !ALLOW_FWS_IN_NEWSGROUPLIST */ /* illegal group names / combinations */ if (errors_catbp & CA_ERROR_NEWSGROUPS_POSTER) @@ -1511,7 +1511,7 @@ check_article_to_be_posted( if ((warnings_catbp & CA_WARNING_NEWSGROUPS_EXAMPLE) || (warnings_catbp & CA_WARNING_FOLLOWUP_TO_EXAMPLE)) my_fprintf(stderr, "%s", _(txt_warn_example_hierarchy)); -#ifdef FOLLOW_USEFOR_DRAFT /* TODO: give useful warning */ +#ifdef ALLOW_FWS_IN_NEWSGROUPLIST if (warnings_catbp & CA_WARNING_SPACE_IN_NEWSGROUPS) my_fprintf(stderr, _(txt_warn_header_line_comma), "Newsgroups"); if (warnings_catbp & CA_WARNING_SPACE_IN_FOLLOWUP_TO) @@ -1520,7 +1520,7 @@ check_article_to_be_posted( my_fprintf(stderr, _(txt_warn_header_line_groups_contd), "Newsgroups"); if (warnings_catbp & CA_WARNING_NEWLINE_IN_FOLLOWUP_TO) my_fprintf(stderr, _(txt_warn_header_line_groups_contd), "Followup-To"); -#endif /* FOLLOW_USEFOR_DRAFT */ +#endif /* ALLOW_FWS_IN_NEWSGROUPLIST */ if (warnings_catbp & CA_WARNING_MULTIPLE_SIGDASHES) my_fprintf(stderr, _(txt_warn_multiple_sigs), saw_sig_dashes); @@ -2682,13 +2682,13 @@ is_crosspost( /* - * with folding there would not be a length limit, but currently we don't do - * folding and some of our code has a 2048 byte limit. also there are - * several newsservers out there which do have some length limit, so - * shortening to 998 is a good idea. + * RFC 5537 3.4.4 + * "If the resulting References header field would, after unfolding, exceed + * 998 characters in length (including its field name but not the final + * CRLF), it MUST be trimmed (and otherwise MAY be trimmed)." */ #ifdef NNTP_ONLY -# define MAXREFSIZE 998 /* MIN(IMF_LINE_LEN,2047) */ +# define MAXREFSIZE 998 #else /* some extern inews (required for posting right into the spool) can't handle 1k-lines */ # define MAXREFSIZE 512 #endif /* NNTP_ONLY */ @@ -3380,7 +3380,7 @@ mail_to_someone( return ret_code; /* - * TODO: This is a undocumented hack! + * TODO: This is an undocumented hack! * in the !mime_forward case we should get the charset of each part * and convert it to the local one (as this is also needed for the * interactive_mailer case). @@ -3388,7 +3388,7 @@ mail_to_someone( if (note_h.ext->type == TYPE_MULTIPART) mime_forward = TRUE; /* force mime_forward for multipart articles */ - if (!mime_forward || INTERACTIVE_NONE != tinrc.interactive_mailer) { + if (!mime_forward || tinrc.interactive_mailer != INTERACTIVE_NONE) { rewind(artinfo->raw); fprintf(fp, "%s", _(txt_forwarded)); @@ -3423,12 +3423,12 @@ mail_to_someone( fprintf(fp, "%s", _(txt_forwarded_end)); } - if (INTERACTIVE_NONE == tinrc.interactive_mailer) + if (tinrc.interactive_mailer == INTERACTIVE_NONE) msg_write_signature(fp, TRUE, &CURR_GROUP); fclose(fp); - if (INTERACTIVE_NONE != tinrc.interactive_mailer) { /* user wants to use his own mailreader */ + if (tinrc.interactive_mailer != INTERACTIVE_NONE) { /* user wants to use his own mailreader */ char buf[HEADER_LEN]; char *p; @@ -3526,12 +3526,12 @@ mail_bug_report( fprintf(fp, "\nPlease enter _detailed_ bug report, gripe or comment:\n\n"); start_line_offset += 2; - if (INTERACTIVE_NONE == tinrc.interactive_mailer) + if (tinrc.interactive_mailer == INTERACTIVE_NONE) msg_write_signature(fp, TRUE, (selmenu.curr == -1) ? NULL : &CURR_GROUP); fclose(fp); - if (INTERACTIVE_NONE != tinrc.interactive_mailer) { /* user wants to use his own mailreader */ + if (tinrc.interactive_mailer != INTERACTIVE_NONE) { /* user wants to use his own mailreader */ subject[strlen(subject) - 1] = '\0'; /* cut trailing '\n' */ strfmailer(mailer, subject, bug_addr, nam, buf, sizeof(buf), tinrc.mailer_format); if (invoke_cmd(buf)) @@ -3555,7 +3555,7 @@ mail_to_author( t_bool raw_data) { FILE *fp; - char *p, *q; + char *p; char from_addr[HEADER_LEN]; char nam[PATH_LEN]; char subject[HEADER_LEN]; @@ -3593,9 +3593,9 @@ mail_to_author( } } - q = p = my_strdup(note_h.subj); + p = my_strdup(note_h.subj); snprintf(subject, sizeof(subject), "Re: %s\n", eat_re(p, TRUE)); - free(q); + free(p); /* * add extra headers in the mail_to_author() case as we don't include the @@ -3649,7 +3649,7 @@ mail_to_author( } else /* !copy_text */ fprintf(fp, "\n"); /* add a newline to keep vi from bitching */ - if (INTERACTIVE_NONE == tinrc.interactive_mailer) + if (tinrc.interactive_mailer == INTERACTIVE_NONE) msg_write_signature(fp, TRUE, &CURR_GROUP); fclose(fp); @@ -3659,7 +3659,7 @@ mail_to_author( find_reply_to_addr(mail_to, TRUE, &pgart.hdr); - if (INTERACTIVE_NONE != tinrc.interactive_mailer) { /* user wants to use his own mailreader for reply */ + if (tinrc.interactive_mailer != INTERACTIVE_NONE) { /* user wants to use his own mailreader for reply */ char buf[HEADER_LEN]; subject[strlen(subject) - 1] = '\0'; /* cut trailing '\n' */ @@ -4539,7 +4539,7 @@ insert_from_header( # else p = rfc1522_encode(from_buff, tinrc.mm_charset, TRUE); # endif /* CHARSET_CONVERSION */ - if (GNKSA_OK != gnksa_check_from(p)) { /* error in address */ + if (gnksa_check_from(p) != GNKSA_OK) { /* error in address */ error_message(2, _(txt_invalid_from), from_buff); free(p); unlink(outfile); @@ -4557,7 +4557,7 @@ insert_from_header( # else p = rfc1522_encode(from_name, tinrc.mm_charset, FALSE); # endif /* CHARSET_CONVERSION */ - if (GNKSA_OK != gnksa_check_from(p + 6)) { /* error in address */ + if (gnksa_check_from(p + 6) != GNKSA_OK) { /* error in address */ error_message(2, _(txt_invalid_from), from_name + 6); free(p); unlink(outfile); @@ -4759,11 +4759,11 @@ submit_mail_file( free_and_init_header(&hdr); } } - if (NULL != fcc) { + if (fcc != NULL) { if (mailed && strlen(fcc)) { char a_mailbox[PATH_LEN]; - if (0 == strfpath(fcc, a_mailbox, sizeof(a_mailbox), group, TRUE)) + if (!strfpath(fcc, a_mailbox, sizeof(a_mailbox), group, TRUE)) STRCPY(a_mailbox, fcc); if (!append_mail(file, userid, a_mailbox)) { /* TODO: error handling */ @@ -5126,7 +5126,7 @@ build_messageid( /* * I've seen passwd->pw_name with spaces in it (cygwin) and we use * that in the !FROGERY case -> disallow 'common' junk which is not - * catched by the gnksa_check_from() + * caught by the gnksa_check_from() */ if (damaged_id(buf)) return NULL; diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/prompt.c tin-2.4.3/src/prompt.c --- tin-2.4.2/src/prompt.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/prompt.c 2018-11-23 16:32:15.991492545 +0100 @@ -6,7 +6,7 @@ * Updated : 2017-10-18 * Notes : * - * Copyright (c) 1991-2018 Iain Lea + * Copyright (c) 1991-2019 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/read.c tin-2.4.3/src/read.c --- tin-2.4.2/src/read.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/read.c 2018-11-23 16:32:16.015493517 +0100 @@ -5,7 +5,7 @@ * Created : 1997-04-10 * Updated : 2016-07-29 * - * Copyright (c) 1997-2018 Jason Faultless + * Copyright (c) 1997-2019 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -229,7 +229,7 @@ tin_read( fprintf(stderr, "tin_read(%s)", strerror(errno)); #endif /* DEBUG */ - if (ptr == 0) /* End of data? */ + if (ptr == NULL) /* End of data? */ return NULL; /* diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/refs.c tin-2.4.3/src/refs.c --- tin-2.4.2/src/refs.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/refs.c 2018-11-23 16:32:16.039494489 +0100 @@ -8,7 +8,7 @@ * Credits : Richard Hodson * hash_msgid, free_msgid * - * Copyright (c) 1996-2018 Jason Faultless + * Copyright (c) 1996-2019 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/regex.c tin-2.4.3/src/regex.c --- tin-2.4.2/src/regex.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/regex.c 2018-11-23 16:32:16.063495461 +0100 @@ -7,7 +7,7 @@ * Notes : Regular expression subroutines * Credits : * - * Copyright (c) 1997-2018 Jason Faultless + * Copyright (c) 1997-2019 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -148,7 +148,7 @@ highlight_regexes( int color) { char *ptr; - int offsets[6]; /* we are not interrested in any supatterns, so 6 is sufficient */ + int offsets[6]; /* we are not interested in any subpatterns, so 6 is sufficient */ int offsets_size = ARRAY_SIZE(offsets); #ifdef USE_CURSES char buf[LEN]; diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/rfc1524.c tin-2.4.3/src/rfc1524.c --- tin-2.4.2/src/rfc1524.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/rfc1524.c 2018-11-25 09:47:40.265368958 +0100 @@ -3,10 +3,10 @@ * Module : rfc1524.c * Author : Urs Janssen , Jason Faultless * Created : 2000-05-15 - * Updated : 2013-11-21 + * Updated : 2018-11-25 * Notes : mailcap parsing as defined in RFC 1524 * - * Copyright (c) 2000-2018 Urs Janssen , Jason Faultless + * Copyright (c) 2000-2019 Urs Janssen , Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -71,16 +71,14 @@ get_mailcap_entry( char buf[LEN]; char filename[LEN]; /* name of current mailcap file */ char mailcap[LEN]; /* full match */ - char *mailcaps = NULL; /* possible mailcap files */ + char *mailcaps; /* possible mailcap files */ char wildcap[LEN]; /* basetype match */ t_mailcap *foo = (t_mailcap *) 0; /* build list of mailcap files */ - if ((ptr = getenv("MAILCAPS")) != NULL && strlen(ptr)) - mailcaps = my_strdup(ptr); - if (mailcaps != NULL) { - mailcaps = my_realloc(mailcaps, strlen(mailcaps) + strlen(DEFAULT_MAILCAPS) + 2); - strcat(strcat(mailcaps, ":"), DEFAULT_MAILCAPS); + if ((ptr = getenv("MAILCAPS")) != NULL && strlen(ptr)) { + mailcaps = my_malloc(strlen(ptr) + strlen(DEFAULT_MAILCAPS) + 2); + sprintf(mailcaps, "%s:%s", ptr, DEFAULT_MAILCAPS); } else mailcaps = my_strdup(DEFAULT_MAILCAPS); @@ -114,7 +112,7 @@ get_mailcap_entry( if (!strncasecmp(ptr + strlen(content_types[part->type]) + 1, part->subtype, strlen(part->subtype))) { /* full match, so parse line and evaluate test if given. */ STRCPY(mailcap, ptr); - FreeAndNull(foo); + FreeIfNeeded(foo); foo = parse_mailcap_line(mailcap, part, path); if (foo != NULL) { fclose(fp); /* perfect match with test succeeded (if given) */ @@ -125,7 +123,7 @@ get_mailcap_entry( if ((*(ptr2 + 1) == '*') || (*(ptr2 + 1) == ';')) { /* wildmat match */ if (!strlen(wildcap)) { /* we don't already have a wildmat match */ STRCPY(wildcap, buf); - FreeAndNull(foo); + FreeIfNeeded(foo); foo = parse_mailcap_line(wildcap, part, path); if (foo == NULL) /* test failed */ wildcap[0] = '\0'; /* ignore match */ @@ -161,7 +159,7 @@ parse_mailcap_line( const char *path) { char *ptr, *optr, *buf; - int i = MAILCAPFIELDS - 2; /* max MAILCAPFIELDS - required fileds */ + int i = MAILCAPFIELDS - 2; /* max MAILCAPFIELDS - required fields */ t_mailcap *tmailcap; /* malloc and init */ @@ -182,7 +180,7 @@ parse_mailcap_line( optr = ptr = my_strdup(mailcap); - /* get required entrys */ + /* get required entries */ ptr = get_mailcap_field(ptr); buf = my_calloc(1, strlen(content_types[part->type]) + strlen(part->subtype) + 2); sprintf(buf, "%s/%s", content_types[part->type], part->subtype); @@ -373,7 +371,7 @@ expand_mailcap_meta( * we do a check here */ if (space < 10) { /* 'worst'case are two chars ... */ - olen = strlen(line); /* get current legth of string */ + olen = strlen(line); /* get current length of string */ space += linelen; /* recalc available space */ linelen <<= 1; /* double maxlen */ line = my_realloc(line, linelen); @@ -381,17 +379,17 @@ expand_mailcap_meta( lptr = line + olen; /* adjust pointer to current position */ } - if ('\\' == *ptr) { + if (*ptr == '\\') { ptr++; - if (('\\' == *ptr) || ('%' == *ptr)) { + if ((*ptr == '\\') || (*ptr == '%')) { *lptr++ = *ptr++; space--; } continue; } - if ('%' == *ptr) { + if (*ptr == '%') { ptr++; - if ('{' == *ptr) { /* Content-Type parameter */ + if (*ptr == '{') { /* Content-Type parameter */ char *end; if ((end = strchr(ptr, '}')) != NULL) { @@ -421,11 +419,11 @@ expand_mailcap_meta( } continue; #if 0 /* TODO */ - } else if ('F' == *ptr) { /* Content-Types and Filenames of sub parts */ - } else if ('n' == *ptr) { /* Number of sub parts */ + } else if (*ptr == 'F') { /* Content-Types and Filenames of sub parts */ + } else if (*ptr == 'n') { /* Number of sub parts */ } #endif /* 0 */ - } else if ('s' == *ptr) { /* Filename */ + } else if (*ptr == 's') { /* Filename */ const char *nptr = escape_shell_meta_chars ? escape_shell_meta(path, quote) : path; CHECK_SPACE(strlen(nptr) + 2); @@ -434,7 +432,7 @@ expand_mailcap_meta( space -= strlen(line); ptr++; continue; - } else if ('t' == *ptr) { /* Content-Type */ + } else if (*ptr == 't') { /* Content-Type */ const char *nptr = escape_shell_meta_chars ? escape_shell_meta(part->subtype, quote) : part->subtype; CHECK_SPACE((strlen(content_types[part->type]) + 1 + strlen(nptr))); @@ -453,9 +451,9 @@ expand_mailcap_meta( } if (escape_shell_meta_chars) { - if (('\'' == *ptr) && (quote != dbl_quote)) + if ((*ptr == '\'') && (quote != dbl_quote)) quote = (quote == no_quote ? sgl_quote : no_quote); - else if (('"' == *ptr) && (quote != sgl_quote)) + else if ((*ptr == '"') && (quote != sgl_quote)) quote = (quote == no_quote ? dbl_quote : no_quote); } diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/rfc2045.c tin-2.4.3/src/rfc2045.c --- tin-2.4.2/src/rfc2045.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/rfc2045.c 2018-11-23 16:32:16.111497405 +0100 @@ -3,10 +3,10 @@ * Module : rfc2045.c * Author : Chris Blum * Created : 1995-09-01 - * Updated : 2017-02-17 + * Updated : 2018-11-22 * Notes : RFC 2045/2047 encoding * - * Copyright (c) 1995-2018 Chris Blum + * Copyright (c) 1995-2019 Chris Blum * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -298,7 +298,7 @@ put_rest( /* rest is now empty */ FreeAndNull(*rest); - (*line)[put_chars] = '\0'; /* don't count the termining NULL! */ + (*line)[put_chars] = '\0'; /* don't count the terminating NULL! */ return put_chars; } @@ -410,7 +410,7 @@ read_decoded_base64_line( *max_line_len <<= 1; *line = my_realloc(*line, *max_line_len); } - if ((0 == put_chars) || ('\n' != (*line)[put_chars - 1])) + if ((put_chars == 0) || ((*line)[put_chars - 1] != '\n')) (*line)[put_chars++] = '\n'; (*line)[put_chars] = '\0'; return lines_read; @@ -490,7 +490,7 @@ read_decoded_qp_line( buflen <<= 1; buf = my_realloc(buf, buflen); } - strncat(buf, buf2, buflen); + strncat(buf, buf2, buflen - 2); } while ((c == '=') && (lines_read < max_lines_to_read)); /* * re-add newline and NULL termination at end of line diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/rfc2046.c tin-2.4.3/src/rfc2046.c --- tin-2.4.2/src/rfc2046.c 2017-12-08 08:54:36.000000000 +0100 +++ tin-2.4.3/src/rfc2046.c 2018-11-23 16:32:16.143498702 +0100 @@ -3,10 +3,10 @@ * Module : rfc2046.c * Author : Jason Faultless * Created : 2000-02-18 - * Updated : 2017-10-11 + * Updated : 2018-11-22 * Notes : RFC 2046 MIME article parsing * - * Copyright (c) 2000-2018 Jason Faultless + * Copyright (c) 2000-2019 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -138,36 +138,60 @@ boundary_cmp( { size_t blen = strlen(boundary); size_t len; + char *e, *l; int nl; if ((len = strlen(line)) == 0) return BOUND_NONE; - nl = line[len - 1] == '\n'; - - if (len != blen + 2 + nl && len != blen + 4 + nl) + if (blen + 2 > len) return BOUND_NONE; - if (line[0] != '-' || line[1] != '-') + /* remove traing whites as per RFC 2046 5.1.1 */ + l = my_strdup(line); + e = l + len - 1; + while(e > l + blen + 1 && isspace(*e)) + *e-- = '\0'; + + len = strlen(l); + + nl = l[len - 1] == '\n'; + + if (len != blen + 2 + nl && len != blen + 4 + nl) { + free(l); return BOUND_NONE; + } + if (l[0] != '-' || l[1] != '-') { + free(l); + return BOUND_NONE; + } - if (strncmp(line + 2, boundary, blen) != 0) + if (strncmp(l + 2, boundary, blen) != 0) { + free(l); return BOUND_NONE; + } - if (line[blen + 2] != '-') { - if (nl ? line[blen + 2] == '\n' : line[blen + 2] == '\0') + if (l[blen + 2] != '-') { + if (nl ? l[blen + 2] == '\n' : l[blen + 2] == '\0') { + free(l); return BOUND_START; - else + } else { + free(l); return BOUND_NONE; + } } - if (line[blen + 3] != '-') + if (l[blen + 3] != '-') { + free(l); return BOUND_NONE; + } - if (nl ? line[blen + 4] == '\n' : line[blen + 4] == '\0') + if (nl ? l[blen + 4] == '\n' : l[blen + 4] == '\0') { + free(l); return BOUND_END; - else - return BOUND_NONE; + } + free(l); + return BOUND_NONE; } @@ -202,7 +226,7 @@ static char * skip_space( char *source) { - while ((*source) && ((' ' == *source) || ('\t' == *source))) + while ((*source) && ((*source == ' ') || (*source == '\t'))) source++; return *source ? source : NULL; } @@ -294,15 +318,15 @@ get_quoted_string( ptr = *dest; source++; /* skip over double quote */ while (*source) { - if ('\\' == *source) { + if (*source == '\\') { quote = TRUE; /* next char as-is */ - if ('\\' == *++source) { + if (*++source == '\\') { *ptr++ = *source++; quote = FALSE; } continue; } - if (('"' == *source) && !quote) + if ((*source == '"') && !quote) break; /* end of quoted-string */ *ptr++ = *source++; quote = FALSE; @@ -404,7 +428,7 @@ skip_equal_sign( if (!(source = skip_space(source))) return NULL; - if ('=' != *source++) + if (*source++ != '=') /* no equal sign, invalid header, stop parsing here */ return NULL; @@ -463,7 +487,7 @@ parse_params( } /* catch parameter value; may be surrounded by double quotes */ - if ('"' == *param) /* parse quoted-string */ + if (*param == '"') /* parse quoted-string */ param = get_quoted_string(param, &value); else { /* parse token */ @@ -485,9 +509,9 @@ parse_params( content->params = ptr; /* advance pointer to next parameter */ - while ((*param) && (';' != *param)) + while ((*param) && (*param != ';')) param++; - if (';' == *param) + if (*param == ';') param++; } } @@ -1528,7 +1552,7 @@ art_open( /* * TODO: compare art->msgid and artinfo->hdr.messageid and issue a - * warinng (once) about broken overviews if they differ + * warning (once) about broken overviews if they differ */ if ((artinfo->tex2iso = ((group->attribute->tex2iso_conv) ? is_art_tex_encoded(artinfo->raw) : FALSE))) @@ -1543,7 +1567,7 @@ art_open( #endif /* DEBUG_ART */ /* - * If Newsgroups is empty its a good bet the article is a mail article + * If Newsgroups is empty it is a good bet the article is a mail article * TODO: Why do this ? */ if (!artinfo->hdr.newsgroups) diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/rfc2047.c tin-2.4.3/src/rfc2047.c --- tin-2.4.2/src/rfc2047.c 2017-12-08 08:54:37.000000000 +0100 +++ tin-2.4.3/src/rfc2047.c 2018-11-24 13:36:24.949858470 +0100 @@ -3,10 +3,10 @@ * Module : rfc2047.c * Author : Chris Blum * Created : 1995-09-01 - * Updated : 2017-03-28 + * Updated : 2018-11-23 * Notes : MIME header encoding/decoding stuff * - * Copyright (c) 1995-2018 Chris Blum + * Copyright (c) 1995-2019 Chris Blum * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -232,16 +232,30 @@ rfc1522_decode( char *c, *sc; const char *d; char *t; -#define BUFFER_LEN 2048 - static char buffer[BUFFER_LEN]; + static char *buffer = NULL; + static int buffer_len = 0; size_t max_len; char charset[1024]; char encoding; t_bool adjacentflag = FALSE; + if (!s) { + FreeAndNull(buffer); + return NULL; + } + charset[0] = '\0'; c = my_strdup(s); max_len = strlen(c) + 1; + + if (!buffer) { + buffer_len = max_len; + buffer = my_malloc((size_t) buffer_len); + } else if (max_len > (size_t) buffer_len) { + buffer_len = max_len; + buffer = my_realloc(buffer, (size_t) buffer_len); + } + t = buffer; /* @@ -257,7 +271,7 @@ rfc1522_decode( #endif /* !CHARSET_CONVERSION */ sc = c; - while (*c && t - buffer < BUFFER_LEN - 1) { + while (*c && t - buffer < buffer_len - 1) { if (*c != '=') { if (adjacentflag && isspace((unsigned char) *c)) { const char *dd; @@ -312,8 +326,8 @@ rfc1522_decode( *(tmpbuf + i) = '\0'; process_charsets(&tmpbuf, &max_len, charset, tinrc.mm_local_charset, FALSE); chars_to_copy = strlen(tmpbuf); - if (chars_to_copy > BUFFER_LEN - (t - buffer) - 1) - chars_to_copy = BUFFER_LEN - (t - buffer) - 1; + if (chars_to_copy > buffer_len - (t - buffer) - 1) + chars_to_copy = buffer_len - (t - buffer) - 1; strncpy(t, tmpbuf, chars_to_copy); free(tmpbuf); t += chars_to_copy; @@ -327,7 +341,7 @@ rfc1522_decode( } } } - while (d != c && t - buffer < BUFFER_LEN - 1) + while (d != c && t - buffer < buffer_len - 1) *t++ = *d++; } *t = '\0'; @@ -563,7 +577,7 @@ rfc1522_do_encode( static const char *struct_header[] = { "Approved: ", "From: ", "Originator: ", "Reply-To: ", "Sender: ", "X-Cancelled-By: ", "X-Comment-To: ", - "X-Submissions-To: ", "To: ", "Cc: ", "Bcc: ", "X-Originator: ", 0 }; + "X-Submissions-To: ", "To: ", "Cc: ", "Bcc: ", "X-Originator: ", NULL }; const char **strptr = struct_header; do { @@ -821,7 +835,7 @@ every "word" were a space ... */ column++; } } - FreeAndNull(buffer); + FreeIfNeeded(buffer); buffer = new_buffer; } *t = '\0'; diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/save.c tin-2.4.3/src/save.c --- tin-2.4.2/src/save.c 2017-12-08 08:54:37.000000000 +0100 +++ tin-2.4.3/src/save.c 2018-11-24 13:29:03.480027458 +0100 @@ -3,10 +3,10 @@ * Module : save.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2017-08-21 + * Updated : 2018-11-23 * Notes : * - * Copyright (c) 1991-2018 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2019 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -573,7 +573,7 @@ save_and_process_art( /* * Extract/view parts from multipart articles if required - * libuu does this as part of it's own processing + * libuu does this as part of its own processing */ #ifndef HAVE_LIBUU if (post_process) { @@ -957,7 +957,7 @@ post_process_uud( case MIDDLE: /* - * TODO: replace hardcoded length check (uue lines are not + * TODO: replace hard coded length check (uue lines are not * required to be 60 chars long (45 encoded chars) * ('M' == 60 * 3 / 4 + ' ' == 77)) */ @@ -1837,7 +1837,7 @@ build_attachment_line( #endif /* USE_CURSES */ part = get_part(i); - namelen = strwidth(_(txt_attachment_no_name)); + namelen = MIN(cCOLS - 13 - info_len - 8, strwidth(_(txt_attachment_no_name))); tagged = get_tagged(i); if (!(name = get_filename(part->params))) { @@ -2263,7 +2263,7 @@ process_part( const char *savepath, enum action what) { - FILE *infile = NULL; + FILE *infile; char buf[2048], buf2[2048]; int count; int i, line_count; diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/screen.c tin-2.4.3/src/screen.c --- tin-2.4.2/src/screen.c 2017-12-08 08:54:37.000000000 +0100 +++ tin-2.4.3/src/screen.c 2018-12-04 14:31:00.696858992 +0100 @@ -3,10 +3,10 @@ * Module : screen.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2017-03-28 + * Updated : 2018-12-04 * Notes : * - * Copyright (c) 1991-2018 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2019 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -62,7 +62,7 @@ stow_cursor( /* - * helper for the varius *_message() functions + * helper for the various *_message() functions * returns a pointer to an allocated buffer with the formatted message * must be freed if not needed anymore */ @@ -71,17 +71,21 @@ fmt_message( const char *fmt, va_list ap) { - char *msg; + size_t size = LEN; + char *msg = my_malloc(size); + int used; + va_list aq; + + while (1) { + begin_va_copy(aq, ap); + used = vsnprintf(msg, size, fmt, aq); + end_va_copy(aq); -#ifdef HAVE_VASPRINTF - if (vasprintf(&msg, fmt, ap) == -1) /* something went wrong */ -#endif /* HAVE_VASPRINTF */ - { - size_t size = LEN; - - msg = my_malloc(size); - /* TODO: realloc msg if necessary */ - vsnprintf(msg, size, fmt, ap); + if (used >= 0 && used < (int) size) + break; + + size <<= 1; + msg = my_realloc(msg, size); } return msg; @@ -128,7 +132,7 @@ wait_message( const char *fmt, ...) { - char *buf; + char *buf, *msg; va_list ap; va_start(ap, fmt); @@ -139,7 +143,22 @@ wait_message( #endif /* HAVE_COLOR */ buf = fmt_message(fmt, ap); - my_fputs(buf, stdout); + /* test for multiline messages */ + if (strrchr(buf, '\n')) { + char *from, *to; + + for (from = buf; *from && (to = strchr(from, '\n')); from = ++to) { + *to = '\0'; + msg = strunc(from, cCOLS - 1); + my_fputs(msg, stdout); + my_fputc('\n', stdout); + free(msg); + } + } else { + msg = strunc(buf, cCOLS - 1); + my_fputs(msg, stdout); + free(msg); + } free(buf); #ifdef HAVE_COLOR diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/search.c tin-2.4.3/src/search.c --- tin-2.4.2/src/search.c 2017-12-08 08:54:37.000000000 +0100 +++ tin-2.4.3/src/search.c 2018-11-23 16:32:16.247502913 +0100 @@ -3,10 +3,10 @@ * Module : search.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2015-05-20 + * Updated : 2018-01-29 * Notes : * - * Copyright (c) 1991-2018 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2019 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -86,7 +86,7 @@ get_search_pattern( *forward = last_forward; my_strncpy(def, last_pattern, LEN); } else { - sprintf(tmpbuf, (*forward ? fwd_msg : bwd_msg), def); + snprintf(tmpbuf, sizeof(tmpbuf), (*forward ? fwd_msg : bwd_msg), def); if (!prompt_string_default(tmpbuf, def, _(txt_no_search_string), which_hist)) return NULL; @@ -125,7 +125,7 @@ get_search_pattern( * A gross hack to simulate substrings with wildmat() */ /* TODO: somehow use REGEX_FMT here? */ - sprintf(tmpbuf, "*%s*", def); + snprintf(tmpbuf, sizeof(tmpbuf), "*%s*", def); return tmpbuf; } diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/select.c tin-2.4.3/src/select.c --- tin-2.4.2/src/select.c 2017-12-08 08:54:37.000000000 +0100 +++ tin-2.4.3/src/select.c 2018-12-18 10:48:11.774905401 +0100 @@ -3,10 +3,10 @@ * Module : select.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2017-03-28 + * Updated : 2018-11-22 * Notes : * - * Copyright (c) 1991-2018 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2019 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1031,7 +1031,7 @@ skip_newgroups( * my_group[] if group is added or was already there. Return -1 if group * is not in active[] * - * NOTE: can't be static due to my_group_add() marco + * NOTE: can't be static due to my_group_add() macro */ int add_my_group( @@ -1298,7 +1298,7 @@ toggle_my_groups( } } #else - /* preserv group ordering based on newsrc */ + /* preserve group ordering based on newsrc */ if ((fp = fopen(newsrc, "r")) == NULL) return; @@ -1443,7 +1443,7 @@ lookup_msgid( if (nntp_caps.hdr_cmd) { snprintf(buf, sizeof(buf), "%s Newsgroups %s", nntp_caps.hdr_cmd, msgid); - ret = new_nntp_command(buf, (nntp_caps.type == CAPABILITIES) ? OK_HDR : OK_HEAD, NULL, 0); + ret = new_nntp_command(buf, (nntp_caps.type == CAPABILITIES) ? OK_HDR : OK_HEAD, NULL, 0); switch (ret) { case OK_HEAD: @@ -1469,7 +1469,6 @@ lookup_msgid( if (ret == OK_HDR) { /* RFC 3977 ("0 %s", grp) */ if (*ptr == '0' && (*(ptr + 1) == ' ' || *(ptr + 1) == '\t')) r = ptr + 2; - } if (r) @@ -1481,7 +1480,7 @@ lookup_msgid( if (!r) { # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "lookup_msgid(%s) response empty or not recognized", buf); # endif /* DEBUG */ if (!nntp_caps.xpat) @@ -1527,7 +1526,7 @@ lookup_msgid( if (!r) { # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "lookup_msgid(%s) response empty or not recognized", buf); # endif /* DEBUG */ info_message(_(txt_lookup_func_not_available)); @@ -1664,7 +1663,7 @@ static struct t_group * get_group_from_list( char *newsgroups) { - char *ptr; + char *ptr, *tr; t_bool found = FALSE; struct t_group *group = NULL; @@ -1673,7 +1672,8 @@ get_group_from_list( /* find first available group of type news */ do { - group = group_find(ptr, TRUE); + tr = str_trim(ptr); + group = group_find(tr, TRUE); if (group && group->type == GROUP_TYPE_NEWS) found = TRUE; } while (!found && (ptr = strtok(NULL, ",")) != NULL); diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/sigfile.c tin-2.4.3/src/sigfile.c --- tin-2.4.2/src/sigfile.c 2017-12-08 08:54:37.000000000 +0100 +++ tin-2.4.3/src/sigfile.c 2018-11-23 16:32:16.299505020 +0100 @@ -3,10 +3,10 @@ * Module : sigfile.c * Author : M. Gleason & I. Lea * Created : 1992-10-17 - * Updated : 2017-08-02 + * Updated : 2018-11-22 * Notes : Generate random signature for posting/mailing etc. * - * Copyright (c) 1992-2018 Mike Gleason + * Copyright (c) 1992-2019 Mike Gleason * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -62,7 +62,7 @@ msg_write_signature( char pathfixed[PATH_LEN]; #ifdef NNTP_INEWS - if (read_news_via_nntp && 0 == strcasecmp(tinrc.inews_prog, INTERNAL_CMD)) + if (read_news_via_nntp && !strcasecmp(tinrc.inews_prog, INTERNAL_CMD)) include_dot_signature = TRUE; #endif /* NNTP_INEWS */ diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/signal.c tin-2.4.3/src/signal.c --- tin-2.4.2/src/signal.c 2017-12-08 08:54:37.000000000 +0100 +++ tin-2.4.3/src/signal.c 2018-11-23 16:32:16.323505992 +0100 @@ -3,10 +3,10 @@ * Module : signal.c * Author : I.Lea * Created : 1991-04-01 - * Updated : 2016-07-29 + * Updated : 2018-02-15 * Notes : signal handlers for different modes and window resizing * - * Copyright (c) 1991-2018 Iain Lea + * Copyright (c) 1991-2019 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -423,7 +423,7 @@ signal_handler( #if defined(HAVE_ALARM) && defined(SIGALRM) case SIGALRM: # ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "get_server() %d sec elapsed without response", tinrc.nntp_read_timeout_secs); # endif /* DEBUG */ tin_done(NNTP_ERROR_EXIT, "NNTP connection error. Exiting..."); diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/strftime.c tin-2.4.3/src/strftime.c --- tin-2.4.2/src/strftime.c 2017-12-08 08:54:37.000000000 +0100 +++ tin-2.4.3/src/strftime.c 2018-11-23 16:32:16.347506964 +0100 @@ -3,8 +3,8 @@ * Module : strftime.c * Author : A. Robbins & I. Lea * Created : 1991-02-01 - * Updated : 1993-08-15 - * Notes : Relatively quick-and-dirty implemenation of ANSI library + * Updated : 2018-04-04 + * Notes : Relatively quick-and-dirty implementation of ANSI library * routine for System V Unix systems. * If target system already has strftime() call the #define * HAVE_STRFTIME can be set to use it. @@ -12,7 +12,7 @@ * tm = localtime(&secs); * num = strftime(buf, sizeof(buf), "%a %d-%m-%y %H:%M:%S", tm); * - * Copyright (c) 1991-2018 Arnold Robbins + * Copyright (c) 1991-2019 Arnold Robbins * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -67,7 +67,7 @@ my_strftime( #ifdef HAVE_STRFTIME return strftime(s, maxsize, format, timeptr); #else - char *endp = s + maxsize; + char *endp; char *start = s; char tbuf[100]; int i; @@ -108,6 +108,7 @@ my_strftime( # endif /* HAVE_SETTZ */ #endif /* HAVE_TZSET */ + endp = s + maxsize; for (; *format && s < endp - 1; format++) { tbuf[0] = '\0'; if (*format != '%') { diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/string.c tin-2.4.3/src/string.c --- tin-2.4.2/src/string.c 2017-12-08 08:54:37.000000000 +0100 +++ tin-2.4.3/src/string.c 2018-11-23 16:32:16.375508098 +0100 @@ -3,10 +3,10 @@ * Module : string.c * Author : Urs Janssen * Created : 1997-01-20 - * Updated : 2017-02-17 + * Updated : 2018-07-20 * Notes : * - * Copyright (c) 1997-2018 Urs Janssen + * Copyright (c) 1997-2019 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -69,7 +69,7 @@ * special ltoa() * converts value into a string with a maxlen of digits (usually should be * >=4), last char may be one of the following: - * 'k'ilo, 'M'ega, 'G'iga, 'T'erra, 'P'eta, 'E'xa, 'Z'etta, 'Y'otta, + * 'k'ilo, 'M'ega, 'G'iga, 'T'era, 'P'eta, 'E'xa, 'Z'etta, 'Y'otta, * 'X'ona, 'W'eka, 'V'unda, 'U'da (these last 4 are no official SI-prefixes) * or 'e' if an error occurs */ @@ -690,11 +690,11 @@ sh_format( * the whole string rather than escaping individual chars. */ if (quote == '"') { - fix = (strchr(SH_DOUBLE, *src) != 0); + fix = (strchr(SH_DOUBLE, *src) != NULL); } else if (quote == '\'') { - fix = (strchr(SH_SINGLE, *src) != 0); + fix = (strchr(SH_SINGLE, *src) != NULL); } else - fix = (strchr(SH_META, *src) != 0); + fix = (strchr(SH_META, *src) != NULL); if (fix) { SH_FORMAT('\\'); } @@ -755,7 +755,7 @@ strrstr( const char *ptr; size_t slen, plen; - if ((str != 0) && (pat != 0)) { + if ((str != NULL) && (pat != NULL)) { slen = strlen(str); plen = strlen(pat); @@ -1025,7 +1025,7 @@ strwidth( #define TRUNC_TAIL "..." /* * shortens 'mesg' that it occupies at most 'len' screen positions. - * If it was nessary to truncate 'mesg', " ..." is appended to the + * If it was necessary to truncate 'mesg', " ..." is appended to the * resulting string (still 'len' screen positions wide). * The resulting string is stored in 'buf'. */ @@ -1202,35 +1202,77 @@ normalize( int32_t needed, norm_len; UChar *ustr, *norm; UErrorCode status = U_ZERO_ERROR; +#ifdef HAVE_UNICODE_UNORM2_H + static const char *uname[] = {"nfc", "nfkc", "nfkc_cf"}; /* */ + const char *unamep; + UNormalization2Mode mode; +#else UNormalizationMode mode; +#endif /* !HAVE_UNICODE_UNORM2_H */ + + /* convert to UTF-16 which is used internally by ICU */ + if ((ustr = char2UChar(tmp)) == NULL) /* something went wrong, return the original string (as valid UTF8) */ + return tmp; switch (tinrc.normalization_form) { case NORMALIZE_NFD: +#ifdef HAVE_UNICODE_UNORM2_H + unamep = uname[0]; + mode = UNORM2_DECOMPOSE; +#else mode = UNORM_NFD; +#endif /* HAVE_UNICODE_UNORM2_H */ break; case NORMALIZE_NFC: +#ifdef HAVE_UNICODE_UNORM2_H + unamep = uname[0]; + mode = UNORM2_COMPOSE; +#else mode = UNORM_NFC; +#endif /* HAVE_UNICODE_UNORM2_H */ break; case NORMALIZE_NFKD: +#ifdef HAVE_UNICODE_UNORM2_H + unamep = uname[1]; + mode = UNORM2_DECOMPOSE; +#else mode = UNORM_NFKD; +#endif /* HAVE_UNICODE_UNORM2_H */ break; +#ifdef HAVE_UNICODE_UNORM2_H + case NORMALIZE_NFKC_CF: + unamep = uname[2]; + mode = UNORM2_COMPOSE; + break; +#endif /* HAVE_UNICODE_UNORM2_H */ case NORMALIZE_NFKC: default: +#ifdef HAVE_UNICODE_UNORM2_H + unamep = uname[1]; + mode = UNORM2_COMPOSE; +#else mode = UNORM_NFKC; +#endif /* HAVE_UNICODE_UNORM2_H */ } - /* convert to UTF-16 which is used internally by ICU */ - if ((ustr = char2UChar(tmp)) == NULL) /* something went wrong, return the original string (as valid UTF8) */ - return tmp; - +#ifdef HAVE_UNICODE_UNORM2_H + needed = unorm2_normalize(unorm2_getInstance(NULL, unamep, mode, &status), ustr, -1, NULL, 0, &status); +#else needed = unorm_normalize(ustr, -1, mode, 0, NULL, 0, &status); +#endif /* HAVE_UNICODE_UNORM2_H */ + status = U_ZERO_ERROR; /* reset status */ norm_len = needed + 1; norm = my_malloc(sizeof(UChar) * norm_len); +#ifdef HAVE_UNICODE_UNORM2_H + (void) unorm2_normalize(unorm2_getInstance(NULL, unamep, mode, &status), ustr, -1, norm, norm_len, &status); +#else (void) unorm_normalize(ustr, -1, mode, 0, norm, norm_len, &status); +#endif /* HAVE_UNICODE_UNORM2_H */ + if (U_FAILURE(status)) { /* something went wrong, return the original string (as valid UTF8) */ free(ustr); @@ -1302,21 +1344,22 @@ fmt_string( const char *fmt, ...) { - char *str; va_list ap; + size_t size = LEN; + char *str = my_malloc(size); + int used; + + while (1) { + va_start(ap, fmt); + used = vsnprintf(str, size, fmt, ap); + va_end(ap); - va_start(ap, fmt); -#ifdef HAVE_VASPRINTF - if (vasprintf(&str, fmt, ap) == -1) /* something went wrong */ -#endif /* HAVE_VASPRINTF */ - { - size_t size = LEN; + if (used > 0 && used < (int) size) + break; - str = my_malloc(size); - /* TODO: realloc str if necessary */ - vsnprintf(str, size, fmt, ap); + size <<= 1; + str = my_realloc(str, size); } - va_end(ap); return str; } diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/tags.c tin-2.4.3/src/tags.c --- tin-2.4.2/src/tags.c 2017-12-08 08:54:37.000000000 +0100 +++ tin-2.4.3/src/tags.c 2018-11-23 16:32:16.399509070 +0100 @@ -6,7 +6,7 @@ * Updated : 2010-04-02 * Notes : Split out from other modules * - * Copyright (c) 1999-2018 Jason Faultless + * Copyright (c) 1999-2019 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/tcurses.c tin-2.4.3/src/tcurses.c --- tin-2.4.2/src/tcurses.c 2017-12-08 08:54:37.000000000 +0100 +++ tin-2.4.3/src/tcurses.c 2018-11-23 16:32:16.423510042 +0100 @@ -3,11 +3,11 @@ * Module : tcurses.c * Author : Thomas Dickey * Created : 1997-03-02 - * Updated : 2017-10-18 + * Updated : 2018-07-02 * Notes : This is a set of wrapper functions adapting the termcap * interface of tin to use SVr4 curses (e.g., ncurses). * - * Copyright (c) 1997-2018 Thomas Dickey + * Copyright (c) 1997-2019 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -61,9 +61,9 @@ int cCOLS; static int my_innstr(char *str, int n); -# if defined(HAVE_XCURSES) && !defined(HAVE_VWPRINTW) +# if defined(HAVE_XCURSES) && !defined(HAVE_VW_PRINTW) static int -vwprintw( +vw_printw( WINDOW *w, char *fmt, va_list ap) @@ -74,7 +74,7 @@ vwprintw( vsnprintf(buffer, sizeof(buffer), fmt, ap); getyx(w, y, x); - TRACE(("vwprintw[%d/%d,%d/%d]:%s", y, cLINES, x, cCOLS, buffer)); + TRACE(("vw_printw[%d/%d,%d/%d]:%s", y, cLINES, x, cCOLS, buffer)); while (*string == '\b') string++; code = waddstr(w, string); @@ -84,7 +84,7 @@ vwprintw( } return code; } -# endif /* HAVE_XCURSES && !HAVE_VWPRINTW */ +# endif /* HAVE_XCURSES && !HAVE_VW_PRINTW */ /* @@ -657,7 +657,7 @@ my_printf( if (flag) Raw(TRUE); } else - vwprintw(stdscr, fmt, ap); + vw_printw(stdscr, fmt, ap); va_end(ap); } @@ -681,7 +681,7 @@ my_fprintf( if (flag) Raw(TRUE); } else - vwprintw(stdscr, fmt, ap); + vw_printw(stdscr, fmt, ap); va_end(ap); } @@ -843,7 +843,7 @@ my_retouch( /* * innstr can't read multibyte chars - * we use innwstr (if avaible) and convert to multibyte chars + * we use innwstr (if available) and convert to multibyte chars */ static int my_innstr( diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/thread.c tin-2.4.3/src/thread.c --- tin-2.4.2/src/thread.c 2017-12-08 08:54:37.000000000 +0100 +++ tin-2.4.3/src/thread.c 2018-11-23 16:32:16.451511176 +0100 @@ -6,7 +6,7 @@ * Updated : 2017-03-28 * Notes : * - * Copyright (c) 1991-2018 Iain Lea + * Copyright (c) 1991-2019 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/tincfg.tbl tin-2.4.3/src/tincfg.tbl --- tin-2.4.2/src/tincfg.tbl 2017-12-08 08:54:40.000000000 +0100 +++ tin-2.4.3/src/tincfg.tbl 2018-11-07 13:41:49.238381585 +0100 @@ -5,7 +5,7 @@ ; Updated : 2017-08-13 ; Notes : #defines and structs for config.c ; -; Copyright (c) 1996-2018 Thomas E. Dickey +; Copyright (c) 1996-2019 Thomas E. Dickey ; All rights reserved. ; ; Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/trace.c tin-2.4.3/src/trace.c --- tin-2.4.2/src/trace.c 2017-12-08 08:54:37.000000000 +0100 +++ tin-2.4.3/src/trace.c 2018-11-23 16:32:16.503513283 +0100 @@ -6,7 +6,7 @@ * Updated : 2001-07-22 * Notes : debugging support via TRACE macro. * - * Copyright (c) 1997-2018 Thomas Dickey + * Copyright (c) 1997-2019 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/version.c tin-2.4.3/src/version.c --- tin-2.4.2/src/version.c 2017-12-08 08:54:37.000000000 +0100 +++ tin-2.4.3/src/version.c 2018-11-23 16:32:16.527514254 +0100 @@ -6,7 +6,7 @@ * Updated : 2013-11-15 * Notes : * - * Copyright (c) 2003-2018 Urs Janssen + * Copyright (c) 2003-2019 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/xface.c tin-2.4.3/src/xface.c --- tin-2.4.2/src/xface.c 2017-12-08 08:54:37.000000000 +0100 +++ tin-2.4.3/src/xface.c 2018-11-23 16:32:16.579516360 +0100 @@ -6,7 +6,7 @@ * Updated : 2013-11-06 * Notes : * - * Copyright (c) 2003-2018 Joshua Crawford & Drazen Kacar + * Copyright (c) 2003-2019 Joshua Crawford & Drazen Kacar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -36,7 +36,7 @@ /* - * TODO: - document the used vars/files/dir in the mapage + * TODO: - document the used vars/files/dir in the manpage * - move strings to lang.c */ diff -Nurp '--exclude=.bzr*' tin-2.4.2/src/xref.c tin-2.4.3/src/xref.c --- tin-2.4.2/src/xref.c 2017-12-08 08:54:37.000000000 +0100 +++ tin-2.4.3/src/xref.c 2018-12-18 10:44:18.694058034 +0100 @@ -3,10 +3,10 @@ * Module : xref.c * Author : I. Lea & H. Brugge * Created : 1993-07-01 - * Updated : 2016-06-02 + * Updated : 2018-02-12 * Notes : * - * Copyright (c) 1993-2018 Iain Lea + * Copyright (c) 1993-2019 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -117,7 +117,7 @@ overview_xref_support( if (fields != 7) { expensive_over_parse = TRUE; #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "OVERVIEW.FMT: %s at position %d expected %d", ptr, fields, 7); #endif /* DEBUG */ } @@ -130,7 +130,7 @@ overview_xref_support( if (fields != 6) { expensive_over_parse = TRUE; #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "OVERVIEW.FMT: %s at position %d expected %d", ptr, fields, 6); #endif /* DEBUG */ } @@ -149,13 +149,13 @@ overview_xref_support( if (fields < 7) { expensive_over_parse = TRUE; #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "OVERVIEW.FMT: %s at position %d expected > %d", ptr, fields, 7); #endif /* DEBUG */ } #ifdef DEBUG else { - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "OVERVIEW.FMT: %s at position %d", ptr, fields); } #endif /* DEBUG */ @@ -170,7 +170,7 @@ overview_xref_support( if (fields != 1) { expensive_over_parse = TRUE; #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "OVERVIEW.FMT: %s at position %d expected %d", ptr, fields, 1); #endif /* DEBUG */ } @@ -183,7 +183,7 @@ overview_xref_support( if (fields != 2) { expensive_over_parse = TRUE; #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "OVERVIEW.FMT: %s at position %d expected %d", ptr, fields, 2); #endif /* DEBUG */ } @@ -196,7 +196,7 @@ overview_xref_support( if (fields != 3) { expensive_over_parse = TRUE; #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "OVERVIEW.FMT: %s at position %d expected %d", ptr, fields, 3); #endif /* DEBUG */ } @@ -209,7 +209,7 @@ overview_xref_support( if (fields != 4) { expensive_over_parse = TRUE; #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "OVERVIEW.FMT: %s at position %d expected %d", ptr, fields, 4); #endif /* DEBUG */ } @@ -222,7 +222,7 @@ overview_xref_support( if (fields != 5) { expensive_over_parse = TRUE; #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "OVERVIEW.FMT: %s at position %d expected %d", ptr, fields, 5); #endif /* DEBUG */ } @@ -235,7 +235,7 @@ overview_xref_support( if (fields != 6) { expensive_over_parse = TRUE; #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "OVERVIEW.FMT: %s at position %d expected %d", ptr, fields, 6); #endif /* DEBUG */ } @@ -248,7 +248,7 @@ overview_xref_support( if (fields != 7) { expensive_over_parse = TRUE; #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "OVERVIEW.FMT: %s at position %d expected %d", ptr, fields, 7); #endif /* DEBUG */ } @@ -272,7 +272,7 @@ overview_xref_support( if (fields < 2) { #ifdef DEBUG - if (debug & DEBUG_NNTP) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", fp ? "OVERVIEW.FMT: Empty response - using safe defaults" : "OVERVIEW.FMT: not advertized - using safe defaults"); #endif /* DEBUG */ ofmt = my_realloc(ofmt, sizeof(struct t_overview_fmt) * (8 + 1)); @@ -400,8 +400,8 @@ art_mark_xref_read( if (debug & DEBUG_NEWSRC) { debug_mesg = fmt_string("FOUND!Xref: [%s:%"T_ARTNUM_PFMT"] marked READ num_unread=[%"T_ARTNUM_PFMT"]", groupname, artnum, group->newsrc.num_unread); - debug_print_comment(debug_mesg); - debug_print_bitmap(group, NULL); + debug_print_comment(debug_mesg); + debug_print_bitmap(group, NULL); /* error_message(2, debug_mesg); */ free(debug_mesg); } diff -Nurp '--exclude=.bzr*' tin-2.4.2/tin.spec tin-2.4.3/tin.spec --- tin-2.4.2/tin.spec 2017-05-03 19:47:33.000000000 +0200 +++ tin-2.4.3/tin.spec 2018-12-05 09:56:40.416996944 +0100 @@ -1,6 +1,6 @@ Name: tin Summary: easy-to-use USENET news reader -Version: 2.4.2 +Version: 2.4.3 Release: 1 License: BSD Group: Applications/News diff -Nurp '--exclude=.bzr*' tin-2.4.2/tools/metamutt tin-2.4.3/tools/metamutt --- tin-2.4.2/tools/metamutt 2017-05-03 19:47:35.000000000 +0200 +++ tin-2.4.3/tools/metamutt 2018-10-21 23:54:28.838717064 +0200 @@ -7,7 +7,7 @@ # work as a filter without any problems. # # This script was written to use it in combination with the tin news -# reader, where you have to set the envionment variable +# reader, where you have to set the environment variable # METAMAIL=metamutt, but it should work with other programs, too. # # You need formail (from the procmail package) to use this script. If diff -Nurp '--exclude=.bzr*' tin-2.4.2/tools/opt-case.pl tin-2.4.3/tools/opt-case.pl --- tin-2.4.2/tools/opt-case.pl 2017-12-08 08:44:49.000000000 +0100 +++ tin-2.4.3/tools/opt-case.pl 2018-06-04 10:46:05.899149489 +0200 @@ -56,7 +56,7 @@ while (defined($line = <>)) { # that won't hurt, it just doesn't optimize'em if ($line =~ m/^(subj|from|msgid(?:|_last|_only)|refs_only|xref)=(.*[^\W\d_].*)$/o) { print "# rule rewritten, it might be possible that it can be further optimized\n"; - print "# check lines with (?i) if they really need to be case insensitve and if\n"; + print "# check lines with (?i) if they really need to be case insensitive and if\n"; print "# not remove leading (?i) manually\n"; print "$1=$mod$2\n"; next; diff -Nurp '--exclude=.bzr*' tin-2.4.2/tools/tinews.pl tin-2.4.3/tools/tinews.pl --- tin-2.4.2/tools/tinews.pl 2017-12-10 17:01:49.000000000 +0100 +++ tin-2.4.3/tools/tinews.pl 2018-12-20 00:06:15.973815317 +0100 @@ -1,10 +1,10 @@ #! /usr/bin/perl -w # -# reads an article on STDIN, mails any copies if requied, +# reads an article on STDIN, mails any copies if required, # signs the article and posts it. # # -# Copyright (c) 2002-2018 Urs Janssen , +# Copyright (c) 2002-2019 Urs Janssen , # Marc Brockschmidt # # Redistribution and use in source and binary forms, with or without @@ -32,7 +32,7 @@ # POSSIBILITY OF SUCH DAMAGE. # # -# TODO: - add debug mode which doesn't delete tmp-files and is verbose +# TODO: - extend debug mode to not delete tmp-files and be more verbose # - add pid to pgptmpf to allow multiple simultaneous instances # - check for /etc/nntpserver (and /etc/news/server) # - add $PGPOPTS, $PGPPATH and $GNUPGHOME support @@ -50,7 +50,7 @@ use strict; use warnings; # version Number -my $version = "1.1.49"; +my $version = "1.1.50"; my %config; @@ -556,7 +556,7 @@ sub getdate { # are defined, the sub will try to ask the user (only if # $config{'Interactive'} is != 0). sub AuthonNNTP { - my $Server = Net::NNTP->new($config{'NNTPServer'}, Reader => 1, Debug => 0, Port => $config{'NNTPPort'}) + my $Server = Net::NNTP->new($config{'NNTPServer'}, Reader => 1, Debug => $config{'debug'}, Port => $config{'NNTPPort'}) or die("$0: Can't connect to ".$config{'NNTPServer'}.":".$config{'NNTPPort'}."!\n"); my $ServerMsg = ""; my $ServerCod = $Server->code(); @@ -909,6 +909,8 @@ sub usage { print " -v show version\n"; print " -w string set Followup-To:-header to string\n"; print " -x string set Path:-header to string\n"; + print " -D enable debugging\n"; + print " -F string set References:-header to string\n"; print " -H show help\n"; print " -I do not add Injection-Date: header\n"; print " -L do not add Cancel-Lock: / Cancel-Key: headers\n"; @@ -934,6 +936,10 @@ B [B] E I B reads an article on STDIN, signs it via L or L and posts it to a news server. +The article shall not contain any raw 8-bit data or it needs to +already have the relevant MIME-headers as B will not +add any MIME-headers nor encode its input. + If the article contains To:, Cc: or Bcc: headers and mail-actions are configured it will automatically add a "Posted-And-Mailed: yes" header to the article and send out the mail-copies. @@ -944,7 +950,7 @@ Cancel-Lock: (and Cancel-Key: if require The input should have unix line endings (, '\n'). =head1 OPTIONS -X +X =over 4 @@ -1091,7 +1097,9 @@ These options are accepted for compatibi =item -B | -B | --B X<-D> X<-N> X<--debug> -These options are accepted but do not have any functionality yet. +Enable warnings about raw 8-bit data and set L in debug +mode, enable warnings about raw 8-bit data, warn about disabled options +due to lacking perl-modules or executables and unreadable files. =back @@ -1164,7 +1172,7 @@ The '-B' command-line option override X<$ORGANIZATION> X Set the article header field Organization: to the contents of the variable -if there isn't already a Organization: header in the article. The '-B' +if there isn't already an Organization: header in the article. The '-B' command-line option overrides B<$ORGANIZATION>. =item B<$DISTRIBUTION> @@ -1241,8 +1249,8 @@ B requires the following stan L, L, and L. -If the Cancel-Lock feature is enabled the following additional modules -must be installed: L, L or +If the Cancel-Lock feature (RFC 8315) is enabled the following additional +modules must be installed: L, L or L and L. sha256 and sha512 as algorithms for B are only available with L. @@ -1253,6 +1261,9 @@ L users may need to set B<$GPG_ before using B. See L for details. +B does not do any MIME encoding, its input should be already +properly encoded and have all relevant headers set. + =head1 AUTHOR Urs Janssen Eurs@tin.orgE, diff -Nurp '--exclude=.bzr*' tin-2.4.2/tools/w2r.pl tin-2.4.3/tools/w2r.pl --- tin-2.4.2/tools/w2r.pl 2017-12-08 08:42:29.000000000 +0100 +++ tin-2.4.3/tools/w2r.pl 2018-06-04 10:46:42.500670889 +0200 @@ -56,7 +56,7 @@ sub w2p { while ($wild =~ s/(.)//) { $cchar = $1; - # if char is a [, and we arn't allreay in [] + # if char is a [, and we aren't allreay in [] if ($lchar !~ m/\\/o && $cchar =~ m/\[/o) { $bmode++; $reg = $cchar;