----------------------------------------------------------------------------- MANIFEST | 78 +-- Makefile | 4 README | 5 aclocal.m4 | 2 config.guess | 8 config.sub | 17 configure | 2 configure.in | 4 doc/CHANGES | 307 -------------- doc/CHANGES.old | 295 +++++++++++++ doc/TODO | 9 doc/l10n/de.po | 217 +++++----- doc/l10n/de/tin.1 | 12 doc/l10n/de/tin.5 | 24 - doc/l10n/en_GB.po | 207 +++++---- doc/l10n/en_GB/tin.1 | 6 doc/l10n/en_GB/tin.5 | 10 doc/l10n/tin-man.pot | 189 ++++---- doc/tin.1 | 5 doc/tin.5 | 10 doc/tinews.1 | 60 ++ include/autoconf.hin | 2 include/bool.h | 2 include/bugrep.h | 2 include/debug.h | 2 include/extern.h | 2 include/keymap.h | 2 include/newsrc.h | 2 include/nntplib.h | 2 include/policy.h | 2 include/proto.h | 2 include/rfc2046.h | 2 include/stpwatch.h | 2 include/tcurses.h | 2 include/tin.h | 2 include/tinrc.h | 2 include/tnntp.h | 2 include/trace.h | 2 include/version.h | 8 po/da.po | 12 po/de.po | 20 po/en_GB.po | 12 po/et.po | 12 po/fr.po | 1007 ++++++++++++++++++++++++++++++++--------------- po/ru.po | 12 po/sv.po | 12 po/tin.pot | 12 po/tr.po | 12 po/zh_CN.po | 12 po/zh_TW.po | 12 src/active.c | 19 src/art.c | 21 src/attrib.c | 2 src/auth.c | 10 src/charset.c | 2 src/color.c | 2 src/config.c | 6 src/cook.c | 2 src/debug.c | 2 src/envarg.c | 2 src/feed.c | 6 src/filter.c | 2 src/getline.c | 10 src/global.c | 2 src/group.c | 8 src/hashstr.c | 2 src/header.c | 2 src/help.c | 2 src/inews.c | 2 src/init.c | 2 src/joinpath.c | 2 src/keymap.c | 2 src/lang.c | 4 src/list.c | 2 src/lock.c | 2 src/mail.c | 2 src/main.c | 2 src/makecfg.c | 17 src/memory.c | 2 src/mimetypes.c | 2 src/misc.c | 8 src/my_tmpfile.c | 2 src/newsrc.c | 2 src/nntplib.c | 30 - src/nrctbl.c | 2 src/options_menu.c | 2 src/page.c | 2 src/pgp.c | 2 src/post.c | 8 src/prompt.c | 2 src/read.c | 2 src/refs.c | 2 src/regex.c | 2 src/rfc1524.c | 2 src/rfc2045.c | 2 src/rfc2046.c | 10 src/rfc2047.c | 2 src/save.c | 11 src/screen.c | 2 src/search.c | 2 src/select.c | 11 src/sigfile.c | 2 src/signal.c | 2 src/strftime.c | 2 src/string.c | 3 src/tags.c | 2 src/tcurses.c | 2 src/thread.c | 2 src/tincfg.tbl | 2 src/trace.c | 2 src/version.c | 2 src/xface.c | 2 src/xref.c | 2 tin-2.4.1/po/da.gmo |binary tin-2.4.1/po/de.gmo |binary tin-2.4.1/po/en_GB.gmo |binary tin-2.4.1/po/et.gmo |binary tin-2.4.1/po/fr.gmo |binary tin-2.4.1/po/ru.gmo |binary tin-2.4.1/po/sv.gmo |binary tin-2.4.1/po/tr.gmo |binary tin-2.4.1/po/zh_CN.gmo |binary tin-2.4.1/po/zh_TW.gmo |binary tin.spec | 2 tools/tinews.pl | 61 ++ 125 files changed, 1768 insertions(+), 1219 deletions(-) ----------------------------------------------------------------------------- diff -Nurp '--exclude=.bzr*' tin-2.4.0/MANIFEST tin-2.4.1/MANIFEST --- tin-2.4.0/MANIFEST 2016-08-23 07:28:24.000000000 +0200 +++ tin-2.4.1/MANIFEST 2016-12-24 14:39:47.387812570 +0100 @@ -1,26 +1,26 @@ -MANIFEST for tin-2.4.0 (Tue Aug 23 07:28:24 CEST 2016) +MANIFEST for tin-2.4.1 (Sat Dec 24 14:39:47 CET 2016) ---------------------------------------------------- 14534 ./Makefile - 8171 ./MANIFEST - 1441 ./README + 8170 ./MANIFEST + 1383 ./README 745 ./README.MAC 976 ./README.WIN 188348 ./aclocal.m4 1081 ./conf-tin - 44493 ./config.guess - 36346 ./config.sub + 44668 ./config.guess + 36384 ./config.sub 683308 ./configure 36085 ./configure.in 7123 ./install-sh 318 ./po4a.conf 1502 ./tin.spec 18847 ./doc/ABOUT-NLS - 12487 ./doc/CHANGES - 289013 ./doc/CHANGES.old + 1060 ./doc/CHANGES + 301408 ./doc/CHANGES.old 5098 ./doc/CREDITS 1305 ./doc/DEBUG_REFS 31071 ./doc/INSTALL - 46510 ./doc/TODO + 46733 ./doc/TODO 935 ./doc/WHATSNEW 2618 ./doc/art_handling.txt 1701 ./doc/article.txt @@ -45,10 +45,10 @@ MANIFEST for tin-2.4.0 (Tue Aug 23 07:28 4947 ./doc/umlaute.txt 4246 ./doc/umlauts.txt 6957 ./doc/url_handler.1 - 137846 ./doc/tin.1 - 81120 ./doc/tin.5 + 137931 ./doc/tin.1 + 81125 ./doc/tin.5 5065 ./doc/tin.defaults - 15629 ./doc/tinews.1 + 16634 ./doc/tinews.1 2418 ./doc/tools.txt 4345 ./doc/w2r.1 2196 ./doc/wildmat.3 @@ -56,7 +56,7 @@ MANIFEST for tin-2.4.0 (Tue Aug 23 07:28 3815 ./tools/metamutt 2789 ./tools/opt-case.pl 1413 ./tools/tinlock - 36625 ./tools/tinews.pl + 38512 ./tools/tinews.pl 3786 ./tools/url_handler.pl 1657 ./tools/url_handler.sh 3347 ./tools/w2r.pl @@ -78,23 +78,23 @@ MANIFEST for tin-2.4.0 (Tue Aug 23 07:28 17326 ./include/tinrc.h 4346 ./include/tnntp.h 2264 ./include/trace.h - 2351 ./include/version.h - 35475 ./src/active.c - 76178 ./src/art.c + 2348 ./include/version.h + 35442 ./src/active.c + 76397 ./src/art.c 77850 ./src/attrib.c - 16150 ./src/auth.c + 16340 ./src/auth.c 12936 ./src/charset.c 8680 ./src/color.c - 66194 ./src/config.c + 66196 ./src/config.c 28292 ./src/cook.c 27368 ./src/curses.c 11375 ./src/debug.c 3408 ./src/envarg.c - 30724 ./src/feed.c + 30726 ./src/feed.c 57756 ./src/filter.c - 18148 ./src/getline.c + 18194 ./src/getline.c 9070 ./src/global.c - 44901 ./src/group.c + 44905 ./src/group.c 3900 ./src/hashstr.c 8229 ./src/header.c 6253 ./src/heapsort.c @@ -109,35 +109,35 @@ MANIFEST for tin-2.4.0 (Tue Aug 23 07:28 6663 ./src/lock.c 16899 ./src/mail.c 26402 ./src/main.c - 10850 ./src/makecfg.c + 10950 ./src/makecfg.c 13786 ./src/memory.c 5283 ./src/mimetypes.c - 95225 ./src/misc.c + 95229 ./src/misc.c 39379 ./src/newsrc.c - 54627 ./src/nntplib.c + 54290 ./src/nntplib.c 7758 ./src/nrctbl.c 105665 ./src/options_menu.c 66100 ./src/page.c 24137 ./src/parsdate.y 17057 ./src/plp_snprintf.c 13212 ./src/pgp.c - 152469 ./src/post.c + 152473 ./src/post.c 18910 ./src/prompt.c 10510 ./src/read.c 27501 ./src/refs.c 5482 ./src/regex.c 14526 ./src/rfc1524.c 15181 ./src/rfc2045.c - 38790 ./src/rfc2046.c + 38783 ./src/rfc2046.c 36755 ./src/rfc2047.c - 59208 ./src/save.c + 59236 ./src/save.c 13252 ./src/screen.c 18276 ./src/search.c - 40791 ./src/select.c + 40909 ./src/select.c 7748 ./src/sigfile.c 14332 ./src/signal.c 7215 ./src/strftime.c - 38640 ./src/string.c + 38653 ./src/string.c 13345 ./src/tags.c 17487 ./src/tcurses.c 3070 ./src/tmpfile.c @@ -270,14 +270,14 @@ MANIFEST for tin-2.4.0 (Tue Aug 23 07:28 145399 ./po/tin.pot 162671 ./po/da.gmo 220718 ./po/da.po - 199129 ./po/de.gmo - 238317 ./po/de.po + 199125 ./po/de.gmo + 238313 ./po/de.po 8584 ./po/en_GB.gmo 149062 ./po/en_GB.po 188803 ./po/et.gmo 226920 ./po/et.po 197197 ./po/fr.gmo - 235049 ./po/fr.po + 236204 ./po/fr.po 122249 ./po/ru.gmo 208378 ./po/ru.po 22543 ./po/sv.gmo @@ -288,12 +288,12 @@ MANIFEST for tin-2.4.0 (Tue Aug 23 07:28 183616 ./po/zh_CN.gmo 225161 ./po/zh_TW.po 183756 ./po/zh_TW.gmo - 146266 ./doc/l10n/de/tin.1 - 85859 ./doc/l10n/de/tin.5 + 146370 ./doc/l10n/de/tin.1 + 85916 ./doc/l10n/de/tin.5 130 ./doc/l10n/de.add - 360823 ./doc/l10n/de.po - 141601 ./doc/l10n/en_GB/tin.1 - 83674 ./doc/l10n/en_GB/tin.5 - 464630 ./doc/l10n/en_GB.po - 293018 ./doc/l10n/tin-man.pot -11522508 total + 361526 ./doc/l10n/de.po + 141686 ./doc/l10n/en_GB/tin.1 + 83679 ./doc/l10n/en_GB/tin.5 + 464868 ./doc/l10n/en_GB.po + 293166 ./doc/l10n/tin-man.pot +11529672 total diff -Nurp '--exclude=.bzr*' tin-2.4.0/Makefile tin-2.4.1/Makefile --- tin-2.4.0/Makefile 2016-08-23 07:28:24.000000000 +0200 +++ tin-2.4.1/Makefile 2016-12-24 14:39:46.819789419 +0100 @@ -9,9 +9,9 @@ SHELL = @SHELL@ PROJECT = tin LVER = 2 PVER = 4 -SVER = 0 +SVER = 1 VER = $(LVER).$(PVER).$(SVER) -DVER = 20160823 +DVER = 20161224 EXE = tin # directory structure diff -Nurp '--exclude=.bzr*' tin-2.4.0/README tin-2.4.1/README --- tin-2.4.0/README 2013-08-28 19:09:37.000000000 +0200 +++ tin-2.4.1/README 2016-08-24 01:58:27.977831942 +0200 @@ -34,6 +34,5 @@ The latest release is available at: or its mirrors. If you have additional questions or would like to be informed about the -latest new features/version you may subscribe to the (developers) -tin mailing lists; to subscribe write to majordomo@tin.org, asking -in the body to: subscribe and/or read news.software.readers. +latest new features/version you may subscribe to the (developers) tin +mailing lists via and/or read news.software.readers. diff -Nurp '--exclude=.bzr*' tin-2.4.0/aclocal.m4 tin-2.4.1/aclocal.m4 --- tin-2.4.0/aclocal.m4 2016-08-16 15:59:17.000000000 +0200 +++ tin-2.4.1/aclocal.m4 2016-10-12 17:31:37.701242893 +0200 @@ -5,7 +5,7 @@ dnl Created : 1995-08-24 dnl Updated : 2016-08-16 dnl Notes : dnl -dnl Copyright (c) 1995-2016 Thomas E. Dickey +dnl Copyright (c) 1995-2017 Thomas E. Dickey dnl All rights reserved. dnl dnl Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/config.guess tin-2.4.1/config.guess --- tin-2.4.0/config.guess 2016-08-10 13:05:04.000000000 +0200 +++ tin-2.4.1/config.guess 2016-10-03 17:45:29.556844036 +0200 @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2016-05-15' +timestamp='2016-10-02' # 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 @@ -999,6 +999,9 @@ EOF 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} + exit ;; openrisc*:Linux:*:*) echo or1k-unknown-linux-${LIBC} exit ;; @@ -1031,6 +1034,9 @@ EOF ppcle:Linux:*:*) echo powerpcle-unknown-linux-${LIBC} exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; diff -Nurp '--exclude=.bzr*' tin-2.4.0/config.sub tin-2.4.1/config.sub --- tin-2.4.0/config.sub 2016-06-20 14:21:20.000000000 +0200 +++ tin-2.4.1/config.sub 2016-12-24 14:39:43.935671895 +0100 @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2016-06-20' +timestamp='2016-12-24' # 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 @@ -117,7 +117,7 @@ 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* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -301,6 +301,7 @@ case $basic_machine in | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \ | riscv32 | riscv64 \ | rl78 | rx \ @@ -425,6 +426,7 @@ case $basic_machine in | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ | pyramid-* \ | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ @@ -1029,7 +1031,7 @@ case $basic_machine in ppc-* | ppcbe-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppcle | powerpclittle | ppc-le | powerpc-little) + ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) @@ -1041,7 +1043,7 @@ case $basic_machine in ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) + ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) @@ -1396,7 +1398,7 @@ case $os in | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ @@ -1408,7 +1410,7 @@ case $os in | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix*) + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1637,6 +1639,9 @@ case $basic_machine in sparc-* | *-sun) os=-sunos4.1.1 ;; + pru-*) + os=-elf + ;; *-be) os=-beos ;; diff -Nurp '--exclude=.bzr*' tin-2.4.0/configure tin-2.4.1/configure --- tin-2.4.0/configure 2016-08-23 07:28:24.000000000 +0200 +++ tin-2.4.1/configure 2016-12-24 14:39:47.075799856 +0100 @@ -636,7 +636,7 @@ fi PACKAGE=tin -VERSION=2.4.0 +VERSION=2.4.1 cat >> confdefs.h < +dnl Copyright (c) 1995-2017 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.0 +VERSION=2.4.1 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(PACKAGE) diff -Nurp '--exclude=.bzr*' tin-2.4.0/doc/CHANGES tin-2.4.1/doc/CHANGES --- tin-2.4.0/doc/CHANGES 2016-08-23 07:26:56.000000000 +0200 +++ tin-2.4.1/doc/CHANGES 2016-12-21 15:16:49.640224678 +0100 @@ -1,295 +1,24 @@ --- 2.4.0 release 20160823 "Octomore" -- - -U031) Thomas E. Dickey - ADD. update configure macros - FIX. aclocal.m4, configure, Makefile, conf-tin - -U030) Matt Anton - ADD. updated french translation - FIX. fr.po - -U029) Corinna Vinschen - BUG. missing prototypes on cygwin - FIX. aclocal.m4 - -U028) Dennis Preiser - BUG. memleak on exit due to unexpected nntp connection vanishing - FIX. art.c, memory.c - -U027) Urs Janssen - Dennis Preiser - ADD. log reconnect limit reached (debian bug #832397) - ADD. document NNTP_ERROR_EXIT code (debian bug #832397) - ADD. give error messages on exit after curses has ended (debian bug #832397) - FIX. proto.h, active.c, header.c, lang.c, mail.c, main.c, misc.c - newsrc.c, nntplib.c, page.c, read.c, select.c, signal.c, thread.c - tin.[15] - -U026) Joe Hansen - ADD. updated danish translation - FIX. da.po - -U025) Toomas Soome - ADD. updated estonian translation - FIX. et.po - --- 2.3.4 release 20160628 "Newton" -- - -U024) Dennis Preiser - ADD. hide strip_blanks option when using curses - ADD. LookupMessage ('L') to selection level if reading via NNTP - BUG. toggling inverse_okay didn't refresh Menu header - BUG. progress message when piping/printing articles looked odd - BUG. spurious revers mark in menu in !USE_CURSES case when toggling - ON/OFF options - BUG. select_format wasn't fully honored in - !USE_CURSES && !MULTIBYTE_ABLE case - BUG. strip_blanks (!USE_CURSES) wasn't always honored - FIX. config.c, feed.c, group.c, help.c, init.c, keymap.c, lang.c - options_menu.c, screen.c, select.c, thread.c, tincfg.tbl, extern.h - tin.h, tinrc.h, tin.1 - -U023) Urs Janssen - ADD. config.guess, config.sub update - ADD. LookupMessage ('L') to selection level if reading via NNTP - BUG. filter menu required = sign if filtering on exact line number - BUG. didn't compile with --disable-piping / -DDONT_HAVE_PIPING - BUG. missing checks for successful fopen of debug refs dump files - BUG. typos in debug message - FIX. active.c, filter.c, nntplib.c, refs.c, save.c, screen.c, select.c - xref.c, config.guess, config.sub, tin.1, de.po - -U022) Toomas Soome - ADD. updated estonian translation - FIX. et.po - --- 2.3.3 release 20160327 "Kinloch" -- - -U021) Glenn Spell - BUG. progress message when piping/printing articles looked odd - FIX. extern.h, feed.c, lang.c, prompt.c, screen.c - -U020) Joe Hansen - ADD. updated danish translation - FIX. da.po - -U019) Urs Janssen - BUG. single quoted lines not always colored - BUG. -Q [-nqd] didn't work with servers announcing LIST COUNTS - BUG. NNTP cmd. arguments could exhaust RFC 3977 3.1 limit - BUG. -z leaked file descriptors and memory with no unread news present - BUG. possible null pointer dereference with gmtime() and localtime() - BUG. automatic auth on non RFC 3977 servers didn't update can_post status - BUG. memleak in buffer_to_local() - BUG. overlapping strcpy in join_references() - BUG. handle missing server name in xref overview data in xref-filters - BUG. didn't remove old SCOPES-[RW], REFS.dump, REFS.info before logging - to them - BUG. ! was disallowed in local part of From - REM. idna_decode() from headers_to_display - ADD. -D 128 to purge old debug files - ADD. avoid useless strdup()/free()/realloc() - ADD. updated german translation - ADD. config.guess, config.sub update - ADD. improve -u error message - ADD. don't resend "LIST [NEWSGROUPS|COUNTS] wildmat" on reconnect - ADD. warn about "-D 1" when not using nntp - ADD. remove superfluous abs(size_t - size_t) - ADD. removed fixed buffer from create_path() - ADD. --enable-break-long-lines is now default - ADD. avoid several comma operators (to silence -Wcomma) - ADD. updated german translation - FIX. active.c, art.c, auth.c, charset.c, cook.c, debug.c, filter.c - group.c, lang.c, mail.c, main.c, misc.c, nntplib.c, page.c, post.c - rfc2046.c, rfc2047.c, save.c, screen.c, thread.c, nntplib.h,de.po - tin.1, config.guess, config.sub, de.po - -U018) Dennis Preiser - ADD. allow RFC 2231 parameter value continuation with gaps in numbering - and part numbering starting anywhere - ADD. RFC 2231 decoding of non us-ascii MIME-parameter values - ADD. fallback to RFC 2047 decoding of non us-ascii MIME-parameter values - ADD. omit charset info for non text/*-parts in the attachment menu - BUG. crash in RFC 2231 parameter value continuation if 0-part is missing - BUG. out of bounds access in buffer_to_local() on invalid multibyte - sequence - BUG. unknown evaluation order in reconnect loop - BUG. memory leak on unexpected end of file - BUG. Content-Disposition filename wasn't used if found before - Content-Type name - BUG. changing extquote_handling in 'M'enu did not immediately took effect - BUG. aborting exit of -w (post_article_and_exit) lead to endless - drain_buffer()-loop - BUG. delayed auth in read_newsrc_active_file() could lead to exit - due to empty group list - BUG. leaving a mailgroup might keep the cursor visible - BUG. when prompting for username/password string may lack termination - FIX. active.c, auth.c, cook.c, mail.c, misc.c, nntplib.c - options_menu.c, read.c, rfc2046.c, save.c, proto.h, rfc2046.h - -U017) Matt Anton - ADD. updated french translation - FIX. fr.po - -U016) Toomas Soome - ADD. updated estonian translation - FIX. et.po - --- 2.3.2 release 20151224 "Glenavullen" -- - -U015) Stefan Assmann - BUG. format string vulnerability with -Sv - FIX. save.c, select.c +-- 2.4.1 release 20161224 "Daill" -- -U014) Wei-Lun Chao - ADD. update traditional chinese translation - FIX. zh_TW.po - -U013) Mingye Wang - ADD. simplified chinese translation - FIX. zh_CN.po - -U012) Thomas E. Dickey - ADD. update configure macros - FIX. aclocal.m4 - -U011) Dennis Preiser - BUG. uue parts in mime articles were not mime decoded before uue - decoding - BUG. used freed fp if cooking of article fails - BUG. Cygwin >= 2.0 was treated as Cygwin < 1.7 - BUG. ncurses >= 6.0 wasn't recognized - BUG. possible crash on initial reconnect loop when network is down - BUG. socket not closed on early exit - BUG. memory leak when aborting index_group() from select level - BUG. memory leak when reading mailgroup articles without Message-ID - BUG. memory leak in makecfg - BUG. in thread level space calculation for %F was wrong with - S'ubject or 'P'ercent threading active - BUG. in thread level show_author was ignored with S'ubject or 'P'ercent - threading active - BUG. thread level didn't show subject with 'P'ercent or 'M'ultibyte - threading active and '%T' present in thread_format - ADD. AttachSelect and AttachPipe now perform charset translation for - text/*-parts - ADD. handle CRLF spread over two lines in base64 decoding - ADD. options to color external quotes (extquote_handling, - extquote_regex, col_extquote) - ADD. skip over RFC 2231 language parameter in encoded words - ADD. RFC 2231 parameter value continuation - ADD. allow comments in Content-* headers - REM. groupname_max_length tinrc option (replaced by select_format) - FIX. extern.h, rfc2046.h, tcurses.h, tin.h, tinrc.h, version.h, art.c - attrib.c, color.c, config.c, cook.c, group.c, init.c, lang.c - main.c, makecfg.c, memory.c, misc.c, nntplib.c, options_menu.c - page.c, rfc2045.c, rfc2046.c, rfc2047.c, save.c, select.c, string.c - thread.c, tincfg.tbl, tin.[15], configure[.in] - -U010) Joe Hansen - ADD. updated danish translation - FIX. da.po - -U009) Urs Janssen - ADD. updated german translation - ADD. config.guess, config.sub update - ADD. fix hypothetic null pointer dereference - ADD. allow hand supplied Sender header with external news - ADD. avoid useless strdup()/free() - ADD. onion TLD to disallowed TLDs - ADD. removed redundant conditions in auth code - ADD. --enable-heapsort is now default - ADD. --enable-ipv6 is now default - REM. dead code - BUG. wrong format string in CLOSEDIR macro used - BUG. uncontrolled format string in nntp error messages. - BUG. tin_errno wasn't always cleared when aborting index_group() - BUG. in batch mode rebindable keys were malloced but not freed - FIX. auth.c, cook.c, group.c, lang.c, main.c, misc.c, nntplib.c - page.c, post.c, prompt.c, rfc2047.c, search.c, thread.c, policy.h - tin.h, de.po, config.guess, config.sub, configure[.in] - Makefile[.in] - -U008) Toomas Soome - ADD. updated estonian translation - FIX. et.po - --- 2.3.1 release 20141224 "Tallant" -- - -U007) Dennis Preiser - ADD. also validate "utf8" input - FIX. misc.c - -U006) Joe Hansen - ADD. updated danish translation - FIX. da.po - -U005) Urs Janssen - ADD. fix hypothetic null pointer dereference - ADD. config.guess, config.sub update - ADD. updated german translation - FIX. proto.h, filter.c, post.c, save.c, tin.1, config.guess, config.sub - de.po - --- 2.3.0 release 20141003 "Glenfoyle" -- - -U004) Joe Hansen - ADD. updated danish translation - FIX. da.po - -U003) Urs Janssen - ADD. !HAVE_LONG_FILE_NAMES code path to my_tmpfile() - ADD. allow TLDs with up to 14 chars (.cancerresearch) in - URL_REGEX and NEWS_REGEX - BUG. memleak in normalize() if libidn is used for normalization - BUG. '-d' didn't work as it was always overwritten by tinrc setting - ADD. config.sub update - FIX. attrib.c, config.c, filter.c, mail.c, my_tmpfile.c, string.c - config.sub, tin.[15] - -U002) Dennis Preiser - BUG. in base64 encoding multibyte chars could have been broken into - multiple encoded words which is prohibited by RFC 2047 - FIX. rfc2047.c - -U001) Matt Anton - ADD. updated french translation - FIX. fr.po - --- 2.2.1 release 20140504 "Tober an Righ" -- - - 004) Dennis Preiser - BUG. don't stop utf8 validation on first \n - BUG. possible buffer overrun in build_gline(). - BUG. missing check for art->refptr in build_tline(). - ADD. handle space-stuffing from RFC 2646 4.4 - ADD. tweak URL_REGEX, don't stop before closing ) if there was an - opening ( in the URL. - ADD. allow editing of captured URL before spawning viewer - FIX. cook.c, misc.c, page.c, rfc2046.c, select.c, thread.c, rfc2046.h - tin.h - - 003) Matt Anton - ADD. updated french translation - FIX. fr.po - - 002) Toomas Soome - ADD. updated estonian translation - FIX. et.po + 002) Dennis Preiser + BUG. reconnection problem if started with '-n' and multiple + "LIST COUNTS grp1,grp2,..." were sent + BUG. overlapping strcpy(3)/wcscpy(3) + FIX. getline.c, select.c 001) Urs Janssen ADD. config.guess, config.sub update - ADD. updated german translation - ADD. no-c-format hint for xgettext - BUG. hypothetic 1 byte buffer overrun in read_newsrc_active_file() with - newsgoup names longer than 511 bytes (RFC 3977 guarantees them to - 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 - 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 + ADD. clarify ternary condition + BUG. logic error when connecting to a server in transit mode forced + user to auth even if server didn't request it + BUG. resource leak in post_process_uud() and parse_rfc2045_article() + BUG. possible nullpointer dereferenced when running out of memory in + makecfg (during compliation) + BUG. memleak if using libunistring for unicode normalization + FIX. active.c, art.c, auth.c, config.c, feed.c, group.c, makecfg.c + misc.c, nntplib.c, post.c, rfc2046.c, save.c, select.c, string.c + config.guess, config.sub, tin.5 --- 2.2.0 release 20131224 "Lochindaal" -- +-- 2.4.0 release 20160823 "Octomore" -- -For changes made till the 2.2.0 release look at CHANGES.old +For changes made till the 2.4.0 release look at CHANGES.old diff -Nurp '--exclude=.bzr*' tin-2.4.0/doc/CHANGES.old tin-2.4.1/doc/CHANGES.old --- tin-2.4.0/doc/CHANGES.old 2015-06-27 09:32:58.000000000 +0200 +++ tin-2.4.1/doc/CHANGES.old 2016-12-23 13:51:56.751830769 +0100 @@ -1,5 +1,298 @@ This file contains an overview of the changes made between -tin 1.3BETA 950824 and tin 2.2.0, for recent changes look at CHANGES +tin 1.3BETA 950824 and tin 2.4.0, for recent changes look at CHANGES + +-- 2.4.0 release 20160823 "Octomore" -- + +U031) Thomas E. Dickey + ADD. update configure macros + FIX. aclocal.m4, configure, Makefile, conf-tin + +U030) Matt Anton + ADD. updated french translation + FIX. fr.po + +U029) Corinna Vinschen + BUG. missing prototypes on cygwin + FIX. aclocal.m4 + +U028) Dennis Preiser + BUG. memleak on exit due to unexpected nntp connection vanishing + FIX. art.c, memory.c + +U027) Urs Janssen + Dennis Preiser + ADD. log reconnect limit reached (debian bug #832397) + ADD. document NNTP_ERROR_EXIT code (debian bug #832397) + ADD. give error messages on exit after curses has ended (debian bug + #832397) + FIX. proto.h, active.c, header.c, lang.c, mail.c, main.c, misc.c + newsrc.c, nntplib.c, page.c, read.c, select.c, signal.c, thread.c + tin.[15] + +U026) Joe Hansen + ADD. updated danish translation + FIX. da.po + +U025) Toomas Soome + ADD. updated estonian translation + FIX. et.po + +-- 2.3.4 release 20160628 "Newton" -- + +U024) Dennis Preiser + ADD. hide strip_blanks option when using curses + ADD. LookupMessage ('L') to selection level if reading via NNTP + BUG. toggling inverse_okay didn't refresh Menu header + BUG. progress message when piping/printing articles looked odd + BUG. spurious revers mark in menu in !USE_CURSES case when toggling + ON/OFF options + BUG. select_format wasn't fully honored in + !USE_CURSES && !MULTIBYTE_ABLE case + BUG. strip_blanks (!USE_CURSES) wasn't always honored + FIX. config.c, feed.c, group.c, help.c, init.c, keymap.c, lang.c + options_menu.c, screen.c, select.c, thread.c, tincfg.tbl, extern.h + tin.h, tinrc.h, tin.1 + +U023) Urs Janssen + ADD. config.guess, config.sub update + ADD. LookupMessage ('L') to selection level if reading via NNTP + BUG. filter menu required = sign if filtering on exact line number + BUG. didn't compile with --disable-piping / -DDONT_HAVE_PIPING + BUG. missing checks for successful fopen of debug refs dump files + BUG. typos in debug message + FIX. active.c, filter.c, nntplib.c, refs.c, save.c, screen.c, select.c + xref.c, config.guess, config.sub, tin.1, de.po + +U022) Toomas Soome + ADD. updated estonian translation + FIX. et.po + +-- 2.3.3 release 20160327 "Kinloch" -- + +U021) Glenn Spell + BUG. progress message when piping/printing articles looked odd + FIX. extern.h, feed.c, lang.c, prompt.c, screen.c + +U020) Joe Hansen + ADD. updated danish translation + FIX. da.po + +U019) Urs Janssen + BUG. single quoted lines not always colored + BUG. -Q [-nqd] didn't work with servers announcing LIST COUNTS + BUG. NNTP cmd. arguments could exhaust RFC 3977 3.1 limit + BUG. -z leaked file descriptors and memory with no unread news present + BUG. possible null pointer dereference with gmtime() and localtime() + BUG. automatic auth on non RFC 3977 servers didn't update can_post status + BUG. memleak in buffer_to_local() + BUG. overlapping strcpy in join_references() + BUG. handle missing server name in xref overview data in xref-filters + BUG. didn't remove old SCOPES-[RW], REFS.dump, REFS.info before logging + to them + BUG. ! was disallowed in local part of From + REM. idna_decode() from headers_to_display + ADD. -D 128 to purge old debug files + ADD. avoid useless strdup()/free()/realloc() + ADD. updated german translation + ADD. config.guess, config.sub update + ADD. improve -u error message + ADD. don't resend "LIST [NEWSGROUPS|COUNTS] wildmat" on reconnect + ADD. warn about "-D 1" when not using nntp + ADD. remove superfluous abs(size_t - size_t) + ADD. removed fixed buffer from create_path() + ADD. --enable-break-long-lines is now default + ADD. avoid several comma operators (to silence -Wcomma) + ADD. updated german translation + FIX. active.c, art.c, auth.c, charset.c, cook.c, debug.c, filter.c + group.c, lang.c, mail.c, main.c, misc.c, nntplib.c, page.c, post.c + rfc2046.c, rfc2047.c, save.c, screen.c, thread.c, nntplib.h,de.po + tin.1, config.guess, config.sub, de.po + +U018) Dennis Preiser + ADD. allow RFC 2231 parameter value continuation with gaps in numbering + and part numbering starting anywhere + ADD. RFC 2231 decoding of non us-ascii MIME-parameter values + ADD. fallback to RFC 2047 decoding of non us-ascii MIME-parameter values + ADD. omit charset info for non text/*-parts in the attachment menu + BUG. crash in RFC 2231 parameter value continuation if 0-part is missing + BUG. out of bounds access in buffer_to_local() on invalid multibyte + sequence + BUG. unknown evaluation order in reconnect loop + BUG. memory leak on unexpected end of file + BUG. Content-Disposition filename wasn't used if found before + Content-Type name + BUG. changing extquote_handling in 'M'enu did not immediately took effect + BUG. aborting exit of -w (post_article_and_exit) lead to endless + drain_buffer()-loop + BUG. delayed auth in read_newsrc_active_file() could lead to exit + due to empty group list + BUG. leaving a mailgroup might keep the cursor visible + BUG. when prompting for username/password string may lack termination + FIX. active.c, auth.c, cook.c, mail.c, misc.c, nntplib.c + options_menu.c, read.c, rfc2046.c, save.c, proto.h, rfc2046.h + +U017) Matt Anton + ADD. updated french translation + FIX. fr.po + +U016) Toomas Soome + ADD. updated estonian translation + FIX. et.po + +-- 2.3.2 release 20151224 "Glenavullen" -- + +U015) Stefan Assmann + BUG. format string vulnerability with -Sv + FIX. save.c, select.c + +U014) Wei-Lun Chao + ADD. update traditional chinese translation + FIX. zh_TW.po + +U013) Mingye Wang + ADD. simplified chinese translation + FIX. zh_CN.po + +U012) Thomas E. Dickey + ADD. update configure macros + FIX. aclocal.m4 + +U011) Dennis Preiser + BUG. uue parts in mime articles were not mime decoded before uue + decoding + BUG. used freed fp if cooking of article fails + BUG. Cygwin >= 2.0 was treated as Cygwin < 1.7 + BUG. ncurses >= 6.0 wasn't recognized + BUG. possible crash on initial reconnect loop when network is down + BUG. socket not closed on early exit + BUG. memory leak when aborting index_group() from select level + BUG. memory leak when reading mailgroup articles without Message-ID + BUG. memory leak in makecfg + BUG. in thread level space calculation for %F was wrong with + S'ubject or 'P'ercent threading active + BUG. in thread level show_author was ignored with S'ubject or 'P'ercent + threading active + BUG. thread level didn't show subject with 'P'ercent or 'M'ultibyte + threading active and '%T' present in thread_format + ADD. AttachSelect and AttachPipe now perform charset translation for + text/*-parts + ADD. handle CRLF spread over two lines in base64 decoding + ADD. options to color external quotes (extquote_handling, + extquote_regex, col_extquote) + ADD. skip over RFC 2231 language parameter in encoded words + ADD. RFC 2231 parameter value continuation + ADD. allow comments in Content-* headers + REM. groupname_max_length tinrc option (replaced by select_format) + FIX. extern.h, rfc2046.h, tcurses.h, tin.h, tinrc.h, version.h, art.c + attrib.c, color.c, config.c, cook.c, group.c, init.c, lang.c + main.c, makecfg.c, memory.c, misc.c, nntplib.c, options_menu.c + page.c, rfc2045.c, rfc2046.c, rfc2047.c, save.c, select.c, string.c + thread.c, tincfg.tbl, tin.[15], configure[.in] + +U010) Joe Hansen + ADD. updated danish translation + FIX. da.po + +U009) Urs Janssen + ADD. updated german translation + ADD. config.guess, config.sub update + ADD. fix hypothetic null pointer dereference + ADD. allow hand supplied Sender header with external news + ADD. avoid useless strdup()/free() + ADD. onion TLD to disallowed TLDs + ADD. removed redundant conditions in auth code + ADD. --enable-heapsort is now default + ADD. --enable-ipv6 is now default + REM. dead code + BUG. wrong format string in CLOSEDIR macro used + BUG. uncontrolled format string in nntp error messages. + BUG. tin_errno wasn't always cleared when aborting index_group() + BUG. in batch mode rebindable keys were malloced but not freed + FIX. auth.c, cook.c, group.c, lang.c, main.c, misc.c, nntplib.c + page.c, post.c, prompt.c, rfc2047.c, search.c, thread.c, policy.h + tin.h, de.po, config.guess, config.sub, configure[.in] + Makefile[.in] + +U008) Toomas Soome + ADD. updated estonian translation + FIX. et.po + +-- 2.3.1 release 20141224 "Tallant" -- + +U007) Dennis Preiser + ADD. also validate "utf8" input + FIX. misc.c + +U006) Joe Hansen + ADD. updated danish translation + FIX. da.po + +U005) Urs Janssen + ADD. fix hypothetic null pointer dereference + ADD. config.guess, config.sub update + ADD. updated german translation + FIX. proto.h, filter.c, post.c, save.c, tin.1, config.guess, config.sub + de.po + +-- 2.3.0 release 20141003 "Glenfoyle" -- + +U004) Joe Hansen + ADD. updated danish translation + FIX. da.po + +U003) Urs Janssen + ADD. !HAVE_LONG_FILE_NAMES code path to my_tmpfile() + ADD. allow TLDs with up to 14 chars (.cancerresearch) in + URL_REGEX and NEWS_REGEX + BUG. memleak in normalize() if libidn is used for normalization + BUG. '-d' didn't work as it was always overwritten by tinrc setting + ADD. config.sub update + FIX. attrib.c, config.c, filter.c, mail.c, my_tmpfile.c, string.c + config.sub, tin.[15] + +U002) Dennis Preiser + BUG. in base64 encoding multibyte chars could have been broken into + multiple encoded words which is prohibited by RFC 2047 + FIX. rfc2047.c + +U001) Matt Anton + ADD. updated french translation + FIX. fr.po + +-- 2.2.1 release 20140504 "Tober an Righ" -- + + 004) Dennis Preiser + BUG. don't stop utf8 validation on first \n + BUG. possible buffer overrun in build_gline(). + BUG. missing check for art->refptr in build_tline(). + ADD. handle space-stuffing from RFC 2646 4.4 + ADD. tweak URL_REGEX, don't stop before closing ) if there was an + opening ( in the URL. + ADD. allow editing of captured URL before spawning viewer + FIX. cook.c, misc.c, page.c, rfc2046.c, select.c, thread.c, rfc2046.h + tin.h + + 003) Matt Anton + ADD. updated french translation + FIX. fr.po + + 002) Toomas Soome + ADD. updated estonian translation + FIX. et.po + + 001) Urs Janssen + ADD. config.guess, config.sub update + ADD. updated german translation + ADD. no-c-format hint for xgettext + BUG. hypothetic 1 byte buffer overrun in read_newsrc_active_file() with + newsgoup names longer than 511 bytes (RFC 3977 guarantees them to + 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 + 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 -- 2.2.0 release 20131224 "Lochindaal" -- diff -Nurp '--exclude=.bzr*' tin-2.4.0/doc/TODO tin-2.4.1/doc/TODO --- tin-2.4.0/doc/TODO 2016-08-12 09:31:11.000000000 +0200 +++ tin-2.4.1/doc/TODO 2016-12-21 09:34:01.597031951 +0100 @@ -811,6 +811,9 @@ o check for wcsftime() and if found use least in page.c). [20130129 Urs Janssen ] +o avoid uidna_IDNToUnicode() if linked against ICU >=4.6 + [20161221 Urs Janssen ] + Docs/online help ---------------- o the documentation of PageFollowupQuoteHeaders (^W) and @@ -856,6 +859,10 @@ o document %G of strfpath() in man page Not yet classified ------------------ +o abort HEAD/NEXT loop on 5xx responses to HEAD? (see + art.c:open_art_header()) + [20161011 Urs Janssen ] + o follow $LC_COLLATE (e.g. add strxfrm() to subj_comp_*/from_comp_*)? [20160421 Urs Janssen ] @@ -923,7 +930,7 @@ o charset conversion fails when convert o add "COMPRESS DEFLATE" support once it's official? this would require a rewrite of the code which reads data from the network (which should be done anyway for TLS) as we must handle null-bytes in the stream. - + [20100122 Urs Janssen ] o the documentation suggests that novrootdir/$TIN_NOVROOTDIR defaults to diff -Nurp '--exclude=.bzr*' tin-2.4.0/doc/l10n/de/tin.1 tin-2.4.1/doc/l10n/de/tin.1 --- tin-2.4.0/doc/l10n/de/tin.1 2016-08-23 07:27:43.000000000 +0200 +++ tin-2.4.1/doc/l10n/de/tin.1 2016-12-23 13:43:20.022734675 +0100 @@ -3,7 +3,7 @@ .\" Module : tin.1 .\" Author : I. Lea, U. Janssen .\" Created : 1991-08-23 -.\" Updated : 2016-08-23 +.\" Updated : 2016-12-24 .\" 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 "23. August 2016" 2.4.0 "Usenet Newsreader" +.TH tin 1 "24. December 2016" 2.4.1 "Usenet Newsreader" .\" .\" .SH NAME @@ -811,8 +811,8 @@ even those not currently yanked in. Artikel/Gruppe Beschränkungen ein\-/ausschalten. .TP \fBToggleInfoLastLine 'i'\fP -Display the subject of the first article in the current thread in the last -line. +Betreff des ersten Artikels im aktuellen Thread in der letzten Zeile +anziegen. .TP \fBToggleInverseVideo 'I'\fP (De)aktiviere inverse Darstellung. @@ -3481,6 +3481,8 @@ Set this variable to disable the use of (e.g. metamutt). .TP \fBMM_CHARSET\fP +Benutzter MIME\-Zeichensatz, falls nicht über die tinrc\-Variable +\fBmm_charset\fP konfiguriert. .TP \fBISPELL\fP Set this variable to point to \fB\%ispell\fP(1) or a replacement and its @@ -3564,7 +3566,7 @@ Der verwendete Terminaltyp. Weitere Info \fB\%environ\fP(5). .TP \fBDISPLAY\fP -Display name, pointing to the X server; required for xface. +Anzeigename der auf den X\-Server zeigt; erforderlich für xface. .TP \fBWINDOWID\fP Used for determining terminal's X window id; required for xface. Should be diff -Nurp '--exclude=.bzr*' tin-2.4.0/doc/l10n/de/tin.5 tin-2.4.1/doc/l10n/de/tin.5 --- tin-2.4.0/doc/l10n/de/tin.5 2016-08-23 07:27:43.000000000 +0200 +++ tin-2.4.1/doc/l10n/de/tin.5 2016-12-23 13:43:20.538755746 +0100 @@ -2,7 +2,7 @@ .\" Module : tin.5 .\" Author : U. Janssen .\" Created : 2000-07-10 -.\" Updated : 2016-08-23 +.\" Updated : 2016-12-24 .\" Notes : needs a some work .\" .\" @@ -11,7 +11,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH tin 5 "23. August 2016" 2.4.0 "Usenet Newsreader" +.TH tin 5 "24. December 2016" 2.4.1 "Usenet Newsreader" .SH NAME tin, rtin \- zugehörige Dateien @@ -231,7 +231,7 @@ the default server given at compile time .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 for the user. +case. This file should be readable only by the user. .RE .PP @@ -254,7 +254,7 @@ authorization. If the password contains in double quotes ("). Usernames must not be enclosed in double quotes and thus can't contain spaces or tabs. Any line that starts with "#" is a comment. Blank lines are ignored. This file should be readable only for the -user as it contains the user's uncrypted password for reading news! +user as it contains the user's unencrypted password for reading news! .TP \fBNNTPServer\fP Vollständiger Name (FQDN) des Newsservers. @@ -288,7 +288,7 @@ news.example.com "streng geheim" james.b Der Name der Newsgruppe. .TP \fBflag\fP -a flag indicating if the group is subscribed ':' or not '!'. +Markierung die angibt ob die Gruppe abonniert ist ':' oder nicht '!'. .TP \fBArtikel\fP range of already read articles from that group; numbers separated by commas @@ -328,14 +328,14 @@ Signatur \fI${TIN_HOMEDIR:\-"$HOME"}/.sigfixed\fP .sp .RS -fixed part of a randomly generated signature +Fester Bestandteil einer zufällig erzeugten Signatur .RE .PP \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/.inputhistory\fP .sp .RS -history of last used strings +Historie der zuletzt verwendeten Zeichenfolgen .RE .PP @@ -1098,16 +1098,16 @@ posting history \fI${TIN_HOMEDIR:\-"$HOME"}/Mail/posted\fP .sp .RS -Copy of all posted articles in \fB\%mbox\fP(5) format. The filename can be -changed by setting \fBposted_articles_file\fP. +Kopie aller geposteten Artikel im \fB\%mbox\fP(5)\-Format. Der Dateiname kann +durch setzen von \fBposted_articles_file\fP geändert werden. .RE .PP \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/postponed.articles\fP .sp .RS -Vorrat an zurückgestellten Artikeln. Diese Datei benutzt das \fB\%mbox\fP(5) -Format. +Vorrat an zurückgestellten Artikeln. Diese Datei benutzt das +\fB\%mbox\fP(5)\-Format. .RE .PP @@ -2465,7 +2465,7 @@ News per NNTP gelesen wird verwendet \fB Diese Datei enthält kurze Beschreibungen der einzelnen Newsgroupen. Es wird normalerweise durch die lokalen Newsserver aktualisiert (zB. \fB\%innd\fP(8)) sobald eine neue Gruppe wird erstellt. Jede Zeile besteht aus zwei durch -Tabulatoren getrennte Felder "\fIgroup.name\fP \fIKurzbeschreibung\fP". +Tabulator getrennten Feldern "\fIgroup.name\fP \fIKurzbeschreibung\fP". .TP \fBgroup.name\fP ist der Name der Newsgruppe diff -Nurp '--exclude=.bzr*' tin-2.4.0/doc/l10n/de.po tin-2.4.1/doc/l10n/de.po --- tin-2.4.0/doc/l10n/de.po 2016-08-10 16:14:35.000000000 +0200 +++ tin-2.4.1/doc/l10n/de.po 2016-12-23 13:43:16.218579330 +0100 @@ -1,13 +1,13 @@ # German translations for the tin man pages. # This file is distributed under the same license as the tin package. -# Urs Janssen , 2008-2016. +# Urs Janssen , 2008-2017. # msgid "" msgstr "" -"Project-Id-Version: tin-man 2.4.0\n" +"Project-Id-Version: tin-man 2.4.1\n" "Report-Msgid-Bugs-To: translation@tin.org\n" -"POT-Creation-Date: 2016-08-10 10:07+0200\n" -"PO-Revision-Date: 2016-08-10 16:06+0200\n" +"POT-Creation-Date: 2016-12-23 13:31+0100\n" +"PO-Revision-Date: 2016-12-24 12:00+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 "August 23rd, 2016" -msgstr "23. August 2016" +msgid "December 24th, 2016" +msgstr "24. December 2016" #. type: TH #: doc/tin.1:12 doc/tin.5:9 #, no-wrap -msgid "2.4.0" -msgstr "2.4.0" +msgid "2.4.1" +msgstr "2.4.1" #. type: TH #: doc/tin.1:12 doc/tin.5:9 @@ -2180,6 +2180,8 @@ msgid "" "Display the subject of the first article in the current thread in the last " "line." msgstr "" +"Betreff des ersten Artikels im aktuellen Thread in der letzten Zeile " +"anziegen." #. type: TP #: doc/tin.1:829 @@ -8383,60 +8385,69 @@ msgstr "" msgid "B" msgstr "B" +#. type: Plain text +#: doc/tin.1:3578 +msgid "" +"MIME character set used if not configured via the tinrc variable " +"B." +msgstr "" +"Benutzter MIME-Zeichensatz, falls nicht über die tinrc-Variable " +"B konfiguriert." + #. type: TP -#: doc/tin.1:3577 +#: doc/tin.1:3578 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3582 +#: doc/tin.1:3583 msgid "" "Set this variable to point to B<\\%ispell>(1) or a replacement and its cmd-" "line options." msgstr "" #. type: TP -#: doc/tin.1:3582 +#: doc/tin.1:3583 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3589 +#: doc/tin.1:3590 msgid "" "Define any additional options that you wish to pass to your B<\\%pgp>(1) or " "B<\\%gpg>(1) program." msgstr "" #. type: TP -#: doc/tin.1:3589 +#: doc/tin.1:3590 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3594 +#: doc/tin.1:3595 msgid "" "Override the name of the B<\\%pgp>(1) directory in B<$HOME> that holds your " "keys etc.." msgstr "" #. type: TP -#: doc/tin.1:3594 +#: doc/tin.1:3595 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3599 +#: doc/tin.1:3600 msgid "" "Override the name of the B<\\%gpg>(1) directory in B<$HOME> that holds your " "keys etc.." msgstr "" #. type: TP -#: doc/tin.1:3599 +#: doc/tin.1:3600 #, no-wrap msgid "B" msgstr "B" @@ -8444,7 +8455,7 @@ msgstr "B" #. TODO: document LC_CTYPEs influence on #. ~/.tin/keymap.*, 8bit char display, ... #. type: Plain text -#: doc/tin.1:3613 +#: doc/tin.1:3614 msgid "" "This variable determines the B<\\%locale>(5) category for character " "handling functions. Usually it determines the character classes for pattern " @@ -8456,13 +8467,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3613 +#: doc/tin.1:3614 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3622 +#: doc/tin.1:3623 msgid "" "Formats of informative and diagnostic messages and interactive responses. " "It's value should be of the form I[I<_territory>][I<.codeset>]" @@ -8471,13 +8482,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3622 +#: doc/tin.1:3623 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3630 +#: doc/tin.1:3631 msgid "" "Date and time formats. It's value should be of the form " "I[I<_territory>][I<.codeset>][I<@modifier>]. See B<\\%locale>(5) " @@ -8485,13 +8496,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3630 +#: doc/tin.1:3631 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3639 +#: doc/tin.1:3640 msgid "" "This variable overrides the value of the B<$LANG> variable and any other B<" "$LC_> variable. It's value should be of the form I[I<_territory>]" @@ -8500,13 +8511,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3639 +#: doc/tin.1:3640 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3648 +#: doc/tin.1:3649 msgid "" "This variable determines the B<\\%locale>(5) category for any category not " "specifically selected with a variable starting with B<$LC_>. It's value " @@ -8515,13 +8526,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3648 +#: doc/tin.1:3649 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3656 +#: doc/tin.1:3657 msgid "" "This variable defines a priority list for translations. Whenever a " "translation is not available in the language selected via B<$LC_ALL> or B<" @@ -8531,13 +8542,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3656 +#: doc/tin.1:3657 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3666 +#: doc/tin.1:3667 msgid "" "A decimal integer E 0 used to indicate the user's preferred width in " "column positions for the terminal screen or window. If this variable is " @@ -8550,13 +8561,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3666 +#: doc/tin.1:3667 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3676 +#: doc/tin.1:3677 msgid "" "A decimal integer E 0 used to indicate the user's preferred number of " "lines on a page or the vertical screen or window size in lines. A line in " @@ -8569,7 +8580,7 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3676 +#: doc/tin.1:3677 #, no-wrap msgid "B" msgstr "B" @@ -8577,7 +8588,7 @@ msgstr "B" # # #. type: Plain text -#: doc/tin.1:3682 +#: doc/tin.1:3683 msgid "" "The type of terminal in use. This is used when looking up termcap " "sequences. See B<\\%environ>(5) for more information." @@ -8586,95 +8597,95 @@ msgstr "" "%environ>(5)." #. type: TP -#: doc/tin.1:3682 +#: doc/tin.1:3683 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3685 +#: doc/tin.1:3686 msgid "Display name, pointing to the X server; required for xface." -msgstr "" +msgstr "Anzeigename der auf den X-Server zeigt; erforderlich für xface." #. type: TP -#: doc/tin.1:3685 +#: doc/tin.1:3686 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3689 +#: doc/tin.1:3690 msgid "" "Used for determining terminal's X window id; required for xface. Should be " "set by the terminal emulator." msgstr "" #. type: TP -#: doc/tin.1:3689 +#: doc/tin.1:3690 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3693 +#: doc/tin.1:3694 msgid "" "The pathname of the user's login shell. Used to set B." msgstr "" #. type: TP -#: doc/tin.1:3693 +#: doc/tin.1:3694 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3698 +#: doc/tin.1:3699 msgid "" "The pathname of the user's dir to put non-essential run time files into." msgstr "" #. type: SH -#: doc/tin.1:3698 +#: doc/tin.1:3699 #, no-wrap msgid "SIGNALS" msgstr "SIGNALE" #. TODO: add missing, sort useful, document in detail #. type: Plain text -#: doc/tin.1:3702 +#: doc/tin.1:3703 msgid "B handles a couple of signals:" msgstr "B verarbeitet folgende Signale:" #. type: TP -#: doc/tin.1:3702 +#: doc/tin.1:3703 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3705 doc/tin.1:3708 +#: doc/tin.1:3706 doc/tin.1:3709 msgid "Terminate gracefully." msgstr "" #. type: TP -#: doc/tin.1:3705 +#: doc/tin.1:3706 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:3708 +#: doc/tin.1:3709 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3711 +#: doc/tin.1:3712 msgid "Terminate gracefully but do not restore terminal (tty)." msgstr "Beenden ohne das Terminal (tty) wiederherzustellen." #. type: TP -#: doc/tin.1:3711 +#: doc/tin.1:3712 #, no-wrap msgid "B" msgstr "B" @@ -8685,18 +8696,18 @@ msgstr "B" #. give an overview of the most common error messages and how to cope with #. them. #. type: Plain text -#: doc/tin.1:3722 +#: doc/tin.1:3723 msgid "Write out I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>-file." msgstr "Speichern der I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>-Datei." #. type: SH -#: doc/tin.1:3722 +#: doc/tin.1:3723 #, no-wrap msgid "SECURITY" msgstr "SICHERHEIT" #. type: Plain text -#: doc/tin.1:3730 +#: doc/tin.1:3731 msgid "" "If B is started in debug mode (''B<-D n>'') it will create world " "readable files in B<$TMPDIR> which may contain the users NNTP password in " @@ -8705,7 +8716,7 @@ msgid "" msgstr "" #. type: SH -#: doc/tin.1:3730 +#: doc/tin.1:3731 #, no-wrap msgid "CONFORMING TO" msgstr "KONFORM ZU" @@ -8713,7 +8724,7 @@ msgstr "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 #. type: Plain text -#: doc/tin.1:3738 +#: doc/tin.1:3739 msgid "" "B does conform to the Base Definitions volume of IEEE Std 1003.1-2008, " "Section 12, Utility Conventions (Utility Argument Syntax, Utility Syntax " @@ -8721,13 +8732,13 @@ msgid "" msgstr "" #. type: SH -#: doc/tin.1:3738 +#: doc/tin.1:3739 #, no-wrap msgid "NOTES" msgstr "ANMERKUNGEN" #. type: Plain text -#: doc/tin.1:3743 +#: doc/tin.1:3744 msgid "" "Regular expression support is provided by the PCRE library package B<\\" "%pcre>(3), which is open source software, written by Philip Hazel, and " @@ -8738,18 +8749,18 @@ msgstr "" "Hazel und das Urheberrecht liegt bei der University of Cambridge, England." #. type: Plain text -#: doc/tin.1:3747 +#: doc/tin.1:3748 msgid "Eftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/E" msgstr "Eftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/E" #. type: SH -#: doc/tin.1:3747 +#: doc/tin.1:3748 #, no-wrap msgid "BUGS" msgstr "FEHLER" #. type: Plain text -#: doc/tin.1:3755 +#: doc/tin.1:3756 msgid "" "B NNTPd, B<\\%noffle>(1) (E= V1.0-pre5) and B (E= " "V1.1.91) can't handle pipelined GROUP commands. If you run into trouble with " @@ -8758,7 +8769,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:3764 +#: doc/tin.1:3765 msgid "" "Before mailing a bug-report to Etin-bugs@tin.orgE please check if " "you are using the latest (stable) release, and if not, please upgrade first! " @@ -8769,13 +8780,13 @@ msgid "" msgstr "" #. type: SH -#: doc/tin.1:3764 +#: doc/tin.1:3765 #, no-wrap msgid "HISTORY" msgstr "GESCHICHTE" #. type: Plain text -#: doc/tin.1:3773 +#: doc/tin.1:3774 msgid "" "B is based on the B<\\%tass>(1) newsreader that was developed by Rich " "Skrenta and posted to alt.sources in March 1991; its first version was " @@ -8793,171 +8804,171 @@ msgstr "" "Versionen findet sich unter" #. type: Plain text -#: doc/tin.1:3777 +#: doc/tin.1:3778 msgid "Ehttp://www.tin.org/history.htmlE." msgstr "Ehttp://www.tin.org/history.htmlE." #. type: SH -#: doc/tin.1:3777 +#: doc/tin.1:3778 #, no-wrap msgid "CREDITS" msgstr "DANKSAGUNGEN" #. type: IP -#: doc/tin.1:3779 +#: doc/tin.1:3780 #, no-wrap msgid "Rich Skrenta" msgstr "Rich Skrenta" #. type: Plain text -#: doc/tin.1:3783 +#: doc/tin.1:3784 msgid "author of B<\\%tass>(1) v3.2 which this newsreader used as its base." msgstr "Autor von B<\\%tass>(1) v3.2, der Basis für diesen Newsreader." #. type: IP -#: doc/tin.1:3783 +#: doc/tin.1:3784 #, no-wrap msgid "Bill Davidsen" msgstr "Bill Davidsen" #. type: Plain text -#: doc/tin.1:3785 +#: doc/tin.1:3786 msgid "author of envarg.c environment variable reading routine." msgstr "Autor von envarg.c, Umgebungsvariablenleseroutine." #. type: IP -#: doc/tin.1:3785 +#: doc/tin.1:3786 #, no-wrap msgid "Mike Gleason" msgstr "Mike Gleason" #. type: Plain text -#: doc/tin.1:3787 +#: doc/tin.1:3788 msgid "author of sigfile.c random signature generation routines." msgstr "Autor von sigfile.c, Zufallssignaturengenerierungsroutine." #. type: IP -#: doc/tin.1:3787 +#: doc/tin.1:3788 #, no-wrap msgid "Markus Kuhn EMarkus.Kuhn@cl.cam.ac.ukE" msgstr "Markus Kuhn EMarkus.Kuhn@cl.cam.ac.ukE" #. type: Plain text -#: doc/tin.1:3789 +#: doc/tin.1:3790 msgid "" "author of langinfo.c, charset.c and iso2asc.txt ISO-8859-1 documentation." msgstr "" #. type: IP -#: doc/tin.1:3789 +#: doc/tin.1:3790 #, no-wrap msgid "Arnold Robbins" msgstr "Arnold Robbins" #. type: Plain text -#: doc/tin.1:3791 +#: doc/tin.1:3792 msgid "author of strftime.c date formatting routine." msgstr "Autor von strftime.c, Datumsfromatierungsroutine." #. type: IP -#: doc/tin.1:3791 +#: doc/tin.1:3792 #, no-wrap msgid "Rich Salz" msgstr "Rich Salz" #. type: Plain text -#: doc/tin.1:3793 +#: doc/tin.1:3794 msgid "" "author of wildmat.c pattern matching and parsdate.y date parsing routines." msgstr "" #. type: IP -#: doc/tin.1:3793 +#: doc/tin.1:3794 #, no-wrap msgid "Dave Taylor" msgstr "Dave Taylor" #. type: Plain text -#: doc/tin.1:3797 +#: doc/tin.1:3798 msgid "author of curses.c from the B<\\%elm>(1) mailreader." msgstr "Autor von curses.c aus dem Mailreader B<\\%elm>(1)." #. type: IP -#: doc/tin.1:3797 +#: doc/tin.1:3798 #, no-wrap msgid "Chris Thewalt" msgstr "Chris Thewalt" #. type: Plain text -#: doc/tin.1:3801 +#: doc/tin.1:3802 msgid "author of getline.c B<\\%emacs>(1) style editing routine." msgstr "Autor von getline.c, B<\\%emacs>(1)-artige Eingaberoutine." #. type: IP -#: doc/tin.1:3801 +#: doc/tin.1:3802 #, no-wrap msgid "Steven Madsen" msgstr "Steven Madsen" #. type: Plain text -#: doc/tin.1:3805 +#: doc/tin.1:3806 msgid "for adding B<\\%pgp>(1) (Pretty Good Privacy) support." msgstr "für B<\\%pgp>(1) (Pretty Good Privacy) Unterstützung." #. type: IP -#: doc/tin.1:3805 +#: doc/tin.1:3806 #, no-wrap msgid "Philip Hazel Eph10@cam.ac.ukE" msgstr "Philip Hazel Eph10@cam.ac.ukE" #. type: Plain text -#: doc/tin.1:3809 +#: doc/tin.1:3810 msgid "for B<\\%pcre>(3) (Perl-compatible regular expression library)." msgstr "für B<\\%pcre>(3) (Library für Perl-kompatible reguläre Ausdrücke)." #. type: IP -#: doc/tin.1:3809 +#: doc/tin.1:3810 #, no-wrap msgid "Patrick Powell Epapowell@astart.comE" msgstr "Patrick Powell Epapowell@astart.comE" #. type: Plain text -#: doc/tin.1:3817 +#: doc/tin.1:3818 msgid "for B<\\%snprintf>(3) and B<\\%vsnprintf>(3) fallbacks." msgstr "für B<\\%snprintf>(3) und B<\\%vsnprintf>(3) Fallbacks." #. type: SH -#: doc/tin.1:3817 +#: doc/tin.1:3818 #, no-wrap msgid "AUTHOR" msgstr "AUTOR" #. type: TP -#: doc/tin.1:3818 +#: doc/tin.1:3819 #, no-wrap msgid "Iain Lea Eiain@bricbrac.deE" msgstr "Iain Lea Eiain@bricbrac.deE" #. type: SH -#: doc/tin.1:3822 +#: doc/tin.1:3823 #, no-wrap msgid "MAINTAINER" msgstr "" #. type: TP -#: doc/tin.1:3823 +#: doc/tin.1:3824 #, no-wrap msgid "Urs Janssen Eurs@tin.orgE" msgstr "Urs Janßen Eurs@tin.orgE" #. type: SH -#: doc/tin.1:3827 doc/tin.5:2634 +#: doc/tin.1:3828 doc/tin.5:2634 #, no-wrap msgid "SEE ALSO" msgstr "SIEHE AUCH" #. type: Plain text -#: doc/tin.1:3882 +#: doc/tin.1:3883 msgid "" "B<\\%cron>(1), B<\\%elm>(1), B<\\%emacs>(1), B<\\%gpg>(1), B<\\%inews>(1), B<" "\\%ispell>(1), B<\\%lp>(1), B<\\%lpr>(1), B<\\%metamail>(1), B<\\" @@ -9348,7 +9359,7 @@ msgstr "" msgid "" "secret to be used for cancel-locks if B<\\%tin>(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 for the user." +"This file should be readable only by the user." msgstr "" #. type: Plain text @@ -9364,7 +9375,7 @@ msgid "" "in double quotes (\"). Usernames must not be enclosed in double quotes and " "thus can't contain spaces or tabs. Any line that starts with \"#\" is a " "comment. Blank lines are ignored. This file should be readable only for the " -"user as it contains the user's uncrypted password for reading news!" +"user as it contains the user's unencrypted password for reading news!" msgstr "" #. type: TP @@ -9386,7 +9397,7 @@ msgstr "B" #. type: Plain text #: doc/tin.5:267 -msgid "user's uncrypted password for reading news." +msgid "user's unencrypted password for reading news." msgstr "Unverschlüsseltes Passwort für den Newsserver." #. type: TP @@ -9450,7 +9461,7 @@ msgstr "" #. type: Plain text #: doc/tin.5:295 msgid "a flag indicating if the group is subscribed ':' or not '!'." -msgstr "" +msgstr "Markierung die angibt ob die Gruppe abonniert ist ':' oder nicht '!'." #. type: TP #: doc/tin.5:295 @@ -9498,12 +9509,12 @@ msgstr "Signatur" #. type: Plain text #: doc/tin.5:335 msgid "fixed part of a randomly generated signature" -msgstr "" +msgstr "Fester Bestandteil einer zufällig erzeugten Signatur" #. type: Plain text #: doc/tin.5:342 msgid "history of last used strings" -msgstr "" +msgstr "Historie der zuletzt verwendeten Zeichenfolgen" #. type: Plain text #: doc/tin.5:349 @@ -11134,12 +11145,14 @@ msgid "" "Copy of all posted articles in B<\\%mbox>(5) format. The filename can be " "changed by setting B." msgstr "" +"Kopie aller geposteten Artikel im B<\\%mbox>(5)-Format. Der Dateiname kann " +"durch setzen von B geändert werden." #. type: Plain text #: doc/tin.5:1131 msgid "Pool of postponed articles. This file is in B<\\%mbox>(5) format." msgstr "" -"Vorrat an zurückgestellten Artikeln. Diese Datei benutzt das B<\\%mbox>(5) " +"Vorrat an zurückgestellten Artikeln. Diese Datei benutzt das B<\\%mbox>(5)-" "Format." #. type: Plain text @@ -13048,7 +13061,7 @@ msgstr "" "Diese Datei enthält kurze Beschreibungen der einzelnen Newsgroupen. Es wird " "normalerweise durch die lokalen Newsserver aktualisiert (zB. B<\\%innd>(8)) " "sobald eine neue Gruppe wird erstellt. Jede Zeile besteht aus zwei durch " -"Tabulatoren getrennte Felder \"I\tI\"." +"Tabulator getrennten Feldern \"I\tI\"." #. type: Plain text #: doc/tin.5:2589 diff -Nurp '--exclude=.bzr*' tin-2.4.0/doc/l10n/en_GB/tin.1 tin-2.4.1/doc/l10n/en_GB/tin.1 --- tin-2.4.0/doc/l10n/en_GB/tin.1 2016-08-23 07:27:44.000000000 +0200 +++ tin-2.4.1/doc/l10n/en_GB/tin.1 2016-12-23 13:31:50.310670449 +0100 @@ -3,7 +3,7 @@ .\" Module : tin.1 .\" Author : I. Lea, U. Janssen .\" Created : 1991-08-23 -.\" Updated : 2016-08-23 +.\" Updated : 2016-12-24 .\" 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 "August 23rd, 2016" 2.4.0 "Usenet newsreader" +.TH tin 1 "December 24th, 2016" 2.4.1 "Usenet newsreader" .\" .\" .SH NAME @@ -3435,6 +3435,8 @@ Set this variable to disable the use of (e.g. metamutt). .TP \fBMM_CHARSET\fP +MIME character set used if not configured via the tinrc variable +\fBmm_charset\fP. .TP \fBISPELL\fP Set this variable to point to \fB\%ispell\fP(1) or a replacement and its diff -Nurp '--exclude=.bzr*' tin-2.4.0/doc/l10n/en_GB/tin.5 tin-2.4.1/doc/l10n/en_GB/tin.5 --- tin-2.4.0/doc/l10n/en_GB/tin.5 2016-08-23 07:27:45.000000000 +0200 +++ tin-2.4.1/doc/l10n/en_GB/tin.5 2016-12-23 13:31:50.798690297 +0100 @@ -2,7 +2,7 @@ .\" Module : tin.5 .\" Author : U. Janssen .\" Created : 2000-07-10 -.\" Updated : 2016-08-23 +.\" Updated : 2016-12-24 .\" Notes : needs a some work .\" .\" @@ -11,7 +11,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH tin 5 "August 23rd, 2016" 2.4.0 "Usenet newsreader" +.TH tin 5 "December 24th, 2016" 2.4.1 "Usenet newsreader" .SH NAME tin, rtin \- related files @@ -231,7 +231,7 @@ the default server given at compile time .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 for the user. +case. This file should be readable only by the user. .RE .PP @@ -254,13 +254,13 @@ authorisation. If the password contains in double quotes ("). Usernames must not be enclosed in double quotes and thus can't contain spaces or tabs. Any line that starts with "#" is a comment. Blank lines are ignored. This file should be readable only for the -user as it contains the user's uncrypted password for reading news! +user as it contains the user's unencrypted password for reading news! .TP \fBnntpserver\fP full qualified domain name of the news server. .TP \fBpassword\fP -user's uncrypted password for reading news. +user's unencrypted password for reading news. .TP \fBuser\fP username on the news server if it differs from the local login. This field diff -Nurp '--exclude=.bzr*' tin-2.4.0/doc/l10n/en_GB.po tin-2.4.1/doc/l10n/en_GB.po --- tin-2.4.0/doc/l10n/en_GB.po 2016-08-10 16:07:02.000000000 +0200 +++ tin-2.4.1/doc/l10n/en_GB.po 2016-12-23 13:31:46.006495381 +0100 @@ -1,13 +1,13 @@ # English (United Kingdom) translations for the tin man pages. # This file is distributed under the same license as the tin package. -# Urs Janssen , 2011-2016. +# Urs Janssen , 2011-2017. # msgid "" msgstr "" -"Project-Id-Version: tin-man 2.4.0\n" +"Project-Id-Version: tin-man 2.4.1\n" "Report-Msgid-Bugs-To: translation@tin.org\n" -"POT-Creation-Date: 2016-08-10 10:07+0200\n" -"PO-Revision-Date: 2016-08-10 16:06+0200\n" +"POT-Creation-Date: 2016-12-23 13:31+0100\n" +"PO-Revision-Date: 2016-12-24 12:00+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 "August 23rd, 2016" -msgstr "August 23rd, 2016" +msgid "December 24th, 2016" +msgstr "December 24th, 2016" #. type: TH #: doc/tin.1:12 doc/tin.5:9 #, no-wrap -msgid "2.4.0" -msgstr "2.4.0" +msgid "2.4.1" +msgstr "2.4.1" #. type: TH #: doc/tin.1:12 doc/tin.5:9 @@ -9427,14 +9427,23 @@ msgstr "" msgid "B" msgstr "B" +#. type: Plain text +#: doc/tin.1:3578 +msgid "" +"MIME character set used if not configured via the tinrc variable " +"B." +msgstr "" +"MIME character set used if not configured via the tinrc variable " +"B." + #. type: TP -#: doc/tin.1:3577 +#: doc/tin.1:3578 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3582 +#: doc/tin.1:3583 msgid "" "Set this variable to point to B<\\%ispell>(1) or a replacement and its cmd-" "line options." @@ -9443,13 +9452,13 @@ msgstr "" "line options." #. type: TP -#: doc/tin.1:3582 +#: doc/tin.1:3583 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3589 +#: doc/tin.1:3590 msgid "" "Define any additional options that you wish to pass to your B<\\%pgp>(1) or " "B<\\%gpg>(1) program." @@ -9458,13 +9467,13 @@ msgstr "" "B<\\%gpg>(1) program." #. type: TP -#: doc/tin.1:3589 +#: doc/tin.1:3590 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3594 +#: doc/tin.1:3595 msgid "" "Override the name of the B<\\%pgp>(1) directory in B<$HOME> that holds your " "keys etc.." @@ -9473,13 +9482,13 @@ msgstr "" "keys etc.." #. type: TP -#: doc/tin.1:3594 +#: doc/tin.1:3595 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3599 +#: doc/tin.1:3600 msgid "" "Override the name of the B<\\%gpg>(1) directory in B<$HOME> that holds your " "keys etc.." @@ -9488,7 +9497,7 @@ msgstr "" "keys etc.." #. type: TP -#: doc/tin.1:3599 +#: doc/tin.1:3600 #, no-wrap msgid "B" msgstr "B" @@ -9496,7 +9505,7 @@ msgstr "B" #. TODO: document LC_CTYPEs influence on #. ~/.tin/keymap.*, 8bit char display, ... #. type: Plain text -#: doc/tin.1:3613 +#: doc/tin.1:3614 msgid "" "This variable determines the B<\\%locale>(5) category for character " "handling functions. Usually it determines the character classes for pattern " @@ -9515,13 +9524,13 @@ msgstr "" "for more information." #. type: TP -#: doc/tin.1:3613 +#: doc/tin.1:3614 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3622 +#: doc/tin.1:3623 msgid "" "Formats of informative and diagnostic messages and interactive responses. " "It's value should be of the form I[I<_territory>][I<.codeset>]" @@ -9534,13 +9543,13 @@ msgstr "" "information." #. type: TP -#: doc/tin.1:3622 +#: doc/tin.1:3623 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3630 +#: doc/tin.1:3631 msgid "" "Date and time formats. It's value should be of the form " "I[I<_territory>][I<.codeset>][I<@modifier>]. See B<\\%locale>(5) " @@ -9551,13 +9560,13 @@ msgstr "" "and B<\\%environ>(5) for more information." #. type: TP -#: doc/tin.1:3630 +#: doc/tin.1:3631 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3639 +#: doc/tin.1:3640 msgid "" "This variable overrides the value of the B<$LANG> variable and any other B<" "$LC_> variable. It's value should be of the form I[I<_territory>]" @@ -9570,13 +9579,13 @@ msgstr "" "information." #. type: TP -#: doc/tin.1:3639 +#: doc/tin.1:3640 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3648 +#: doc/tin.1:3649 msgid "" "This variable determines the B<\\%locale>(5) category for any category not " "specifically selected with a variable starting with B<$LC_>. It's value " @@ -9589,13 +9598,13 @@ msgstr "" "%environ>(5) for more information." #. type: TP -#: doc/tin.1:3648 +#: doc/tin.1:3649 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3656 +#: doc/tin.1:3657 msgid "" "This variable defines a priority list for translations. Whenever a " "translation is not available in the language selected via B<$LC_ALL> or B<" @@ -9610,13 +9619,13 @@ msgstr "" "information." #. type: TP -#: doc/tin.1:3656 +#: doc/tin.1:3657 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3666 +#: doc/tin.1:3667 msgid "" "A decimal integer E 0 used to indicate the user's preferred width in " "column positions for the terminal screen or window. If this variable is " @@ -9637,13 +9646,13 @@ msgstr "" "characteristics." #. type: TP -#: doc/tin.1:3666 +#: doc/tin.1:3667 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3676 +#: doc/tin.1:3677 msgid "" "A decimal integer E 0 used to indicate the user's preferred number of " "lines on a page or the vertical screen or window size in lines. A line in " @@ -9664,13 +9673,13 @@ msgstr "" "B<$LINES> unless they wish to override the system selection." #. type: TP -#: doc/tin.1:3676 +#: doc/tin.1:3677 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3682 +#: doc/tin.1:3683 msgid "" "The type of terminal in use. This is used when looking up termcap " "sequences. See B<\\%environ>(5) for more information." @@ -9679,24 +9688,24 @@ msgstr "" "sequences. See B<\\%environ>(5) for more information." #. type: TP -#: doc/tin.1:3682 +#: doc/tin.1:3683 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3685 +#: doc/tin.1:3686 msgid "Display name, pointing to the X server; required for xface." msgstr "Display name, pointing to the X server; required for xface." #. type: TP -#: doc/tin.1:3685 +#: doc/tin.1:3686 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3689 +#: doc/tin.1:3690 msgid "" "Used for determining terminal's X window id; required for xface. Should be " "set by the terminal emulator." @@ -9705,73 +9714,73 @@ msgstr "" "set by the terminal emulator." #. type: TP -#: doc/tin.1:3689 +#: doc/tin.1:3690 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3693 +#: doc/tin.1:3694 msgid "" "The pathname of the user's login shell. Used to set B." msgstr "" "The pathname of the user's login shell. Used to set B." #. type: TP -#: doc/tin.1:3693 +#: doc/tin.1:3694 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3698 +#: doc/tin.1:3699 msgid "" "The pathname of the user's dir to put non-essential run time files into." msgstr "" "The pathname of the user's dir to put non-essential run time files into." #. type: SH -#: doc/tin.1:3698 +#: doc/tin.1:3699 #, no-wrap msgid "SIGNALS" msgstr "SIGNALS" #. TODO: add missing, sort useful, document in detail #. type: Plain text -#: doc/tin.1:3702 +#: doc/tin.1:3703 msgid "B handles a couple of signals:" msgstr "B handles a couple of signals:" #. type: TP -#: doc/tin.1:3702 +#: doc/tin.1:3703 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3705 doc/tin.1:3708 +#: doc/tin.1:3706 doc/tin.1:3709 msgid "Terminate gracefully." msgstr "Terminate gracefully." #. type: TP -#: doc/tin.1:3705 +#: doc/tin.1:3706 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:3708 +#: doc/tin.1:3709 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:3711 +#: doc/tin.1:3712 msgid "Terminate gracefully but do not restore terminal (tty)." msgstr "Terminate gracefully but do not restore terminal (tty)." #. type: TP -#: doc/tin.1:3711 +#: doc/tin.1:3712 #, no-wrap msgid "B" msgstr "B" @@ -9780,18 +9789,18 @@ msgstr "B" #. give an overview of the most common error messages and how to cope with #. them. #. type: Plain text -#: doc/tin.1:3722 +#: doc/tin.1:3723 msgid "Write out I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>-file." msgstr "Write out I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>-file." #. type: SH -#: doc/tin.1:3722 +#: doc/tin.1:3723 #, no-wrap msgid "SECURITY" msgstr "SECURITY" #. type: Plain text -#: doc/tin.1:3730 +#: doc/tin.1:3731 msgid "" "If B is started in debug mode (''B<-D n>'') it will create world " "readable files in B<$TMPDIR> which may contain the users NNTP password in " @@ -9804,7 +9813,7 @@ msgstr "" "before starting tin in debug mode (e.g. B)." #. type: SH -#: doc/tin.1:3730 +#: doc/tin.1:3731 #, no-wrap msgid "CONFORMING TO" msgstr "CONFORMING TO" @@ -9812,7 +9821,7 @@ msgstr "CONFORMING TO" #. - RFC\%2045, RFC\%2047, RFC\%2231, RFC\%2980, RFC\%3977, RFC\%4155 #. RFC\%4643, RFC\%5322, RFC\%5536, RFC\%5537, RFC\%6048 or whatever #. type: Plain text -#: doc/tin.1:3738 +#: doc/tin.1:3739 msgid "" "B does conform to the Base Definitions volume of IEEE Std 1003.1-2008, " "Section 12, Utility Conventions (Utility Argument Syntax, Utility Syntax " @@ -9823,13 +9832,13 @@ msgstr "" "Guidelines)." #. type: SH -#: doc/tin.1:3738 +#: doc/tin.1:3739 #, no-wrap msgid "NOTES" msgstr "NOTES" #. type: Plain text -#: doc/tin.1:3743 +#: doc/tin.1:3744 msgid "" "Regular expression support is provided by the PCRE library package B<\\" "%pcre>(3), which is open source software, written by Philip Hazel, and " @@ -9840,18 +9849,18 @@ msgstr "" "copyright by the University of Cambridge, England." #. type: Plain text -#: doc/tin.1:3747 +#: doc/tin.1:3748 msgid "Eftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/E" msgstr "Eftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/E" #. type: SH -#: doc/tin.1:3747 +#: doc/tin.1:3748 #, no-wrap msgid "BUGS" msgstr "BUGS" #. type: Plain text -#: doc/tin.1:3755 +#: doc/tin.1:3756 msgid "" "B NNTPd, B<\\%noffle>(1) (E= V1.0-pre5) and B (E= " "V1.1.91) can't handle pipelined GROUP commands. If you run into trouble with " @@ -9864,7 +9873,7 @@ msgstr "" "and recompile." #. type: Plain text -#: doc/tin.1:3764 +#: doc/tin.1:3765 msgid "" "Before mailing a bug-report to Etin-bugs@tin.orgE please check if " "you are using the latest (stable) release, and if not, please upgrade first! " @@ -9881,13 +9890,13 @@ msgstr "" "request it." #. type: SH -#: doc/tin.1:3764 +#: doc/tin.1:3765 #, no-wrap msgid "HISTORY" msgstr "HISTORY" #. type: Plain text -#: doc/tin.1:3773 +#: doc/tin.1:3774 msgid "" "B is based on the B<\\%tass>(1) newsreader that was developed by Rich " "Skrenta and posted to alt.sources in March 1991; its first version was " @@ -9904,173 +9913,173 @@ msgstr "" "overview see" #. type: Plain text -#: doc/tin.1:3777 +#: doc/tin.1:3778 msgid "Ehttp://www.tin.org/history.htmlE." msgstr "Ehttp://www.tin.org/history.htmlE." #. type: SH -#: doc/tin.1:3777 +#: doc/tin.1:3778 #, no-wrap msgid "CREDITS" msgstr "CREDITS" #. type: IP -#: doc/tin.1:3779 +#: doc/tin.1:3780 #, no-wrap msgid "Rich Skrenta" msgstr "Rich Skrenta" #. type: Plain text -#: doc/tin.1:3783 +#: doc/tin.1:3784 msgid "author of B<\\%tass>(1) v3.2 which this newsreader used as its base." msgstr "author of B<\\%tass>(1) v3.2 which this newsreader used as its base." #. type: IP -#: doc/tin.1:3783 +#: doc/tin.1:3784 #, no-wrap msgid "Bill Davidsen" msgstr "Bill Davidsen" #. type: Plain text -#: doc/tin.1:3785 +#: doc/tin.1:3786 msgid "author of envarg.c environment variable reading routine." msgstr "author of envarg.c environment variable reading routine." #. type: IP -#: doc/tin.1:3785 +#: doc/tin.1:3786 #, no-wrap msgid "Mike Gleason" msgstr "Mike Gleason" #. type: Plain text -#: doc/tin.1:3787 +#: doc/tin.1:3788 msgid "author of sigfile.c random signature generation routines." msgstr "author of sigfile.c random signature generation routines." #. type: IP -#: doc/tin.1:3787 +#: doc/tin.1:3788 #, no-wrap msgid "Markus Kuhn EMarkus.Kuhn@cl.cam.ac.ukE" msgstr "Markus Kuhn EMarkus.Kuhn@cl.cam.ac.ukE" #. type: Plain text -#: doc/tin.1:3789 +#: doc/tin.1:3790 msgid "" "author of langinfo.c, charset.c and iso2asc.txt ISO-8859-1 documentation." msgstr "" "author of langinfo.c, charset.c and iso2asc.txt ISO-8859-1 documentation." #. type: IP -#: doc/tin.1:3789 +#: doc/tin.1:3790 #, no-wrap msgid "Arnold Robbins" msgstr "Arnold Robbins" #. type: Plain text -#: doc/tin.1:3791 +#: doc/tin.1:3792 msgid "author of strftime.c date formatting routine." msgstr "author of strftime.c date formatting routine." #. type: IP -#: doc/tin.1:3791 +#: doc/tin.1:3792 #, no-wrap msgid "Rich Salz" msgstr "Rich Salz" #. type: Plain text -#: doc/tin.1:3793 +#: doc/tin.1:3794 msgid "" "author of wildmat.c pattern matching and parsdate.y date parsing routines." msgstr "" "author of wildmat.c pattern matching and parsdate.y date parsing routines." #. type: IP -#: doc/tin.1:3793 +#: doc/tin.1:3794 #, no-wrap msgid "Dave Taylor" msgstr "Dave Taylor" #. type: Plain text -#: doc/tin.1:3797 +#: doc/tin.1:3798 msgid "author of curses.c from the B<\\%elm>(1) mailreader." msgstr "author of curses.c from the B<\\%elm>(1) mailreader." #. type: IP -#: doc/tin.1:3797 +#: doc/tin.1:3798 #, no-wrap msgid "Chris Thewalt" msgstr "Chris Thewalt" #. type: Plain text -#: doc/tin.1:3801 +#: doc/tin.1:3802 msgid "author of getline.c B<\\%emacs>(1) style editing routine." msgstr "author of getline.c B<\\%emacs>(1) style editing routine." #. type: IP -#: doc/tin.1:3801 +#: doc/tin.1:3802 #, no-wrap msgid "Steven Madsen" msgstr "Steven Madsen" #. type: Plain text -#: doc/tin.1:3805 +#: doc/tin.1:3806 msgid "for adding B<\\%pgp>(1) (Pretty Good Privacy) support." msgstr "for adding B<\\%pgp>(1) (Pretty Good Privacy) support." #. type: IP -#: doc/tin.1:3805 +#: doc/tin.1:3806 #, no-wrap msgid "Philip Hazel Eph10@cam.ac.ukE" msgstr "Philip Hazel Eph10@cam.ac.ukE" #. type: Plain text -#: doc/tin.1:3809 +#: doc/tin.1:3810 msgid "for B<\\%pcre>(3) (Perl-compatible regular expression library)." msgstr "for B<\\%pcre>(3) (Perl-compatible regular expression library)." #. type: IP -#: doc/tin.1:3809 +#: doc/tin.1:3810 #, no-wrap msgid "Patrick Powell Epapowell@astart.comE" msgstr "Patrick Powell Epapowell@astart.comE" #. type: Plain text -#: doc/tin.1:3817 +#: doc/tin.1:3818 msgid "for B<\\%snprintf>(3) and B<\\%vsnprintf>(3) fallbacks." msgstr "for B<\\%snprintf>(3) and B<\\%vsnprintf>(3) fallbacks." #. type: SH -#: doc/tin.1:3817 +#: doc/tin.1:3818 #, no-wrap msgid "AUTHOR" msgstr "AUTHOR" #. type: TP -#: doc/tin.1:3818 +#: doc/tin.1:3819 #, no-wrap msgid "Iain Lea Eiain@bricbrac.deE" msgstr "Iain Lea Eiain@bricbrac.deE" #. type: SH -#: doc/tin.1:3822 +#: doc/tin.1:3823 #, no-wrap msgid "MAINTAINER" msgstr "MAINTAINER" #. type: TP -#: doc/tin.1:3823 +#: doc/tin.1:3824 #, no-wrap msgid "Urs Janssen Eurs@tin.orgE" msgstr "Urs Janssen Eurs@tin.orgE" #. type: SH -#: doc/tin.1:3827 doc/tin.5:2634 +#: doc/tin.1:3828 doc/tin.5:2634 #, no-wrap msgid "SEE ALSO" msgstr "SEE ALSO" #. type: Plain text -#: doc/tin.1:3882 +#: doc/tin.1:3883 msgid "" "B<\\%cron>(1), B<\\%elm>(1), B<\\%emacs>(1), B<\\%gpg>(1), B<\\%inews>(1), B<" "\\%ispell>(1), B<\\%lp>(1), B<\\%lpr>(1), B<\\%metamail>(1), B<\\" @@ -10555,11 +10564,11 @@ msgstr "" msgid "" "secret to be used for cancel-locks if B<\\%tin>(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 for the user." +"This file should be readable only by the user." msgstr "" "secret to be used for cancel-locks if B<\\%tin>(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 for the user." +"This file should be readable only by the user." #. type: Plain text #: doc/tin.5:249 @@ -10574,14 +10583,14 @@ msgid "" "in double quotes (\"). Usernames must not be enclosed in double quotes and " "thus can't contain spaces or tabs. Any line that starts with \"#\" is a " "comment. Blank lines are ignored. This file should be readable only for the " -"user as it contains the user's uncrypted password for reading news!" +"user as it contains the user's unencrypted password for reading news!" msgstr "" "\"I I [I]\" pairs for NNTP servers that require " "authorisation. If the password contains a space or a tab it must be enclosed " "in double quotes (\"). Usernames must not be enclosed in double quotes and " "thus can't contain spaces or tabs. Any line that starts with \"#\" is a " "comment. Blank lines are ignored. This file should be readable only for the " -"user as it contains the user's uncrypted password for reading news!" +"user as it contains the user's unencrypted password for reading news!" #. type: TP #: doc/tin.5:261 doc/tin.5:1087 @@ -10602,8 +10611,8 @@ msgstr "B" #. type: Plain text #: doc/tin.5:267 -msgid "user's uncrypted password for reading news." -msgstr "user's uncrypted password for reading news." +msgid "user's unencrypted password for reading news." +msgstr "user's unencrypted password for reading news." #. type: TP #: doc/tin.5:267 diff -Nurp '--exclude=.bzr*' tin-2.4.0/doc/l10n/tin-man.pot tin-2.4.1/doc/l10n/tin-man.pot --- tin-2.4.0/doc/l10n/tin-man.pot 2016-08-23 07:27:41.000000000 +0200 +++ tin-2.4.1/doc/l10n/tin-man.pot 2016-12-23 13:31:15.000000000 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2016-08-10 10:07+0200\n" +"POT-Creation-Date: 2016-12-23 13:31+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,13 +25,13 @@ msgstr "" #. type: TH #: doc/tin.1:12 doc/tin.5:9 #, no-wrap -msgid "August 23rd, 2016" +msgid "December 24th, 2016" msgstr "" #. type: TH #: doc/tin.1:12 doc/tin.5:9 #, no-wrap -msgid "2.4.0" +msgid "2.4.1" msgstr "" #. type: TH @@ -8001,60 +8001,67 @@ msgstr "" msgid "B" msgstr "" +#. type: Plain text +#: doc/tin.1:3578 +msgid "" +"MIME character set used if not configured via the tinrc variable " +"B." +msgstr "" + #. type: TP -#: doc/tin.1:3577 +#: doc/tin.1:3578 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3582 +#: doc/tin.1:3583 msgid "" "Set this variable to point to B<\\%ispell>(1) or a replacement and its " "cmd-line options." msgstr "" #. type: TP -#: doc/tin.1:3582 +#: doc/tin.1:3583 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3589 +#: doc/tin.1:3590 msgid "" "Define any additional options that you wish to pass to your B<\\%pgp>(1) or " "B<\\%gpg>(1) program." msgstr "" #. type: TP -#: doc/tin.1:3589 +#: doc/tin.1:3590 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3594 +#: doc/tin.1:3595 msgid "" "Override the name of the B<\\%pgp>(1) directory in B<$HOME> that holds your " "keys etc.." msgstr "" #. type: TP -#: doc/tin.1:3594 +#: doc/tin.1:3595 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3599 +#: doc/tin.1:3600 msgid "" "Override the name of the B<\\%gpg>(1) directory in B<$HOME> that holds your " "keys etc.." msgstr "" #. type: TP -#: doc/tin.1:3599 +#: doc/tin.1:3600 #, no-wrap msgid "B" msgstr "" @@ -8062,7 +8069,7 @@ msgstr "" #. TODO: document LC_CTYPEs influence on #. ~/.tin/keymap.*, 8bit char display, ... #. type: Plain text -#: doc/tin.1:3613 +#: doc/tin.1:3614 msgid "" "This variable determines the B<\\%locale>(5) category for character " "handling functions. Usually it determines the character classes for pattern " @@ -8074,13 +8081,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3613 +#: doc/tin.1:3614 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3622 +#: doc/tin.1:3623 msgid "" "Formats of informative and diagnostic messages and interactive responses. " "It's value should be of the form " @@ -8089,13 +8096,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3622 +#: doc/tin.1:3623 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3630 +#: doc/tin.1:3631 msgid "" "Date and time formats. It's value should be of the form " "I[I<_territory>][I<.codeset>][I<@modifier>]. See B<\\%locale>(5) " @@ -8103,13 +8110,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3630 +#: doc/tin.1:3631 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3639 +#: doc/tin.1:3640 msgid "" "This variable overrides the value of the B<$LANG> variable and any other " "B<$LC_> variable. It's value should be of the form " @@ -8118,13 +8125,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3639 +#: doc/tin.1:3640 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3648 +#: doc/tin.1:3649 msgid "" "This variable determines the B<\\%locale>(5) category for any category not " "specifically selected with a variable starting with B<$LC_>. It's value " @@ -8133,13 +8140,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3648 +#: doc/tin.1:3649 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3656 +#: doc/tin.1:3657 msgid "" "This variable defines a priority list for translations. Whenever a " "translation is not available in the language selected via B<$LC_ALL> or " @@ -8149,13 +8156,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3656 +#: doc/tin.1:3657 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3666 +#: doc/tin.1:3667 msgid "" "A decimal integer E 0 used to indicate the user's preferred width in " "column positions for the terminal screen or window. If this variable is " @@ -8168,13 +8175,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3666 +#: doc/tin.1:3667 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3676 +#: doc/tin.1:3677 msgid "" "A decimal integer E 0 used to indicate the user's preferred number of " "lines on a page or the vertical screen or window size in lines. A line in " @@ -8187,108 +8194,108 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3676 +#: doc/tin.1:3677 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3682 +#: doc/tin.1:3683 msgid "" "The type of terminal in use. This is used when looking up termcap " "sequences. See B<\\%environ>(5) for more information." msgstr "" #. type: TP -#: doc/tin.1:3682 +#: doc/tin.1:3683 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3685 +#: doc/tin.1:3686 msgid "Display name, pointing to the X server; required for xface." msgstr "" #. type: TP -#: doc/tin.1:3685 +#: doc/tin.1:3686 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3689 +#: doc/tin.1:3690 msgid "" "Used for determining terminal's X window id; required for xface. Should be " "set by the terminal emulator." msgstr "" #. type: TP -#: doc/tin.1:3689 +#: doc/tin.1:3690 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3693 +#: doc/tin.1:3694 msgid "" "The pathname of the user's login shell. Used to set " "B." msgstr "" #. type: TP -#: doc/tin.1:3693 +#: doc/tin.1:3694 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3698 +#: doc/tin.1:3699 msgid "The pathname of the user's dir to put non-essential run time files into." msgstr "" #. type: SH -#: doc/tin.1:3698 +#: doc/tin.1:3699 #, no-wrap msgid "SIGNALS" msgstr "" #. TODO: add missing, sort useful, document in detail #. type: Plain text -#: doc/tin.1:3702 +#: doc/tin.1:3703 msgid "B handles a couple of signals:" msgstr "" #. type: TP -#: doc/tin.1:3702 +#: doc/tin.1:3703 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3705 doc/tin.1:3708 +#: doc/tin.1:3706 doc/tin.1:3709 msgid "Terminate gracefully." msgstr "" #. type: TP -#: doc/tin.1:3705 +#: doc/tin.1:3706 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:3708 +#: doc/tin.1:3709 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3711 +#: doc/tin.1:3712 msgid "Terminate gracefully but do not restore terminal (tty)." msgstr "" #. type: TP -#: doc/tin.1:3711 +#: doc/tin.1:3712 #, no-wrap msgid "B" msgstr "" @@ -8299,18 +8306,18 @@ msgstr "" #. give an overview of the most common error messages and how to cope with #. them. #. type: Plain text -#: doc/tin.1:3722 +#: doc/tin.1:3723 msgid "Write out I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>-file." msgstr "" #. type: SH -#: doc/tin.1:3722 +#: doc/tin.1:3723 #, no-wrap msgid "SECURITY" msgstr "" #. type: Plain text -#: doc/tin.1:3730 +#: doc/tin.1:3731 msgid "" "If B is started in debug mode (''B<-D n>'') it will create world " "readable files in B<$TMPDIR> which may contain the users NNTP password in " @@ -8319,7 +8326,7 @@ msgid "" msgstr "" #. type: SH -#: doc/tin.1:3730 +#: doc/tin.1:3731 #, no-wrap msgid "CONFORMING TO" msgstr "" @@ -8327,7 +8334,7 @@ msgstr "" #. - RFC\%2045, RFC\%2047, RFC\%2231, RFC\%2980, RFC\%3977, RFC\%4155 #. RFC\%4643, RFC\%5322, RFC\%5536, RFC\%5537, RFC\%6048 or whatever #. type: Plain text -#: doc/tin.1:3738 +#: doc/tin.1:3739 msgid "" "B does conform to the Base Definitions volume of IEEE Std 1003.1-2008, " "Section 12, Utility Conventions (Utility Argument Syntax, Utility Syntax " @@ -8335,13 +8342,13 @@ msgid "" msgstr "" #. type: SH -#: doc/tin.1:3738 +#: doc/tin.1:3739 #, no-wrap msgid "NOTES" msgstr "" #. type: Plain text -#: doc/tin.1:3743 +#: doc/tin.1:3744 msgid "" "Regular expression support is provided by the PCRE library package " "B<\\%pcre>(3), which is open source software, written by Philip Hazel, and " @@ -8349,18 +8356,18 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:3747 +#: doc/tin.1:3748 msgid "Eftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/E" msgstr "" #. type: SH -#: doc/tin.1:3747 +#: doc/tin.1:3748 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: doc/tin.1:3755 +#: doc/tin.1:3756 msgid "" "B NNTPd, B<\\%noffle>(1) (E= V1.0-pre5) and B (E= " "V1.1.91) can't handle pipelined GROUP commands. If you run into trouble with " @@ -8369,7 +8376,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:3764 +#: doc/tin.1:3765 msgid "" "Before mailing a bug-report to Etin-bugs@tin.orgE please check if " "you are using the latest (stable) release, and if not, please upgrade first! " @@ -8380,13 +8387,13 @@ msgid "" msgstr "" #. type: SH -#: doc/tin.1:3764 +#: doc/tin.1:3765 #, no-wrap msgid "HISTORY" msgstr "" #. type: Plain text -#: doc/tin.1:3773 +#: doc/tin.1:3774 msgid "" "B is based on the B<\\%tass>(1) newsreader that was developed by Rich " "Skrenta and posted to alt.sources in March 1991; its first version was " @@ -8397,169 +8404,169 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:3777 +#: doc/tin.1:3778 msgid "Ehttp://www.tin.org/history.htmlE." msgstr "" #. type: SH -#: doc/tin.1:3777 +#: doc/tin.1:3778 #, no-wrap msgid "CREDITS" msgstr "" #. type: IP -#: doc/tin.1:3779 +#: doc/tin.1:3780 #, no-wrap msgid "Rich Skrenta" msgstr "" #. type: Plain text -#: doc/tin.1:3783 +#: doc/tin.1:3784 msgid "author of B<\\%tass>(1) v3.2 which this newsreader used as its base." msgstr "" #. type: IP -#: doc/tin.1:3783 +#: doc/tin.1:3784 #, no-wrap msgid "Bill Davidsen" msgstr "" #. type: Plain text -#: doc/tin.1:3785 +#: doc/tin.1:3786 msgid "author of envarg.c environment variable reading routine." msgstr "" #. type: IP -#: doc/tin.1:3785 +#: doc/tin.1:3786 #, no-wrap msgid "Mike Gleason" msgstr "" #. type: Plain text -#: doc/tin.1:3787 +#: doc/tin.1:3788 msgid "author of sigfile.c random signature generation routines." msgstr "" #. type: IP -#: doc/tin.1:3787 +#: doc/tin.1:3788 #, no-wrap msgid "Markus Kuhn EMarkus.Kuhn@cl.cam.ac.ukE" msgstr "" #. type: Plain text -#: doc/tin.1:3789 +#: doc/tin.1:3790 msgid "author of langinfo.c, charset.c and iso2asc.txt ISO-8859-1 documentation." msgstr "" #. type: IP -#: doc/tin.1:3789 +#: doc/tin.1:3790 #, no-wrap msgid "Arnold Robbins" msgstr "" #. type: Plain text -#: doc/tin.1:3791 +#: doc/tin.1:3792 msgid "author of strftime.c date formatting routine." msgstr "" #. type: IP -#: doc/tin.1:3791 +#: doc/tin.1:3792 #, no-wrap msgid "Rich Salz" msgstr "" #. type: Plain text -#: doc/tin.1:3793 +#: doc/tin.1:3794 msgid "author of wildmat.c pattern matching and parsdate.y date parsing routines." msgstr "" #. type: IP -#: doc/tin.1:3793 +#: doc/tin.1:3794 #, no-wrap msgid "Dave Taylor" msgstr "" #. type: Plain text -#: doc/tin.1:3797 +#: doc/tin.1:3798 msgid "author of curses.c from the B<\\%elm>(1) mailreader." msgstr "" #. type: IP -#: doc/tin.1:3797 +#: doc/tin.1:3798 #, no-wrap msgid "Chris Thewalt" msgstr "" #. type: Plain text -#: doc/tin.1:3801 +#: doc/tin.1:3802 msgid "author of getline.c B<\\%emacs>(1) style editing routine." msgstr "" #. type: IP -#: doc/tin.1:3801 +#: doc/tin.1:3802 #, no-wrap msgid "Steven Madsen" msgstr "" #. type: Plain text -#: doc/tin.1:3805 +#: doc/tin.1:3806 msgid "for adding B<\\%pgp>(1) (Pretty Good Privacy) support." msgstr "" #. type: IP -#: doc/tin.1:3805 +#: doc/tin.1:3806 #, no-wrap msgid "Philip Hazel Eph10@cam.ac.ukE" msgstr "" #. type: Plain text -#: doc/tin.1:3809 +#: doc/tin.1:3810 msgid "for B<\\%pcre>(3) (Perl-compatible regular expression library)." msgstr "" #. type: IP -#: doc/tin.1:3809 +#: doc/tin.1:3810 #, no-wrap msgid "Patrick Powell Epapowell@astart.comE" msgstr "" #. type: Plain text -#: doc/tin.1:3817 +#: doc/tin.1:3818 msgid "for B<\\%snprintf>(3) and B<\\%vsnprintf>(3) fallbacks." msgstr "" #. type: SH -#: doc/tin.1:3817 +#: doc/tin.1:3818 #, no-wrap msgid "AUTHOR" msgstr "" #. type: TP -#: doc/tin.1:3818 +#: doc/tin.1:3819 #, no-wrap msgid "Iain Lea Eiain@bricbrac.deE" msgstr "" #. type: SH -#: doc/tin.1:3822 +#: doc/tin.1:3823 #, no-wrap msgid "MAINTAINER" msgstr "" #. type: TP -#: doc/tin.1:3823 +#: doc/tin.1:3824 #, no-wrap msgid "Urs Janssen Eurs@tin.orgE" msgstr "" #. type: SH -#: doc/tin.1:3827 doc/tin.5:2634 +#: doc/tin.1:3828 doc/tin.5:2634 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: doc/tin.1:3882 +#: doc/tin.1:3883 msgid "" "B<\\%cron>(1), B<\\%elm>(1), B<\\%emacs>(1), B<\\%gpg>(1), B<\\%inews>(1), " "B<\\%ispell>(1), B<\\%lp>(1), B<\\%lpr>(1), B<\\%metamail>(1), " @@ -8933,7 +8940,7 @@ msgstr "" msgid "" "secret to be used for cancel-locks if B<\\%tin>(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 for the user." +"case. This file should be readable only by the user." msgstr "" #. type: Plain text @@ -8949,7 +8956,7 @@ msgid "" "in double quotes (\"). Usernames must not be enclosed in double quotes and " "thus can't contain spaces or tabs. Any line that starts with \"#\" is a " "comment. Blank lines are ignored. This file should be readable only for the " -"user as it contains the user's uncrypted password for reading news!" +"user as it contains the user's unencrypted password for reading news!" msgstr "" #. type: TP @@ -8971,7 +8978,7 @@ msgstr "" #. type: Plain text #: doc/tin.5:267 -msgid "user's uncrypted password for reading news." +msgid "user's unencrypted password for reading news." msgstr "" #. type: TP diff -Nurp '--exclude=.bzr*' tin-2.4.0/doc/tin.1 tin-2.4.1/doc/tin.1 --- tin-2.4.0/doc/tin.1 2016-08-23 07:27:26.000000000 +0200 +++ tin-2.4.1/doc/tin.1 2016-12-21 15:10:36.728982759 +0100 @@ -3,13 +3,13 @@ .\" Module : tin.1 .\" Author : I. Lea, U. Janssen .\" Created : 1991-08-23 -.\" Updated : 2016-08-23 +.\" Updated : 2016-12-24 .\" Notes : use american english; still needs some work, e.g.: .\" - document authorization (.newsauth) .\" - document random organization feature .\" .\" -.TH tin 1 "August 23rd, 2016" "2.4.0" "Usenet newsreader" +.TH tin 1 "December 24th, 2016" "2.4.1" "Usenet newsreader" .\" .\" .SH NAME @@ -3574,6 +3574,7 @@ Set this variable to disable the use of or a replacement (e.g. metamutt). .TP .B MM_CHARSET +MIME character set used if not configured via the tinrc variable \fBmm_charset\fP. .TP .B ISPELL Set this variable to point to diff -Nurp '--exclude=.bzr*' tin-2.4.0/doc/tin.5 tin-2.4.1/doc/tin.5 --- tin-2.4.0/doc/tin.5 2016-08-23 07:27:35.000000000 +0200 +++ tin-2.4.1/doc/tin.5 2016-12-23 13:30:47.508115959 +0100 @@ -2,11 +2,11 @@ .\" Module : tin.5 .\" Author : U. Janssen .\" Created : 2000-07-10 -.\" Updated : 2016-08-23 +.\" Updated : 2016-12-24 .\" Notes : needs a some work .\" .\" -.TH tin 5 "August 23rd, 2016" "2.4.0" "Usenet newsreader" +.TH tin 5 "December 24th, 2016" "2.4.1" "Usenet newsreader" .SH NAME tin, rtin \- related files @@ -234,7 +234,7 @@ priority. secret to be used for cancel-locks if .BR \%tin (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 for the user. +creation in that case. This file should be readable only by the user. .RE .PP @@ -257,13 +257,13 @@ require authorization. If the password c enclosed in double quotes ("). Usernames must not be enclosed in double quotes and thus can't contain spaces or tabs. Any line that starts with "#" is a comment. Blank lines are ignored. This file should be readable only for the -user as it contains the user's uncrypted password for reading news! +user as it contains the user's unencrypted password for reading news! .TP .B nntpserver full qualified domain name of the news server. .TP .B password -user's uncrypted password for reading news. +user's unencrypted password for reading news. .TP .B user username on the news server if it differs from the local login. This field is diff -Nurp '--exclude=.bzr*' tin-2.4.0/doc/tinews.1 tin-2.4.1/doc/tinews.1 --- tin-2.4.0/doc/tinews.1 2014-02-25 22:52:45.000000000 +0100 +++ tin-2.4.1/doc/tinews.1 2016-12-13 17:49:46.702190411 +0100 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16) +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "tinews.pl 1" -.TH tinews.pl 1 "February 25th, 2014" "1.1.38" "Post and sign an article via NNTP" +.TH tinews.pl 1 "December 13th, 2016" "1.1.42" "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 @@ -136,8 +145,8 @@ tinews.pl \- Post and sign an article vi \&\fBtinews.pl\fR [\fB\s-1OPTIONS\s0\fR] < \fIinput\fR .SH "DESCRIPTION" .IX Header "DESCRIPTION" -\&\fBtinews.pl\fR reads an article on \s-1STDIN\s0, signs it via \fBpgp\fR(1) or -\&\fBgpg\fR(1) and posts it to a newsserver. +\&\fBtinews.pl\fR reads an article on \s-1STDIN,\s0 signs it via \fBpgp\fR(1) or +\&\fBgpg\fR(1) and posts it to a news server. .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 @@ -175,6 +184,19 @@ Set the article header field Expires: to .IX Xref "-f --from" .IX Item "-f From | --from From" Set the article header field From: to the given value. +.IP "\-\fBi\fR \fIheader\fR | \-\-\fBignore-headers\fR \fIheader\fR" 4 +.IX Xref "-i --ignore-headers" +.IX Item "-i header | --ignore-headers header" +Comma separated list of headers that will be ignored during signing. +Usually the following headers will be signed if present: +.Sp +From, Newsgroups, Subject, Control, Supersedes, Followup-To, +Date, Injection-Date, Sender, Approved, Message-ID, Reply-To, +Cancel-Key, Also-Control and Distribution. +.Sp +Some of them may be altered on the Server (i.e. Cancel-Key) which would +invalid the signature, this option can be used the exclude such headers +if required. .ie n .IP "\-\fBn\fR ""Newsgroups"" | \-\-\fBnewsgroups\fR ""Newsgroups""" 4 .el .IP "\-\fBn\fR \f(CWNewsgroups\fR | \-\-\fBnewsgroups\fR \f(CWNewsgroups\fR" 4 .IX Xref "-n --newsgroups" @@ -222,6 +244,10 @@ Set the article header field Path: to th .IX Xref "-H --help" .IX Item "-H | --help" Show help-page. +.IP "\-\fBI\fR | \-\-\fBno-injection-date\fR" 4 +.IX Xref "-I --no-injection-date" +.IX Item "-I | --no-injection-date" +Do not add Injection-Date: header. .IP "\-\fBL\fR | \-\-\fBno-canlock\fR" 4 .IX Xref "-L --no-canlock" .IX Item "-L | --no-canlock" @@ -348,7 +374,7 @@ off by default. \&\*(L"nntpserver password [user]\*(R" pairs for \s-1NNTP\s0 servers that require authorization. Any line that starts with \*(L"#\*(R" is a comment. Blank lines are ignored. This file should be readable only for the user as it contains the -user's uncrypted password for reading news. First match counts. If no +user's unencrypted password for reading news. First match counts. If no matching entry is found \fI\f(CI$HOME\fI/.nntpauth\fR is checked. .ie n .IP "\fI\fI$HOME\fI/.nntpauth\fR" 4 .el .IP "\fI\f(CI$HOME\fI/.nntpauth\fR" 4 @@ -356,13 +382,13 @@ matching entry is found \fI\f(CI$HOME\fI \&\*(L"nntpserver user password\*(R" pairs for \s-1NNTP\s0 servers that require authorization. First match counts. Lines starting with \*(L"#\*(R" are skipped and blank lines are ignored. This file should be readable only for the user as -it contains the user's uncrypted password for reading news. +it contains the user's unencrypted password for reading news. \&\fI\f(CI$HOME\fI/.newsauth\fR is checked first. .ie n .IP "\fI\fI$XDG_CONFIG_HOME\fI/tinewsrc\fR \fI\fI$HOME\fI/.config/tinewsrc\fR \fI\fI$HOME\fI/.tinewsrc\fR" 4 .el .IP "\fI\f(CI$XDG_CONFIG_HOME\fI/tinewsrc\fR \fI\f(CI$HOME\fI/.config/tinewsrc\fR \fI\f(CI$HOME\fI/.tinewsrc\fR" 4 .IX Item "$XDG_CONFIG_HOME/tinewsrc $HOME/.config/tinewsrc $HOME/.tinewsrc" \&\*(L"option=value\*(R" configuration pairs. Lines that start with \*(L"#\*(R" are ignored. -If the file contains uncrypted passwords (e.g. NNTPPass or PGPPass), it +If the file contains unencrypted passwords (e.g. NNTPPass or PGPPass), it should be readable for the user only. .SH "SECURITY" .IX Header "SECURITY" @@ -373,7 +399,7 @@ security is an issue, don't use this scr .SH "NOTES" .IX Header "NOTES" \&\fBtinews.pl\fR is designed to be used with \fBpgp\fR(1)\-2.6.3, -\&\fBpgp\fR(1)\-5, \fBpgp\fR(1)\-6 and \fBgpg\fR(1). +\&\fBpgp\fR(1)\-5, \fBpgp\fR(1)\-6, \fBgpg\fR(1) and \fBgpg2\fR(1). .PP \&\fBtinews.pl\fR requires the following standard modules to be installed: \&\fBGetopt::Long\fR(3pm), \fBNet::NNTP\fR(3pm), \fBTime::Local\fR(3pm) and @@ -388,7 +414,7 @@ Urs Janssen , Marc Brockschmidt .SH "SEE ALSO" .IX Header "SEE ALSO" -\&\fBpgp\fR(1), \fBgpg\fR(1), \fBpgps\fR(1), \fBDigest::HMAC_SHA1\fR(3pm), +\&\fBpgp\fR(1), \fBgpg\fR(1), \fBgpg2\fR(1), \fBpgps\fR(1), \fBDigest::HMAC_SHA1\fR(3pm), \&\fBDigest::SHA\fR(3pm), \fBDigest::SHA1\fR(3pm), \fBGetopt::Long\fR(3pm), \&\fBMIME::Base64\fR(3pm), \fBNet::NNTP\fR(3pm), \fBTime::Local\fR(3pm), \&\fBTerm::Readline\fR(3pm) diff -Nurp '--exclude=.bzr*' tin-2.4.0/include/autoconf.hin tin-2.4.1/include/autoconf.hin --- tin-2.4.0/include/autoconf.hin 2016-04-11 16:59:32.000000000 +0200 +++ tin-2.4.1/include/autoconf.hin 2016-10-12 17:28:41.007594963 +0200 @@ -6,7 +6,7 @@ * Updated : 2012-02-29 * Notes : #include files, #defines & struct's * - * Copyright (c) 1995-2016 Thomas Dickey + * Copyright (c) 1995-2017 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/include/bool.h tin-2.4.1/include/bool.h --- tin-2.4.0/include/bool.h 2015-11-22 01:15:40.000000000 +0100 +++ tin-2.4.1/include/bool.h 2016-10-12 17:28:38.303484829 +0200 @@ -6,7 +6,7 @@ * Updated : 2013-01-09 * Notes : * - * Copyright (c) 1997-2016 Urs Janssen + * Copyright (c) 1997-2017 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/include/bugrep.h tin-2.4.1/include/bugrep.h --- tin-2.4.0/include/bugrep.h 2015-11-22 01:15:40.000000000 +0100 +++ tin-2.4.1/include/bugrep.h 2016-10-12 17:28:38.335486132 +0200 @@ -6,7 +6,7 @@ * Updated : 2006-02-15 * Notes : * - * Copyright (c) 1997-2016 Urs Janssen + * Copyright (c) 1997-2017 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/include/debug.h tin-2.4.1/include/debug.h --- tin-2.4.0/include/debug.h 2016-02-28 11:31:47.000000000 +0100 +++ tin-2.4.1/include/debug.h 2016-10-12 17:28:38.367487436 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-02-27 * Notes : * - * Copyright (c) 2007-2016 Urs Janssen + * Copyright (c) 2007-2017 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/include/extern.h tin-2.4.1/include/extern.h --- tin-2.4.0/include/extern.h 2016-06-07 00:47:43.000000000 +0200 +++ tin-2.4.1/include/extern.h 2016-10-12 17:28:38.399488739 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-06-06 * Notes : * - * Copyright (c) 1997-2016 Iain Lea + * Copyright (c) 1997-2017 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/include/keymap.h tin-2.4.1/include/keymap.h --- tin-2.4.0/include/keymap.h 2015-11-22 01:15:40.000000000 +0100 +++ tin-2.4.1/include/keymap.h 2016-10-12 17:28:38.459491182 +0200 @@ -6,7 +6,7 @@ * Updated : 2011-01-25 * Notes : * - * Copyright (c) 1999-2016 Jason Faultless + * Copyright (c) 1999-2017 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/include/newsrc.h tin-2.4.1/include/newsrc.h --- tin-2.4.0/include/newsrc.h 2015-11-22 01:15:40.000000000 +0100 +++ tin-2.4.1/include/newsrc.h 2016-10-12 17:28:38.547494767 +0200 @@ -6,7 +6,7 @@ * Updated : 2003-11-18 * Notes : newsrc bit handling * - * Copyright (c) 1997-2016 Iain Lea , Rich Skrenta + * Copyright (c) 1997-2017 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.0/include/nntplib.h tin-2.4.1/include/nntplib.h --- tin-2.4.0/include/nntplib.h 2016-01-15 17:48:09.000000000 +0100 +++ tin-2.4.1/include/nntplib.h 2016-10-12 17:28:38.575495907 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-01-03 * Notes : nntp.h 1.5.11/1.6 with extensions for tin * - * Copyright (c) 1991-2016 Iain Lea + * Copyright (c) 1991-2017 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/include/policy.h tin-2.4.1/include/policy.h --- tin-2.4.0/include/policy.h 2015-11-22 01:15:40.000000000 +0100 +++ tin-2.4.1/include/policy.h 2016-10-12 17:28:38.631498188 +0200 @@ -6,7 +6,7 @@ * Updated : 2015-09-14 * Notes : #defines and static data for policy configuration * - * Copyright (c) 1999-2016 Ralf Doeblitz + * Copyright (c) 1999-2017 Ralf Doeblitz * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/include/proto.h tin-2.4.1/include/proto.h --- tin-2.4.0/include/proto.h 2016-07-30 11:20:13.000000000 +0200 +++ tin-2.4.1/include/proto.h 2016-10-12 17:28:38.663499491 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-07-29 * Notes : * - * Copyright (c) 1997-2016 Urs Janssen + * Copyright (c) 1997-2017 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/include/rfc2046.h tin-2.4.1/include/rfc2046.h --- tin-2.4.0/include/rfc2046.h 2016-01-28 23:06:35.000000000 +0100 +++ tin-2.4.1/include/rfc2046.h 2016-10-12 17:28:38.691500632 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-01-01 * Notes : rfc2046 MIME article definitions * - * Copyright (c) 2000-2016 Jason Faultless + * Copyright (c) 2000-2017 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/include/stpwatch.h tin-2.4.1/include/stpwatch.h --- tin-2.4.0/include/stpwatch.h 2015-11-22 01:15:40.000000000 +0100 +++ tin-2.4.1/include/stpwatch.h 2016-10-12 17:28:38.727502099 +0200 @@ -7,7 +7,7 @@ * Notes : Simple stopwatch routines for timing code using timeb * or gettimeofday structs * - * Copyright (c) 1993-2016 Iain Lea + * Copyright (c) 1993-2017 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/include/tcurses.h tin-2.4.1/include/tcurses.h --- tin-2.4.0/include/tcurses.h 2015-11-22 01:15:40.000000000 +0100 +++ tin-2.4.1/include/tcurses.h 2016-10-12 17:28:38.779504216 +0200 @@ -6,7 +6,7 @@ * Updated : 2011-04-02 * Notes : curses #include files, #defines & struct's * - * Copyright (c) 1997-2016 Thomas Dickey + * Copyright (c) 1997-2017 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/include/tin.h tin-2.4.1/include/tin.h --- tin-2.4.0/include/tin.h 2016-04-18 17:01:30.000000000 +0200 +++ tin-2.4.1/include/tin.h 2016-10-12 17:28:38.823506008 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-04-12 * Notes : #include files, #defines & struct's * - * Copyright (c) 1997-2016 Iain Lea , Rich Skrenta + * Copyright (c) 1997-2017 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.0/include/tinrc.h tin-2.4.1/include/tinrc.h --- tin-2.4.0/include/tinrc.h 2016-04-17 20:01:21.000000000 +0200 +++ tin-2.4.1/include/tinrc.h 2016-10-12 17:28:38.879508290 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-04-17 * Notes : * - * Copyright (c) 1999-2016 Jason Faultless + * Copyright (c) 1999-2017 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/include/tnntp.h tin-2.4.1/include/tnntp.h --- tin-2.4.0/include/tnntp.h 2015-11-22 01:15:40.000000000 +0100 +++ tin-2.4.1/include/tnntp.h 2016-10-12 17:28:38.907509430 +0200 @@ -6,7 +6,7 @@ * Updated : 2006-02-15 * Notes : #include files, #defines & struct's * - * Copyright (c) 1997-2016 Thomas Dickey + * Copyright (c) 1997-2017 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/include/trace.h tin-2.4.1/include/trace.h --- tin-2.4.0/include/trace.h 2015-11-22 01:15:40.000000000 +0100 +++ tin-2.4.1/include/trace.h 2016-10-12 17:28:38.931510407 +0200 @@ -6,7 +6,7 @@ * Updated : 2002-11-10 * Notes : Interface of trace.c * - * Copyright (c) 1997-2016 Thomas Dickey + * Copyright (c) 1997-2017 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/include/version.h tin-2.4.1/include/version.h --- tin-2.4.0/include/version.h 2016-08-23 07:28:24.000000000 +0200 +++ tin-2.4.1/include/version.h 2016-12-24 14:39:46.851790724 +0100 @@ -6,7 +6,7 @@ * Updated : 2013-11-21 * Notes : * - * Copyright (c) 1991-2016 Iain Lea + * Copyright (c) 1991-2017 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -40,10 +40,10 @@ # define PRODUCT "tin" # ifndef TIN_AUTOCONF_H -# define VERSION "2.4.0" +# define VERSION "2.4.1" # endif /* !TIN_AUTOCONF_H */ -# define RELEASEDATE "20160823" -# define RELEASENAME "Octomore" +# define RELEASEDATE "20161224" +# define RELEASENAME "Daill" /* config-file versions - must by dotted triples */ # define TINRC_VERSION "1.3.13" # define ATTRIBUTES_VERSION "1.0.8" Binary files tin-2.4.0/po/da.gmo and tin-2.4.1/po/da.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.0/po/da.po tin-2.4.1/po/da.po --- tin-2.4.0/po/da.po 2016-08-10 16:24:54.000000000 +0200 +++ tin-2.4.1/po/da.po 2016-12-20 16:59:38.578935171 +0100 @@ -74,7 +74,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 2.3.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-30 11:25+0200\n" +"POT-Creation-Date: 2016-12-20 16:59+0100\n" "PO-Revision-Date: 2016-07-08 09:14+0100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -8150,11 +8150,11 @@ msgstr "" msgid "NNTP connection error. Exiting..." msgstr "NNTP-forbindelsesfejl. Afslutter ..." -#: src/nntplib.c:856 src/nntplib.c:1839 +#: src/nntplib.c:856 src/nntplib.c:1834 msgid "Rejoin current group\n" msgstr "Tilslut igen til nuværende gruppe\n" -#: src/nntplib.c:864 src/nntplib.c:1847 +#: src/nntplib.c:864 src/nntplib.c:1842 #, c-format msgid "Read (%s)\n" msgstr "Læst (%s)\n" @@ -8164,12 +8164,12 @@ msgstr "Læst (%s)\n" msgid "Resend last command (%s)\n" msgstr "Send sidste kommando igen (%s)\n" -#: src/nntplib.c:1486 +#: src/nntplib.c:1481 msgid "CAPABILITIES did not announce READER" msgstr "FUNKTIONER annoncerede ikke LÆSER" # noget bud? -#: src/nntplib.c:1993 +#: src/nntplib.c:1988 msgid "MOTD: " msgstr "MOTD: " @@ -8253,7 +8253,7 @@ msgstr "" "mærkeligt ud.\n" "\n" -#: src/save.c:1065 +#: src/save.c:1067 msgid "bytes" msgstr "byte" Binary files tin-2.4.0/po/de.gmo and tin-2.4.1/po/de.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.0/po/de.po tin-2.4.1/po/de.po --- tin-2.4.0/po/de.po 2016-08-10 16:24:54.000000000 +0200 +++ tin-2.4.1/po/de.po 2016-12-20 17:00:03.879967692 +0100 @@ -4,14 +4,14 @@ # Kai Bojens , 2000-2002. # Andreas Metzler , 2001-2003. # Christian Garbs , 2003. -# Urs Janssen , 2004-2016 +# Urs Janssen , 2004-2017 # msgid "" msgstr "" -"Project-Id-Version: tin 2.4.0\n" +"Project-Id-Version: tin 2.4.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-30 11:25+0200\n" -"PO-Revision-Date: 2016-07-30 12:15+0200\n" +"POT-Creation-Date: 2016-12-20 16:59+0100\n" +"PO-Revision-Date: 2016-12-20 17:00+0100\n" "Last-Translator: Urs Janssen \n" "Language-Team: German \n" "Language: de\n" @@ -1514,7 +1514,7 @@ msgstr "" #: src/lang.c:238 #, c-format msgid "Insecure permissions of %s (%o)" -msgstr "Unsichere Zugriffsbeschränkungen auf %s (%o)" +msgstr "Unsichere Dateiberechtigungen auf %s (%o)" #: src/lang.c:240 #, c-format @@ -8418,11 +8418,11 @@ msgstr "" msgid "NNTP connection error. Exiting..." msgstr "NNTP Verbindungsfehler. Beende..." -#: src/nntplib.c:856 src/nntplib.c:1839 +#: src/nntplib.c:856 src/nntplib.c:1834 msgid "Rejoin current group\n" msgstr "Betrete aktuelle Gruppe neu\n" -#: src/nntplib.c:864 src/nntplib.c:1847 +#: src/nntplib.c:864 src/nntplib.c:1842 #, c-format msgid "Read (%s)\n" msgstr "Lese (%s)\n" @@ -8432,11 +8432,11 @@ msgstr "Lese (%s)\n" msgid "Resend last command (%s)\n" msgstr "Sende letztes Kommando (%s) neu\n" -#: src/nntplib.c:1486 +#: src/nntplib.c:1481 msgid "CAPABILITIES did not announce READER" msgstr "CAPABILITIES hat READER nicht bekannt geben" -#: src/nntplib.c:1993 +#: src/nntplib.c:1988 msgid "MOTD: " msgstr "MOTD: " @@ -8521,7 +8521,7 @@ msgstr "" "aussehen.\n" "\n" -#: src/save.c:1065 +#: src/save.c:1067 msgid "bytes" msgstr "Bytes" Binary files tin-2.4.0/po/en_GB.gmo and tin-2.4.1/po/en_GB.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.0/po/en_GB.po tin-2.4.1/po/en_GB.po --- tin-2.4.0/po/en_GB.po 2016-08-10 16:24:54.000000000 +0200 +++ tin-2.4.1/po/en_GB.po 2016-12-20 16:59:38.970951169 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 2.3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-30 11:25+0200\n" +"POT-Creation-Date: 2016-12-20 16:59+0100\n" "PO-Revision-Date: 2013-12-24 01:00+0000\n" "Last-Translator: Urs Janssen \n" "Language-Team: \n" @@ -7401,11 +7401,11 @@ msgstr "" msgid "NNTP connection error. Exiting..." msgstr "" -#: src/nntplib.c:856 src/nntplib.c:1839 +#: src/nntplib.c:856 src/nntplib.c:1834 msgid "Rejoin current group\n" msgstr "" -#: src/nntplib.c:864 src/nntplib.c:1847 +#: src/nntplib.c:864 src/nntplib.c:1842 #, c-format msgid "Read (%s)\n" msgstr "" @@ -7415,11 +7415,11 @@ msgstr "" msgid "Resend last command (%s)\n" msgstr "" -#: src/nntplib.c:1486 +#: src/nntplib.c:1481 msgid "CAPABILITIES did not announce READER" msgstr "" -#: src/nntplib.c:1993 +#: src/nntplib.c:1988 msgid "MOTD: " msgstr "" @@ -7490,7 +7490,7 @@ msgid "" "\n" msgstr "" -#: src/save.c:1065 +#: src/save.c:1067 msgid "bytes" msgstr "" Binary files tin-2.4.0/po/et.gmo and tin-2.4.1/po/et.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.0/po/et.po tin-2.4.1/po/et.po --- tin-2.4.0/po/et.po 2016-08-10 16:24:54.000000000 +0200 +++ tin-2.4.1/po/et.po 2016-12-20 16:59:39.162959007 +0100 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 2.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-30 11:25+0200\n" +"POT-Creation-Date: 2016-12-20 16:59+0100\n" "PO-Revision-Date: 2016-08-10 16:15+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -8187,11 +8187,11 @@ msgstr "" msgid "NNTP connection error. Exiting..." msgstr "NNTP ühenduse viga. Lõpetan..." -#: src/nntplib.c:856 src/nntplib.c:1839 +#: src/nntplib.c:856 src/nntplib.c:1834 msgid "Rejoin current group\n" msgstr "Taasühinen jooksva grupiga\n" -#: src/nntplib.c:864 src/nntplib.c:1847 +#: src/nntplib.c:864 src/nntplib.c:1842 #, c-format msgid "Read (%s)\n" msgstr "Lugesin (%s)\n" @@ -8201,11 +8201,11 @@ msgstr "Lugesin (%s)\n" msgid "Resend last command (%s)\n" msgstr "Saada viimane käsk uuesti (%s)\n" -#: src/nntplib.c:1486 +#: src/nntplib.c:1481 msgid "CAPABILITIES did not announce READER" msgstr "CAPABILITIES ei sisalda READER" -#: src/nntplib.c:1993 +#: src/nntplib.c:1988 msgid "MOTD: " msgstr "MOTD: " @@ -8287,7 +8287,7 @@ msgstr "" "vormingut kasutama ja järgnev tekst võib olla kummaline.\n" "\n" -#: src/save.c:1065 +#: src/save.c:1067 msgid "bytes" msgstr "baiti" Binary files tin-2.4.0/po/fr.gmo and tin-2.4.1/po/fr.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.0/po/fr.po tin-2.4.1/po/fr.po --- tin-2.4.0/po/fr.po 2016-08-10 17:21:36.000000000 +0200 +++ tin-2.4.1/po/fr.po 2016-12-20 16:59:39.346966516 +0100 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: tin-2.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-30 11:25+0200\n" +"POT-Creation-Date: 2016-12-20 16:59+0100\n" "PO-Revision-Date: 2016-08-10 16:57+0100\n" "Last-Translator: Matt Anton \n" "Language-Team: French \n" @@ -610,8 +610,11 @@ msgstr "Article rejeté (enregistré dan #: src/lang.c:65 #, c-format -msgid "%s=article, %s=thread, %s=range, %s=hot, %s=pattern, %s=tagged, %s=quit: " -msgstr "%s=article, %s=fil, %s=champ, %s=sélection, %s=chaîne, %s=art. marq., %s=quitter : " +msgid "" +"%s=article, %s=thread, %s=range, %s=hot, %s=pattern, %s=tagged, %s=quit: " +msgstr "" +"%s=article, %s=fil, %s=champ, %s=sélection, %s=chaîne, %s=art. marq., " +"%s=quitter : " #: src/lang.c:66 msgid "Article unavailable" @@ -791,8 +794,10 @@ 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 : " +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 #, c-format @@ -828,7 +833,8 @@ msgstr "*** Début de l'article ***" #: src/lang.c:118 #, 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) : " +msgstr "" +"Annuler (effacer) ou remplacer (écraser) l'article [%%s]? (%s/%s/%s) : " #: src/lang.c:119 msgid "Cancelling article..." @@ -1107,7 +1113,9 @@ msgstr "" #: src/lang.c:190 #, c-format msgid "Error: Custom format exceeds screen width. Using default \"%s\"." -msgstr "Erreur : le format personnalisé est plus long que l’écran. Utilisation de celui par défaut « %s »." +msgstr "" +"Erreur : le format personnalisé est plus long que l’écran. Utilisation de " +"celui par défaut « %s »." #: src/lang.c:191 msgid "Internal error in GNKSA routine - send bug report.\n" @@ -1138,7 +1146,8 @@ 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 "" -"Domaine invalide. Envoyez un rapport de bogue si votre domaine premier existe.\n" +"Domaine invalide. Envoyez un rapport de bogue si votre domaine premier " +"existe.\n" "Utilisez .invalid comme domaine premier pour les fausses adresses.\n" #: src/lang.c:198 @@ -1146,7 +1155,8 @@ 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 "" -"Domaine illégal. Envoyez un rapport de bogue si votre domaine premier existe.\n" +"Domaine illégal. Envoyez un rapport de bogue si votre domaine premier " +"existe.\n" "Utilisez .invalid comme domaine premier pour les fausses adresses.\n" #: src/lang.c:199 @@ -1154,7 +1164,8 @@ 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 "" -"Domaine inconnu. Envoyez un rapport de bogue si votre domaine premier existe.\n" +"Domaine inconnu. Envoyez un rapport de bogue si votre domaine premier " +"existe.\n" "Utilisez .invalid comme domaine premier pour les fausses adresses.\n" #: src/lang.c:200 @@ -1182,8 +1193,11 @@ msgid "Domain literal has impossible num msgstr "Domaine littéral contient une valeur numérique impossible.\n" #: src/lang.c:206 -msgid "Domain literal is for private use only and not allowed for global use.\n" -msgstr "Domaine littéral est pour l'usage privé et n'est pas autorisé à l'usage global.\n" +msgid "" +"Domain literal is for private use only and not allowed for global use.\n" +msgstr "" +"Domaine littéral est pour l'usage privé et n'est pas autorisé à l'usage " +"global.\n" #: src/lang.c:207 msgid "Right bracket missing in domain literal.\n" @@ -1207,7 +1221,8 @@ msgid "" "Unquoted words may not contain '!()<>@,;:\\.[]' in route addresses.\n" msgstr "" "Caractère illégal dans le nom réel.\n" -"Mots non cités ne devraient pas contenir '!()<>@,;:\\.[]' dans l'adresse de routage.\n" +"Mots non cités ne devraient pas contenir '!()<>@,;:\\.[]' dans l'adresse de " +"routage.\n" #: src/lang.c:212 msgid "" @@ -1223,7 +1238,8 @@ msgid "" "Encoded words may not contain '!()<>@,;:\"\\.[]/=' in parameter.\n" msgstr "" "Caractère illégal dans le nom réel.\n" -"Mots encodés ne devraient pas contenir '!()<>@,;:\"\\.[]/=' dans le paramètre.\n" +"Mots encodés ne devraient pas contenir '!()<>@,;:\"\\.[]/=' dans le " +"paramètre.\n" #: src/lang.c:214 msgid "Bad syntax in encoded word used in realname.\n" @@ -1235,7 +1251,8 @@ msgid "" "Unquoted words may not contain '()<>\\' in old-style addresses.\n" msgstr "" "Caractère illégal dans le nom réel.\n" -"Mots non cités ne devraient pas contenir '()<>\\' dans les adresses de type anciennes.\n" +"Mots non cités ne devraient pas contenir '()<>\\' dans les adresses de type " +"anciennes.\n" #: src/lang.c:216 msgid "" @@ -1243,7 +1260,8 @@ msgid "" "Control characters and unencoded 8bit characters > 127 are not allowed.\n" msgstr "" "Caractère illégal dans le nom réel.\n" -"Les caractères de contrôle et non encodés en 8bit > 127 ne sont pas autorisés.\n" +"Les caractères de contrôle et non encodés en 8bit > 127 ne sont pas " +"autorisés.\n" #: src/lang.c:217 msgid "" @@ -1310,7 +1328,8 @@ msgid "" "%s\n" msgstr "" "\n" -"Erreur : L'en-tête de la ligne %d n'a pas de séparateur après l'en-tête nom :\n" +"Erreur : L'en-tête de la ligne %d n'a pas de séparateur après l'en-tête " +"nom :\n" "%s\n" #: src/lang.c:233 @@ -1434,7 +1453,8 @@ msgid "" "Error on line %d: \"Sender:\" header not allowed (it will be added for you)\n" msgstr "" "\n" -"Erreur sur la ligne %d : en-tête \"Sender:\" non autorisé (sera ajouté pour vous)\n" +"Erreur sur la ligne %d : en-tête \"Sender:\" non autorisé (sera ajouté pour " +"vous)\n" #: src/lang.c:261 #, c-format @@ -1497,7 +1517,8 @@ msgid "" "You requested followups to your article to go to the following %s:\n" msgstr "" "\n" -"Vous avez souhaité que les réponses à votre article aillent au(x) %s suivant(s) :\n" +"Vous avez souhaité que les réponses à votre article aillent au(x) %s " +"suivant(s) :\n" #: src/lang.c:275 #, c-format @@ -1515,8 +1536,10 @@ msgstr "-- fin du message redirigé --\n #: src/lang.c:278 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" +"# 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" @@ -1525,14 +1548,17 @@ msgid "" "# 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" +"# 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" +"# 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" +"# gnksa=[<>]?NUM Optional. GNKSA parse_from() return code. '<' or '>' " +"opt.\n" "# xref=PATTERN Optional. Kill pattern (e.g. alt.flame*)\n" "# time=NUM Optional. time_t value when rule expires\n" "#\n" @@ -1543,24 +1569,32 @@ msgstr "" "# début de la règle, sinon ils seront déplacés\n" "# à la règle suivante. '#' n'est pas un mot-clé\n" "# valide pour un commentaire !\n" -"# group=TERME Obligatoire. Liste de groupe (pe. fr.comp.*,!*sources*).\n" +"# group=TERME Obligatoire. Liste de groupe (pe. fr.comp.*,!" +"*sources*).\n" "# case=NUM Obligatoire. Casse sensible=0 / casse insensible=1.\n" "# score=NUM|TERME Obligatoire. Score à attribuer. Soit :\n" "# score=NUM Un numéro (pe. 70). Ou :\n" "# score=TERME Un des deux mots-clé suivants : 'hot' ou 'kill'.\n" -"# subj=TERME Facultatif. En-tête 'Subject:' (pe. Comment devenir un gourou).\n" +"# subj=TERME Facultatif. En-tête 'Subject:' (pe. Comment devenir un " +"gourou).\n" "# from=TERME Facultatif. En-tête 'From:' (pe. *Craig Shergold*).\n" -"# msgid=TERME Facultatif. En-tête 'Message-ID:' (pe. <123@ether.net>) avec\n" +"# msgid=TERME Facultatif. En-tête 'Message-ID:' (pe. <123@ether." +"net>) avec\n" "# référence complète.\n" -"# msgid_last=TERME Facultatif. Comme ci-dessus mais avec juste le dernier MID.\n" +"# msgid_last=TERME Facultatif. Comme ci-dessus mais avec juste le dernier " +"MID.\n" "# msgid_only=TERME Facultatif. Comme ci-dessus mais sans les références.\n" -"# refs_only=TERME Facultatif. En-tête 'References:' (pe. <123@ether.net>) sans\n" +"# refs_only=TERME Facultatif. En-tête 'References:' (pe. <123@ether." +"net>) sans\n" "# la ligne Message-ID:\n" -"# lines=[<>]?NUM Facultatif. En-tête 'Lines:'. '<' ou '>' sont optionnels.\n" -"# gnksa=[<>]?NUM Facultatif. Résultat du 'parse_from' du GNKSA. '<' ou '>'\n" +"# lines=[<>]?NUM Facultatif. En-tête 'Lines:'. '<' ou '>' sont " +"optionnels.\n" +"# gnksa=[<>]?NUM Facultatif. Résultat du 'parse_from' du GNKSA. '<' ou " +"'>'\n" "# sont optionnels.\n" "# xref=CHAÎNE Facultatif. Chaîne à filtrer (pe. alt.flame*)\n" -"# time=NUM Facultatif. La valeur de time_t indique la durée de la règle.\n" +"# time=NUM Facultatif. La valeur de time_t indique la durée de la " +"règle.\n" "#\n" #: src/lang.c:299 @@ -1640,20 +1674,27 @@ msgid "group" msgstr "groupe" #: src/lang.c:318 -msgid "*** Group descriptions are disabled according to current select_format ***" -msgstr "*** Les descriptions de groupe sont désactivées en accord avec le format sélectionné ***" +msgid "" +"*** Group descriptions are disabled according to current select_format ***" +msgstr "" +"*** Les descriptions de groupe sont désactivées en accord avec le format " +"sélectionné ***" #: src/lang.c:320 -msgid "One or more lines of comment. to add a line or proceed if line is empty." -msgstr "Inclure un commentaire. pour ajouter une ligne ou continuer si vide." +msgid "" +"One or more lines of comment. to add a line or proceed if line is empty." +msgstr "" +"Inclure un commentaire. pour ajouter une ligne ou continuer si vide." #: src/lang.c:321 msgid "From: line to add to filter file. toggles & sets." msgstr "Filtrer l'en-tête 'From:'. change & valide." #: src/lang.c:322 -msgid "Linecount of articles to be filtered. < for less, > for more, = for equal." -msgstr "Filtrer selon le nombre de lignes. < pour moins, > pour plus, = pareil." +msgid "" +"Linecount of articles to be filtered. < for less, > for more, = for equal." +msgstr "" +"Filtrer selon le nombre de lignes. < pour moins, > pour plus, = pareil." #: src/lang.c:323 msgid "Message-ID: line to add to filter file. toggles & sets." @@ -1664,24 +1705,33 @@ msgid "Subject: line to add to filter fi msgstr "Filtrer l'en-tête 'Subject'. change & valide." #: src/lang.c:325 -msgid "Enter text pattern to filter if Subject: & From: lines are not what you want." +msgid "" +"Enter text pattern to filter if Subject: & From: lines are not what you want." msgstr "Terme à filtrer si autre que les en-têtes 'Subject:' & 'From:'." #: src/lang.c:326 -msgid "Select where text pattern should be applied. toggles & sets." -msgstr "Sur quel en-tête appliquer ce terme. change & valide." +msgid "" +"Select where text pattern should be applied. toggles & sets." +msgstr "" +"Sur quel en-tête appliquer ce terme. change & valide." #: src/lang.c:327 -msgid "Expiration time in days for the entered filter. toggles & sets." -msgstr "Durée (en nombre de jours) de la règle. change & valide." +msgid "" +"Expiration time in days for the entered filter. toggles & sets." +msgstr "" +"Durée (en nombre de jours) de la règle. change & valide." #: src/lang.c:328 -msgid "Apply kill only to current group or all groups. toggles & sets." +msgid "" +"Apply kill only to current group or all groups. toggles & sets." msgstr "Filtrer groupe actuel ou tous. change & valide." #: src/lang.c:329 -msgid "Apply select to current group or all groups. toggles & sets." -msgstr "Appliquer la règle au groupe actuel ou à tous. change & valide." +msgid "" +"Apply select to current group or all groups. toggles & sets." +msgstr "" +"Appliquer la règle au groupe actuel ou à tous. change & " +"valide." #: src/lang.c:330 msgid "kill an article via a menu" @@ -1893,7 +1943,9 @@ msgstr "démarquer toutes les PJ marqué #: src/lang.c:386 msgid "toggle info message in last line (name/description of attachment)" -msgstr "(dés)activer le message d'info. de la dernière ligne (nom/description de la PJ)" +msgstr "" +"(dés)activer le message d'info. de la dernière ligne (nom/description de la " +"PJ)" #: src/lang.c:387 msgid "choose first attribute in list" @@ -2066,7 +2118,8 @@ msgstr "rechercher partout un terme pré #: src/lang.c:431 msgid " \t (searches are case-insensitive and wrap around to all articles)" -msgstr " \t (les recherches ignorent la casse et s'opèrent sur tous les articles)" +msgstr "" +" \t (les recherches ignorent la casse et s'opèrent sur tous les articles)" #: src/lang.c:432 msgid "search for articles by Subject line backwards" @@ -2378,7 +2431,8 @@ msgstr "choisir le dernier article dans #: src/lang.c:511 msgid "mark art, range or tagged arts as read; move crsr to next unread art" -msgstr "marquer le ou les articles marqués comme lus et aller au prochain non lu" +msgstr "" +"marquer le ou les articles marqués comme lus et aller au prochain non lu" #: src/lang.c:512 msgid "mark article, range or tagged articles as unread" @@ -2550,10 +2604,12 @@ msgstr "%d %s brouillon(s), réutilisez- #: src/lang.c:546 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" +" To get the whole article, turn alternative handling OFF in the Option " +"Menu\n" msgstr "" "X-Conversion-Note : contenus multiparties/alternatifs retirés.\n" -" Pour voir l'article complet, désactivez la prise en charge alternative dans\n" +" Pour voir l'article complet, désactivez la prise en charge alternative " +"dans\n" " le Menu Option.\n" #: src/lang.c:548 @@ -2574,52 +2630,70 @@ msgstr "incomplet " #, 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" +"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" +"%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" +"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" +"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 "" "\n" "Bienvenue dans %s, un lecteur de groupes UseNet. Pouvant également lire un\n" "spool local (p.e. /news) ou depuis un serveur NNTP (Network News\n" -"Transport Protocol) distant (avec l'option -r). L'option -h liste les options\n" +"Transport Protocol) distant (avec l'option -r). L'option -h liste les " +"options\n" "principales de la ligne de commande.\n" "\n" "%s a quatre niveaux, la liste des groupes, l'index du groupe, le contenu du\n" -"fil de discussion, la visualisation de l'article. Une aide est visible depuis\n" +"fil de discussion, la visualisation de l'article. Une aide est visible " +"depuis\n" "chaque niveaux en appuyant simplement sur 'h'.\n" "\n" -"Déplacez-vous en utilisant les touches fléchées ou bien 'j' et 'k'. Utilisez\n" +"Déplacez-vous en utilisant les touches fléchées ou bien 'j' et 'k'. " +"Utilisez\n" "PgUp/PgDn ou Ctrl-U et Ctrl-D pour faire défiler la page de haut en bas.\n" "Entrez dans un groupe en appuyant sur RETOUR/TAB.\n" "\n" "Les articles, fils, articles marqués ou articles correspondant à un critère\n" "peuvent être envoyés par mail (commande 'm'), imprimés (commande 'o'),\n" "enregistrés (commande 's'), passés à une commande (commande '|').\n" -"Utilisez la commande 'w' pour poster un nouvel article, les commandes 'f'/'F'\n" -"pour poster un suivi en réponse à un article existant et les commandes 'r'/'R'\n" +"Utilisez la commande 'w' pour poster un nouvel article, les commandes " +"'f'/'F'\n" +"pour poster un suivi en réponse à un article existant et les commandes " +"'r'/'R'\n" "pour répondre par mail à l'auteur de l'article auquel vous répondez.\n" "La commande 'M' permet de configurer %s via un menu.\n" "\n" "Pour plus d'informations, lisez les pages de manuel, ainsi que les fichiers\n" "README, INSTALL, TODO et FTP.\n" -"Si vous constatez des bogues ou tout autre problème, envoyez s'il vous plaît\n" +"Si vous constatez des bogues ou tout autre problème, envoyez s'il vous " +"plaît\n" "un rapport de bogue/commentaires à %s via la touche 'R'.\n" #: src/lang.c:568 @@ -2835,18 +2909,25 @@ msgstr "=mettre l'actuel à n; %s=des #: src/lang.c:625 #, c-format -msgid "%s=view; %s=pipe; %s=pipe raw; %s=save; %s=tag; %s=tag pattern; %s=untag all" -msgstr "%s=voir; %s=passer; %s=passer la source; %s=enregistrer; %s=marquer; %s=marquer sélection; %s=tout démarquer" +msgid "" +"%s=view; %s=pipe; %s=pipe raw; %s=save; %s=tag; %s=tag pattern; %s=untag all" +msgstr "" +"%s=voir; %s=passer; %s=passer la source; %s=enregistrer; %s=marquer; " +"%s=marquer sélection; %s=tout démarquer" #: src/lang.c:627 #, c-format msgid "%s=view; %s=save; %s=tag; %s=tag pattern; %s=untag all" -msgstr "%s=voir; %s=enregistrer; %s=marquer; %s=marquer sélection; %s=tout démarquer" +msgstr "" +"%s=voir; %s=enregistrer; %s=marquer; %s=marquer sélection; %s=tout démarquer" #: src/lang.c:629 #, c-format -msgid "%s=reverse tagging; %s=search forwards; %s=search backwards; %s=repeat search" -msgstr "%s=(dés)activer le marquage; %s=recherche avant; %s=recherche arrière; %s=répéter la recherche" +msgid "" +"%s=reverse tagging; %s=search forwards; %s=search backwards; %s=repeat search" +msgstr "" +"%s=(dés)activer le marquage; %s=recherche avant; %s=recherche arrière; " +"%s=répéter la recherche" #: src/lang.c:630 src/lang.c:634 #, c-format @@ -2855,8 +2936,11 @@ msgstr "=voir 'n'; %s=non lu suivant; #: src/lang.c:631 #, c-format -msgid "%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; %s=list thread" -msgstr "%s=rech. auteur; %s=tout lu; %s=bas; %s=haut; %s=marquer lu; %s=voir fil" +msgid "" +"%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; " +"%s=list thread" +msgstr "" +"%s=rech. auteur; %s=tout lu; %s=bas; %s=haut; %s=marquer lu; %s=voir fil" #: src/lang.c:632 #, c-format @@ -2871,7 +2955,8 @@ msgstr "%s=recherche avant; %s=recherche #: src/lang.c:635 #, c-format msgid "%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read" -msgstr "%s=rech. auteur; %s=rech. corps; %s=tout marquer lu; %s=suivi; %s=marquer lu" +msgstr "" +"%s=rech. auteur; %s=rech. corps; %s=tout marquer lu; %s=suivi; %s=marquer lu" #: src/lang.c:636 #, c-format @@ -2885,13 +2970,17 @@ msgstr "=voir 'n'; %s=non lu suivant; #: src/lang.c:639 #, c-format -msgid "%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" +msgid "" +"%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" msgstr "%s=bas; %s=haut; %s=aide; %s=déplacer; %s=quitter; %s=voir lu/non lu" #: src/lang.c:640 #, c-format -msgid "%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/out" -msgstr "%s=abonner; %s=sous-critère; %s=désabonner; %s=critère; %s=liste des groupes" +msgid "" +"%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/" +"out" +msgstr "" +"%s=abonner; %s=sous-critère; %s=désabonner; %s=critère; %s=liste des groupes" #: src/lang.c:641 #, c-format @@ -2957,7 +3046,9 @@ msgstr "Encore essayer et enregistrer le #: src/lang.c:657 msgid "Warning: No newsgroups were written to your newsrc file. Save aborted." -msgstr "Attention : Aucuns groupes n'a été écrits dans le newsrc. Enregistrement annulé." +msgstr "" +"Attention : Aucuns groupes n'a été écrits dans le newsrc. Enregistrement " +"annulé." #: src/lang.c:658 msgid "newsrc file saved successfully.\n" @@ -3104,7 +3195,8 @@ msgstr "Groupe %s introuvable dans le fi #: src/lang.c:694 msgid "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: " -msgstr "c)réer, utiliser a)utre nom, utiliser .newsrc par d)éfaut, q)uitter tin : " +msgstr "" +"c)réer, utiliser a)utre nom, utiliser .newsrc par d)éfaut, q)uitter tin : " #: src/lang.c:695 msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: " @@ -3185,7 +3277,8 @@ msgid "" msgstr "" "Une erreur est survenue lors du postage de l'article. Si vous pensez que\n" "cette erreur est temporaire ou alors corrigeable, vous pouvez enregistrer\n" -"l'article comme brouillon et le réutiliser plus tard grâce à la commande ^O.\n" +"l'article comme brouillon et le réutiliser plus tard grâce à la commande " +"^O.\n" #: src/lang.c:717 msgid "Posted articles history" @@ -3210,8 +3303,12 @@ msgid "Post subject [%s]> " msgstr "Poster le sujet [%s] > " #: src/lang.c:722 -msgid "# Summary of mailed/posted messages viewable by 'W' command from within tin.\n" -msgstr "# Sommaire des messages envoyés/postés visible par la commande 'W' depuis tin.\n" +msgid "" +"# Summary of mailed/posted messages viewable by 'W' command from within " +"tin.\n" +msgstr "" +"# Sommaire des messages envoyés/postés visible par la commande 'W' depuis " +"tin.\n" #: src/lang.c:723 msgid "Posting article..." @@ -3274,7 +3371,8 @@ msgstr "Voulez-vous réellement quitter #: src/lang.c:737 #, 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] : " +msgstr "" +"%s=éditer message d'annulation, %s=quitter, %s=effacer (annuler) [%%s] : " #: src/lang.c:738 msgid "You have tagged articles in this group - quit anyway?" @@ -3414,7 +3512,8 @@ msgstr "Les réponses ont été redirig #: src/lang.c:775 #, 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 : " +msgstr "" +"Les réponses ont été redirigées à l'auteur. %s=mail, %s=poster, %s=quitter : " #: src/lang.c:777 msgid "Press to continue..." @@ -3470,7 +3569,8 @@ msgstr "" "# Fichier de configuration serveur de %s\n" "# Ce fichier a été automatiquement enregistré par %s %s %s (\"%s\")\n" "#\n" -"# N'éditez pas ce fichier lorsque %s est ouvert, car tout changement apporté\n" +"# N'éditez pas ce fichier lorsque %s est ouvert, car tout changement " +"apporté\n" "# sera écrasé lorsque vous quitterez %s.\n" "# Enfin, ne touchez pas à ce fichier si vous ne savez pas quoi y faire.\n" "############################################################################\n" @@ -3625,8 +3725,10 @@ msgid "Select article> " msgstr "Sélectionner l'article > " #: src/lang.c:828 -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." +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:829 msgid "Select group> " @@ -3742,22 +3844,28 @@ msgid "" "# expire=ON/OFF ON=limit to default_filter_days OFF=don't ever expire\n" msgstr "" "# Réglages par défaut pour les filtres et filtres d'auto-sélection\n" -"# header=NUM 0,1=Subject: 2,3=From: 4=Message-ID: & ligne References: complète\n" +"# header=NUM 0,1=Subject: 2,3=From: 4=Message-ID: & ligne References: " +"complète\n" "# 5=Message-ID: & dernière entrée dans References: seulement\n" "# 6=Message-ID: entrée 7=Lines: seulement\n" -"# global=ON/OFF ON=appliquer à tous les groups OFF=appliquer au groupe actuel\n" +"# global=ON/OFF ON=appliquer à tous les groups OFF=appliquer au groupe " +"actuel\n" "# 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:865 -msgid "# If ON use print current subject or newsgroup description in the last line\n" +msgid "" +"# If ON use print current subject or newsgroup description in the last line\n" msgstr "" -"# Si ON, affiche le sujet actuel ou la description du groupe dans la dernière\n" +"# Si ON, affiche le sujet actuel ou la description du groupe dans la " +"dernière\n" "# ligne\n" #: src/lang.c:866 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" +msgstr "" +"# Info sur l'hôte & l'heure utilisées pour détecter les nouveaux groupes (ne " +"pas toucher)\n" #: src/lang.c:867 msgid "There is no news\n" @@ -3922,11 +4030,15 @@ msgstr "Utiliser le programme d'affichag #: src/lang.c:910 msgid " -c mark all news as read in subscribed newsgroups (batch mode)" -msgstr " -c marquer tous les articles lus dans les groupes abonnés (en tâche de fond)" +msgstr "" +" -c marquer tous les articles lus dans les groupes abonnés (en tâche " +"de fond)" #: src/lang.c:911 msgid " -Z return status indicating if any unread news (batch mode)" -msgstr " -Z retourne un statut indiquant s'il y a nouveaux articles (en tâche de fond)" +msgstr "" +" -Z retourne un statut indiquant s'il y a nouveaux articles (en tâche " +"de fond)" #: src/lang.c:912 msgid " -q don't check for new newsgroups" @@ -3982,7 +4094,8 @@ msgstr " -N envoyer toute répons #: src/lang.c:923 msgid " -M user mail new news to specified user (batch mode)" -msgstr " -M util. envoyer tout nouvel article à une personne (en tâche de fond)" +msgstr "" +" -M util. envoyer tout nouvel article à une personne (en tâche de fond)" #: src/lang.c:924 #, c-format @@ -4012,7 +4125,9 @@ msgstr " -s rép. répertoire où enre #: src/lang.c:930 msgid " -S save new news for later reading (batch mode)" -msgstr " -S enregistrer tout nouvel article pour lecture différée (en tâche de fond)" +msgstr "" +" -S enregistrer tout nouvel article pour lecture différée (en tâche " +"de fond)" #: src/lang.c:931 msgid " -z start if any unread news" @@ -4073,7 +4188,8 @@ msgid "" "%-100s\n" msgstr "" "\n" -"Attention : message excédant %d colonnes. Ligne %d est la première dépassant :\n" +"Attention : message excédant %d colonnes. Ligne %d est la première " +"dépassant :\n" "%-100s\n" #: src/lang.c:943 @@ -4095,10 +4211,12 @@ msgstr "" #: src/lang.c:945 msgid "" "\n" -"Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:\".\n" +"Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:" +"\".\n" msgstr "" "\n" -"Attention : \"Subject:\" commence par \"Re: \" mais il n'y a pas de \"References:\".\n" +"Attention : \"Subject:\" commence par \"Re: \" mais il n'y a pas de " +"\"References:\".\n" #: src/lang.c:947 msgid "" @@ -4114,8 +4232,10 @@ msgstr "" 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" +" 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" @@ -4123,8 +4243,10 @@ msgid "" msgstr "" "Lisez ceci attentivement !\n" "\n" -" Vous êtes sur le point d'effacer un article apparemment écrit par vous. Cela effacera\n" -" cet article sur la plupart des serveurs UseNet du monde, mais il n'y a aucune\n" +" Vous êtes sur le point d'effacer un article apparemment écrit par vous. " +"Cela effacera\n" +" cet article sur la plupart des serveurs UseNet du monde, mais il n'y a " +"aucune\n" " garantie que cela marche.\n" "\n" "Voici l'article que vous vous apprêtez à effacer :\n" @@ -4214,19 +4336,26 @@ msgstr "Attention : Seul %d sur %d artic #, 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" +"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 "" "\n" -"Attention : Votre signature est longue de plus de %d lignes. Comme les signatures\n" -" ne contiennent aucune information pertinente, elles se doivent d'être\n" +"Attention : Votre signature est longue de plus de %d lignes. Comme les " +"signatures\n" +" ne contiennent aucune information pertinente, elles se doivent " +"d'être\n" " le plus court possible.\n" #: src/lang.c:975 #, c-format -msgid "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " -msgstr "Attention : cette email peut contenir un piège à spam. %s=continuer, %s=annuler ?" +msgid "" +"Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " +msgstr "" +"Attention : cette email peut contenir un piège à spam. %s=continuer, " +"%s=annuler ?" #: src/lang.c:976 msgid "" @@ -4234,7 +4363,8 @@ msgid "" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" msgstr "" "\n" -"Attention : Les signatures doivent commencer avec '-- \\n' et non par '-- \\n'.\n" +"Attention : Les signatures doivent commencer avec '-- \\n' et non par '-- " +"\\n'.\n" #: src/lang.c:977 msgid "Writing attributes file..." @@ -4295,10 +4425,13 @@ msgstr " -D mode mode debug" msgid "" "Read carefully!\n" "\n" -" You are about to cancel an article seemingly not written by you. This will\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" +" 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" @@ -4306,9 +4439,11 @@ msgid "" msgstr "" "Lisez ceci attentivement !\n" "\n" -" Vous vous apprêtez à effacer un article qui fut apparemment écrit par vous. Cela\n" +" Vous vous apprêtez à effacer un article qui fut apparemment écrit par " +"vous. Cela\n" " effacera l'article sur de nombreux serveurs UseNet répartis sur el globe;\n" -" La mojorité d'UseNet considère cela comme inapproprié, pour ne pas dire complètement.\n" +" La mojorité d'UseNet considère cela comme inapproprié, pour ne pas dire " +"complètement.\n" " Appuyez sur 'd' si vous vous sentez apte à subir les conséquences de ce\n" "geste.\n" "\n" @@ -4514,7 +4649,8 @@ msgstr "Article non signé et pas de cl #: src/lang.c:1076 #, 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 : " +msgstr "" +"%s=quitter, %s=éditer, %s=ispell, %s=pgp, %s=menu, %s=poster, %s=brouillon : " #: src/lang.c:1077 #, c-format @@ -4523,8 +4659,11 @@ msgstr "%s=quitter, %s=éditer, %s=ispel #: src/lang.c:1078 #, c-format -msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " -msgstr "%s=quitter, %s=éditer, %s=ispell, %s=pgp, %s=menu, %s=poster, %s=brouillon [%%s]: " +msgid "" +"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " +msgstr "" +"%s=quitter, %s=éditer, %s=ispell, %s=pgp, %s=menu, %s=poster, %s=brouillon " +"[%%s]: " #: src/lang.c:1080 #, c-format @@ -4539,7 +4678,8 @@ msgstr "%s=quitter, %s=éditer, %s=pgp, #: src/lang.c:1082 #, 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] : " +msgstr "" +"%s=quitter, %s=éditer, %s=pgp, %s=menu, %s=poster, %s=brouillon [%%s] : " #: src/lang.c:1086 #, c-format @@ -4554,7 +4694,8 @@ msgstr "%s=quitter, %s=éditer, %s=ispel #: src/lang.c:1088 #, 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] : " +msgstr "" +"%s=quitter, %s=éditer, %s=ispell, %s=menu, %s=poster, %s=brouillon [%%s] : " #: src/lang.c:1090 #, c-format @@ -4594,8 +4735,11 @@ msgstr "Déconnexion du serveur...\n" #: src/lang.c:1106 #, 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 "" +"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\"" #: src/lang.c:1107 #, c-format @@ -4651,7 +4795,8 @@ msgstr " -l utilise seulement LIS #: src/lang.c:1118 msgid " -n only read subscribed .newsrc groups from NNTP server" -msgstr " -n lire seulement groupes abonnés du .newsrc depuis le serveur NNTP" +msgstr "" +" -n lire seulement groupes abonnés du .newsrc depuis le serveur NNTP" #: src/lang.c:1120 msgid " -4 force connecting via IPv4" @@ -4726,7 +4871,8 @@ msgstr "Le postage avec l'inews externe #: src/lang.c:1148 msgid "It worked! Should I always use my built in inews from now on?" -msgstr "Ca a marché ! Devrais-je toujours utiliser mon inews intégré à présent ?" +msgstr "" +"Ca a marché ! Devrais-je toujours utiliser mon inews intégré à présent ?" #: src/lang.c:1152 #, c-format @@ -4831,23 +4977,38 @@ msgstr "" #: src/lang.c:1189 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" +" 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 "" "\n" -" Si votre article contient du texte cité prenez s'il vous plaît un peu de temps pour le nettoyer\n" -" afin de répondre en dessous du texte cité, ou bien les personnes penseront que vous êtes un peu bête !\n" -" La plupart des gens ont la bonne idée d'effacer les parties inutiles du texte cité.\n" -" Formattez votre article afin qu'aucune ligne ne dépasse 80 caractères, afin de respecter les usages (72 est un bon choix car il vous permet d'éviter\n" -" d'excéder la limite). Si vos lignes sont trop longues, elles seront coupées de façons aléatoires\n" -" rendant la lecture difficile voir impossible. Si vous ne respectez pas ces simples\n" +" Si votre article contient du texte cité prenez s'il vous plaît un peu de " +"temps pour le nettoyer\n" +" afin de répondre en dessous du texte cité, ou bien les personnes penseront " +"que vous êtes un peu bête !\n" +" La plupart des gens ont la bonne idée d'effacer les parties inutiles du " +"texte cité.\n" +" Formattez votre article afin qu'aucune ligne ne dépasse 80 caractères, " +"afin de respecter les usages (72 est un bon choix car il vous permet " +"d'éviter\n" +" d'excéder la limite). Si vos lignes sont trop longues, elles seront " +"coupées de façons aléatoires\n" +" rendant la lecture difficile voir impossible. Si vous ne respectez pas ces " +"simples\n" " règles, pratiquement toutes les personnes ignoreront vos articles.\n" #: src/lang.c:1202 @@ -4885,43 +5046,62 @@ msgstr "Service indisponible\n" #: src/lang.c:1224 #, c-format -msgid "%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" -msgstr "%s=passer; %s=mail; %s=impr.; %s=quitter; %s=voir lu/non lu; %s=enreg.; %s=marquer; %s=poster" +msgid "" +"%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; " +"%s=post" +msgstr "" +"%s=passer; %s=mail; %s=impr.; %s=quitter; %s=voir lu/non lu; %s=enreg.; " +"%s=marquer; %s=poster" #: src/lang.c:1225 #, c-format -msgid "%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" -msgstr "%s=passer; %s=mail; %s=impr.; %s=quitter; %s=répondre; %s=enreg.; %s=marquer; %s=poster" +msgid "" +"%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" +msgstr "" +"%s=passer; %s=mail; %s=impr.; %s=quitter; %s=répondre; %s=enreg.; " +"%s=marquer; %s=poster" #: src/lang.c:1227 #, c-format -msgid "%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" -msgstr "%s=mail; %s=imprimer; %s=quitter; %s=voir lu/non lu; %s=enregistrer; %s=marquer; %s=poster" +msgid "" +"%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" +msgstr "" +"%s=mail; %s=imprimer; %s=quitter; %s=voir lu/non lu; %s=enregistrer; " +"%s=marquer; %s=poster" #: src/lang.c:1228 #, c-format msgid "%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" -msgstr "%s=mail; %s=imprimer; %s=quitter; %s=répondre; %s=enregistrer; %s=marquer; %s=poster" +msgstr "" +"%s=mail; %s=imprimer; %s=quitter; %s=répondre; %s=enregistrer; %s=marquer; " +"%s=poster" #: src/lang.c:1232 #, c-format -msgid "%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" -msgstr "%s=passer; %s=mail; %s=quitter; %s=voir lu/non lu; %s=enregistrer; %s=marquer; %s=poster" +msgid "" +"%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" +msgstr "" +"%s=passer; %s=mail; %s=quitter; %s=voir lu/non lu; %s=enregistrer; " +"%s=marquer; %s=poster" #: src/lang.c:1233 #, c-format msgid "%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" -msgstr "%s=passer; %s=mail; %s=quitter; %s=répondre; %s=enregistrer; %s=marquer; %s=poster" +msgstr "" +"%s=passer; %s=mail; %s=quitter; %s=répondre; %s=enregistrer; %s=marquer; " +"%s=poster" #: src/lang.c:1235 #, c-format msgid "%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" -msgstr "%s=mail; %s=quitter; %s=voir lu/non lu; %s=enregistrer; %s=marquer; %s=poster" +msgstr "" +"%s=mail; %s=quitter; %s=voir lu/non lu; %s=enregistrer; %s=marquer; %s=poster" #: src/lang.c:1236 #, c-format msgid "%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" -msgstr "%s=mail; %s=quitter; %s=répondre; %s=enregistrer; %s=marquer; %s=poster" +msgstr "" +"%s=mail; %s=quitter; %s=répondre; %s=enregistrer; %s=marquer; %s=poster" #: src/lang.c:1242 msgid "Terminal does not support color" @@ -5421,7 +5601,9 @@ msgstr "" #: src/lang.c:1629 msgid "Show short description for each newsgroup. toggles & sets." -msgstr "Afficher une brève description pour chaque groupe. change & valide." +msgstr "" +"Afficher une brève description pour chaque groupe. change & " +" valide." #: src/lang.c:1630 msgid "Show description of each newsgroup" @@ -5436,8 +5618,11 @@ msgstr "" "# la vue de sélection des groupes\n" #: src/lang.c:1636 -msgid "Show From (author) fields in group & thread level. toggles & sets." -msgstr "Affiche l'auteur dans le menu groupe. change & valide." +msgid "" +"Show From (author) fields in group & thread level. toggles & " +"sets." +msgstr "" +"Affiche l'auteur dans le menu groupe. change & valide." #: src/lang.c:1637 msgid "In group and thread level, show author by" @@ -5461,7 +5646,8 @@ msgstr "" #: src/lang.c:1647 msgid "Draw -> or highlighted bar for selection. toggles & sets." -msgstr "Affiche -> ou une barre de sélection. change & valide." +msgstr "" +"Affiche -> ou une barre de sélection. change & valide." #: src/lang.c:1648 msgid "Draw -> instead of highlighted bar" @@ -5507,7 +5693,9 @@ msgstr "" #: src/lang.c:1672 msgid "Enter percentage match required to thread together. sets." -msgstr "Entrer le pourcentage de concordance pour grouper les articles en un fil. valide." +msgstr "" +"Entrer le pourcentage de concordance pour grouper les articles en un fil. " +" valide." #: src/lang.c:1673 msgid "Thread percentage match" @@ -5519,19 +5707,27 @@ 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" +"# 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 "" "# Taux de concordance du fil...\n" -"# le pourcentage de caractères dans le sujet d'un article qui doit correspondre\n" -"# à un article initial pour qu'ils puissent être considérés comme appartenant à\n" -"# un même fil. Cette option est un pourcentage, par ex. 80, sans décimales qui\n" -"# suivent. Si 80 est utilisé ici, alors 80% des caractères doivent absolument\n" -"# correspondre, sans insertion de caractère, pour que les deux articles soient placés\n" -"# dans le même fil. Par exemple 'happy' et 'harpy' correspondent, mais 'harpie',\n" +"# le pourcentage de caractères dans le sujet d'un article qui doit " +"correspondre\n" +"# à un article initial pour qu'ils puissent être considérés comme " +"appartenant à\n" +"# un même fil. Cette option est un pourcentage, par ex. 80, sans décimales " +"qui\n" +"# suivent. Si 80 est utilisé ici, alors 80% des caractères doivent " +"absolument\n" +"# correspondre, sans insertion de caractère, pour que les deux articles " +"soient placés\n" +"# dans le même fil. Par exemple 'happy' et 'harpy' correspondent, mais " +"'harpie',\n" "# 'happie' et 'harppy' seront regroupés à part de 'happy'\n" #: src/lang.c:1687 @@ -5553,8 +5749,10 @@ msgstr "" "# 2 = moyenne\n" #: src/lang.c:1696 -msgid "Sort articles by Subject, From, Date or Score. toggles & sets." -msgstr "Trie les articles d'après un en-tête. change & valide." +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:1697 msgid "Sort articles by" @@ -5617,8 +5815,11 @@ msgstr "" "# 4 = Date la plus récente, ascendant\n" #: src/lang.c:1726 -msgid "Put cursor at first/last unread art in groups. toggles & sets." -msgstr "Place le curseur sur le 1er article non lu. change & valide." +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:1727 msgid "Go to first unread article in group" @@ -5626,11 +5827,14 @@ msgstr "Aller au 1er article non lu du g #: src/lang.c:1728 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" +msgstr "" +"# Si ON, place le curseur sur le 1er article non lu sinon sur le dernier\n" #: src/lang.c:1732 msgid "Show all articles or only unread articles. toggles & sets." -msgstr "Affiche tous les articles ou seulement ceux non lus. change & valide." +msgstr "" +"Affiche tous les articles ou seulement ceux non lus. change & " +" valide." #: src/lang.c:1733 msgid "Show only unread articles" @@ -5638,7 +5842,8 @@ msgstr "Afficher articles non lus seulem #: src/lang.c:1734 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" +msgstr "" +"# Si ON, affiche seulement les articles non lus sinon les affiche tous.\n" #: src/lang.c:1739 msgid "Show only groups with unread arts" @@ -5725,14 +5930,16 @@ msgid "List thread using right arrow key msgstr "Lister le fil via la flèche droite" #: src/lang.c:1785 -msgid "# If ON automatically list thread when entering it using right arrow key.\n" +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:1789 msgid "Enter character to indicate deleted articles. sets, cancels." -msgstr "Caractère indiquant les articles effacés. valide, annule." +msgstr "" +"Caractère indiquant les articles effacés. valide, annule." #: src/lang.c:1790 msgid "Character to show deleted articles" @@ -5747,8 +5954,10 @@ msgstr "" "# _ est transformé en ' '\n" #: src/lang.c:1796 -msgid "Enter character to indicate articles in a range. sets, cancels." -msgstr "Caractère indiquant les articles inclus. valide, annule." +msgid "" +"Enter character to indicate articles in a range. sets, cancels." +msgstr "" +"Caractère indiquant les articles inclus. valide, annule." #: src/lang.c:1797 msgid "Character to show inrange articles" @@ -5763,8 +5972,12 @@ msgstr "" "# _ est transformé en ' '\n" #: src/lang.c:1803 -msgid "Enter character to indicate that article will return. sets, cancels." -msgstr "Caractère indiquant que l'article sera retourné. valide, annule." +msgid "" +"Enter character to indicate that article will return. sets, " +"cancels." +msgstr "" +"Caractère indiquant que l'article sera retourné. valide, " +"annule." #: src/lang.c:1804 msgid "Character to show returning arts" @@ -5779,8 +5992,10 @@ msgstr "" "# _ est transformé en ' '\n" #: src/lang.c:1810 -msgid "Enter character to indicate selected articles. sets, cancels." -msgstr "Caractère indiquant les articles sélectionnés. valide, annule." +msgid "" +"Enter character to indicate selected articles. sets, cancels." +msgstr "" +"Caractère indiquant les articles sélectionnés. valide, annule." #: src/lang.c:1811 msgid "Character to show selected articles" @@ -5791,12 +6006,14 @@ msgid "" "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" msgstr "" -"# Caractère utilisé pour indiquer qu'un article fut sélectionné (defaut '*')\n" +"# Caractère utilisé pour indiquer qu'un article fut sélectionné (defaut " +"'*')\n" "# _ est transformé en ' '\n" #: src/lang.c:1817 msgid "Enter character to indicate recent articles. sets, cancels." -msgstr "Caractère indiquant les articles récents. valide, annule." +msgstr "" +"Caractère indiquant les articles récents. valide, annule." #: src/lang.c:1818 msgid "Character to show recent articles" @@ -5812,7 +6029,8 @@ msgstr "" #: src/lang.c:1824 msgid "Enter character to indicate unread articles. sets, cancels." -msgstr "Caractère indiquant les articles non lus. valide, annule." +msgstr "" +"Caractère indiquant les articles non lus. valide, annule." #: src/lang.c:1825 msgid "Character to show unread articles" @@ -5844,7 +6062,8 @@ msgstr "" #: src/lang.c:1838 msgid "Enter character to indicate killed articles. sets, cancels." -msgstr "Caractère indiquant les articles filtrés. valide, annule." +msgstr "" +"Caractère indiquant les articles filtrés. valide, annule." #: src/lang.c:1839 msgid "Character to show killed articles" @@ -5859,8 +6078,11 @@ msgstr "" "# kill_level doit être choisi en conséquence, _ est transformé en ' '\n" #: src/lang.c:1845 -msgid "Enter character to indicate read selected articles. sets, cancels." -msgstr "Caractère indiquant les articles lus et sélectionnés. valide, annule." +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:1846 msgid "Character to show readselected arts" @@ -5890,8 +6112,12 @@ msgstr "" "# news.software.readers -> n.software.readers -> n.s.readers -> n.s.r.\n" #: src/lang.c:1860 -msgid "0 = full page scrolling, -1 = show previous last line as first on next page, -2 = half page" -msgstr "0 = défilement page par page, -1 = afficher dernière ligne dans page suivante, -2 = demi-page" +msgid "" +"0 = full page scrolling, -1 = show previous last line as first on next page, " +"-2 = half page" +msgstr "" +"0 = défilement page par page, -1 = afficher dernière ligne dans page " +"suivante, -2 = demi-page" #: src/lang.c:1861 msgid "Number of lines to scroll in pager" @@ -5925,11 +6151,16 @@ msgstr "Afficher les signatures" #: src/lang.c:1874 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" +msgstr "" +"# Si OFF ne pas afficher les signatures lors de la visualisation des " +"articles.\n" #: src/lang.c:1878 -msgid "Display uuencoded data as tagged attachments. toggles & sets." -msgstr "Afficher les archives uue comme PJ marquées. change & valide." +msgid "" +"Display uuencoded data as tagged attachments. toggles & sets." +msgstr "" +"Afficher les archives uue comme PJ marquées. change & " +"valide." #: src/lang.c:1879 msgid "Display uue data as an attachment" @@ -5942,7 +6173,8 @@ msgid "" "# * 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" +"# 2 = hide all, as for 1, but any line that looks like uuencoded data " +"will\n" "# be folded into a tag line.\n" msgstr "" "# Prise en charge des données uuencode dans le pager\n" @@ -5950,12 +6182,16 @@ msgstr "" "# * 0 = aucune, affichage brut des données uuencode\n" "# 1 = oui, les données uuencode seront condensée dans une seule ligne\n" "# affichant la taille et le fichier, comme sont affichées les PJ MIME\n" -"# 2 = masquer, comme pour l'option 1, mais toute ligne qui ressemble à des\n" +"# 2 = masquer, comme pour l'option 1, mais toute ligne qui ressemble à " +"des\n" "# données uuencode sera condensée en une seule ligne.\n" #: src/lang.c:1890 -msgid "Decode German style TeX umlaut codes to ISO. toggles & sets." -msgstr "Décode les umlauts Allemands de type TeX en ISO. change & valide." +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:1891 msgid "Display \"a as Umlaut-a" @@ -5982,13 +6218,17 @@ 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" +"# '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 "" -"# Quels en-têtes voulez-vous voir. Si vous souhaitez voir _tout_ les en-têtes,\n" +"# Quels en-têtes voulez-vous voir. Si vous souhaitez voir _tout_ les en-" +"têtes,\n" "# utilisez '*' comme valeur. C'est le seul moyen d'utiliser un caractère\n" -"# joker ici. Si vous entrez 'X-' comme valeur, vous verrez tous les en-têtes\n" -"# commençant par 'X-' (comme X-Alan ou X-Pape). Vous pouvez afficher plusieurs\n" +"# joker ici. Si vous entrez 'X-' comme valeur, vous verrez tous les en-" +"têtes\n" +"# commençant par 'X-' (comme X-Alan ou X-Pape). Vous pouvez afficher " +"plusieurs\n" "# en-têtes en les délimitant avec des espaces. Ne rien définir, désactive\n" "# cette option.\n" @@ -6000,14 +6240,17 @@ msgstr "Ne pas afficher ces en-têtes" 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" +"# 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 "" -"# Comme l'option 'news_headers_to_display' excepté que là c'est le contraire.\n" -"# Un exemple d'utilisation de ces deux options pourrait que vous trouviez les\n" +"# Comme l'option 'news_headers_to_display' excepté que là c'est le " +"contraire.\n" +"# Un exemple d'utilisation de ces deux options pourrait que vous trouviez " +"les\n" "# en-têtes 'X-' intéressantes mais celles contenant 'Alan' et 'Pape'\n" "# inutiles... donc voici ce que vous pourriez alors faire :\n" "# news_headers_to_display=X-\n" @@ -6015,8 +6258,11 @@ msgstr "" "# Ne rien définir, désactive cette option.\n" #: src/lang.c:1919 -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 ?" +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:1920 msgid "Skip multipart/alternative parts" @@ -6028,7 +6274,8 @@ msgstr "# Si ON, enlève automatiquement #: src/lang.c:1925 msgid "Enable detection of verbatim blocks? toggles & sets." -msgstr "Activer la détection des blocs à citer ? change & valide." +msgstr "" +"Activer la détection des blocs à citer ? change & valide." #: src/lang.c:1926 msgid "Detection of verbatim blocks" @@ -6040,7 +6287,9 @@ msgstr "# Si ON, détecte les blocs text #: src/lang.c:1932 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." +msgstr "" +"Une expression régulière pour déterminer quelles lignes afficher dans " +"col_quote." #: src/lang.c:1933 msgid "Regex used to show quoted lines" @@ -6058,7 +6307,9 @@ msgstr "" #: src/lang.c:1940 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." +msgstr "" +"Une expression régulière pour déterminer quelles lignes afficher dans " +"col_quote2." #: src/lang.c:1941 msgid "Regex used to show twice quoted l." @@ -6076,7 +6327,9 @@ msgstr "" #: src/lang.c:1948 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." +msgstr "" +"Une expression régulière pour déterminer quelles lignes afficher dans " +"col_quote3." #: src/lang.c:1949 msgid "Regex used to show >= 3 times q.l." @@ -6089,12 +6342,16 @@ msgid "" "# If you leave this blank, tin will use a built in default.\n" msgstr "" "# Une expression régulière qui permettra à tin d'afficher les citations de\n" -"# troisième niveau et supérieur. Ces citations sont affichées dans col_quote3.\n" -"# Si vous laissez ce champ vide, tin utilisera une valeur incluse par défaut.\n" +"# troisième niveau et supérieur. Ces citations sont affichées dans " +"col_quote3.\n" +"# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " +"défaut.\n" #: src/lang.c:1956 msgid "Enable detection of external quotes? toggles & sets." -msgstr "Activer la détection des citations externes ? change & valide." +msgstr "" +"Activer la détection des citations externes ? change & " +"valide." #: src/lang.c:1957 msgid "Detection of external quotes" @@ -6102,11 +6359,15 @@ msgstr "Détection des citations externe #: src/lang.c:1958 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" +msgstr "" +"# Si ON, détecte les citations textuelles de sources externes dans les " +"articles\n" #: src/lang.c:1962 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." +msgstr "" +"Une expression régulière pour déterminer quelles lignes afficher dans " +"col_extquote." #: src/lang.c:1963 msgid "Regex used to show quotes from external sources" @@ -6118,13 +6379,16 @@ msgid "" "# 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 "" -"# Une expression régulière qui permettra à tin de décider quelles sont les citations de\n" +"# Une expression régulière qui permettra à tin de décider quelles sont les " +"citations de\n" "# 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:1971 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." +msgstr "" +"Une expression régulière pour déterminer quels mots afficher dans " +"col_markslashes." #: src/lang.c:1972 msgid "Regex used to highlight /slashes/" @@ -6138,11 +6402,14 @@ msgid "" msgstr "" "# Une expression régulière qui permettra à tin d'afficher les mots\n" "# placés entre des '/' dans col_markslashes.\n" -"# Si vous laissez ce champ vide, tin utilisera une valeur incluse par défaut.\n" +"# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " +"défaut.\n" #: src/lang.c:1979 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." +msgstr "" +"Une expression régulière pour déterminer quels mots afficher dans " +"col_markstars." #: src/lang.c:1980 msgid "Regex used to highlight *stars*" @@ -6156,11 +6423,14 @@ msgid "" msgstr "" "# Une expression régulière qui permettra à tin d'afficher les mots\n" "# placés entre des '*' dans col_markstars.\n" -"# Si vous laissez ce champ vide, tin utilisera une valeur incluse par défaut.\n" +"# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " +"défaut.\n" #: src/lang.c:1987 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." +msgstr "" +"Une expression régulière pour déterminer quels mots afficher dans " +"col_markstroke." #: src/lang.c:1988 msgid "Regex used to highlight -strokes-" @@ -6174,11 +6444,14 @@ msgid "" msgstr "" "# Une expression régulière qui permettra à tin d'afficher les mots\n" "# placés entre des '-' dans col_markstroke.\n" -"# Si vous laissez ce champ vide, tin utilisera une valeur incluse par défaut.\n" +"# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " +"défaut.\n" #: src/lang.c:1995 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." +msgstr "" +"Une expression régulière pour déterminer quels mots afficher dans " +"col_markdash." #: src/lang.c:1996 msgid "Regex used to highlight _underline_" @@ -6192,11 +6465,14 @@ msgid "" msgstr "" "# Une expression régulière qui permettra à tin d'afficher les mots\n" "# placés entre des '_' dans col_markdash.\n" -"# Si vous laissez ce champ vide, tin utilisera une valeur incluse par défaut.\n" +"# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " +"défaut.\n" #: src/lang.c:2003 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." +msgstr "" +"Une expression régulière pour trouver les préfixes dans le sujet. '|' est un " +"séparateur." #: src/lang.c:2004 msgid "Regex with Subject prefixes" @@ -6212,7 +6488,9 @@ msgstr "" #: src/lang.c:2010 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." +msgstr "" +"Une expression régulière pour trouver les suffixes dans le sujet. '|' est un " +"séparateur." #: src/lang.c:2011 msgid "Regex with Subject suffixes" @@ -6259,8 +6537,12 @@ msgstr "" "# la fin d'une bloc textuel.\n" #: src/lang.c:2031 -msgid "Enter name and options for external MIME viewer, --internal for built-in viewer" -msgstr "Nom et options pour le visualisateur MIME externe, --internal pour celui inclus" +msgid "" +"Enter name and options for external MIME viewer, --internal for built-in " +"viewer" +msgstr "" +"Nom et options pour le visualisateur MIME externe, --internal pour celui " +"inclus" #: src/lang.c:2032 msgid "MIME binary content viewer" @@ -6270,7 +6552,8 @@ msgstr "Visualisateur de contenu MIME" 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" +"# Otherwise specify an external viewer program (eg, metamail) or leave " +"blank\n" "# for no automatic viewing\n" msgstr "" "# Utilisation du visualisateur MIME inclus pour les parties non textuelles\n" @@ -6297,7 +6580,8 @@ msgstr "" #: src/lang.c:2047 msgid "Ask to mark groups read when quitting. toggles & sets." -msgstr "Marquer lu les groupes à la fermeture ? change & valide." +msgstr "" +"Marquer lu les groupes à la fermeture ? change & valide." #: src/lang.c:2048 msgid "Catchup read groups when quitting" @@ -6334,9 +6618,11 @@ msgid "'Mark as (un)read' ignores tags" msgstr "'Marquer (non)lu l'article' ignore les marques" #: src/lang.c:2073 -msgid "# If ON the 'Mark as (un)read' function marks only the current article.\n" +msgid "" +"# If ON the 'Mark as (un)read' function marks only the current article.\n" msgstr "" -"# Si ON, la fonction 'Marquer (non) lu l'article' agit uniquement sur l'article\n" +"# Si ON, la fonction 'Marquer (non) lu l'article' agit uniquement sur " +"l'article\n" "# actuel.\n" #: src/lang.c:2077 @@ -6383,11 +6669,13 @@ msgid "" "# of already read articles to be read before first unread one\n" msgstr "" "# Nombre d'articles à récupérer (0=pas de limite); si le nombre est négatif\n" -"# détermine le nombre max d'articles déjà lus à relire avant le premier non lu\n" +"# détermine le nombre max d'articles déjà lus à relire avant le premier non " +"lu\n" #: src/lang.c:2104 msgid "Enter number of days article is considered recent. sets." -msgstr "Nombre de jours un article est considéré comme récent. valide." +msgstr "" +"Nombre de jours un article est considéré comme récent. valide." #: src/lang.c:2105 msgid "Article recentness time limit" @@ -6398,7 +6686,8 @@ msgid "# Number of days in which article msgstr "# Nombre de jours un article est considéré comme récent; (0=OFF)\n" #: src/lang.c:2110 -msgid "WILDMAT for normal wildcards, REGEX for full regular expression matching." +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:2111 @@ -6907,7 +7196,8 @@ msgstr "Englober les fils pour le non lu #: src/lang.c:2403 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" +msgstr "" +"# Si ON, englober les fils lors de la recherche de l'article suivant non lu\n" #: src/lang.c:2407 msgid "Enter default mail address (and fullname). sets." @@ -6934,8 +7224,11 @@ msgstr "" "# des articles\n" #: src/lang.c:2419 -msgid "Enter path/! command/--none to create your default signature. sets." -msgstr "Chemin/! commande/--aucune pour la création de votre signature. valide." +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:2420 msgid "Create signature from path/command" @@ -6948,13 +7241,16 @@ msgid "" "# sigfile=!command executes external command to generate a signature\n" "# sigfile=--none don't append a signature\n" msgstr "" -"# Fichier de signature à utiliser lors de la composition/réponse à un article.\n" +"# Fichier de signature à utiliser lors de la composition/réponse à un " +"article.\n" "# 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" +"# sigfile=!commande exécute une commande externe pour générer la " +"signature\n" "# sigfile=--aucun ne pas ajouter de signature\n" #: src/lang.c:2428 -msgid "Prepend signature with \"-- \" on own line. toggles & sets." +msgid "" +"Prepend signature with \"-- \" on own line. toggles & sets." msgstr "Précéder la signature avec \"-- \". change & valide." #: src/lang.c:2429 @@ -6969,7 +7265,8 @@ msgstr "" #: src/lang.c:2434 msgid "Add signature when reposting articles. toggles & sets." -msgstr "Rajouter la signature lors du repostage. change & valide." +msgstr "" +"Rajouter la signature lors du repostage. change & valide." #: src/lang.c:2435 msgid "Add signature when reposting" @@ -7027,8 +7324,10 @@ msgstr "" "# 7 = Citations compr., signatures et lignes vides citées\n" #: src/lang.c:2462 src/lang.c:2470 src/lang.c:2476 -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" +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:2463 msgid "Quote line when following up" @@ -7054,7 +7353,8 @@ msgstr "Citation lors d'un envoi par mai #: src/lang.c:2482 msgid "If ON, include User-Agent: header. toggles & sets." -msgstr "Si ON, inclus l'en-tête 'User-Agent:'. change & valide." +msgstr "" +"Si ON, inclus l'en-tête 'User-Agent:'. change & valide." #: src/lang.c:2483 msgid "Insert 'User-Agent:' header" @@ -7065,8 +7365,11 @@ msgid "# If ON include advertising User- msgstr "# Si ON inclus l'en-tête 'User-Agent:'\n" #: src/lang.c:2489 -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." +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:2490 msgid "MM_CHARSET" @@ -7083,7 +7386,8 @@ msgid "" msgstr "" "# Jeu d'encodage supporté localement qui est également utilisé pour les\n" "# en-têtes MIME ainsi que l'en-tête 'Content-Type'.\n" -"# Si rien n'est déclaré, la valeur de la variable d'environnement MM_CHARSET\n" +"# Si rien n'est déclaré, la valeur de la variable d'environnement " +"MM_CHARSET\n" "# est utilisée.\n" "# Utilisez US-ASCII ou utilisez la valeur par défaut lors de la compilation\n" "# de tin si aucunes des deux n'est définie.\n" @@ -7100,7 +7404,8 @@ msgid "# Charset used for MIME (Content- msgstr "# Jeu d'encodage utilisé par l'en-tête MIME (Content-Type).\n" #: src/lang.c:2506 -msgid "Enter local charset name (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." +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:2507 @@ -7160,8 +7465,11 @@ msgstr "" "# valeur 8bit.\n" #: src/lang.c:2539 -msgid "Auto-view post-processed files toggles, sets, cancels." -msgstr "Visualiser automatiquement les fichiers traités. change, valide, annule." +msgid "" +"Auto-view post-processed files toggles, sets, cancels." +msgstr "" +"Visualiser automatiquement les fichiers traités. change, " +"valide, annule." #: src/lang.c:2540 msgid "View post-processed files" @@ -7183,12 +7491,14 @@ msgstr "Caractères 8bits dans en-têtes 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" +"# 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 "" -"# Si ON, les caractères 8bit dans les en-têtes des mails ne sont PAS encodés.\n" +"# Si ON, les caractères 8bit dans les en-têtes des mails ne sont PAS " +"encodés.\n" "# OFF par défaut. Donc les caractères 8bit sont encodés par défaut.\n" "# Les caractères 8bit dans les en-têtes sont encodés indépendamment\n" "# de la valeur de cette option sauf si mail_mime_encoding a comme valeur\n" @@ -7202,14 +7512,18 @@ msgid "Strip blanks from ends of lines" msgstr "Nettoyer les fins de lignes" #: src/lang.c:2565 -msgid "# If ON strip blanks from ends of lines for faster display on slow terminals.\n" +msgid "" +"# If ON strip blanks from ends of lines for faster display on slow " +"terminals.\n" msgstr "" "# Si ON, enlève les blancs présents aux fins de lignes pour un affichage \n" "# plus rapide sur les terminaux lents.\n" #: src/lang.c:2571 msgid "If ON, use transliteration. toggles & sets." -msgstr "Si ON, utilise 'translit' pour iconv_open(3). change & valide." +msgstr "" +"Si ON, utilise 'translit' pour iconv_open(3). change & " +"valide." #: src/lang.c:2572 msgid "Transliteration" @@ -7238,7 +7552,8 @@ msgid "" "# 2 = Bcc\n" "# 3 = Cc and Bcc\n" msgstr "" -"# Mettre votre nom dans le champ Cc: et/ou CCi: lors de l'envoi d'un article.\n" +"# Mettre votre nom dans le champ Cc: et/ou CCi: lors de l'envoi d'un " +"article.\n" "# Les valeurs possibles sont (la valeur par défaut est indiquée par *) :\n" "# * 0 = Non\n" "# 1 = Cc\n" @@ -7275,7 +7590,8 @@ msgstr "# Durée (en nombre de jours) de #: src/lang.c:2604 msgid "Add posted articles to filter. toggles & sets." -msgstr "Créer une règle pour les articles postés. change & valide." +msgstr "" +"Créer une règle pour les articles postés. change & valide." #: src/lang.c:2605 msgid "Add posted articles to filter" @@ -7299,7 +7615,8 @@ msgstr "Répertoire mail" #: src/lang.c:2612 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" +msgstr "" +"# (-m) répertoire où sont enregistrés les articles/fils au format mailbox\n" #: src/lang.c:2617 msgid "Save articles in batch mode (-S)" @@ -7326,8 +7643,12 @@ msgid "# Directory where articles/thread msgstr "# Répertoire où sont enregistrés les articles/fils\n" #: src/lang.c:2629 -msgid "Auto save article/thread by Archive-name: header. toggles & sets." -msgstr "Enregistrement auto. basé sur l'en-tête Archive-name:. change & valide." +msgid "" +"Auto save article/thread by Archive-name: header. toggles & " +"sets." +msgstr "" +"Enregistrement auto. basé sur l'en-tête Archive-name:. change & " +" valide." #: src/lang.c:2630 msgid "Use Archive-name: header for save" @@ -7343,8 +7664,12 @@ msgstr "" "# & le numéro de la partie et ou patch.\n" #: src/lang.c:2636 -msgid "Mark saved articles/threads as read. toggles, sets, cancels." -msgstr "Marquer lu les articles/fils enregistrés. change, valide, annule." +msgid "" +"Mark saved articles/threads as read. toggles, sets, " +"cancels." +msgstr "" +"Marquer lu les articles/fils enregistrés. change, valide, " +" annule." #: src/lang.c:2637 msgid "Mark saved articles/threads as read" @@ -7381,26 +7706,35 @@ msgid "Process only unread articles" msgstr "Traiter uniquement les articles non lus" #: src/lang.c:2654 -msgid "# If ON only save/print/pipe/mail unread articles (tagged articles excepted)\n" +msgid "" +"# If ON only save/print/pipe/mail unread articles (tagged articles " +"excepted)\n" msgstr "" "# Si ON, enregistre/imprime/pipe/envoi articles non lu\n" "# (excepté les articles marqués)\n" #: src/lang.c:2659 msgid "Print all or just part of header. toggles & sets." -msgstr "Afficher tout ou une partie des en-têtes. change & valide." +msgstr "" +"Afficher tout ou une partie des en-têtes. change & valide." #: src/lang.c:2660 msgid "Print all headers when printing" msgstr "Imprimer tous les en-têtes" #: src/lang.c:2661 -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" +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:2665 -msgid "The printer program with options that is to be used to print articles/threads." -msgstr "Le logiciel d'impression avec options utilisées pour imprimer les articles/fils." +msgid "" +"The printer program with options that is to be used to print articles/" +"threads." +msgstr "" +"Le logiciel d'impression avec options utilisées pour imprimer les articles/" +"fils." #: src/lang.c:2666 msgid "Printer program with options" @@ -7408,21 +7742,27 @@ msgstr "Logiciel d'impression avec optio #: src/lang.c:2667 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" +msgstr "" +"# Logiciel d'impression avec options utilisées por imprimer les articles/" +"fils\n" #: src/lang.c:2673 msgid "Force redraw after certain commands" msgstr "Rafraîchir l'écran après certaines actions" #: src/lang.c:2674 -msgid "# If ON a screen redraw will always be done after certain external commands\n" +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:2678 -msgid "Start editor with line offset. toggles, sets, cancels." -msgstr "Lancer l'éditeur avec une ligne décalée. change, valide, annule." +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:2679 msgid "Start editor with line offset" @@ -7438,7 +7778,8 @@ msgstr "" #: src/lang.c:2685 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." +msgstr "" +"%E pour l'éditeur, %F pour le fichier, %N pour la ligne, valide." #: src/lang.c:2686 msgid "Invocation of your editor" @@ -7453,7 +7794,8 @@ msgstr "" "# %E Éditeur %F Fichier %N N° de ligne\n" #: src/lang.c:2692 -msgid "Enter name and options for external-inews, --internal for internal inews" +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:2693 @@ -7469,8 +7811,11 @@ msgstr "" "# NNTP sinon, utilise un logiciel inews externe\n" #: src/lang.c:2698 -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." +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:2699 msgid "Invocation of your mail command" @@ -7519,12 +7864,17 @@ msgid "Use UTF-8 graphics (thread tree e msgstr "Utiliser les formes UTF-8 (symboles, etc.)" #: src/lang.c:2726 -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" +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:2731 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." +msgstr "" +"Fichier pour les articles postés, valide, pas de fichier = " +"désactive." #: src/lang.c:2732 msgid "Filename for posted articles" @@ -7540,8 +7890,11 @@ msgstr "" "# enregistrés\n" #: src/lang.c:2738 -msgid "Keep all failed articles in ~/dead.articles. toggles & sets." -msgstr "Garder les articles non postés dans ~/dead.articles. change & valide." +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:2739 msgid "Keep failed arts in ~/dead.articles" @@ -7553,7 +7906,9 @@ msgstr "# Si ON, garde tous les articles #: src/lang.c:2744 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" +msgstr "" +"Voulez-vous effacer dans newsrc les groupes auxquels vous vous êtes " +"désabonnés" #: src/lang.c:2745 msgid "No unsubscribed groups in newsrc" @@ -7561,7 +7916,8 @@ msgstr "Pas de groupes désabonnés dans #: src/lang.c:2746 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" +msgstr "" +"# Si ON, efface dans newsrc les groupes auxquels vous vous êtes désabonnés\n" #: src/lang.c:2751 msgid "Remove bogus groups from newsrc" @@ -7582,16 +7938,21 @@ msgstr "" "# 2 = marquer d'un D dans l'écran de sélection\n" #: src/lang.c:2761 -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." +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:2762 msgid "NNTP read timeout in seconds" msgstr "Durée limite d'attente lecture NNTP en secondes" #: src/lang.c:2763 -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" +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:2768 msgid "Enter number of seconds until active file will be reread. sets." @@ -7602,20 +7963,27 @@ msgid "Interval in secs to reread active msgstr "Durée avant relecture du fichier active" #: src/lang.c:2770 -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" +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:2775 msgid "Reconnect to server automatically" msgstr "Reconnexion automatique au serveur" #: src/lang.c:2776 -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" +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:2780 -msgid "Create local copies of NNTP overview files. toggles & sets." -msgstr "Créer des copies locales des en-têtes NNTP. change & valide." +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:2781 msgid "Cache NNTP overview files locally" @@ -7795,7 +8163,9 @@ msgstr "Effacer les fichiers traités" #: src/lang.c:2895 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." +msgstr "" +"Fichier pour les articles postés, valide, pas de fichier = " +"désactive." #: src/lang.c:2896 msgid "Mailbox to save sent mails" @@ -7803,7 +8173,8 @@ msgstr "Boîte aux lettres pour les emai #: src/lang.c:2901 msgid "Set Followup-To: header to this group(s). sets, cancels." -msgstr "En-tête 'Followup-To:' pour ce(s) groupe(s). valide, annule." +msgstr "" +"En-tête 'Followup-To:' pour ce(s) groupe(s). valide, annule." #: src/lang.c:2902 msgid "Followup-To: header" @@ -7811,11 +8182,15 @@ msgstr "En-tête 'Followup-To:'" #: src/lang.c:2907 msgid "Enter default mail address (and fullname). sets, cancels." -msgstr "Adresse mail par défaut (et nom complet). valide, annule." +msgstr "" +"Adresse mail par défaut (et nom complet). valide, annule." #: src/lang.c:2914 -msgid "Path and options for ispell-like spell-checker. sets, cancels." -msgstr "Chemin et options pour ispell (ou autre correcteur). valide, annule." +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:2915 msgid "Ispell program" @@ -7823,7 +8198,9 @@ msgstr "Programme 'Ispell'" #: src/lang.c:2921 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." +msgstr "" +"Lorsque le groupe est une liste de diffusion, envoyer les réponses à cette " +"adresse email." #: src/lang.c:2922 msgid "Mailing list address" @@ -7834,8 +8211,11 @@ msgid "Forward articles as attachment" msgstr "Faire suivre les articles en pièce-jointe" #: src/lang.c:2933 -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." +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:2934 msgid "Which MIME types will be saved" @@ -7875,7 +8255,8 @@ msgstr "Sélection rapide (une touche) d #: src/lang.c:2963 src/lang.c:2987 msgid "ON = case sensitive, OFF = ignore case. sets, cancels." -msgstr "ON = casse sensible, OFF = ignore la casse. valide, annule." +msgstr "" +"ON = casse sensible, OFF = ignore la casse. valide, annule." #: src/lang.c:2964 msgid "Quick (1 key) select filter case" @@ -7914,7 +8295,8 @@ msgid "UNDECLARED_CHARSET" msgstr "UNDECLARED_CHARSET" #: src/lang.c:3007 -msgid "Add this text at the start of the message body. sets, cancels." +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:3008 @@ -7930,8 +8312,10 @@ msgid "X_Headers" msgstr "X_Headers" #: src/lang.c:3019 -msgid "Automatically insert an X-Comment-To: header? toggles & sets." -msgstr "Si ON, inclus un en-tête 'X-Comment-To:'. change & valide." +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:3020 msgid "Insert 'X-Comment-To:' header" @@ -7969,11 +8353,11 @@ msgstr "" msgid "NNTP connection error. Exiting..." msgstr "Erreur de connexion NNTP. Fermeture..." -#: src/nntplib.c:856 src/nntplib.c:1839 +#: src/nntplib.c:856 src/nntplib.c:1834 msgid "Rejoin current group\n" msgstr "Rejoindre le groupe actuel\n" -#: src/nntplib.c:864 src/nntplib.c:1847 +#: src/nntplib.c:864 src/nntplib.c:1842 #, c-format msgid "Read (%s)\n" msgstr "Lecture (%s)\n" @@ -7983,11 +8367,11 @@ msgstr "Lecture (%s)\n" msgid "Resend last command (%s)\n" msgstr "Réenvoyer la dernière commande (%s)\n" -#: src/nntplib.c:1486 +#: src/nntplib.c:1481 msgid "CAPABILITIES did not announce READER" msgstr "CAPABILITIES n'a pas annoncé READER" -#: src/nntplib.c:1993 +#: src/nntplib.c:1988 msgid "MOTD: " msgstr "MOTD: " @@ -8060,7 +8444,8 @@ msgstr "[- Indisponible -]" #, 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" +"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 "" @@ -8069,7 +8454,7 @@ msgstr "" "ce qui suit peut paraître assez bizarre.\n" "\n" -#: src/save.c:1065 +#: src/save.c:1067 msgid "bytes" msgstr "octets" Binary files tin-2.4.0/po/ru.gmo and tin-2.4.1/po/ru.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.0/po/ru.po tin-2.4.1/po/ru.po --- tin-2.4.0/po/ru.po 2016-08-10 16:24:55.000000000 +0200 +++ tin-2.4.1/po/ru.po 2016-12-20 16:59:39.570975660 +0100 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 1.8.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-30 11:25+0200\n" +"POT-Creation-Date: 2016-12-20 16:59+0100\n" "PO-Revision-Date: 2006-04-21 15:39+0200\n" "Last-Translator: Andrei Emeltchenko \n" "Language-Team: Russian \n" @@ -8057,11 +8057,11 @@ msgstr "" msgid "NNTP connection error. Exiting..." msgstr " NNTP %s. ..." -#: src/nntplib.c:856 src/nntplib.c:1839 +#: src/nntplib.c:856 src/nntplib.c:1834 msgid "Rejoin current group\n" msgstr " \n" -#: src/nntplib.c:864 src/nntplib.c:1847 +#: src/nntplib.c:864 src/nntplib.c:1842 #, c-format msgid "Read (%s)\n" msgstr " (%s)\n" @@ -8071,11 +8071,11 @@ msgstr " (%s)\n" msgid "Resend last command (%s)\n" msgstr " (%s)\n" -#: src/nntplib.c:1486 +#: src/nntplib.c:1481 msgid "CAPABILITIES did not announce READER" msgstr "" -#: src/nntplib.c:1993 +#: src/nntplib.c:1988 msgid "MOTD: " msgstr "" @@ -8158,7 +8158,7 @@ msgstr "" " .\n" "\n" -#: src/save.c:1065 +#: src/save.c:1067 msgid "bytes" msgstr "" Binary files tin-2.4.0/po/sv.gmo and tin-2.4.1/po/sv.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.0/po/sv.po tin-2.4.1/po/sv.po --- tin-2.4.0/po/sv.po 2016-08-10 16:24:55.000000000 +0200 +++ tin-2.4.1/po/sv.po 2016-12-20 16:59:39.734982351 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 1.8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-30 11:25+0200\n" +"POT-Creation-Date: 2016-12-20 16:59+0100\n" "PO-Revision-Date: 2006-01-11 21:22+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -7440,11 +7440,11 @@ msgstr "" msgid "NNTP connection error. Exiting..." msgstr "" -#: src/nntplib.c:856 src/nntplib.c:1839 +#: src/nntplib.c:856 src/nntplib.c:1834 msgid "Rejoin current group\n" msgstr "" -#: src/nntplib.c:864 src/nntplib.c:1847 +#: src/nntplib.c:864 src/nntplib.c:1842 #, c-format msgid "Read (%s)\n" msgstr "Ls (%s)\n" @@ -7454,11 +7454,11 @@ msgstr "Ls (%s)\n" msgid "Resend last command (%s)\n" msgstr "" -#: src/nntplib.c:1486 +#: src/nntplib.c:1481 msgid "CAPABILITIES did not announce READER" msgstr "" -#: src/nntplib.c:1993 +#: src/nntplib.c:1988 msgid "MOTD: " msgstr "" @@ -7529,7 +7529,7 @@ msgid "" "\n" msgstr "" -#: src/save.c:1065 +#: src/save.c:1067 msgid "bytes" msgstr "byte" diff -Nurp '--exclude=.bzr*' tin-2.4.0/po/tin.pot tin-2.4.1/po/tin.pot --- tin-2.4.0/po/tin.pot 2016-08-10 10:03:32.000000000 +0200 +++ tin-2.4.1/po/tin.pot 2016-12-20 17:00:15.300433761 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-30 11:25+0200\n" +"POT-Creation-Date: 2016-12-20 16:59+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -7316,11 +7316,11 @@ msgstr "" msgid "NNTP connection error. Exiting..." msgstr "" -#: src/nntplib.c:856 src/nntplib.c:1839 +#: src/nntplib.c:856 src/nntplib.c:1834 msgid "Rejoin current group\n" msgstr "" -#: src/nntplib.c:864 src/nntplib.c:1847 +#: src/nntplib.c:864 src/nntplib.c:1842 #, c-format msgid "Read (%s)\n" msgstr "" @@ -7330,11 +7330,11 @@ msgstr "" msgid "Resend last command (%s)\n" msgstr "" -#: src/nntplib.c:1486 +#: src/nntplib.c:1481 msgid "CAPABILITIES did not announce READER" msgstr "" -#: src/nntplib.c:1993 +#: src/nntplib.c:1988 msgid "MOTD: " msgstr "" @@ -7405,7 +7405,7 @@ msgid "" "\n" msgstr "" -#: src/save.c:1065 +#: src/save.c:1067 msgid "bytes" msgstr "" Binary files tin-2.4.0/po/tr.gmo and tin-2.4.1/po/tr.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.0/po/tr.po tin-2.4.1/po/tr.po --- tin-2.4.0/po/tr.po 2016-08-10 16:24:55.000000000 +0200 +++ tin-2.4.1/po/tr.po 2016-12-20 16:59:39.954991328 +0100 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 1.7.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-30 11:25+0200\n" +"POT-Creation-Date: 2016-12-20 16:59+0100\n" "PO-Revision-Date: 2005-03-06 09:25+0200\n" "Last-Translator: ebnem Korkmaz \n" "Language-Team: Turkish \n" @@ -8910,12 +8910,12 @@ msgstr "" msgid "NNTP connection error. Exiting..." msgstr "NNTP sunucusuna balant baarsz %s. kyor..." -#: src/nntplib.c:856 src/nntplib.c:1839 +#: src/nntplib.c:856 src/nntplib.c:1834 #, fuzzy msgid "Rejoin current group\n" msgstr "u anki gruba tekrar katl\n" -#: src/nntplib.c:864 src/nntplib.c:1847 +#: src/nntplib.c:864 src/nntplib.c:1842 #, fuzzy, c-format msgid "Read (%s)\n" msgstr "Oku (%s)\n" @@ -8925,11 +8925,11 @@ msgstr "Oku (%s)\n" msgid "Resend last command (%s)\n" msgstr "Son komutu tekrr yolla (%s)\n" -#: src/nntplib.c:1486 +#: src/nntplib.c:1481 msgid "CAPABILITIES did not announce READER" msgstr "" -#: src/nntplib.c:1993 +#: src/nntplib.c:1988 msgid "MOTD: " msgstr "" @@ -9003,7 +9003,7 @@ msgid "" "\n" msgstr "" -#: src/save.c:1065 +#: src/save.c:1067 msgid "bytes" msgstr "bayt" Binary files tin-2.4.0/po/zh_CN.gmo and tin-2.4.1/po/zh_CN.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.0/po/zh_CN.po tin-2.4.1/po/zh_CN.po --- tin-2.4.0/po/zh_CN.po 2016-08-10 16:24:55.000000000 +0200 +++ tin-2.4.1/po/zh_CN.po 2016-12-20 16:59:40.138998838 +0100 @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 2.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-30 11:25+0200\n" +"POT-Creation-Date: 2016-12-20 16:59+0100\n" "PO-Revision-Date: 2015-08-28 12:21+0800\n" "Last-Translator: Mingye Wang \n" "Language-Team: Chinese (simplified) \n" @@ -8065,11 +8065,11 @@ msgstr "" msgid "NNTP connection error. Exiting..." msgstr "连接到 NNTP 服务器 %s 时失败。离开…" -#: src/nntplib.c:856 src/nntplib.c:1839 +#: src/nntplib.c:856 src/nntplib.c:1834 msgid "Rejoin current group\n" msgstr "重新链接目前的群组\n" -#: src/nntplib.c:864 src/nntplib.c:1847 +#: src/nntplib.c:864 src/nntplib.c:1842 #, c-format msgid "Read (%s)\n" msgstr "已读 (%s)\n" @@ -8079,11 +8079,11 @@ msgstr "已读 (%s)\n" msgid "Resend last command (%s)\n" msgstr "重新发送最近的命令 (%s)\n" -#: src/nntplib.c:1486 +#: src/nntplib.c:1481 msgid "CAPABILITIES did not announce READER" msgstr "能力中并未宣告包含阅读器" -#: src/nntplib.c:1993 +#: src/nntplib.c:1988 msgid "MOTD: " msgstr "MOTD: " @@ -8165,7 +8165,7 @@ msgstr "" "以了解新的格式，而随后而来的东西也许看起来会很怪异。\n" "\n" -#: src/save.c:1065 +#: src/save.c:1067 msgid "bytes" msgstr "字节" Binary files tin-2.4.0/po/zh_TW.gmo and tin-2.4.1/po/zh_TW.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.0/po/zh_TW.po tin-2.4.1/po/zh_TW.po --- tin-2.4.0/po/zh_TW.po 2016-08-10 16:24:55.000000000 +0200 +++ tin-2.4.1/po/zh_TW.po 2016-12-20 16:59:40.307005694 +0100 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 2.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-30 11:25+0200\n" +"POT-Creation-Date: 2016-12-20 16:59+0100\n" "PO-Revision-Date: 2015-10-08 12:13+0800\n" "Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (traditional) \n" @@ -8060,11 +8060,11 @@ msgstr "" msgid "NNTP connection error. Exiting..." msgstr "連線到 NNTP 伺服器 %s 時失敗。離開…" -#: src/nntplib.c:856 src/nntplib.c:1839 +#: src/nntplib.c:856 src/nntplib.c:1834 msgid "Rejoin current group\n" msgstr "重新連結目前的群組\n" -#: src/nntplib.c:864 src/nntplib.c:1847 +#: src/nntplib.c:864 src/nntplib.c:1842 #, c-format msgid "Read (%s)\n" msgstr "已讀 (%s)\n" @@ -8074,11 +8074,11 @@ msgstr "已讀 (%s)\n" msgid "Resend last command (%s)\n" msgstr "重新發送最近的命令 (%s)\n" -#: src/nntplib.c:1486 +#: src/nntplib.c:1481 msgid "CAPABILITIES did not announce READER" msgstr "能力中並未宣告包含閱讀器" -#: src/nntplib.c:1993 +#: src/nntplib.c:1988 msgid "MOTD: " msgstr "MOTD: " @@ -8160,7 +8160,7 @@ msgstr "" "以了解新的格式，而隨後而來的東西也許看起來會很怪異。\n" "\n" -#: src/save.c:1065 +#: src/save.c:1067 msgid "bytes" msgstr "位元組" diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/active.c tin-2.4.1/src/active.c --- tin-2.4.0/src/active.c 2016-07-30 11:20:13.000000000 +0200 +++ tin-2.4.1/src/active.c 2016-10-12 17:28:00.465943764 +0200 @@ -3,10 +3,10 @@ * Module : active.c * Author : I. Lea * Created : 1992-02-16 - * Updated : 2016-07-29 + * Updated : 2016-10-10 * Notes : * - * Copyright (c) 1992-2016 Iain Lea + * Copyright (c) 1992-2017 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -320,8 +320,8 @@ do_read_newsrc_active_file( char *p; char moderated[PATH_LEN]; int window = 0; + long processed = 0L; t_artnum count = T_ARTNUM_CONST(-1), min = T_ARTNUM_CONST(1), max = T_ARTNUM_CONST(0); - t_artnum processed = T_ARTNUM_CONST(0); static char ngname[NNTP_GRPLEN + 1]; /* RFC 3977 3.1 limits group names to 497 octets */ struct t_group *grpptr; #ifdef NNTP_ABLE @@ -503,6 +503,7 @@ do_read_newsrc_active_file( #endif /* NNTP_ABLE */ } + /* * Wrapper for do_read_newsrc_active_file() to handle * missing authentication @@ -584,9 +585,9 @@ read_active_file( FILE *fp; char *ptr; char moderated[PATH_LEN]; - t_artnum count = T_ARTNUM_CONST(-1), min = T_ARTNUM_CONST(1), max = T_ARTNUM_CONST(0); long processed = 0L; struct t_group *grpptr; + t_artnum count = T_ARTNUM_CONST(-1), min = T_ARTNUM_CONST(1), max = T_ARTNUM_CONST(0); if (!batch_mode || verbose) wait_message(0, _(txt_reading_news_active_file)); @@ -671,9 +672,9 @@ read_active_counts( FILE *fp; char *ptr; char moderated[PATH_LEN]; - t_artnum count = T_ARTNUM_CONST(-1), min = T_ARTNUM_CONST(1), max = T_ARTNUM_CONST(0); - t_artnum processed = T_ARTNUM_CONST(0); + long processed = 0L; struct t_group *grpptr; + t_artnum count = T_ARTNUM_CONST(-1), min = T_ARTNUM_CONST(1), max = T_ARTNUM_CONST(0); if (!batch_mode || verbose) wait_message(0, _(txt_reading_news_active_file)); @@ -794,8 +795,8 @@ read_news_active_file( char moderated[PATH_LEN]; int r = 0, j = 0; int i; - t_artnum count = T_ARTNUM_CONST(-1), min = T_ARTNUM_CONST(1), max = T_ARTNUM_CONST(0); struct t_group *grpptr; + t_artnum count = T_ARTNUM_CONST(-1), min = T_ARTNUM_CONST(1), max = T_ARTNUM_CONST(0); t_bool need_auth = FALSE; *buff = '\0'; @@ -1272,7 +1273,7 @@ create_save_active_file( if (no_write && file_size(local_save_active_file) != -1L) return; - if (strfpath(cmdline.args & CMDLINE_SAVEDIR ? cmdline.savedir : tinrc.savedir, group_path, sizeof(group_path), NULL, FALSE)) { + if (strfpath((cmdline.args & CMDLINE_SAVEDIR) ? cmdline.savedir : tinrc.savedir, group_path, sizeof(group_path), NULL, FALSE)) { wait_message(0, _(txt_creating_active)); print_active_head(local_save_active_file); @@ -1280,7 +1281,7 @@ create_save_active_file( group_path[strlen(group_path) - 1] = '\0'; fb = my_strdup(group_path); - make_group_list(local_save_active_file, cmdline.args & CMDLINE_SAVEDIR ? cmdline.savedir : tinrc.savedir, fb, group_path); + make_group_list(local_save_active_file, (cmdline.args & CMDLINE_SAVEDIR) ? cmdline.savedir : tinrc.savedir, fb, group_path); free(fb); } } diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/art.c tin-2.4.1/src/art.c --- tin-2.4.0/src/art.c 2016-08-06 17:04:53.000000000 +0200 +++ tin-2.4.1/src/art.c 2016-12-24 10:42:20.995817241 +0100 @@ -3,10 +3,10 @@ * Module : art.c * Author : I.Lea & R.Skrenta * Created : 1991-04-01 - * Updated : 2016-08-06 + * Updated : 2016-10-10 * Notes : * - * Copyright (c) 1991-2016 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2017 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -212,7 +212,7 @@ setup_hard_base( #ifdef NNTP_ABLE char buf[NNTP_STRLEN]; char line[NNTP_STRLEN]; - int getart_limit = cmdline.args & CMDLINE_GETART_LIMIT ? cmdline.getart_limit : tinrc.getart_limit; + int getart_limit = (cmdline.args & CMDLINE_GETART_LIMIT) ? cmdline.getart_limit : tinrc.getart_limit; FILE *fp; t_artnum last, start, count = 0, j = 0; static t_bool skip_listgroup = FALSE; @@ -433,7 +433,7 @@ index_group( min = grpmenu.max ? base[0] : group->xmin; max = grpmenu.max ? base[grpmenu.max - 1] : min - 1; - getart_limit = cmdline.args & CMDLINE_GETART_LIMIT ? cmdline.getart_limit : tinrc.getart_limit; + getart_limit = (cmdline.args & CMDLINE_GETART_LIMIT) ? cmdline.getart_limit : tinrc.getart_limit; if (getart_limit > 0) { if (grpmenu.max && (grpmenu.max > getart_limit)) @@ -631,6 +631,13 @@ open_art_header( return fp; /* + * TODO: + * shall we stop on 5xx?, i.e JamNNTPd/2 1.3 responds with + * "503 Access denied" instead of 480 but NEXT still works, + * so tin loops over all articles without getting useful data + */ + + /* * HEAD failed, try to find NEXT * Should return "223 artno message-id more text...." */ @@ -2018,7 +2025,7 @@ write_overview( /* * Can't write or caching is off or getart_limit is set */ - if (no_write || !tinrc.cache_overview_files || (cmdline.args & CMDLINE_GETART_LIMIT ? cmdline.getart_limit : tinrc.getart_limit) != 0) + if (no_write || !tinrc.cache_overview_files || ((cmdline.args & CMDLINE_GETART_LIMIT) ? cmdline.getart_limit : tinrc.getart_limit) != 0) return; if ((fp = open_xover_fp(group, "w", T_ARTNUM_CONST(0), T_ARTNUM_CONST(0), FALSE)) == NULL) @@ -2757,7 +2764,7 @@ find_artnum( /*----------------------------- Overview handling -----------------------*/ /* TODO: use * setlocale(LC_ALL, "POSIX"); setlocale(LC_TIME, "POSIX"); - * my_strftime(date, sizeof(date) -1, "%d %b %Y %H:%M:%S GMT",gmtime(&secs)); + * my_strftime(date, sizeof(date) -1, "%d %b %Y %H:%M:%S GMT", gmtime(&secs)); * instead? */ static char * @@ -2772,7 +2779,7 @@ print_date( }; if ((tm = gmtime(&secs)) != NULL) - snprintf(date, sizeof(date), "%02d %s %04d %02d:%02d:%02d GMT", + snprintf(date, sizeof(date), "%02d %.3s %04d %02d:%02d:%02d GMT", tm->tm_mday, months_a[tm->tm_mon], tm->tm_year + 1900, diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/attrib.c tin-2.4.1/src/attrib.c --- tin-2.4.0/src/attrib.c 2015-11-22 01:14:29.000000000 +0100 +++ tin-2.4.1/src/attrib.c 2016-10-12 17:28:00.529946370 +0200 @@ -6,7 +6,7 @@ * Updated : 2015-10-09 * Notes : Group attribute routines * - * Copyright (c) 1993-2016 Iain Lea + * Copyright (c) 1993-2017 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/auth.c tin-2.4.1/src/auth.c --- tin-2.4.0/src/auth.c 2016-01-31 23:24:44.000000000 +0100 +++ tin-2.4.1/src/auth.c 2016-12-13 17:21:28.565124060 +0100 @@ -3,11 +3,11 @@ * Module : auth.c * Author : Dirk Nimmich * Created : 1997-04-05 - * Updated : 2016-01-31 + * Updated : 2016-12-13 * Notes : Routines to authenticate to a news server via NNTP. * DON'T USE get_respcode() THROUGHOUT THIS CODE. * - * Copyright (c) 1997-2016 Dirk Nimmich + * Copyright (c) 1997-2017 Dirk Nimmich * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -297,6 +297,12 @@ authinfo_plain( return TRUE; } } +# ifdef DEBUG + else { + if (debug & DEBUG_NNTP) + debug_print_file("NNTP", "read_newsauth_file(\"%s\", \"%s\", \"%s\") failed", server, authuser, authpass); + } +# endif /* DEBUG */ } /* diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/charset.c tin-2.4.1/src/charset.c --- tin-2.4.0/src/charset.c 2016-03-13 15:44:36.000000000 +0100 +++ tin-2.4.1/src/charset.c 2016-10-12 17:28:00.585948652 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-03-10 * Notes : ISO to ascii charset conversion routines * - * Copyright (c) 1993-2016 Markus Kuhn + * Copyright (c) 1993-2017 Markus Kuhn * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/color.c tin-2.4.1/src/color.c --- tin-2.4.0/src/color.c 2015-11-22 01:14:29.000000000 +0100 +++ tin-2.4.1/src/color.c 2016-10-12 17:28:00.621950118 +0200 @@ -11,7 +11,7 @@ * Notes : This are the basic function for ansi-color * and word highlighting * - * Copyright (c) 1995-2016 Roland Rosenfeld + * Copyright (c) 1995-2017 Roland Rosenfeld * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/config.c tin-2.4.1/src/config.c --- tin-2.4.0/src/config.c 2016-04-17 20:01:36.000000000 +0200 +++ tin-2.4.1/src/config.c 2016-10-12 17:28:00.649951258 +0200 @@ -3,10 +3,10 @@ * Module : config.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2016-04-17 + * Updated : 2016-10-10 * Notes : Configuration file routines * - * Copyright (c) 1991-2016 Iain Lea + * Copyright (c) 1991-2017 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -766,7 +766,7 @@ read_config_file( #ifdef HAVE_COLOR if (match_boolean(buf, "use_color=", &tinrc.use_color)) { - use_color = cmdline.args & CMDLINE_USE_COLOR ? bool_not(tinrc.use_color) : tinrc.use_color; + use_color = (cmdline.args & CMDLINE_USE_COLOR) ? bool_not(tinrc.use_color) : tinrc.use_color; break; } #endif /* HAVE_COLOR */ diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/cook.c tin-2.4.1/src/cook.c --- tin-2.4.0/src/cook.c 2016-02-28 01:13:47.000000000 +0100 +++ tin-2.4.1/src/cook.c 2016-10-12 17:28:00.677952399 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-02-28 * Notes : Split from page.c * - * Copyright (c) 2000-2016 Jason Faultless + * Copyright (c) 2000-2017 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/debug.c tin-2.4.1/src/debug.c --- tin-2.4.0/src/debug.c 2016-04-15 14:44:27.000000000 +0200 +++ tin-2.4.1/src/debug.c 2016-10-12 17:28:00.741955005 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-02-26 * Notes : debug routines * - * Copyright (c) 1991-2016 Iain Lea + * Copyright (c) 1991-2017 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/envarg.c tin-2.4.1/src/envarg.c --- tin-2.4.0/src/envarg.c 2015-11-22 01:14:30.000000000 +0100 +++ tin-2.4.1/src/envarg.c 2016-10-12 17:28:00.765955983 +0200 @@ -6,7 +6,7 @@ * Updated : 1993-03-10 * Notes : Adds default options from environment to command line * - * Copyright (c) 1991-2016 Bill Davidson + * Copyright (c) 1991-2017 Bill Davidson * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/feed.c tin-2.4.1/src/feed.c --- tin-2.4.0/src/feed.c 2016-04-12 17:29:48.000000000 +0200 +++ tin-2.4.1/src/feed.c 2016-10-12 17:28:00.817958101 +0200 @@ -3,10 +3,10 @@ * Module : feed.c * Author : I. Lea * Created : 1991-08-31 - * Updated : 2016-04-12 + * Updated : 2016-10-10 * Notes : provides same interface to mail,pipe,print,save & repost commands * - * Copyright (c) 1991-2016 Iain Lea + * Copyright (c) 1991-2017 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -162,7 +162,7 @@ expand_feed_filename( if ((ret == 0) || !(strrchr(outpath, DIRSEP))) { char buf[PATH_LEN]; - if (!strfpath(cmdline.args & CMDLINE_SAVEDIR ? cmdline.savedir : curr_group->attribute->savedir, buf, sizeof(buf), curr_group, FALSE)) + if (!strfpath((cmdline.args & CMDLINE_SAVEDIR) ? cmdline.savedir : curr_group->attribute->savedir, buf, sizeof(buf), curr_group, FALSE)) joinpath(buf, sizeof(buf), homedir, DEFAULT_SAVEDIR); joinpath(outpath, outpath_len, buf, path); return FALSE; diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/filter.c tin-2.4.1/src/filter.c --- tin-2.4.0/src/filter.c 2016-05-24 00:00:20.000000000 +0200 +++ tin-2.4.1/src/filter.c 2016-10-12 17:28:00.845959241 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-05-23 * Notes : Filter articles. Kill & auto selection are supported. * - * Copyright (c) 1991-2016 Iain Lea + * Copyright (c) 1991-2017 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/getline.c tin-2.4.1/src/getline.c --- tin-2.4.0/src/getline.c 2015-11-22 01:14:30.000000000 +0100 +++ tin-2.4.1/src/getline.c 2016-11-21 22:12:43.012262023 +0100 @@ -452,7 +452,7 @@ static void gl_kill_back_word( void) { - int i, cur; + int i, j, cur; #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) /* delete spaces */ @@ -482,12 +482,16 @@ gl_kill_back_word( i++; if (i != gl_pos) { + j = i; cur = gl_pos; gl_fixup(-1, i); + + while (gl_buf[cur]) + gl_buf[j++] = gl_buf[cur++]; #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - wcscpy(&gl_buf[i], &gl_buf[cur]); + gl_buf[j] = (wchar_t) '\0'; #else - strcpy(&gl_buf[i], &gl_buf[cur]); + gl_buf[j] = '\0'; #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ gl_fixup(i, i); } else diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/global.c tin-2.4.1/src/global.c --- tin-2.4.0/src/global.c 2015-11-22 01:14:30.000000000 +0100 +++ tin-2.4.1/src/global.c 2016-10-12 17:28:00.893961196 +0200 @@ -6,7 +6,7 @@ * Updated : 2005-10-19 * Notes : Generic nagivation and key handling routines * - * Copyright (c) 1999-2016 Jason Faultless + * Copyright (c) 1999-2017 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/group.c tin-2.4.1/src/group.c --- tin-2.4.0/src/group.c 2016-05-02 10:59:10.000000000 +0200 +++ tin-2.4.1/src/group.c 2016-10-12 17:28:00.921962337 +0200 @@ -3,10 +3,10 @@ * Module : group.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2016-04-17 + * Updated : 2016-10-10 * Notes : * - * Copyright (c) 1991-2016 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2017 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1409,9 +1409,9 @@ show_group_title( *txt_threading[curr_group->attribute->thread_articles]); /* article count */ - if (cmdline.args & CMDLINE_GETART_LIMIT ? cmdline.getart_limit : tinrc.getart_limit) + if ((cmdline.args & CMDLINE_GETART_LIMIT) ? cmdline.getart_limit : tinrc.getart_limit) snprintf(tmp, sizeof(tmp), " %d/%d%c", - cmdline.args & CMDLINE_GETART_LIMIT ? cmdline.getart_limit : tinrc.getart_limit, art_cnt, + (cmdline.args & CMDLINE_GETART_LIMIT) ? cmdline.getart_limit : tinrc.getart_limit, art_cnt, (curr_group->attribute->show_only_unread_arts ? tinrc.art_marked_unread : tinrc.art_marked_read)); else snprintf(tmp, sizeof(tmp), " %d%c", diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/hashstr.c tin-2.4.1/src/hashstr.c --- tin-2.4.0/src/hashstr.c 2015-11-22 01:14:30.000000000 +0100 +++ tin-2.4.1/src/hashstr.c 2016-10-12 17:28:00.949963478 +0200 @@ -6,7 +6,7 @@ * Updated : 2003-09-19 * Notes : * - * Copyright (c) 1991-2016 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2017 Iain Lea , Rich Skrenta * All rights reserved. * diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/header.c tin-2.4.1/src/header.c --- tin-2.4.0/src/header.c 2016-07-30 11:20:13.000000000 +0200 +++ tin-2.4.1/src/header.c 2016-10-12 17:28:00.973964455 +0200 @@ -5,7 +5,7 @@ * Created : 1997-03-10 * Updated : 2016-07-29 * - * Copyright (c) 1997-2016 Urs Janssen + * Copyright (c) 1997-2017 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/help.c tin-2.4.1/src/help.c --- tin-2.4.0/src/help.c 2016-06-07 00:47:17.000000000 +0200 +++ tin-2.4.1/src/help.c 2016-10-12 17:28:01.025966573 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-06-06 * Notes : * - * Copyright (c) 1991-2016 Iain Lea + * Copyright (c) 1991-2017 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/inews.c tin-2.4.1/src/inews.c --- tin-2.4.0/src/inews.c 2015-11-22 01:14:30.000000000 +0100 +++ tin-2.4.1/src/inews.c 2016-10-12 17:28:01.073968528 +0200 @@ -6,7 +6,7 @@ * Updated : 2013-11-27 * Notes : NNTP built in version of inews * - * Copyright (c) 1991-2016 Iain Lea + * Copyright (c) 1991-2017 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/init.c tin-2.4.1/src/init.c --- tin-2.4.0/src/init.c 2016-07-05 15:31:43.000000000 +0200 +++ tin-2.4.1/src/init.c 2016-10-12 17:28:01.093969343 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-04-17 * Notes : * - * Copyright (c) 1991-2016 Iain Lea + * Copyright (c) 1991-2017 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/joinpath.c tin-2.4.1/src/joinpath.c --- tin-2.4.0/src/joinpath.c 2015-11-22 01:14:30.000000000 +0100 +++ tin-2.4.1/src/joinpath.c 2016-10-12 17:28:01.141971298 +0200 @@ -6,7 +6,7 @@ * Updated : 2008-12-04 * Notes : * - * Copyright (c) 1997-2016 Thomas Dickey + * Copyright (c) 1997-2017 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/keymap.c tin-2.4.1/src/keymap.c --- tin-2.4.0/src/keymap.c 2016-05-25 22:34:16.000000000 +0200 +++ tin-2.4.1/src/keymap.c 2016-10-12 17:28:01.161972112 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-05-25 * Notes : This file contains key mapping routines and variables. * - * Copyright (c) 2000-2016 Dirk Nimmich + * Copyright (c) 2000-2017 Dirk Nimmich * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/lang.c tin-2.4.1/src/lang.c --- tin-2.4.0/src/lang.c 2016-07-30 11:20:13.000000000 +0200 +++ tin-2.4.1/src/lang.c 2016-10-12 17:28:01.193973416 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-07-29 * Notes : * - * Copyright (c) 1991-2016 Iain Lea + * Copyright (c) 1991-2017 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1094,7 +1094,7 @@ Warning: Posting is in %s and contains c #endif /* HAVE_PGP_GPG */ #ifdef M_UNIX - constext txt_copyright_notice[] = "%s (c) Copyright 1991-2016 Iain Lea."; + constext txt_copyright_notice[] = "%s (c) Copyright 1991-2017 Iain Lea."; #endif /* M_UNIX */ #ifdef NNTP_ABLE diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/list.c tin-2.4.1/src/list.c --- tin-2.4.0/src/list.c 2015-11-22 01:14:30.000000000 +0100 +++ tin-2.4.1/src/list.c 2016-10-12 17:28:01.261976186 +0200 @@ -6,7 +6,7 @@ * Updated : 2008-11-28 * Notes : Low level functions handling the active[] list and its group_hash index * - * Copyright (c) 1993-2016 Iain Lea + * Copyright (c) 1993-2017 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/lock.c tin-2.4.1/src/lock.c --- tin-2.4.0/src/lock.c 2016-01-05 15:50:08.000000000 +0100 +++ tin-2.4.1/src/lock.c 2016-10-12 17:28:01.277976837 +0200 @@ -6,7 +6,7 @@ * Updated : 2013-11-17 * Notes : * - * Copyright (c) 1998-2016 Urs Janssen + * Copyright (c) 1998-2017 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/mail.c tin-2.4.1/src/mail.c --- tin-2.4.0/src/mail.c 2016-07-30 11:20:14.000000000 +0200 +++ tin-2.4.1/src/mail.c 2016-10-12 17:28:01.297977651 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-07-29 * Notes : Mail handling routines for creating pseudo newsgroups * - * Copyright (c) 1992-2016 Iain Lea + * Copyright (c) 1992-2017 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/main.c tin-2.4.1/src/main.c --- tin-2.4.0/src/main.c 2016-07-30 11:20:14.000000000 +0200 +++ tin-2.4.1/src/main.c 2016-10-12 17:28:01.317978466 +0200 @@ -6,7 +6,7 @@ * Updated : main.c * Notes : * - * Copyright (c) 1991-2016 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2017 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.0/src/makecfg.c tin-2.4.1/src/makecfg.c --- tin-2.4.0/src/makecfg.c 2016-04-19 11:23:41.000000000 +0200 +++ tin-2.4.1/src/makecfg.c 2016-12-24 10:45:40.255893936 +0100 @@ -3,10 +3,10 @@ * Module : makecfg.c * Author : Thomas E. Dickey * Created : 1997-08-23 - * Updated : 2015-11-25 + * Updated : 2016-11-18 * Notes : #defines and structs for options_menu.c * - * Copyright (c) 1997-2016 Thomas E. Dickey + * Copyright (c) 1997-2017 Thomas E. Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -81,7 +81,12 @@ static char * string_dup( const char *string) { - return strcpy((char *) malloc(strlen(string) + 1), string); + char *buf; + + if ((buf = malloc(strlen(string) + 1)) == NULL) + failed("malloc() failed"); + + return strcpy(buf, string); } static void @@ -89,8 +94,10 @@ store_data( const char *name, const char *type) { - MYDATA *p = (MYDATA *) malloc(sizeof(MYDATA)); - MYDATA *q; + MYDATA *p, *q; + + if ((p = (MYDATA *) malloc(sizeof(MYDATA))) == NULL) + failed("malloc() failed"); p->link = 0; p->name = string_dup(name); diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/memory.c tin-2.4.1/src/memory.c --- tin-2.4.0/src/memory.c 2016-08-08 17:35:13.000000000 +0200 +++ tin-2.4.1/src/memory.c 2016-10-12 17:28:01.365980421 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-08-06 * Notes : * - * Copyright (c) 1991-2016 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2017 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.0/src/mimetypes.c tin-2.4.1/src/mimetypes.c --- tin-2.4.0/src/mimetypes.c 2015-11-22 01:14:30.000000000 +0100 +++ tin-2.4.1/src/mimetypes.c 2016-10-12 17:28:01.393981561 +0200 @@ -6,7 +6,7 @@ * Updated : 2007-12-30 * Notes : mime.types handling * - * Copyright (c) 2000-2016 Jason Faultless + * Copyright (c) 2000-2017 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/misc.c tin-2.4.1/src/misc.c --- tin-2.4.0/src/misc.c 2016-08-05 15:48:33.000000000 +0200 +++ tin-2.4.1/src/misc.c 2016-10-12 17:28:01.417982539 +0200 @@ -3,10 +3,10 @@ * Module : misc.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2016-07-29 + * Updated : 2016-10-10 * Notes : * - * Copyright (c) 1991-2016 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2017 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1594,7 +1594,7 @@ _strfpath( char buf[PATH_LEN]; is_mailbox = TRUE; - if (strfpath(cmdline.args & CMDLINE_MAILDIR ? cmdline.maildir : group->attribute->maildir, buf, sizeof(buf), group, FALSE)) { + if (strfpath((cmdline.args & CMDLINE_MAILDIR) ? cmdline.maildir : group->attribute->maildir, buf, sizeof(buf), group, FALSE)) { if (*(format + 1) == '\0') /* Just an = */ joinpath(tbuf, sizeof(tbuf), buf, group->name); else @@ -1622,7 +1622,7 @@ _strfpath( /* * Start with the savedir name */ - if (strfpath(cmdline.args & CMDLINE_SAVEDIR ? cmdline.savedir : group->attribute->savedir, buf, sizeof(buf), group, FALSE)) { + if (strfpath((cmdline.args & CMDLINE_SAVEDIR) ? cmdline.savedir : group->attribute->savedir, buf, sizeof(buf), group, FALSE)) { char tmp[PATH_LEN]; #ifdef HAVE_LONG_FILE_NAMES my_strncpy(tmp, group->name, sizeof(tmp) - 1); diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/my_tmpfile.c tin-2.4.1/src/my_tmpfile.c --- tin-2.4.0/src/my_tmpfile.c 2015-11-22 01:14:30.000000000 +0100 +++ tin-2.4.1/src/my_tmpfile.c 2016-10-12 17:28:01.449983842 +0200 @@ -6,7 +6,7 @@ * Updated : 2014-05-13 * Notes : * - * Copyright (c) 2001-2016 Urs Janssen + * Copyright (c) 2001-2017 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/newsrc.c tin-2.4.1/src/newsrc.c --- tin-2.4.0/src/newsrc.c 2016-07-30 11:20:14.000000000 +0200 +++ tin-2.4.1/src/newsrc.c 2016-10-12 17:28:01.473984820 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-07-29 * Notes : ArtCount = (ArtMax - ArtMin) + 1 [could have holes] * - * Copyright (c) 1991-2016 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2017 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.0/src/nntplib.c tin-2.4.1/src/nntplib.c --- tin-2.4.0/src/nntplib.c 2016-07-30 11:20:14.000000000 +0200 +++ tin-2.4.1/src/nntplib.c 2016-12-24 10:46:35.970152275 +0100 @@ -3,7 +3,7 @@ * Module : nntplib.c * Author : S. Barber & I. Lea * Created : 1991-01-12 - * Updated : 2016-07-29 + * Updated : 2016-12-13 * Notes : NNTP client routines taken from clientlib.c 1.5.11 (1991-02-10) * Copyright : (c) Copyright 1991-99 by Stan Barber & Iain Lea * Permission is hereby granted to copy, reproduce, redistribute @@ -1199,7 +1199,7 @@ check_extensions( nntp_caps.sasl |= SASL_LOGIN; } } - } else if (!strncasecmp(ptr, "COMPRESS", 8)) { /* draft-murchison-nntp-compress-05 */ + } else if (!strncasecmp(ptr, "COMPRESS", 8)) { /* draft-murchison-nntp-compress-06 */ d = ptr + 8; d = strpbrk(d, " \t"); while (d != NULL && (d + 1 < (ptr + strlen(ptr)))) { @@ -1262,8 +1262,8 @@ mode_reader( put_server("MODE READER"); /* - * According to the latest NNTP draft (May 2005), MODE READER may only - * return the following response codes: + * According to RFC 3977 (5.3), MODE READER may only return the + * following response codes: * * 200 (OK_CANPOST) Hello, you can post * 201 (OK_NOPOST) Hello, you can't post @@ -1429,20 +1429,9 @@ nntp_open( * allowed to post after authentication issue a "MODE READER" again and * interpret the response code. */ - if (force_auth_on_conn_open || (nntp_caps.type == CAPABILITIES && !nntp_caps.reader && (nntp_caps.authinfo_user || (nntp_caps.authinfo_sasl & SASL_PLAIN)))) - { -# ifdef DEBUG - if (debug & DEBUG_NNTP) - debug_print_file("NNTP", "nntp_open() authenticate()"); -# endif /* DEBUG */ - /* - * switch mode before auth so we do not auth as a feeder. - * don't use mode_reader() to prevent authenticaion to - * kick in on a 481 "auth required" response and thus lead - * to a 502 "already authenticated" error later on. - */ - if (nntp_caps.type == CAPABILITIES && nntp_caps.mode_reader) { + if (nntp_caps.type == CAPABILITIES && !nntp_caps.reader) { + if (nntp_caps.mode_reader) { char buf[NNTP_STRLEN]; # ifdef DEBUG @@ -1462,6 +1451,13 @@ nntp_open( } check_extensions(); } + } + + if (force_auth_on_conn_open) { +# ifdef DEBUG + if (debug & DEBUG_NNTP) + 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; diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/nrctbl.c tin-2.4.1/src/nrctbl.c --- tin-2.4.0/src/nrctbl.c 2016-01-05 15:53:28.000000000 +0100 +++ tin-2.4.1/src/nrctbl.c 2016-10-12 17:28:01.521986775 +0200 @@ -9,7 +9,7 @@ * and the name of the newsrc file for a given * alias of the server. * - * Copyright (c) 1996-2016 Sven Paulus + * Copyright (c) 1996-2017 Sven Paulus * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/options_menu.c tin-2.4.1/src/options_menu.c --- tin-2.4.0/src/options_menu.c 2016-04-27 13:35:05.000000000 +0200 +++ tin-2.4.1/src/options_menu.c 2016-10-12 17:28:01.541987590 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-04-27 * Notes : Split from config.c * - * Copyright (c) 2004-2016 Michael Bienia + * Copyright (c) 2004-2017 Michael Bienia * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/page.c tin-2.4.1/src/page.c --- tin-2.4.0/src/page.c 2016-07-30 11:20:14.000000000 +0200 +++ tin-2.4.1/src/page.c 2016-10-12 17:28:01.569988730 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-07-29 * Notes : * - * Copyright (c) 1991-2016 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2017 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.0/src/pgp.c tin-2.4.1/src/pgp.c --- tin-2.4.0/src/pgp.c 2015-11-22 01:14:30.000000000 +0100 +++ tin-2.4.1/src/pgp.c 2016-10-12 17:28:01.621990848 +0200 @@ -6,7 +6,7 @@ * Updated : 2013-11-12 * Notes : PGP support * - * Copyright (c) 1995-2016 Steven J. Madsen + * Copyright (c) 1995-2017 Steven J. Madsen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/post.c tin-2.4.1/src/post.c --- tin-2.4.0/src/post.c 2016-03-13 15:44:52.000000000 +0100 +++ tin-2.4.1/src/post.c 2016-10-12 17:28:01.673992966 +0200 @@ -3,10 +3,10 @@ * Module : post.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2016-03-10 + * Updated : 2016-10-10 * Notes : mail/post/replyto/followup/repost & cancel articles * - * Copyright (c) 1991-2016 Iain Lea + * Copyright (c) 1991-2017 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -2054,7 +2054,7 @@ post_article_done: char a_mailbox[LEN]; char posted_msgs_file[PATH_LEN]; - joinpath(posted_msgs_file, sizeof(posted_msgs_file), cmdline.args & CMDLINE_MAILDIR ? cmdline.maildir : (group ? group->attribute->maildir : tinrc.maildir), tinrc.posted_articles_file); + joinpath(posted_msgs_file, sizeof(posted_msgs_file), (cmdline.args & CMDLINE_MAILDIR) ? cmdline.maildir : (group ? group->attribute->maildir : tinrc.maildir), tinrc.posted_articles_file); /* * log Message-ID if given in a_message_id, * add Date:, remove empty headers @@ -2637,6 +2637,7 @@ skip_id( return skipped; } + /* * Checks if Message-ID has valid format * Returns FALSE if it does, TRUE if it does not @@ -4017,6 +4018,7 @@ cancel_article( return redraw_screen; } + #define FromSameUser (strcasestr(from_name, arts[respnum].from)) #ifndef FORGERY # define NotSuperseding (!supersede || (!FromSameUser)) diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/prompt.c tin-2.4.1/src/prompt.c --- tin-2.4.0/src/prompt.c 2016-04-04 09:44:40.000000000 +0200 +++ tin-2.4.1/src/prompt.c 2016-10-12 17:28:01.705994269 +0200 @@ -6,7 +6,7 @@ * Updated : 2015-10-31 * Notes : * - * Copyright (c) 1991-2016 Iain Lea + * Copyright (c) 1991-2017 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/read.c tin-2.4.1/src/read.c --- tin-2.4.0/src/read.c 2016-07-30 11:20:14.000000000 +0200 +++ tin-2.4.1/src/read.c 2016-10-12 17:28:01.729995247 +0200 @@ -5,7 +5,7 @@ * Created : 1997-04-10 * Updated : 2016-07-29 * - * Copyright (c) 1997-2016 Jason Faultless + * Copyright (c) 1997-2017 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/refs.c tin-2.4.1/src/refs.c --- tin-2.4.0/src/refs.c 2016-05-02 17:44:44.000000000 +0200 +++ tin-2.4.1/src/refs.c 2016-10-12 17:28:01.749996061 +0200 @@ -8,7 +8,7 @@ * Credits : Richard Hodson * hash_msgid, free_msgid * - * Copyright (c) 1996-2016 Jason Faultless + * Copyright (c) 1996-2017 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/regex.c tin-2.4.1/src/regex.c --- tin-2.4.0/src/regex.c 2015-11-22 01:14:31.000000000 +0100 +++ tin-2.4.1/src/regex.c 2016-10-12 17:28:01.773997039 +0200 @@ -7,7 +7,7 @@ * Notes : Regular expression subroutines * Credits : * - * Copyright (c) 1997-2016 Jason Faultless + * Copyright (c) 1997-2017 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/rfc1524.c tin-2.4.1/src/rfc1524.c --- tin-2.4.0/src/rfc1524.c 2015-11-22 01:14:31.000000000 +0100 +++ tin-2.4.1/src/rfc1524.c 2016-10-12 17:28:01.793997854 +0200 @@ -6,7 +6,7 @@ * Updated : 2013-11-21 * Notes : mailcap parsing as defined in RFC 1524 * - * Copyright (c) 2000-2016 Urs Janssen , Jason Faultless + * Copyright (c) 2000-2017 Urs Janssen , Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/rfc2045.c tin-2.4.1/src/rfc2045.c --- tin-2.4.0/src/rfc2045.c 2015-11-22 01:14:31.000000000 +0100 +++ tin-2.4.1/src/rfc2045.c 2016-10-12 17:28:01.813998669 +0200 @@ -6,7 +6,7 @@ * Updated : 2015-08-24 * Notes : RFC 2045/2047 encoding * - * Copyright (c) 1995-2016 Chris Blum + * Copyright (c) 1995-2017 Chris Blum * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/rfc2046.c tin-2.4.1/src/rfc2046.c --- tin-2.4.0/src/rfc2046.c 2016-02-15 10:54:07.000000000 +0100 +++ tin-2.4.1/src/rfc2046.c 2016-10-12 17:28:01.833999483 +0200 @@ -3,10 +3,10 @@ * Module : rfc2046.c * Author : Jason Faultless * Created : 2000-02-18 - * Updated : 2016-02-11 + * Updated : 2016-09-26 * Notes : RFC 2046 MIME article parsing * - * Copyright (c) 2000-2016 Jason Faultless + * Copyright (c) 2000-2017 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1392,10 +1392,10 @@ parse_rfc2045_article( t_openartinfo *artinfo, t_bool show_progress_meter) { - int ret; + int ret = ART_ABORT; - if (!infile || (read_news_via_nntp && !(artinfo->raw = tmpfile()))) - return ART_ABORT; + if (read_news_via_nntp && !(artinfo->raw = tmpfile())) + goto error; if (!read_news_via_nntp) artinfo->raw = infile; diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/rfc2047.c tin-2.4.1/src/rfc2047.c --- tin-2.4.0/src/rfc2047.c 2016-03-13 15:45:15.000000000 +0100 +++ tin-2.4.1/src/rfc2047.c 2016-10-12 17:28:01.870000949 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-03-10 * Notes : MIME header encoding/decoding stuff * - * Copyright (c) 1995-2016 Chris Blum + * Copyright (c) 1995-2017 Chris Blum * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/save.c tin-2.4.1/src/save.c --- tin-2.4.0/src/save.c 2016-04-05 18:22:36.000000000 +0200 +++ tin-2.4.1/src/save.c 2016-10-12 17:28:01.894001926 +0200 @@ -3,10 +3,10 @@ * Module : save.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2016-02-25 + * Updated : 2016-10-10 * Notes : * - * Copyright (c) 1991-2016 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2017 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -213,7 +213,7 @@ check_start_save_any_news( if (function == SAVE_ANY_NEWS) { char tmp[PATH_LEN]; - if (!strfpath(cmdline.args & CMDLINE_SAVEDIR ? cmdline.savedir : tinrc.savedir, tmp, sizeof(tmp), group, FALSE)) + if (!strfpath((cmdline.args & CMDLINE_SAVEDIR) ? cmdline.savedir : tinrc.savedir, tmp, sizeof(tmp), group, FALSE)) joinpath(tmp, sizeof(tmp), homedir, DEFAULT_SAVEDIR); make_group_path(group->name, group_path); @@ -648,6 +648,7 @@ generate_filename( snprintf(buf, buflen, "%s-%03d.%s", SAVEFILE_PREFIX, seqno++, suffix); } + /* * Generate /save/to/path name. * @@ -720,7 +721,7 @@ expand_save_filename( base_name(buf_path, base_filename); /* Build default path to save to */ - if (!(ret = strfpath(cmdline.args & CMDLINE_SAVEDIR ? cmdline.savedir : curr_group->attribute->savedir, buf, sizeof(buf), curr_group, FALSE))) + if (!(ret = strfpath((cmdline.args & CMDLINE_SAVEDIR) ? cmdline.savedir : curr_group->attribute->savedir, buf, sizeof(buf), curr_group, FALSE))) joinpath(buf, sizeof(buf), homedir, DEFAULT_SAVEDIR); /* Join path and filename */ @@ -949,6 +950,7 @@ post_process_uud( filename = strrchr(path, DIRSEP) + 1; /* ptr to filename portion */ if ((fp_out = fopen(path, "w")) == NULL) { perror_message(_(txt_cannot_open), path); + fclose(fp_in); return; } state = MIDDLE; @@ -2054,6 +2056,7 @@ tag_pattern( return; } + static int get_tagged( int n) diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/screen.c tin-2.4.1/src/screen.c --- tin-2.4.0/src/screen.c 2016-04-15 14:07:27.000000000 +0200 +++ tin-2.4.1/src/screen.c 2016-10-12 17:28:01.918002904 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-04-15 * Notes : * - * Copyright (c) 1991-2016 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2017 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.0/src/search.c tin-2.4.1/src/search.c --- tin-2.4.0/src/search.c 2015-11-22 01:14:31.000000000 +0100 +++ tin-2.4.1/src/search.c 2016-10-12 17:28:01.946004045 +0200 @@ -6,7 +6,7 @@ * Updated : 2015-05-20 * Notes : * - * Copyright (c) 1991-2016 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2017 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.0/src/select.c tin-2.4.1/src/select.c --- tin-2.4.0/src/select.c 2016-07-30 11:20:14.000000000 +0200 +++ tin-2.4.1/src/select.c 2016-10-12 17:28:01.966004859 +0200 @@ -3,10 +3,10 @@ * Module : select.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2016-07-29 + * Updated : 2016-10-10 * Notes : * - * Copyright (c) 1991-2016 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2017 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -640,6 +640,10 @@ show_selection_page( show_mini_help(SELECT_LEVEL); +#ifdef NNTP_ABLE + did_reconnect = FALSE; +#endif /* NNTP_ABLE */ + if (selmenu.max <= 0) { info_message(_(txt_no_groups)); return; @@ -806,7 +810,7 @@ build_gline( int getart_limit; t_artnum num_unread; - getart_limit = cmdline.args & CMDLINE_GETART_LIMIT ? cmdline.getart_limit : tinrc.getart_limit; + getart_limit = (cmdline.args & CMDLINE_GETART_LIMIT) ? cmdline.getart_limit : tinrc.getart_limit; num_unread = active[my_group[i]].newsrc.num_unread; if (getart_limit > 0 && getart_limit < num_unread) num_unread = getart_limit; @@ -858,6 +862,7 @@ static void sync_active_file( void) { + wait_message(0, _(txt_reading_news_newsrc_file)); force_reread_active_file = TRUE; resync_active_file(); } diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/sigfile.c tin-2.4.1/src/sigfile.c --- tin-2.4.0/src/sigfile.c 2015-11-22 01:14:31.000000000 +0100 +++ tin-2.4.1/src/sigfile.c 2016-10-12 17:28:01.990005837 +0200 @@ -6,7 +6,7 @@ * Updated : 2013-11-21 * Notes : Generate random signature for posting/mailing etc. * - * Copyright (c) 1992-2016 Mike Gleason + * Copyright (c) 1992-2017 Mike Gleason * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/signal.c tin-2.4.1/src/signal.c --- tin-2.4.0/src/signal.c 2016-07-30 11:20:14.000000000 +0200 +++ tin-2.4.1/src/signal.c 2016-10-12 17:28:02.010006651 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-07-29 * Notes : signal handlers for different modes and window resizing * - * Copyright (c) 1991-2016 Iain Lea + * Copyright (c) 1991-2017 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/strftime.c tin-2.4.1/src/strftime.c --- tin-2.4.0/src/strftime.c 2015-11-22 01:14:31.000000000 +0100 +++ tin-2.4.1/src/strftime.c 2016-10-12 17:28:02.038007792 +0200 @@ -12,7 +12,7 @@ * tm = localtime(&secs); * num = strftime(buf, sizeof(buf), "%a %d-%m-%y %H:%M:%S", tm); * - * Copyright (c) 1991-2016 Arnold Robbins + * Copyright (c) 1991-2017 Arnold Robbins * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/string.c tin-2.4.1/src/string.c --- tin-2.4.0/src/string.c 2016-02-25 14:14:12.000000000 +0100 +++ tin-2.4.1/src/string.c 2016-12-04 10:53:13.724471558 +0100 @@ -6,7 +6,7 @@ * Updated : 2016-02-25 * Notes : * - * Copyright (c) 1997-2016 Urs Janssen + * Copyright (c) 1997-2017 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1273,6 +1273,7 @@ normalize( mode = UNINORM_NFKC; } buf = (char *) u8_normalize(mode, (uint8_t *) tmp, strlen(tmp) + 1, NULL, &olen); + free(tmp); return buf; } # else diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/tags.c tin-2.4.1/src/tags.c --- tin-2.4.0/src/tags.c 2015-11-22 01:14:31.000000000 +0100 +++ tin-2.4.1/src/tags.c 2016-10-12 17:28:02.110010724 +0200 @@ -6,7 +6,7 @@ * Updated : 2010-04-02 * Notes : Split out from other modules * - * Copyright (c) 1999-2016 Jason Faultless + * Copyright (c) 1999-2017 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/tcurses.c tin-2.4.1/src/tcurses.c --- tin-2.4.0/src/tcurses.c 2015-11-22 01:14:31.000000000 +0100 +++ tin-2.4.1/src/tcurses.c 2016-10-12 17:28:02.150012353 +0200 @@ -7,7 +7,7 @@ * Notes : This is a set of wrapper functions adapting the termcap * interface of tin to use SVr4 curses (e.g., ncurses). * - * Copyright (c) 1997-2016 Thomas Dickey + * Copyright (c) 1997-2017 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/thread.c tin-2.4.1/src/thread.c --- tin-2.4.0/src/thread.c 2016-07-26 13:56:54.000000000 +0200 +++ tin-2.4.1/src/thread.c 2016-10-12 17:28:02.186013820 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-07-26 * Notes : * - * Copyright (c) 1991-2016 Iain Lea + * Copyright (c) 1991-2017 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/tincfg.tbl tin-2.4.1/src/tincfg.tbl --- tin-2.4.0/src/tincfg.tbl 2016-04-17 20:02:49.000000000 +0200 +++ tin-2.4.1/src/tincfg.tbl 2016-10-12 17:31:23.600668233 +0200 @@ -5,7 +5,7 @@ ; Updated : 2016-04-17 ; Notes : #defines and structs for config.c ; -; Copyright (c) 1996-2016 Thomas E. Dickey +; Copyright (c) 1996-2017 Thomas E. Dickey ; All rights reserved. ; ; Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/trace.c tin-2.4.1/src/trace.c --- tin-2.4.0/src/trace.c 2015-11-22 01:14:31.000000000 +0100 +++ tin-2.4.1/src/trace.c 2016-10-12 17:28:02.258016752 +0200 @@ -6,7 +6,7 @@ * Updated : 2001-07-22 * Notes : debugging support via TRACE macro. * - * Copyright (c) 1997-2016 Thomas Dickey + * Copyright (c) 1997-2017 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/version.c tin-2.4.1/src/version.c --- tin-2.4.0/src/version.c 2015-11-22 01:14:31.000000000 +0100 +++ tin-2.4.1/src/version.c 2016-10-12 17:28:02.294018218 +0200 @@ -6,7 +6,7 @@ * Updated : 2013-11-15 * Notes : * - * Copyright (c) 2003-2016 Urs Janssen + * Copyright (c) 2003-2017 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/xface.c tin-2.4.1/src/xface.c --- tin-2.4.0/src/xface.c 2015-11-22 01:14:31.000000000 +0100 +++ tin-2.4.1/src/xface.c 2016-10-12 17:28:02.410022943 +0200 @@ -6,7 +6,7 @@ * Updated : 2013-11-06 * Notes : * - * Copyright (c) 2003-2016 Joshua Crawford & Drazen Kacar + * Copyright (c) 2003-2017 Joshua Crawford & Drazen Kacar * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/src/xref.c tin-2.4.1/src/xref.c --- tin-2.4.0/src/xref.c 2016-07-13 17:39:00.000000000 +0200 +++ tin-2.4.1/src/xref.c 2016-10-12 17:28:02.462025062 +0200 @@ -6,7 +6,7 @@ * Updated : 2016-06-02 * Notes : * - * Copyright (c) 1993-2016 Iain Lea + * Copyright (c) 1993-2017 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.0/tin.spec tin-2.4.1/tin.spec --- tin-2.4.0/tin.spec 2016-06-28 16:25:02.000000000 +0200 +++ tin-2.4.1/tin.spec 2016-08-23 23:02:45.158437607 +0200 @@ -1,6 +1,6 @@ Name: tin Summary: easy-to-use USENET news reader -Version: 2.4.0 +Version: 2.4.1 Release: 1 License: BSD Group: Applications/News diff -Nurp '--exclude=.bzr*' tin-2.4.0/tools/tinews.pl tin-2.4.1/tools/tinews.pl --- tin-2.4.0/tools/tinews.pl 2015-11-22 01:49:47.000000000 +0100 +++ tin-2.4.1/tools/tinews.pl 2016-12-21 11:06:24.034473781 +0100 @@ -4,7 +4,7 @@ # signs the article and posts it. # # -# Copyright (c) 2002-2016 Urs Janssen , +# Copyright (c) 2002-2017 Urs Janssen , # Marc Brockschmidt # # Redistribution and use in source and binary forms, with or without @@ -39,14 +39,15 @@ # - add $PGPOPTS, $PGPPATH and $GNUPGHOME support # - cleanup and remove duplicated code # - option to convert CRLF to LF in input -# - use STARTTLS (if Net::NNTP is recent enought and server supports it) +# - use STARTTLS (if Net::NNTP is recent enough and server supports it) +# - quote inpupt properly before passing to shell # use strict; use warnings; # version Number -my $version = "1.1.40"; +my $version = "1.1.42"; my %config; @@ -59,10 +60,10 @@ $config{'NNTPPass'} = ''; # password fo $config{'PGPSigner'} = ''; # sign as who? $config{'PGPPass'} = ''; # pgp2 only $config{'PathtoPGPPass'}= ''; # pgp2, pgp5, pgp6 and gpg -$config{'PGPPassFD'} = 9; # file descriptor used for input redirection of PathtoPGPPass, GPG, PGP5 and PGP6 only +$config{'PGPPassFD'} = 9; # file descriptor used for input redirection of PathtoPGPPass; GPG1, GPG2, PGP5 and PGP6 only $config{'pgp'} = '/usr/bin/pgp'; # path to pgp -$config{'PGPVersion'} = '2'; # Use 2 for 2.X, 5 for PGP5, 6 for PGP6 and GPG for GPG +$config{'PGPVersion'} = '2'; # Use 2 for 2.X, 5 for PGP5, 6 for PGP6, GPG or GPG1 for GPG1 and GPG2 for GPG2 $config{'digest-algo'} = 'MD5';# Digest Algorithm for GPG. Must be supported by your installation $config{'Interactive'} = 'yes';# allow interactive usage @@ -81,6 +82,8 @@ $config{'pgpend'} = '-----END PGP SIGNA # $config{'canlock_secret'} = '~/.cancelsecret'; # Path to canlock secret file +# $config{'ignore_headers'} = ''; # headers to be ignored during signing + $config{'PGPSignHeaders'} = ['From', 'Newsgroups', 'Subject', 'Control', 'Supersedes', 'Followup-To', 'Date', 'Injection-Date', 'Sender', 'Approved', 'Message-ID', 'Reply-To', 'Cancel-Key', 'Also-Control', @@ -148,6 +151,7 @@ GetOptions('A|V|W|O|no-organization|h|he 'distribution|d=s' => \$config{'distribution'}, 'expires|e=s' => \$config{'expires'}, 'from|f=s' => \$config{'from'}, + 'ignore-headers|i=s' => \$config{'ignore_headers'}, 'followupto|w=s' => \$config{'followup-to'}, 'newsgroups|n=s' => \$config{'newsgroups'}, 'replyto|r=s' => \$config{'reply-to'}, @@ -211,7 +215,13 @@ if (! $config{'no_sign'}) { } } - +# Remove unwanted headers from PGPSignHeaders +if (${config{'ignore_headers'}}) { + my @hdr_to_ignore = split(/,/, ${config{'ignore_headers'}}); + foreach my $hdr (@hdr_to_ignore) { + @{$config{'PGPSignHeaders'}} = map {lc($_) eq lc($hdr) ? () : $_} @{$config{'PGPSignHeaders'}}; + } +} # Read the message and split the header readarticle(\%Header, \@Body); @@ -621,11 +631,19 @@ sub getpgpcommand { } else { die("$0: Passphrase is unknown!\n"); } - } elsif ($PGPVersion =~ m/GPG/io) { + } elsif ($PGPVersion =~ m/GPG1?$/io) { + if ($config{'PathtoPGPPass'}) { + $PGPCommand = $config{'pgp'}." --emit-version --digest-algo $config{'digest-algo'} -a -u \"".$config{'PGPSigner'}."\" -o ".$config{'pgptmpf'}.".txt.asc --no-tty --batch --passphrase-fd ".$config{'PGPPassFD'}." ".$config{'PGPPassFD'}."<".$config{'PathtoPGPPass'}." --clearsign ".$config{'pgptmpf'}.".txt"; + } elsif ($config{'Interactive'}) { + $PGPCommand = $config{'pgp'}." --emit-version --digest-algo $config{'digest-algo'} -a -u \"".$config{'PGPSigner'}."\" -o ".$config{'pgptmpf'}.".txt.asc --no-secmem-warning --no-batch --clearsign ".$config{'pgptmpf'}.".txt"; + } else { + die("$0: Passphrase is unknown!\n"); + } + } elsif ($PGPVersion =~ m/GPG2$/io) { if ($config{'PathtoPGPPass'}) { - $PGPCommand = $config{'pgp'}." --digest-algo $config{'digest-algo'} -a -u \"".$config{'PGPSigner'}."\" -o ".$config{'pgptmpf'}.".txt.asc --no-tty --batch --passphrase-fd ".$config{'PGPPassFD'}." ".$config{'PGPPassFD'}."<".$config{'PathtoPGPPass'}." --clearsign ".$config{'pgptmpf'}.".txt"; + $PGPCommand = $config{'pgp'}." --pinentry-mode loopback --emit-version --digest-algo $config{'digest-algo'} -a -u \"".$config{'PGPSigner'}."\" -o ".$config{'pgptmpf'}.".txt.asc --no-tty --batch --passphrase-fd ".$config{'PGPPassFD'}." ".$config{'PGPPassFD'}."<".$config{'PathtoPGPPass'}." --clearsign ".$config{'pgptmpf'}.".txt"; } elsif ($config{'Interactive'}) { - $PGPCommand = $config{'pgp'}." --digest-algo $config{'digest-algo'} -a -u \"".$config{'PGPSigner'}."\" -o ".$config{'pgptmpf'}.".txt.asc --no-secmem-warning --no-batch --clearsign ".$config{'pgptmpf'}.".txt"; + $PGPCommand = $config{'pgp'}." --emit-version --digest-algo $config{'digest-algo'} -a -u \"".$config{'PGPSigner'}."\" -o ".$config{'pgptmpf'}.".txt.asc --no-secmem-warning --no-batch --clearsign ".$config{'pgptmpf'}.".txt"; } else { die("$0: Passphrase is unknown!\n"); } @@ -803,6 +821,7 @@ sub usage { print " -d string set Distribution:-header to string\n"; print " -e string set Expires:-header to string\n"; print " -f string set From:-header to string\n"; + print " -i string list of headers to be ignored for signing\n"; print " -n string set Newsgroups:-header to string\n"; print " -o string set Organization:-header to string\n"; print " -p port use port as NNTP port [default=".$config{'NNTPPort'}."]\n"; @@ -876,6 +895,20 @@ X<-f> X<--from> Set the article header field From: to the given value. +=item -B F
| --B F
+X<-i> X<--ignore-headers> + +Comma separated list of headers that will be ignored during signing. +Usually the following headers will be signed if present: + +From, Newsgroups, Subject, Control, Supersedes, Followup-To, +Date, Injection-Date, Sender, Approved, Message-ID, Reply-To, +Cancel-Key, Also-Control and Distribution. + +Some of them may be altered on the Server (i.e. Cancel-Key) which would +invalid the signature, this option can be used the exclude such headers +if required. + =item -B C | --B C X<-n> X<--newsgroups> @@ -1082,7 +1115,7 @@ off by default. "nntpserver password [user]" pairs for NNTP servers that require authorization. Any line that starts with "#" is a comment. Blank lines are ignored. This file should be readable only for the user as it contains the -user's uncrypted password for reading news. First match counts. If no +user's unencrypted password for reading news. First match counts. If no matching entry is found F<$HOME/.nntpauth> is checked. =item F<$HOME/.nntpauth> @@ -1090,13 +1123,13 @@ matching entry is found F<$HOME/.nntpaut "nntpserver user password" pairs for NNTP servers that require authorization. First match counts. Lines starting with "#" are skipped and blank lines are ignored. This file should be readable only for the user as -it contains the user's uncrypted password for reading news. +it contains the user's unencrypted password for reading news. F<$HOME/.newsauth> is checked first. =item F<$XDG_CONFIG_HOME/tinewsrc> F<$HOME/.config/tinewsrc> F<$HOME/.tinewsrc> "option=value" configuration pairs. Lines that start with "#" are ignored. -If the file contains uncrypted passwords (e.g. NNTPPass or PGPPass), it +If the file contains unencrypted passwords (e.g. NNTPPass or PGPPass), it should be readable for the user only. =back @@ -1111,7 +1144,7 @@ security is an issue, don't use this scr =head1 NOTES B is designed to be used with B(1)-2.6.3, -B(1)-5, B(1)-6 and B(1). +B(1)-5, B(1)-6, B(1) and B(1). B requires the following standard modules to be installed: B(3pm), B(3pm), B(3pm) and @@ -1128,7 +1161,7 @@ Marc Brockschmidt Emarc@marcbrocksch =head1 SEE ALSO -B(1), B(1), B(1), B(3pm), +B(1), B(1), B(1), B(1), B(3pm), B(3pm), B(3pm), B(3pm), B(3pm), B(3pm), B(3pm), B(3pm)