----------------------------------------------------------------------------- MANIFEST | 203 Makefile | 13 config.guess | 15 config.sub | 19 configure | 1735 ++--- configure.in | 10 doc/CHANGES | 45 doc/INSTALL | 7 doc/TODO | 26 doc/WHATSNEW | 14 doc/keymap.sample | 6 doc/tin.1 | 18 doc/tin.5 | 14 include/autoconf.hin | 7 include/extern.h | 29 include/keymap.h | 4 include/menukeys.h | 4 include/proto.h | 47 include/tin.h | 10 include/version.h | 9 pcre/AUTHORS | 2 pcre/COPYING | 69 pcre/ChangeLog | 136 pcre/LICENCE | 69 pcre/Makefile.in | 2 pcre/Makefile.in-old | 24 pcre/NEWS | 47 pcre/NON-UNIX-USE | 142 pcre/README | 102 pcre/RunTest.in | 101 pcre/configure.in | 35 pcre/dftables.c | 46 pcre/doc/pcre.3 | 164 pcre/doc/pcrepattern.3 | 1301 ++- pcre/get.c | 44 pcre/internal.h | 363 - pcre/maketables.c | 44 pcre/pcre-config.in | 11 pcre/pcre.c | 2307 ++++-- pcre/pcre.in | 52 pcre/pcredemo.c | 42 pcre/pcregrep.c | 33 pcre/pcreposix.c | 53 pcre/pcreposix.h | 35 pcre/pcretest.c | 457 + pcre/perltest | 2 pcre/printint.c | 183 pcre/study.c | 72 pcre/testdata/testinput2 | 157 pcre/testdata/testinput4 | 12 pcre/testdata/testinput5 | 9 pcre/testdata/testinput6 | 517 + pcre/testdata/testoutput1 | 2 pcre/testdata/testoutput2 | 1890 ++++- pcre/testdata/testoutput3 | 6 pcre/testdata/testoutput4 | 18 pcre/testdata/testoutput5 | 528 - pcre/testdata/testoutput6 | 1013 ++ pcre/ucp.c | 150 pcre/ucp.h | 58 pcre/ucpinternal.h | 91 pcre/ucptable.c |15105 ++++++++++++++++++++++++++++++++++++++++++++ pcre/ucptypetable.c | 93 pcre/version.sh | 6 po/de.gmo |binary po/de.po | 2379 +++--- po/en_GB.gmo |binary po/en_GB.po | 2224 +++--- po/et.gmo |binary po/et.po | 2299 +++--- po/fr.gmo |binary po/fr.po | 3025 ++++---- po/messages |binary po/tin.pot | 2235 +++--- src/Makefile.in | 7 src/art.c | 2 src/config.c | 38 src/cook.c | 328 src/filter.c | 2 src/global.c | 243 src/group.c | 56 src/help.c | 8 src/inews.c | 2 src/init.c | 4 src/keymap.c | 33 src/lang.c | 279 src/misc.c | 6 src/newsrc.c | 7 src/nntplib.c | 4 src/options_menu.c | 167 src/page.c | 384 - src/pgp.c | 15 src/post.c | 38 src/prompt.c | 5 src/refs.c | 4 src/rfc1524.c | 24 src/rfc2045.c | 312 src/rfc2046.c | 2 src/rfc2047.c | 14 src/screen.c | 10 src/search.c | 36 src/select.c | 185 src/string.c | 63 src/thread.c | 66 src/version.c | 21 src/xref.c | 2 tin.spec | 2 107 files changed, 32185 insertions(+), 10174 deletions(-) ----------------------------------------------------------------------------- diff -Nurp tin-1.7.6/MANIFEST tin-1.7.7/MANIFEST --- tin-1.7.6/MANIFEST 2004-09-06 11:07:24.000000000 +0200 +++ tin-1.7.7/MANIFEST 2004-12-15 16:56:38.000000000 +0100 @@ -1,28 +1,28 @@ -MANIFEST for tin-1.7.6 (Mon Sep 6 11:07:23 CEST 2004) +MANIFEST for tin-1.7.7 (Wed Dec 15 16:56:38 CET 2004) ---------------------------------------------------- - 12936 ./Makefile - 7410 ./MANIFEST + 13125 ./Makefile + 7607 ./MANIFEST 1440 ./README 564 ./README.MAC 2209 ./README.VMS 1006 ./README.WIN 138874 ./aclocal.m4 882 ./conf-tin - 43209 ./config.guess - 31254 ./config.sub - 486848 ./configure - 30835 ./configure.in + 43393 ./config.guess + 31414 ./config.sub + 487302 ./configure + 30841 ./configure.in 7123 ./install.sh 777 ./mkdirs.sh 1505 ./tin.spec 18847 ./doc/ABOUT-NLS - 16865 ./doc/CHANGES + 18782 ./doc/CHANGES 226345 ./doc/CHANGES.old 4654 ./doc/CREDITS 1469 ./doc/DEBUG_REFS - 29793 ./doc/INSTALL - 30218 ./doc/TODO - 750 ./doc/WHATSNEW + 29900 ./doc/INSTALL + 30877 ./doc/TODO + 963 ./doc/WHATSNEW 2618 ./doc/art_handling.txt 1700 ./doc/article.txt 3862 ./doc/auth.txt @@ -31,7 +31,7 @@ MANIFEST for tin-1.7.6 (Mon Sep 6 11:07 35304 ./doc/good-netkeeping-seal 3803 ./doc/internals.txt 23621 ./doc/iso2asc.txt - 4042 ./doc/keymap.sample + 4112 ./doc/keymap.sample 660 ./doc/mailcap.sample 3365 ./doc/mime.types 1541 ./doc/nov_tests @@ -48,8 +48,8 @@ MANIFEST for tin-1.7.6 (Mon Sep 6 11:07 4168 ./doc/mmdf.5 2128 ./doc/newsoverview.5 6963 ./doc/plp_snprintf.3 - 117717 ./doc/tin.1 - 72480 ./doc/tin.5 + 117824 ./doc/tin.1 + 72519 ./doc/tin.5 4733 ./doc/w2r.1 2196 ./doc/wildmat.3 344 ./tools/expiretover @@ -63,14 +63,14 @@ MANIFEST for tin-1.7.6 (Mon Sep 6 11:07 2778 ./include/bool.h 2039 ./include/bugrep.h 9502 ./include/oldconfig.h - 57776 ./include/extern.h - 11429 ./include/keymap.h - 15886 ./include/menukeys.h + 58088 ./include/extern.h + 11501 ./include/keymap.h + 15938 ./include/menukeys.h 6340 ./include/newsrc.h 6507 ./include/nntplib.h 665 ./include/plp_snprintf.h 12209 ./include/policy.h - 30228 ./include/proto.h + 30501 ./include/proto.h 5047 ./include/rfc2046.h 3373 ./include/stpwatch.h 5756 ./include/tcurses.h @@ -78,31 +78,31 @@ MANIFEST for tin-1.7.6 (Mon Sep 6 11:07 13273 ./include/tinrc.h 5670 ./include/tnntp.h 2264 ./include/trace.h - 2531 ./include/version.h + 2561 ./include/version.h 25899 ./src/active.c - 55400 ./src/art.c + 55396 ./src/art.c 31543 ./src/attrib.c 12354 ./src/auth.c 13712 ./src/charset.c 8220 ./src/color.c - 57537 ./src/config.c - 29822 ./src/cook.c + 57803 ./src/config.c + 19971 ./src/cook.c 30473 ./src/curses.c 9791 ./src/debug.c 3408 ./src/envarg.c 26001 ./src/feed.c - 54994 ./src/filter.c + 54995 ./src/filter.c 18114 ./src/getline.c - 7254 ./src/global.c - 45013 ./src/group.c + 8933 ./src/global.c + 45174 ./src/group.c 3900 ./src/hashstr.c 8763 ./src/header.c - 27937 ./src/help.c - 13862 ./src/inews.c - 32715 ./src/init.c + 28225 ./src/help.c + 13855 ./src/inews.c + 32720 ./src/init.c 2216 ./src/joinpath.c - 38018 ./src/keymap.c - 113648 ./src/lang.c + 38670 ./src/keymap.c + 116362 ./src/lang.c 4486 ./src/langinfo.c 7033 ./src/list.c 6662 ./src/lock.c @@ -111,42 +111,42 @@ MANIFEST for tin-1.7.6 (Mon Sep 6 11:07 10197 ./src/makecfg.c 12294 ./src/memory.c 5257 ./src/mimetypes.c - 89299 ./src/misc.c - 40349 ./src/newsrc.c - 37180 ./src/nntplib.c + 89409 ./src/misc.c + 40317 ./src/newsrc.c + 37182 ./src/nntplib.c 7291 ./src/nrctbl.c - 39978 ./src/options_menu.c - 60591 ./src/page.c + 42153 ./src/options_menu.c + 58982 ./src/page.c 24133 ./src/parsdate.y 16966 ./src/plp_snprintf.c - 12695 ./src/pgp.c - 133340 ./src/post.c - 17609 ./src/prompt.c + 12702 ./src/pgp.c + 133557 ./src/post.c + 17550 ./src/prompt.c 10683 ./src/read.c - 25572 ./src/refs.c + 25568 ./src/refs.c 5276 ./src/regex.c - 14422 ./src/rfc1524.c - 5553 ./src/rfc2045.c - 29740 ./src/rfc2046.c - 32733 ./src/rfc2047.c + 14545 ./src/rfc1524.c + 15062 ./src/rfc2045.c + 29727 ./src/rfc2046.c + 32678 ./src/rfc2047.c 37285 ./src/save.c - 11489 ./src/screen.c - 15480 ./src/search.c - 30671 ./src/select.c + 11472 ./src/screen.c + 16267 ./src/search.c + 30958 ./src/select.c 7590 ./src/sigfile.c 12655 ./src/signal.c 7215 ./src/strftime.c - 23023 ./src/string.c + 22632 ./src/string.c 13874 ./src/tags.c 16944 ./src/tcurses.c 3071 ./src/tmpfile.c 3364 ./src/my_tmpfile.c - 39438 ./src/thread.c + 39673 ./src/thread.c 2472 ./src/trace.c - 4117 ./src/version.c + 4384 ./src/version.c 5453 ./src/wildmat.c 7153 ./src/xface.c - 7747 ./src/xref.c + 7742 ./src/xref.c 3013 ./vms/dir.h 424 ./vms/filetypes.h 21451 ./vms/getopt.c @@ -170,50 +170,57 @@ MANIFEST for tin-1.7.6 (Mon Sep 6 11:07 5652 ./vms/vmspwd.c 389 ./vms/vmstimval.h 179 ./pcre/AUTHORS - 2218 ./pcre/COPYING - 64875 ./pcre/ChangeLog + 2067 ./pcre/COPYING + 71737 ./pcre/ChangeLog 8049 ./pcre/INSTALL - 2218 ./pcre/LICENCE - 2643 ./pcre/Makefile.in - 12558 ./pcre/Makefile.in-old - 6142 ./pcre/NEWS - 5381 ./pcre/NON-UNIX-USE - 16781 ./pcre/README - 3133 ./pcre/RunTest.in + 2067 ./pcre/LICENCE + 2639 ./pcre/Makefile.in + 12953 ./pcre/Makefile.in-old + 8460 ./pcre/NEWS + 9665 ./pcre/NON-UNIX-USE + 19589 ./pcre/README + 4742 ./pcre/RunTest.in 138 ./pcre/config.h - 5153 ./pcre/configure.in - 5182 ./pcre/dftables.c - 11406 ./pcre/get.c - 29055 ./pcre/internal.h - 4547 ./pcre/maketables.c - 1093 ./pcre/pcre-config.in - 255554 ./pcre/pcre.c + 5847 ./pcre/configure.in + 5808 ./pcre/dftables.c + 12072 ./pcre/get.c + 32928 ./pcre/internal.h + 5173 ./pcre/maketables.c + 1171 ./pcre/pcre-config.in + 282536 ./pcre/pcre.c 271 ./pcre/pcre.def - 7055 ./pcre/pcre.in - 11338 ./pcre/pcredemo.c - 15371 ./pcre/pcregrep.c - 10393 ./pcre/pcreposix.c - 2347 ./pcre/pcreposix.h - 41274 ./pcre/pcretest.c - 5232 ./pcre/perltest - 9622 ./pcre/printint.c - 13590 ./pcre/study.c - 400 ./pcre/version.sh - 6924 ./pcre/doc/pcre.3 - 55268 ./pcre/doc/pcrepattern.3 + 9530 ./pcre/pcre.in + 11707 ./pcre/pcredemo.c + 17061 ./pcre/pcregrep.c + 11279 ./pcre/pcreposix.c + 3983 ./pcre/pcreposix.h + 51609 ./pcre/pcretest.c + 5234 ./pcre/perltest + 12606 ./pcre/printint.c + 14414 ./pcre/study.c + 4196 ./pcre/ucp.c + 1831 ./pcre/ucp.h + 3547 ./pcre/ucpinternal.h + 453166 ./pcre/ucptable.c + 3267 ./pcre/ucptypetable.c + 395 ./pcre/version.sh + 8305 ./pcre/doc/pcre.3 + 61694 ./pcre/doc/pcrepattern.3 73940 ./pcre/testdata/testinput1 - 20702 ./pcre/testdata/testinput2 + 24195 ./pcre/testdata/testinput2 596 ./pcre/testdata/testinput3 - 8431 ./pcre/testdata/testinput4 - 3479 ./pcre/testdata/testinput5 - 98304 ./pcre/testdata/testoutput1 - 86022 ./pcre/testdata/testoutput2 - 1528 ./pcre/testdata/testoutput3 - 14786 ./pcre/testdata/testoutput4 - 22706 ./pcre/testdata/testoutput5 - 19771 ./include/autoconf.hin + 8401 ./pcre/testdata/testinput4 + 3516 ./pcre/testdata/testinput5 + 7432 ./pcre/testdata/testinput6 + 98299 ./pcre/testdata/testoutput1 + 115639 ./pcre/testdata/testoutput2 + 1513 ./pcre/testdata/testoutput3 + 14738 ./pcre/testdata/testoutput4 + 22902 ./pcre/testdata/testoutput5 + 16226 ./pcre/testdata/testoutput6 + 19859 ./include/autoconf.hin 5800 ./pcre/pcre.mms - 20961 ./src/Makefile.in + 20987 ./src/Makefile.in 7634 ./src/tincfg.tbl 8747 ./src/descrip.mms 954 ./libcanlock/Build @@ -276,13 +283,13 @@ MANIFEST for tin-1.7.6 (Mon Sep 6 11:07 41 ./intl/VERSION 4962 ./po/Makefile.inn 847 ./po/POTFILES.in - 117391 ./po/tin.pot - 159859 ./po/de.gmo - 189901 ./po/de.po - 6547 ./po/en_GB.gmo - 119552 ./po/en_GB.po - 151003 ./po/et.gmo - 181283 ./po/et.po - 125574 ./po/fr.gmo - 172706 ./po/fr.po -6039072 total + 120362 ./po/tin.pot + 164613 ./po/de.gmo + 195863 ./po/de.po + 7359 ./po/en_GB.gmo + 123039 ./po/en_GB.po + 142956 ./po/et.gmo + 186066 ./po/et.po + 162681 ./po/fr.gmo + 193204 ./po/fr.po +6727420 total diff -Nurp tin-1.7.6/Makefile tin-1.7.7/Makefile --- tin-1.7.6/Makefile 2004-09-06 11:07:20.000000000 +0200 +++ tin-1.7.7/Makefile 2004-12-15 16:56:35.000000000 +0100 @@ -1,15 +1,15 @@ # Top level Makefile for tin # - for configuration options read the doc/INSTALL file. # -# Updated: 2004-09-05 +# Updated: 2004-09-14 # PROJECT = tin LVER = 1 PVER = 7 -SVER = 6 +SVER = 7 VER = $(LVER).$(PVER).$(SVER) -DVER = 20040906 +DVER = 20041215 EXE = tin # directory structure @@ -236,6 +236,11 @@ PCRE = \ $(PCREDIR)/perltest \ $(PCREDIR)/printint.c \ $(PCREDIR)/study.c \ + $(PCREDIR)/ucp.c \ + $(PCREDIR)/ucp.h \ + $(PCREDIR)/ucpinternal.h \ + $(PCREDIR)/ucptable.c \ + $(PCREDIR)/ucptypetable.c \ $(PCREDIR)/version.sh \ $(PCREDIR)/doc/pcre.3 \ $(PCREDIR)/doc/pcrepattern.3 \ @@ -244,11 +249,13 @@ PCRE = \ $(PCREDIR)/testdata/testinput3 \ $(PCREDIR)/testdata/testinput4 \ $(PCREDIR)/testdata/testinput5 \ + $(PCREDIR)/testdata/testinput6 \ $(PCREDIR)/testdata/testoutput1 \ $(PCREDIR)/testdata/testoutput2 \ $(PCREDIR)/testdata/testoutput3 \ $(PCREDIR)/testdata/testoutput4 \ $(PCREDIR)/testdata/testoutput5 \ + $(PCREDIR)/testdata/testoutput6 CAN = \ $(CANDIR)/Build \ diff -Nurp tin-1.7.6/config.guess tin-1.7.7/config.guess --- tin-1.7.6/config.guess 2004-08-31 22:50:35.000000000 +0200 +++ tin-1.7.7/config.guess 2004-11-15 18:44:20.000000000 +0100 @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2004-08-29' +timestamp='2004-11-12' # 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 @@ -319,6 +319,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ *:OS/390:*:*) echo i370-ibm-openedition exit 0 ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit 0 ;; *:OS400:*:*) echo powerpc-ibm-os400 exit 0 ;; @@ -342,7 +345,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7 && exit 0 ;; esac ;; @@ -827,6 +830,9 @@ EOF crisv32:Linux:*:*) echo crisv32-axis-linux-gnu exit 0 ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -1244,7 +1250,10 @@ EOF A*) echo alpha-dec-vms && exit 0 ;; I*) echo ia64-dec-vms && exit 0 ;; V*) echo vax-dec-vms && exit 0 ;; - esac + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -Nurp tin-1.7.6/config.sub tin-1.7.7/config.sub --- tin-1.7.6/config.sub 2004-11-12 17:38:41.000000000 +0100 +++ tin-1.7.7/config.sub 2004-12-02 02:40:05.000000000 +0100 @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2004-08-29' +timestamp='2004-11-30' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -267,7 +267,7 @@ case $basic_machine in | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xstormy16 | xtensa \ + | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -343,8 +343,8 @@ case $basic_machine in | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; @@ -489,6 +489,10 @@ case $basic_machine in basic_machine=m88k-motorola os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -1029,6 +1033,10 @@ case $basic_machine in basic_machine=hppa1.1-winbond os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1297,6 +1305,9 @@ case $os in -kaos*) os=-kaos ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *) diff -Nurp tin-1.7.6/configure tin-1.7.7/configure --- tin-1.7.6/configure 2004-09-06 11:07:23.000000000 +0200 +++ tin-1.7.7/configure 2004-12-15 16:56:37.000000000 +0100 @@ -627,7 +627,7 @@ fi PACKAGE=tin -VERSION=1.7.6 +VERSION=1.7.7 cat >> confdefs.h <&6 +echo "configure:1340: checking for AIX" >&5 +cat > conftest.$ac_ext <&5 | + egrep "yes" >/dev/null 2>&1; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF +#define _ALL_SOURCE 1 +EOF + +else + rm -rf conftest* + echo "$ac_t""no" 1>&6 +fi +rm -f conftest* + + echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6 -echo "configure:1341: checking if we must define _GNU_SOURCE" >&5 +echo "configure:1365: checking if we must define _GNU_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -1353,7 +1377,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -1363,7 +1387,7 @@ else cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat > conftest.$ac_ext < int main() { @@ -1373,7 +1397,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -1395,7 +1419,7 @@ test "$cf_cv_gnu_source" = yes && CPPFLA echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:1399: checking for strerror in -lcposix" >&5 +echo "configure:1423: checking for strerror in -lcposix" >&5 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1403,7 +1427,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1438,7 +1462,7 @@ fi echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1442: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:1466: checking for ${CC-cc} option to accept ANSI C" >&5 if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1494,7 +1518,7 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_cc="$cf_arg"; break else @@ -1578,12 +1602,12 @@ You have the following choices: fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1582: checking for Cygwin environment" >&5 +echo "configure:1606: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1611,19 +1635,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1615: checking for mingw32 environment" >&5 +echo "configure:1639: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1655,7 +1679,7 @@ esac echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1659: checking for executable suffix" >&5 +echo "configure:1683: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1665,7 +1689,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1686,13 +1710,13 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6 ac_exeext=$EXEEXT echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1690: checking for object suffix" >&5 +echo "configure:1714: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1720: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1727,7 +1751,7 @@ LIB_PREFIX=$LIB_PREFIX echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1731: checking whether ln -s works" >&5 +echo "configure:1755: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1771,7 +1795,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1775: checking for $ac_word" >&5 +echo "configure:1799: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BUILD_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1864,7 +1888,7 @@ fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1868: checking build system type" >&5 +echo "configure:1892: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1890,7 +1914,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1894: checking for $ac_word" >&5 +echo "configure:1918: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1922,7 +1946,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1926: checking for $ac_word" >&5 +echo "configure:1950: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1957,7 +1981,7 @@ fi # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. set dummy ${ac_tool_prefix}ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1961: checking for $ac_word" >&5 +echo "configure:1985: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1989,7 +2013,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1993: checking for $ac_word" >&5 +echo "configure:2017: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2024,7 +2048,7 @@ fi # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2028: checking for $ac_word" >&5 +echo "configure:2052: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2056,7 +2080,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2060: checking for $ac_word" >&5 +echo "configure:2084: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2093,7 +2117,7 @@ if eval "test \"`echo '$''{'cf_cv_subst_ else echo $ac_n "checking for archiver options (symbol AR_OPTS)""... $ac_c" 1>&6 -echo "configure:2097: checking for archiver options (symbol AR_OPTS)" >&5 +echo "configure:2121: checking for archiver options (symbol AR_OPTS)" >&5 test -z "$AR_OPTS" && AR_OPTS=rv echo "$ac_t""$AR_OPTS" 1>&6 @@ -2139,7 +2163,7 @@ if test "${with_ispell+set}" = set; then *) # user supplied option-value for "--with-ispell=path" echo $ac_n "checking for ispell""... $ac_c" 1>&6 -echo "configure:2143: checking for ispell" >&5 +echo "configure:2167: checking for ispell" >&5 ac_cv_path_PATH_ISPELL="$withval" cat >> confdefs.h <&6 -echo "configure:2160: checking for $ac_word" >&5 +echo "configure:2184: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_ISPELL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2213,7 +2237,7 @@ if test "${with_metamail+set}" = set; th *) # user supplied option-value for "--with-metamail=path" echo $ac_n "checking for metamail""... $ac_c" 1>&6 -echo "configure:2217: checking for metamail" >&5 +echo "configure:2241: checking for metamail" >&5 ac_cv_path_PATH_METAMAIL="$withval" cat >> confdefs.h <&6 -echo "configure:2234: checking for $ac_word" >&5 +echo "configure:2258: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_METAMAIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2287,7 +2311,7 @@ if test "${with_sum+set}" = set; then *) # user supplied option-value for "--with-sum=path" echo $ac_n "checking for sum""... $ac_c" 1>&6 -echo "configure:2291: checking for sum" >&5 +echo "configure:2315: checking for sum" >&5 ac_cv_path_PATH_SUM="$withval" cat >> confdefs.h <&6 -echo "configure:2308: checking for $ac_word" >&5 +echo "configure:2332: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_SUM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2351,12 +2375,12 @@ fi if test $ac_cv_path_PATH_SUM then echo $ac_n "checking if $ac_cv_path_PATH_SUM takes -r""... $ac_c" 1>&6 -echo "configure:2355: checking if $ac_cv_path_PATH_SUM takes -r" >&5 +echo "configure:2379: checking if $ac_cv_path_PATH_SUM takes -r" >&5 if eval "test \"`echo '$''{'ac_cv_prog_sum_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -if { ac_try='$ac_cv_path_PATH_SUM -r config.log 1>&5'; { (eval echo configure:2360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } +if { ac_try='$ac_cv_path_PATH_SUM -r config.log 1>&5'; { (eval echo configure:2384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then ac_cv_prog_sum_r=yes else @@ -2386,7 +2410,7 @@ fi echo $ac_n "checking for default editor""... $ac_c" 1>&6 -echo "configure:2390: checking for default editor" >&5 +echo "configure:2414: checking for default editor" >&5 # Check whether --with-editor or --without-editor was given. if test "${with_editor+set}" = set; then @@ -2414,7 +2438,7 @@ if test -z "$DEFAULT_EDITOR" ; then # Extract the first word of "vi", so it can be a program name with args. set dummy vi; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2418: checking for $ac_word" >&5 +echo "configure:2442: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_EDITOR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2459,7 +2483,7 @@ EOF # Extract the first word of "sendmail", so it can be a program name with args. set dummy sendmail; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2463: checking for $ac_word" >&5 +echo "configure:2487: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_MAILER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2513,7 +2537,7 @@ if test -z "$DEFAULT_MAILER" ; then # Extract the first word of "mailx", so it can be a program name with args. set dummy mailx; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2517: checking for $ac_word" >&5 +echo "configure:2541: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_MAILER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2550,7 +2574,7 @@ if test -z "$DEFAULT_MAILER" ; then # Extract the first word of "mail", so it can be a program name with args. set dummy mail; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2554: checking for $ac_word" >&5 +echo "configure:2578: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_MAILER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2584,7 +2608,7 @@ fi fi echo $ac_n "checking for default mailer""... $ac_c" 1>&6 -echo "configure:2588: checking for default mailer" >&5 +echo "configure:2612: checking for default mailer" >&5 if test -n "$DEFAULT_MAILER" ; then case $cf_cv_system_name in #(vi @@ -2611,7 +2635,7 @@ echo "$ac_t""$DEFAULT_MAILER" 1>&6 echo $ac_n "checking for incoming-mail directory""... $ac_c" 1>&6 -echo "configure:2615: checking for incoming-mail directory" >&5 +echo "configure:2639: checking for incoming-mail directory" >&5 # Check whether --with-mailbox or --without-mailbox was given. if test "${with_mailbox+set}" = set; then @@ -2657,7 +2681,7 @@ echo "$ac_t""$DEFAULT_MAILBOX" 1>&6 ## PGP Support echo $ac_n "checking if you want PGP/GPG-Support""... $ac_c" 1>&6 -echo "configure:2661: checking if you want PGP/GPG-Support" >&5 +echo "configure:2685: checking if you want PGP/GPG-Support" >&5 # Check whether --enable-pgp-gpg or --disable-pgp-gpg was given. if test "${enable_pgp_gpg+set}" = set; then @@ -2689,7 +2713,7 @@ if test "${with_pgp+set}" = set; then *) # user supplied option-value for "--with-pgp=path" echo $ac_n "checking for pgp""... $ac_c" 1>&6 -echo "configure:2693: checking for pgp" >&5 +echo "configure:2717: checking for pgp" >&5 ac_cv_path_PATH_PGP="$withval" cat >> confdefs.h <&6 -echo "configure:2710: checking for $ac_word" >&5 +echo "configure:2734: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_PGP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2764,7 +2788,7 @@ if test "${with_pgpk+set}" = set; then *) # user supplied option-value for "--with-pgpk=path" echo $ac_n "checking for pgpk""... $ac_c" 1>&6 -echo "configure:2768: checking for pgpk" >&5 +echo "configure:2792: checking for pgpk" >&5 ac_cv_path_PATH_PGPK="$withval" cat >> confdefs.h <&6 -echo "configure:2785: checking for $ac_word" >&5 +echo "configure:2809: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_PGPK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2839,7 +2863,7 @@ if test "${with_gpg+set}" = set; then *) # user supplied option-value for "--with-gpg=path" echo $ac_n "checking for gpg""... $ac_c" 1>&6 -echo "configure:2843: checking for gpg" >&5 +echo "configure:2867: checking for gpg" >&5 ac_cv_path_PATH_GPG="$withval" cat >> confdefs.h <&6 -echo "configure:2860: checking for $ac_word" >&5 +echo "configure:2884: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_GPG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2913,13 +2937,13 @@ fi echo $ac_n "checking for the default shell program""... $ac_c" 1>&6 -echo "configure:2917: checking for the default shell program" >&5 +echo "configure:2941: checking for the default shell program" >&5 cf_shell_progs="$cf_cv_default_shell" if test -z "$cf_shell_progs" ; then cf_shell_progs="sh ksh bash zsh pdksh jsh keysh ash dash" # TIN preferred default shell for BSD systems is csh. Others are sh. cat > conftest.$ac_ext < @@ -2932,7 +2956,7 @@ make an error ; return 0; } EOF -if { (eval echo configure:2936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* $cf_shell_progs="csh tcsh $cf_shell_progs" else @@ -2942,11 +2966,11 @@ fi rm -f conftest* fi -echo "(line 2946) testing paths of shell programs: $cf_shell_progs ..." 1>&5 +echo "(line 2970) testing paths of shell programs: $cf_shell_progs ..." 1>&5 if test -s /etc/shells && test `egrep -c -v '^(#| | |$)' /etc/shells` -gt 0; then -echo "(line 2950) testing /etc/shells ..." 1>&5 +echo "(line 2974) testing /etc/shells ..." 1>&5 for cf_prog in $cf_shell_progs do @@ -2981,14 +3005,14 @@ echo "(line 2950) testing /etc/shells .. echo "$ac_t""$DEFAULT_SHELL" 1>&6 else -echo "(line 2985) testing $PATH ..." 1>&5 +echo "(line 3009) testing $PATH ..." 1>&5 for ac_prog in $cf_shell_progs do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2992: checking for $ac_word" >&5 +echo "configure:3016: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_SHELL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3041,7 +3065,7 @@ EOF ### check for this early, since it'll override several options echo $ac_n "checking if NNTP-support will be used""... $ac_c" 1>&6 -echo "configure:3045: checking if NNTP-support will be used" >&5 +echo "configure:3069: checking if NNTP-support will be used" >&5 # Check whether --enable-nntp or --disable-nntp was given. if test "${enable_nntp+set}" = set; then @@ -3063,7 +3087,7 @@ echo "$ac_t""$enableval" 1>&6 USE_SPOOLDIR=yes if test "$USE_NNTP" = "yes" ; then echo $ac_n "checking whether to be NNTP_ONLY""... $ac_c" 1>&6 -echo "configure:3067: checking whether to be NNTP_ONLY" >&5 +echo "configure:3091: checking whether to be NNTP_ONLY" >&5 # Check whether --enable-nntp-only or --disable-nntp-only was given. if test "${enable_nntp_only+set}" = set; then @@ -3095,7 +3119,7 @@ fi ### use option --enable-debug to compile-in test/development code echo $ac_n "checking if you want to compile-in debug support""... $ac_c" 1>&6 -echo "configure:3099: checking if you want to compile-in debug support" >&5 +echo "configure:3123: checking if you want to compile-in debug support" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -3122,7 +3146,7 @@ echo "$ac_t""$enableval" 1>&6 ### use option --disable-echo to suppress full display compiling commands echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6 -echo "configure:3126: checking if you want to see long compiling messages" >&5 +echo "configure:3150: checking if you want to see long compiling messages" >&5 # Check whether --enable-echo or --disable-echo was given. if test "${enable_echo+set}" = set; then @@ -3167,7 +3191,7 @@ echo "$ac_t""$enableval" 1>&6 ### use option --enable-prototypes to turn on optional prototypes echo $ac_n "checking if you want to compile with fallback prototypes""... $ac_c" 1>&6 -echo "configure:3171: checking if you want to compile with fallback prototypes" >&5 +echo "configure:3195: checking if you want to compile with fallback prototypes" >&5 # Check whether --enable-prototypes or --disable-prototypes was given. if test "${enable_prototypes+set}" = set; then @@ -3191,7 +3215,7 @@ EXTRA_CFLAGS="" if test -n "$GCC" then echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6 -echo "configure:3195: checking if you want to turn on gcc warnings" >&5 +echo "configure:3219: checking if you want to turn on gcc warnings" >&5 # Check whether --enable-warnings or --disable-warnings was given. if test "${enable_warnings+set}" = set; then @@ -3217,7 +3241,7 @@ then GCC_VERSION=none if test "$GCC" = yes ; then echo $ac_n "checking version of $CC""... $ac_c" 1>&6 -echo "configure:3221: checking version of $CC" >&5 +echo "configure:3245: checking version of $CC" >&5 GCC_VERSION="`${CC} --version|sed -e '2,$d' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown echo "$ac_t""$GCC_VERSION" 1>&6 @@ -3228,11 +3252,11 @@ fi if test "$GCC" = yes then cat > conftest.$ac_ext <&6 -echo "configure:3236: checking for $CC warning options" >&5 +echo "configure:3260: checking for $CC warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" cf_warn_CONST="" @@ -3251,7 +3275,7 @@ echo "configure:3236: checking for $CC w Wundef $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:3255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:3279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 case $cf_opt in #(vi Wcast-qual) #(vi @@ -3281,7 +3305,7 @@ fi if test "$USE_SPOOLDIR" = "yes"; then ## options for directories echo $ac_n "checking for news-library path""... $ac_c" 1>&6 -echo "configure:3285: checking for news-library path" >&5 +echo "configure:3309: checking for news-library path" >&5 # Check whether --with-libdir or --without-libdir was given. if test "${with_libdir+set}" = set; then @@ -3319,7 +3343,7 @@ eval NEWSLIBDIR="$withval" echo "$ac_t""$NEWSLIBDIR" 1>&6 echo $ac_n "checking for news spool-directory path""... $ac_c" 1>&6 -echo "configure:3323: checking for news spool-directory path" >&5 +echo "configure:3347: checking for news spool-directory path" >&5 # Check whether --with-spooldir or --without-spooldir was given. if test "${with_spooldir+set}" = set; then @@ -3357,7 +3381,7 @@ eval SPOOLDIR="$withval" echo "$ac_t""$SPOOLDIR" 1>&6 echo $ac_n "checking for news overview-directory path""... $ac_c" 1>&6 -echo "configure:3361: checking for news overview-directory path" >&5 +echo "configure:3385: checking for news overview-directory path" >&5 # Check whether --with-nov-dir or --without-nov-dir was given. if test "${with_nov_dir+set}" = set; then @@ -3395,7 +3419,7 @@ eval NOVROOTDIR="$withval" echo "$ac_t""$NOVROOTDIR" 1>&6 echo $ac_n "checking for overview filename""... $ac_c" 1>&6 -echo "configure:3399: checking for overview filename" >&5 +echo "configure:3423: checking for overview filename" >&5 # Check whether --with-nov-fname or --without-nov-fname was given. if test "${with_nov_fname+set}" = set; then @@ -3431,7 +3455,7 @@ fi ## TODO: kick the --with-inews-dir= stuff, the check below should be enough ## (requires some code rework in tin) echo $ac_n "checking for directory containing \"inews\"""... $ac_c" 1>&6 -echo "configure:3435: checking for directory containing \"inews\"" >&5 +echo "configure:3459: checking for directory containing \"inews\"" >&5 # Check whether --with-inews-dir or --without-inews-dir was given. if test "${with_inews_dir+set}" = set; then @@ -3472,7 +3496,7 @@ echo "$ac_t""$INEWSDIR" 1>&6 # Extract the first word of "inews", so it can be a program name with args. set dummy inews; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3476: checking for $ac_word" >&5 +echo "configure:3500: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_INEWS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3529,7 +3553,7 @@ fi if test "$USE_SPOOLDIR" = "yes"; then ## options for libraries echo $ac_n "checking for optional INN-NNTP library""... $ac_c" 1>&6 -echo "configure:3533: checking for optional INN-NNTP library" >&5 +echo "configure:3557: checking for optional INN-NNTP library" >&5 # Check whether --with-inn-nntplib or --without-inn-nntplib was given. if test "${with_inn_nntplib+set}" = set; then @@ -3561,7 +3585,7 @@ fi ### Look for network libraries first, since some functions (such as gethostname) ### are used in a lot of places. echo $ac_n "checking if you want socks library""... $ac_c" 1>&6 -echo "configure:3565: checking if you want socks library" >&5 +echo "configure:3589: checking if you want socks library" >&5 if eval "test \"`echo '$''{'cf_cv_use_libsocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3581,7 +3605,7 @@ fi echo "$ac_t""$cf_cv_use_libsocks" 1>&6 echo $ac_n "checking if you want socks5 library""... $ac_c" 1>&6 -echo "configure:3585: checking if you want socks5 library" >&5 +echo "configure:3609: checking if you want socks5 library" >&5 if eval "test \"`echo '$''{'cf_cv_use_libsocks5'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3657,7 +3681,7 @@ cat >> confdefs.h <<\EOF EOF cat > conftest.$ac_ext < @@ -3666,7 +3690,7 @@ int main() { accept((char *)0) ; return 0; } EOF -if { (eval echo configure:3670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -3680,7 +3704,7 @@ else cf_test_netlibs=no echo $ac_n "checking for network libraries""... $ac_c" 1>&6 -echo "configure:3684: checking for network libraries" >&5 +echo "configure:3708: checking for network libraries" >&5 if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3691,12 +3715,12 @@ cf_test_netlibs=yes for ac_func in gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3695: checking for $ac_func" >&5 +echo "configure:3719: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3742,7 +3766,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:3746: checking for gethostname in -lnsl" >&5 +echo "configure:3770: checking for gethostname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3750,7 +3774,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3794,7 +3818,7 @@ else echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 -echo "configure:3798: checking for gethostname in -lsocket" >&5 +echo "configure:3822: checking for gethostname in -lsocket" >&5 ac_lib_var=`echo socket'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3802,7 +3826,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3858,7 +3882,7 @@ done # I don't know the entrypoints - 97/7/22 TD # AC_HAVE_LIBRARY(inet,cf_cv_netlibs="-linet $cf_cv_netlibs") echo $ac_n "checking for main in -linet""... $ac_c" 1>&6 -echo "configure:3862: checking for main in -linet" >&5 +echo "configure:3886: checking for main in -linet" >&5 ac_lib_var=`echo inet'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3866,14 +3890,14 @@ else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3898,12 +3922,12 @@ if test "$ac_cv_func_lsocket" != no ; th for ac_func in socket do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3902: checking for $ac_func" >&5 +echo "configure:3926: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3949,7 +3973,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:3953: checking for socket in -lsocket" >&5 +echo "configure:3977: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3957,7 +3981,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4001,7 +4025,7 @@ else echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6 -echo "configure:4005: checking for socket in -lbsd" >&5 +echo "configure:4029: checking for socket in -lbsd" >&5 ac_lib_var=`echo bsd'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4009,7 +4033,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4065,12 +4089,12 @@ fi for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4069: checking for $ac_func" >&5 +echo "configure:4093: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4116,7 +4140,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4120: checking for gethostbyname in -lnsl" >&5 +echo "configure:4144: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4124,7 +4148,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4176,12 +4200,12 @@ done for ac_func in strcasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4180: checking for $ac_func" >&5 +echo "configure:4204: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4227,7 +4251,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6 -echo "configure:4231: checking for strcasecmp in -lresolv" >&5 +echo "configure:4255: checking for strcasecmp in -lresolv" >&5 ac_lib_var=`echo resolv'_'strcasecmp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4235,7 +4259,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4318,10 +4342,10 @@ cat >> confdefs.h <<\EOF EOF echo $ac_n "checking if the socks library uses socks4 prefix""... $ac_c" 1>&6 -echo "configure:4322: checking if the socks library uses socks4 prefix" >&5 +echo "configure:4346: checking if the socks library uses socks4 prefix" >&5 cf_use_socks4=error cat > conftest.$ac_ext < @@ -4330,7 +4354,7 @@ int main() { Rinit((char *)0) ; return 0; } EOF -if { (eval echo configure:4334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define USE_SOCKS4_PREFIX 1 @@ -4342,14 +4366,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { SOCKSinit((char *)0) ; return 0; } EOF -if { (eval echo configure:4353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_use_socks4=no else @@ -4414,9 +4438,9 @@ EOF fi echo $ac_n "checking if socks5p.h is available""... $ac_c" 1>&6 -echo "configure:4418: checking if socks5p.h is available" >&5 +echo "configure:4442: checking if socks5p.h is available" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_use_socks5p_h=yes else @@ -4452,17 +4476,17 @@ for ac_hdr in unistd.h fcntl.h sys/file. do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4456: checking for $ac_hdr" >&5 +echo "configure:4480: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4489,12 +4513,12 @@ fi done echo $ac_n "checking for fcntl""... $ac_c" 1>&6 -echo "configure:4493: checking for fcntl" >&5 +echo "configure:4517: checking for fcntl" >&5 if eval "test \"`echo '$''{'ac_cv_func_fcntl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_fcntl=yes" else @@ -4537,12 +4561,12 @@ else fi echo $ac_n "checking for lockf""... $ac_c" 1>&6 -echo "configure:4541: checking for lockf" >&5 +echo "configure:4565: checking for lockf" >&5 if eval "test \"`echo '$''{'ac_cv_func_lockf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_lockf=yes" else @@ -4585,12 +4609,12 @@ else fi echo $ac_n "checking for flock""... $ac_c" 1>&6 -echo "configure:4589: checking for flock" >&5 +echo "configure:4613: checking for flock" >&5 if eval "test \"`echo '$''{'ac_cv_func_flock'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_flock=yes" else @@ -4634,7 +4658,7 @@ fi echo $ac_n "checking for file-locking functions""... $ac_c" 1>&6 -echo "configure:4638: checking for file-locking functions" >&5 +echo "configure:4662: checking for file-locking functions" >&5 if eval "test \"`echo '$''{'cf_cv_lockfile'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4646,7 +4670,7 @@ if eval 'test ${ac_cv_func_'$cf_lock'+se case $cf_lock in #(vi fcntl) #(vi cat > conftest.$ac_ext < @@ -4674,7 +4698,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4702: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4686,7 +4710,7 @@ rm -f conftest* ;; lockf) #(vi cat > conftest.$ac_ext < @@ -4706,7 +4730,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4718,7 +4742,7 @@ rm -f conftest* ;; flock) cat > conftest.$ac_ext < @@ -4741,7 +4765,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4762,7 +4786,7 @@ echo "$ac_t""$cf_cv_lockfile" 1>&6 echo $ac_n "checking which locking method should be used""... $ac_c" 1>&6 -echo "configure:4766: checking which locking method should be used" >&5 +echo "configure:4790: checking which locking method should be used" >&5 ### fcntl() is preferred, if the user just disables fcntl() ### without specifying an alternative lockf() is preferred @@ -4831,7 +4855,7 @@ fi echo $ac_n "checking for screen type""... $ac_c" 1>&6 -echo "configure:4835: checking for screen type" >&5 +echo "configure:4859: checking for screen type" >&5 # Check whether --with-screen or --without-screen was given. if test "${with_screen+set}" = set; then @@ -4847,7 +4871,7 @@ use_curses=no use_ncurses=no echo $ac_n "checking if you specified curses install-directory""... $ac_c" 1>&6 -echo "configure:4851: checking if you specified curses install-directory" >&5 +echo "configure:4875: checking if you specified curses install-directory" >&5 # Check whether --with-curses-dir or --without-curses-dir was given. @@ -4904,7 +4928,7 @@ pdcurses) #(vi ;; none) echo $ac_n "checking if you want to use ncurses library""... $ac_c" 1>&6 -echo "configure:4908: checking if you want to use ncurses library" >&5 +echo "configure:4932: checking if you want to use ncurses library" >&5 # Check whether --with-ncurses or --without-ncurses was given. if test "${with_ncurses+set}" = set; then @@ -4917,7 +4941,7 @@ fi echo "$ac_t""$use_ncurses" 1>&6 echo $ac_n "checking if you want curses rather than termcap interface""... $ac_c" 1>&6 -echo "configure:4921: checking if you want curses rather than termcap interface" >&5 +echo "configure:4945: checking if you want curses rather than termcap interface" >&5 # Check whether --enable-curses or --disable-curses was given. if test "${enable_curses+set}" = set; then @@ -4954,7 +4978,7 @@ test "$cf_cv_curses_dir" != "no" && \ CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 -echo "configure:4958: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "configure:4982: checking for $cf_ncuhdr_root header in include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4965,7 +4989,7 @@ else do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h=$cf_header @@ -5009,7 +5033,7 @@ if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 -echo "configure:5013: checking for $cf_ncuhdr_root include-path" >&5 +echo "configure:5037: checking for $cf_ncuhdr_root include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5104,14 +5128,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:5115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5138,7 +5162,7 @@ done do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h2=$cf_header @@ -5206,14 +5230,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:5217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5268,7 +5292,7 @@ esac echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:5272: checking for ncurses version" >&5 +echo "configure:5296: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5294,7 +5318,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:5298: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:5322: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -5303,7 +5327,7 @@ EOF else cat > conftest.$ac_ext < @@ -5327,7 +5351,7 @@ int main() exit(0); } EOF -if { (eval echo configure:5331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -5358,7 +5382,7 @@ cf_nculib_root=ncurses cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:5362: checking for Gpm_Open in -lgpm" >&5 +echo "configure:5386: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5366,7 +5390,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5393,7 +5417,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 -echo "configure:5397: checking for initscr in -lgpm" >&5 +echo "configure:5421: checking for initscr in -lgpm" >&5 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5401,7 +5425,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5443,7 +5467,7 @@ freebsd*) # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:5447: checking for tgoto in -lmytinfo" >&5 +echo "configure:5471: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5451,7 +5475,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5495,12 +5519,12 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:5499: checking for initscr" >&5 +echo "configure:5523: checking for initscr" >&5 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_initscr=yes" else @@ -5543,17 +5567,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:5547: checking for initscr in -l$cf_nculib_root" >&5 +echo "configure:5571: checking for initscr in -l$cf_nculib_root" >&5 LIBS="-l$cf_nculib_root $LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:5557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -5622,17 +5646,17 @@ test -d /usr && { for cf_libdir in $cf_search do echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 -echo "configure:5626: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo "configure:5650: checking for -l$cf_nculib_root in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:5636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -5663,7 +5687,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 -echo "configure:5667: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo "configure:5691: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` @@ -5672,14 +5696,14 @@ echo "configure:5667: checking if we can fi done cat > conftest.$ac_ext < int main() { initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:5683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -5706,9 +5730,9 @@ EOF for cf_hdr in stdlib.h wchar.h wctype.h do echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6 -echo "configure:5710: checking for $cf_hdr" >&5 +echo "configure:5734: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -5716,7 +5740,7 @@ echo "configure:5710: checking for $cf_h EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5743,12 +5767,12 @@ done echo $ac_n "checking for wide char and multibyte support""... $ac_c" 1>&6 -echo "configure:5747: checking for wide char and multibyte support" >&5 +echo "configure:5771: checking for wide char and multibyte support" >&5 if eval "test \"`echo '$''{'am_cv_multibyte_able'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef HAVE_STDLIB_H @@ -5784,7 +5808,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:5788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_multibyte_able=yes else @@ -5794,7 +5818,7 @@ else cf_save_LIBS="$LIBS" LIBS="-lutf8 $LIBS" cat > conftest.$ac_ext < int main() { @@ -5820,7 +5844,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:5824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_multibyte_able=libutf8 else @@ -5861,7 +5885,7 @@ test "$cf_cv_curses_dir" != "no" && \ CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 -echo "configure:5865: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "configure:5889: checking for $cf_ncuhdr_root header in include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5872,7 +5896,7 @@ else do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h=$cf_header @@ -5924,7 +5948,7 @@ if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 -echo "configure:5928: checking for $cf_ncuhdr_root include-path" >&5 +echo "configure:5952: checking for $cf_ncuhdr_root include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6019,14 +6043,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:6030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6053,7 +6077,7 @@ done do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h2=$cf_header @@ -6129,14 +6153,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:6140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6191,7 +6215,7 @@ esac echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:6195: checking for ncurses version" >&5 +echo "configure:6219: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6217,7 +6241,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:6221: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:6245: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -6226,7 +6250,7 @@ EOF else cat > conftest.$ac_ext < @@ -6250,7 +6274,7 @@ int main() exit(0); } EOF -if { (eval echo configure:6254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -6281,7 +6305,7 @@ cf_nculib_root=ncursesw cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:6285: checking for Gpm_Open in -lgpm" >&5 +echo "configure:6309: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6289,7 +6313,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6316,7 +6340,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 -echo "configure:6320: checking for initscr in -lgpm" >&5 +echo "configure:6344: checking for initscr in -lgpm" >&5 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6324,7 +6348,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6366,7 +6390,7 @@ freebsd*) # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:6370: checking for tgoto in -lmytinfo" >&5 +echo "configure:6394: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6374,7 +6398,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6418,12 +6442,12 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:6422: checking for initscr" >&5 +echo "configure:6446: checking for initscr" >&5 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_initscr=yes" else @@ -6466,17 +6490,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:6470: checking for initscr in -l$cf_nculib_root" >&5 +echo "configure:6494: checking for initscr in -l$cf_nculib_root" >&5 LIBS="-l$cf_nculib_root $LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -6545,17 +6569,17 @@ test -d /usr && { for cf_libdir in $cf_search do echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 -echo "configure:6549: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo "configure:6573: checking for -l$cf_nculib_root in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -6586,7 +6610,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 -echo "configure:6590: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo "configure:6614: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` @@ -6595,14 +6619,14 @@ echo "configure:6590: checking if we can fi done cat > conftest.$ac_ext < int main() { initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:6606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -6625,7 +6649,7 @@ EOF echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:6629: checking for ncurses version" >&5 +echo "configure:6653: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6651,7 +6675,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:6655: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:6679: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -6660,7 +6684,7 @@ EOF else cat > conftest.$ac_ext < @@ -6684,7 +6708,7 @@ int main() exit(0); } EOF -if { (eval echo configure:6688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -6707,13 +6731,13 @@ EOF echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 -echo "configure:6711: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "configure:6735: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6725,7 +6749,7 @@ int main() { getbegyx(stdscr, y1, x1) ; return 0; } EOF -if { (eval echo configure:6729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_need_xopen_extension=no else @@ -6733,7 +6757,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_need_xopen_extension=yes else @@ -6769,7 +6793,7 @@ test $cf_cv_need_xopen_extension = yes & echo $ac_n "checking for extra include directories""... $ac_c" 1>&6 -echo "configure:6773: checking for extra include directories" >&5 +echo "configure:6797: checking for extra include directories" >&5 if eval "test \"`echo '$''{'cf_cv_curses_incdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6793,7 +6817,7 @@ echo "$ac_t""$cf_cv_curses_incdir" 1>&6 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS" echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6 -echo "configure:6797: checking if we have identified curses headers" >&5 +echo "configure:6821: checking if we have identified curses headers" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6806,14 +6830,14 @@ for cf_header in \ ncurses/ncurses.h do cat > conftest.$ac_ext < int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:6817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_header=$cf_header; break else @@ -6836,17 +6860,17 @@ for ac_hdr in $cf_cv_ncurses_header do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6840: checking for $ac_hdr" >&5 +echo "configure:6864: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6877,16 +6901,16 @@ done echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6 -echo "configure:6881: checking if we have identified curses libraries" >&5 +echo "configure:6905: checking if we have identified curses libraries" >&5 cat > conftest.$ac_ext < int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:6890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -6902,7 +6926,7 @@ if test "$cf_result" = no ; then case $host_os in #(vi freebsd*) #(vi echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:6906: checking for tgoto in -lmytinfo" >&5 +echo "configure:6930: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6910,7 +6934,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6944,7 +6968,7 @@ fi ;; hpux10.*|hpux11.*) #(vi echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 -echo "configure:6948: checking for initscr in -lcur_colr" >&5 +echo "configure:6972: checking for initscr in -lcur_colr" >&5 ac_lib_var=`echo cur_colr'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6952,7 +6976,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcur_colr $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6986,7 +7010,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 -echo "configure:6990: checking for initscr in -lHcurses" >&5 +echo "configure:7014: checking for initscr in -lHcurses" >&5 ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6994,7 +7018,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lHcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7058,12 +7082,12 @@ if test ".$ac_cv_func_initscr" != .yes ; # Check for library containing tgoto. Do this before curses library # because it may be needed to link the test-case for initscr. echo $ac_n "checking for tgoto""... $ac_c" 1>&6 -echo "configure:7062: checking for tgoto" >&5 +echo "configure:7086: checking for tgoto" >&5 if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_tgoto=yes" else @@ -7107,7 +7131,7 @@ else for cf_term_lib in $cf_check_list termcap termlib unknown do echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6 -echo "configure:7111: checking for tgoto in -l$cf_term_lib" >&5 +echo "configure:7135: checking for tgoto in -l$cf_term_lib" >&5 ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7115,7 +7139,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_term_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7156,7 +7180,7 @@ fi for cf_curs_lib in $cf_check_list xcurses jcurses unknown do echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6 -echo "configure:7160: checking for initscr in -l$cf_curs_lib" >&5 +echo "configure:7184: checking for initscr in -l$cf_curs_lib" >&5 ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7164,7 +7188,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_curs_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7201,16 +7225,16 @@ fi LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown ; then echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6 -echo "configure:7205: checking if we can link with $cf_curs_lib library" >&5 +echo "configure:7229: checking if we can link with $cf_curs_lib library" >&5 cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -7226,16 +7250,16 @@ rm -f conftest* : elif test "$cf_term_lib" != predefined ; then echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6 -echo "configure:7230: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 +echo "configure:7254: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 cat > conftest.$ac_ext < int main() { initscr(); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:7239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=no else @@ -7245,14 +7269,14 @@ else LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -7273,7 +7297,7 @@ fi echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:7277: checking for ncurses version" >&5 +echo "configure:7301: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7299,7 +7323,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:7303: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:7327: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -7308,7 +7332,7 @@ EOF else cat > conftest.$ac_ext < @@ -7332,7 +7356,7 @@ int main() exit(0); } EOF -if { (eval echo configure:7336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -7355,13 +7379,13 @@ EOF echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 -echo "configure:7359: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "configure:7383: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -7373,7 +7397,7 @@ int main() { getbegyx(stdscr, y1, x1) ; return 0; } EOF -if { (eval echo configure:7377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_need_xopen_extension=no else @@ -7381,7 +7405,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_need_xopen_extension=yes else @@ -7417,7 +7441,7 @@ fi ## substitute externally-installed PCRE library for our bundled version echo $ac_n "checking if you want to use installed version of pcre""... $ac_c" 1>&6 -echo "configure:7421: checking if you want to use installed version of pcre" >&5 +echo "configure:7445: checking if you want to use installed version of pcre" >&5 # Check whether --with-pcre or --without-pcre was given. if test "${with_pcre+set}" = set; then @@ -7490,7 +7514,7 @@ fi debug_malloc=none echo $ac_n "checking if you want to link with dbmalloc for testing""... $ac_c" 1>&6 -echo "configure:7494: checking if you want to link with dbmalloc for testing" >&5 +echo "configure:7518: checking if you want to link with dbmalloc for testing" >&5 # Check whether --with-dbmalloc or --without-dbmalloc was given. if test "${with_dbmalloc+set}" = set; then @@ -7504,17 +7528,17 @@ echo "$ac_t""$with_dbmalloc" 1>&6 if test "$with_dbmalloc" = yes ; then ac_safe=`echo "dbmalloc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dbmalloc.h""... $ac_c" 1>&6 -echo "configure:7508: checking for dbmalloc.h" >&5 +echo "configure:7532: checking for dbmalloc.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7531,7 +7555,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for debug_malloc in -ldbmalloc""... $ac_c" 1>&6 -echo "configure:7535: checking for debug_malloc in -ldbmalloc" >&5 +echo "configure:7559: checking for debug_malloc in -ldbmalloc" >&5 ac_lib_var=`echo dbmalloc'_'debug_malloc | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7539,7 +7563,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldbmalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7578,7 +7602,7 @@ fi echo $ac_n "checking if you want to link with dmalloc for testing""... $ac_c" 1>&6 -echo "configure:7582: checking if you want to link with dmalloc for testing" >&5 +echo "configure:7606: checking if you want to link with dmalloc for testing" >&5 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then @@ -7592,17 +7616,17 @@ echo "$ac_t""$with_dmalloc" 1>&6 if test "$with_dmalloc" = yes ; then ac_safe=`echo "dmalloc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dmalloc.h""... $ac_c" 1>&6 -echo "configure:7596: checking for dmalloc.h" >&5 +echo "configure:7620: checking for dmalloc.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7619,7 +7643,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for dmalloc_debug in -ldmalloc""... $ac_c" 1>&6 -echo "configure:7623: checking for dmalloc_debug in -ldmalloc" >&5 +echo "configure:7647: checking for dmalloc_debug in -ldmalloc" >&5 ac_lib_var=`echo dmalloc'_'dmalloc_debug | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7627,7 +7651,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldmalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7666,7 +7690,7 @@ fi echo $ac_n "checking if you want debugging-trace""... $ac_c" 1>&6 -echo "configure:7670: checking if you want debugging-trace" >&5 +echo "configure:7694: checking if you want debugging-trace" >&5 # Check whether --with-trace or --without-trace was given. if test "${with_trace+set}" = set; then @@ -7684,12 +7708,12 @@ EOF EXTRAOBJS="$EXTRAOBJS trace.o" echo $ac_n "checking for _tracef""... $ac_c" 1>&6 -echo "configure:7688: checking for _tracef" >&5 +echo "configure:7712: checking for _tracef" >&5 if eval "test \"`echo '$''{'ac_cv_func__tracef'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__tracef=yes" else @@ -7734,7 +7758,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for _tracef in -l${cf_with_screen}_g""... $ac_c" 1>&6 -echo "configure:7738: checking for _tracef in -l${cf_with_screen}_g" >&5 +echo "configure:7762: checking for _tracef in -l${cf_with_screen}_g" >&5 ac_lib_var=`echo ${cf_with_screen}_g'_'_tracef | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7742,7 +7766,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l${cf_with_screen}_g $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7785,7 +7809,7 @@ fi ## options for miscellaneous definitions echo $ac_n "checking for domain-name""... $ac_c" 1>&6 -echo "configure:7789: checking for domain-name" >&5 +echo "configure:7813: checking for domain-name" >&5 # Check whether --with-domain-name or --without-domain-name was given. if test "${with_domain_name+set}" = set; then @@ -7814,7 +7838,7 @@ echo "$ac_t""$DOMAIN_NAME" 1>&6 if test "$USE_NNTP" = "yes" ; then echo $ac_n "checking for NNTP default-server""... $ac_c" 1>&6 -echo "configure:7818: checking for NNTP default-server" >&5 +echo "configure:7842: checking for NNTP default-server" >&5 # Check whether --with-nntp-default-server or --without-nntp-default-server was given. if test "${with_nntp_default_server+set}" = set; then @@ -7880,7 +7904,7 @@ EOF ## optional features echo $ac_n "checking whether to use MH style mail handling for mailgroups""... $ac_c" 1>&6 -echo "configure:7884: checking whether to use MH style mail handling for mailgroups" >&5 +echo "configure:7908: checking whether to use MH style mail handling for mailgroups" >&5 # Check whether --enable-mh-mail-handling or --disable-mh-mail-handling was given. if test "${enable_mh_mail_handling+set}" = set; then @@ -7899,7 +7923,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable 8-bit keycodes""... $ac_c" 1>&6 -echo "configure:7903: checking whether to enable 8-bit keycodes" >&5 +echo "configure:7927: checking whether to enable 8-bit keycodes" >&5 # Check whether --enable-8bit-keys or --disable-8bit-keys was given. if test "${enable_8bit_keys+set}" = set; then @@ -7925,7 +7949,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable ANSI-color""... $ac_c" 1>&6 -echo "configure:7929: checking whether to enable ANSI-color" >&5 +echo "configure:7953: checking whether to enable ANSI-color" >&5 # Check whether --enable-color or --disable-color was given. if test "${enable_color+set}" = set; then @@ -7942,7 +7966,7 @@ use_color=$enableval echo "$ac_t""$use_color" 1>&6 echo $ac_n "checking whether to enable posting-etiquette""... $ac_c" 1>&6 -echo "configure:7946: checking whether to enable posting-etiquette" >&5 +echo "configure:7970: checking whether to enable posting-etiquette" >&5 # Check whether --enable-etiquette or --disable-etiquette was given. if test "${enable_etiquette+set}" = set; then @@ -7961,7 +7985,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to strictly observe RFC2047 and break long lines""... $ac_c" 1>&6 -echo "configure:7965: checking whether to strictly observe RFC2047 and break long lines" >&5 +echo "configure:7989: checking whether to strictly observe RFC2047 and break long lines" >&5 # Check whether --enable-break-long-lines or --disable-break-long-lines was given. if test "${enable_break_long_lines+set}" = set; then @@ -7980,7 +8004,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to force MM_CHARSET obeyance when decoding mime""... $ac_c" 1>&6 -echo "configure:7984: checking whether to force MM_CHARSET obeyance when decoding mime" >&5 +echo "configure:8008: checking whether to force MM_CHARSET obeyance when decoding mime" >&5 # Check whether --enable-mime-strict-charset or --disable-mime-strict-charset was given. if test "${enable_mime_strict_charset+set}" = set; then @@ -8006,7 +8030,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking for MIME character-set""... $ac_c" 1>&6 -echo "configure:8010: checking for MIME character-set" >&5 +echo "configure:8034: checking for MIME character-set" >&5 # Check whether --with-mime-default-charset or --without-mime-default-charset was given. if test "${with_mime_default_charset+set}" = set; then @@ -8028,7 +8052,7 @@ EOF echo "$ac_t""$MM_CHARSET" 1>&6 echo $ac_n "checking for default ISO/ASCII table""... $ac_c" 1>&6 -echo "configure:8032: checking for default ISO/ASCII table" >&5 +echo "configure:8056: checking for default ISO/ASCII table" >&5 # Check whether --with-iso-to-ascii or --without-iso-to-ascii was given. if test "${with_iso_to_ascii+set}" = set; then @@ -8050,7 +8074,7 @@ EOF echo "$ac_t""$DEFAULT_ISO2ASC" 1>&6 echo $ac_n "checking whether to enable locale support""... $ac_c" 1>&6 -echo "configure:8054: checking whether to enable locale support" >&5 +echo "configure:8078: checking whether to enable locale support" >&5 # Check whether --enable-locale or --disable-locale was given. if test "${enable_locale+set}" = set; then @@ -8069,7 +8093,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable posting""... $ac_c" 1>&6 -echo "configure:8073: checking whether to enable posting" >&5 +echo "configure:8097: checking whether to enable posting" >&5 # Check whether --enable-posting or --disable-posting was given. if test "${enable_posting+set}" = set; then @@ -8088,7 +8112,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable shell escape""... $ac_c" 1>&6 -echo "configure:8092: checking whether to enable shell escape" >&5 +echo "configure:8116: checking whether to enable shell escape" >&5 # Check whether --enable-shell-escape or --disable-shell-escape was given. if test "${enable_shell_escape+set}" = set; then @@ -8107,7 +8131,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to have fascist newsadmin""... $ac_c" 1>&6 -echo "configure:8111: checking whether to have fascist newsadmin" >&5 +echo "configure:8135: checking whether to have fascist newsadmin" >&5 # Check whether --enable-fascist-newsadmin or --disable-fascist-newsadmin was given. if test "${enable_fascist_newsadmin+set}" = set; then @@ -8126,7 +8150,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable inverse video and highlighting""... $ac_c" 1>&6 -echo "configure:8130: checking whether to enable inverse video and highlighting" >&5 +echo "configure:8154: checking whether to enable inverse video and highlighting" >&5 # Check whether --enable-inverse-video or --disable-inverse-video was given. if test "${enable_inverse_video+set}" = set; then @@ -8145,7 +8169,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable piping support""... $ac_c" 1>&6 -echo "configure:8149: checking whether to enable piping support" >&5 +echo "configure:8173: checking whether to enable piping support" >&5 # Check whether --enable-piping or --disable-piping was given. if test "${enable_piping+set}" = set; then @@ -8164,7 +8188,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable printer support""... $ac_c" 1>&6 -echo "configure:8168: checking whether to enable printer support" >&5 +echo "configure:8192: checking whether to enable printer support" >&5 # Check whether --enable-printing or --disable-printing was given. if test "${enable_printing+set}" = set; then @@ -8183,7 +8207,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to unique tmp-files by appending .pid""... $ac_c" 1>&6 -echo "configure:8187: checking whether to unique tmp-files by appending .pid" >&5 +echo "configure:8211: checking whether to unique tmp-files by appending .pid" >&5 # Check whether --enable-append-pid or --disable-append-pid was given. if test "${enable_append_pid+set}" = set; then @@ -8209,7 +8233,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to fallback to XHDR XREF if XOVER isn't supported""... $ac_c" 1>&6 -echo "configure:8213: checking whether to fallback to XHDR XREF if XOVER isn't supported" >&5 +echo "configure:8237: checking whether to fallback to XHDR XREF if XOVER isn't supported" >&5 # Check whether --enable-xhdr-xref or --disable-xhdr-xref was given. if test "${enable_xhdr_xref+set}" = set; then @@ -8236,7 +8260,7 @@ echo "$ac_t""$enableval" 1>&6 ### bypass a bug in old versions of leafnode & NNTPcache echo $ac_n "checking whether to send a GROUP command before a LISTGROUP""... $ac_c" 1>&6 -echo "configure:8240: checking whether to send a GROUP command before a LISTGROUP" >&5 +echo "configure:8264: checking whether to send a GROUP command before a LISTGROUP" >&5 # Check whether --enable-broken-listgroup-fix or --disable-broken-listgroup-fix was given. if test "${enable_broken_listgroup_fix+set}" = set; then @@ -8256,7 +8280,7 @@ echo "$ac_t""$enableval" 1>&6 ### on some old systems the WIFEXITED()/WEXITSTATUS() macros do not work echo $ac_n "checking whether to ignore system()s return value""... $ac_c" 1>&6 -echo "configure:8260: checking whether to ignore system()s return value" >&5 +echo "configure:8284: checking whether to ignore system()s return value" >&5 # Check whether --enable-broken-system-fix or --disable-broken-system-fix was given. if test "${enable_broken_system_fix+set}" = set; then @@ -8276,7 +8300,7 @@ echo "$ac_t""$enableval" 1>&6 ### checks for the location of the system-wide default setting file echo $ac_n "checking for directory containing tin.defaults file""... $ac_c" 1>&6 -echo "configure:8280: checking for directory containing tin.defaults file" >&5 +echo "configure:8304: checking for directory containing tin.defaults file" >&5 # Check whether --with-defaults-dir or --without-defaults-dir was given. if test "${with_defaults_dir+set}" = set; then @@ -8319,7 +8343,7 @@ EOF ### check for ipv6 support echo $ac_n "checking whether to enable IPv6""... $ac_c" 1>&6 -echo "configure:8323: checking whether to enable IPv6" >&5 +echo "configure:8347: checking whether to enable IPv6" >&5 # Check whether --enable-ipv6 or --disable-ipv6 was given. if test "${enable_ipv6+set}" = set; then @@ -8340,7 +8364,7 @@ if test "$enableval" = "yes"; then echo $ac_n "checking ipv6 stack type""... $ac_c" 1>&6 -echo "configure:8344: checking ipv6 stack type" >&5 +echo "configure:8368: checking ipv6 stack type" >&5 if eval "test \"`echo '$''{'cf_cv_ipv6type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8360,7 +8384,7 @@ do ;; inria) #(vi cat > conftest.$ac_ext < @@ -8378,7 +8402,7 @@ rm -f conftest* ;; kame) #(vi cat > conftest.$ac_ext < @@ -8396,7 +8420,7 @@ rm -f conftest* ;; linux-glibc) #(vi cat > conftest.$ac_ext < @@ -8423,7 +8447,7 @@ rm -f conftest* ;; toshiba) #(vi cat > conftest.$ac_ext < @@ -8441,7 +8465,7 @@ rm -f conftest* ;; v6d) #(vi cat > conftest.$ac_ext < @@ -8459,7 +8483,7 @@ rm -f conftest* ;; zeta) cat > conftest.$ac_ext < @@ -8492,7 +8516,7 @@ cf_ipv6lib=none cf_ipv6dir=none echo $ac_n "checking for IPv6 library if required""... $ac_c" 1>&6 -echo "configure:8496: checking for IPv6 library if required" >&5 +echo "configure:8520: checking for IPv6 library if required" >&5 case $cf_cv_ipv6type in #(vi solaris) #(vi ;; @@ -8526,7 +8550,7 @@ echo "$ac_t""$cf_ipv6lib" 1>&6 if test "$cf_ipv6lib" != "none"; then cat > conftest.$ac_ext < @@ -8537,7 +8561,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:8541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -8634,12 +8658,12 @@ rm -f conftest* eval 'cf_cv_have_lib_'$cf_ipv6lib'=no' cf_libdir="" echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 -echo "configure:8638: checking for getaddrinfo" >&5 +echo "configure:8662: checking for getaddrinfo" >&5 if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getaddrinfo=yes" else @@ -8682,10 +8706,10 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for getaddrinfo in -l$cf_ipv6lib""... $ac_c" 1>&6 -echo "configure:8686: checking for getaddrinfo in -l$cf_ipv6lib" >&5 +echo "configure:8710: checking for getaddrinfo in -l$cf_ipv6lib" >&5 LIBS="-l$cf_ipv6lib $LIBS" cat > conftest.$ac_ext < @@ -8696,7 +8720,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:8700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' @@ -8765,10 +8789,10 @@ test -d /usr && { for cf_libdir in $cf_search do echo $ac_n "checking for -l$cf_ipv6lib in $cf_libdir""... $ac_c" 1>&6 -echo "configure:8769: checking for -l$cf_ipv6lib in $cf_libdir" >&5 +echo "configure:8793: checking for -l$cf_ipv6lib in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS" cat > conftest.$ac_ext < @@ -8779,7 +8803,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:8783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' @@ -8812,7 +8836,7 @@ fi echo $ac_n "checking working getaddrinfo""... $ac_c" 1>&6 -echo "configure:8816: checking working getaddrinfo" >&5 +echo "configure:8840: checking working getaddrinfo" >&5 if eval "test \"`echo '$''{'cf_cv_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8821,7 +8845,7 @@ if test "$cross_compiling" = yes; then cf_cv_getaddrinfo=unknown else cat > conftest.$ac_ext < @@ -8900,7 +8924,7 @@ int main() } EOF -if { (eval echo configure:8904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_getaddrinfo=yes else @@ -8944,12 +8968,12 @@ fi for ac_func in getaddrinfo getnameinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8948: checking for $ac_func" >&5 +echo "configure:8972: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9001,7 +9025,7 @@ done ### checks for operator characteristics (should be the last option) echo $ac_n "checking whether to make a coffee while compiling""... $ac_c" 1>&6 -echo "configure:9005: checking whether to make a coffee while compiling" >&5 +echo "configure:9029: checking whether to make a coffee while compiling" >&5 # Check whether --with-coffee or --without-coffee was given. if test "${with_coffee+set}" = set; then @@ -9026,7 +9050,7 @@ fi ### checks for compiler characteristics echo $ac_n "checking for makeflags variable""... $ac_c" 1>&6 -echo "configure:9030: checking for makeflags variable" >&5 +echo "configure:9054: checking for makeflags variable" >&5 if eval "test \"`echo '$''{'cf_cv_makeflags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9071,12 +9095,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:9075: checking for working const" >&5 +echo "configure:9099: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -9146,21 +9170,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:9150: checking for inline" >&5 +echo "configure:9174: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -9187,13 +9211,13 @@ esac echo $ac_n "checking for ansi token expansion/substitution""... $ac_c" 1>&6 -echo "configure:9191: checking for ansi token expansion/substitution" >&5 +echo "configure:9215: checking for ansi token expansion/substitution" >&5 if eval "test \"`echo '$''{'cf_cv_cpp_expands'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_cpp_expands=yes else @@ -9222,13 +9246,13 @@ EOF echo $ac_n "checking for ansi token concatenation""... $ac_c" 1>&6 -echo "configure:9226: checking for ansi token concatenation" >&5 +echo "configure:9250: checking for ansi token concatenation" >&5 if eval "test \"`echo '$''{'cf_cv_cpp_concats'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_cpp_concats=yes else @@ -9257,20 +9281,20 @@ EOF echo $ac_n "checking if nested parameters work""... $ac_c" 1>&6 -echo "configure:9261: checking if nested parameters work" >&5 +echo "configure:9285: checking if nested parameters work" >&5 if eval "test \"`echo '$''{'cf_cv_nested_params'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_nested_params=yes else @@ -9293,12 +9317,12 @@ EOF ### Checks for header files. echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:9297: checking for ANSI C header files" >&5 +echo "configure:9321: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -9306,7 +9330,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9323,7 +9347,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -9341,7 +9365,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -9362,7 +9386,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -9373,7 +9397,7 @@ if (XOR (islower (i), ISLOWER (i)) || to exit (0); } EOF -if { (eval echo configure:9377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -9401,12 +9425,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/di do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:9405: checking for $ac_hdr that defines DIR" >&5 +echo "configure:9429: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -9414,7 +9438,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:9418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -9439,7 +9463,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:9443: checking for opendir in -ldir" >&5 +echo "configure:9467: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9447,7 +9471,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9480,7 +9504,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:9484: checking for opendir in -lx" >&5 +echo "configure:9508: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9488,7 +9512,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9522,12 +9546,12 @@ fi fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:9526: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:9550: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -9536,7 +9560,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:9540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -9557,12 +9581,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:9561: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:9585: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -9578,7 +9602,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:9582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -9657,9 +9681,9 @@ for cf_hdr in \ do echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6 -echo "configure:9661: checking for $cf_hdr" >&5 +echo "configure:9685: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -9667,7 +9691,7 @@ echo "configure:9661: checking for $cf_h EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9671: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9703,17 +9727,17 @@ unistd.h \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9707: checking for $ac_hdr" >&5 +echo "configure:9731: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9744,17 +9768,17 @@ if test "$ISC" = yes ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9748: checking for $ac_hdr" >&5 +echo "configure:9772: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9789,16 +9813,16 @@ if test "$ac_cv_header_termios_h" = yes esac if test "$termios_bad" = maybe ; then echo $ac_n "checking whether termios.h needs _POSIX_SOURCE""... $ac_c" 1>&6 -echo "configure:9793: checking whether termios.h needs _POSIX_SOURCE" >&5 +echo "configure:9817: checking whether termios.h needs _POSIX_SOURCE" >&5 cat > conftest.$ac_ext < int main() { struct termios foo; int x = foo.c_iflag ; return 0; } EOF -if { (eval echo configure:9802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* termios_bad=no else @@ -9807,7 +9831,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* termios_bad=unknown else @@ -9839,7 +9863,7 @@ fi echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6 -echo "configure:9843: checking declaration of size-change" >&5 +echo "configure:9867: checking declaration of size-change" >&5 if eval "test \"`echo '$''{'cf_cv_sizechange'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9853,7 +9877,7 @@ do CPPFLAGS="$cf_save_CPPFLAGS" test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" cat > conftest.$ac_ext < #ifdef HAVE_TERMIOS_H @@ -9892,7 +9916,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sizechange=yes else @@ -9931,7 +9955,7 @@ fi echo $ac_n "checking if sys/time.h conflicts with sys/select.h""... $ac_c" 1>&6 -echo "configure:9935: checking if sys/time.h conflicts with sys/select.h" >&5 +echo "configure:9959: checking if sys/time.h conflicts with sys/select.h" >&5 if eval "test \"`echo '$''{'cf_cv_sys_select_timeval'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9939,7 +9963,7 @@ else for cf_opts in no yes do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sys_select_timeval=$cf_opts break @@ -9991,12 +10015,12 @@ EOF ### Checks for Datatypes. echo $ac_n "checking for gid_t""... $ac_c" 1>&6 -echo "configure:9995: checking for gid_t" >&5 +echo "configure:10019: checking for gid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_gid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10024,12 +10048,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:10028: checking for mode_t" >&5 +echo "configure:10052: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10057,12 +10081,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:10061: checking for off_t" >&5 +echo "configure:10085: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10090,12 +10114,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:10094: checking for pid_t" >&5 +echo "configure:10118: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10123,12 +10147,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:10127: checking for size_t" >&5 +echo "configure:10151: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10156,12 +10180,12 @@ EOF fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:10160: checking for ssize_t" >&5 +echo "configure:10184: checking for ssize_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10189,12 +10213,12 @@ EOF fi echo $ac_n "checking for time_t""... $ac_c" 1>&6 -echo "configure:10193: checking for time_t" >&5 +echo "configure:10217: checking for time_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10222,12 +10246,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:10226: checking for uid_t in sys/types.h" >&5 +echo "configure:10250: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -10257,9 +10281,9 @@ fi echo $ac_n "checking for quad_t""... $ac_c" 1>&6 -echo "configure:10261: checking for quad_t" >&5 +echo "configure:10285: checking for quad_t" >&5 cat > conftest.$ac_ext < @@ -10272,7 +10296,7 @@ int main() { quad_t x; x = 0 ; return 0; } EOF -if { (eval echo configure:10276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_quad_t=yes else @@ -10291,9 +10315,9 @@ EOF fi echo $ac_n "checking for long long""... $ac_c" 1>&6 -echo "configure:10295: checking for long long" >&5 +echo "configure:10319: checking for long long" >&5 cat > conftest.$ac_ext < @@ -10302,7 +10326,7 @@ int main() { long long x; x = 0 ; return 0; } EOF -if { (eval echo configure:10306: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_long_long=yes else @@ -10321,9 +10345,9 @@ EOF fi echo $ac_n "checking for nl_item""... $ac_c" 1>&6 -echo "configure:10325: checking for nl_item" >&5 +echo "configure:10349: checking for nl_item" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_nl_item=yes else @@ -10360,7 +10384,7 @@ fi # libuu/uudeview # only define HAVE_LIBUU and HAVE_UUDEVIEW_H if both are found echo $ac_n "checking for UUInitialize in -luu""... $ac_c" 1>&6 -echo "configure:10364: checking for UUInitialize in -luu" >&5 +echo "configure:10388: checking for UUInitialize in -luu" >&5 ac_lib_var=`echo uu'_'UUInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10368,7 +10392,7 @@ else ac_save_LIBS="$LIBS" LIBS="-luu $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10396,17 +10420,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l echo "$ac_t""yes" 1>&6 ac_safe=`echo "uudeview.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for uudeview.h""... $ac_c" 1>&6 -echo "configure:10400: checking for uudeview.h" >&5 +echo "configure:10424: checking for uudeview.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10444,7 +10468,7 @@ fi # libidn - Internationalized Domain Names echo $ac_n "checking for stringprep_check_version in -lidn""... $ac_c" 1>&6 -echo "configure:10448: checking for stringprep_check_version in -lidn" >&5 +echo "configure:10472: checking for stringprep_check_version in -lidn" >&5 ac_lib_var=`echo idn'_'stringprep_check_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10452,7 +10476,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lidn $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10480,17 +10504,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l echo "$ac_t""yes" 1>&6 ac_safe=`echo "stringprep.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for stringprep.h""... $ac_c" 1>&6 -echo "configure:10484: checking for stringprep.h" >&5 +echo "configure:10508: checking for stringprep.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10513,17 +10537,17 @@ EOF ac_safe=`echo "idna.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for idna.h""... $ac_c" 1>&6 -echo "configure:10517: checking for idna.h" >&5 +echo "configure:10541: checking for idna.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10551: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10545,7 +10569,7 @@ if eval "test \"`echo '$ac_cv_header_'$a EOF echo $ac_n "checking for idna_to_unicode_lzlz in -lidn""... $ac_c" 1>&6 -echo "configure:10549: checking for idna_to_unicode_lzlz in -lidn" >&5 +echo "configure:10573: checking for idna_to_unicode_lzlz in -lidn" >&5 ac_lib_var=`echo idn'_'idna_to_unicode_lzlz | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10553,7 +10577,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lidn $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10585,9 +10609,9 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l EOF echo $ac_n "checking for IDNA_USE_STD3_ASCII_RULES""... $ac_c" 1>&6 -echo "configure:10589: checking for IDNA_USE_STD3_ASCII_RULES" >&5 +echo "configure:10613: checking for IDNA_USE_STD3_ASCII_RULES" >&5 cat > conftest.$ac_ext < EOF @@ -10636,17 +10660,17 @@ fi # ICU - International Components for Unicode ac_safe=`echo "unicode/unorm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for unicode/unorm.h""... $ac_c" 1>&6 -echo "configure:10640: checking for unicode/unorm.h" >&5 +echo "configure:10664: checking for unicode/unorm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10650: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10665,17 +10689,17 @@ if eval "test \"`echo '$ac_cv_header_'$a ac_safe=`echo "unicode/ustring.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for unicode/ustring.h""... $ac_c" 1>&6 -echo "configure:10669: checking for unicode/ustring.h" >&5 +echo "configure:10693: checking for unicode/ustring.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10703: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10701,12 +10725,12 @@ EOF EOF echo $ac_n "checking for unorm_normalize in libicuuc""... $ac_c" 1>&6 -echo "configure:10705: checking for unorm_normalize in libicuuc" >&5 +echo "configure:10729: checking for unorm_normalize in libicuuc" >&5 cf_save_LIBS="$LIBS" cf_try_icuuc="no" LIBS="$LIBS -licuuc" cat > conftest.$ac_ext < int main() { @@ -10716,7 +10740,7 @@ int main() { needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status); ; return 0; } EOF -if { (eval echo configure:10720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -10735,17 +10759,17 @@ rm -f conftest* echo "$ac_t""$cf_try_icuuc" 1>&6 ac_safe=`echo "unicode/ubidi.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for unicode/ubidi.h""... $ac_c" 1>&6 -echo "configure:10739: checking for unicode/ubidi.h" >&5 +echo "configure:10763: checking for unicode/ubidi.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10792,24 +10816,24 @@ else cf_cv_termlib=none cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_termlib=terminfo else @@ -10838,16 +10862,16 @@ if test "$cf_cv_termlib" = none; then for cf_func in tigetstr tgetstr do echo $ac_n "checking for $cf_func in -l$cf_lib""... $ac_c" 1>&6 -echo "configure:10842: checking for $cf_func in -l$cf_lib" >&5 +echo "configure:10866: checking for $cf_func in -l$cf_lib" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -10874,7 +10898,7 @@ fi if test "$cf_cv_termlib" = none; then # allow curses library for broken AIX system. echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6 -echo "configure:10878: checking for initscr in -lcurses" >&5 +echo "configure:10902: checking for initscr in -lcurses" >&5 ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10882,7 +10906,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10914,7 +10938,7 @@ else fi echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:10918: checking for tgoto in -ltermcap" >&5 +echo "configure:10942: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10922,7 +10946,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10966,11 +10990,11 @@ fi # terminfo-based termcap interfaces may be prototyped in , # which may/may not be compatible with echo $ac_n "checking if we should include termcap.h""... $ac_c" 1>&6 -echo "configure:10970: checking if we should include termcap.h" >&5 +echo "configure:10994: checking if we should include termcap.h" >&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -I$srcdir/include" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -11001,7 +11025,7 @@ EOF echo $ac_n "checking for term.h""... $ac_c" 1>&6 -echo "configure:11005: checking for term.h" >&5 +echo "configure:11029: checking for term.h" >&5 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11014,7 +11038,7 @@ for cf_header in \ term.h do cat > conftest.$ac_ext < @@ -11023,7 +11047,7 @@ int main() { WINDOW *x ; return 0; } EOF -if { (eval echo configure:11027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header=$cf_header break @@ -11064,7 +11088,7 @@ esac echo $ac_n "checking if we should include curses.h or termcap.h""... $ac_c" 1>&6 -echo "configure:11068: checking if we should include curses.h or termcap.h" >&5 +echo "configure:11092: checking if we should include curses.h or termcap.h" >&5 if eval "test \"`echo '$''{'cf_cv_need_curses_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11082,7 +11106,7 @@ do test -n "$cf_t_opts" && CPPFLAGS="$CPPFLAGS -D$cf_t_opts" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* test "$cf_cv_need_curses_h" = no && { cf_cv_need_curses_h=maybe @@ -11103,7 +11127,7 @@ else rm -rf conftest* echo "Recompiling with corrected call (C:$cf_c_opts, T:$cf_t_opts)" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_need_curses_h=yes cf_ok_c_opts=$cf_c_opts @@ -11187,7 +11211,7 @@ esac echo $ac_n "checking declaration of tputs 3rd param""... $ac_c" 1>&6 -echo "configure:11191: checking declaration of tputs 3rd param" >&5 +echo "configure:11215: checking declaration of tputs 3rd param" >&5 if eval "test \"`echo '$''{'cf_cv_type_outchar'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11203,10 +11227,10 @@ for Q in int void; do for R in int char; do for S in "" const; do -echo "(line 11207) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 +echo "(line 11231) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_outchar="$Q OutChar($R)" cf_cv_found=yes @@ -11270,14 +11294,14 @@ EOF elif test ".$cf_cv_termlib" = .termcap ; then # BSD 'tputs()' may need 'PC' to be set. cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_EXTERN_TCAP_PC 1 @@ -11296,13 +11320,13 @@ fi echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6 -echo "configure:11300: checking if external errno is declared" >&5 +echo "configure:11324: checking if external errno is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_errno=yes else @@ -11343,13 +11367,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external errno exists""... $ac_c" 1>&6 -echo "configure:11347: checking if external errno exists" >&5 +echo "configure:11371: checking if external errno exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_errno=yes else @@ -11391,12 +11415,12 @@ fi for ac_func in strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11395: checking for $ac_func" >&5 +echo "configure:11419: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11446,13 +11470,13 @@ else echo $ac_n "checking if external sys_nerr is declared""... $ac_c" 1>&6 -echo "configure:11450: checking if external sys_nerr is declared" >&5 +echo "configure:11474: checking if external sys_nerr is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_sys_nerr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_sys_nerr=yes else @@ -11493,13 +11517,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external sys_nerr exists""... $ac_c" 1>&6 -echo "configure:11497: checking if external sys_nerr exists" >&5 +echo "configure:11521: checking if external sys_nerr exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_sys_nerr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_sys_nerr=yes else @@ -11538,13 +11562,13 @@ fi echo $ac_n "checking if external sys_errlist is declared""... $ac_c" 1>&6 -echo "configure:11542: checking if external sys_errlist is declared" >&5 +echo "configure:11566: checking if external sys_errlist is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_sys_errlist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_sys_errlist=yes else @@ -11585,13 +11609,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external sys_errlist exists""... $ac_c" 1>&6 -echo "configure:11589: checking if external sys_errlist exists" >&5 +echo "configure:11613: checking if external sys_errlist exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_sys_errlist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_sys_errlist=yes else @@ -11646,6 +11670,7 @@ for ac_func in \ fdopen \ fork \ ftime \ + ftruncate \ getcwd \ gettimeofday \ getwd \ @@ -11695,12 +11720,12 @@ for ac_func in \ $cf_tc_funcs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11699: checking for $ac_func" >&5 +echo "configure:11724: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11749,12 +11774,12 @@ done echo $ac_n "checking for flock""... $ac_c" 1>&6 -echo "configure:11753: checking for flock" >&5 +echo "configure:11778: checking for flock" >&5 if eval "test \"`echo '$''{'ac_cv_func_flock'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_flock=yes" else @@ -11799,7 +11824,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for flock in -lbsd""... $ac_c" 1>&6 -echo "configure:11803: checking for flock in -lbsd" >&5 +echo "configure:11828: checking for flock in -lbsd" >&5 ac_lib_var=`echo bsd'_'flock | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11807,7 +11832,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11847,12 +11872,12 @@ fi echo $ac_n "checking for wide char and multibyte support""... $ac_c" 1>&6 -echo "configure:11851: checking for wide char and multibyte support" >&5 +echo "configure:11876: checking for wide char and multibyte support" >&5 if eval "test \"`echo '$''{'am_cv_multibyte_able'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef HAVE_STDLIB_H @@ -11888,7 +11913,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:11892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_multibyte_able=yes else @@ -11898,7 +11923,7 @@ else cf_save_LIBS="$LIBS" LIBS="-lutf8 $LIBS" cat > conftest.$ac_ext < int main() { @@ -11924,7 +11949,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:11928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_multibyte_able=libutf8 else @@ -11958,9 +11983,9 @@ EOF echo $ac_n "checking if gettimeofday takes two arguments""... $ac_c" 1>&6 -echo "configure:11962: checking if gettimeofday takes two arguments" >&5 +echo "configure:11987: checking if gettimeofday takes two arguments" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_gettimeofday_2args=yes else @@ -11991,12 +12016,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:11995: checking return type of signal handlers" >&5 +echo "configure:12020: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -12013,7 +12038,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:12017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -12033,7 +12058,7 @@ EOF echo $ac_n "checking declaration of signal arguments""... $ac_c" 1>&6 -echo "configure:12037: checking declaration of signal arguments" >&5 +echo "configure:12062: checking declaration of signal arguments" >&5 if eval "test \"`echo '$''{'cf_cv_sig_args'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12042,7 +12067,7 @@ cf_cv_sig_args= for cf_test in "int sig" "int sig, ..." do cat > conftest.$ac_ext < @@ -12050,7 +12075,7 @@ int main() { extern RETSIGTYPE catch($cf_test); signal(SIGINT, catch) ; return 0; } EOF -if { (eval echo configure:12054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sig_args="$cf_test";break else @@ -12076,13 +12101,13 @@ EOF if test "$ac_cv_func_sigaction" = yes; then echo $ac_n "checking whether sigaction needs _POSIX_SOURCE""... $ac_c" 1>&6 -echo "configure:12080: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "configure:12105: checking whether sigaction needs _POSIX_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_sigact_bad'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -12091,7 +12116,7 @@ int main() { struct sigaction act ; return 0; } EOF -if { (eval echo configure:12095: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sigact_bad=no else @@ -12112,13 +12137,13 @@ EOF echo $ac_n "checking if we have sigaction/related functions""... $ac_c" 1>&6 -echo "configure:12116: checking if we have sigaction/related functions" >&5 +echo "configure:12141: checking if we have sigaction/related functions" >&5 if eval "test \"`echo '$''{'cf_cv_sigaction_funcs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_sigaction_funcs=yes else @@ -12158,7 +12183,7 @@ EOF fi echo $ac_n "checking for fork""... $ac_c" 1>&6 -echo "configure:12162: checking for fork" >&5 +echo "configure:12187: checking for fork" >&5 if eval "test \"`echo '$''{'cf_cv_func_fork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12167,7 +12192,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_fork=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_func_fork=yes else @@ -12199,12 +12224,12 @@ EOF echo $ac_n "checking for memmove""... $ac_c" 1>&6 -echo "configure:12203: checking for memmove" >&5 +echo "configure:12228: checking for memmove" >&5 if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_memmove=yes" else @@ -12246,12 +12271,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for bcopy""... $ac_c" 1>&6 -echo "configure:12250: checking for bcopy" >&5 +echo "configure:12275: checking for bcopy" >&5 if eval "test \"`echo '$''{'ac_cv_func_bcopy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_bcopy=yes" else @@ -12290,7 +12315,7 @@ if eval "test \"`echo '$ac_cv_func_'bcop echo "$ac_t""yes" 1>&6 echo $ac_n "checking if bcopy does overlapping moves""... $ac_c" 1>&6 -echo "configure:12294: checking if bcopy does overlapping moves" >&5 +echo "configure:12319: checking if bcopy does overlapping moves" >&5 if eval "test \"`echo '$''{'cf_cv_good_bcopy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12299,7 +12324,7 @@ else cf_cv_good_bcopy=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_good_bcopy=yes else @@ -12350,9 +12375,9 @@ fi echo $ac_n "checking if select expects int * arguments""... $ac_c" 1>&6 -echo "configure:12354: checking if select expects int * arguments" >&5 +echo "configure:12379: checking if select expects int * arguments" >&5 cat > conftest.$ac_ext < EOF @@ -12372,7 +12397,7 @@ rm -f conftest* echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 -echo "configure:12376: checking whether closedir returns void" >&5 +echo "configure:12401: checking whether closedir returns void" >&5 if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12380,13 +12405,13 @@ else ac_cv_func_closedir_void=yes else cat > conftest.$ac_ext < #include <$ac_header_dirent> int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF -if { (eval echo configure:12390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_closedir_void=no else @@ -12412,7 +12437,7 @@ fi # autoconf 2.5x assumes setvbuf is not reversed when cross-compiling if test "$cross_compiling" != yes ; then echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 -echo "configure:12416: checking whether setvbuf arguments are reversed" >&5 +echo "configure:12441: checking whether setvbuf arguments are reversed" >&5 if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12420,7 +12445,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < /* If setvbuf has the reversed format, exit 0. */ @@ -12434,7 +12459,7 @@ main () { exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:12438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_setvbuf_reversed=yes else @@ -12472,12 +12497,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12476: checking for $ac_func" >&5 +echo "configure:12501: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12527,13 +12552,13 @@ done echo $ac_n "checking for type sigaction_t""... $ac_c" 1>&6 -echo "configure:12531: checking for type sigaction_t" >&5 +echo "configure:12556: checking for type sigaction_t" >&5 if eval "test \"`echo '$''{'cf_cv_type_sigaction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -12541,7 +12566,7 @@ int main() { sigaction_t x ; return 0; } EOF -if { (eval echo configure:12545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_sigaction=yes else @@ -12561,13 +12586,13 @@ EOF echo $ac_n "checking for nonconflicting termios.h""... $ac_c" 1>&6 -echo "configure:12565: checking for nonconflicting termios.h" >&5 +echo "configure:12590: checking for nonconflicting termios.h" >&5 if eval "test \"`echo '$''{'cf_cv_use_termios_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_use_termios_h=yes else @@ -12620,13 +12645,13 @@ fi echo $ac_n "checking for passwd.pw_gecos""... $ac_c" 1>&6 -echo "configure:12624: checking for passwd.pw_gecos" >&5 +echo "configure:12649: checking for passwd.pw_gecos" >&5 if eval "test \"`echo '$''{'cf_cv_pw_gecos'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -12637,7 +12662,7 @@ int main() { char bar = foo.pw_gecos ; return 0; } EOF -if { (eval echo configure:12641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_pw_gecos=yes else @@ -12657,13 +12682,13 @@ EOF echo $ac_n "checking for tm.tm_gmtoff""... $ac_c" 1>&6 -echo "configure:12661: checking for tm.tm_gmtoff" >&5 +echo "configure:12686: checking for tm.tm_gmtoff" >&5 if eval "test \"`echo '$''{'cf_cv_tm_gmtoff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_tm_gmtoff=yes else @@ -12703,7 +12728,7 @@ EOF echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:12707: checking for long file names" >&5 +echo "configure:12732: checking for long file names" >&5 if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12751,17 +12776,17 @@ for ac_hdr in sys/wait.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12755: checking for $ac_hdr" >&5 +echo "configure:12780: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12798,17 +12823,17 @@ for ac_hdr in wait.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12802: checking for $ac_hdr" >&5 +echo "configure:12827: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12838,17 +12863,17 @@ for ac_hdr in waitstatus.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12842: checking for $ac_hdr" >&5 +echo "configure:12867: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12877: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12889,13 +12914,13 @@ fi echo $ac_n "checking for union wait""... $ac_c" 1>&6 -echo "configure:12893: checking for union wait" >&5 +echo "configure:12918: checking for union wait" >&5 if eval "test \"`echo '$''{'cf_cv_type_unionwait'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_type_unionwait=no echo compiles ok w/o union wait 1>&5 @@ -12917,7 +12942,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_type_unionwait=yes echo compiles ok with union wait and possibly macros too 1>&5 @@ -12957,7 +12982,7 @@ EOF echo $ac_n "checking if the system function returns usable child-status""... $ac_c" 1>&6 -echo "configure:12961: checking if the system function returns usable child-status" >&5 +echo "configure:12986: checking if the system function returns usable child-status" >&5 if eval "test \"`echo '$''{'cf_cv_system_status'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12966,7 +12991,7 @@ else cf_cv_system_status=unknown else cat > conftest.$ac_ext < @@ -12999,7 +13024,7 @@ int main() } EOF -if { (eval echo configure:13003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_system_status=no else @@ -13010,11 +13035,11 @@ else cf_cv_system_status=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_system_status=yes else @@ -13057,13 +13082,13 @@ EOF if test "$cf_cv_ncurses_version" != no ; then echo $ac_n "checking for obsolete/broken version of ncurses""... $ac_c" 1>&6 -echo "configure:13061: checking for obsolete/broken version of ncurses" >&5 +echo "configure:13086: checking for obsolete/broken version of ncurses" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -13077,7 +13102,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_broken=no else @@ -13102,13 +13127,13 @@ fi echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6 -echo "configure:13106: checking if curses supports color attributes" >&5 +echo "configure:13131: checking if curses supports color attributes" >&5 if eval "test \"`echo '$''{'cf_cv_color_curses'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -13123,7 +13148,7 @@ chtype x = COLOR_BLUE; ; return 0; } EOF -if { (eval echo configure:13127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_color_curses=yes else @@ -13174,7 +13199,7 @@ if test $check_sig_const = yes ; then echo $ac_n "checking for redefinable signal constants""... $ac_c" 1>&6 -echo "configure:13178: checking for redefinable signal constants" >&5 +echo "configure:13203: checking for redefinable signal constants" >&5 if eval "test \"`echo '$''{'cf_cv_sig_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13186,7 +13211,7 @@ if test -n "$cf_cv_sig_args"; then cf_cv_sig_const=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_sig_const=yes else @@ -13239,13 +13264,13 @@ fi echo $ac_n "checking for ANSI qsort""... $ac_c" 1>&6 -echo "configure:13243: checking for ANSI qsort" >&5 +echo "configure:13268: checking for ANSI qsort" >&5 if eval "test \"`echo '$''{'cf_cv_comptype'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_comptype=yes else @@ -13285,7 +13310,7 @@ fi echo $ac_n "checking if application can dump core""... $ac_c" 1>&6 -echo "configure:13289: checking if application can dump core" >&5 +echo "configure:13314: checking if application can dump core" >&5 if eval "test \"`echo '$''{'cf_cv_corefile'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13294,7 +13319,7 @@ else cf_cv_corefile=unknown else cat > conftest.$ac_ext < @@ -13335,7 +13360,7 @@ int main() #endif } EOF -if { (eval echo configure:13339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_corefile=yes else @@ -13381,18 +13406,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:13385: checking for missing "${ac_func}" extern" >&5 +echo "configure:13410: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "(line 13391) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13416) testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax @@ -13414,7 +13439,7 @@ if { (eval echo configure:13410: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13473,18 +13498,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:13477: checking for missing "${ac_func}" extern" >&5 +echo "configure:13502: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "(line 13483) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13508) testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax @@ -13506,7 +13531,7 @@ if { (eval echo configure:13502: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13563,18 +13588,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:13567: checking for missing "${ac_func}" extern" >&5 +echo "configure:13592: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "(line 13573) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13598) testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax @@ -13596,7 +13621,7 @@ if { (eval echo configure:13592: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13704,18 +13729,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:13708: checking for missing "${ac_func}" extern" >&5 +echo "configure:13733: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "(line 13714) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13739) testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax @@ -13737,7 +13762,7 @@ if { (eval echo configure:13733: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13791,18 +13816,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:13795: checking for missing "${ac_func}" extern" >&5 +echo "configure:13820: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "(line 13801) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13826) testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax @@ -13824,7 +13849,7 @@ if { (eval echo configure:13820: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13881,18 +13906,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:13885: checking for missing "${ac_func}" extern" >&5 +echo "configure:13910: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "(line 13891) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13916) testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax @@ -13914,7 +13939,7 @@ if { (eval echo configure:13910: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13962,7 +13987,7 @@ fi echo $ac_n "checking for working TIOCGWINSZ""... $ac_c" 1>&6 -echo "configure:13966: checking for working TIOCGWINSZ" >&5 +echo "configure:13991: checking for working TIOCGWINSZ" >&5 if eval "test \"`echo '$''{'cf_cv_use_tiocgwinsz'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13973,7 +13998,7 @@ else cf_cv_use_tiocgwinsz=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_use_tiocgwinsz=yes else @@ -14045,7 +14070,7 @@ esac # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14049: checking for $ac_word" >&5 +echo "configure:14074: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14075,19 +14100,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:14079: checking for working alloca.h" >&5 +echo "configure:14104: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:14091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -14108,12 +14133,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:14112: checking for alloca" >&5 +echo "configure:14137: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -14173,12 +14198,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:14177: checking whether alloca needs Cray hooks" >&5 +echo "configure:14202: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14207: checking for $ac_func" >&5 +echo "configure:14232: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -14258,7 +14283,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:14262: checking stack direction for C alloca" >&5 +echo "configure:14287: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14266,7 +14291,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -14310,17 +14335,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:14314: checking for $ac_hdr" >&5 +echo "configure:14339: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14349,12 +14374,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14353: checking for $ac_func" >&5 +echo "configure:14378: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -14402,7 +14427,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:14406: checking for working mmap" >&5 +echo "configure:14431: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14410,7 +14435,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -14574,12 +14599,12 @@ fi echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:14578: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo "configure:14603: checking whether we are using the GNU C Library 2.1 or newer" >&5 if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -14641,17 +14666,17 @@ stdlib.h string.h unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:14645: checking for $ac_hdr" >&5 +echo "configure:14670: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14682,12 +14707,12 @@ getgid getuid mempcpy munmap putenv sete strdup strtoul tsearch __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14686: checking for $ac_func" >&5 +echo "configure:14711: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -14751,7 +14776,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:14755: checking for iconv" >&5 +echo "configure:14780: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14759,7 +14784,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -14769,7 +14794,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:14773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -14781,7 +14806,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext < #include @@ -14791,7 +14816,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:14795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -14812,13 +14837,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:14816: checking for iconv declaration" >&5 +echo "configure:14841: checking for iconv declaration" >&5 if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -14837,7 +14862,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -14866,19 +14891,19 @@ EOF echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:14870: checking for nl_langinfo and CODESET" >&5 +echo "configure:14895: checking for nl_langinfo and CODESET" >&5 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:14882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else @@ -14901,19 +14926,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:14905: checking for LC_MESSAGES" >&5 +echo "configure:14930: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:14917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -14934,7 +14959,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:14938: checking whether NLS is requested" >&5 +echo "configure:14963: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. @@ -14958,7 +14983,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:14962: checking whether included gettext is requested" >&5 +echo "configure:14987: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then @@ -14979,17 +15004,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:14983: checking for libintl.h" >&5 +echo "configure:15008: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15018: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -15006,12 +15031,12 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 -echo "configure:15010: checking for GNU gettext in libc" >&5 +echo "configure:15035: checking for GNU gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -15020,7 +15045,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:15024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext1_libc=yes else @@ -15036,14 +15061,14 @@ echo "$ac_t""$gt_cv_func_gnugettext1_lib if test "$gt_cv_func_gnugettext1_libc" != "yes"; then echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 -echo "configure:15040: checking for GNU gettext in libintl" >&5 +echo "configure:15065: checking for GNU gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else gt_save_LIBS="$LIBS" LIBS="$LIBS -lintl $LIBICONV" cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -15052,7 +15077,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:15056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext1_libintl=yes else @@ -15085,12 +15110,12 @@ EOF for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15089: checking for $ac_func" >&5 +echo "configure:15114: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15143,7 +15168,7 @@ done set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15147: checking for $ac_word" >&5 +echo "configure:15172: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15177,7 +15202,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15181: checking for $ac_word" >&5 +echo "configure:15206: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15215,7 +15240,7 @@ fi set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15219: checking for $ac_word" >&5 +echo "configure:15244: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15269,7 +15294,7 @@ fi set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15273: checking for $ac_word" >&5 +echo "configure:15298: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15303,7 +15328,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15307: checking for $ac_word" >&5 +echo "configure:15332: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15340,7 +15365,7 @@ fi set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15344: checking for $ac_word" >&5 +echo "configure:15369: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15413,7 +15438,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15417: checking for $ac_word" >&5 +echo "configure:15442: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15446,7 +15471,7 @@ done ac_verc_fail=yes else echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:15450: checking version of bison" >&5 +echo "configure:15475: checking version of bison" >&5 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -15494,7 +15519,7 @@ echo "configure:15450: checking version LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:15498: checking for catalogs to be installed" >&5 +echo "configure:15523: checking for catalogs to be installed" >&5 NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -15550,7 +15575,7 @@ use_our_messages=no if test "$USE_NLS" = yes ; then if test -d $srcdir/po ; then echo $ac_n "checking if we should use included message-library""... $ac_c" 1>&6 -echo "configure:15554: checking if we should use included message-library" >&5 +echo "configure:15579: checking if we should use included message-library" >&5 # Check whether --enable-included-msgs or --disable-included-msgs was given. if test "${enable_included_msgs+set}" = set; then @@ -15605,17 +15630,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:15609: checking for $ac_hdr" >&5 +echo "configure:15634: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15619: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -15690,19 +15715,19 @@ bison*) # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:15694: checking for working alloca.h" >&5 +echo "configure:15719: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:15706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -15723,12 +15748,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:15727: checking for alloca" >&5 +echo "configure:15752: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -15788,12 +15813,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:15792: checking whether alloca needs Cray hooks" >&5 +echo "configure:15817: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15822: checking for $ac_func" >&5 +echo "configure:15847: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15873,7 +15898,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:15877: checking stack direction for C alloca" >&5 +echo "configure:15902: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15881,7 +15906,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:15929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -15928,19 +15953,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:15932: checking for working alloca.h" >&5 +echo "configure:15957: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:15944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -15961,12 +15986,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:15965: checking for alloca" >&5 +echo "configure:15990: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -16026,12 +16051,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:16030: checking whether alloca needs Cray hooks" >&5 +echo "configure:16055: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16060: checking for $ac_func" >&5 +echo "configure:16085: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16111,7 +16136,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:16115: checking stack direction for C alloca" >&5 +echo "configure:16140: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16119,7 +16144,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -16172,9 +16197,9 @@ esac for cf_hdr in iconv.h do echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6 -echo "configure:16176: checking for $cf_hdr" >&5 +echo "configure:16201: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -16182,7 +16207,7 @@ echo "configure:16176: checking for $cf_ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:16211: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -16208,13 +16233,13 @@ fi done echo $ac_n "checking for iconv_open() //TRANSLIT extension""... $ac_c" 1>&6 -echo "configure:16212: checking for iconv_open() //TRANSLIT extension" >&5 +echo "configure:16237: checking for iconv_open() //TRANSLIT extension" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""unknown" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define HAVE_ICONV_OPEN_TRANSLIT 1 @@ -16259,7 +16284,7 @@ if test "$cf_cv_termlib" = pdcurses ; th # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:16263: checking for X" >&5 +echo "configure:16288: checking for X" >&5 # Check whether --with-x or --without-x was given. @@ -16322,12 +16347,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16331: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:16356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -16396,14 +16421,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -16503,7 +16528,7 @@ clix*) # FIXME: modify the library lookup in autoconf to # allow _s.a suffix ahead of .a echo $ac_n "checking for open in -lc_s""... $ac_c" 1>&6 -echo "configure:16507: checking for open in -lc_s" >&5 +echo "configure:16532: checking for open in -lc_s" >&5 ac_lib_var=`echo c_s'_'open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16511,7 +16536,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16539,7 +16564,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l echo "$ac_t""yes" 1>&6 LIBS="-lc_s $LIBS" echo $ac_n "checking for gethostname in -lbsd""... $ac_c" 1>&6 -echo "configure:16543: checking for gethostname in -lbsd" >&5 +echo "configure:16568: checking for gethostname in -lbsd" >&5 ac_lib_var=`echo bsd'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16547,7 +16572,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16575,7 +16600,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l echo "$ac_t""yes" 1>&6 LIBS="-lbsd $LIBS" echo $ac_n "checking for gethostname in -lnsl_s""... $ac_c" 1>&6 -echo "configure:16579: checking for gethostname in -lnsl_s" >&5 +echo "configure:16604: checking for gethostname in -lnsl_s" >&5 ac_lib_var=`echo nsl_s'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16583,7 +16608,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16611,7 +16636,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l echo "$ac_t""yes" 1>&6 LIBS="-lnsl_s $LIBS" echo $ac_n "checking for XOpenDisplay in -lX11_s""... $ac_c" 1>&6 -echo "configure:16615: checking for XOpenDisplay in -lX11_s" >&5 +echo "configure:16640: checking for XOpenDisplay in -lX11_s" >&5 ac_lib_var=`echo X11_s'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16619,7 +16644,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16647,7 +16672,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l echo "$ac_t""yes" 1>&6 LIBS="-lX11_s $LIBS" echo $ac_n "checking for XtAppInitialize in -lXt_s""... $ac_c" 1>&6 -echo "configure:16651: checking for XtAppInitialize in -lXt_s" >&5 +echo "configure:16676: checking for XtAppInitialize in -lXt_s" >&5 ac_lib_var=`echo Xt_s'_'XtAppInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16655,7 +16680,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXt_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16707,7 +16732,7 @@ fi ;; *) echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:16711: checking for socket in -lsocket" >&5 +echo "configure:16736: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16715,7 +16740,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16754,7 +16779,7 @@ else fi echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:16758: checking for gethostname in -lnsl" >&5 +echo "configure:16783: checking for gethostname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16762,7 +16787,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16824,17 +16849,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:16828: checking whether -R must be followed by a space" >&5 +echo "configure:16853: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -16850,14 +16875,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -16889,7 +16914,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:16893: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:16918: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16897,7 +16922,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16930,7 +16955,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:16934: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:16959: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16938,7 +16963,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16978,12 +17003,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:16982: checking for gethostbyname" >&5 +echo "configure:17007: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -17027,7 +17052,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:17031: checking for gethostbyname in -lnsl" >&5 +echo "configure:17056: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17035,7 +17060,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17076,12 +17101,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:17080: checking for connect" >&5 +echo "configure:17105: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -17125,7 +17150,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:17129: checking for connect in -lsocket" >&5 +echo "configure:17154: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17133,7 +17158,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17168,12 +17193,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:17172: checking for remove" >&5 +echo "configure:17197: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -17217,7 +17242,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:17221: checking for remove in -lposix" >&5 +echo "configure:17246: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17225,7 +17250,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17260,12 +17285,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:17264: checking for shmat" >&5 +echo "configure:17289: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -17309,7 +17334,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:17313: checking for shmat in -lipc" >&5 +echo "configure:17338: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17317,7 +17342,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17361,7 +17386,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:17365: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:17390: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17369,7 +17394,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17446,14 +17471,14 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat > conftest.$ac_ext < int main() { printf("Hello world"); ; return 0; } EOF -if { (eval echo configure:17457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -17471,7 +17496,7 @@ rm -f conftest* fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:17475: checking for XOpenDisplay in -lX11" >&5 +echo "configure:17500: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17479,7 +17504,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17511,7 +17536,7 @@ else fi echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:17515: checking for XtAppInitialize in -lXt" >&5 +echo "configure:17540: checking for XtAppInitialize in -lXt" >&5 ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17519,7 +17544,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17598,14 +17623,14 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat > conftest.$ac_ext < int main() { printf("Hello world"); ; return 0; } EOF -if { (eval echo configure:17609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -17658,7 +17683,7 @@ fi echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:17662: checking for XextCreateExtension in -lXext" >&5 +echo "configure:17687: checking for XextCreateExtension in -lXext" >&5 ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17666,7 +17691,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17716,13 +17741,13 @@ do if test $cf_path != default ; then CPPFLAGS="-I$cf_path/include $cf_save" echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6 -echo "configure:17720: checking for $cf_test in $cf_path" >&5 +echo "configure:17745: checking for $cf_test in $cf_path" >&5 else echo $ac_n "checking for $cf_test""... $ac_c" 1>&6 -echo "configure:17723: checking for $cf_test" >&5 +echo "configure:17748: checking for $cf_test" >&5 fi cat > conftest.$ac_ext < @@ -17731,7 +17756,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:17735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -17778,23 +17803,23 @@ do if test $cf_path != default ; then LIBS="-L$cf_path/lib $cf_lib $LIBS" echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6 -echo "configure:17782: checking for $cf_lib in $cf_path" >&5 +echo "configure:17807: checking for $cf_lib in $cf_path" >&5 else LIBS="$cf_lib $LIBS" echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6 -echo "configure:17786: checking for $cf_test in $cf_lib" >&5 +echo "configure:17811: checking for $cf_test in $cf_lib" >&5 fi cf_SAVE="$LIBS" LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -17873,14 +17898,14 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat > conftest.$ac_ext < int main() { printf("Hello world"); ; return 0; } EOF -if { (eval echo configure:17884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -17898,7 +17923,7 @@ rm -f conftest* fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:17902: checking for XOpenDisplay in -lX11" >&5 +echo "configure:17927: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17906,7 +17931,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17938,14 +17963,14 @@ else fi echo $ac_n "checking for XCurses library""... $ac_c" 1>&6 -echo "configure:17942: checking for XCurses library" >&5 +echo "configure:17967: checking for XCurses library" >&5 if eval "test \"`echo '$''{'cf_cv_lib_XCurses'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else LIBS="-lXCurses $LIBS" cat > conftest.$ac_ext < @@ -17955,7 +17980,7 @@ int main() { XCursesExit(); ; return 0; } EOF -if { (eval echo configure:17959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_lib_XCurses=yes else diff -Nurp tin-1.7.6/configure.in tin-1.7.7/configure.in --- tin-1.7.6/configure.in 2004-09-06 11:07:20.000000000 +0200 +++ tin-1.7.7/configure.in 2004-12-15 16:56:35.000000000 +0100 @@ -2,7 +2,7 @@ dnl Project : tin - a Usenet reader dnl Module : configure.in dnl Author : Thomas E. Dickey dnl Created : 1995-08-24 -dnl Updated : 2004-08-20 +dnl Updated : 2004-12-08 dnl Notes : dnl dnl Copyright (c) 1995-2004 Thomas E. Dickey @@ -41,7 +41,7 @@ AC_PREFIX_DEFAULT(/usr/local) dnl PACKAGE is required for GNU gettext PACKAGE=tin -VERSION=1.7.6 +VERSION=1.7.7 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(PACKAGE) @@ -86,6 +86,7 @@ AC_PROG_MAKE_SET AC_PROG_INSTALL CF_PROG_YACC AC_CHECK_PROGS(LINT, lint alint lclint tdlint splint, []) +AC_AIX CF_GNU_SOURCE AC_ISC_POSIX CF_ANSI_CC_REQD @@ -626,9 +627,9 @@ AC_MSG_RESULT($enableval) ### on some old systems the WIFEXITED()/WEXITSTATUS() macros do not work AC_MSG_CHECKING(whether to ignore system()s return value) CF_ARG_ENABLE(broken-system-fix, - [ --enable-broken-system-fix + [ --enable-broken-system-fix ignore system()s return value], - [AC_DEFINE(IGNORE_SYSTEM_STATUS)]) + [AC_DEFINE(IGNORE_SYSTEM_STATUS)]) AC_MSG_RESULT($enableval) ### checks for the location of the system-wide default setting file @@ -906,6 +907,7 @@ AC_CHECK_FUNCS(\ fdopen \ fork \ ftime \ + ftruncate \ getcwd \ gettimeofday \ getwd \ diff -Nurp tin-1.7.6/doc/CHANGES tin-1.7.7/doc/CHANGES --- tin-1.7.6/doc/CHANGES 2004-09-06 10:37:55.000000000 +0200 +++ tin-1.7.7/doc/CHANGES 2004-12-15 16:47:12.000000000 +0100 @@ -1,3 +1,45 @@ +-- 1.7.7 release 20041215 "Scalpay" -- + + 026) Michael Bienia + BUG. possible buffer overrun in get_mailcap_entry() + FIX. rfc1524.c + +U034) Michael Velten + BUG. currmenu->curr off by one error for empty groups + BUG. upward scrolling in !USE_CURSES was broken + ADD. consistently display "End of ..." message + BUG. reused the search offset when switching the context + FIX. proto.h, global.c, group.c, page.c, search.c, select.c, thread.c + +U033) Matt Anton + ADD. added missing french translations + FIX. fr.po + +U032) Michael Bienia + ADD. (w)strunc() now malloc()s the needed space + ADD. line-scrolling in select-, group- and thread-level + ADD. screen-scrolling iKeyScrollUp ('<'), iKeyScrollDown ('>') + ADD. unifiy option-value description formats + BUG. missing file truncation in do_rfc15211522_encode() + FIX. extern.h, keymap.h, menukeys.h, proto.h, tin.h, cook.c, global.c + group.c, help.c, keymap.c, lang.c, options_menu.c, page.c, post.c + prompt.c, rfc2045.c, rfc2047.c, screen.c, select.c, string.c + thread.c, keymap.sample, tin.1, tin.5 + +U031) Urs Janssen + ADD. keymap-file version number + ADD. config.guess, config.sub update + ADD. pcre update (4.5 -> 5.0) + ADD. configure check for ftruncate(3) + ADD. make sscanf(3)s first two args non-constant for backward + portability + BUG. missing #ifdef in the disable-color case + BUG. systemtype detection broken + FIX. Makefile.in, extern.h, proto.h, version.h, init.c, keymap.c, lang.c + misc.c, newsrc.c, options_menu.c, post.c, version.c, keymap.sample + pcre/*, config.guess, config.sub, de.po, en_GB.po, fr.po, tin.1 + tin.5, configure.in, autoconf.hin + -- 1.7.6 release 20040906 "Baleshare" -- U030) Dennis Grevenstein @@ -44,7 +86,7 @@ U028) Michael Bienia @@ -201,6 +243,7 @@ U012) Toomas Soome ADD. config.guess, config.sub update + ADD. pcre update (4.4 -> 4.5) ADD. install.sh update ADD. configure check for libidn, idna.h, stringprep.h ADD. configure check for nl_item diff -Nurp tin-1.7.6/doc/INSTALL tin-1.7.7/doc/INSTALL --- tin-1.7.6/doc/INSTALL 2004-08-20 16:55:27.000000000 +0200 +++ tin-1.7.7/doc/INSTALL 2004-12-08 23:32:47.000000000 +0100 @@ -49,13 +49,14 @@ The following configure options and defi --mandir --with-spooldir --prefix --with-trace + ENFORCE_RFC1034 HAVE_UUDEVIEW_H EVIL_INSIDE NNTP_INEWS FOLLOW_USEFOR_DRAFT NNTP_SERVER_FILE FORGERY PROFILE REQUIRE_BRACKETS_IN_DOMAIN_LITERAL SMALL_MEMORY_MACHINE HAVE_LIBUU XFACE_ABLE - USE_CANLOCK + USE_CANLOCK HAVE_BROKEN_SSCANF Not yet documented configure options and defines: @@ -629,8 +630,8 @@ let tin generate Message-IDs USE_CANLOCK turn on cancel-locks, you need to compile libcanlock first by running -./Build in the libcanlock dir and uncomment the CANLOCK/CANLIB lines in -src/Makefile +./Build in the libcanlock dir or by using "make canlock" from the src +dir. You also have to uncomment the CANLOCK/CANLIB lines in src/Makefile. FOLLOW_USEFOR_DRAFT issue a warning instead of an error-message if Newsgroups: or diff -Nurp tin-1.7.6/doc/TODO tin-1.7.7/doc/TODO --- tin-1.7.6/doc/TODO 2004-09-04 23:13:57.000000000 +0200 +++ tin-1.7.7/doc/TODO 2004-11-26 19:51:20.000000000 +0100 @@ -4,6 +4,14 @@ not read only ,-). Bugs ---- +o fast/endless reconecction loop after a "200\n\r400\n\r" greeting, + see + + +o rot13-toggle '%' doesn't work in raw '^H' mode (but isn't disabled, so + the info message in the last line is wrong). + [20041125 Urs Janssen ] + o AFAICS change_config_file() currently has a static return value, but some callers do check the return value and in case we did change something we should update (global) attributes accordingly. @@ -45,8 +53,8 @@ o '-s' cmd-line switch implicitly chang Might get away with simply setting glob_attributes->savedir [Jason Faultless ] -o add version number to other config-files (e.g. tin.defaults, - keymap) and do the same checks as for TINRC_VERSION/tinrc. for the +o add version number to other config-files (e.g. tin.defaults) + and do the same checks as for TINRC_VERSION/tinrc. for the filter (and attributes) file also store the editor offset (different languages do use different headers) and the filter method used (wildmat or regexp) and the charset the file is written in (e.g. @@ -103,8 +111,11 @@ o mailers other than sendmail (f.e. elm New features ------------ +o add user defined screen layout at different levels + [20041025 Urs Janssen ] + o add TLS support - (see draft-ietf-nntpext-tls-nntp-01.txt; + (see draft-ietf-nntpext-tls-nntp-03.txt; might be useful) [20031210 Urs Janssen ] @@ -461,6 +472,10 @@ o suppress hide_uue=2 checking unless f Internal Changes ---------------- +o replace various occurrence of "US-ASCII" by DEFAULT(_MIME)_CHARSET + and define that to "US-ASCII" (to make 'updates' easier). + [20040929 Urs Janssen ] + o add configure option for slrnface [20030506 Urs Janssen ] @@ -631,6 +646,8 @@ o man page always needs work and proof o tin.defaults could use more documentation in manpage (tin.5) +o replace "\\" by "\e" in manpages (portable?) + Not yet classified ------------------ o there is no command to undo a range ('#') selection @@ -715,7 +732,8 @@ o doesn't handle symlinks for .oldnewsr [20020627 Jeff Sheinberg ] o cleanup main.c/init_selfinfo() - ('strace -e trace=file tin' and you know what I mean) + ('strace -e trace=file tin' and/or 'ltrace -e getenv tin' and you know + what I mean) [fixed some of the double/tripple reads, urs] o either use libinn(3) where ever it's possible inside the code (if diff -Nurp tin-1.7.6/doc/WHATSNEW tin-1.7.7/doc/WHATSNEW --- tin-1.7.6/doc/WHATSNEW 2004-08-20 15:16:16.000000000 +0200 +++ tin-1.7.7/doc/WHATSNEW 2004-11-15 18:44:22.000000000 +0100 @@ -11,13 +11,23 @@ Changes New features ------------ -. You can now specify a mailbox folder to save your sent mails so you - possibly don't need auto_cc or auto_bcc anymore. See tin(5). +. You can now specify a mailbox folder to save your sent mails (fcc=) so + you possibly don't need auto_cc or auto_bcc anymore. See tin(5). . x_headers can take a command which generates the header(s). See tin(5). . mime_forward (message/rfc822) attributes option +. single line scrolling in all levels + +. minimalistic BiDi support (render_bidi) + +. minimalistic IDNA decoding support + +. display non-printable characters as octals in raw-mode + +. user defined date_format + Retired Features ---------------- . AmigaOS support diff -Nurp tin-1.7.6/doc/keymap.sample tin-1.7.7/doc/keymap.sample --- tin-1.7.6/doc/keymap.sample 2004-08-20 10:30:47.000000000 +0200 +++ tin-1.7.7/doc/keymap.sample 2004-11-15 18:51:30.000000000 +0100 @@ -1,8 +1,8 @@ -# Sample keymap file +# Keymap file V1.0.0 for the TIN newsreader # +# Sample keymap file # This file contains the default key mappings # -# # Global keys PageDown3 SPACE @@ -35,6 +35,8 @@ Quit q Version v Post w Pipe | +ScrollUp < +ScrollDown > PageUp ^B PageDown ^D PageDown2 ^F diff -Nurp tin-1.7.6/doc/tin.1 tin-1.7.7/doc/tin.1 --- tin-1.7.6/doc/tin.1 2004-09-06 10:39:47.000000000 +0200 +++ tin-1.7.7/doc/tin.1 2004-12-15 16:47:27.000000000 +0100 @@ -3,13 +3,13 @@ .\" Module : tin.1 .\" Author : I. Lea, U. Janssen .\" Created : 1991-08-23 -.\" Updated : 2004-09-06 +.\" Updated : 2004-12-15 .\" Notes : use american english; still needs some work, e.g.: .\" - document authorization (.newsauth) .\" - document random organization feature .\" .\" -.TH tin 1 "September 6th, 2004" "1.7.6" "A Usenet newsreader" +.TH tin 1 "December 15th, 2004" "1.7.7" "A Usenet newsreader" .\" .\" .SH NAME @@ -471,6 +471,12 @@ Toggle use of ANSI color. .B RedrawScr '^L' Redraw the current screen. .TP +.B ScrollUp '<' +Scroll screen up by one line. +.TP +.B ScrollDown '>' +Scroll screen down by one line. +.TP .B Postponed '^O' Reload postponed article. If your system blocks the \fBPostponed\fP key you must quote it by pressing '\fB^V\fP' (CTRL-V) first. The postpone-menu @@ -1321,10 +1327,10 @@ The character used to show that an artic The character used to show that an article was hot before it was read. Default is ':'. \fBkill_level\fP must be set accordingly. .TP -.B Ask before using \fBmetamail_prog\fP (ask_for_metamail) -If ON \fBtin\fP will ask before using \fBmetamail_prog\fP -to display MIME messages. This only occurs if \fBmetamail_prog\fP is set. -Default is OFF. +.B Ask before using MIME viewer (ask_for_metamail) +If ON \fBtin\fP will ask before using a MIME viewer +(\fBmetamail_prog\fP) to display MIME messages. This only occurs if a +MIME viewer is set. Default is OFF. .TP .B Send you a blind cc automatically (auto_bcc) If ON automatically put your name in the ''Bcc:'' field when mailing an diff -Nurp tin-1.7.6/doc/tin.5 tin-1.7.7/doc/tin.5 --- tin-1.7.6/doc/tin.5 2004-09-06 10:39:38.000000000 +0200 +++ tin-1.7.7/doc/tin.5 2004-12-15 16:47:36.000000000 +0100 @@ -2,10 +2,10 @@ .\" Module : tin.5 .\" Author : U. Janssen .\" Created : 2000-07-10 -.\" Updated : 2004-09-06 +.\" Updated : 2004-12-15 .\" Notes : needs a some work .\" -.TH tin 5 "September 6th, 2004" "1.7.6" "A Usenet newsreader" +.TH tin 5 "December 15th, 2004" "1.7.7" "A Usenet newsreader" .SH NAME tin, rtin \- related files @@ -741,6 +741,8 @@ Below is a list of all keynames and thei \fBVersion\fP v \fBPost\fP w \fBPipe\fP | +\fBScrollUp\fP < +\fBScrollDown\fP > \fBPageUp\fP ^B \fBPageDown\fP ^D \fBPageDown2\fP ^F @@ -1097,12 +1099,12 @@ The character used to show that an artic The character used to show that an article was hot before it was read. Default is ':'. \fBkill_level\fP must be set accordingly. .TP -.B Ask before using \fBmetamail_prog\fP (ask_for_metamail) +.B Ask before using MIME viewer (ask_for_metamail) If ON .BR tin (1) -will ask before using \fBmetamail_prog\fP -to display MIME messages. This only occurs if \fBmetamail_prog\fP is set. -Default is OFF. +will ask before using a MIME viewer (\fBmetamail_prog\fP) to display +MIME messages. This only occurs if a MIME viewer is set. Default is +OFF. .TP .B auto_bcc If ON automatically put your name in the ''Bcc:'' field when mailing an diff -Nurp tin-1.7.6/include/autoconf.hin tin-1.7.7/include/autoconf.hin --- tin-1.7.6/include/autoconf.hin 2004-08-24 00:32:43.000000000 +0200 +++ tin-1.7.7/include/autoconf.hin 2004-12-08 23:18:22.000000000 +0100 @@ -3,7 +3,7 @@ * Module : autoconf.hin * Author : Thomas Dickey * Created : 1995-08-24 - * Updated : 2004-08-20 + * Updated : 2004-09-14 * Notes : #include files, #defines & struct's * * Copyright (c) 1995-2004 Thomas Dickey @@ -238,6 +238,7 @@ # undef HAVE_FLOCK # undef HAVE_FORK # undef HAVE_FTIME +# undef HAVE_FTRUNCATE # undef HAVE_GAI_STRERROR # undef HAVE_GETADDRINFO # undef HAVE_GETCWD @@ -597,7 +598,8 @@ # undef BROKEN_LISTGROUP /* - * on some old systems the WIFEXITED()/WEXITSTATUS() macros do not work + * on some old systems the WIFEXITED()/WEXITSTATUS() macros do not work, + * e.g. SEIUX3.2, DG/UX5.4R3, NEXTSTEP3 */ # undef IGNORE_SYSTEM_STATUS @@ -649,6 +651,7 @@ */ # if defined(MULTIBYTE_ABLE) || defined(HAVE_LIBUTF8_H) # define SUPPORT_UTF8 1 +# define SUPPORT_UCP 1 # endif /* MULTIBYTE_ABLE || HAVE_LIBUTF8_H */ /* diff -Nurp tin-1.7.6/include/extern.h tin-1.7.7/include/extern.h --- tin-1.7.6/include/extern.h 2004-09-03 17:31:01.000000000 +0200 +++ tin-1.7.7/include/extern.h 2004-11-16 14:25:49.000000000 +0100 @@ -3,7 +3,7 @@ * Module : extern.h * Author : I. Lea * Created : 1991-04-01 - * Updated : 2004-09-03 + * Updated : 2004-11-16 * Notes : * * Copyright (c) 1997-2004 Iain Lea @@ -473,9 +473,9 @@ extern constext txt_cannot_create[]; extern constext txt_cannot_create_uniq_name[]; extern constext txt_cannot_find_base_art[]; extern constext txt_cannot_get_nntp_server_name[]; -#if defined(M_UNIX) && !defined(USE_TERMINFO) +#if !defined(USE_CURSES) && defined(M_UNIX) && !defined(USE_TERMINFO) extern constext txt_cannot_get_term_entry[]; -#endif /* M_UNIX && !USE_TERMINFO */ +#endif /* !USE_CURSES && M_UNIX && !USE_TERMINFO */ extern constext txt_cannot_open[]; extern constext txt_cannot_open_for_saving[]; extern constext txt_cannot_post[]; @@ -716,6 +716,8 @@ extern constext txt_help_global_quit_tin extern constext txt_help_global_redraw_screen[]; extern constext txt_help_global_save[]; extern constext txt_help_global_auto_save[]; +extern constext txt_help_global_scroll_down[]; +extern constext txt_help_global_scroll_up[]; extern constext txt_help_global_search_auth_backwards[]; extern constext txt_help_global_search_auth_forwards[]; extern constext txt_help_global_search_body[]; @@ -901,11 +903,13 @@ extern constext txt_no_responses[]; extern constext txt_no_resps_in_thread[]; extern constext txt_no_search_string[]; extern constext txt_no_subject[]; -extern constext txt_no_term_clear_eol[]; -extern constext txt_no_term_clear_eos[]; -extern constext txt_no_term_clearscreen[]; -extern constext txt_no_term_cursor_motion[]; -extern constext txt_no_term_set[]; +#ifndef USE_CURSES + extern constext txt_no_term_clear_eol[]; + extern constext txt_no_term_clear_eos[]; + extern constext txt_no_term_clearscreen[]; + extern constext txt_no_term_cursor_motion[]; + extern constext txt_no_term_set[]; +#endif /* !USE_CURSES */ extern constext txt_no_viewer_found[]; extern constext txt_no_xover_support[]; extern constext txt_not_exist[]; @@ -999,7 +1003,9 @@ extern constext txt_saved_to[]; extern constext txt_saved_to_range[]; extern constext txt_saving[]; extern constext txt_screen_init_failed[]; -extern constext txt_screen_too_small[]; +#ifndef USE_CURSES + extern constext txt_screen_too_small[]; +#endif /* !USE_CURSES */ extern constext txt_screen_too_small_exiting[]; extern constext txt_search_backwards[]; extern constext txt_search_body[]; @@ -1041,6 +1047,7 @@ extern constext txt_supersede_group[]; extern constext txt_superseding_art[]; extern constext txt_suspended_message[]; extern constext txt_tab[]; +extern constext txt_tex[]; extern constext txt_there_is_no_news[]; extern constext txt_thread_upper[]; extern constext txt_thread_com[]; @@ -1493,7 +1500,9 @@ extern struct opttxt txt_mono_markstar; extern struct opttxt txt_mono_markdash; extern struct opttxt txt_mono_markslash; extern struct opttxt txt_mono_markstroke; -extern struct opttxt txt_mm_charset; +#ifndef CHARSET_CONVERSION + extern struct opttxt txt_mm_charset; +#endif /* CHARSET_CONVERSION */ extern struct opttxt txt_metamail_prog; extern struct opttxt txt_news_headers_to_display; extern struct opttxt txt_news_headers_to_not_display; diff -Nurp tin-1.7.6/include/keymap.h tin-1.7.7/include/keymap.h --- tin-1.7.6/include/keymap.h 2004-08-20 10:30:48.000000000 +0200 +++ tin-1.7.7/include/keymap.h 2004-11-16 14:26:34.000000000 +0100 @@ -3,7 +3,7 @@ * Module : keymap.h * Author : J. Faultless, D. Nimmich * Created : 1999 - * Updated : 2003-05-14 + * Updated : 2004-11-16 * Notes : * * Copyright (c) 1999-2004 Jason Faultless @@ -106,6 +106,8 @@ struct k_global { t_keynode Version; /* 'v' */ t_keynode Post; /* 'w' */ t_keynode Pipe; /* '|' */ + t_keynode ScrollUp; /* '<' */ + t_keynode ScrollDown; /* '>' */ t_keynode CatchupLeft; /* special, for internal use only */ t_keynode MouseToggle; /* special, for internal use only */ t_keynode null; /* End of group */ diff -Nurp tin-1.7.6/include/menukeys.h tin-1.7.7/include/menukeys.h --- tin-1.7.6/include/menukeys.h 2004-08-20 10:30:48.000000000 +0200 +++ tin-1.7.7/include/menukeys.h 2004-11-16 14:26:45.000000000 +0100 @@ -3,7 +3,7 @@ * Module : menukeys.h * Author : S.Robbins * Created : 1994-08-15 - * Updated : 2003-05-14 + * Updated : 2004-11-16 * Notes : * * Copyright (c) 1994-2004 Steve Robbins @@ -167,6 +167,8 @@ #define iKeyVersion 'v' #define iKeyPost 'w' #define iKeyPipe '|' +#define iKeyScrollUp '<' +#define iKeyScrollDown '>' #define iKeyPageUp ctrl('B') #define iKeyPageDown ctrl('D') #define iKeyPageDown2 ctrl('F') diff -Nurp tin-1.7.6/include/proto.h tin-1.7.7/include/proto.h --- tin-1.7.6/include/proto.h 2004-09-05 16:06:12.000000000 +0200 +++ tin-1.7.7/include/proto.h 2004-12-10 17:54:36.000000000 +0100 @@ -3,7 +3,7 @@ * Module : proto.h * Author : Urs Janssen * Created : - * Updated : 2004-09-05 + * Updated : 2004-12-08 * Notes : * * Copyright (c) 1997-2004 Urs Janssen @@ -87,11 +87,11 @@ extern void convert_tex2iso(char *from, #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ /* color.c */ +extern void draw_pager_line(const char *str, int flags, t_bool raw_data); #ifdef HAVE_COLOR extern void bcol(int color); extern void fcol(int color); #endif /* HAVE_COLOR */ -extern void draw_pager_line(const char *str, int flags, t_bool raw_data); /* config.c */ extern char **ulBuildArgv(char *cmd, int *new_argc); @@ -117,22 +117,11 @@ extern OUTC_RETTYPE outchar(OUTC_ARGS); extern int InitScreen(void); extern int RawState(void); extern int ReadCh(void); -#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) && !defined(USE_CURSES) - extern wint_t ReadWch(void); -#endif /* MULTIBYTE_ABLE && !NO_LOCALE && !USE_CURSES */ extern int get_arrow_key(int prech); extern int get_termcaps(void); -extern void ClearScreen(void); -extern void CleartoEOLN(void); -extern void CleartoEOS(void); -extern void ScrollScreen(int lines_to_scroll); -extern void SetScrollRegion(int topline, int bottomline); extern void EndInverse(void); extern void EndWin(void); extern void InitWin(void); -#ifndef USE_CURSES - extern void MoveCursor(int row, int col); -#endif /* USE_CURSES */ extern void Raw(int state); extern void StartInverse(void); extern void cursoroff(void); @@ -144,6 +133,17 @@ extern void set_xclick_off(void); extern void set_xclick_on(void); extern void setup_screen(void); extern void word_highlight_string(int row, int col, int size, int color); +#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) && !defined(USE_CURSES) + extern wint_t ReadWch(void); +#endif /* MULTIBYTE_ABLE && !NO_LOCALE && !USE_CURSES */ +#ifndef USE_CURSES + extern void ClearScreen(void); + extern void CleartoEOLN(void); + extern void CleartoEOS(void); + extern void MoveCursor(int row, int col); + extern void ScrollScreen(int lines_to_scroll); + extern void SetScrollRegion(int topline, int bottomline); +#endif /* USE_CURSES */ #if 0 extern void ToggleInverse(void); #endif /* 0 */ @@ -197,6 +197,8 @@ extern void top_of_list(void); extern void end_of_list(void); extern void move_to_item(int n); extern void prompt_item_num(int ch, const char *prompt); +extern void scroll_down(void); +extern void scroll_up(void); extern void set_first_screen_item(void); /* group.c */ @@ -403,9 +405,6 @@ extern void set_default_bitmap(struct t_ #endif /* DEBUG_NEWSRC */ /* nntplib.c */ -#ifdef NNTP_ABLE - extern FILE *nntp_command(const char *, int, char *, size_t); -#endif /* NNTP_ABLE */ extern FILE *get_nntp_fp(FILE *fp); extern FILE *get_nntp_wr_fp(FILE *fp); extern char *getserverbyfile(const char *file); @@ -416,6 +415,9 @@ extern int nntp_open(void); extern void nntp_close(void); extern void put_server(const char *string); extern void u_put_server(const char *string); +#ifdef NNTP_ABLE + extern FILE *nntp_command(const char *, int, char *, size_t); +#endif /* NNTP_ABLE */ /* nrctbl.c */ extern int get_newsrcname(char *newsrc_name, const char *nntpserver_name); @@ -520,6 +522,8 @@ extern t_mailcap *get_mailcap_entry(t_pa extern void free_mailcap(t_mailcap *tmailcap); /* rfc2045.c */ +extern int read_decoded_base64_line(FILE *file, char **line, int *max_line_len, const int max_lines_to_read, char **rest); +extern int read_decoded_qp_line(FILE *file, char **line, int *max_line_len, const int max_lines_to_read); extern void rfc1521_encode(char *line, FILE *f, int e); /* rfc2046.c */ @@ -575,6 +579,7 @@ extern int search_active(t_bool forward, extern int search_article(t_bool forward, t_bool repeat, int start_line, int lines, t_lineinfo *line, int reveal_ctrl_l_lines, FILE *fp); extern int search_config(t_bool forward, t_bool repeat, int current, int last); extern int search_body(struct t_group *group, int current_art, t_bool repeat); +extern void reset_srch_offsets(void); /* select.c */ extern int add_my_group(const char *group, t_bool add); @@ -604,15 +609,16 @@ extern char *eat_tab(char *s); extern char *fmt_string(const char *fmt, ...); extern char *my_strdup(const char *str); extern char *str_trim(char *string); +extern char *strunc(const char *message, int len); extern char *tin_ltoa(long value, int digits); extern char *tin_strtok(char *str, const char *delim); -#if !defined(HAVE_STRCASESTR) || defined(DECL_STRCASESTR) - extern const char *strcasestr(const char *haystack, const char *needle); -#endif /* !HAVE_STRCASESTR || DECL_STRCASESTR */ extern int sh_format(char *dst, size_t len, const char *fmt, ...); extern size_t mystrcat(char **t, const char *s); extern void my_strncpy(char *p, const char *q, size_t n); extern void str_lwr(char *str); +#if !defined(HAVE_STRCASESTR) || defined(DECL_STRCASESTR) + extern const char *strcasestr(const char *haystack, const char *needle); +#endif /* !HAVE_STRCASESTR || DECL_STRCASESTR */ #ifndef HAVE_STRPBRK extern char *strpbrk(char *str1, char *str2); #endif /* !HAVE_STRPBRK */ @@ -646,10 +652,9 @@ extern void str_lwr(char *str); extern char *wchar_t2char(const wchar_t *wstr); extern wchar_t *char2wchar_t(const char *str); extern wchar_t *wcspart(const wchar_t *wstr, int columns, t_bool pad); - extern wchar_t *wstrunc(const wchar_t *wmessage, wchar_t *wbuf, size_t wbuf_len, int len); + extern wchar_t *wstrunc(const wchar_t *wmessage, int len); extern wchar_t *my_wcsdup(const wchar_t *wstr); #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ -extern char *strunc(const char *message, char *buf, size_t buf_len, int len); #if defined(HAVE_LIBICUUC) && defined(MULTIBYTE_ABLE) && defined(HAVE_UNICODE_UBIDI_H) && !defined(NO_LOCALE) extern char *render_bidi(const char *str, t_bool *is_rtl); #endif /* HAVE_LIBICUUC && MULTIBYTE_ABLE && HAVE_UNICODE_UBIDI_H && !NO_LOCALE */ diff -Nurp tin-1.7.6/include/tin.h tin-1.7.7/include/tin.h --- tin-1.7.6/include/tin.h 2004-08-20 19:08:26.000000000 +0200 +++ tin-1.7.7/include/tin.h 2004-12-10 17:48:59.000000000 +0100 @@ -3,7 +3,7 @@ * Module : tin.h * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-08-20 + * Updated : 2004-10-01 * Notes : #include files, #defines & struct's * * Copyright (c) 1997-2004 Iain Lea , Rich Skrenta @@ -751,7 +751,7 @@ enum rc_state { RC_IGNORE, RC_CHECK, RC_ * case insensitive */ #if 1 /* complex */ -# define NEWS_REGEX "\\b(?:s?news|nntp):(?:(?:(?://(?:(?:[^\\W_](?:(?:-(?!-)|[^\\W_]){0,61}[^\\W_])?|xn--[^\\W_](?:-(?!-)|[^\\W_]){1,57}[^\\W_])\\.)+[a-z]{2,6}\\.?|localhost|(?:(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?))(?::\\d+)?(?(?=[/])[^()\\^\\[\\]{}\\|\\x00-\\x1f\\x7f\\s\"<>'\\\\:,;]+|$))|[^\\^\\[\\]{}\\|\\x00-\\x1f\\x7f\\s<>\"():,;\\\\'/]+)\\b" +# define NEWS_REGEX "\\b(?:s?news|nntp):(?:(?:(?://(?:(?:[^\\W_](?:(?:-(?!-)|[^\\W_]){0,61}[^\\W_])?|xn--[^\\W_](?:-(?!-)|[^\\W_]){1,57}[^\\W_])\\.)+[a-z]{2,6}\\.?|localhost|(?:(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?))(?::\\d+)?(?(?=[/])[^()\\^\\[\\]{}\\|\\x00-\\x1f\\x7f\\s\"<>'\\\\:,;]+|$))|[^\\^\\[\\]{}\\|\\x00-\\x1f\\x7f\\s<>\"():,;\\\\'/]+)\\b" #else # if 1 /* less complex */ # define NEWS_REGEX "\\b(?:s?news|nntp):[^\\s\\*@>]+(?(?=[@])[^\\s\\*@<>()\",/]+|[^\\s\\*<>()\":,/]+)\\b" @@ -1023,9 +1023,9 @@ enum { /* Line number (starting at 0) of 1st non-header data on the screen */ /* ie, size of header */ #define INDEX_TOP 2 -#define INDEX2LNUM(i) (INDEX_TOP + (i) % NOTESLINES) +#define INDEX2LNUM(i) (INDEX_TOP + (i) - currmenu->first) #ifndef USE_CURSES -# define INDEX2SNUM(i) ((i) % NOTESLINES) +# define INDEX2SNUM(i) ((i) - currmenu->first) #endif /* !USE_CURSES */ #define GROUP_MATCH(s1, pat, case) (wildmat(s1, pat, case)) @@ -1778,9 +1778,9 @@ typedef struct { int curr; /* Current cursor pos (cur_groupnum, index_point, thread_index_point) */ int max; /* Max # on current menu (group_top, top_base, top_thread) */ int first; /* First # on current menu */ - int last; /* Last # on current menu (first,last_*_on_screen) */ void (*redraw) (void); /* Redraw function */ void (*draw_arrow) (void); /* Arrow draw */ + void (*draw_item) (int item); /* draw the specified item */ } t_menu; diff -Nurp tin-1.7.6/include/version.h tin-1.7.7/include/version.h --- tin-1.7.6/include/version.h 2004-09-06 11:07:20.000000000 +0200 +++ tin-1.7.7/include/version.h 2004-12-15 16:56:35.000000000 +0100 @@ -3,7 +3,7 @@ * Module : version.h * Author : I. Lea * Created : 1991-04-01 - * Updated : 2003-09-19 + * Updated : 2004-10-19 * Notes : * * Copyright (c) 1991-2004 Iain Lea @@ -40,14 +40,15 @@ # define PRODUCT "tin" # ifndef TIN_AUTOCONF_H -# define VERSION "1.7.6" +# define VERSION "1.7.7" # endif /* !TIN_AUTOCONF_H */ -# define RELEASEDATE "20040906" -# define RELEASENAME "Baleshare" +# define RELEASEDATE "20041215" +# define RELEASENAME "Scalpay" /* config-file versions - must by dotted triples */ # define TINRC_VERSION "1.3.7" # define ATTRIBUTES_VERSION "1.0.3" # define FILTER_VERSION "1.0.0" +# define KEYMAP_VERSION "1.0.0" # define SERVERCONFIG_VERSION "1.0.0" # ifdef VMS diff -Nurp tin-1.7.6/pcre/AUTHORS tin-1.7.7/pcre/AUTHORS --- tin-1.7.6/pcre/AUTHORS 2004-08-20 10:30:52.000000000 +0200 +++ tin-1.7.7/pcre/AUTHORS 2004-11-15 18:44:37.000000000 +0100 @@ -3,4 +3,4 @@ Written by: Philip Hazel University of Cambridge Computing Service, Cambridge, England. Phone: +44 1223 334714. -Copyright (c) 1997-2003 University of Cambridge +Copyright (c) 1997-2004 University of Cambridge +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: -Permission is granted to anyone to use this software for any purpose on any -computer system, and to redistribute it freely, subject to the following -restrictions: - -1. This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -2. The origin of this software must not be misrepresented, either by - explicit claim or by omission. In practice, this means that if you use - PCRE in software that you distribute to others, commercially or - otherwise, you must put a sentence like this - - Regular expression support is provided by the PCRE library package, - which is open source software, written by Philip Hazel, and copyright - by the University of Cambridge, England. - - somewhere reasonably visible in your documentation and in any relevant - files or online help data or similar. A reference to the ftp site for - the source, that is, to - - ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ - - should also be given in the documentation. However, this condition is not - intended to apply to whole chains of software. If package A includes PCRE, - it must acknowledge it, but if package B is software that includes package - A, the condition is not imposed on package B (unless it uses PCRE - independently). - -3. Altered versions must be plainly marked as such, and must not be - misrepresented as being the original software. - -4. If PCRE is embedded in any software that is released under the GNU - General Purpose Licence (GPL), or Lesser General Purpose Licence (LGPL), - then the terms of that licence shall supersede any condition above with - which it is incompatible. + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. -The documentation for PCRE, supplied in the "doc" directory, is distributed -under the same terms as the software itself. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of Cambridge nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. End diff -Nurp tin-1.7.6/pcre/ChangeLog tin-1.7.7/pcre/ChangeLog --- tin-1.7.6/pcre/ChangeLog 2004-08-20 10:30:52.000000000 +0200 +++ tin-1.7.7/pcre/ChangeLog 2004-11-15 18:44:37.000000000 +0100 @@ -1,6 +1,142 @@ ChangeLog for PCRE ------------------ +Version 5.0 13-Sep-04 +--------------------- + + 1. Internal change: literal characters are no longer packed up into items + containing multiple characters in a single byte-string. Each character + is now matched using a separate opcode. However, there may be more than one + byte in the character in UTF-8 mode. + + 2. The pcre_callout_block structure has two new fields: pattern_position and + next_item_length. These contain the offset in the pattern to the next match + item, and its length, respectively. + + 3. The PCRE_AUTO_CALLOUT option for pcre_compile() requests the automatic + insertion of callouts before each pattern item. Added the /C option to + pcretest to make use of this. + + 4. On the advice of a Windows user, the lines + + #if defined(_WIN32) || defined(WIN32) + _setmode( _fileno( stdout ), 0x8000 ); + #endif /* defined(_WIN32) || defined(WIN32) */ + + have been added to the source of pcretest. This apparently does useful + magic in relation to line terminators. + + 5. Changed "r" and "w" in the calls to fopen() in pcretest to "rb" and "wb" + for the benefit of those environments where the "b" makes a difference. + + 6. The icc compiler has the same options as gcc, but "configure" doesn't seem + to know about it. I have put a hack into configure.in that adds in code + to set GCC=yes if CC=icc. This seems to end up at a point in the + generated configure script that is early enough to affect the setting of + compiler options, which is what is needed, but I have no means of testing + whether it really works. (The user who reported this had patched the + generated configure script, which of course I cannot do.) + + LATER: After change 22 below (new libtool files), the configure script + seems to know about icc (and also ecc). Therefore, I have commented out + this hack in configure.in. + + 7. Added support for pkg-config (2 patches were sent in). + + 8. Negated POSIX character classes that used a combination of internal tables + were completely broken. These were [[:^alpha:]], [[:^alnum:]], and + [[:^ascii]]. Typically, they would match almost any characters. The other + POSIX classes were not broken in this way. + + 9. Matching the pattern "\b.*?" against "ab cd", starting at offset 1, failed + to find the match, as PCRE was deluded into thinking that the match had to + start at the start point or following a newline. The same bug applied to + patterns with negative forward assertions or any backward assertions + preceding ".*" at the start, unless the pattern required a fixed first + character. This was a failing pattern: "(?!.bcd).*". The bug is now fixed. + +10. In UTF-8 mode, when moving forwards in the subject after a failed match + starting at the last subject character, bytes beyond the end of the subject + string were read. + +11. Renamed the variable "class" as "classbits" to make life easier for C++ + users. (Previously there was a macro definition, but it apparently wasn't + enough.) + +12. Added the new field "tables" to the extra data so that tables can be passed + in at exec time, or the internal tables can be re-selected. This allows + a compiled regex to be saved and re-used at a later time by a different + program that might have everything at different addresses. + +13. Modified the pcre-config script so that, when run on Solaris, it shows a + -R library as well as a -L library. + +14. The debugging options of pcretest (-d on the command line or D on a + pattern) showed incorrect output for anything following an extended class + that contained multibyte characters and which was followed by a quantifier. + +15. Added optional support for general category Unicode character properties + via the \p, \P, and \X escapes. Unicode property support implies UTF-8 + support. It adds about 90K to the size of the library. The meanings of the + inbuilt class escapes such as \d and \s have NOT been changed. + +16. Updated pcredemo.c to include calls to free() to release the memory for the + compiled pattern. + +17. The generated file chartables.c was being created in the source directory + instead of in the building directory. This caused the build to fail if the + source directory was different from the building directory, and was + read-only. + +18. Added some sample Win commands from Mark Tetrode into the NON-UNIX-USE + file. No doubt somebody will tell me if they don't make sense... Also added + Dan Mooney's comments about building on OpenVMS. + +19. Added support for partial matching via the PCRE_PARTIAL option for + pcre_exec() and the \P data escape in pcretest. + +20. Extended pcretest with 3 new pattern features: + + (i) A pattern option of the form ">rest-of-line" causes pcretest to + write the compiled pattern to the file whose name is "rest-of-line". + This is a straight binary dump of the data, with the saved pointer to + the character tables forced to be NULL. The study data, if any, is + written too. After writing, pcretest reads a new pattern. + + (ii) If, instead of a pattern, " University of Cambridge Computing Service, Cambridge, England. Phone: +44 1223 334714. -Copyright (c) 1997-2003 University of Cambridge +Copyright (c) 1997-2004 University of Cambridge +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: -Permission is granted to anyone to use this software for any purpose on any -computer system, and to redistribute it freely, subject to the following -restrictions: - -1. This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -2. The origin of this software must not be misrepresented, either by - explicit claim or by omission. In practice, this means that if you use - PCRE in software that you distribute to others, commercially or - otherwise, you must put a sentence like this - - Regular expression support is provided by the PCRE library package, - which is open source software, written by Philip Hazel, and copyright - by the University of Cambridge, England. - - somewhere reasonably visible in your documentation and in any relevant - files or online help data or similar. A reference to the ftp site for - the source, that is, to - - ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ - - should also be given in the documentation. However, this condition is not - intended to apply to whole chains of software. If package A includes PCRE, - it must acknowledge it, but if package B is software that includes package - A, the condition is not imposed on package B (unless it uses PCRE - independently). - -3. Altered versions must be plainly marked as such, and must not be - misrepresented as being the original software. - -4. If PCRE is embedded in any software that is released under the GNU - General Purpose Licence (GPL), or Lesser General Purpose Licence (LGPL), - then the terms of that licence shall supersede any condition above with - which it is incompatible. + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. -The documentation for PCRE, supplied in the "doc" directory, is distributed -under the same terms as the software itself. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of Cambridge nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. End diff -Nurp tin-1.7.6/pcre/Makefile.in tin-1.7.7/pcre/Makefile.in --- tin-1.7.6/pcre/Makefile.in 2004-08-20 10:30:52.000000000 +0200 +++ tin-1.7.7/pcre/Makefile.in 2004-11-15 18:44:37.000000000 +0100 @@ -30,7 +30,7 @@ CPPOPTS = \ -DMATCH_LIMIT=10000000 \ -DNEWLINE=10 \ -DPOSIX_MALLOC_THRESHOLD=10 \ - @DEFS@ -I. -I. -I../include + @DEFS@ -I. -I../include RANLIB = @RANLIB@ RM = rm diff -Nurp tin-1.7.6/pcre/Makefile.in-old tin-1.7.7/pcre/Makefile.in-old --- tin-1.7.6/pcre/Makefile.in-old 2004-08-20 10:30:53.000000000 +0200 +++ tin-1.7.7/pcre/Makefile.in-old 2004-11-15 18:44:37.000000000 +0100 @@ -68,6 +68,7 @@ CC_FOR_BUILD = @CC_FOR_BUILD@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ +UCP = @UCP@ UTF8 = @UTF8@ NEWLINE = @NEWLINE@ POSIX_MALLOC_THRESHOLD = @POSIX_MALLOC_THRESHOLD@ @@ -119,10 +120,14 @@ libpcreposix.la: libpcre.la pcreposix.@O $(LINKLIB) -rpath $(LIBDIR) libpcre.la -version-info \ '$(PCREPOSIXLIBVERSION)' -o libpcreposix.la pcreposix.lo -pcre.@OBJEXT@: $(top_srcdir)/chartables.c $(top_srcdir)/pcre.c \ +# Note that chartables.c is in the current directory, not the source directory. + +pcre.@OBJEXT@: chartables.c $(top_srcdir)/pcre.c \ $(top_srcdir)/internal.h $(top_srcdir)/printint.c \ + $(top_srcdir)/ucp.c $(top_srcdir)/ucp.h $(top_srcdir)/ucpinternal.h \ + $(top_srcdir)/ucptable.c $(top_srcdir)/ucptypetable.c \ pcre.h config.h Makefile - $(LTCOMPILE) $(UTF8) $(POSIX_MALLOC_THRESHOLD) $(top_srcdir)/pcre.c + $(LTCOMPILE) $(UTF8) $(UCP) $(POSIX_MALLOC_THRESHOLD) $(top_srcdir)/pcre.c pcreposix.@OBJEXT@: $(top_srcdir)/pcreposix.c $(top_srcdir)/pcreposix.h \ $(top_srcdir)/internal.h pcre.h config.h Makefile @@ -138,15 +143,15 @@ get.@OBJEXT@: $(top_srcdir)/get study.@OBJEXT@: $(top_srcdir)/study.c $(top_srcdir)/internal.h \ pcre.h config.h Makefile - $(LTCOMPILE) $(UTF8) $(top_srcdir)/study.c + $(LTCOMPILE) $(UTF8) $(UCP) $(top_srcdir)/study.c pcretest.@OBJEXT@: $(top_srcdir)/pcretest.c $(top_srcdir)/internal.h \ $(top_srcdir)/printint.c \ pcre.h config.h Makefile - $(CC) -c $(CFLAGS) -I. $(UTF8) $(LINK_SIZE) $(top_srcdir)/pcretest.c + $(CC) -c $(CFLAGS) -I. $(UTF8) $(UCP) $(LINK_SIZE) $(top_srcdir)/pcretest.c pcregrep.@OBJEXT@: $(top_srcdir)/pcregrep.c pcre.h Makefile config.h - $(CC) -c $(CFLAGS) -I. $(UTF8) $(PCREGREP_OSTYPE) $(top_srcdir)/pcregrep.c + $(CC) -c $(CFLAGS) -I. $(UTF8) $(UCP) $(PCREGREP_OSTYPE) $(top_srcdir)/pcregrep.c # Some Windows-specific targets for MinGW. Do not use for Cygwin. @@ -198,10 +203,11 @@ wininstall : winshared -strip $(DESTDIR)$(BINDIR)/pcregrep@EXEEXT@ -strip $(DESTDIR)$(BINDIR)/pcretest@EXEEXT@ -# An auxiliary program makes the default character table source +# An auxiliary program makes the default character table source. This is put +# in the current directory, NOT the $top_srcdir directory. -$(top_srcdir)/chartables.c: dftables - ./dftables $(top_srcdir)/chartables.c +chartables.c: dftables + ./dftables chartables.c dftables.@BUILD_OBJEXT@: $(top_srcdir)/dftables.c $(top_srcdir)/maketables.c \ $(top_srcdir)/internal.h pcre.h config.h Makefile @@ -253,6 +259,8 @@ install: all @ON_WINDOWS@ wininst $(LIBTOOL) --mode=install $(INSTALL) pcregrep@EXEEXT@ $(DESTDIR)$(BINDIR)/pcregrep@EXEEXT@ $(LIBTOOL) --mode=install $(INSTALL) pcretest@EXEEXT@ $(DESTDIR)$(BINDIR)/pcretest@EXEEXT@ $(INSTALL) pcre-config $(DESTDIR)$(BINDIR)/pcre-config + $(mkinstalldirs) $(DESTDIR)$(LIBDIR)/pkgconfig + $(INSTALL) libpcre.pc $(DESTDIR)$(LIBDIR)/pkgconfig/libpcre.pc # We deliberately omit dftables and chartables.c from 'make clean'; once made # chartables.c shouldn't change, and if people have edited the tables by hand, diff -Nurp tin-1.7.6/pcre/NEWS tin-1.7.7/pcre/NEWS --- tin-1.7.6/pcre/NEWS 2004-08-20 10:30:53.000000000 +0200 +++ tin-1.7.7/pcre/NEWS 2004-11-15 18:44:37.000000000 +0100 @@ -1,6 +1,53 @@ News about PCRE releases ------------------------ +Release 5.0 13-Sep-04 +--------------------- + +The licence under which PCRE is released has been changed to the more +conventional "BSD" licence. + +In the code, some bugs have been fixed, and there are also some major changes +in this release (which is why I've increased the number to 5.0). Some changes +are internal rearrangements, and some provide a number of new facilities. The +new features are: + +1. There's an "automatic callout" feature that inserts callouts before every + item in the regex, and there's a new callout field that gives the position + in the pattern - useful for debugging and tracing. + +2. The extra_data structure can now be used to pass in a set of character + tables at exec time. This is useful if compiled regex are saved and re-used + at a later time when the tables may not be at the same address. If the + default internal tables are used, the pointer saved with the compiled + pattern is now set to NULL, which means that you don't need to do anything + special unless you are using custom tables. + +3. It is possible, with some restrictions on the content of the regex, to + request "partial" matching. A special return code is given if all of the + subject string matched part of the regex. This could be useful for testing + an input field as it is being typed. + +4. There is now some optional support for Unicode character properties, which + means that the patterns items such as \p{Lu} and \X can now be used. Only + the general category properties are supported. If PCRE is compiled with this + support, an additional 90K data structure is include, which increases the + size of the library dramatically. + +5. There is support for saving compiled patterns and re-using them later. + +6. There is support for running regular expressions that were compiled on a + different host with the opposite endianness. + +7. The pcretest program has been extended to accommodate the new features. + +The main internal rearrangement is that sequences of literal characters are no +longer handled as strings. Instead, each character is handled on its own. This +makes some UTF-8 handling easier, and makes the support of partial matching +possible. Compiled patterns containing long literal strings will be larger as a +result of this change; I hope that performance will not be much affected. + + Release 4.5 01-Dec-03 --------------------- diff -Nurp tin-1.7.6/pcre/NON-UNIX-USE tin-1.7.7/pcre/NON-UNIX-USE --- tin-1.7.6/pcre/NON-UNIX-USE 2004-08-20 10:30:53.000000000 +0200 +++ tin-1.7.7/pcre/NON-UNIX-USE 2004-11-15 18:44:38.000000000 +0100 @@ -1,19 +1,25 @@ Compiling PCRE on non-Unix systems ---------------------------------- -See below for comments on Cygwin or MinGW usage. I (Philip Hazel) have no -knowledge of Windows sytems and how their libraries work. The items in the -PCRE Makefile that relate to anything other than Unix-like systems have been -contributed by PCRE users. There are some other comments and files in the -Contrib directory on the ftp site that you may find useful. +See below for comments on Cygwin or MinGW and OpenVMS usage. I (Philip Hazel) +have no knowledge of Windows or VMS sytems and how their libraries work. The +items in the PCRE Makefile that relate to anything other than Unix-like systems +have been contributed by PCRE users. There are some other comments and files in +the Contrib directory on the ftp site that you may find useful. See -The following are generic comments about building PCRE: + ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Contrib If you want to compile PCRE for a non-Unix system (or perhaps, more strictly, -for a system that does not support "configure" and make files), note that PCRE -consists entirely of code written in Standard C, and so should compile -successfully on any machine with a Standard C compiler and library, using -normal compiling commands to do the following: +for a system that does not support "configure" and "make" files), note that +PCRE consists entirely of code written in Standard C, and so should compile +successfully on any system that has a Standard C compiler and library. + + +GENERIC INSTRUCTIONS + +The following are generic comments about building PCRE. The interspersed +indented commands are suggestions from Mark Tetrode as to which commands you +might use on a Windows system to build a static library. (1) Copy or rename the file config.in as config.h, and change the macros that define HAVE_STRERROR and HAVE_MEMMOVE to define them as 1 rather than 0. @@ -23,32 +29,85 @@ particular, if you want to force a speci the NEWLINE macro. The default is to use '\n', thereby using whatever value your compiler gives to '\n'. + rem Mark Tetrode's commands + copy config.in config.h + rem Use write, because notepad cannot handle UNIX files. Change values. + write config.h + (2) Copy or rename the file pcre.in as pcre.h, and change the macro definitions for PCRE_MAJOR, PCRE_MINOR, and PCRE_DATE near its start to the values set in configure.in. + rem Mark Tetrode's commands + copy pcre.in pcre.h + rem Read values from configure.in + write configure.in + rem Change values + write pcre.h + (3) Compile dftables.c as a stand-alone program, and then run it with the single argument "chartables.c". This generates a set of standard character tables and writes them to that file. + rem Mark Tetrode's commands + rem Compile & run + cl -DSUPPORT_UTF8 dftables.c + dftables.exe > chartables.c + (4) Compile maketables.c, get.c, study.c and pcre.c and link them all together into an object library in whichever form your system keeps such libraries. This is the pcre library (chartables.c is included by means of an #include directive). If your system has static and shared libraries, you may have to do this once for each type. + rem Mark Tetrode's commands, for a static library + rem Compile & lib + cl -DSUPPORT_UTF8 -DPOSIX_MALLOC_THRESHOLD=10 /c maketables.c get.c study.c pcre.c + lib /OUT:pcre.lib maketables.obj get.obj study.obj pcre.obj + (5) Similarly, compile pcreposix.c and link it (on its own) as the pcreposix library. + rem Mark Tetrode's commands, for a static library + rem Compile & lib + cl -DSUPPORT_UTF8 -DPOSIX_MALLOC_THRESHOLD=10 /c pcreposix.c + lib /OUT:pcreposix.lib pcreposix.obj + (6) Compile the test program pcretest.c. This needs the functions in the pcre and pcreposix libraries when linking. + rem Mark Tetrode's commands + rem compile & link + cl pcretest.c pcre.lib pcreposix.lib + (7) Run pcretest on the testinput files in the testdata directory, and check that the output matches the corresponding testoutput files. You must use the -i option when checking testinput2. Note that the supplied files are in Unix format, with just LF characters as line terminators. You may need to edit them to change this if your system uses a different convention. + rem Mark Tetrode's commands + rem Make a change, i.e. space, backspace, and save again - do this for all + rem to change UNIX to Win, \n to \n\r + write testoutput1 + write testoutput2 + write testoutput3 + write testoutput4 + write testoutput5 + pcretest testdata\testinput1 testdata\myoutput1 + windiff testdata\testoutput1 testdata\myoutput1 + pcretest -i testdata\testinput2 testdata\myoutput2 + windiff testdata\testoutput2 testdata\myoutput2 + pcretest testdata\testinput3 testdata\myoutput3 + windiff testdata\testoutput3 testdata\myoutput3 + pcretest testdata\testinput4 testdata\myoutput4 + windiff testdata\testoutput4 testdata\myoutput4 + pcretest testdata\testinput5 testdata\myoutput5 + windiff testdata\testoutput5 testdata\myoutput5 + + +FURTHER REMARKS + If you have a system without "configure" but where you can use a Makefile, edit Makefile.in to create Makefile, substituting suitable values for the variables at the head of the file. @@ -119,4 +178,67 @@ void (*pcre_free)(void *) = free; #endif ========================= + +BUILDING PCRE ON OPENVMS + +Dan Mooney sent the following comments about building PCRE on OpenVMS: + +"It was quite easy to compile and link the library. I don't have a formal +make file but the attached file [reproduced below] contains the OpenVMS DCL +commands I used to build the library. I had to add #define +POSIX_MALLOC_THRESHOLD 10 to pcre.h since it was not defined anywhere. + +The library was built on: +O/S: HP OpenVMS v7.3-1 +Compiler: Compaq C v6.5-001-48BCD +Linker: vA13-01 + +The test results did not match 100% due to the issues you mention in your +documentation regarding isprint(), iscntrl(), isgraph() and ispunct(). I +modified some of the character tables temporarily and was able to get the +results to match. Tests using the fr locale did not match since I don't have +that locale loaded. The study size was always reported to be 3 less than the +value in the standard test output files." + +========================= +$! This DCL procedure builds PCRE on OpenVMS +$! +$! I followed the instructions in the non-unix-use file in the distribution. +$! +$ COMPILE == "CC/LIST/NOMEMBER_ALIGNMENT/PREFIX_LIBRARY_ENTRIES=ALL_ENTRIES +$ COMPILE DFTABLES.C +$ LINK/EXE=DFTABLES.EXE DFTABLES.OBJ +$ RUN DFTABLES.EXE/OUTPUT=CHARTABLES.C +$ COMPILE MAKETABLES.C +$ COMPILE GET.C +$ COMPILE STUDY.C +$! I had to set POSIX_MALLOC_THRESHOLD to 10 in PCRE.H since the symbol +$! did not seem to be defined anywhere. +$! I edited pcre.h and added #DEFINE SUPPORT_UTF8 to enable UTF8 support. +$ COMPILE PCRE.C +$ LIB/CREATE PCRE MAKETABLES.OBJ, GET.OBJ, STUDY.OBJ, PCRE.OBJ +$! I had to set POSIX_MALLOC_THRESHOLD to 10 in PCRE.H since the symbol +$! did not seem to be defined anywhere. +$ COMPILE PCREPOSIX.C +$ LIB/CREATE PCREPOSIX PCREPOSIX.OBJ +$ COMPILE PCRETEST.C +$ LINK/EXE=PCRETEST.EXE PCRETEST.OBJ, PCRE/LIB, PCREPOSIX/LIB +$! C programs that want access to command line arguments must be +$! defined as a symbol +$ PCRETEST :== "$ SYS$ROADSUSERS:[DMOONEY.REGEXP]PCRETEST.EXE" +$! Arguments must be enclosed in quotes. +$ PCRETEST "-C" +$! Test results: +$! +$! The test results did not match 100%. The functions isprint(), iscntrl(), +$! isgraph() and ispunct() on OpenVMS must not produce the same results +$! as the system that built the test output files provided with the +$! distribution. +$! +$! The study size did not match and was always 3 less on OpenVMS. +$! +$! Locale could not be set to fr +$! +========================= + **** diff -Nurp tin-1.7.6/pcre/README tin-1.7.7/pcre/README --- tin-1.7.6/pcre/README 2004-08-20 10:30:53.000000000 +0200 +++ tin-1.7.7/pcre/README 2004-11-15 18:44:38.000000000 +0100 @@ -22,6 +22,28 @@ ensure that they link with PCRE's libpcr up the "real" POSIX functions of the same name. +Documentation for PCRE +---------------------- + +If you install PCRE in the normal way, you will end up with an installed set of +man pages whose names all start with "pcre". The one that is called "pcre" +lists all the others. In addition to these man pages, the PCRE documentation is +supplied in two other forms; however, as there is no standard place to install +them, they are left in the doc directory of the unpacked source distribution. +These forms are: + + 1. Files called doc/pcre.txt, doc/pcregrep.txt, and doc/pcretest.txt. The + first of these is a concatenation of the text forms of all the section 3 + man pages except those that summarize individual functions. The other two + are the text forms of the section 1 man pages for the pcregrep and + pcretest commands. Text forms are provided for ease of scanning with text + editors or similar tools. + + 2. A subdirectory called doc/html contains all the documentation in HTML + form, hyperlinked in various ways, and rooted in a file called + doc/index.html. + + Contributions by users of PCRE ------------------------------ @@ -46,7 +68,7 @@ INSTALL. Most commonly, people build PCRE within its own distribution directory, and in this case, on many systems, just running "./configure" is sufficient, but the -usual methods of changing standard defaults are available. For example, +usual methods of changing standard defaults are available. For example: CFLAGS='-O2 -Wall' ./configure --prefix=/opt/local @@ -69,6 +91,13 @@ library. You can read more about them in for handling UTF-8 is not included in the library. (Even when included, it still has to be enabled by an option at run time.) +. If, in addition to support for UTF-8 character strings, you want to include + support for the \P, \p, and \X sequences that recognize Unicode character + properties, you must add --enable-unicode-properties to the "configure" + command. This adds about 90K to the size of the library (in the form of a + property table); only the basic two-letter properties such as Lu are + supported. + . You can build PCRE to recognized CR or NL as the newline character, instead of whatever your compiler uses for "\n", by adding --newline-is-cr or --newline-is-nl to the "configure" command, respectively. Only do this if you @@ -111,12 +140,14 @@ library. You can read more about them in on the "configure" command. PCRE runs more slowly in this mode, but it may be necessary in environments with limited stack sizes. -The "configure" script builds five files: +The "configure" script builds seven files: -. libtool is a script that builds shared and/or static libraries +. pcre.h is build by copying pcre.in and making substitutions . Makefile is built by copying Makefile.in and making substitutions. . config.h is built by copying config.in and making substitutions. . pcre-config is built by copying pcre-config.in and making substitutions. +. libpcre.pc is data for the pkg-config command, built from libpcre.pc.in +. libtool is a script that builds shared and/or static libraries . RunTest is a script for running tests Once "configure" has run, you can run "make". It builds two libraries called @@ -125,20 +156,33 @@ command. You can use "make install" to c pcre.h and pcreposix.h, and the man pages to appropriate live directories on your system, in the normal way. + +Retrieving configuration information on Unix-like systems +--------------------------------------------------------- + Running "make install" also installs the command pcre-config, which can be used to recall information about the PCRE configuration and installation. For -example, +example: pcre-config --version prints the version number, and - pcre-config --libs + pcre-config --libs outputs information about where the library is installed. This command can be included in makefiles for programs that use PCRE, saving the programmer from having to remember too many details. +The pkg-config command is another system for saving and retrieving information +about installed libraries. Instead of separate commands for each library, a +single command is used. For example: + + pkg-config --cflags pcre + +The data is held in *.pc files that are installed in a directory called +pkgconfig. + Shared libraries on Unix-like systems ------------------------------------- @@ -158,7 +202,7 @@ installed themselves. However, the versi use the uninstalled libraries. To build PCRE using static libraries only you must use --disable-shared when -configuring it. For example +configuring it. For example: ./configure --prefix=/usr/gnu --disable-shared @@ -202,9 +246,9 @@ configuring process. (This can also be r The script runs the pcretest test program (which is documented in its own man page) on each of the testinput files (in the testdata directory) in turn, and compares the output with the contents of the corresponding testoutput file. -A file called testtry is used to hold the output from pcretest. To run pcretest -on just one of the test files, give its number as an argument to RunTest, for -example: +A file called testtry is used to hold the main output from pcretest +(testsavedregex is also used as a working file). To run pcretest on just one of +the test files, give its number as an argument to RunTest, for example: RunTest 2 @@ -247,19 +291,23 @@ running "configure". This file can be al provided you are running Perl 5.8 or higher. (For Perl 5.6, a small patch, commented in the script, can be be used.) -The fifth and final file tests error handling with UTF-8 encoding, and internal -UTF-8 features of PCRE that are not relevant to Perl. +The fifth test checks error handling with UTF-8 encoding, and internal UTF-8 +features of PCRE that are not relevant to Perl. + +The sixth and final test checks the support for Unicode character properties. +It it not run automatically unless PCRE is built with Unicode property support. +To to this you must set --enable-unicode-properties when running "configure". Character tables ---------------- -PCRE uses four tables for manipulating and identifying characters. The final -argument of the pcre_compile() function is a pointer to a block of memory -containing the concatenated tables. A call to pcre_maketables() can be used to -generate a set of tables in the current locale. If the final argument for -pcre_compile() is passed as NULL, a set of default tables that is built into -the binary is used. +PCRE uses four tables for manipulating and identifying characters whose values +are less than 256. The final argument of the pcre_compile() function is a +pointer to a block of memory containing the concatenated tables. A call to +pcre_maketables() can be used to generate a set of tables in the current +locale. If the final argument for pcre_compile() is passed as NULL, a set of +default tables that is built into the binary is used. The source file called chartables.c contains the default set of tables. This is not supplied in the distribution, but is built by the program dftables @@ -299,12 +347,20 @@ The distribution should contain the foll headers: dftables.c auxiliary program for building chartables.c + get.c ) maketables.c ) - study.c ) source of - pcre.c ) the functions + study.c ) source of the functions + pcre.c ) in the library pcreposix.c ) printint.c ) + + ucp.c ) + ucp.h ) source for the code that is used for + ucpinternal.h ) Unicode property handling + ucptable.c ) + ucptypetable.c ) + pcre.in "source" for the header for the external API; pcre.h is built from this by "configure" pcreposix.h header for the external POSIX wrapper API @@ -335,7 +391,9 @@ The distribution should contain the foll doc/pcretest.txt plain text documentation of test program doc/perltest.txt plain text documentation of Perl test program install-sh a shell script for installing files + libpcre.pc.in "source" for libpcre.pc for pkg-config ltmain.sh file used to build a libtool script + mkinstalldirs script for making install directories pcretest.c comprehensive test program pcredemo.c simple demonstration of coding calls to PCRE perltest Perl test program @@ -346,15 +404,19 @@ The distribution should contain the foll testdata/testinput3 test data for locale-specific tests testdata/testinput4 test data for UTF-8 tests compatible with Perl testdata/testinput5 test data for other UTF-8 tests + testdata/testinput6 test data for Unicode property support tests testdata/testoutput1 test results corresponding to testinput1 testdata/testoutput2 test results corresponding to testinput2 testdata/testoutput3 test results corresponding to testinput3 testdata/testoutput4 test results corresponding to testinput4 testdata/testoutput5 test results corresponding to testinput5 + testdata/testoutput6 test results corresponding to testinput6 (C) Auxiliary files for Win32 DLL dll.mk + libpcre.def + libpcreposix.def pcre.def (D) Auxiliary file for VPASCAL @@ -362,4 +424,4 @@ The distribution should contain the foll makevp.bat Philip Hazel -December 2003 +September 2004 diff -Nurp tin-1.7.6/pcre/RunTest.in tin-1.7.7/pcre/RunTest.in --- tin-1.7.6/pcre/RunTest.in 2004-08-20 10:30:53.000000000 +0200 +++ tin-1.7.7/pcre/RunTest.in 2004-11-15 18:44:38.000000000 +0100 @@ -15,6 +15,7 @@ do2=no do3=no do4=no do5=no +do6=no while [ $# -gt 0 ] ; do case $1 in @@ -23,29 +24,57 @@ while [ $# -gt 0 ] ; do 3) do3=yes;; 4) do4=yes;; 5) do5=yes;; + 6) do6=yes;; *) echo "Unknown test number $1"; exit 1;; esac shift done +if [ "@LINK_SIZE@" != "" -a "@LINK_SIZE@" != "-DLINK_SIZE=2" ] ; then + if [ $do2 = yes ] ; then + echo "Can't run test 2 with an internal link size other than 2" + exit 1 + fi + if [ $do5 = yes ] ; then + echo "Can't run test 5 with an internal link size other than 2" + exit 1 + fi + if [ $do6 = yes ] ; then + echo "Can't run test 6 with an internal link size other than 2" + exit 1 + fi +fi + if [ "@UTF8@" = "" ] ; then if [ $do4 = yes ] ; then - echo "Can't run test 4 because UFT8 support is not configured" + echo "Can't run test 4 because UTF-8 support is not configured" exit 1 fi if [ $do5 = yes ] ; then - echo "Can't run test 5 because UFT8 support is not configured" + echo "Can't run test 5 because UTF-8 support is not configured" + exit 1 + fi + if [ $do6 = yes ] ; then + echo "Can't run test 6 because UTF-8 support is not configured" exit 1 fi fi -if [ $do1 = no -a $do2 = no -a $do3 = no -a $do4 = no -a\ - $do5 = no ] ; then +if [ "@UCP@" = "" ] ; then + if [ $do6 = yes ] ; then + echo "Can't run test 6 because Unicode property support is not configured" + exit 1 + fi +fi + +if [ $do1 = no -a $do2 = no -a $do3 = no -a $do4 = no -a \ + $do5 = no -a $do6 = no ] ; then do1=yes - do2=yes + do2=yes do3=yes if [ "@UTF8@" != "" ] ; then do4=yes; fi if [ "@UTF8@" != "" ] ; then do5=yes; fi + if [ "@UTF8@" != "" -a "@UCP@" != "" ] ; then do6=yes; fi fi # Show which release @@ -55,7 +84,7 @@ fi # Primary test, Perl-compatible if [ $do1 = yes ] ; then - echo "Testing main functionality (Perl compatible)" + echo "Test 1: main functionality (Perl compatible)" ./pcretest $testdata/testinput1 testtry if [ $? = 0 ] ; then $cf testtry $testdata/testoutput1 @@ -68,13 +97,17 @@ fi # PCRE tests that are not Perl-compatible - API & error tests, mostly if [ $do2 = yes ] ; then - echo "Testing API and error handling (not Perl compatible)" - ./pcretest -i $testdata/testinput2 testtry - if [ $? = 0 ] ; then - $cf testtry $testdata/testoutput2 - if [ $? != 0 ] ; then exit 1; fi - else exit 1 - fi + if [ "@LINK_SIZE@" = "" -o "@LINK_SIZE@" = "-DLINK_SIZE=2" ] ; then + echo "Test 2: API and error handling (not Perl compatible)" + ./pcretest -i $testdata/testinput2 testtry + if [ $? = 0 ] ; then + $cf testtry $testdata/testoutput2 + if [ $? != 0 ] ; then exit 1; fi + else exit 1 + fi + else + echo Test 2 skipped for link size other than 2 \(@LINK_SIZE@\) + fi fi if [ $do1 = yes -a $do2 = yes ] ; then @@ -88,7 +121,7 @@ fi if [ $do3 = yes ] ; then locale -a | grep '^fr_FR$' >/dev/null if [ $? -eq 0 ] ; then - echo "Testing locale-specific features (using 'fr_FR' locale)" + echo "Test 3: locale-specific features (using 'fr_FR' locale)" ./pcretest $testdata/testinput3 testtry if [ $? = 0 ] ; then $cf testtry $testdata/testoutput3 @@ -113,7 +146,7 @@ fi # Additional tests for UTF8 support if [ $do4 = yes ] ; then - echo "Testing UTF-8 support (Perl compatible)" + echo "Test 4: UTF-8 support (Perl compatible)" ./pcretest $testdata/testinput4 testtry if [ $? = 0 ] ; then $cf testtry $testdata/testoutput4 @@ -125,15 +158,35 @@ if [ $do4 = yes ] ; then fi if [ $do5 = yes ] ; then - echo "Testing API and internals for UTF-8 support (not Perl compatible)" - ./pcretest $testdata/testinput5 testtry - if [ $? = 0 ] ; then - $cf testtry $testdata/testoutput5 - if [ $? != 0 ] ; then exit 1; fi - else exit 1 - fi - echo "UTF8 internals test ran OK" - echo " " + if [ "@LINK_SIZE@" = "" -o "@LINK_SIZE@" = "-DLINK_SIZE=2" ] ; then + echo "Test 5: API and internals for UTF-8 support (not Perl compatible)" + ./pcretest $testdata/testinput5 testtry + if [ $? = 0 ] ; then + $cf testtry $testdata/testoutput5 + if [ $? != 0 ] ; then exit 1; fi + else exit 1 + fi + echo "UTF8 internals test ran OK" + echo " " + else + echo Test 5 skipped for link size other than 2 \(@LINK_SIZE@\) + fi +fi + +if [ $do6 = yes ] ; then + if [ "@LINK_SIZE@" = "" -o "@LINK_SIZE@" = "-DLINK_SIZE=2" ] ; then + echo "Test 6: Unicode property support" + ./pcretest $testdata/testinput6 testtry + if [ $? = 0 ] ; then + $cf testtry $testdata/testoutput6 + if [ $? != 0 ] ; then exit 1; fi + else exit 1 + fi + echo "Unicode properties test ran OK" + echo " " + else + echo Test 6 skipped for link size other than 2 \(@LINK_SIZE@\) + fi fi # End diff -Nurp tin-1.7.6/pcre/configure.in tin-1.7.7/pcre/configure.in --- tin-1.7.6/pcre/configure.in 2004-08-20 10:30:53.000000000 +0200 +++ tin-1.7.7/pcre/configure.in 2004-11-15 18:44:38.000000000 +0100 @@ -20,9 +20,9 @@ dnl macro, and may be treated as octal c dnl digits for minor numbers less than 10. There are unlikely to be dnl that many releases anyway. -PCRE_MAJOR=4 -PCRE_MINOR=5 -PCRE_DATE=01-December-2003 +PCRE_MAJOR=5 +PCRE_MINOR=0 +PCRE_DATE=13-Sep-2004 PCRE_VERSION=${PCRE_MAJOR}.${PCRE_MINOR} dnl Default values for miscellaneous macros @@ -38,6 +38,14 @@ PCRE_POSIXLIB_VERSION=0:0:0 dnl Checks for programs. AC_PROG_CC + +dnl The icc compiler has the same options as gcc, so let the rest of the +dnl configure script think it has gcc when setting up dnl options etc. +dnl This is a nasty hack which no longer seems necessary with the update +dnl to the latest libtool files, so I have commented it out. +dnl +dnl if test "$CC" = "icc" ; then GCC=yes ; fi + AC_PROG_INSTALL AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL @@ -79,6 +87,15 @@ if test "$enableval" = "yes"; then fi ) +dnl Handle --enable-unicode-properties + +AC_ARG_ENABLE(unicode-properties, +[ --enable-unicode-properties enable Unicode properties support], +if test "$enableval" = "yes"; then + UCP=-DSUPPORT_UCP +fi +) + dnl Handle --enable-newline-is-cr AC_ARG_ENABLE(newline-is-cr, @@ -107,7 +124,8 @@ fi ) dnl Handle --disable-stack-for-recursion -AC_ARG_ENABLE(recursion, + +AC_ARG_ENABLE(stack-for-recursion, [ --disable-stack-for-recursion disable use of stack recursion when matching], if test "$enableval" = "no"; then NO_RECURSE=-DNO_RECURSE @@ -143,6 +161,12 @@ dnl Now arrange to build libtool AC_PROG_LIBTOOL +dnl Unicode character property support implies UTF-8 support + +if test "$UCP" != "" ; then + UTF8=-DSUPPORT_UTF8 +fi + dnl "Export" these variables AC_SUBST(BUILD_EXEEXT) @@ -163,6 +187,7 @@ AC_SUBST(PCRE_VERSION) AC_SUBST(PCRE_LIB_VERSION) AC_SUBST(PCRE_POSIXLIB_VERSION) AC_SUBST(POSIX_MALLOC_THRESHOLD) +AC_SUBST(UCP) AC_SUBST(UTF8) dnl Stuff to make MinGW work better. Special treatment is no longer @@ -198,4 +223,4 @@ if test "x$enable_shared" = "xno" ; then fi dnl This must be last; it determines what files are written as well as config.h -AC_OUTPUT(Makefile pcre.h:pcre.in pcre-config:pcre-config.in RunTest:RunTest.in,[chmod a+x RunTest pcre-config]) +AC_OUTPUT(Makefile pcre.h:pcre.in pcre-config:pcre-config.in libpcre.pc:libpcre.pc.in RunTest:RunTest.in,[chmod a+x RunTest pcre-config]) diff -Nurp tin-1.7.6/pcre/dftables.c tin-1.7.7/pcre/dftables.c --- tin-1.7.6/pcre/dftables.c 2004-08-20 10:30:53.000000000 +0200 +++ tin-1.7.7/pcre/dftables.c 2004-11-15 18:44:38.000000000 +0100 @@ -8,29 +8,35 @@ and semantics are as close as possible t Written by: Philip Hazel - Copyright (c) 1997-2003 University of Cambridge + Copyright (c) 1997-2004 University of Cambridge ----------------------------------------------------------------------------- -Permission is granted to anyone to use this software for any purpose on any -computer system, and to redistribute it freely, subject to the following -restrictions: - -1. This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -2. The origin of this software must not be misrepresented, either by - explicit claim or by omission. - -3. Altered versions must be plainly marked as such, and must not be - misrepresented as being the original software. - -4. If PCRE is embedded in any software that is released under the GNU - General Purpose Licence (GPL), then the terms of that licence shall - supersede any condition above with which it is incompatible. ------------------------------------------------------------------------------ +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. -See the file Tech.Notes for some information on the internals. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of Cambridge nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +----------------------------------------------------------------------------- */ diff -Nurp tin-1.7.6/pcre/doc/pcre.3 tin-1.7.7/pcre/doc/pcre.3 --- tin-1.7.6/pcre/doc/pcre.3 2004-08-20 10:30:54.000000000 +0200 +++ tin-1.7.7/pcre/doc/pcre.3 2004-11-15 18:44:39.000000000 +0100 @@ -1,24 +1,25 @@ .TH PCRE 3 .SH NAME PCRE - Perl-compatible regular expressions -.SH DESCRIPTION +.SH INTRODUCTION .rs .sp The PCRE library is a set of functions that implement regular expression pattern matching using the same syntax and semantics as Perl, with just a few -differences. The current implementation of PCRE (release 4.x) corresponds -approximately with Perl 5.8, including support for UTF-8 encoded strings. -However, this support has to be explicitly enabled; it is not the default. - -PCRE is written in C and released as a C library. However, a number of people -have written wrappers and interfaces of various kinds. A C++ class is included -in these contributions, which can be found in the \fIContrib\fR directory at -the primary FTP site, which is: - +differences. The current implementation of PCRE (release 5.x) corresponds +approximately with Perl 5.8, including support for UTF-8 encoded strings and +Unicode general category properties. However, this support has to be explicitly +enabled; it is not the default. +.P +PCRE is written in C and released as a C library. A number of people have +written wrappers and interfaces of various kinds. A C++ class is included in +these contributions, which can be found in the \fIContrib\fR directory at the +primary FTP site, which is: +.sp .\" HTML .\" ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre - +.P Details of exactly which Perl regular expression features are and are not supported by PCRE are given in separate documents. See the .\" HREF @@ -29,93 +30,116 @@ and \fBpcrecompat\fR .\" pages. - +.P Some features of PCRE can be included, excluded, or changed when the library is built. The .\" HREF \fBpcre_config()\fR .\" function makes it possible for a client to discover which features are -available. Documentation about building PCRE for various operating systems can -be found in the \fBREADME\fR file in the source distribution. - -.SH USER DOCUMENTATION +available. The features themselves are described in the +.\" HREF +\fBpcrebuild\fP +.\" +page. Documentation about building PCRE for various operating systems can be +found in the \fBREADME\fP file in the source distribution. +. +. +.SH "USER DOCUMENTATION" .rs .sp -The user documentation for PCRE has been split up into a number of different -sections. In the "man" format, each of these is a separate "man page". In the -HTML format, each is a separate page, linked from the index page. In the plain -text format, all the sections are concatenated, for ease of searching. The -sections are as follows: - +The user documentation for PCRE comprises a number of different sections. In +the "man" format, each of these is a separate "man page". In the HTML format, +each is a separate page, linked from the index page. In the plain text format, +all the sections are concatenated, for ease of searching. The sections are as +follows: +.sp pcre this document pcreapi details of PCRE's native API pcrebuild options for building PCRE pcrecallout details of the callout feature pcrecompat discussion of Perl compatibility - pcregrep description of the \fBpcregrep\fR command + pcregrep description of the \fBpcregrep\fP command + pcrepartial details of the partial matching facility +.\" JOIN pcrepattern syntax and semantics of supported regular expressions pcreperform discussion of performance issues pcreposix the POSIX-compatible API + pcreprecompile details of saving and re-using precompiled patterns pcresample discussion of the sample program - pcretest the \fBpcretest\fR testing command - + pcretest description of the \fBpcretest\fP testing command +.sp In addition, in the "man" and HTML formats, there is a short page for each library function, listing its arguments and results. - +. +. .SH LIMITATIONS .rs .sp There are some size limitations in PCRE but it is hoped that they will never in practice be relevant. - +.P The maximum length of a compiled pattern is 65539 (sic) bytes if PCRE is compiled with the default internal linkage size of 2. If you want to process regular expressions that are truly enormous, you can compile PCRE with an -internal linkage size of 3 or 4 (see the \fBREADME\fR file in the source +internal linkage size of 3 or 4 (see the \fBREADME\fP file in the source distribution and the .\" HREF -\fBpcrebuild\fR +\fBpcrebuild\fP .\" -documentation for details). If these cases the limit is substantially larger. +documentation for details). In these cases the limit is substantially larger. However, the speed of execution will be slower. - +.P All values in repeating quantifiers must be less than 65536. The maximum number of capturing subpatterns is 65535. - +.P There is no limit to the number of non-capturing subpatterns, but the maximum depth of nesting of all kinds of parenthesized subpattern, including capturing subpatterns, assertions, and other types of subpattern, is 200. - +.P The maximum length of a subject string is the largest positive number that an integer variable can hold. However, PCRE uses recursion to handle subpatterns and indefinite repetition. This means that the available stack space may limit the size of a subject string that can be processed by certain patterns. - +.sp .\" HTML -.SH UTF-8 SUPPORT +. +. +.SH "UTF-8 AND UNICODE PROPERTY SUPPORT" .rs .sp -Starting at release 3.3, PCRE has had some support for character strings -encoded in the UTF-8 format. For release 4.0 this has been greatly extended to -cover most common requirements. - +From release 3.3, PCRE has had some support for character strings encoded in +the UTF-8 format. For release 4.0 this was greatly extended to cover most +common requirements, and in release 5.0 additional support for Unicode general +category properties was added. +.P In order process UTF-8 strings, you must build PCRE to include UTF-8 support in the code, and, in addition, you must call .\" HREF -\fBpcre_compile()\fR +\fBpcre_compile()\fP .\" with the PCRE_UTF8 option flag. When you do this, both the pattern and any subject strings that are matched against it are treated as UTF-8 strings instead of just strings of bytes. - +.P If you compile PCRE with UTF-8 support, but do not use it at run time, the library will be a bit bigger, but the additional run time overhead is limited to testing the PCRE_UTF8 flag in several places, so should not be very large. - +.P +If PCRE is built with Unicode character property support (which implies UTF-8 +support), the escape sequences \ep{..}, \eP{..}, and \eX are supported. +The available properties that can be tested are limited to the general +category properties such as Lu for an upper case letter or Nd for a decimal +number. A full list is given in the +.\" HREF +\fBpcrepattern\fP +.\" +documentation. The PCRE library is increased in size by about 90K when Unicode +property support is included. +.P The following comments apply when PCRE is running in UTF-8 mode: - +.P 1. When you set the PCRE_UTF8 flag, the strings passed as patterns and subjects are checked for validity on entry to the relevant functions. If an invalid UTF-8 string is passed, an error return is given. In some situations, you may @@ -126,37 +150,43 @@ is given (respectively) contains only va not diagnose an invalid UTF-8 string. If you pass an invalid UTF-8 string to PCRE when PCRE_NO_UTF8_CHECK is set, the results are undefined. Your program may crash. - -2. In a pattern, the escape sequence \\x{...}, where the contents of the braces +.P +2. In a pattern, the escape sequence \ex{...}, where the contents of the braces is a string of hexadecimal digits, is interpreted as a UTF-8 character whose -code number is the given hexadecimal number, for example: \\x{1234}. If a +code number is the given hexadecimal number, for example: \ex{1234}. If a non-hexadecimal digit appears between the braces, the item is not recognized. This escape sequence can be used either as a literal, or within a character class. - -3. The original hexadecimal escape sequence, \\xhh, matches a two-byte UTF-8 +.P +3. The original hexadecimal escape sequence, \exhh, matches a two-byte UTF-8 character if the value is greater than 127. - +.P 4. Repeat quantifiers apply to complete UTF-8 characters, not to individual -bytes, for example: \\x{100}{3}. - +bytes, for example: \ex{100}{3}. +.P 5. The dot metacharacter matches one UTF-8 character instead of a single byte. - -6. The escape sequence \\C can be used to match a single byte in UTF-8 mode, +.P +6. The escape sequence \eC can be used to match a single byte in UTF-8 mode, but its use can lead to some strange effects. - -7. The character escapes \\b, \\B, \\d, \\D, \\s, \\S, \\w, and \\W correctly +.P +7. The character escapes \eb, \eB, \ed, \eD, \es, \eS, \ew, and \eW correctly test characters of any code value, but the characters that PCRE recognizes as digits, spaces, or word characters remain the same set as before, all with -values less than 256. - -8. Case-insensitive matching applies only to characters whose values are less -than 256. PCRE does not support the notion of "case" for higher-valued -characters. - -9. PCRE does not support the use of Unicode tables and properties or the Perl -escapes \\p, \\P, and \\X. - +values less than 256. This remains true even when PCRE includes Unicode +property support, because to do otherwise would slow down PCRE in many common +cases. If you really want to test for a wider sense of, say, "digit", you +must use Unicode property tests such as \ep{Nd}. +.P +8. Similarly, characters that match the POSIX named character classes are all +low-valued characters. +.P +9. Case-insensitive matching applies only to characters whose values are less +than 128, unless PCRE is built with Unicode property support. Even when Unicode +property support is available, PCRE still uses its own character tables when +checking the case of low-valued characters, so as not to degrade performance. +The Unicode property information is used only for characters with higher +values. +. .SH AUTHOR .rs .sp @@ -167,8 +197,8 @@ University Computing Service, Cambridge CB2 3QG, England. .br Phone: +44 1223 334714 - +.sp .in 0 -Last updated: 20 August 2003 +Last updated: 09 September 2004 .br -Copyright (c) 1997-2003 University of Cambridge. +Copyright (c) 1997-2004 University of Cambridge. diff -Nurp tin-1.7.6/pcre/doc/pcrepattern.3 tin-1.7.7/pcre/doc/pcrepattern.3 --- tin-1.7.6/pcre/doc/pcrepattern.3 2004-08-20 10:30:54.000000000 +0200 +++ tin-1.7.7/pcre/doc/pcrepattern.3 2004-11-15 18:44:39.000000000 +0100 @@ -1,49 +1,49 @@ .TH PCRE 3 .SH NAME PCRE - Perl-compatible regular expressions -.SH PCRE REGULAR EXPRESSION DETAILS +.SH "PCRE REGULAR EXPRESSION DETAILS" .rs .sp The syntax and semantics of the regular expressions supported by PCRE are described below. Regular expressions are also described in the Perl -documentation and in a number of other books, some of which have copious -examples. Jeffrey Friedl's "Mastering Regular Expressions", published by -O'Reilly, covers them in great detail. The description here is intended as -reference documentation. - -The basic operation of PCRE is on strings of bytes. However, there is also -support for UTF-8 character strings. To use this support you must build PCRE to -include UTF-8 support, and then call \fBpcre_compile()\fR with the PCRE_UTF8 -option. How this affects the pattern matching is mentioned in several places -below. There is also a summary of UTF-8 features in the +documentation and in a number of books, some of which have copious examples. +Jeffrey Friedl's "Mastering Regular Expressions", published by O'Reilly, covers +regular expressions in great detail. This description of PCRE's regular +expressions is intended as reference material. +.P +The original operation of PCRE was on strings of one-byte characters. However, +there is now also support for UTF-8 character strings. To use this, you must +build PCRE to include UTF-8 support, and then call \fBpcre_compile()\fP with +the PCRE_UTF8 option. How this affects pattern matching is mentioned in several +places below. There is also a summary of UTF-8 features in the .\" HTML .\" section on UTF-8 support .\" in the main .\" HREF -\fBpcre\fR +\fBpcre\fP .\" page. - +.P A regular expression is a pattern that is matched against a subject string from left to right. Most characters stand for themselves in a pattern, and match the corresponding characters in the subject. As a trivial example, the pattern - +.sp The quick brown fox - +.sp matches a portion of a subject string that is identical to itself. The power of regular expressions comes from the ability to include alternatives and repetitions in the pattern. These are encoded in the pattern by the use of -\fImeta-characters\fR, which do not stand for themselves but instead are +\fImetacharacters\fP, which do not stand for themselves but instead are interpreted in some special way. - -There are two different sets of meta-characters: those that are recognized +.P +There are two different sets of metacharacters: those that are recognized anywhere in the pattern except within square brackets, and those that are -recognized in square brackets. Outside square brackets, the meta-characters are +recognized in square brackets. Outside square brackets, the metacharacters are as follows: - - \\ general escape character with several uses +.sp + \e general escape character with several uses ^ assert start of string (or line, in multiline mode) $ assert end of string (or line, in multiline mode) . match any character except newline (by default) @@ -58,231 +58,376 @@ as follows: + 1 or more quantifier also "possessive quantifier" { start min/max quantifier - +.sp Part of a pattern that is in square brackets is called a "character class". In -a character class the only meta-characters are: - - \\ general escape character +a character class the only metacharacters are: +.sp + \e general escape character ^ negate the class, but only if the first character - indicates character range +.\" JOIN [ POSIX character class (only if followed by POSIX syntax) ] terminates the character class - -The following sections describe the use of each of the meta-characters. - +.sp +The following sections describe the use of each of the metacharacters. +. .SH BACKSLASH .rs .sp The backslash character has several uses. Firstly, if it is followed by a -non-alphameric character, it takes away any special meaning that character may +non-alphanumeric character, it takes away any special meaning that character may have. This use of backslash as an escape character applies both inside and outside character classes. - -For example, if you want to match a * character, you write \\* in the pattern. +.P +For example, if you want to match a * character, you write \e* in the pattern. This escaping action applies whether or not the following character would -otherwise be interpreted as a meta-character, so it is always safe to precede a -non-alphameric with backslash to specify that it stands for itself. In -particular, if you want to match a backslash, you write \\\\. - +otherwise be interpreted as a metacharacter, so it is always safe to precede a +non-alphanumeric with backslash to specify that it stands for itself. In +particular, if you want to match a backslash, you write \e\e. +.P If a pattern is compiled with the PCRE_EXTENDED option, whitespace in the pattern (other than in a character class) and characters between a # outside a character class and the next newline character are ignored. An escaping backslash can be used to include a whitespace or # character as part of the pattern. - +.P If you want to remove the special meaning from a sequence of characters, you -can do so by putting them between \\Q and \\E. This is different from Perl in -that $ and @ are handled as literals in \\Q...\\E sequences in PCRE, whereas in +can do so by putting them between \eQ and \eE. This is different from Perl in +that $ and @ are handled as literals in \eQ...\eE sequences in PCRE, whereas in Perl, $ and @ cause variable interpolation. Note the following examples: - +.sp Pattern PCRE matches Perl matches - - \\Qabc$xyz\\E abc$xyz abc followed by the +.sp +.\" JOIN + \eQabc$xyz\eE abc$xyz abc followed by the contents of $xyz - \\Qabc\\$xyz\\E abc\\$xyz abc\\$xyz - \\Qabc\\E\\$\\Qxyz\\E abc$xyz abc$xyz - -The \\Q...\\E sequence is recognized both inside and outside character classes. - + \eQabc\e$xyz\eE abc\e$xyz abc\e$xyz + \eQabc\eE\e$\eQxyz\eE abc$xyz abc$xyz +.sp +The \eQ...\eE sequence is recognized both inside and outside character classes. +. +. +.\" HTML +.SS "Non-printing characters" +.rs +.sp A second use of backslash provides a way of encoding non-printing characters in patterns in a visible manner. There is no restriction on the appearance of non-printing characters, apart from the binary zero that terminates a pattern, but when a pattern is being prepared by text editing, it is usually easier to use one of the following escape sequences than the binary character it represents: - - \\a alarm, that is, the BEL character (hex 07) - \\cx "control-x", where x is any character - \\e escape (hex 1B) - \\f formfeed (hex 0C) - \\n newline (hex 0A) - \\r carriage return (hex 0D) - \\t tab (hex 09) - \\ddd character with octal code ddd, or backreference - \\xhh character with hex code hh - \\x{hhh..} character with hex code hhh... (UTF-8 mode only) - -The precise effect of \\cx is as follows: if x is a lower case letter, it +.sp + \ea alarm, that is, the BEL character (hex 07) + \ecx "control-x", where x is any character + \ee escape (hex 1B) + \ef formfeed (hex 0C) + \en newline (hex 0A) + \er carriage return (hex 0D) + \et tab (hex 09) + \eddd character with octal code ddd, or backreference + \exhh character with hex code hh + \ex{hhh..} character with hex code hhh... (UTF-8 mode only) +.sp +The precise effect of \ecx is as follows: if x is a lower case letter, it is converted to upper case. Then bit 6 of the character (hex 40) is inverted. -Thus \\cz becomes hex 1A, but \\c{ becomes hex 3B, while \\c; becomes hex +Thus \ecz becomes hex 1A, but \ec{ becomes hex 3B, while \ec; becomes hex 7B. - -After \\x, from zero to two hexadecimal digits are read (letters can be in +.P +After \ex, from zero to two hexadecimal digits are read (letters can be in upper or lower case). In UTF-8 mode, any number of hexadecimal digits may -appear between \\x{ and }, but the value of the character code must be less +appear between \ex{ and }, but the value of the character code must be less than 2**31 (that is, the maximum hexadecimal value is 7FFFFFFF). If characters -other than hexadecimal digits appear between \\x{ and }, or if there is no +other than hexadecimal digits appear between \ex{ and }, or if there is no terminating }, this form of escape is not recognized. Instead, the initial -\\x will be interpreted as a basic hexadecimal escape, with no following -digits, giving a byte whose value is zero. - +\ex will be interpreted as a basic hexadecimal escape, with no following +digits, giving a character whose value is zero. +.P Characters whose value is less than 256 can be defined by either of the two -syntaxes for \\x when PCRE is in UTF-8 mode. There is no difference in the -way they are handled. For example, \\xdc is exactly the same as \\x{dc}. - -After \\0 up to two further octal digits are read. In both cases, if there +syntaxes for \ex when PCRE is in UTF-8 mode. There is no difference in the +way they are handled. For example, \exdc is exactly the same as \ex{dc}. +.P +After \e0 up to two further octal digits are read. In both cases, if there are fewer than two digits, just those that are present are used. Thus the -sequence \\0\\x\\07 specifies two binary zeros followed by a BEL character +sequence \e0\ex\e07 specifies two binary zeros followed by a BEL character (code value 7). Make sure you supply two digits after the initial zero if the -character that follows is itself an octal digit. - +pattern character that follows is itself an octal digit. +.P The handling of a backslash followed by a digit other than 0 is complicated. Outside a character class, PCRE reads it and any following digits as a decimal number. If the number is less than 10, or if there have been at least that many previous capturing left parentheses in the expression, the entire sequence is -taken as a \fIback reference\fR. A description of how this works is given -later, following the discussion of parenthesized subpatterns. - +taken as a \fIback reference\fP. A description of how this works is given +.\" HTML +.\" +later, +.\" +following the discussion of +.\" HTML +.\" +parenthesized subpatterns. +.\" +.P Inside a character class, or if the decimal number is greater than 9 and there have not been that many capturing subpatterns, PCRE re-reads up to three octal digits following the backslash, and generates a single byte from the least significant 8 bits of the value. Any subsequent digits stand for themselves. For example: - - \\040 is another way of writing a space - \\40 is the same, provided there are fewer than 40 +.sp + \e040 is another way of writing a space +.\" JOIN + \e40 is the same, provided there are fewer than 40 previous capturing subpatterns - \\7 is always a back reference - \\11 might be a back reference, or another way of + \e7 is always a back reference +.\" JOIN + \e11 might be a back reference, or another way of writing a tab - \\011 is always a tab - \\0113 is a tab followed by the character "3" - \\113 might be a back reference, otherwise the + \e011 is always a tab + \e0113 is a tab followed by the character "3" +.\" JOIN + \e113 might be a back reference, otherwise the character with octal code 113 - \\377 might be a back reference, otherwise +.\" JOIN + \e377 might be a back reference, otherwise the byte consisting entirely of 1 bits - \\81 is either a back reference, or a binary zero +.\" JOIN + \e81 is either a back reference, or a binary zero followed by the two characters "8" and "1" - +.sp Note that octal values of 100 or greater must not be introduced by a leading zero, because no more than three octal digits are ever read. - +.P All the sequences that define a single byte value or a single UTF-8 character (in UTF-8 mode) can be used both inside and outside character classes. In -addition, inside a character class, the sequence \\b is interpreted as the -backspace character (hex 08). Outside a character class it has a different -meaning (see below). - -The third use of backslash is for specifying generic character types: - - \\d any decimal digit - \\D any character that is not a decimal digit - \\s any whitespace character - \\S any character that is not a whitespace character - \\w any "word" character - \\W any "non-word" character - +addition, inside a character class, the sequence \eb is interpreted as the +backspace character (hex 08), and the sequence \eX is interpreted as the +character "X". Outside a character class, these sequences have different +meanings +.\" HTML +.\" +(see below). +.\" +. +. +.SS "Generic character types" +.rs +.sp +The third use of backslash is for specifying generic character types. The +following are always recognized: +.sp + \ed any decimal digit + \eD any character that is not a decimal digit + \es any whitespace character + \eS any character that is not a whitespace character + \ew any "word" character + \eW any "non-word" character +.sp Each pair of escape sequences partitions the complete set of characters into two disjoint sets. Any given character matches one, and only one, of each pair. - -In UTF-8 mode, characters with values greater than 255 never match \\d, \\s, or -\\w, and always match \\D, \\S, and \\W. - -For compatibility with Perl, \\s does not match the VT character (code 11). -This makes it different from the the POSIX "space" class. The \\s characters +.P +These character type sequences can appear both inside and outside character +classes. They each match one character of the appropriate type. If the current +matching point is at the end of the subject string, all of them fail, since +there is no character to match. +.P +For compatibility with Perl, \es does not match the VT character (code 11). +This makes it different from the the POSIX "space" class. The \es characters are HT (9), LF (10), FF (12), CR (13), and space (32). - -A "word" character is any letter or digit or the underscore character, that is, -any character which can be part of a Perl "word". The definition of letters and -digits is controlled by PCRE's character tables, and may vary if locale- -specific matching is taking place (see +.P +A "word" character is an underscore or any character less than 256 that is a +letter or digit. The definition of letters and digits is controlled by PCRE's +low-valued character tables, and may vary if locale-specific matching is taking +place (see .\" HTML .\" "Locale support" .\" in the .\" HREF -\fBpcreapi\fR +\fBpcreapi\fP .\" -page). For example, in the "fr" (French) locale, some character codes greater -than 128 are used for accented letters, and these are matched by \\w. - -These character type sequences can appear both inside and outside character -classes. They each match one character of the appropriate type. If the current -matching point is at the end of the subject string, all of them fail, since -there is no character to match. - +page). For example, in the "fr_FR" (French) locale, some character codes +greater than 128 are used for accented letters, and these are matched by \ew. +.P +In UTF-8 mode, characters with values greater than 128 never match \ed, \es, or +\ew, and always match \eD, \eS, and \eW. This is true even when Unicode +character property support is available. +. +. +.\" HTML +.SS Unicode character properties +.rs +.sp +When PCRE is built with Unicode character property support, three additional +escape sequences to match generic character types are available when UTF-8 mode +is selected. They are: +.sp + \ep{\fIxx\fP} a character with the \fIxx\fP property + \eP{\fIxx\fP} a character without the \fIxx\fP property + \eX an extended Unicode sequence +.sp +The property names represented by \fIxx\fP above are limited to the +Unicode general category properties. Each character has exactly one such +property, specified by a two-letter abbreviation. For compatibility with Perl, +negation can be specified by including a circumflex between the opening brace +and the property name. For example, \ep{^Lu} is the same as \eP{Lu}. +.P +If only one letter is specified with \ep or \eP, it includes all the properties +that start with that letter. In this case, in the absence of negation, the +curly brackets in the escape sequence are optional; these two examples have +the same effect: +.sp + \ep{L} + \epL +.sp +The following property codes are supported: +.sp + C Other + Cc Control + Cf Format + Cn Unassigned + Co Private use + Cs Surrogate +.sp + L Letter + Ll Lower case letter + Lm Modifier letter + Lo Other letter + Lt Title case letter + Lu Upper case letter +.sp + M Mark + Mc Spacing mark + Me Enclosing mark + Mn Non-spacing mark +.sp + N Number + Nd Decimal number + Nl Letter number + No Other number +.sp + P Punctuation + Pc Connector punctuation + Pd Dash punctuation + Pe Close punctuation + Pf Final punctuation + Pi Initial punctuation + Po Other punctuation + Ps Open punctuation +.sp + S Symbol + Sc Currency symbol + Sk Modifier symbol + Sm Mathematical symbol + So Other symbol +.sp + Z Separator + Zl Line separator + Zp Paragraph separator + Zs Space separator +.sp +Extended properties such as "Greek" or "InMusicalSymbols" are not supported by +PCRE. +.P +Specifying caseless matching does not affect these escape sequences. For +example, \ep{Lu} always matches only upper case letters. +.P +The \eX escape matches any number of Unicode characters that form an extended +Unicode sequence. \eX is equivalent to +.sp + (?>\ePM\epM*) +.sp +That is, it matches a character without the "mark" property, followed by zero +or more characters with the "mark" property, and treats the sequence as an +atomic group +.\" HTML +.\" +(see below). +.\" +Characters with the "mark" property are typically accents that affect the +preceding character. +.P +Matching characters by Unicode property is not fast, because PCRE has to search +a structure that contains data for over fifteen thousand characters. That is +why the traditional escape sequences such as \ed and \ew do not use Unicode +properties in PCRE. +. +. +.\" HTML +.SS "Simple assertions" +.rs +.sp The fourth use of backslash is for certain simple assertions. An assertion specifies a condition that has to be met at a particular point in a match, without consuming any characters from the subject string. The use of -subpatterns for more complicated assertions is described below. The backslashed -assertions are - - \\b matches at a word boundary - \\B matches when not at a word boundary - \\A matches at start of subject - \\Z matches at end of subject or before newline at end - \\z matches at end of subject - \\G matches at first matching position in subject - -These assertions may not appear in character classes (but note that \\b has a +subpatterns for more complicated assertions is described +.\" HTML +.\" +below. +.\" +The backslashed +assertions are: +.sp + \eb matches at a word boundary + \eB matches when not at a word boundary + \eA matches at start of subject + \eZ matches at end of subject or before newline at end + \ez matches at end of subject + \eG matches at first matching position in subject +.sp +These assertions may not appear in character classes (but note that \eb has a different meaning, namely the backspace character, inside a character class). - +.P A word boundary is a position in the subject string where the current character -and the previous character do not both match \\w or \\W (i.e. one matches -\\w and the other matches \\W), or the start or end of the string if the -first or last character matches \\w, respectively. - -The \\A, \\Z, and \\z assertions differ from the traditional circumflex and -dollar (described below) in that they only ever match at the very start and end -of the subject string, whatever options are set. Thus, they are independent of -multiline mode. - -They are not affected by the PCRE_NOTBOL or PCRE_NOTEOL options. If the -\fIstartoffset\fR argument of \fBpcre_exec()\fR is non-zero, indicating that -matching is to start at a point other than the beginning of the subject, \\A -can never match. The difference between \\Z and \\z is that \\Z matches before -a newline that is the last character of the string as well as at the end of the -string, whereas \\z matches only at the end. - -The \\G assertion is true only when the current matching position is at the -start point of the match, as specified by the \fIstartoffset\fR argument of -\fBpcre_exec()\fR. It differs from \\A when the value of \fIstartoffset\fR is -non-zero. By calling \fBpcre_exec()\fR multiple times with appropriate +and the previous character do not both match \ew or \eW (i.e. one matches +\ew and the other matches \eW), or the start or end of the string if the +first or last character matches \ew, respectively. +.P +The \eA, \eZ, and \ez assertions differ from the traditional circumflex and +dollar (described in the next section) in that they only ever match at the very +start and end of the subject string, whatever options are set. Thus, they are +independent of multiline mode. These three assertions are not affected by the +PCRE_NOTBOL or PCRE_NOTEOL options, which affect only the behaviour of the +circumflex and dollar metacharacters. However, if the \fIstartoffset\fP +argument of \fBpcre_exec()\fP is non-zero, indicating that matching is to start +at a point other than the beginning of the subject, \eA can never match. The +difference between \eZ and \ez is that \eZ matches before a newline that is the +last character of the string as well as at the end of the string, whereas \ez +matches only at the end. +.P +The \eG assertion is true only when the current matching position is at the +start point of the match, as specified by the \fIstartoffset\fP argument of +\fBpcre_exec()\fP. It differs from \eA when the value of \fIstartoffset\fP is +non-zero. By calling \fBpcre_exec()\fP multiple times with appropriate arguments, you can mimic Perl's /g option, and it is in this kind of -implementation where \\G can be useful. - -Note, however, that PCRE's interpretation of \\G, as the start of the current +implementation where \eG can be useful. +.P +Note, however, that PCRE's interpretation of \eG, as the start of the current match, is subtly different from Perl's, which defines it as the end of the previous match. In Perl, these can be different when the previously matched string was empty. Because PCRE does just one match at a time, it cannot reproduce this behaviour. - -If all the alternatives of a pattern begin with \\G, the expression is anchored +.P +If all the alternatives of a pattern begin with \eG, the expression is anchored to the starting match position, and the "anchored" flag is set in the compiled regular expression. - -.SH CIRCUMFLEX AND DOLLAR +. +. +.SH "CIRCUMFLEX AND DOLLAR" .rs .sp Outside a character class, in the default matching mode, the circumflex -character is an assertion which is true only if the current matching point is -at the start of the subject string. If the \fIstartoffset\fR argument of -\fBpcre_exec()\fR is non-zero, circumflex can never match if the PCRE_MULTILINE +character is an assertion that is true only if the current matching point is +at the start of the subject string. If the \fIstartoffset\fP argument of +\fBpcre_exec()\fP is non-zero, circumflex can never match if the PCRE_MULTILINE option is unset. Inside a character class, circumflex has an entirely different -meaning (see below). - +meaning +.\" HTML +.\" +(see below). +.\" +.P Circumflex need not be the first character of the pattern if a number of alternatives are involved, but it should be the first thing in each alternative in which it appears if the pattern is ever to match that branch. If all @@ -290,57 +435,68 @@ possible alternatives start with a circu constrained to match only at the start of the subject, it is said to be an "anchored" pattern. (There are also other constructs that can cause a pattern to be anchored.) - -A dollar character is an assertion which is true only if the current matching +.P +A dollar character is an assertion that is true only if the current matching point is at the end of the subject string, or immediately before a newline character that is the last character in the string (by default). Dollar need not be the last character of the pattern if a number of alternatives are involved, but it should be the last item in any branch in which it appears. Dollar has no special meaning in a character class. - +.P The meaning of dollar can be changed so that it matches only at the very end of the string, by setting the PCRE_DOLLAR_ENDONLY option at compile time. This -does not affect the \\Z assertion. - +does not affect the \eZ assertion. +.P The meanings of the circumflex and dollar characters are changed if the PCRE_MULTILINE option is set. When this is the case, they match immediately after and immediately before an internal newline character, respectively, in addition to matching at the start and end of the subject string. For example, -the pattern /^abc$/ matches the subject string "def\\nabc" in multiline mode, -but not otherwise. Consequently, patterns that are anchored in single line mode -because all branches start with ^ are not anchored in multiline mode, and a -match for circumflex is possible when the \fIstartoffset\fR argument of -\fBpcre_exec()\fR is non-zero. The PCRE_DOLLAR_ENDONLY option is ignored if -PCRE_MULTILINE is set. - -Note that the sequences \\A, \\Z, and \\z can be used to match the start and +the pattern /^abc$/ matches the subject string "def\enabc" (where \en +represents a newline character) in multiline mode, but not otherwise. +Consequently, patterns that are anchored in single line mode because all +branches start with ^ are not anchored in multiline mode, and a match for +circumflex is possible when the \fIstartoffset\fP argument of \fBpcre_exec()\fP +is non-zero. The PCRE_DOLLAR_ENDONLY option is ignored if PCRE_MULTILINE is +set. +.P +Note that the sequences \eA, \eZ, and \ez can be used to match the start and end of the subject in both modes, and if all branches of a pattern start with -\\A it is always anchored, whether PCRE_MULTILINE is set or not. - -.SH FULL STOP (PERIOD, DOT) +\eA it is always anchored, whether PCRE_MULTILINE is set or not. +. +. +.SH "FULL STOP (PERIOD, DOT)" .rs .sp Outside a character class, a dot in the pattern matches any one character in the subject, including a non-printing character, but not (by default) newline. In UTF-8 mode, a dot matches any UTF-8 character, which might be more than one -byte long, except (by default) for newline. If the PCRE_DOTALL option is set, +byte long, except (by default) newline. If the PCRE_DOTALL option is set, dots match newlines as well. The handling of dot is entirely independent of the handling of circumflex and dollar, the only relationship being that they both involve newline characters. Dot has no special meaning in a character class. - -.SH MATCHING A SINGLE BYTE +. +. +.SH "MATCHING A SINGLE BYTE" .rs .sp -Outside a character class, the escape sequence \\C matches any one byte, both -in and out of UTF-8 mode. Unlike a dot, it always matches a newline. The -feature is provided in Perl in order to match individual bytes in UTF-8 mode. -Because it breaks up UTF-8 characters into individual bytes, what remains in -the string may be a malformed UTF-8 string. For this reason it is best avoided. - -PCRE does not allow \\C to appear in lookbehind assertions (see below), because -in UTF-8 mode it makes it impossible to calculate the length of the lookbehind. - -.SH SQUARE BRACKETS +Outside a character class, the escape sequence \eC matches any one byte, both +in and out of UTF-8 mode. Unlike a dot, it can match a newline. The feature is +provided in Perl in order to match individual bytes in UTF-8 mode. Because it +breaks up UTF-8 characters into individual bytes, what remains in the string +may be a malformed UTF-8 string. For this reason, the \eC escape sequence is +best avoided. +.P +PCRE does not allow \eC to appear in lookbehind assertions +.\" HTML +.\" +(described below), +.\" +because in UTF-8 mode this would make it impossible to calculate the length of +the lookbehind. +. +. +.\" HTML +.SH "SQUARE BRACKETS AND CHARACTER CLASSES" .rs .sp An opening square bracket introduces a character class, terminated by a closing @@ -348,7 +504,7 @@ square bracket. A closing square bracket closing square bracket is required as a member of the class, it should be the first data character in the class (after an initial circumflex, if present) or escaped with a backslash. - +.P A character class matches a single character in the subject. In UTF-8 mode, the character may occupy more than one byte. A matched character must be in the set of characters defined by the class, unless the first character in the class @@ -356,377 +512,403 @@ definition is a circumflex, in which cas the set defined by the class. If a circumflex is actually required as a member of the class, ensure it is not the first character, or escape it with a backslash. - +.P For example, the character class [aeiou] matches any lower case vowel, while [^aeiou] matches any character that is not a lower case vowel. Note that a -circumflex is just a convenient notation for specifying the characters which -are in the class by enumerating those that are not. It is not an assertion: it -still consumes a character from the subject string, and fails if the current -pointer is at the end of the string. - +circumflex is just a convenient notation for specifying the characters that +are in the class by enumerating those that are not. A class that starts with a +circumflex is not an assertion: it still consumes a character from the subject +string, and therefore it fails if the current pointer is at the end of the +string. +.P In UTF-8 mode, characters with values greater than 255 can be included in a -class as a literal string of bytes, or by using the \\x{ escaping mechanism. - +class as a literal string of bytes, or by using the \ex{ escaping mechanism. +.P When caseless matching is set, any letters in a class represent both their upper case and lower case versions, so for example, a caseless [aeiou] matches "A" as well as "a", and a caseless [^aeiou] does not match "A", whereas a -caseful version would. PCRE does not support the concept of case for characters -with values greater than 255. - +caseful version would. When running in UTF-8 mode, PCRE supports the concept of +case for characters with values greater than 128 only when it is compiled with +Unicode property support. +.P The newline character is never treated in any special way in character classes, whatever the setting of the PCRE_DOTALL or PCRE_MULTILINE options is. A class such as [^a] will always match a newline. - +.P The minus (hyphen) character can be used to specify a range of characters in a character class. For example, [d-m] matches any letter between d and m, inclusive. If a minus character is required in a class, it must be escaped with a backslash or appear in a position where it cannot be interpreted as indicating a range, typically as the first or last character in the class. - +.P It is not possible to have the literal character "]" as the end character of a range. A pattern such as [W-]46] is interpreted as a class of two characters ("W" and "-") followed by a literal string "46]", so it would match "W46]" or "-46]". However, if the "]" is escaped with a backslash it is interpreted as -the end of range, so [W-\\]46] is interpreted as a single class containing a -range followed by two separate characters. The octal or hexadecimal -representation of "]" can also be used to end a range. - +the end of range, so [W-\e]46] is interpreted as a class containing a range +followed by two other characters. The octal or hexadecimal representation of +"]" can also be used to end a range. +.P Ranges operate in the collating sequence of character values. They can also be -used for characters specified numerically, for example [\\000-\\037]. In UTF-8 +used for characters specified numerically, for example [\e000-\e037]. In UTF-8 mode, ranges can include characters whose values are greater than 255, for -example [\\x{100}-\\x{2ff}]. - +example [\ex{100}-\ex{2ff}]. +.P If a range that includes letters is used when caseless matching is set, it matches the letters in either case. For example, [W-c] is equivalent to -[][\\^_`wxyzabc], matched caselessly, and if character tables for the "fr" -locale are in use, [\\xc8-\\xcb] matches accented E characters in both cases. - -The character types \\d, \\D, \\s, \\S, \\w, and \\W may also appear in a -character class, and add the characters that they match to the class. For -example, [\\dABCDEF] matches any hexadecimal digit. A circumflex can +[][\e\e^_`wxyzabc], matched caselessly, and in non-UTF-8 mode, if character +tables for the "fr_FR" locale are in use, [\exc8-\excb] matches accented E +characters in both cases. In UTF-8 mode, PCRE supports the concept of case for +characters with values greater than 128 only when it is compiled with Unicode +property support. +.P +The character types \ed, \eD, \ep, \eP, \es, \eS, \ew, and \eW may also appear +in a character class, and add the characters that they match to the class. For +example, [\edABCDEF] matches any hexadecimal digit. A circumflex can conveniently be used with the upper case character types to specify a more restricted set of characters than the matching lower case type. For example, -the class [^\\W_] matches any letter or digit, but not underscore. - -All non-alphameric characters other than \\, -, ^ (at the start) and the -terminating ] are non-special in character classes, but it does no harm if they -are escaped. - -.SH POSIX CHARACTER CLASSES +the class [^\eW_] matches any letter or digit, but not underscore. +.P +The only metacharacters that are recognized in character classes are backslash, +hyphen (only where it can be interpreted as specifying a range), circumflex +(only at the start), opening square bracket (only when it can be interpreted as +introducing a POSIX class name - see the next section), and the terminating +closing square bracket. However, escaping other non-alphanumeric characters +does no harm. +. +. +.SH "POSIX CHARACTER CLASSES" .rs .sp -Perl supports the POSIX notation for character classes, which uses names +Perl supports the POSIX notation for character classes. This uses names enclosed by [: and :] within the enclosing square brackets. PCRE also supports this notation. For example, - +.sp [01[:alpha:]%] - +.sp matches "0", "1", any alphabetic character, or "%". The supported class names are - +.sp alnum letters and digits alpha letters ascii character codes 0 - 127 blank space or tab only cntrl control characters - digit decimal digits (same as \\d) + digit decimal digits (same as \ed) graph printing characters, excluding space lower lower case letters print printing characters, including space punct printing characters, excluding letters and digits - space white space (not quite the same as \\s) + space white space (not quite the same as \es) upper upper case letters - word "word" characters (same as \\w) + word "word" characters (same as \ew) xdigit hexadecimal digits - +.sp The "space" characters are HT (9), LF (10), VT (11), FF (12), CR (13), and space (32). Notice that this list includes the VT character (code 11). This -makes "space" different to \\s, which does not include VT (for Perl +makes "space" different to \es, which does not include VT (for Perl compatibility). - +.P The name "word" is a Perl extension, and "blank" is a GNU extension from Perl 5.8. Another Perl extension is negation, which is indicated by a ^ character after the colon. For example, - +.sp [12[:^digit:]] - +.sp matches "1", "2", or any non-digit. PCRE (and Perl) also recognize the POSIX syntax [.ch.] and [=ch=] where "ch" is a "collating element", but these are not supported, and an error is given if they are encountered. - -In UTF-8 mode, characters with values greater than 255 do not match any of +.P +In UTF-8 mode, characters with values greater than 128 do not match any of the POSIX character classes. - -.SH VERTICAL BAR +. +. +.SH "VERTICAL BAR" .rs .sp Vertical bar characters are used to separate alternative patterns. For example, the pattern - +.sp gilbert|sullivan - +.sp matches either "gilbert" or "sullivan". Any number of alternatives may appear, and an empty alternative is permitted (matching the empty string). The matching process tries each alternative in turn, from left to right, and the first one that succeeds is used. If the alternatives are within a -subpattern (defined below), "succeeds" means matching the rest of the main -pattern as well as the alternative in the subpattern. - -.SH INTERNAL OPTION SETTING +subpattern +.\" HTML +.\" +(defined below), +.\" +"succeeds" means matching the rest of the main pattern as well as the +alternative in the subpattern. +. +. +.SH "INTERNAL OPTION SETTING" .rs .sp The settings of the PCRE_CASELESS, PCRE_MULTILINE, PCRE_DOTALL, and PCRE_EXTENDED options can be changed from within the pattern by a sequence of Perl option letters enclosed between "(?" and ")". The option letters are - +.sp i for PCRE_CASELESS m for PCRE_MULTILINE s for PCRE_DOTALL x for PCRE_EXTENDED - +.sp For example, (?im) sets caseless, multiline matching. It is also possible to unset these options by preceding the letter with a hyphen, and a combined setting and unsetting such as (?im-sx), which sets PCRE_CASELESS and PCRE_MULTILINE while unsetting PCRE_DOTALL and PCRE_EXTENDED, is also permitted. If a letter appears both before and after the hyphen, the option is unset. - +.P When an option change occurs at top level (that is, not inside subpattern parentheses), the change applies to the remainder of the pattern that follows. If the change is placed right at the start of a pattern, PCRE extracts it into the global options (and it will therefore show up in data extracted by the -\fBpcre_fullinfo()\fR function). - +\fBpcre_fullinfo()\fP function). +.P An option change within a subpattern affects only that part of the current pattern that follows it, so - +.sp (a(?i)b)c - +.sp matches abc and aBc and no other strings (assuming PCRE_CASELESS is not used). By this means, options can be made to have different settings in different parts of the pattern. Any changes made in one alternative do carry on into subsequent branches within the same subpattern. For example, - +.sp (a(?i)b|c) - +.sp matches "ab", "aB", "c", and "C", even though when matching "C" the first branch is abandoned before the option setting. This is because the effects of option settings happen at compile time. There would be some very weird behaviour otherwise. - +.P The PCRE-specific options PCRE_UNGREEDY and PCRE_EXTRA can be changed in the same way as the Perl-compatible options by using the characters U and X respectively. The (?X) flag setting is special in that it must always occur earlier in the pattern than any of the additional features it turns on, even -when it is at top level. It is best put at the start. - +when it is at top level. It is best to put it at the start. +. +. +.\" HTML .SH SUBPATTERNS .rs .sp Subpatterns are delimited by parentheses (round brackets), which can be nested. -Marking part of a pattern as a subpattern does two things: - +Turning part of a pattern into a subpattern does two things: +.sp 1. It localizes a set of alternatives. For example, the pattern - +.sp cat(aract|erpillar|) - +.sp matches one of the words "cat", "cataract", or "caterpillar". Without the parentheses, it would match "cataract", "erpillar" or the empty string. - -2. It sets up the subpattern as a capturing subpattern (as defined above). -When the whole pattern matches, that portion of the subject string that matched -the subpattern is passed back to the caller via the \fIovector\fR argument of -\fBpcre_exec()\fR. Opening parentheses are counted from left to right (starting -from 1) to obtain the numbers of the capturing subpatterns. - +.sp +2. It sets up the subpattern as a capturing subpattern. This means that, when +the whole pattern matches, that portion of the subject string that matched the +subpattern is passed back to the caller via the \fIovector\fP argument of +\fBpcre_exec()\fP. Opening parentheses are counted from left to right (starting +from 1) to obtain numbers for the capturing subpatterns. +.P For example, if the string "the red king" is matched against the pattern - +.sp the ((red|white) (king|queen)) - +.sp the captured substrings are "red king", "red", and "king", and are numbered 1, 2, and 3, respectively. - +.P The fact that plain parentheses fulfil two functions is not always helpful. There are often times when a grouping subpattern is required without a capturing requirement. If an opening parenthesis is followed by a question mark and a colon, the subpattern does not do any capturing, and is not counted when computing the number of any subsequent capturing subpatterns. For example, if the string "the white queen" is matched against the pattern - +.sp the ((?:red|white) (king|queen)) - +.sp the captured substrings are "white queen" and "queen", and are numbered 1 and 2. The maximum number of capturing subpatterns is 65535, and the maximum depth of nesting of all subpatterns, both capturing and non-capturing, is 200. - +.P As a convenient shorthand, if any option settings are required at the start of a non-capturing subpattern, the option letters may appear between the "?" and the ":". Thus the two patterns - +.sp (?i:saturday|sunday) (?:(?i)saturday|sunday) - +.sp match exactly the same set of strings. Because alternative branches are tried from left to right, and options are not reset until the end of the subpattern is reached, an option setting in one branch does affect subsequent branches, so the above patterns match "SUNDAY" as well as "Saturday". - -.SH NAMED SUBPATTERNS +. +. +.SH "NAMED SUBPATTERNS" .rs .sp Identifying capturing parentheses by number is simple, but it can be very hard to keep track of the numbers in complicated regular expressions. Furthermore, -if an expression is modified, the numbers may change. To help with the +if an expression is modified, the numbers may change. To help with this difficulty, PCRE supports the naming of subpatterns, something that Perl does not provide. The Python syntax (?P...) is used. Names consist of alphanumeric characters and underscores, and must be unique within a pattern. - +.P Named capturing parentheses are still allocated numbers as well as names. The PCRE API provides function calls for extracting the name-to-number translation -table from a compiled pattern. For further details see the +table from a compiled pattern. There is also a convenience function for +extracting a captured substring by name. For further details see the .\" HREF -\fBpcreapi\fR +\fBpcreapi\fP .\" documentation. - +. +. .SH REPETITION .rs .sp Repetition is specified by quantifiers, which can follow any of the following items: - +.sp a literal data character the . metacharacter - the \\C escape sequence - escapes such as \\d that match single characters + the \eC escape sequence + the \eX escape sequence (in UTF-8 mode with Unicode properties) + an escape such as \ed that matches a single character a character class a back reference (see next section) a parenthesized subpattern (unless it is an assertion) - +.sp The general repetition quantifier specifies a minimum and maximum number of permitted matches, by giving the two numbers in curly brackets (braces), separated by a comma. The numbers must be less than 65536, and the first must be less than or equal to the second. For example: - +.sp z{2,4} - +.sp matches "zz", "zzz", or "zzzz". A closing brace on its own is not a special character. If the second number is omitted, but the comma is present, there is no upper limit; if the second number and the comma are both omitted, the quantifier specifies an exact number of required matches. Thus - +.sp [aeiou]{3,} - +.sp matches at least 3 successive vowels, but may match many more, while - - \\d{8} - +.sp + \ed{8} +.sp matches exactly 8 digits. An opening curly bracket that appears in a position where a quantifier is not allowed, or one that does not match the syntax of a quantifier, is taken as a literal character. For example, {,6} is not a quantifier, but a literal string of four characters. - +.P In UTF-8 mode, quantifiers apply to UTF-8 characters rather than to individual -bytes. Thus, for example, \\x{100}{2} matches two UTF-8 characters, each of -which is represented by a two-byte sequence. - +bytes. Thus, for example, \ex{100}{2} matches two UTF-8 characters, each of +which is represented by a two-byte sequence. Similarly, when Unicode property +support is available, \eX{3} matches three Unicode extended sequences, each of +which may be several bytes long (and they may be of different lengths). +.P The quantifier {0} is permitted, causing the expression to behave as if the previous item and the quantifier were not present. - +.P For convenience (and historical compatibility) the three most common quantifiers have single-character abbreviations: - +.sp * is equivalent to {0,} + is equivalent to {1,} ? is equivalent to {0,1} - +.sp It is possible to construct infinite loops by following a subpattern that can match no characters with a quantifier that has no upper limit, for example: - +.sp (a?)* - +.sp Earlier versions of Perl and PCRE used to give an error at compile time for such patterns. However, because there are cases where this can be useful, such patterns are now accepted, but if any repetition of the subpattern does in fact match no characters, the loop is forcibly broken. - +.P By default, the quantifiers are "greedy", that is, they match as much as possible (up to the maximum number of permitted times), without causing the rest of the pattern to fail. The classic example of where this gives problems -is in trying to match comments in C programs. These appear between the -sequences /* and */ and within the sequence, individual * and / characters may -appear. An attempt to match C comments by applying the pattern - - /\\*.*\\*/ - +is in trying to match comments in C programs. These appear between /* and */ +and within the comment, individual * and / characters may appear. An attempt to +match C comments by applying the pattern +.sp + /\e*.*\e*/ +.sp to the string - - /* first command */ not comment /* second comment */ - +.sp + /* first comment */ not comment /* second comment */ +.sp fails, because it matches the entire string owing to the greediness of the .* item. - +.P However, if a quantifier is followed by a question mark, it ceases to be greedy, and instead matches the minimum number of times possible, so the pattern - - /\\*.*?\\*/ - +.sp + /\e*.*?\e*/ +.sp does the right thing with the C comments. The meaning of the various quantifiers is not otherwise changed, just the preferred number of matches. Do not confuse this use of question mark with its use as a quantifier in its own right. Because it has two uses, it can sometimes appear doubled, as in - - \\d??\\d - +.sp + \ed??\ed +.sp which matches one digit by preference, but can match two if that is the only way the rest of the pattern matches. - +.P If the PCRE_UNGREEDY option is set (an option which is not available in Perl), the quantifiers are not greedy by default, but individual ones can be made greedy by following them with a question mark. In other words, it inverts the default behaviour. - +.P When a parenthesized subpattern is quantified with a minimum repeat count that -is greater than 1 or with a limited maximum, more store is required for the +is greater than 1 or with a limited maximum, more memory is required for the compiled pattern, in proportion to the size of the minimum or maximum. - +.P If a pattern starts with .* or .{0,} and the PCRE_DOTALL option (equivalent to Perl's /s) is set, thus allowing the . to match newlines, the pattern is implicitly anchored, because whatever follows will be tried against every character position in the subject string, so there is no point in retrying the overall match at any position after the first. PCRE normally treats such a -pattern as though it were preceded by \\A. - +pattern as though it were preceded by \eA. +.P In cases where it is known that the subject string contains no newlines, it is worth setting PCRE_DOTALL in order to obtain this optimization, or alternatively using ^ to indicate anchoring explicitly. - +.P However, there is one situation where the optimization cannot be used. When .* is inside capturing parentheses that are the subject of a backreference elsewhere in the pattern, a match at the start may fail, and a later one succeed. Consider, for example: - - (.*)abc\\1 - +.sp + (.*)abc\e1 +.sp If the subject is "xyz123abc123" the match point is the fourth character. For this reason, such a pattern is not implicitly anchored. - +.P When a capturing subpattern is repeated, the value captured is the substring that matched the final iteration. For example, after - - (tweedle[dume]{3}\\s*)+ - +.sp + (tweedle[dume]{3}\es*)+ +.sp has matched "tweedledum tweedledee" the value of the captured substring is "tweedledee". However, if there are nested capturing subpatterns, the corresponding captured values may have been set in previous iterations. For example, after - +.sp /(a|(b))+/ - +.sp matches "aba" the value of the second captured substring is "b". - -.SH ATOMIC GROUPING AND POSSESSIVE QUANTIFIERS +. +. +.\" HTML +.SH "ATOMIC GROUPING AND POSSESSIVE QUANTIFIERS" .rs .sp With both maximizing and minimizing repetition, failure of what follows @@ -735,95 +917,102 @@ number of repeats allows the rest of the useful to prevent this, either to change the nature of the match, or to cause it fail earlier than it otherwise might, when the author of the pattern knows there is no point in carrying on. - -Consider, for example, the pattern \\d+foo when applied to the subject line - +.P +Consider, for example, the pattern \ed+foo when applied to the subject line +.sp 123456bar - +.sp After matching all 6 digits and then failing to match "foo", the normal -action of the matcher is to try again with only 5 digits matching the \\d+ +action of the matcher is to try again with only 5 digits matching the \ed+ item, and then with 4, and so on, before ultimately failing. "Atomic grouping" (a term taken from Jeffrey Friedl's book) provides the means for specifying that once a subpattern has matched, it is not to be re-evaluated in this way. - +.P If we use atomic grouping for the previous example, the matcher would give up immediately on failing to match "foo" the first time. The notation is a kind of special parenthesis, starting with (?> as in this example: - - (?>\\d+)foo - +.sp + (?>\ed+)foo +.sp This kind of parenthesis "locks up" the part of the pattern it contains once it has matched, and a failure further into the pattern is prevented from backtracking into it. Backtracking past it to previous items, however, works as normal. - +.P An alternative description is that a subpattern of this type matches the string of characters that an identical standalone pattern would match, if anchored at the current point in the subject string. - +.P Atomic grouping subpatterns are not capturing subpatterns. Simple cases such as the above example can be thought of as a maximizing repeat that must swallow -everything it can. So, while both \\d+ and \\d+? are prepared to adjust the +everything it can. So, while both \ed+ and \ed+? are prepared to adjust the number of digits they match in order to make the rest of the pattern match, -(?>\\d+) can only match an entire sequence of digits. - +(?>\ed+) can only match an entire sequence of digits. +.P Atomic groups in general can of course contain arbitrarily complicated subpatterns, and can be nested. However, when the subpattern for an atomic group is just a single repeated item, as in the example above, a simpler notation, called a "possessive quantifier" can be used. This consists of an additional + character following a quantifier. Using this notation, the previous example can be rewritten as - - \\d++bar - +.sp + \ed++foo +.sp Possessive quantifiers are always greedy; the setting of the PCRE_UNGREEDY option is ignored. They are a convenient notation for the simpler forms of atomic group. However, there is no difference in the meaning or processing of a possessive quantifier and the equivalent atomic group. - +.P The possessive quantifier syntax is an extension to the Perl syntax. It originates in Sun's Java package. - +.P When a pattern contains an unlimited repeat inside a subpattern that can itself be repeated an unlimited number of times, the use of an atomic group is the only way to avoid some failing matches taking a very long time indeed. The pattern - - (\\D+|<\\d+>)*[!?] - +.sp + (\eD+|<\ed+>)*[!?] +.sp matches an unlimited number of substrings that either consist of non-digits, or digits enclosed in <>, followed by either ! or ?. When it matches, it runs quickly. However, if it is applied to - +.sp aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - +.sp it takes a long time before reporting failure. This is because the string can -be divided between the two repeats in a large number of ways, and all have to -be tried. (The example used [!?] rather than a single character at the end, -because both PCRE and Perl have an optimization that allows for fast failure -when a single character is used. They remember the last single character that -is required for a match, and fail early if it is not present in the string.) -If the pattern is changed to - - ((?>\\D+)|<\\d+>)*[!?] - +be divided between the internal \eD+ repeat and the external * repeat in a +large number of ways, and all have to be tried. (The example uses [!?] rather +than a single character at the end, because both PCRE and Perl have an +optimization that allows for fast failure when a single character is used. They +remember the last single character that is required for a match, and fail early +if it is not present in the string.) If the pattern is changed so that it uses +an atomic group, like this: +.sp + ((?>\eD+)|<\ed+>)*[!?] +.sp sequences of non-digits cannot be broken, and failure happens quickly. - -.SH BACK REFERENCES +. +. +.\" HTML +.SH "BACK REFERENCES" .rs .sp Outside a character class, a backslash followed by a digit greater than 0 (and possibly further digits) is a back reference to a capturing subpattern earlier (that is, to its left) in the pattern, provided there have been that many previous capturing left parentheses. - +.P However, if the decimal number following the backslash is less than 10, it is always taken as a back reference, and causes an error only if there are not that many capturing left parentheses in the entire pattern. In other words, the parentheses that are referenced need not be to the left of the reference for -numbers less than 10. See the section entitled "Backslash" above for further -details of the handling of digits following a backslash. - +numbers less than 10. See the subsection entitled "Non-printing characters" +.\" HTML +.\" +above +.\" +for further details of the handling of digits following a backslash. +.P A back reference matches whatever actually matched the capturing subpattern in the current subject string, rather than anything matching the subpattern itself (see @@ -832,212 +1021,239 @@ itself (see "Subpatterns as subroutines" .\" below for a way of doing that). So the pattern - - (sens|respons)e and \\1ibility - +.sp + (sens|respons)e and \e1ibility +.sp matches "sense and sensibility" and "response and responsibility", but not "sense and responsibility". If caseful matching is in force at the time of the back reference, the case of letters is relevant. For example, - - ((?i)rah)\\s+\\1 - +.sp + ((?i)rah)\es+\e1 +.sp matches "rah rah" and "RAH RAH", but not "RAH rah", even though the original capturing subpattern is matched caselessly. - +.P Back references to named subpatterns use the Python syntax (?P=name). We could rewrite the above example as follows: - - (?(?i)rah)\\s+(?P=p1) - +.sp + (?(?i)rah)\es+(?P=p1) +.sp There may be more than one back reference to the same subpattern. If a subpattern has not actually been used in a particular match, any back references to it always fail. For example, the pattern - - (a|(bc))\\2 - +.sp + (a|(bc))\e2 +.sp always fails if it starts to match "a" rather than "bc". Because there may be many capturing parentheses in a pattern, all digits following the backslash are taken as part of a potential back reference number. If the pattern continues with a digit character, some delimiter must be used to terminate the back reference. If the PCRE_EXTENDED option is set, this can be whitespace. -Otherwise an empty comment can be used. - +Otherwise an empty comment (see +.\" HTML +.\" +"Comments" +.\" +below) can be used. +.P A back reference that occurs inside the parentheses to which it refers fails -when the subpattern is first used, so, for example, (a\\1) never matches. +when the subpattern is first used, so, for example, (a\e1) never matches. However, such references can be useful inside repeated subpatterns. For example, the pattern - - (a|b\\1)+ - +.sp + (a|b\e1)+ +.sp matches any number of "a"s and also "aba", "ababbaa" etc. At each iteration of the subpattern, the back reference matches the character string corresponding to the previous iteration. In order for this to work, the pattern must be such that the first iteration does not need to match the back reference. This can be done using alternation, as in the example above, or by a quantifier with a minimum of zero. - +. +. +.\" HTML .SH ASSERTIONS .rs .sp An assertion is a test on the characters following or preceding the current matching point that does not actually consume any characters. The simple -assertions coded as \\b, \\B, \\A, \\G, \\Z, \\z, ^ and $ are described above. +assertions coded as \eb, \eB, \eA, \eG, \eZ, \ez, ^ and $ are described +.\" HTML +.\" +above. +.\" +.P More complicated assertions are coded as subpatterns. There are two kinds: those that look ahead of the current position in the subject string, and those -that look behind it. - -An assertion subpattern is matched in the normal way, except that it does not -cause the current matching position to be changed. Lookahead assertions start +that look behind it. An assertion subpattern is matched in the normal way, +except that it does not cause the current matching position to be changed. +.P +Assertion subpatterns are not capturing subpatterns, and may not be repeated, +because it makes no sense to assert the same thing several times. If any kind +of assertion contains capturing subpatterns within it, these are counted for +the purposes of numbering the capturing subpatterns in the whole pattern. +However, substring capturing is carried out only for positive assertions, +because it does not make sense for negative assertions. +. +. +.SS "Lookahead assertions" +.rs +.sp +Lookahead assertions start with (?= for positive assertions and (?! for negative assertions. For example, - - \\w+(?=;) - +.sp + \ew+(?=;) +.sp matches a word followed by a semicolon, but does not include the semicolon in the match, and - +.sp foo(?!bar) - +.sp matches any occurrence of "foo" that is not followed by "bar". Note that the apparently similar pattern - +.sp (?!foo)bar - +.sp does not find an occurrence of "bar" that is preceded by something other than "foo"; it finds any occurrence of "bar" whatsoever, because the assertion (?!foo) is always true when the next three characters are "bar". A -lookbehind assertion is needed to achieve this effect. - +lookbehind assertion is needed to achieve the other effect. +.P If you want to force a matching failure at some point in a pattern, the most convenient way to do it is with (?!) because an empty string always matches, so an assertion that requires there not to be an empty string must always fail. - +. +. +.\" HTML +.SS "Lookbehind assertions" +.rs +.sp Lookbehind assertions start with (?<= for positive assertions and (?.*)(?<=abcd) - -or, equivalently, - +.sp +or, equivalently, using the possessive quantifier syntax, +.sp ^.*+(?<=abcd) - +.sp there can be no backtracking for the .* item; it can match only the entire string. The subsequent lookbehind assertion does a single test on the last four characters. If it fails, the match fails immediately. For long strings, this approach makes a significant difference to the processing time. - +. +. +.SS "Using multiple assertions" +.rs +.sp Several assertions (of any sort) may occur in succession. For example, - - (?<=\\d{3})(? .SH COMMENTS .rs .sp -The sequence (?# marks the start of a comment which continues up to the next +The sequence (?# marks the start of a comment that continues up to the next closing parenthesis. Nested parentheses are not permitted. The characters that make up a comment play no part in the pattern matching at all. - +.P If the PCRE_EXTENDED option is set, an unescaped # character outside a character class introduces a comment that continues up to the next newline character in the pattern. - -.SH RECURSIVE PATTERNS +. +. +.SH "RECURSIVE PATTERNS" .rs .sp Consider the problem of matching a string in parentheses, allowing for unlimited nested parentheses. Without the use of recursion, the best that can be done is to use a pattern that matches up to some fixed depth of nesting. It -is not possible to handle an arbitrary nesting depth. Perl has provided an -experimental facility that allows regular expressions to recurse (amongst other -things). It does this by interpolating Perl code in the expression at run time, -and the code can refer to the expression itself. A Perl pattern to solve the -parentheses problem can be created like this: - - $re = qr{\\( (?: (?>[^()]+) | (?p{$re}) )* \\)}x; - +is not possible to handle an arbitrary nesting depth. Perl provides a facility +that allows regular expressions to recurse (amongst other things). It does this +by interpolating Perl code in the expression at run time, and the code can +refer to the expression itself. A Perl pattern to solve the parentheses problem +can be created like this: +.sp + $re = qr{\e( (?: (?>[^()]+) | (?p{$re}) )* \e)}x; +.sp The (?p{...}) item interpolates Perl code at run time, and in this case refers recursively to the pattern in which it appears. Obviously, PCRE cannot support the interpolation of Perl code. Instead, it supports some special syntax for recursion of the entire pattern, and also for individual subpattern recursion. - +.P The special item that consists of (? followed by a number greater than zero and a closing parenthesis is a recursive call of the subpattern of the given number, provided that it occurs inside that subpattern. (If not, it is a "subroutine" call, which is described in the next section.) The special item (?R) is a recursive call of the entire regular expression. - +.P For example, this PCRE pattern solves the nested parentheses problem (assume the PCRE_EXTENDED option is set so that white space is ignored): - - \\( ( (?>[^()]+) | (?R) )* \\) - +.sp + \e( ( (?>[^()]+) | (?R) )* \e) +.sp First it matches an opening parenthesis. Then it matches any number of substrings which can either be a sequence of non-parentheses, or a recursive match of the pattern itself (that is a correctly parenthesized substring). Finally there is a closing parenthesis. - +.P If this were part of a larger pattern, you would not want to recurse the entire pattern, so instead you could use this: - - ( \\( ( (?>[^()]+) | (?1) )* \\) ) - +.sp + ( \e( ( (?>[^()]+) | (?1) )* \e) ) +.sp We have put the pattern into parentheses, and caused the recursion to refer to them instead of the whole pattern. In a larger pattern, keeping track of parenthesis numbers can be tricky. It may be more convenient to use named parentheses instead. For this, PCRE uses (?P>name), which is an extension to the Python syntax that PCRE uses for named parentheses (Perl does not provide named parentheses). We could rewrite the above example as follows: - - (?P \\( ( (?>[^()]+) | (?P>pn) )* \\) ) - +.sp + (?P \e( ( (?>[^()]+) | (?P>pn) )* \e) ) +.sp This particular example pattern contains nested unlimited repeats, and so the use of atomic grouping for matching strings of non-parentheses is important when applying the pattern to strings that do not match. For example, when this pattern is applied to - +.sp (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa() - +.sp it yields "no match" quickly. However, if atomic grouping is not used, the match runs for a very long time indeed because there are so many different ways the + and * repeats can carve up the subject, and all have to be tested before failure can be reported. - +.P At the end of a match, the values set for any capturing subpatterns are those from the outermost level of the recursion at which the subpattern value is set. If you want to obtain intermediate values, a callout function can be used (see -below and the +the next section and the .\" HREF -\fBpcrecallout\fR +\fBpcrecallout\fP .\" documentation). If the pattern above is matched against - +.sp (ab(cd)ef) - +.sp the value for the capturing parentheses is "ef", which is the last value taken on at the top level. If additional parentheses are added, giving - - \\( ( ( (?>[^()]+) | (?R) )* ) \\) +.sp + \e( ( ( (?>[^()]+) | (?R) )* ) \e) ^ ^ ^ ^ - +.sp the string they capture is "ab(cd)ef", the contents of the top level parentheses. If there are more than 15 capturing parentheses in a pattern, PCRE has to obtain extra memory to store data during a recursion, which it does by -using \fBpcre_malloc\fR, freeing it via \fBpcre_free\fR afterwards. If no +using \fBpcre_malloc\fP, freeing it via \fBpcre_free\fP afterwards. If no memory can be obtained, the match fails with the PCRE_ERROR_NOMEMORY error. - +.P Do not confuse the (?R) item with the condition (R), which tests for recursion. Consider this pattern, which matches text in angle brackets, allowing for arbitrary nesting. Only digits are allowed in nested brackets (that is, when recursing), whereas any characters are permitted at the outer level. - - < (?: (?(R) \\d++ | [^<>]*+) | (?R)) * > - +.sp + < (?: (?(R) \ed++ | [^<>]*+) | (?R)) * > +.sp In this pattern, (?(R) is the start of a conditional subpattern, with two different alternatives for the recursive and non-recursive cases. The (?R) item is the actual recursive call. - +. +. .\" HTML -.SH SUBPATTERNS AS SUBROUTINES +.SH "SUBPATTERNS AS SUBROUTINES" .rs .sp If the syntax for a recursive subpattern reference (either by number or by name) is used outside the parentheses to which it refers, it operates like a subroutine in a programming language. An earlier example pointed out that the pattern - - (sens|respons)e and \\1ibility - +.sp + (sens|respons)e and \e1ibility +.sp matches "sense and sensibility" and "response and responsibility", but not "sense and responsibility". If instead the pattern - +.sp (sens|respons)e and (?1)ibility - +.sp is used, it does match "sense and responsibility" as well as the other two strings. Such references must, however, follow the subpattern to which they refer. - +. +. .SH CALLOUTS .rs .sp @@ -1201,31 +1422,35 @@ Perl has a feature whereby using the seq code to be obeyed in the middle of matching a regular expression. This makes it possible, amongst other things, to extract different substrings that match the same pair of parentheses when there is a repetition. - +.P PCRE provides a similar feature, but of course it cannot obey arbitrary Perl code. The feature is called "callout". The caller of PCRE provides an external -function by putting its entry point in the global variable \fIpcre_callout\fR. +function by putting its entry point in the global variable \fIpcre_callout\fP. By default, this variable contains NULL, which disables all calling out. - +.P Within a regular expression, (?C) indicates the points at which the external function is to be called. If you want to identify different callout points, you can put a number less than 256 after the letter C. The default value is zero. For example, this pattern has two callout points: - +.sp (?C1)\dabc(?C2)def - -During matching, when PCRE reaches a callout point (and \fIpcre_callout\fR is +.sp +If the PCRE_AUTO_CALLOUT flag is passed to \fBpcre_compile()\fP, callouts are +automatically installed before each item in the pattern. They are all numbered +255. +.P +During matching, when PCRE reaches a callout point (and \fIpcre_callout\fP is set), the external function is called. It is provided with the number of the -callout, and, optionally, one item of data originally supplied by the caller of -\fBpcre_exec()\fR. The callout function may cause matching to backtrack, or to -fail altogether. A complete description of the interface to the callout -function is given in the +callout, the position in the pattern, and, optionally, one item of data +originally supplied by the caller of \fBpcre_exec()\fP. The callout function +may cause matching to proceed, to backtrack, or to fail altogether. A complete +description of the interface to the callout function is given in the .\" HREF -\fBpcrecallout\fR +\fBpcrecallout\fP .\" documentation. - +.P .in 0 -Last updated: 03 February 2003 +Last updated: 09 September 2004 .br -Copyright (c) 1997-2003 University of Cambridge. +Copyright (c) 1997-2004 University of Cambridge. diff -Nurp tin-1.7.6/pcre/get.c tin-1.7.7/pcre/get.c --- tin-1.7.6/pcre/get.c 2004-08-20 10:30:53.000000000 +0200 +++ tin-1.7.7/pcre/get.c 2004-11-15 18:44:38.000000000 +0100 @@ -12,29 +12,37 @@ Written by: Philip Hazel . */ +for these functions came from Scott Wimer. */ /* Include the internals header, which itself includes Standard C headers plus diff -Nurp tin-1.7.6/pcre/internal.h tin-1.7.7/pcre/internal.h --- tin-1.7.6/pcre/internal.h 2004-08-20 10:30:53.000000000 +0200 +++ tin-1.7.7/pcre/internal.h 2004-11-15 18:44:38.000000000 +0100 @@ -5,30 +5,38 @@ /* This is a library of functions to support regular expressions whose syntax and semantics are as close as possible to those of the Perl 5 language. See -the file Tech.Notes for some information on the internals. +the file doc/Tech.Notes for some information on the internals. Written by: Philip Hazel - Copyright (c) 1997-2003 University of Cambridge + Copyright (c) 1997-2004 University of Cambridge ----------------------------------------------------------------------------- -Permission is granted to anyone to use this software for any purpose on any -computer system, and to redistribute it freely, subject to the following -restrictions: - -1. This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -2. The origin of this software must not be misrepresented, either by - explicit claim or by omission. - -3. Altered versions must be plainly marked as such, and must not be - misrepresented as being the original software. - -4. If PCRE is embedded in any software that is released under the GNU - General Purpose Licence (GPL), then the terms of that licence shall - supersede any condition above with which it is incompatible. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of Cambridge nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. ----------------------------------------------------------------------------- */ @@ -55,6 +63,39 @@ setjmp and stdarg are used is when NO_RE #define PCRE_DEFINITION /* Win32 __declspec(export) trigger for .dll */ #endif +/* We need to have types that specify unsigned 16-bit and 32-bit integers. We +cannot determine these outside the compilation (e.g. by running a program as +part of "configure") because PCRE is often cross-compiled for use on other +systems. Instead we make use of the maximum sizes that are available at +preprocessor time in standard C environments. */ + +#if USHRT_MAX == 65535 + typedef unsigned short pcre_uint16; +#elif UINT_MAX == 65535 + typedef unsigned int pcre_uint16; +#else + #error Cannot determine a type for 16-bit unsigned integers +#endif + +#if UINT_MAX == 4294967295 + typedef unsigned int pcre_uint32; +#elif ULONG_MAX == 4294967295 + typedef unsigned long int pcre_uint32; +#else + #error Cannot determine a type for 32-bit unsigned integers +#endif + +/* All character handling must be done as unsigned characters. Otherwise there +are problems with top-bit-set characters and functions such as isspace(). +However, we leave the interface to the outside world as char *, because that +should make things easier for callers. We define a short type for unsigned char +to save lots of typing. I tried "uchar", but it causes problems on Digital +Unix, where it is defined in sys/types, so use "uschar" instead. */ + +typedef unsigned char uschar; + +/* Include the public PCRE header */ + #include "pcre.h" /* When compiling for use with the Virtual Pascal compiler, these functions @@ -94,13 +135,14 @@ for (i = 0; i < n; ++i) *(--dest) = *(- #endif /* not VPCOMPAT */ -/* PCRE keeps offsets in its compiled code as 2-byte quantities by default. -These are used, for example, to link from the start of a subpattern to its -alternatives and its end. The use of 2 bytes per offset limits the size of the -compiled regex to around 64K, which is big enough for almost everybody. -However, I received a request for an even bigger limit. For this reason, and -also to make the code easier to maintain, the storing and loading of offsets -from the byte string is now handled by the macros that are defined here. +/* PCRE keeps offsets in its compiled code as 2-byte quantities (always stored +in big-endian order) by default. These are used, for example, to link from the +start of a subpattern to its alternatives and its end. The use of 2 bytes per +offset limits the size of the compiled regex to around 64K, which is big enough +for almost everybody. However, I received a request for an even bigger limit. +For this reason, and also to make the code easier to maintain, the storing and +loading of offsets from the byte string is now handled by the macros that are +defined here. The macros are controlled by the value of LINK_SIZE. This defaults to 2 in the config.h file, but can be overridden by using -D on the command line. This @@ -176,6 +218,7 @@ Standard C system should have one. */ #define offsetof(p_type,field) ((size_t)&(((p_type *)0)->field)) #endif + /* These are the public options that can change during matching. */ #define PCRE_IMS (PCRE_CASELESS|PCRE_MULTILINE|PCRE_DOTALL) @@ -184,12 +227,13 @@ Standard C system should have one. */ but skip the top bit so we can use ints for convenience without getting tangled with negative values. The public options defined in pcre.h start at the least significant end. Make sure they don't overlap, though now that we have expanded -to four bytes there is plenty of space. */ +to four bytes, there is plenty of space. */ #define PCRE_FIRSTSET 0x40000000 /* first_byte is set */ #define PCRE_REQCHSET 0x20000000 /* req_byte is set */ #define PCRE_STARTLINE 0x10000000 /* start after \n for multiline */ #define PCRE_ICHANGED 0x08000000 /* i option changes within regex */ +#define PCRE_NOPARTIAL 0x04000000 /* can't use partial with this regex */ /* Options for the "extra" block produced by pcre_study(). */ @@ -201,10 +245,11 @@ time, run time or study time, respective #define PUBLIC_OPTIONS \ (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \ PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \ - PCRE_NO_AUTO_CAPTURE|PCRE_NO_UTF8_CHECK) + PCRE_NO_AUTO_CAPTURE|PCRE_NO_UTF8_CHECK|PCRE_AUTO_CALLOUT) #define PUBLIC_EXEC_OPTIONS \ - (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NO_UTF8_CHECK) + (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NO_UTF8_CHECK| \ + PCRE_PARTIAL) #define PUBLIC_STUDY_OPTIONS 0 /* None defined */ @@ -264,12 +309,13 @@ definitions below, up to ESC_z. There's corresponds to "." rather than an escape sequence. The final one must be ESC_REF as subsequent values are used for \1, \2, \3, etc. There is are two tests in the code for an escape greater than ESC_b and less than ESC_Z to -detect the types that may be repeated. These are the types that consume a -character. If any new escapes are put in between that don't consume a +detect the types that may be repeated. These are the types that consume +characters. If any new escapes are put in between that don't consume a character, that code will have to change. */ enum { ESC_A = 1, ESC_G, ESC_B, ESC_b, ESC_D, ESC_d, ESC_S, ESC_s, ESC_W, - ESC_w, ESC_dum1, ESC_C, ESC_Z, ESC_z, ESC_E, ESC_Q, ESC_REF }; + ESC_w, ESC_dum1, ESC_C, ESC_P, ESC_p, ESC_X, ESC_Z, ESC_z, ESC_E, + ESC_Q, ESC_REF }; /* Flag bits and data types for the extended class (OP_XCLASS) for classes that contain UTF-8 characters with values greater than 255. */ @@ -280,6 +326,8 @@ contain UTF-8 characters with values gre #define XCL_END 0 /* Marks end of individual items */ #define XCL_SINGLE 1 /* Single item (one multibyte char) follows */ #define XCL_RANGE 2 /* A range (two multibyte chars) follows */ +#define XCL_PROP 3 /* Unicode property (one property code) follows */ +#define XCL_NOTPROP 4 /* Unicode inverted property (ditto) */ /* Opcode table: OP_BRA must be last, as all values >= it are used for brackets @@ -305,100 +353,112 @@ enum { OP_WORDCHAR, /* 10 \w */ OP_ANY, /* 11 Match any character */ OP_ANYBYTE, /* 12 Match any byte (\C); different to OP_ANY for UTF-8 */ - OP_EODN, /* 13 End of data or \n at end of data: \Z. */ - OP_EOD, /* 14 End of data: \z */ - - OP_OPT, /* 15 Set runtime options */ - OP_CIRC, /* 16 Start of line - varies with multiline switch */ - OP_DOLL, /* 17 End of line - varies with multiline switch */ - OP_CHARS, /* 18 Match string of characters */ - OP_NOT, /* 19 Match anything but the following char */ - - OP_STAR, /* 20 The maximizing and minimizing versions of */ - OP_MINSTAR, /* 21 all these opcodes must come in pairs, with */ - OP_PLUS, /* 22 the minimizing one second. */ - OP_MINPLUS, /* 23 This first set applies to single characters */ - OP_QUERY, /* 24 */ - OP_MINQUERY, /* 25 */ - OP_UPTO, /* 26 From 0 to n matches */ - OP_MINUPTO, /* 27 */ - OP_EXACT, /* 28 Exactly n matches */ - - OP_NOTSTAR, /* 29 The maximizing and minimizing versions of */ - OP_NOTMINSTAR, /* 30 all these opcodes must come in pairs, with */ - OP_NOTPLUS, /* 31 the minimizing one second. */ - OP_NOTMINPLUS, /* 32 This set applies to "not" single characters */ - OP_NOTQUERY, /* 33 */ - OP_NOTMINQUERY, /* 34 */ - OP_NOTUPTO, /* 35 From 0 to n matches */ - OP_NOTMINUPTO, /* 36 */ - OP_NOTEXACT, /* 37 Exactly n matches */ - - OP_TYPESTAR, /* 38 The maximizing and minimizing versions of */ - OP_TYPEMINSTAR, /* 39 all these opcodes must come in pairs, with */ - OP_TYPEPLUS, /* 40 the minimizing one second. These codes must */ - OP_TYPEMINPLUS, /* 41 be in exactly the same order as those above. */ - OP_TYPEQUERY, /* 42 This set applies to character types such as \d */ - OP_TYPEMINQUERY, /* 43 */ - OP_TYPEUPTO, /* 44 From 0 to n matches */ - OP_TYPEMINUPTO, /* 45 */ - OP_TYPEEXACT, /* 46 Exactly n matches */ - - OP_CRSTAR, /* 47 The maximizing and minimizing versions of */ - OP_CRMINSTAR, /* 48 all these opcodes must come in pairs, with */ - OP_CRPLUS, /* 49 the minimizing one second. These codes must */ - OP_CRMINPLUS, /* 50 be in exactly the same order as those above. */ - OP_CRQUERY, /* 51 These are for character classes and back refs */ - OP_CRMINQUERY, /* 52 */ - OP_CRRANGE, /* 53 These are different to the three seta above. */ - OP_CRMINRANGE, /* 54 */ + OP_NOTPROP, /* 13 \P (not Unicode property) */ + OP_PROP, /* 14 \p (Unicode property) */ + OP_EXTUNI, /* 15 \X (extended Unicode sequence */ + OP_EODN, /* 16 End of data or \n at end of data: \Z. */ + OP_EOD, /* 17 End of data: \z */ + + OP_OPT, /* 18 Set runtime options */ + OP_CIRC, /* 19 Start of line - varies with multiline switch */ + OP_DOLL, /* 20 End of line - varies with multiline switch */ + OP_CHAR, /* 21 Match one character, casefully */ + OP_CHARNC, /* 22 Match one character, caselessly */ + OP_NOT, /* 23 Match anything but the following char */ + + OP_STAR, /* 24 The maximizing and minimizing versions of */ + OP_MINSTAR, /* 25 all these opcodes must come in pairs, with */ + OP_PLUS, /* 26 the minimizing one second. */ + OP_MINPLUS, /* 27 This first set applies to single characters */ + OP_QUERY, /* 28 */ + OP_MINQUERY, /* 29 */ + OP_UPTO, /* 30 From 0 to n matches */ + OP_MINUPTO, /* 31 */ + OP_EXACT, /* 32 Exactly n matches */ + + OP_NOTSTAR, /* 33 The maximizing and minimizing versions of */ + OP_NOTMINSTAR, /* 34 all these opcodes must come in pairs, with */ + OP_NOTPLUS, /* 35 the minimizing one second. */ + OP_NOTMINPLUS, /* 36 This set applies to "not" single characters */ + OP_NOTQUERY, /* 37 */ + OP_NOTMINQUERY, /* 38 */ + OP_NOTUPTO, /* 39 From 0 to n matches */ + OP_NOTMINUPTO, /* 40 */ + OP_NOTEXACT, /* 41 Exactly n matches */ + + OP_TYPESTAR, /* 42 The maximizing and minimizing versions of */ + OP_TYPEMINSTAR, /* 43 all these opcodes must come in pairs, with */ + OP_TYPEPLUS, /* 44 the minimizing one second. These codes must */ + OP_TYPEMINPLUS, /* 45 be in exactly the same order as those above. */ + OP_TYPEQUERY, /* 46 This set applies to character types such as \d */ + OP_TYPEMINQUERY, /* 47 */ + OP_TYPEUPTO, /* 48 From 0 to n matches */ + OP_TYPEMINUPTO, /* 49 */ + OP_TYPEEXACT, /* 50 Exactly n matches */ + + OP_CRSTAR, /* 51 The maximizing and minimizing versions of */ + OP_CRMINSTAR, /* 52 all these opcodes must come in pairs, with */ + OP_CRPLUS, /* 53 the minimizing one second. These codes must */ + OP_CRMINPLUS, /* 54 be in exactly the same order as those above. */ + OP_CRQUERY, /* 55 These are for character classes and back refs */ + OP_CRMINQUERY, /* 56 */ + OP_CRRANGE, /* 57 These are different to the three sets above. */ + OP_CRMINRANGE, /* 58 */ - OP_CLASS, /* 55 Match a character class, chars < 256 only */ - OP_NCLASS, /* 56 Same, but the bitmap was created from a negative + OP_CLASS, /* 59 Match a character class, chars < 256 only */ + OP_NCLASS, /* 60 Same, but the bitmap was created from a negative class - the difference is relevant only when a UTF-8 character > 255 is encountered. */ - OP_XCLASS, /* 57 Extended class for handling UTF-8 chars within the + OP_XCLASS, /* 61 Extended class for handling UTF-8 chars within the class. This does both positive and negative. */ - OP_REF, /* 58 Match a back reference */ - OP_RECURSE, /* 59 Match a numbered subpattern (possibly recursive) */ - OP_CALLOUT, /* 60 Call out to external function if provided */ - - OP_ALT, /* 61 Start of alternation */ - OP_KET, /* 62 End of group that doesn't have an unbounded repeat */ - OP_KETRMAX, /* 63 These two must remain together and in this */ - OP_KETRMIN, /* 64 order. They are for groups the repeat for ever. */ + OP_REF, /* 62 Match a back reference */ + OP_RECURSE, /* 63 Match a numbered subpattern (possibly recursive) */ + OP_CALLOUT, /* 64 Call out to external function if provided */ + + OP_ALT, /* 65 Start of alternation */ + OP_KET, /* 66 End of group that doesn't have an unbounded repeat */ + OP_KETRMAX, /* 67 These two must remain together and in this */ + OP_KETRMIN, /* 68 order. They are for groups the repeat for ever. */ /* The assertions must come before ONCE and COND */ - OP_ASSERT, /* 65 Positive lookahead */ - OP_ASSERT_NOT, /* 66 Negative lookahead */ - OP_ASSERTBACK, /* 67 Positive lookbehind */ - OP_ASSERTBACK_NOT, /* 68 Negative lookbehind */ - OP_REVERSE, /* 69 Move pointer back - used in lookbehind assertions */ + OP_ASSERT, /* 69 Positive lookahead */ + OP_ASSERT_NOT, /* 70 Negative lookahead */ + OP_ASSERTBACK, /* 71 Positive lookbehind */ + OP_ASSERTBACK_NOT, /* 72 Negative lookbehind */ + OP_REVERSE, /* 73 Move pointer back - used in lookbehind assertions */ /* ONCE and COND must come after the assertions, with ONCE first, as there's a test for >= ONCE for a subpattern that isn't an assertion. */ - OP_ONCE, /* 70 Once matched, don't back up into the subpattern */ - OP_COND, /* 71 Conditional group */ - OP_CREF, /* 72 Used to hold an extraction string number (cond ref) */ + OP_ONCE, /* 74 Once matched, don't back up into the subpattern */ + OP_COND, /* 75 Conditional group */ + OP_CREF, /* 76 Used to hold an extraction string number (cond ref) */ - OP_BRAZERO, /* 73 These two must remain together and in this */ - OP_BRAMINZERO, /* 74 order. */ + OP_BRAZERO, /* 77 These two must remain together and in this */ + OP_BRAMINZERO, /* 78 order. */ - OP_BRANUMBER, /* 75 Used for extracting brackets whose number is greater + OP_BRANUMBER, /* 79 Used for extracting brackets whose number is greater than can fit into an opcode. */ - OP_BRA /* 76 This and greater values are used for brackets that - extract substrings up to a basic limit. After that, - use is made of OP_BRANUMBER. */ + OP_BRA /* 80 This and greater values are used for brackets that + extract substrings up to EXTRACT_BASIC_MAX. After + that, use is made of OP_BRANUMBER. */ }; -/* WARNING: There is an implicit assumption in study.c that all opcodes are -less than 128 in value. This makes handling UTF-8 character sequences easier. -*/ +/* WARNING WARNING WARNING: There is an implicit assumption in pcre.c and +study.c that all opcodes are less than 128 in value. This makes handling UTF-8 +character sequences easier. */ + +/* The highest extraction number before we have to start using additional +bytes. (Originally PCRE didn't have support for extraction counts highter than +this number.) The value is limited by the number of opcodes left after OP_BRA, +i.e. 255 - OP_BRA. We actually set it a bit lower to leave room for additional +opcodes. */ + +#define EXTRACT_BASIC_MAX 100 /* This macro defines textual names for all the opcodes. There are used only @@ -407,8 +467,10 @@ macro is referenced only in printint.c. #define OP_NAME_LIST \ "End", "\\A", "\\G", "\\B", "\\b", "\\D", "\\d", \ - "\\S", "\\s", "\\W", "\\w", "Any", "Anybyte", "\\Z", "\\z", \ - "Opt", "^", "$", "chars", "not", \ + "\\S", "\\s", "\\W", "\\w", "Any", "Anybyte", \ + "notprop", "prop", "extuni", \ + "\\Z", "\\z", \ + "Opt", "^", "$", "char", "charnc", "not", \ "*", "*?", "+", "+?", "?", "??", "{", "{", "{", \ "*", "*?", "+", "+?", "?", "??", "{", "{", "{", \ "*", "*?", "+", "+?", "?", "??", "{", "{", "{", \ @@ -431,8 +493,11 @@ in UTF-8 mode. The code that uses this t #define OP_LENGTHS \ 1, /* End */ \ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* \A, \G, \B, \B, \D, \d, \S, \s, \W, \w */ \ - 1, 1, 1, 1, 2, 1, 1, /* Any, Anybyte, \Z, \z, Opt, ^, $ */ \ - 2, /* Chars - the minimum length */ \ + 1, 1, /* Any, Anybyte */ \ + 2, 2, 1, /* NOTPROP, PROP, EXTUNI */ \ + 1, 1, 2, 1, 1, /* \Z, \z, Opt, ^, $ */ \ + 2, /* Char - the minimum length */ \ + 2, /* Charnc - the minimum length */ \ 2, /* not */ \ /* Positive single-char repeats ** These are */ \ 2, 2, 2, 2, 2, 2, /* *, *?, +, +?, ?, ?? ** minima in */ \ @@ -451,7 +516,7 @@ in UTF-8 mode. The code that uses this t 0, /* XCLASS - variable length */ \ 3, /* REF */ \ 1+LINK_SIZE, /* RECURSE */ \ - 2, /* CALLOUT */ \ + 2+2*LINK_SIZE, /* CALLOUT */ \ 1+LINK_SIZE, /* Alt */ \ 1+LINK_SIZE, /* Ket */ \ 1+LINK_SIZE, /* KetRmax */ \ @@ -469,14 +534,6 @@ in UTF-8 mode. The code that uses this t 1+LINK_SIZE /* BRA */ \ -/* The highest extraction number before we have to start using additional -bytes. (Originally PCRE didn't have support for extraction counts highter than -this number.) The value is limited by the number of opcodes left after OP_BRA, -i.e. 255 - OP_BRA. We actually set it a bit lower to leave room for additional -opcodes. */ - -#define EXTRACT_BASIC_MAX 150 - /* A magic value for OP_CREF to indicate the "in recursion" condition. */ #define CREF_RECURSE 0xffff @@ -522,7 +579,7 @@ just to accommodate the POSIX wrapper. * #define ERR34 "character value in \\x{...} sequence is too large" #define ERR35 "invalid condition (?(0)" #define ERR36 "\\C not allowed in lookbehind assertion" -#define ERR37 "PCRE does not support \\L, \\l, \\N, \\P, \\p, \\U, \\u, or \\X" +#define ERR37 "PCRE does not support \\L, \\l, \\N, \\U, or \\u" #define ERR38 "number after (?C is > 255" #define ERR39 "closing ) for (?C expected" #define ERR40 "recursive call could loop indefinitely" @@ -530,37 +587,51 @@ just to accommodate the POSIX wrapper. * #define ERR42 "syntax error after (?P" #define ERR43 "two named groups have the same name" #define ERR44 "invalid UTF-8 string" - -/* All character handling must be done as unsigned characters. Otherwise there -are problems with top-bit-set characters and functions such as isspace(). -However, we leave the interface to the outside world as char *, because that -should make things easier for callers. We define a short type for unsigned char -to save lots of typing. I tried "uchar", but it causes problems on Digital -Unix, where it is defined in sys/types, so use "uschar" instead. */ - -typedef unsigned char uschar; +#define ERR45 "support for \\P, \\p, and \\X has not been compiled" +#define ERR46 "malformed \\P or \\p sequence" +#define ERR47 "unknown property name after \\P or \\p" /* The real format of the start of the pcre block; the index of names and the -code vector run on as long as necessary after the end. */ +code vector run on as long as necessary after the end. We store an explicit +offset to the name table so that if a regex is compiled on one host, saved, and +then run on another where the size of pointers is different, all might still +be well. For the case of compiled-on-4 and run-on-8, we include an extra +pointer that is always NULL. For future-proofing, we also include a few dummy +fields - even though you can never get this planning right! + +NOTE NOTE NOTE: +Because people can now save and re-use compiled patterns, any additions to this +structure should be made at the end, and something earlier (e.g. a new +flag in the options or one of the dummy fields) should indicate that the new +fields are present. Currently PCRE always sets the dummy fields to zero. +NOTE NOTE NOTE: +*/ typedef struct real_pcre { - unsigned long int magic_number; - size_t size; /* Total that was malloced */ - const unsigned char *tables; /* Pointer to tables */ - unsigned long int options; - unsigned short int top_bracket; - unsigned short int top_backref; - unsigned short int first_byte; - unsigned short int req_byte; - unsigned short int name_entry_size; /* Size of any name items; 0 => none */ - unsigned short int name_count; /* Number of name items */ + pcre_uint32 magic_number; + pcre_uint32 size; /* Total that was malloced */ + pcre_uint32 options; + pcre_uint32 dummy1; /* For future use, maybe */ + + pcre_uint16 top_bracket; + pcre_uint16 top_backref; + pcre_uint16 first_byte; + pcre_uint16 req_byte; + pcre_uint16 name_table_offset; /* Offset to name table that follows */ + pcre_uint16 name_entry_size; /* Size of any name items */ + pcre_uint16 name_count; /* Number of name items */ + pcre_uint16 dummy2; /* For future use, maybe */ + + const unsigned char *tables; /* Pointer to tables or NULL for std */ + const unsigned char *nullpad; /* NULL padding */ } real_pcre; -/* The format of the block used to store data from pcre_study(). */ +/* The format of the block used to store data from pcre_study(). The same +remark (see NOTE above) about extending this structure applies. */ typedef struct pcre_study_data { - size_t size; /* Total that was malloced */ - uschar options; + pcre_uint32 size; /* Total that was malloced */ + pcre_uint32 options; uschar start_bits[32]; } pcre_study_data; @@ -573,12 +644,14 @@ typedef struct compile_data { const uschar *cbits; /* Points to character type table */ const uschar *ctypes; /* Points to table of type maps */ const uschar *start_code; /* The start of the compiled code */ + const uschar *start_pattern; /* The start of the pattern */ uschar *name_table; /* The name/number table */ int names_found; /* Number of entries so far */ int name_entry_size; /* Size of each entry */ int top_backref; /* Maximum back reference */ unsigned int backref_map; /* Bitmap of low back refs */ int req_varyopt; /* "After variable item" flag for reqbyte */ + BOOL nopartial; /* Set TRUE if partial won't work */ } compile_data; /* Structure for maintaining a chain of pointers to the currently incomplete @@ -628,6 +701,8 @@ typedef struct match_data { BOOL utf8; /* UTF8 flag */ BOOL endonly; /* Dollar not before final \n */ BOOL notempty; /* Empty string match not wanted */ + BOOL partial; /* PARTIAL flag */ + BOOL hitend; /* Hit the end of the subject at some point */ const uschar *start_code; /* For use when recursing */ const uschar *start_subject; /* Start of the subject string */ const uschar *end_subject; /* End of the subject string */ diff -Nurp tin-1.7.6/pcre/maketables.c tin-1.7.7/pcre/maketables.c --- tin-1.7.6/pcre/maketables.c 2004-08-20 10:30:53.000000000 +0200 +++ tin-1.7.7/pcre/maketables.c 2004-11-15 18:44:38.000000000 +0100 @@ -11,26 +11,32 @@ Written by: Philip Hazel &2 diff -Nurp tin-1.7.6/pcre/pcre.c tin-1.7.7/pcre/pcre.c --- tin-1.7.6/pcre/pcre.c 2004-08-20 10:30:53.000000000 +0200 +++ tin-1.7.7/pcre/pcre.c 2004-11-15 18:44:38.000000000 +0100 @@ -9,26 +9,34 @@ the file Tech.Notes for some information Written by: Philip Hazel - Copyright (c) 1997-2003 University of Cambridge + Copyright (c) 1997-2004 University of Cambridge ----------------------------------------------------------------------------- -Permission is granted to anyone to use this software for any purpose on any -computer system, and to redistribute it freely, subject to the following -restrictions: - -1. This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -2. The origin of this software must not be misrepresented, either by - explicit claim or by omission. - -3. Altered versions must be plainly marked as such, and must not be - misrepresented as being the original software. - -4. If PCRE is embedded in any software that is released under the GNU - General Purpose Licence (GPL), then the terms of that licence shall - supersede any condition above with which it is incompatible. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of Cambridge nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. ----------------------------------------------------------------------------- */ @@ -51,14 +59,14 @@ C headers, and the external pcre header. #include "internal.h" +/* If Unicode Property support is wanted, include a private copy of the +function that does it, and the table that translates names to numbers. */ -/* Allow compilation as C++ source code, should anybody want to do that. */ - -#ifdef __cplusplus -#define class pcre_class +#ifdef SUPPORT_UCP +#include "ucp.c" +#include "ucptypetable.c" #endif - /* Maximum number of items on the nested bracket stacks at compile time. This applies to the nesting of all kinds of parentheses. It does not limit un-nested, non-capturing parentheses. This number can be made bigger if @@ -75,14 +83,6 @@ because the offset vector is always a mu #define REC_STACK_SAVE_MAX 30 -/* The number of bytes in a literal character string above which we can't add -any more is set at 250 in order to allow for UTF-8 characters. (In theory it -could be 255 when UTF-8 support is excluded, but that means that some of the -test output would be different, which just complicates things.) */ - -#define MAXLIT 250 - - /* The maximum remaining length of subject we are prepared to search for a req_byte match. */ @@ -106,16 +106,16 @@ is invalid. */ #if !EBCDIC /* This is the "normal" table for ASCII systems */ static const short int escapes[] = { - 0, 0, 0, 0, 0, 0, 0, 0, /* 0 - 7 */ - 0, 0, ':', ';', '<', '=', '>', '?', /* 8 - ? */ - '@', -ESC_A, -ESC_B, -ESC_C, -ESC_D, -ESC_E, 0, -ESC_G, /* @ - G */ - 0, 0, 0, 0, 0, 0, 0, 0, /* H - O */ - 0, -ESC_Q, 0, -ESC_S, 0, 0, 0, -ESC_W, /* P - W */ - 0, 0, -ESC_Z, '[', '\\', ']', '^', '_', /* X - _ */ - '`', 7, -ESC_b, 0, -ESC_d, ESC_e, ESC_f, 0, /* ` - g */ - 0, 0, 0, 0, 0, 0, ESC_n, 0, /* h - o */ - 0, 0, ESC_r, -ESC_s, ESC_tee, 0, 0, -ESC_w, /* p - w */ - 0, 0, -ESC_z /* x - z */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 0 - 7 */ + 0, 0, ':', ';', '<', '=', '>', '?', /* 8 - ? */ + '@', -ESC_A, -ESC_B, -ESC_C, -ESC_D, -ESC_E, 0, -ESC_G, /* @ - G */ + 0, 0, 0, 0, 0, 0, 0, 0, /* H - O */ +-ESC_P, -ESC_Q, 0, -ESC_S, 0, 0, 0, -ESC_W, /* P - W */ +-ESC_X, 0, -ESC_Z, '[', '\\', ']', '^', '_', /* X - _ */ + '`', 7, -ESC_b, 0, -ESC_d, ESC_e, ESC_f, 0, /* ` - g */ + 0, 0, 0, 0, 0, 0, ESC_n, 0, /* h - o */ +-ESC_p, 0, ESC_r, -ESC_s, ESC_tee, 0, 0, -ESC_w, /* p - w */ + 0, 0, -ESC_z /* x - z */ }; #else /* This is the "abnormal" table for EBCDIC systems */ @@ -129,7 +129,7 @@ static const short int escapes[] = { /* 78 */ 0, '`', ':', '#', '@', '\'', '=', '"', /* 80 */ 0, 7, -ESC_b, 0, -ESC_d, ESC_e, ESC_f, 0, /* 88 */ 0, 0, 0, '{', 0, 0, 0, 0, -/* 90 */ 0, 0, 0, 'l', 0, ESC_n, 0, 0, +/* 90 */ 0, 0, 0, 'l', 0, ESC_n, 0, -ESC_p, /* 98 */ 0, ESC_r, 0, '}', 0, 0, 0, 0, /* A0 */ 0, '~', -ESC_s, ESC_tee, 0, 0, -ESC_w, 0, /* A8 */ 0,-ESC_z, 0, 0, 0, '[', 0, 0, @@ -137,9 +137,9 @@ static const short int escapes[] = { /* B8 */ 0, 0, 0, 0, 0, ']', '=', '-', /* C0 */ '{',-ESC_A, -ESC_B, -ESC_C, -ESC_D,-ESC_E, 0, -ESC_G, /* C8 */ 0, 0, 0, 0, 0, 0, 0, 0, -/* D0 */ '}', 0, 0, 0, 0, 0, 0, 0, +/* D0 */ '}', 0, 0, 0, 0, 0, 0, -ESC_P, /* D8 */-ESC_Q, 0, 0, 0, 0, 0, 0, 0, -/* E0 */ '\\', 0, -ESC_S, 0, 0, 0, -ESC_W, 0, +/* E0 */ '\\', 0, -ESC_S, 0, 0, 0, -ESC_W, -ESC_X, /* E8 */ 0,-ESC_Z, 0, 0, 0, 0, 0, 0, /* F0 */ 0, 0, 0, 0, 0, 0, 0, 0, /* F8 */ 0, 0, 0, 0, 0, 0, 0, 0 @@ -562,6 +562,86 @@ return XSTRING(PCRE_MAJOR) "." XSTRING(P /************************************************* +* Flip bytes in an integer * +*************************************************/ + +/* This function is called when the magic number in a regex doesn't match in +order to flip its bytes to see if we are dealing with a pattern that was +compiled on a host of different endianness. If so, this function is used to +flip other byte values. + +Arguments: + value the number to flip + n the number of bytes to flip (assumed to be 2 or 4) + +Returns: the flipped value +*/ + +static long int +byteflip(long int value, int n) +{ +if (n == 2) return ((value & 0x00ff) << 8) | ((value & 0xff00) >> 8); +return ((value & 0x000000ff) << 24) | + ((value & 0x0000ff00) << 8) | + ((value & 0x00ff0000) >> 8) | + ((value & 0xff000000) >> 24); +} + + + +/************************************************* +* Test for a byte-flipped compiled regex * +*************************************************/ + +/* This function is called from pce_exec() and also from pcre_fullinfo(). Its +job is to test whether the regex is byte-flipped - that is, it was compiled on +a system of opposite endianness. The function is called only when the native +MAGIC_NUMBER test fails. If the regex is indeed flipped, we flip all the +relevant values into a different data block, and return it. + +Arguments: + re points to the regex + study points to study data, or NULL + internal_re points to a new regex block + internal_study points to a new study block + +Returns: the new block if is is indeed a byte-flipped regex + NULL if it is not +*/ + +static real_pcre * +try_flipped(const real_pcre *re, real_pcre *internal_re, + const pcre_study_data *study, pcre_study_data *internal_study) +{ +if (byteflip(re->magic_number, sizeof(re->magic_number)) != MAGIC_NUMBER) + return NULL; + +*internal_re = *re; /* To copy other fields */ +internal_re->size = byteflip(re->size, sizeof(re->size)); +internal_re->options = byteflip(re->options, sizeof(re->options)); +internal_re->top_bracket = byteflip(re->top_bracket, sizeof(re->top_bracket)); +internal_re->top_backref = byteflip(re->top_backref, sizeof(re->top_backref)); +internal_re->first_byte = byteflip(re->first_byte, sizeof(re->first_byte)); +internal_re->req_byte = byteflip(re->req_byte, sizeof(re->req_byte)); +internal_re->name_table_offset = byteflip(re->name_table_offset, + sizeof(re->name_table_offset)); +internal_re->name_entry_size = byteflip(re->name_entry_size, + sizeof(re->name_entry_size)); +internal_re->name_count = byteflip(re->name_count, sizeof(re->name_count)); + +if (study != NULL) + { + *internal_study = *study; /* To copy other fields */ + internal_study->size = byteflip(study->size, sizeof(study->size)); + internal_study->options = byteflip(study->options, sizeof(study->options)); + } + +return internal_re; +} + + + +/************************************************* * (Obsolete) Return info about compiled pattern * *************************************************/ @@ -573,7 +653,7 @@ at the low end of it, and so even on 16- Therefore, I haven't changed the API for pcre_info(). Arguments: - external_re points to compiled code + argument_re points to compiled code optptr where to pass back the options first_byte where to pass back the first character, or -1 if multiline and all branches start ^, @@ -584,11 +664,16 @@ Returns: number of capturing subp */ EXPORT int -pcre_info(const pcre *external_re, int *optptr, int *first_byte) +pcre_info(const pcre *argument_re, int *optptr, int *first_byte) { -const real_pcre *re = (const real_pcre *)external_re; +real_pcre internal_re; +const real_pcre *re = (const real_pcre *)argument_re; if (re == NULL) return PCRE_ERROR_NULL; -if (re->magic_number != MAGIC_NUMBER) return PCRE_ERROR_BADMAGIC; +if (re->magic_number != MAGIC_NUMBER) + { + re = try_flipped(re, &internal_re, NULL, NULL); + if (re == NULL) return PCRE_ERROR_BADMAGIC; + } if (optptr != NULL) *optptr = (int)(re->options & PUBLIC_OPTIONS); if (first_byte != NULL) *first_byte = ((re->options & PCRE_FIRSTSET) != 0)? re->first_byte : @@ -606,7 +691,7 @@ return re->top_bracket; that additional items can be added compatibly. Arguments: - external_re points to compiled code + argument_re points to compiled code extra_data points extra data, or NULL what what information is required where where to put the information @@ -615,18 +700,26 @@ Returns: 0 if data returned, n */ EXPORT int -pcre_fullinfo(const pcre *external_re, const pcre_extra *extra_data, int what, +pcre_fullinfo(const pcre *argument_re, const pcre_extra *extra_data, int what, void *where) { -const real_pcre *re = (const real_pcre *)external_re; +real_pcre internal_re; +pcre_study_data internal_study; +const real_pcre *re = (const real_pcre *)argument_re; const pcre_study_data *study = NULL; if (re == NULL || where == NULL) return PCRE_ERROR_NULL; -if (re->magic_number != MAGIC_NUMBER) return PCRE_ERROR_BADMAGIC; if (extra_data != NULL && (extra_data->flags & PCRE_EXTRA_STUDY_DATA) != 0) study = (const pcre_study_data *)extra_data->study_data; +if (re->magic_number != MAGIC_NUMBER) + { + re = try_flipped(re, &internal_re, study, &internal_study); + if (re == NULL) return PCRE_ERROR_BADMAGIC; + if (study != NULL) study = &internal_study; + } + switch (what) { case PCRE_INFO_OPTIONS: @@ -655,10 +748,13 @@ switch (what) ((re->options & PCRE_STARTLINE) != 0)? -1 : -2; break; + /* Make sure we pass back the pointer to the bit vector in the external + block, not the internal copy (with flipped integer fields). */ + case PCRE_INFO_FIRSTTABLE: *((const uschar **)where) = (study != NULL && (study->options & PCRE_STUDY_MAPPED) != 0)? - study->start_bits : NULL; + ((const pcre_study_data *)extra_data->study_data)->start_bits : NULL; break; case PCRE_INFO_LASTLITERAL: @@ -675,7 +771,11 @@ switch (what) break; case PCRE_INFO_NAMETABLE: - *((const uschar **)where) = (const uschar *)re + sizeof(real_pcre); + *((const uschar **)where) = (const uschar *)re + re->name_table_offset; + break; + + case PCRE_INFO_DEFAULT_TABLES: + *((const uschar **)where) = (const uschar *)pcre_default_tables; break; default: return PCRE_ERROR_BADOPTION; @@ -713,6 +813,14 @@ switch (what) #endif break; + case PCRE_CONFIG_UNICODE_PROPERTIES: +#ifdef SUPPORT_UCP + *((int *)where) = 1; +#else + *((int *)where) = 0; +#endif + break; + case PCRE_CONFIG_NEWLINE: *((int *)where) = NEWLINE; break; @@ -835,11 +943,8 @@ else case 'l': case 'L': case 'N': - case 'p': - case 'P': case 'u': case 'U': - case 'X': *errorptr = ERR37; break; @@ -989,6 +1094,99 @@ return c; +#ifdef SUPPORT_UCP +/************************************************* +* Handle \P and \p * +*************************************************/ + +/* This function is called after \P or \p has been encountered, provided that +PCRE is compiled with support for Unicode properties. On entry, ptrptr is +pointing at the P or p. On exit, it is pointing at the final character of the +escape sequence. + +Argument: + ptrptr points to the pattern position pointer + negptr points to a boolean that is set TRUE for negation else FALSE + errorptr points to the pointer to the error message + +Returns: value from ucp_type_table, or -1 for an invalid type +*/ + +static int +get_ucp(const uschar **ptrptr, BOOL *negptr, const char **errorptr) +{ +int c, i, bot, top; +const uschar *ptr = *ptrptr; +char name[4]; + +c = *(++ptr); +if (c == 0) goto ERROR_RETURN; + +*negptr = FALSE; + +/* \P or \p can be followed by a one- or two-character name in {}, optionally +preceded by ^ for negation. */ + +if (c == '{') + { + if (ptr[1] == '^') + { + *negptr = TRUE; + ptr++; + } + for (i = 0; i <= 2; i++) + { + c = *(++ptr); + if (c == 0) goto ERROR_RETURN; + if (c == '}') break; + name[i] = c; + } + if (c !='}') /* Try to distinguish error cases */ + { + while (*(++ptr) != 0 && *ptr != '}'); + if (*ptr == '}') goto UNKNOWN_RETURN; else goto ERROR_RETURN; + } + name[i] = 0; + } + +/* Otherwise there is just one following character */ + +else + { + name[0] = c; + name[1] = 0; + } + +*ptrptr = ptr; + +/* Search for a recognized property name using binary chop */ + +bot = 0; +top = sizeof(utt)/sizeof(ucp_type_table); + +while (bot < top) + { + i = (bot + top)/2; + c = strcmp(name, utt[i].name); + if (c == 0) return utt[i].value; + if (c > 0) bot = i + 1; else top = i; + } + +UNKNOWN_RETURN: +*errorptr = ERR47; +*ptrptr = ptr; +return -1; + +ERROR_RETURN: +*errorptr = ERR46; +*ptrptr = ptr; +return -1; +} +#endif + + + + /************************************************* * Check for counted repeat * *************************************************/ @@ -1085,18 +1283,22 @@ return p; /* This is called by several functions that scan a compiled expression looking for a fixed first character, or an anchoring op code etc. It skips over things that do not influence this. For some calls, a change of option is important. +For some calls, it makes sense to skip negative forward and all backward +assertions, and also the \b assertion; for others it does not. Arguments: - code pointer to the start of the group - options pointer to external options - optbit the option bit whose changing is significant, or - zero if none are + code pointer to the start of the group + options pointer to external options + optbit the option bit whose changing is significant, or + zero if none are + skipassert TRUE if certain assertions are to be skipped -Returns: pointer to the first significant opcode +Returns: pointer to the first significant opcode */ static const uschar* -first_significant_code(const uschar *code, int *options, int optbit) +first_significant_code(const uschar *code, int *options, int optbit, + BOOL skipassert) { for (;;) { @@ -1111,14 +1313,19 @@ for (;;) case OP_ASSERT_NOT: case OP_ASSERTBACK: case OP_ASSERTBACK_NOT: + if (!skipassert) return code; do code += GET(code, 1); while (*code == OP_ALT); + code += OP_lengths[*code]; + break; + + case OP_WORD_BOUNDARY: + case OP_NOT_WORD_BOUNDARY: + if (!skipassert) return code; /* Fall through */ case OP_CALLOUT: case OP_CREF: case OP_BRANUMBER: - case OP_WORD_BOUNDARY: - case OP_NOT_WORD_BOUNDARY: code += OP_lengths[*code]; break; @@ -1220,19 +1427,18 @@ for (;;) cc += OP_lengths[*cc]; break; - /* Handle char strings. In UTF-8 mode we must count characters, not bytes. - This requires a scan of the string, unfortunately. We assume valid UTF-8 - strings, so all we do is reduce the length by one for every byte whose bits - are 10xxxxxx. */ + /* Handle literal characters */ - case OP_CHARS: - branchlength += *(++cc); + case OP_CHAR: + case OP_CHARNC: + branchlength++; + cc += 2; #ifdef SUPPORT_UTF8 if ((options & PCRE_UTF8) != 0) - for (d = 1; d <= *cc; d++) - if ((cc[d] & 0xc0) == 0x80) branchlength--; + { + while ((*cc & 0xc0) == 0x80) cc++; + } #endif - cc += *cc + 1; break; /* Handle exact repetitions. The count is already in characters, but we @@ -1256,6 +1462,11 @@ for (;;) /* Handle single-char matchers */ + case OP_PROP: + case OP_NOTPROP: + cc++; + /* Fall through */ + case OP_NOT_DIGIT: case OP_DIGIT: case OP_NOT_WHITESPACE: @@ -1342,7 +1553,6 @@ for (;;) { register int c = *code; if (c == OP_END) return NULL; - else if (c == OP_CHARS) code += code[1] + OP_lengths[c]; else if (c > OP_BRA) { int n = c - OP_BRA; @@ -1358,11 +1568,13 @@ for (;;) /* In UTF-8 mode, opcodes that are followed by a character may be followed by a multi-byte character. The length in the table is a minimum, so we have - to scan along to skip the extra characters. All opcodes are less than 128, - so we can use relatively efficient code. */ + to scan along to skip the extra bytes. All opcodes are less than 128, so we + can use relatively efficient code. */ if (utf8) switch(c) { + case OP_CHAR: + case OP_CHARNC: case OP_EXACT: case OP_UPTO: case OP_MINUPTO: @@ -1377,7 +1589,7 @@ for (;;) /* XCLASS is used for classes that cannot be represented just by a bit map. This includes negated single high-valued characters. The length in - the table is zero; the actual length is stored in the compled code. */ + the table is zero; the actual length is stored in the compiled code. */ case OP_XCLASS: code += GET(code, 1) + 1; @@ -1416,7 +1628,6 @@ for (;;) register int c = *code; if (c == OP_END) return NULL; else if (c == OP_RECURSE) return code; - else if (c == OP_CHARS) code += code[1] + OP_lengths[c]; else if (c > OP_BRA) { code += OP_lengths[OP_BRA]; @@ -1429,11 +1640,13 @@ for (;;) /* In UTF-8 mode, opcodes that are followed by a character may be followed by a multi-byte character. The length in the table is a minimum, so we have - to scan along to skip the extra characters. All opcodes are less than 128, - so we can use relatively efficient code. */ + to scan along to skip the extra bytes. All opcodes are less than 128, so we + can use relatively efficient code. */ if (utf8) switch(c) { + case OP_CHAR: + case OP_CHARNC: case OP_EXACT: case OP_UPTO: case OP_MINUPTO: @@ -1448,7 +1661,7 @@ for (;;) /* XCLASS is used for classes that cannot be represented just by a bit map. This includes negated single high-valued characters. The length in - the table is zero; the actual length is stored in the compled code. */ + the table is zero; the actual length is stored in the compiled code. */ case OP_XCLASS: code += GET(code, 1) + 1; @@ -1483,9 +1696,9 @@ static BOOL could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8) { register int c; -for (code = first_significant_code(code + 1 + LINK_SIZE, NULL, 0); +for (code = first_significant_code(code + 1 + LINK_SIZE, NULL, 0, TRUE); code < endcode; - code = first_significant_code(code + OP_lengths[c], NULL, 0)) + code = first_significant_code(code + OP_lengths[c], NULL, 0, TRUE)) { const uschar *ccode; @@ -1551,6 +1764,9 @@ for (code = first_significant_code(code /* Opcodes that must match a character */ + case OP_PROP: + case OP_NOTPROP: + case OP_EXTUNI: case OP_NOT_DIGIT: case OP_DIGIT: case OP_NOT_WHITESPACE: @@ -1559,7 +1775,8 @@ for (code = first_significant_code(code case OP_WORDCHAR: case OP_ANY: case OP_ANYBYTE: - case OP_CHARS: + case OP_CHAR: + case OP_CHARNC: case OP_NOT: case OP_PLUS: case OP_MINPLUS: @@ -1734,6 +1951,107 @@ while ((ptr = (uschar *)find_recurse(ptr /************************************************* +* Insert an automatic callout point * +*************************************************/ + +/* This function is called when the PCRE_AUTO_CALLOUT option is set, to insert +callout points before each pattern item. + +Arguments: + code current code pointer + ptr current pattern pointer + cd pointers to tables etc + +Returns: new code pointer +*/ + +static uschar * +auto_callout(uschar *code, const uschar *ptr, compile_data *cd) +{ +*code++ = OP_CALLOUT; +*code++ = 255; +PUT(code, 0, ptr - cd->start_pattern); /* Pattern offset */ +PUT(code, LINK_SIZE, 0); /* Default length */ +return code + 2*LINK_SIZE; +} + + + +/************************************************* +* Complete a callout item * +*************************************************/ + +/* A callout item contains the length of the next item in the pattern, which +we can't fill in till after we have reached the relevant point. This is used +for both automatic and manual callouts. + +Arguments: + previous_callout points to previous callout item + ptr current pattern pointer + cd pointers to tables etc + +Returns: nothing +*/ + +static void +complete_callout(uschar *previous_callout, const uschar *ptr, compile_data *cd) +{ +int length = ptr - cd->start_pattern - GET(previous_callout, 2); +PUT(previous_callout, 2 + LINK_SIZE, length); +} + + + +#ifdef SUPPORT_UCP +/************************************************* +* Get othercase range * +*************************************************/ + +/* This function is passed the start and end of a class range, in UTF-8 mode +with UCP support. It searches up the characters, looking for internal ranges of +characters in the "other" case. Each call returns the next one, updating the +start address. + +Arguments: + cptr points to starting character value; updated + d end value + ocptr where to put start of othercase range + odptr where to put end of othercase range + +Yield: TRUE when range returned; FALSE when no more +*/ + +static BOOL +get_othercase_range(int *cptr, int d, int *ocptr, int *odptr) +{ +int c, chartype, othercase, next; + +for (c = *cptr; c <= d; c++) + { + if (ucp_findchar(c, &chartype, &othercase) == ucp_L && othercase != 0) break; + } + +if (c > d) return FALSE; + +*ocptr = othercase; +next = othercase + 1; + +for (++c; c <= d; c++) + { + if (ucp_findchar(c, &chartype, &othercase) != ucp_L || othercase != next) + break; + next++; + } + +*odptr = next - 1; +*cptr = c; + +return TRUE; +} +#endif /* SUPPORT_UCP */ + + +/************************************************* * Compile one branch * *************************************************/ @@ -1744,7 +2062,7 @@ bits. Arguments: optionsptr pointer to the option bits brackets points to number of extracting brackets used - code points to the pointer to the current code point + codeptr points to the pointer to the current code point ptrptr points to the current pattern pointer errorptr points to pointer to error message firstbyteptr set to initial literal character, or < 0 (REQ_UNSET, REQ_NONE) @@ -1764,13 +2082,13 @@ compile_branch(int *optionsptr, int *bra int repeat_type, op_type; int repeat_min = 0, repeat_max = 0; /* To please picky compilers */ int bravalue = 0; -int length; int greedy_default, greedy_non_default; int firstbyte, reqbyte; int zeroreqbyte, zerofirstbyte; int req_caseopt, reqvary, tempreqvary; int condcount = 0; int options = *optionsptr; +int after_manual_callout = 0; register int c; register uschar *code = *codeptr; uschar *tempcode; @@ -1779,7 +2097,8 @@ BOOL groupsetfirstbyte = FALSE; const uschar *ptr = *ptrptr; const uschar *tempptr; uschar *previous = NULL; -uschar class[32]; +uschar *previous_callout = NULL; +uschar classbits[32]; #ifdef SUPPORT_UTF8 BOOL class_utf8; @@ -1795,7 +2114,7 @@ BOOL utf8 = FALSE; greedy_default = ((options & PCRE_UNGREEDY) != 0); greedy_non_default = greedy_default ^ 1; -/* Initialize no first char, no required char. REQ_UNSET means "no char +/* Initialize no first byte, no required byte. REQ_UNSET means "no char matching encountered yet". It gets changed to REQ_NONE if we hit something that matches a non-fixed char first char; reqbyte just remains unset if we never find one. @@ -1810,7 +2129,7 @@ firstbyte = reqbyte = zerofirstbyte = ze /* The variable req_caseopt contains either the REQ_CASELESS value or zero, according to the current setting of the caseless flag. REQ_CASELESS is a bit value > 255. It is added into the firstbyte or reqbyte variables to record the -case status of the value. */ +case status of the value. This is used only for ASCII characters. */ req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS : 0; @@ -1820,6 +2139,7 @@ for (;; ptr++) { BOOL negate_class; BOOL possessive_quantifier; + BOOL is_quantifier; int class_charcount; int class_lastchar; int newoptions; @@ -1827,9 +2147,53 @@ for (;; ptr++) int skipbytes; int subreqbyte; int subfirstbyte; + int mclength; + uschar mcbuffer[8]; + + /* Next byte in the pattern */ c = *ptr; - if (inescq && c != 0) goto NORMAL_CHAR; + + /* If in \Q...\E, check for the end; if not, we have a literal */ + + if (inescq && c != 0) + { + if (c == '\\' && ptr[1] == 'E') + { + inescq = FALSE; + ptr++; + continue; + } + else + { + if (previous_callout != NULL) + { + complete_callout(previous_callout, ptr, cd); + previous_callout = NULL; + } + if ((options & PCRE_AUTO_CALLOUT) != 0) + { + previous_callout = code; + code = auto_callout(code, ptr, cd); + } + goto NORMAL_CHAR; + } + } + + /* Fill in length of a previous callout, except when the next thing is + a quantifier. */ + + is_quantifier = c == '*' || c == '+' || c == '?' || + (c == '{' && is_counted_repeat(ptr+1)); + + if (!is_quantifier && previous_callout != NULL && + after_manual_callout-- <= 0) + { + complete_callout(previous_callout, ptr, cd); + previous_callout = NULL; + } + + /* In extended mode, skip white space and comments */ if ((options & PCRE_EXTENDED) != 0) { @@ -1843,6 +2207,14 @@ for (;; ptr++) } } + /* No auto callout for quantifiers. */ + + if ((options & PCRE_AUTO_CALLOUT) != 0 && !is_quantifier) + { + previous_callout = code; + code = auto_callout(code, ptr, cd); + } + switch(c) { /* The branch terminates at end of string, |, or ). */ @@ -1938,7 +2310,7 @@ for (;; ptr++) character (< 256), because in that case the compiled code doesn't use the bit map. */ - memset(class, 0, 32 * sizeof(uschar)); + memset(classbits, 0, 32 * sizeof(uschar)); /* Process characters until ] is reached. By writing this as a "do" it means that an initial ] is taken as a data character. The first pass @@ -2022,13 +2394,16 @@ for (;; ptr++) if (taboffset < 0) break; if (local_negate) { - for (c = 0; c < 32; c++) class[c] |= ~cbits[c+taboffset]; - if (blankclass) class[1] |= 0x3c; + if (i == 0) + for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+taboffset]; + else + for (c = 0; c < 32; c++) classbits[c] &= ~cbits[c+taboffset]; + if (blankclass) classbits[1] |= 0x3c; } else { - for (c = 0; c < 32; c++) class[c] |= cbits[c+taboffset]; - if (blankclass) class[1] &= ~0x3c; + for (c = 0; c < 32; c++) classbits[c] |= cbits[c+taboffset]; + if (blankclass) classbits[1] &= ~0x3c; } } @@ -2048,9 +2423,10 @@ for (;; ptr++) if (c == '\\') { c = check_escape(&ptr, errorptr, *brackets, options, TRUE); - if (-c == ESC_b) c = '\b'; /* \b is backslash in a class */ - if (-c == ESC_Q) /* Handle start of quoted string */ + if (-c == ESC_b) c = '\b'; /* \b is backslash in a class */ + else if (-c == ESC_X) c = 'X'; /* \X is literal X in a class */ + else if (-c == ESC_Q) /* Handle start of quoted string */ { if (ptr[1] == '\\' && ptr[2] == 'E') { @@ -2060,37 +2436,53 @@ for (;; ptr++) continue; } - else if (c < 0) + if (c < 0) { register const uschar *cbits = cd->cbits; - class_charcount = 10; /* Greater than 1 is what matters */ + class_charcount += 2; /* Greater than 1 is what matters */ switch (-c) { case ESC_d: - for (c = 0; c < 32; c++) class[c] |= cbits[c+cbit_digit]; + for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_digit]; continue; case ESC_D: - for (c = 0; c < 32; c++) class[c] |= ~cbits[c+cbit_digit]; + for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_digit]; continue; case ESC_w: - for (c = 0; c < 32; c++) class[c] |= cbits[c+cbit_word]; + for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_word]; continue; case ESC_W: - for (c = 0; c < 32; c++) class[c] |= ~cbits[c+cbit_word]; + for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word]; continue; case ESC_s: - for (c = 0; c < 32; c++) class[c] |= cbits[c+cbit_space]; - class[1] &= ~0x08; /* Perl 5.004 onwards omits VT from \s */ + for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_space]; + classbits[1] &= ~0x08; /* Perl 5.004 onwards omits VT from \s */ continue; case ESC_S: - for (c = 0; c < 32; c++) class[c] |= ~cbits[c+cbit_space]; - class[1] |= 0x08; /* Perl 5.004 onwards omits VT from \s */ + for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_space]; + classbits[1] |= 0x08; /* Perl 5.004 onwards omits VT from \s */ + continue; + +#ifdef SUPPORT_UCP + case ESC_p: + case ESC_P: + { + BOOL negated; + int property = get_ucp(&ptr, &negated, errorptr); + if (property < 0) goto FAILED; + class_utf8 = TRUE; + *class_utf8data++ = ((-c == ESC_p) != negated)? + XCL_PROP : XCL_NOTPROP; + *class_utf8data++ = property; + class_charcount -= 2; /* Not a < 256 character */ + } continue; +#endif /* Unrecognized escapes are faulted if PCRE is running in its strict mode. By default, for compatibility with Perl, they are @@ -2102,7 +2494,8 @@ for (;; ptr++) *errorptr = ERR7; goto FAILED; } - c = *ptr; /* The final character */ + c = *ptr; /* The final character */ + class_charcount -= 2; /* Undo the default count from above */ } } @@ -2127,7 +2520,7 @@ for (;; ptr++) } else #endif - d = *ptr; + d = *ptr; /* Not UTF-8 mode */ /* The second part of a range can be a single-character escape, but not any of the other escapes. Perl 5.6 treats a hyphen as a literal @@ -2138,11 +2531,13 @@ for (;; ptr++) const uschar *oldptr = ptr; d = check_escape(&ptr, errorptr, *brackets, options, TRUE); - /* \b is backslash; any other special means the '-' was literal */ + /* \b is backslash; \X is literal X; any other special means the '-' + was literal */ if (d < 0) { - if (d == -ESC_b) d = '\b'; else + if (d == -ESC_b) d = '\b'; + else if (d == -ESC_X) d = 'X'; else { ptr = oldptr - 2; goto LONE_SINGLE_CHARACTER; /* A few lines below */ @@ -2150,47 +2545,95 @@ for (;; ptr++) } } - /* Check that the two values are in the correct order */ + /* The check that the two values are in the correct order happens in + the pre-pass. Optimize one-character ranges */ - if (d < c) - { - *errorptr = ERR8; - goto FAILED; - } + if (d == c) goto LONE_SINGLE_CHARACTER; /* A few lines below */ - /* If d is greater than 255, we can't just use the bit map, so set up - for the UTF-8 supporting class type. If we are not caseless, we can - just set up a single range. If we are caseless, the characters < 256 - are handled with a bitmap, in order to get the case-insensitive - handling. */ + /* In UTF-8 mode, if the upper limit is > 255, or > 127 for caseless + matching, we have to use an XCLASS with extra data items. Caseless + matching for characters > 127 is available only if UCP support is + available. */ #ifdef SUPPORT_UTF8 - if (d > 255) + if (utf8 && (d > 255 || ((options & PCRE_CASELESS) != 0 && d > 127))) { class_utf8 = TRUE; - *class_utf8data++ = XCL_RANGE; - if ((options & PCRE_CASELESS) == 0) + + /* With UCP support, we can find the other case equivalents of + the relevant characters. There may be several ranges. Optimize how + they fit with the basic range. */ + +#ifdef SUPPORT_UCP + if ((options & PCRE_CASELESS) != 0) { - class_utf8data += ord2utf8(c, class_utf8data); - class_utf8data += ord2utf8(d, class_utf8data); - continue; /* Go get the next char in the class */ + int occ, ocd; + int cc = c; + int origd = d; + while (get_othercase_range(&cc, origd, &occ, &ocd)) + { + if (occ >= c && ocd <= d) continue; /* Skip embedded ranges */ + + if (occ < c && ocd >= c - 1) /* Extend the basic range */ + { /* if there is overlap, */ + c = occ; /* noting that if occ < c */ + continue; /* we can't have ocd > d */ + } /* because a subrange is */ + if (ocd > d && occ <= d + 1) /* always shorter than */ + { /* the basic range. */ + d = ocd; + continue; + } + + if (occ == ocd) + { + *class_utf8data++ = XCL_SINGLE; + } + else + { + *class_utf8data++ = XCL_RANGE; + class_utf8data += ord2utf8(occ, class_utf8data); + } + class_utf8data += ord2utf8(ocd, class_utf8data); + } } - class_utf8data += ord2utf8(256, class_utf8data); +#endif /* SUPPORT_UCP */ + + /* Now record the original range, possibly modified for UCP caseless + overlapping ranges. */ + + *class_utf8data++ = XCL_RANGE; + class_utf8data += ord2utf8(c, class_utf8data); class_utf8data += ord2utf8(d, class_utf8data); - d = 255; - /* Fall through */ + + /* With UCP support, we are done. Without UCP support, there is no + caseless matching for UTF-8 characters > 127; we can use the bit map + for the smaller ones. */ + +#ifdef SUPPORT_UCP + continue; /* With next character in the class */ +#else + if ((options & PCRE_CASELESS) == 0 || c > 127) continue; + + /* Adjust upper limit and fall through to set up the map */ + + d = 127; + +#endif /* SUPPORT_UCP */ } -#endif - /* We use the bit map if the range is entirely < 255, or if part of it - is < 255 and matching is caseless. */ +#endif /* SUPPORT_UTF8 */ + + /* We use the bit map for all cases when not in UTF-8 mode; else + ranges that lie entirely within 0-127 when there is UCP support; else + for partial ranges without UCP support. */ for (; c <= d; c++) { - class[c/8] |= (1 << (c&7)); + classbits[c/8] |= (1 << (c&7)); if ((options & PCRE_CASELESS) != 0) { int uc = cd->fcc[c]; /* flip case */ - class[uc/8] |= (1 << (uc&7)); + classbits[uc/8] |= (1 << (uc&7)); } class_charcount++; /* in case a one-char range */ class_lastchar = c; @@ -2200,28 +2643,44 @@ for (;; ptr++) } /* Handle a lone single character - we can get here for a normal - non-escape char, or after \ that introduces a single character. */ + non-escape char, or after \ that introduces a single character or for an + apparent range that isn't. */ LONE_SINGLE_CHARACTER: - /* Handle a multibyte character */ + /* Handle a character that cannot go in the bit map */ #ifdef SUPPORT_UTF8 - if (utf8 && c > 255) + if (utf8 && (c > 255 || ((options & PCRE_CASELESS) != 0 && c > 127))) { class_utf8 = TRUE; *class_utf8data++ = XCL_SINGLE; class_utf8data += ord2utf8(c, class_utf8data); + +#ifdef SUPPORT_UCP + if ((options & PCRE_CASELESS) != 0) + { + int chartype; + int othercase; + if (ucp_findchar(c, &chartype, &othercase) >= 0 && othercase > 0) + { + *class_utf8data++ = XCL_SINGLE; + class_utf8data += ord2utf8(othercase, class_utf8data); + } + } +#endif /* SUPPORT_UCP */ + } else -#endif +#endif /* SUPPORT_UTF8 */ + /* Handle a single-byte character */ { - class [c/8] |= (1 << (c&7)); + classbits[c/8] |= (1 << (c&7)); if ((options & PCRE_CASELESS) != 0) { c = cd->fcc[c]; /* flip case */ - class[c/8] |= (1 << (c&7)); + classbits[c/8] |= (1 << (c&7)); } class_charcount++; class_lastchar = c; @@ -2233,12 +2692,15 @@ for (;; ptr++) while ((c = *(++ptr)) != ']' || inescq); - /* If class_charcount is 1, we saw precisely one character with a value < - 256. In UTF-8 mode, we can optimize if there were no characters >= 256 and - the one character is < 128. In non-UTF-8 mode we can always optimize. + /* If class_charcount is 1, we saw precisely one character whose value is + less than 256. In non-UTF-8 mode we can always optimize. In UTF-8 mode, we + can optimize the negative case only if there were no characters >= 128 + because OP_NOT and the related opcodes like OP_NOTSTAR operate on + single-bytes only. This is an historical hangover. Maybe one day we can + tidy these opcodes to handle multi-byte characters. The optimization throws away the bit map. We turn the item into a - 1-character OP_CHARS if it's positive, or OP_NOT if it's negative. Note + 1-character OP_CHAR[NC] if it's positive, or OP_NOT if it's negative. Note that OP_NOT does not support multibyte characters. In the positive case, it can cause firstbyte to be set. Otherwise, there can be no first char if this item is first, whatever repeat count may follow. In the case of @@ -2247,40 +2709,44 @@ for (;; ptr++) #ifdef SUPPORT_UTF8 if (class_charcount == 1 && (!utf8 || - (!class_utf8 && class_lastchar < 128))) + (!class_utf8 && (!negate_class || class_lastchar < 128)))) + #else if (class_charcount == 1) #endif { zeroreqbyte = reqbyte; + + /* The OP_NOT opcode works on one-byte characters only. */ + if (negate_class) { if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE; zerofirstbyte = firstbyte; *code++ = OP_NOT; + *code++ = class_lastchar; + break; } + + /* For a single, positive character, get the value into mcbuffer, and + then we can handle this with the normal one-character code. */ + +#ifdef SUPPORT_UTF8 + if (utf8 && class_lastchar > 127) + mclength = ord2utf8(class_lastchar, mcbuffer); else +#endif { - if (firstbyte == REQ_UNSET) - { - zerofirstbyte = REQ_NONE; - firstbyte = class_lastchar | req_caseopt; - } - else - { - zerofirstbyte = firstbyte; - reqbyte = class_lastchar | req_caseopt | cd->req_varyopt; - } - *code++ = OP_CHARS; - *code++ = 1; + mcbuffer[0] = class_lastchar; + mclength = 1; } - *code++ = class_lastchar; - break; /* End of class handling */ - } /* End of 1-byte optimization */ - - /* Otherwise, if this is the first thing in the branch, there can be no - first char setting, whatever the repeat count. Any reqbyte setting must - remain unchanged after any kind of repeat. */ + goto ONE_CHAR; + } /* End of 1-char optimization */ + + /* The general case - not the one-char optimization. If this is the first + thing in the branch, there can be no first char setting, whatever the + repeat count. Any reqbyte setting must remain unchanged after any kind of + repeat. */ if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE; zerofirstbyte = firstbyte; @@ -2304,7 +2770,7 @@ for (;; ptr++) if (class_charcount > 0) { *code++ |= XCL_MAP; - memcpy(code, class, 32); + memcpy(code, classbits, 32); code = class_utf8data; } @@ -2332,20 +2798,21 @@ for (;; ptr++) if (negate_class) { *code++ = OP_NCLASS; - for (c = 0; c < 32; c++) code[c] = ~class[c]; + for (c = 0; c < 32; c++) code[c] = ~classbits[c]; } else { *code++ = OP_CLASS; - memcpy(code, class, 32); + memcpy(code, classbits, 32); } code += 32; break; - /* Various kinds of repeat */ + /* Various kinds of repeat; '{' is not necessarily a quantifier, but this + has been tested above. */ case '{': - if (!is_counted_repeat(ptr+1)) goto NORMAL_CHAR; + if (!is_quantifier) goto NORMAL_CHAR; ptr = read_repeat_counts(ptr+1, &repeat_min, &repeat_max, errorptr); if (*errorptr != NULL) goto FAILED; goto REPEAT; @@ -2422,14 +2889,13 @@ for (;; ptr++) code += 1 + LINK_SIZE; } - /* If previous was a string of characters, chop off the last one and use it - as the subject of the repeat. If there was only one character, we can - abolish the previous item altogether. If a one-char item has a minumum of - more than one, ensure that it is set in reqbyte - it might not be if a - sequence such as x{3} is the first thing in a branch because the x will - have gone into firstbyte instead. */ + /* If previous was a character match, abolish the item and generate a + repeat item instead. If a char item has a minumum of more than one, ensure + that it is set in reqbyte - it might not be if a sequence such as x{3} is + the first thing in a branch because the x will have gone into firstbyte + instead. */ - if (*previous == OP_CHARS) + if (*previous == OP_CHAR || *previous == OP_CHARNC) { /* Deal with UTF-8 characters that take up more than one byte. It's easier to write this out separately than try to macrify it. Use c to @@ -2443,16 +2909,6 @@ for (;; ptr++) while((*lastchar & 0xc0) == 0x80) lastchar--; c = code - lastchar; /* Length of UTF-8 character */ memcpy(utf8_char, lastchar, c); /* Save the char */ - if (lastchar == previous + 2) /* There was only one character */ - { - code = previous; /* Abolish the previous item */ - } - else - { - previous[1] -= c; /* Adjust length of previous */ - code = lastchar; /* Lost char off the end */ - tempcode = code; /* Adjust position to be moved for '+' */ - } c |= 0x80; /* Flag c as a length */ } else @@ -2462,17 +2918,8 @@ for (;; ptr++) with UTF-8 disabled, or for a UTF-8 character < 128. */ { - c = *(--code); - if (code == previous + 2) /* There was only one character */ - { - code = previous; /* Abolish the previous item */ - if (repeat_min > 1) reqbyte = c | req_caseopt | cd->req_varyopt; - } - else - { - previous[1]--; /* adjust length */ - tempcode = code; /* Adjust position to be moved for '+' */ - } + c = code[-1]; + if (repeat_min > 1) reqbyte = c | req_caseopt | cd->req_varyopt; } goto OUTPUT_SINGLE_REPEAT; /* Code shared with single character types */ @@ -2487,27 +2934,40 @@ for (;; ptr++) { op_type = OP_NOTSTAR - OP_STAR; /* Use "not" opcodes */ c = previous[1]; - code = previous; goto OUTPUT_SINGLE_REPEAT; } /* If previous was a character type match (\d or similar), abolish it and create a suitable repeat item. The code is shared with single-character - repeats by setting op_type to add a suitable offset into repeat_type. */ + repeats by setting op_type to add a suitable offset into repeat_type. Note + the the Unicode property types will be present only when SUPPORT_UCP is + defined, but we don't wrap the little bits of code here because it just + makes it horribly messy. */ else if (*previous < OP_EODN) { + uschar *oldcode; + int prop_type; op_type = OP_TYPESTAR - OP_STAR; /* Use type opcodes */ c = *previous; - code = previous; OUTPUT_SINGLE_REPEAT: + prop_type = (*previous == OP_PROP || *previous == OP_NOTPROP)? + previous[1] : -1; + + oldcode = code; + code = previous; /* Usually overwrite previous item */ /* If the maximum is zero then the minimum must also be zero; Perl allows this case, so we do too - by simply omitting the item altogether. */ if (repeat_max == 0) goto END_REPEAT; + /* All real repeats make it impossible to handle partial matching (maybe + one day we will be able to remove this restriction). */ + + if (repeat_max != 1) cd->nopartial = TRUE; + /* Combine the op_type with the repeat_type */ repeat_type += op_type; @@ -2526,51 +2986,37 @@ for (;; ptr++) } } - /* The case {1,} is handled as the special case + */ + /* A repeat minimum of 1 is optimized into some special cases. If the + maximum is unlimited, we use OP_PLUS. Otherwise, the original item it + left in place and, if the maximum is greater than 1, we use OP_UPTO with + one less than the maximum. */ - else if (repeat_min == 1 && repeat_max == -1) - *code++ = OP_PLUS + repeat_type; - - /* The case {n,n} is just an EXACT, while the general case {n,m} is - handled as an EXACT followed by an UPTO. An EXACT of 1 is optimized. */ - - else + else if (repeat_min == 1) { - if (repeat_min != 1) - { - *code++ = OP_EXACT + op_type; /* NB EXACT doesn't have repeat_type */ - PUT2INC(code, 0, repeat_min); - } - - /* If the mininum is 1 and the previous item was a character string, - we either have to put back the item that got cancelled if the string - length was 1, or add the character back onto the end of a longer - string. For a character type nothing need be done; it will just get - put back naturally. Note that the final character is always going to - get added below, so we leave code ready for its insertion. */ - - else if (*previous == OP_CHARS) + if (repeat_max == -1) + *code++ = OP_PLUS + repeat_type; + else { - if (code == previous) code += 2; else - - /* In UTF-8 mode, a multibyte char has its length in c, with the 0x80 - bit set as a flag. The length will always be between 2 and 6. */ - -#ifdef SUPPORT_UTF8 - if (utf8 && c >= 128) previous[1] += c & 7; else -#endif - previous[1]++; + code = oldcode; /* leave previous item in place */ + if (repeat_max == 1) goto END_REPEAT; + *code++ = OP_UPTO + repeat_type; + PUT2INC(code, 0, repeat_max - 1); } + } - /* For a single negated character we also have to put back the - item that got cancelled. At present this applies only to single byte - characters in any mode. */ + /* The case {n,n} is just an EXACT, while the general case {n,m} is + handled as an EXACT followed by an UPTO. */ - else if (*previous == OP_NOT) code++; + else + { + *code++ = OP_EXACT + op_type; /* NB EXACT doesn't have repeat_type */ + PUT2INC(code, 0, repeat_min); /* If the maximum is unlimited, insert an OP_STAR. Before doing so, - we have to insert the character for the previous code. In UTF-8 mode, - long characters have their length in c, with the 0x80 bit as a flag. */ + we have to insert the character for the previous code. For a repeated + Unicode property match, there is an extra byte that defines the + required property. In UTF-8 mode, long characters have their length in + c, with the 0x80 bit as a flag. */ if (repeat_max < 0) { @@ -2582,7 +3028,10 @@ for (;; ptr++) } else #endif - *code++ = c; + { + *code++ = c; + if (prop_type >= 0) *code++ = prop_type; + } *code++ = OP_STAR + repeat_type; } @@ -2600,6 +3049,7 @@ for (;; ptr++) else #endif *code++ = c; + if (prop_type >= 0) *code++ = prop_type; repeat_max -= repeat_min; *code++ = OP_UPTO + repeat_type; PUT2INC(code, 0, repeat_max); @@ -2616,8 +3066,14 @@ for (;; ptr++) } else #endif - *code++ = c; + + /* For a repeated Unicode property match, there is an extra byte that + defines the required property. */ + +#ifdef SUPPORT_UCP + if (prop_type >= 0) *code++ = prop_type; +#endif } /* If previous was a character class or a back reference, we put the repeat @@ -2635,6 +3091,12 @@ for (;; ptr++) code = previous; goto END_REPEAT; } + + /* All real repeats make it impossible to handle partial matching (maybe + one day we will be able to remove this restriction). */ + + if (repeat_max != 1) cd->nopartial = TRUE; + if (repeat_min == 0 && repeat_max == -1) *code++ = OP_CRSTAR + repeat_type; else if (repeat_min == 1 && repeat_max == -1) @@ -2937,9 +3399,11 @@ for (;; ptr++) ptr++; break; - case 'C': /* Callout - may be followed by digits */ - *code++ = OP_CALLOUT; - { + case 'C': /* Callout - may be followed by digits; */ + previous_callout = code; /* Save for later completion */ + after_manual_callout = 1; /* Skip one item before completing */ + *code++ = OP_CALLOUT; /* Already checked that the terminating */ + { /* closing parenthesis is present. */ int n = 0; while ((digitab[*(++ptr)] & ctype_digit) != 0) n = n * 10 + *ptr - '0'; @@ -2949,6 +3413,9 @@ for (;; ptr++) goto FAILED; } *code++ = n; + PUT(code, 0, ptr - cd->start_pattern + 1); /* Pattern offset */ + PUT(code, LINK_SIZE, 0); /* Default length */ + code += 2 * LINK_SIZE; } previous = NULL; continue; @@ -3339,215 +3806,107 @@ for (;; ptr++) *code++ = OP_REF; PUT2INC(code, 0, number); } - else - { - previous = (-c > ESC_b && -c < ESC_Z)? code : NULL; - *code++ = -c; - } - continue; - } - - /* Data character: reset and fall through */ - ptr = tempptr; - c = '\\'; - - /* Handle a run of data characters until a metacharacter is encountered. - The first character is guaranteed not to be whitespace or # when the - extended flag is set. */ - - NORMAL_CHAR: - default: - previous = code; - *code = OP_CHARS; - code += 2; - length = 0; - - do - { - /* If in \Q...\E, check for the end; if not, we always have a literal */ + /* So are Unicode property matches, if supported. We know that get_ucp + won't fail because it was tested in the pre-pass. */ - if (inescq) +#ifdef SUPPORT_UCP + else if (-c == ESC_P || -c == ESC_p) { - if (c == '\\' && ptr[1] == 'E') - { - inescq = FALSE; - ptr++; - } - else - { - *code++ = c; - length++; - } - continue; + BOOL negated; + int value = get_ucp(&ptr, &negated, errorptr); + previous = code; + *code++ = ((-c == ESC_p) != negated)? OP_PROP : OP_NOTPROP; + *code++ = value; } +#endif - /* Skip white space and comments for /x patterns */ + /* For the rest, we can obtain the OP value by negating the escape + value */ - if ((options & PCRE_EXTENDED) != 0) + else { - if ((cd->ctypes[c] & ctype_space) != 0) continue; - if (c == '#') - { - /* The space before the ; is to avoid a warning on a silly compiler - on the Macintosh. */ - while ((c = *(++ptr)) != 0 && c != NEWLINE) ; - if (c == 0) break; - continue; - } + previous = (-c > ESC_b && -c < ESC_Z)? code : NULL; + *code++ = -c; } + continue; + } - /* Backslash may introduce a data char or a metacharacter. Escaped items - are checked for validity in the pre-compiling pass. Stop the string - before a metaitem. */ - - if (c == '\\') - { - tempptr = ptr; - c = check_escape(&ptr, errorptr, *brackets, options, FALSE); - if (c < 0) { ptr = tempptr; break; } - - /* If a character is > 127 in UTF-8 mode, we have to turn it into - two or more bytes in the UTF-8 encoding. */ + /* We have a data character whose value is in c. In UTF-8 mode it may have + a value > 127. We set its representation in the length/buffer, and then + handle it as a data character. */ #ifdef SUPPORT_UTF8 - if (utf8 && c > 127) - { - uschar buffer[8]; - int len = ord2utf8(c, buffer); - for (c = 0; c < len; c++) *code++ = buffer[c]; - length += len; - continue; - } + if (utf8 && c > 127) + mclength = ord2utf8(c, mcbuffer); + else #endif - } - - /* Ordinary character or single-char escape */ - *code++ = c; - length++; - } + { + mcbuffer[0] = c; + mclength = 1; + } - /* This "while" is the end of the "do" above. */ + goto ONE_CHAR; - while (length < MAXLIT && (cd->ctypes[c = *(++ptr)] & ctype_meta) == 0); + /* Handle a literal character. It is guaranteed not to be whitespace or # + when the extended flag is set. If we are in UTF-8 mode, it may be a + multi-byte literal character. */ - /* Update the first and last requirements. These are always bytes, even in - UTF-8 mode. However, there is a special case to be considered when there - are only one or two characters. Because this gets messy in UTF-8 mode, the - code is kept separate. When we get here "length" contains the number of - bytes. */ + default: + NORMAL_CHAR: + mclength = 1; + mcbuffer[0] = c; #ifdef SUPPORT_UTF8 - if (utf8 && length > 1) + if (utf8 && (c & 0xc0) == 0xc0) { - uschar *t = previous + 3; /* After this code, t */ - while (t < code && (*t & 0xc0) == 0x80) t++; /* follows the 1st char */ - - /* Handle the case when there is only one multibyte character. It must - have at least two bytes because of the "length > 1" test above. */ - - if (t == code) - { - /* If no previous first byte, set it from this character, but revert to - none on a zero repeat. */ - - if (firstbyte == REQ_UNSET) - { - zerofirstbyte = REQ_NONE; - firstbyte = previous[2]; - } + while ((ptr[1] & 0xc0) == 0x80) + mcbuffer[mclength++] = *(++ptr); + } +#endif - /* Otherwise, leave the first byte value alone, and don't change it on - a zero repeat */ + /* At this point we have the character's bytes in mcbuffer, and the length + in mclength. When not in UTF-8 mode, the length is always 1. */ - else zerofirstbyte = firstbyte; + ONE_CHAR: + previous = code; + *code++ = ((options & PCRE_CASELESS) != 0)? OP_CHARNC : OP_CHAR; + for (c = 0; c < mclength; c++) *code++ = mcbuffer[c]; - /* In both cases, a zero repeat resets the previous required byte */ + /* Set the first and required bytes appropriately. If no previous first + byte, set it from this character, but revert to none on a zero repeat. + Otherwise, leave the firstbyte value alone, and don't change it on a zero + repeat. */ - zeroreqbyte = reqbyte; - } + if (firstbyte == REQ_UNSET) + { + zerofirstbyte = REQ_NONE; + zeroreqbyte = reqbyte; - /* Handle the case when there is more than one character. These may be - single-byte or multibyte characters */ + /* If the character is more than one byte long, we can set firstbyte + only if it is not to be matched caselessly. */ - else + if (mclength == 1 || req_caseopt == 0) { - t = code - 1; /* After this code, t is at the */ - while ((*t & 0xc0) == 0x80) t--; /* start of the last character */ - - /* If no previous first byte, set it from the first character, and - retain it on a zero repeat (of the last character). The required byte - is reset on a zero repeat, either to the byte before the last - character, unless this is the first byte of the string. In that case, - it reverts to its previous value. */ - - if (firstbyte == REQ_UNSET) - { - zerofirstbyte = firstbyte = previous[2] | req_caseopt; - zeroreqbyte = (t - 1 == previous + 2)? - reqbyte : t[-1] | req_caseopt | cd->req_varyopt; - } - - /* If there was a previous first byte, leave it alone, and don't change - it on a zero repeat. The required byte is reset on a zero repeat to the - byte before the last character. */ - - else - { - zerofirstbyte = firstbyte; - zeroreqbyte = t[-1] | req_caseopt | cd->req_varyopt; - } + firstbyte = mcbuffer[0] | req_caseopt; + if (mclength != 1) reqbyte = code[-1] | cd->req_varyopt; } - - /* In all cases (we know length > 1), the new required byte is the last - byte of the string. */ - - reqbyte = code[-1] | req_caseopt | cd->req_varyopt; + else firstbyte = reqbyte = REQ_NONE; } - else /* End of UTF-8 coding */ -#endif - - /* This is the code for non-UTF-8 operation, either without UTF-8 support, - or when UTF-8 is not enabled. */ + /* firstbyte was previously set; we can set reqbyte only the length is + 1 or the matching is caseful. */ + else { - /* firstbyte was not previously set; take it from this string */ - - if (firstbyte == REQ_UNSET) - { - if (length == 1) - { - zerofirstbyte = REQ_NONE; - firstbyte = previous[2] | req_caseopt; - zeroreqbyte = reqbyte; - } - else - { - zerofirstbyte = firstbyte = previous[2] | req_caseopt; - zeroreqbyte = (length > 2)? - (code[-2] | req_caseopt | cd->req_varyopt) : reqbyte; - reqbyte = code[-1] | req_caseopt | cd->req_varyopt; - } - } - - /* firstbyte was previously set */ - - else - { - zerofirstbyte = firstbyte; - zeroreqbyte = (length == 1)? reqbyte : - code[-2] | req_caseopt | cd->req_varyopt; + zerofirstbyte = firstbyte; + zeroreqbyte = reqbyte; + if (mclength == 1 || req_caseopt == 0) reqbyte = code[-1] | req_caseopt | cd->req_varyopt; - } } - /* Set the length in the data vector, and advance to the next state. */ - - previous[1] = length; - if (length < MAXLIT) ptr--; - break; + break; /* End of literal character handling */ } } /* end of big loop */ @@ -3809,7 +4168,7 @@ is_anchored(register const uschar *code, { do { const uschar *scode = - first_significant_code(code + 1+LINK_SIZE, options, PCRE_MULTILINE); + first_significant_code(code + 1+LINK_SIZE, options, PCRE_MULTILINE, FALSE); register int op = *scode; /* Capturing brackets */ @@ -3878,7 +4237,8 @@ is_startline(const uschar *code, unsigne unsigned int backref_map) { do { - const uschar *scode = first_significant_code(code + 1+LINK_SIZE, NULL, 0); + const uschar *scode = first_significant_code(code + 1+LINK_SIZE, NULL, 0, + FALSE); register int op = *scode; /* Capturing brackets */ @@ -3897,7 +4257,7 @@ do { else if (op == OP_BRA || op == OP_ASSERT || op == OP_ONCE || op == OP_COND) { if (!is_startline(scode, bracket_map, backref_map)) return FALSE; } - /* .* is not anchored unless DOTALL is set and it isn't in brackets that + /* .* means "start at start or after \n" if it isn't in brackets that may be referenced. */ else if (op == OP_TYPESTAR || op == OP_TYPEMINSTAR) @@ -3908,6 +4268,9 @@ do { /* Check for explicit circumflex */ else if (op != OP_CIRC) return FALSE; + + /* Move on to the next alternative */ + code += GET(code, 1); } while (*code == OP_ALT); /* Loop for each alternative */ @@ -3943,7 +4306,7 @@ register int c = -1; do { int d; const uschar *scode = - first_significant_code(code + 1+LINK_SIZE, options, PCRE_CASELESS); + first_significant_code(code + 1+LINK_SIZE, options, PCRE_CASELESS, TRUE); register int op = *scode; if (op >= OP_BRA) op = OP_BRA; @@ -3963,11 +4326,10 @@ do { break; case OP_EXACT: /* Fall through */ - scode++; - - case OP_CHARS: /* Fall through */ - scode++; + scode += 2; + case OP_CHAR: + case OP_CHARNC: case OP_PLUS: case OP_MINPLUS: if (!inassert) return -1; @@ -4107,8 +4469,8 @@ int branch_newextra; int item_count = -1; int name_count = 0; int max_name_size = 0; +int lastitemlength = 0; #ifdef SUPPORT_UTF8 -int lastcharlength = 0; BOOL utf8; BOOL class_utf8; #endif @@ -4199,7 +4561,11 @@ while ((c = *(++ptr)) != 0) /* If we are inside a \Q...\E sequence, all chars are literal */ - if (inescq) goto NORMAL_CHAR; + if (inescq) + { + if ((options & PCRE_AUTO_CALLOUT) != 0) length += 2 + 2*LINK_SIZE; + goto NORMAL_CHAR; + } /* Otherwise, first check for ignored whitespace and comments */ @@ -4218,24 +4584,40 @@ while ((c = *(++ptr)) != 0) item_count++; /* Is zero for the first non-comment item */ + /* Allow space for auto callout before every item except quantifiers. */ + + if ((options & PCRE_AUTO_CALLOUT) != 0 && + c != '*' && c != '+' && c != '?' && + (c != '{' || !is_counted_repeat(ptr + 1))) + length += 2 + 2*LINK_SIZE; + switch(c) { - /* A backslashed item may be an escaped "normal" character or a - character type. For a "normal" character, put the pointers and - character back so that tests for whitespace etc. in the input - are done correctly. */ + /* A backslashed item may be an escaped data character or it may be a + character type. */ case '\\': + c = check_escape(&ptr, errorptr, bracount, options, FALSE); + if (*errorptr != NULL) goto PCRE_ERROR_RETURN; + + lastitemlength = 1; /* Default length of last item for repeats */ + + if (c >= 0) /* Data character */ { - const uschar *save_ptr = ptr; - c = check_escape(&ptr, errorptr, bracount, options, FALSE); - if (*errorptr != NULL) goto PCRE_ERROR_RETURN; - if (c >= 0) + length += 2; /* For a one-byte character */ + +#ifdef SUPPORT_UTF8 + if (utf8 && c > 127) { - ptr = save_ptr; - c = '\\'; - goto NORMAL_CHAR; + int i; + for (i = 0; i < sizeof(utf8_table1)/sizeof(int); i++) + if (c <= utf8_table1[i]) break; + length += i; + lastitemlength += i; } +#endif + + continue; } /* If \Q, enter "literal" mode */ @@ -4246,12 +4628,36 @@ while ((c = *(++ptr)) != 0) continue; } - /* Other escapes need one byte, and are of length one for repeats */ + /* \X is supported only if Unicode property support is compiled */ - length++; -#ifdef SUPPORT_UTF8 - lastcharlength = 1; +#ifndef SUPPORT_UCP + if (-c == ESC_X) + { + *errorptr = ERR45; + goto PCRE_ERROR_RETURN; + } +#endif + + /* \P and \p are for Unicode properties, but only when the support has + been compiled. Each item needs 2 bytes. */ + + else if (-c == ESC_P || -c == ESC_p) + { +#ifdef SUPPORT_UCP + BOOL negated; + length += 2; + lastitemlength = 2; + if (get_ucp(&ptr, &negated, errorptr) < 0) goto PCRE_ERROR_RETURN; + continue; +#else + *errorptr = ERR45; + goto PCRE_ERROR_RETURN; #endif + } + + /* Other escapes need one byte */ + + length++; /* A back reference needs an additional 2 bytes, plus either one or 5 bytes for a repeat. We also need to keep the value of the highest @@ -4281,9 +4687,7 @@ while ((c = *(++ptr)) != 0) case '.': case '$': length++; -#ifdef SUPPORT_UTF8 - lastcharlength = 1; -#endif + lastitemlength = 1; continue; case '*': /* These repeats won't be after brackets; */ @@ -4310,30 +4714,12 @@ while ((c = *(++ptr)) != 0) else { -#ifdef SUPPORT_UTF8 - /* In UTF-8 mode, we should find the length in lastcharlength */ - if (utf8) + if (min != 1) { - if (min != 1) - { - length -= lastcharlength; /* Uncount the original char or metachar */ - if (min > 0) length += 3 + lastcharlength; - } - length += lastcharlength + ((max > 0)? 3 : 1); - } - else -#endif - - /* Not UTF-8 mode: all characters are one byte */ - { - if (min != 1) - { - length--; /* Uncount the original char or metachar */ - if (min > 0) length += 4; - } - - length += (max > 0)? 4 : 2; + length -= lastitemlength; /* Uncount the original char or metachar */ + if (min > 0) length += 3 + lastitemlength; } + length += lastitemlength + ((max > 0)? 3 : 1); } if (ptr[1] == '?') ptr++; /* Needs no extra length */ @@ -4364,14 +4750,17 @@ while ((c = *(++ptr)) != 0) where we can. (In UTF-8 mode we can do this only for chars < 128.) */ case '[': - class_optcount = 0; + if (*(++ptr) == '^') + { + class_optcount = 10; /* Greater than one */ + ptr++; + } + else class_optcount = 0; #ifdef SUPPORT_UTF8 class_utf8 = FALSE; #endif - if (*(++ptr) == '^') ptr++; - /* Written as a "do" so that an initial ']' is taken as data */ if (*ptr != 0) do @@ -4380,7 +4769,7 @@ while ((c = *(++ptr)) != 0) if (inescq) { - if (*ptr != '\\' || ptr[1] != 'E') goto NON_SPECIAL_CHARACTER; + if (*ptr != '\\' || ptr[1] != 'E') goto GET_ONE_CHARACTER; inescq = FALSE; ptr += 1; continue; @@ -4390,19 +4779,17 @@ while ((c = *(++ptr)) != 0) if (*ptr == '\\') { -#ifdef SUPPORT_UTF8 - int prevchar = ptr[-1]; -#endif - int ch = check_escape(&ptr, errorptr, bracount, options, TRUE); + c = check_escape(&ptr, errorptr, bracount, options, TRUE); if (*errorptr != NULL) goto PCRE_ERROR_RETURN; - /* \b is backspace inside a class */ + /* \b is backspace inside a class; \X is literal */ - if (-ch == ESC_b) ch = '\b'; + if (-c == ESC_b) c = '\b'; + else if (-c == ESC_X) c = 'X'; /* \Q enters quoting mode */ - if (-ch == ESC_Q) + else if (-c == ESC_Q) { inescq = TRUE; continue; @@ -4410,33 +4797,26 @@ while ((c = *(++ptr)) != 0) /* Handle escapes that turn into characters */ - if (ch >= 0) + if (c >= 0) goto NON_SPECIAL_CHARACTER; + + /* Escapes that are meta-things. The normal ones just affect the + bit map, but Unicode properties require an XCLASS extended item. */ + + else { + class_optcount = 10; /* \d, \s etc; make sure > 1 */ #ifdef SUPPORT_UTF8 - if (utf8) + if (-c == ESC_p || -c == ESC_P) { - if (ch > 127) class_optcount = 10; /* Ensure > 1 */ - if (ch > 255) + if (!class_utf8) { - uschar buffer[6]; - if (!class_utf8) - { - class_utf8 = TRUE; - length += LINK_SIZE + 1 + 1; - } - length += 1 + ord2utf8(ch, buffer); - - /* If this wide character is preceded by '-', add an extra 2 to - the length in case the previous character was < 128, because in - this case the whole range will be put into the list. */ - - if (prevchar == '-') length += 2; + class_utf8 = TRUE; + length += LINK_SIZE + 2; } + length += 2; } #endif - class_optcount++; /* for possible optimization */ } - else class_optcount = 10; /* \d, \s etc; make sure > 1 */ } /* Check the syntax for POSIX stuff. The bits we actually handle are @@ -4448,42 +4828,155 @@ while ((c = *(++ptr)) != 0) class_optcount = 10; /* Make sure > 1 */ } - /* Anything else just increments the possible optimization count. If - there are wide characters, we are going to have to use an XCLASS. */ + /* Anything else increments the possible optimization count. We have to + detect ranges here so that we can compute the number of extra ranges for + caseless wide characters when UCP support is available. If there are wide + characters, we are going to have to use an XCLASS, even for single + characters. */ else { - NON_SPECIAL_CHARACTER: - class_optcount++; + int d; + + GET_ONE_CHARACTER: #ifdef SUPPORT_UTF8 if (utf8) { - int ch; int extra = 0; - GETCHARLEN(ch, ptr, extra); - if (ch > 127) class_optcount = 10; /* No optimization possible */ - if (ch > 255) + GETCHARLEN(c, ptr, extra); + ptr += extra; + } + else c = *ptr; +#else + c = *ptr; +#endif + + /* Come here from handling \ above when it escapes to a char value */ + + NON_SPECIAL_CHARACTER: + class_optcount++; + + d = -1; + if (ptr[1] == '-') + { + uschar const *hyptr = ptr++; + if (ptr[1] == '\\') { - if (!class_utf8) + ptr++; + d = check_escape(&ptr, errorptr, bracount, options, TRUE); + if (*errorptr != NULL) goto PCRE_ERROR_RETURN; + if (-d == ESC_b) d = '\b'; /* backspace */ + else if (-d == ESC_X) d = 'X'; /* literal X in a class */ + } + else if (ptr[1] != 0 && ptr[1] != ']') + { + ptr++; +#ifdef SUPPORT_UTF8 + if (utf8) + { + int extra = 0; + GETCHARLEN(d, ptr, extra); + ptr += extra; + } + else +#endif + d = *ptr; + } + if (d < 0) ptr = hyptr; /* go back to hyphen as data */ + } + + /* If d >= 0 we have a range. In UTF-8 mode, if the end is > 255, or > + 127 for caseless matching, we will need to use an XCLASS. */ + + if (d >= 0) + { + class_optcount = 10; /* Ensure > 1 */ + if (d < c) + { + *errorptr = ERR8; + goto PCRE_ERROR_RETURN; + } + +#ifdef SUPPORT_UTF8 + if (utf8 && (d > 255 || ((options & PCRE_CASELESS) != 0 && d > 127))) + { + uschar buffer[6]; + if (!class_utf8) /* Allow for XCLASS overhead */ { class_utf8 = TRUE; - length += LINK_SIZE + 1 + 1; + length += LINK_SIZE + 2; } - length += 2 + extra; - /* If this wide character is preceded by '-', add an extra 2 to - the length in case the previous character was < 128, because in - this case the whole range will be put into the list. */ +#ifdef SUPPORT_UCP + /* If we have UCP support, find out how many extra ranges are + needed to map the other case of characters within this range. We + have to mimic the range optimization here, because extending the + range upwards might push d over a boundary that makes is use + another byte in the UTF-8 representation. */ + + if ((options & PCRE_CASELESS) != 0) + { + int occ, ocd; + int cc = c; + int origd = d; + while (get_othercase_range(&cc, origd, &occ, &ocd)) + { + if (occ >= c && ocd <= d) continue; /* Skip embedded */ + + if (occ < c && ocd >= c - 1) /* Extend the basic range */ + { /* if there is overlap, */ + c = occ; /* noting that if occ < c */ + continue; /* we can't have ocd > d */ + } /* because a subrange is */ + if (ocd > d && occ <= d + 1) /* always shorter than */ + { /* the basic range. */ + d = ocd; + continue; + } + + /* An extra item is needed */ - if (ptr[-1] == '-') length += 2; + length += 1 + ord2utf8(occ, buffer) + + ((occ == ocd)? 0 : ord2utf8(ocd, buffer)); + } + } +#endif /* SUPPORT_UCP */ - /* Advance to the end of this character */ + /* The length of the (possibly extended) range */ - ptr += extra; + length += 1 + ord2utf8(c, buffer) + ord2utf8(d, buffer); } +#endif /* SUPPORT_UTF8 */ + + } + + /* We have a single character. There is nothing to be done unless we + are in UTF-8 mode. If the char is > 255, or 127 when caseless, we must + allow for an XCL_SINGLE item, doubled for caselessness if there is UCP + support. */ + + else + { +#ifdef SUPPORT_UTF8 + if (utf8 && (c > 255 || ((options & PCRE_CASELESS) != 0 && c > 127))) + { + uschar buffer[6]; + class_optcount = 10; /* Ensure > 1 */ + if (!class_utf8) /* Allow for XCLASS overhead */ + { + class_utf8 = TRUE; + length += LINK_SIZE + 2; + } +#ifdef SUPPORT_UCP + length += (((options & PCRE_CASELESS) != 0)? 2 : 1) * + (1 + ord2utf8(c, buffer)); +#else /* SUPPORT_UCP */ + length += 1 + ord2utf8(c, buffer); +#endif /* SUPPORT_UCP */ + } +#endif /* SUPPORT_UTF8 */ } -#endif } } while (*(++ptr) != 0 && (inescq || *ptr != ']')); /* Concludes "do" above */ @@ -4608,7 +5101,7 @@ while ((c = *(++ptr)) != 0) *errorptr = ERR39; goto PCRE_ERROR_RETURN; } - length += 2; + length += 2 + 2*LINK_SIZE; continue; /* Named subpatterns are an extension copied from Python */ @@ -4908,111 +5401,46 @@ while ((c = *(++ptr)) != 0) } continue; - /* Non-special character. For a run of such characters the length required - is the number of characters + 2, except that the maximum run length is - MAXLIT. We won't get a skipped space or a non-data escape or the start of a - # comment as the first character, so the length can't be zero. */ + /* Non-special character. It won't be space or # in extended mode, so it is + always a genuine character. If we are in a \Q...\E sequence, check for the + end; if not, we have a literal. */ - NORMAL_CHAR: default: - length += 2; - runlength = 0; - do - { -#ifdef SUPPORT_UTF8 - lastcharlength = 1; /* Need length of last char for UTF-8 repeats */ -#endif - - /* If in a \Q...\E sequence, check for end; otherwise it's a literal */ - if (inescq) - { - if (c == '\\' && ptr[1] == 'E') - { - inescq = FALSE; - ptr++; - } - else runlength++; - continue; - } - - /* Skip whitespace and comments for /x */ - - if ((options & PCRE_EXTENDED) != 0) - { - if ((compile_block.ctypes[c] & ctype_space) != 0) continue; - if (c == '#') - { - /* The space before the ; is to avoid a warning on a silly compiler - on the Macintosh. */ - while ((c = *(++ptr)) != 0 && c != NEWLINE) ; - continue; - } - } - - /* Backslash may introduce a data char or a metacharacter; stop the - string before the latter. */ - - if (c == '\\') - { - const uschar *saveptr = ptr; - c = check_escape(&ptr, errorptr, bracount, options, FALSE); - if (*errorptr != NULL) goto PCRE_ERROR_RETURN; - if (c < 0) { ptr = saveptr; break; } - - /* In UTF-8 mode, add on the number of additional bytes needed to - encode this character, and save the total length in case this is a - final char that is repeated. */ - -#ifdef SUPPORT_UTF8 - if (utf8 && c > 127) - { - int i; - for (i = 0; i < sizeof(utf8_table1)/sizeof(int); i++) - if (c <= utf8_table1[i]) break; - runlength += i; - lastcharlength += i; - } -#endif - } - - /* Ordinary character or single-char escape */ + NORMAL_CHAR: - runlength++; + if (inescq && c == '\\' && ptr[1] == 'E') + { + inescq = FALSE; + ptr++; + continue; } - /* This "while" is the end of the "do" above. */ - - while (runlength < MAXLIT && - (compile_block.ctypes[c = *(++ptr)] & ctype_meta) == 0); - - /* If we hit a meta-character, back off to point to it */ + length += 2; /* For a one-byte character */ + lastitemlength = 1; /* Default length of last item for repeats */ - if (runlength < MAXLIT) ptr--; - - /* If the last char in the string is a UTF-8 multibyte character, we must - set lastcharlength correctly. If it was specified as an escape, this will - already have been done above. However, we also have to support in-line - UTF-8 characters, so check backwards from where we are. */ + /* In UTF-8 mode, check for additional bytes. */ #ifdef SUPPORT_UTF8 - if (utf8) + if (utf8 && (c & 0xc0) == 0xc0) { - const uschar *lastptr = ptr - 1; - if ((*lastptr & 0x80) != 0) - { - while((*lastptr & 0xc0) == 0x80) lastptr--; - lastcharlength = ptr - lastptr; + while ((ptr[1] & 0xc0) == 0x80) /* Can't flow over the end */ + { /* because the end is marked */ + lastitemlength++; /* by a zero byte. */ + length++; + ptr++; } } #endif - length += runlength; continue; } } length += 2 + LINK_SIZE; /* For final KET and END */ +if ((options & PCRE_AUTO_CALLOUT) != 0) + length += 2 + 2*LINK_SIZE; /* For final callout */ + if (length > MAX_PATTERN_SIZE) { *errorptr = ERR20; @@ -5031,24 +5459,32 @@ if (re == NULL) return NULL; } -/* Put in the magic number, and save the size, options, and table pointer */ +/* Put in the magic number, and save the sizes, options, and character table +pointer. NULL is used for the default character tables. The nullpad field is at +the end; it's there to help in the case when a regex compiled on a system with +4-byte pointers is run on another with 8-byte pointers. */ re->magic_number = MAGIC_NUMBER; re->size = size; re->options = options; -re->tables = tables; +re->dummy1 = re->dummy2 = 0; +re->name_table_offset = sizeof(real_pcre); re->name_entry_size = max_name_size + 3; re->name_count = name_count; +re->tables = (tables == pcre_default_tables)? NULL : tables; +re->nullpad = NULL; /* The starting points of the name/number translation table and of the code are passed around in the compile data block. */ compile_block.names_found = 0; compile_block.name_entry_size = max_name_size + 3; -compile_block.name_table = (uschar *)re + sizeof(real_pcre); +compile_block.name_table = (uschar *)re + re->name_table_offset; codestart = compile_block.name_table + re->name_entry_size * re->name_count; compile_block.start_code = codestart; +compile_block.start_pattern = (const uschar *)pattern; compile_block.req_varyopt = 0; +compile_block.nopartial = FALSE; /* Set up a starting, non-extracting bracket, then compile the expression. On error, *errorptr will be set non-NULL, so we don't need to look at the result @@ -5063,6 +5499,8 @@ bracount = 0; re->top_bracket = bracount; re->top_backref = compile_block.top_backref; +if (compile_block.nopartial) re->options |= PCRE_NOPARTIAL; + /* If not reached end of pattern on success, there's an excess bracket. */ if (*errorptr == NULL && *ptr != 0) *errorptr = ERR22; @@ -5124,7 +5562,7 @@ if ((options & PCRE_ANCHORED) == 0) /* For an anchored pattern, we use the "required byte" only if it follows a variable length item in the regex. Remove the caseless flag for non-caseable -chars. */ +bytes. */ if (reqbyte >= 0 && ((re->options & PCRE_ANCHORED) == 0 || (reqbyte & REQ_VARY) != 0)) @@ -5144,7 +5582,8 @@ printf("Length = %d top_bracket = %d top if (re->options != 0) { - printf("%s%s%s%s%s%s%s%s%s\n", + printf("%s%s%s%s%s%s%s%s%s%s\n", + ((re->options & PCRE_NOPARTIAL) != 0)? "nopartial " : "", ((re->options & PCRE_ANCHORED) != 0)? "anchored " : "", ((re->options & PCRE_CASELESS) != 0)? "caseless " : "", ((re->options & PCRE_ICHANGED) != 0)? "case state changed " : "", @@ -5276,27 +5715,46 @@ if (c < 256) return !negated; /* char found */ } -/* Now match against the list of large chars or ranges that end with a large -char. First skip the bit map if present. */ +/* First skip the bit map if present. Then match against the list of Unicode +properties or large chars or ranges that end with a large char. We won't ever +encounter XCL_PROP or XCL_NOTPROP when UCP support is not compiled. */ if ((*data++ & XCL_MAP) != 0) data += 32; while ((t = *data++) != XCL_END) { int x, y; - GETCHARINC(x, data); if (t == XCL_SINGLE) { + GETCHARINC(x, data); if (c == x) return !negated; } - else + else if (t == XCL_RANGE) { + GETCHARINC(x, data); GETCHARINC(y, data); if (c >= x && c <= y) return !negated; } + +#ifdef SUPPORT_UCP + else /* XCL_PROP & XCL_NOTPROP */ + { + int chartype, othercase; + int rqdtype = *data++; + int category = ucp_findchar(c, &chartype, &othercase); + if (rqdtype >= 128) + { + if ((rqdtype - 128 == category) == (t == XCL_PROP)) return !negated; + } + else + { + if ((rqdtype == chartype) == (t == XCL_PROP)) return !negated; + } + } +#endif /* SUPPORT_UCP */ } -return negated; /* char was not found */ +return negated; /* char did not match */ } #endif @@ -5336,7 +5794,7 @@ always used to. /* These versions of the macros manage a private stack on the heap. Note that the rd argument of RMATCH isn't actually used. It's the md argument of -match(), which never actually changes. */ +match(), which never changes. */ #define REGISTER @@ -5398,7 +5856,6 @@ typedef struct heapframe { const uschar *Xcallpat; const uschar *Xcharptr; const uschar *Xdata; - const uschar *Xlastptr; const uschar *Xnext; const uschar *Xpp; const uschar *Xprev; @@ -5413,6 +5870,16 @@ typedef struct heapframe { unsigned long int Xoriginal_ims; +#ifdef SUPPORT_UCP + int Xprop_type; + int Xprop_fail_result; + int Xprop_category; + int Xprop_chartype; + int Xprop_othercase; + int Xprop_test_against; + int *Xprop_test_variable; +#endif + int Xctype; int Xfc; int Xfi; @@ -5523,10 +5990,11 @@ HEAP_RECURSE: /* Ditto for the local variables */ -#define callpat frame->Xcallpat +#ifdef SUPPORT_UTF8 #define charptr frame->Xcharptr +#endif +#define callpat frame->Xcallpat #define data frame->Xdata -#define lastptr frame->Xlastptr #define next frame->Xnext #define pp frame->Xpp #define prev frame->Xprev @@ -5541,6 +6009,16 @@ HEAP_RECURSE: #define original_ims frame->Xoriginal_ims +#ifdef SUPPORT_UCP +#define prop_type frame->Xprop_type +#define prop_fail_result frame->Xprop_fail_result +#define prop_category frame->Xprop_category +#define prop_chartype frame->Xprop_chartype +#define prop_othercase frame->Xprop_othercase +#define prop_test_against frame->Xprop_test_against +#define prop_test_variable frame->Xprop_test_variable +#endif + #define ctype frame->Xctype #define fc frame->Xfc #define fi frame->Xfi @@ -5566,24 +6044,36 @@ i, and fc and c, can be the same variabl #define fi i #define fc c -const uschar *callpat; /* Many of these variables are used ony */ + +#ifdef SUPPORT_UTF8 /* Many of these variables are used ony */ const uschar *charptr; /* small blocks of the code. My normal */ -const uschar *data; /* style of coding would have declared */ -const uschar *lastptr; /* them within each of those blocks. */ -const uschar *next; /* However, in order to accommodate the */ -const uschar *pp; /* version of this code that uses an */ -const uschar *prev; /* external "stack" implemented on the */ -const uschar *saved_eptr; /* heap, it is easier to declare them */ - /* all here, so the declarations can */ -recursion_info new_recursive; /* be cut out in a block. The only */ - /* declarations within blocks below are */ -BOOL cur_is_word; /* for variables that do not have to */ -BOOL condition; /* be preserved over a recursive call */ -BOOL minimize; /* to RMATCH(). */ +#endif /* style of coding would have declared */ +const uschar *callpat; /* them within each of those blocks. */ +const uschar *data; /* However, in order to accommodate the */ +const uschar *next; /* version of this code that uses an */ +const uschar *pp; /* external "stack" implemented on the */ +const uschar *prev; /* heap, it is easier to declare them */ +const uschar *saved_eptr; /* all here, so the declarations can */ + /* be cut out in a block. The only */ +recursion_info new_recursive; /* declarations within blocks below are */ + /* for variables that do not have to */ +BOOL cur_is_word; /* be preserved over a recursive call */ +BOOL condition; /* to RMATCH(). */ +BOOL minimize; BOOL prev_is_word; unsigned long int original_ims; +#ifdef SUPPORT_UCP +int prop_type; +int prop_fail_result; +int prop_category; +int prop_chartype; +int prop_othercase; +int prop_test_against; +int *prop_test_variable; +#endif + int ctype; int length; int max; @@ -5598,6 +6088,14 @@ int stacksave[REC_STACK_SAVE_MAX]; eptrblock newptrb; #endif +/* These statements are here to stop the compiler complaining about unitialized +variables. */ + +#ifdef SUPPORT_UCP +prop_fail_result = 0; +prop_test_against = 0; +prop_test_variable = NULL; +#endif /* OK, now we can get on with the real code of the function. Recursion is specified by the macros RMATCH and RRETURN. When NO_RECURSE is *not* defined, @@ -5629,6 +6127,14 @@ for (;;) op = *ecode; minimize = FALSE; + /* For partial matching, remember if we ever hit the end of the subject after + matching at least one subject character. */ + + if (md->partial && + eptr >= md->end_subject && + eptr > md->start_match) + md->hitend = TRUE; + /* Opening capturing bracket. If there is space in the offset vector, save the current subject position in the working slot at the top of the vector. We mustn't change the current values of the data slot, because they may be set @@ -5883,20 +6389,22 @@ for (;;) if (pcre_callout != NULL) { pcre_callout_block cb; - cb.version = 0; /* Version 0 of the callout block */ + cb.version = 1; /* Version 1 of the callout block */ cb.callout_number = ecode[1]; cb.offset_vector = md->offset_vector; cb.subject = (const char *)md->start_subject; cb.subject_length = md->end_subject - md->start_subject; cb.start_match = md->start_match - md->start_subject; cb.current_position = eptr - md->start_subject; + cb.pattern_position = GET(ecode, 2); + cb.next_item_length = GET(ecode, 2 + LINK_SIZE); cb.capture_top = offset_top/2; cb.capture_last = md->capture_last; cb.callout_data = md->callout_data; if ((rrc = (*pcre_callout)(&cb)) > 0) RRETURN(MATCH_NOMATCH); if (rrc < 0) RRETURN(rrc); } - ecode += 2; + ecode += 2 + 2*LINK_SIZE; break; /* Recursion either matches the current regex, or some subexpression. The @@ -6297,7 +6805,7 @@ for (;;) { if (eptr == md->start_subject) prev_is_word = FALSE; else { - lastptr = eptr - 1; + const uschar *lastptr = eptr - 1; while((*lastptr & 0xc0) == 0x80) lastptr--; GETCHAR(c, lastptr); prev_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0; @@ -6427,6 +6935,63 @@ for (;;) ecode++; break; +#ifdef SUPPORT_UCP + /* Check the next character by Unicode property. We will get here only + if the support is in the binary; otherwise a compile-time error occurs. */ + + case OP_PROP: + case OP_NOTPROP: + if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH); + GETCHARINCTEST(c, eptr); + { + int chartype, rqdtype; + int othercase; + int category = ucp_findchar(c, &chartype, &othercase); + + rqdtype = *(++ecode); + ecode++; + + if (rqdtype >= 128) + { + if ((rqdtype - 128 != category) == (op == OP_PROP)) + RRETURN(MATCH_NOMATCH); + } + else + { + if ((rqdtype != chartype) == (op == OP_PROP)) + RRETURN(MATCH_NOMATCH); + } + } + break; + + /* Match an extended Unicode sequence. We will get here only if the support + is in the binary; otherwise a compile-time error occurs. */ + + case OP_EXTUNI: + if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH); + GETCHARINCTEST(c, eptr); + { + int chartype; + int othercase; + int category = ucp_findchar(c, &chartype, &othercase); + if (category == ucp_M) RRETURN(MATCH_NOMATCH); + while (eptr < md->end_subject) + { + int len = 1; + if (!md->utf8) c = *eptr; else + { + GETCHARLEN(c, eptr, len); + } + category = ucp_findchar(c, &chartype, &othercase); + if (category != ucp_M) break; + eptr += len; + } + } + ecode++; + break; +#endif + + /* Match a back reference, possibly repeatedly. Look past the end of the item to see if there is repeat information following. The code is similar to that for character classes, but repeated for efficiency. Then obey @@ -6438,7 +7003,7 @@ for (;;) case OP_REF: { offset = GET2(ecode, 1) << 1; /* Doubled ref number */ - ecode += 3; /* Advance past item */ + ecode += 3; /* Advance past item */ /* If the reference is unset, set the length to be longer than the amount of subject left; this ensures that every attempt at a match fails. We @@ -6540,9 +7105,11 @@ for (;;) /* Match a bit-mapped character class, possibly repeatedly. This op code is - used when all the characters in the class have values in the range 0-255. - The only difference between OP_CLASS and OP_NCLASS occurs when a data - character outside the range is encountered. + used when all the characters in the class have values in the range 0-255, + and either the matching is caseful, or the characters are in the range + 0-127 when UTF-8 processing is enabled. The only difference between + OP_CLASS and OP_NCLASS occurs when a data character outside the range is + encountered. First, look past the end of the item to see if there is repeat information following. Then obey similar code to character type repeats - written out @@ -6814,38 +7381,82 @@ for (;;) } #endif /* End of XCLASS */ - /* Match a run of characters */ + /* Match a single character, casefully */ + + case OP_CHAR: +#ifdef SUPPORT_UTF8 + if (md->utf8) + { + length = 1; + ecode++; + GETCHARLEN(fc, ecode, length); + if (length > md->end_subject - eptr) RRETURN(MATCH_NOMATCH); + while (length-- > 0) if (*ecode++ != *eptr++) RRETURN(MATCH_NOMATCH); + } + else +#endif - case OP_CHARS: + /* Non-UTF-8 mode */ { - register int slen = ecode[1]; + if (md->end_subject - eptr < 1) RRETURN(MATCH_NOMATCH); + if (ecode[1] != *eptr++) RRETURN(MATCH_NOMATCH); ecode += 2; + } + break; -#ifdef DEBUG /* Sigh. Some compilers never learn. */ - if (eptr >= md->end_subject) - printf("matching subject against pattern "); - else - { - printf("matching subject "); - pchars(eptr, slen, TRUE, md); - printf(" against pattern "); - } - pchars(ecode, slen, FALSE, md); - printf("\n"); -#endif + /* Match a single character, caselessly */ + + case OP_CHARNC: +#ifdef SUPPORT_UTF8 + if (md->utf8) + { + length = 1; + ecode++; + GETCHARLEN(fc, ecode, length); + + if (length > md->end_subject - eptr) RRETURN(MATCH_NOMATCH); - if (slen > md->end_subject - eptr) RRETURN(MATCH_NOMATCH); - if ((ims & PCRE_CASELESS) != 0) + /* If the pattern character's value is < 128, we have only one byte, and + can use the fast lookup table. */ + + if (fc < 128) { - while (slen-- > 0) - if (md->lcc[*ecode++] != md->lcc[*eptr++]) - RRETURN(MATCH_NOMATCH); + if (md->lcc[*ecode++] != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH); } + + /* Otherwise we must pick up the subject character */ + else { - while (slen-- > 0) if (*ecode++ != *eptr++) RRETURN(MATCH_NOMATCH); + int dc; + GETCHARINC(dc, eptr); + ecode += length; + + /* If we have Unicode property support, we can use it to test the other + case of the character, if there is one. The result of ucp_findchar() is + < 0 if the char isn't found, and othercase is returned as zero if there + isn't one. */ + + if (fc != dc) + { +#ifdef SUPPORT_UCP + int chartype; + int othercase; + if (ucp_findchar(fc, &chartype, &othercase) < 0 || dc != othercase) +#endif + RRETURN(MATCH_NOMATCH); + } } } + else +#endif /* SUPPORT_UTF8 */ + + /* Non-UTF-8 mode */ + { + if (md->end_subject - eptr < 1) RRETURN(MATCH_NOMATCH); + if (md->lcc[ecode[1]] != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH); + ecode += 2; + } break; /* Match a single character repeatedly; different opcodes share code. */ @@ -6889,15 +7500,33 @@ for (;;) if (min * length > md->end_subject - eptr) RRETURN(MATCH_NOMATCH); ecode += length; - /* Handle multibyte character matching specially here. There is no - support for any kind of casing for multibyte characters. */ + /* Handle multibyte character matching specially here. There is + support for caseless matching if UCP support is present. */ if (length > 1) { + int oclength = 0; + uschar occhars[8]; + +#ifdef SUPPORT_UCP + int othercase; + int chartype; + if ((ims & PCRE_CASELESS) != 0 && + ucp_findchar(fc, &chartype, &othercase) >= 0 && + othercase > 0) + oclength = ord2utf8(othercase, occhars); +#endif /* SUPPORT_UCP */ + for (i = 1; i <= min; i++) { - if (memcmp(eptr, charptr, length) != 0) RRETURN(MATCH_NOMATCH); - eptr += length; + if (memcmp(eptr, charptr, length) == 0) eptr += length; + /* Need braces because of following else */ + else if (oclength == 0) { RRETURN(MATCH_NOMATCH); } + else + { + if (memcmp(eptr, occhars, oclength) != 0) RRETURN(MATCH_NOMATCH); + eptr += oclength; + } } if (min == max) continue; @@ -6908,11 +7537,15 @@ for (;;) { RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0); if (rrc != MATCH_NOMATCH) RRETURN(rrc); - if (fi >= max || - eptr >= md->end_subject || - memcmp(eptr, charptr, length) != 0) - RRETURN(MATCH_NOMATCH); - eptr += length; + if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH); + if (memcmp(eptr, charptr, length) == 0) eptr += length; + /* Need braces because of following else */ + else if (oclength == 0) { RRETURN(MATCH_NOMATCH); } + else + { + if (memcmp(eptr, occhars, oclength) != 0) RRETURN(MATCH_NOMATCH); + eptr += oclength; + } } /* Control never gets here */ } @@ -6921,10 +7554,14 @@ for (;;) pp = eptr; for (i = min; i < max; i++) { - if (eptr > md->end_subject - length || - memcmp(eptr, charptr, length) != 0) - break; - eptr += length; + if (eptr > md->end_subject - length) break; + if (memcmp(eptr, charptr, length) == 0) eptr += length; + else if (oclength == 0) break; + else + { + if (memcmp(eptr, occhars, oclength) != 0) break; + eptr += oclength; + } } while (eptr >= pp) { @@ -6942,7 +7579,7 @@ for (;;) value of fc will always be < 128. */ } else -#endif +#endif /* SUPPORT_UTF8 */ /* When not in UTF-8 mode, load a single-byte character. */ { @@ -7088,9 +7725,9 @@ for (;;) max = rep_max[c]; /* zero for max => infinity */ if (max == 0) max = INT_MAX; - /* Common code for all repeated single-character (less than 255) matches. - We can give up quickly if there are fewer than the minimum number of - characters left in the subject. */ + /* Common code for all repeated single-byte matches. We can give up quickly + if there are fewer than the minimum number of bytes left in the + subject. */ REPEATNOTCHAR: if (min > md->end_subject - eptr) RRETURN(MATCH_NOMATCH); @@ -7358,16 +7995,77 @@ for (;;) REPEATTYPE: ctype = *ecode++; /* Code for the character type */ +#ifdef SUPPORT_UCP + if (ctype == OP_PROP || ctype == OP_NOTPROP) + { + prop_fail_result = ctype == OP_NOTPROP; + prop_type = *ecode++; + if (prop_type >= 128) + { + prop_test_against = prop_type - 128; + prop_test_variable = &prop_category; + } + else + { + prop_test_against = prop_type; + prop_test_variable = &prop_chartype; + } + } + else prop_type = -1; +#endif + /* First, ensure the minimum number of matches are present. Use inline code for maximizing the speed, and do the type test once at the start (i.e. keep it out of the loop). Also we can test that there are at least the minimum number of bytes before we start. This isn't as effective in UTF-8 mode, but it does no harm. Separate the UTF-8 code completely as that - is tidier. */ + is tidier. Also separate the UCP code, which can be the same for both UTF-8 + and single-bytes. */ if (min > md->end_subject - eptr) RRETURN(MATCH_NOMATCH); if (min > 0) { +#ifdef SUPPORT_UCP + if (prop_type > 0) + { + for (i = 1; i <= min; i++) + { + GETCHARINC(c, eptr); + prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase); + if ((*prop_test_variable == prop_test_against) == prop_fail_result) + RRETURN(MATCH_NOMATCH); + } + } + + /* Match extended Unicode sequences. We will get here only if the + support is in the binary; otherwise a compile-time error occurs. */ + + else if (ctype == OP_EXTUNI) + { + for (i = 1; i <= min; i++) + { + GETCHARINCTEST(c, eptr); + prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase); + if (prop_category == ucp_M) RRETURN(MATCH_NOMATCH); + while (eptr < md->end_subject) + { + int len = 1; + if (!md->utf8) c = *eptr; else + { + GETCHARLEN(c, eptr, len); + } + prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase); + if (prop_category != ucp_M) break; + eptr += len; + } + } + } + + else +#endif /* SUPPORT_UCP */ + +/* Handle all other cases when the coding is UTF-8 */ + #ifdef SUPPORT_UTF8 if (md->utf8) switch(ctype) { @@ -7390,7 +8088,7 @@ for (;;) { if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH); GETCHARINC(c, eptr); - if (c < 256 && (md->ctypes[c] & ctype_digit) != 0) + if (c < 128 && (md->ctypes[c] & ctype_digit) != 0) RRETURN(MATCH_NOMATCH); } break; @@ -7444,11 +8142,16 @@ for (;;) /* No need to skip more bytes - we know it's a 1-byte character */ } break; - } + + default: + RRETURN(PCRE_ERROR_INTERNAL); + } /* End switch(ctype) */ + else -#endif +#endif /* SUPPORT_UTF8 */ - /* Code for the non-UTF-8 case for minimum matching */ + /* Code for the non-UTF-8 case for minimum matching of operators other + than OP_PROP and OP_NOTPROP. */ switch(ctype) { @@ -7496,6 +8199,9 @@ for (;;) if ((md->ctypes[*eptr++] & ctype_word) == 0) RRETURN(MATCH_NOMATCH); break; + + default: + RRETURN(PCRE_ERROR_INTERNAL); } } @@ -7504,10 +8210,56 @@ for (;;) if (min == max) continue; /* If minimizing, we have to test the rest of the pattern before each - subsequent match. Again, separate the UTF-8 case for speed. */ + subsequent match. Again, separate the UTF-8 case for speed, and also + separate the UCP cases. */ if (minimize) { +#ifdef SUPPORT_UCP + if (prop_type > 0) + { + for (fi = min;; fi++) + { + RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0); + if (rrc != MATCH_NOMATCH) RRETURN(rrc); + if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH); + GETCHARINC(c, eptr); + prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase); + if ((*prop_test_variable == prop_test_against) == prop_fail_result) + RRETURN(MATCH_NOMATCH); + } + } + + /* Match extended Unicode sequences. We will get here only if the + support is in the binary; otherwise a compile-time error occurs. */ + + else if (ctype == OP_EXTUNI) + { + for (fi = min;; fi++) + { + RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0); + if (rrc != MATCH_NOMATCH) RRETURN(rrc); + if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH); + GETCHARINCTEST(c, eptr); + prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase); + if (prop_category == ucp_M) RRETURN(MATCH_NOMATCH); + while (eptr < md->end_subject) + { + int len = 1; + if (!md->utf8) c = *eptr; else + { + GETCHARLEN(c, eptr, len); + } + prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase); + if (prop_category != ucp_M) break; + eptr += len; + } + } + } + + else +#endif /* SUPPORT_UCP */ + #ifdef SUPPORT_UTF8 /* UTF-8 mode */ if (md->utf8) @@ -7557,6 +8309,9 @@ for (;;) if (c >= 256 && (md->ctypes[c] & ctype_word) == 0) RRETURN(MATCH_NOMATCH); break; + + default: + RRETURN(PCRE_ERROR_INTERNAL); } } } @@ -7602,6 +8357,9 @@ for (;;) case OP_WORDCHAR: if ((md->ctypes[c] & ctype_word) == 0) RRETURN(MATCH_NOMATCH); break; + + default: + RRETURN(PCRE_ERROR_INTERNAL); } } } @@ -7610,11 +8368,85 @@ for (;;) /* If maximizing it is worth using inline code for speed, doing the type test once at the start (i.e. keep it out of the loop). Again, keep the - UTF-8 stuff separate. */ + UTF-8 and UCP stuff separate. */ else { - pp = eptr; + pp = eptr; /* Remember where we started */ + +#ifdef SUPPORT_UCP + if (prop_type > 0) + { + for (i = min; i < max; i++) + { + int len = 1; + if (eptr >= md->end_subject) break; + GETCHARLEN(c, eptr, len); + prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase); + if ((*prop_test_variable == prop_test_against) == prop_fail_result) + break; + eptr+= len; + } + + /* eptr is now past the end of the maximum run */ + + for(;;) + { + RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0); + if (rrc != MATCH_NOMATCH) RRETURN(rrc); + if (eptr-- == pp) break; /* Stop if tried at original pos */ + BACKCHAR(eptr); + } + } + + /* Match extended Unicode sequences. We will get here only if the + support is in the binary; otherwise a compile-time error occurs. */ + + else if (ctype == OP_EXTUNI) + { + for (i = min; i < max; i++) + { + if (eptr >= md->end_subject) break; + GETCHARINCTEST(c, eptr); + prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase); + if (prop_category == ucp_M) break; + while (eptr < md->end_subject) + { + int len = 1; + if (!md->utf8) c = *eptr; else + { + GETCHARLEN(c, eptr, len); + } + prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase); + if (prop_category != ucp_M) break; + eptr += len; + } + } + + /* eptr is now past the end of the maximum run */ + + for(;;) + { + RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0); + if (rrc != MATCH_NOMATCH) RRETURN(rrc); + if (eptr-- == pp) break; /* Stop if tried at original pos */ + for (;;) /* Move back over one extended */ + { + int len = 1; + BACKCHAR(eptr); + if (!md->utf8) c = *eptr; else + { + GETCHARLEN(c, eptr, len); + } + prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase); + if (prop_category != ucp_M) break; + eptr--; + } + } + } + + else +#endif /* SUPPORT_UCP */ #ifdef SUPPORT_UTF8 /* UTF-8 mode */ @@ -7745,6 +8577,9 @@ for (;;) eptr+= len; } break; + + default: + RRETURN(PCRE_ERROR_INTERNAL); } /* eptr is now past the end of the maximum run */ @@ -7835,6 +8670,9 @@ for (;;) eptr++; } break; + + default: + RRETURN(PCRE_ERROR_INTERNAL); } /* eptr is now past the end of the maximum run */ @@ -7889,7 +8727,6 @@ Undefine all the macros that were define #undef callpat #undef charptr #undef data -#undef lastptr #undef next #undef pp #undef prev @@ -7940,7 +8777,7 @@ portions of the string if it matches. Tw each substring: the offsets to the start and end of the substring. Arguments: - external_re points to the compiled expression + argument_re points to the compiled expression extra_data points to extra data or is NULL subject points to the subject string length length of subject string (may contain binary zeros) @@ -7956,7 +8793,7 @@ Returns: > 0 => success; value */ EXPORT int -pcre_exec(const pcre *external_re, const pcre_extra *extra_data, +pcre_exec(const pcre *argument_re, const pcre_extra *extra_data, const char *subject, int length, int start_offset, int options, int *offsets, int offsetcount) { @@ -7971,18 +8808,25 @@ BOOL startline; BOOL first_byte_caseless = FALSE; BOOL req_byte_caseless = FALSE; match_data match_block; +const uschar *tables; const uschar *start_bits = NULL; const uschar *start_match = (const uschar *)subject + start_offset; const uschar *end_subject; const uschar *req_byte_ptr = start_match - 1; + +pcre_study_data internal_study; const pcre_study_data *study; -const real_pcre *re = (const real_pcre *)external_re; + +real_pcre internal_re; +const real_pcre *external_re = (const real_pcre *)argument_re; +const real_pcre *re = external_re; /* Plausibility checks */ if ((options & ~PUBLIC_EXEC_OPTIONS) != 0) return PCRE_ERROR_BADOPTION; if (re == NULL || subject == NULL || (offsets == NULL && offsetcount > 0)) return PCRE_ERROR_NULL; +if (offsetcount < 0) return PCRE_ERROR_BADCOUNT; /* Fish out the optional data from the extra_data structure, first setting the default values. */ @@ -7991,6 +8835,10 @@ study = NULL; match_block.match_limit = MATCH_LIMIT; match_block.callout_data = NULL; +/* The table pointer is always in native byte order. */ + +tables = external_re->tables; + if (extra_data != NULL) { register unsigned int flags = extra_data->flags; @@ -8000,17 +8848,37 @@ if (extra_data != NULL) match_block.match_limit = extra_data->match_limit; if ((flags & PCRE_EXTRA_CALLOUT_DATA) != 0) match_block.callout_data = extra_data->callout_data; + if ((flags & PCRE_EXTRA_TABLES) != 0) tables = extra_data->tables; } -/* Now we have re supposedly pointing to the regex */ +/* If the exec call supplied NULL for tables, use the inbuilt ones. This +is a feature that makes it possible to save compiled regex and re-use them +in other programs later. */ + +if (tables == NULL) tables = pcre_default_tables; + +/* Check that the first field in the block is the magic number. If it is not, +test for a regex that was compiled on a host of opposite endianness. If this is +the case, flipped values are put in internal_re and internal_study if there was +study data too. */ + +if (re->magic_number != MAGIC_NUMBER) + { + re = try_flipped(re, &internal_re, study, &internal_study); + if (re == NULL) return PCRE_ERROR_BADMAGIC; + if (study != NULL) study = &internal_study; + } -if (re->magic_number != MAGIC_NUMBER) return PCRE_ERROR_BADMAGIC; +/* Set up other data */ anchored = ((re->options | options) & PCRE_ANCHORED) != 0; startline = (re->options & PCRE_STARTLINE) != 0; -match_block.start_code = - (const uschar *)re + sizeof(real_pcre) + re->name_count * re->name_entry_size; +/* The code starts after the real_pcre block and the capture name table. */ + +match_block.start_code = (const uschar *)external_re + re->name_table_offset + + re->name_count * re->name_entry_size; + match_block.start_subject = (const uschar *)subject; match_block.start_offset = start_offset; match_block.end_subject = match_block.start_subject + length; @@ -8022,11 +8890,19 @@ match_block.utf8 = (re->options & PCRE_U match_block.notbol = (options & PCRE_NOTBOL) != 0; match_block.noteol = (options & PCRE_NOTEOL) != 0; match_block.notempty = (options & PCRE_NOTEMPTY) != 0; +match_block.partial = (options & PCRE_PARTIAL) != 0; +match_block.hitend = FALSE; match_block.recursive = NULL; /* No recursion at top level */ -match_block.lcc = re->tables + lcc_offset; -match_block.ctypes = re->tables + ctypes_offset; +match_block.lcc = tables + lcc_offset; +match_block.ctypes = tables + ctypes_offset; + +/* Partial matching is supported only for a restricted set of regexes at the +moment. */ + +if (match_block.partial && (re->options & PCRE_NOPARTIAL) != 0) + return PCRE_ERROR_BADPARTIAL; /* Check a UTF-8 string if required. Unfortunately there's no way of passing back the character offset. */ @@ -8055,7 +8931,7 @@ restoring at the exit of a group is easy ims = re->options & (PCRE_CASELESS|PCRE_MULTILINE|PCRE_DOTALL); /* If the expression has got more back references than the offsets supplied can -hold, we get a temporary bit of working store to use during the matching. +hold, we get a temporary chunk of working store to use during the matching. Otherwise, we can use the vector supplied, rounding down its size to a multiple of 3. */ @@ -8121,7 +8997,7 @@ if ((re->options & PCRE_REQCHSET) != 0) { req_byte = re->req_byte & 255; req_byte_caseless = (re->req_byte & REQ_CASELESS) != 0; - req_byte2 = (re->tables + fcc_offset)[req_byte]; /* case flipped */ + req_byte2 = (tables + fcc_offset)[req_byte]; /* case flipped */ } /* Loop for handling unanchored repeated matching attempts; for anchored regexs @@ -8129,12 +9005,14 @@ the loop runs just once. */ do { - register int *iptr = match_block.offset_vector; - register int *iend = iptr + resetcount; - /* Reset the maximum number of extractions we might see. */ - while (iptr < iend) *iptr++ = -1; + if (match_block.offset_vector != NULL) + { + register int *iptr = match_block.offset_vector; + register int *iend = iptr + resetcount; + while (iptr < iend) *iptr++ = -1; + } /* Advance to a unique first char if possible */ @@ -8166,7 +9044,7 @@ do { while (start_match < end_subject) { - register int c = *start_match; + register unsigned int c = *start_match; if ((start_bits[c/8] & (1 << (c&7))) == 0) start_match++; else break; } } @@ -8188,9 +9066,14 @@ do HOWEVER: when the subject string is very, very long, searching to its end can take a long time, and give bad performance on quite ordinary patterns. This showed up when somebody was matching /^C/ on a 32-megabyte string... so we - don't do this when the string is sufficiently long. */ + don't do this when the string is sufficiently long. - if (req_byte >= 0 && end_subject - start_match < REQ_BYTE_MAX) + ALSO: this processing is disabled when partial matching is requested. + */ + + if (req_byte >= 0 && + end_subject - start_match < REQ_BYTE_MAX && + !match_block.partial) { register const uschar *p = start_match + ((first_byte >= 0)? 1 : 0); @@ -8245,7 +9128,8 @@ do start_match++; #ifdef SUPPORT_UTF8 if (match_block.utf8) - while((*start_match & 0xc0) == 0x80) start_match++; + while(start_match < end_subject && (*start_match & 0xc0) == 0x80) + start_match++; #endif continue; } @@ -8296,9 +9180,16 @@ if (using_temporary_offsets) (pcre_free)(match_block.offset_vector); } -DPRINTF((">>>> returning PCRE_ERROR_NOMATCH\n")); - -return PCRE_ERROR_NOMATCH; +if (match_block.partial && match_block.hitend) + { + DPRINTF((">>>> returning PCRE_ERROR_PARTIAL\n")); + return PCRE_ERROR_PARTIAL; + } +else + { + DPRINTF((">>>> returning PCRE_ERROR_NOMATCH\n")); + return PCRE_ERROR_NOMATCH; + } } /* End of pcre.c */ diff -Nurp tin-1.7.6/pcre/pcre.in tin-1.7.7/pcre/pcre.in --- tin-1.7.6/pcre/pcre.in 2004-08-20 10:30:53.000000000 +0200 +++ tin-1.7.7/pcre/pcre.in 2004-11-15 18:44:38.000000000 +0100 @@ -2,7 +2,39 @@ * Perl-Compatible Regular Expressions * *************************************************/ -/* Copyright (c) 1997-2003 University of Cambridge */ +/* In its original form, this is the .in file that is transformed by +"configure" into pcre.h. + + Copyright (c) 1997-2004 University of Cambridge + +----------------------------------------------------------------------------- +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of Cambridge nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +----------------------------------------------------------------------------- +*/ #ifndef _PCRE_H #define _PCRE_H @@ -58,6 +90,8 @@ extern "C" { #define PCRE_UTF8 0x0800 #define PCRE_NO_AUTO_CAPTURE 0x1000 #define PCRE_NO_UTF8_CHECK 0x2000 +#define PCRE_AUTO_CALLOUT 0x4000 +#define PCRE_PARTIAL 0x8000 /* Exec-time and get/set-time error codes */ @@ -72,6 +106,10 @@ extern "C" { #define PCRE_ERROR_CALLOUT (-9) /* Never used by PCRE itself */ #define PCRE_ERROR_BADUTF8 (-10) #define PCRE_ERROR_BADUTF8_OFFSET (-11) +#define PCRE_ERROR_PARTIAL (-12) +#define PCRE_ERROR_BADPARTIAL (-13) +#define PCRE_ERROR_INTERNAL (-14) +#define PCRE_ERROR_BADCOUNT (-15) /* Request types for pcre_fullinfo() */ @@ -87,6 +125,7 @@ extern "C" { #define PCRE_INFO_NAMECOUNT 8 #define PCRE_INFO_NAMETABLE 9 #define PCRE_INFO_STUDYSIZE 10 +#define PCRE_INFO_DEFAULT_TABLES 11 /* Request types for pcre_config() */ @@ -96,12 +135,14 @@ extern "C" { #define PCRE_CONFIG_POSIX_MALLOC_THRESHOLD 3 #define PCRE_CONFIG_MATCH_LIMIT 4 #define PCRE_CONFIG_STACKRECURSE 5 +#define PCRE_CONFIG_UNICODE_PROPERTIES 6 /* Bit flags for the pcre_extra structure */ #define PCRE_EXTRA_STUDY_DATA 0x0001 #define PCRE_EXTRA_MATCH_LIMIT 0x0002 #define PCRE_EXTRA_CALLOUT_DATA 0x0004 +#define PCRE_EXTRA_TABLES 0x0008 /* Types */ @@ -109,13 +150,15 @@ struct real_pcre; /* dec typedef struct real_pcre pcre; /* The structure for passing additional data to pcre_exec(). This is defined in -such as way as to be extensible. */ +such as way as to be extensible. Always add new fields at the end, in order to +remain compatible. */ typedef struct pcre_extra { unsigned long int flags; /* Bits for which fields are set */ void *study_data; /* Opaque data from pcre_study() */ unsigned long int match_limit; /* Maximum number of calls to match() */ void *callout_data; /* Data passed back in callouts */ + const unsigned char *tables; /* Pointer to character tables */ } pcre_extra; /* The structure for passing out data via the pcre_callout_function. We use a @@ -131,10 +174,13 @@ typedef struct pcre_callout_block { const char *subject; /* The subject being matched */ int subject_length; /* The length of the subject */ int start_match; /* Offset to start of this match attempt */ - int current_position; /* Where we currently are */ + int current_position; /* Where we currently are in the subject */ int capture_top; /* Max current capture */ int capture_last; /* Most recently closed capture */ void *callout_data; /* Data passed in with the call */ + /* ------------------- Added for Version 1 -------------------------- */ + int pattern_position; /* Offset to next item in the pattern */ + int next_item_length; /* Length of next item in the pattern */ /* ------------------------------------------------------------------ */ } pcre_callout_block; diff -Nurp tin-1.7.6/pcre/pcredemo.c tin-1.7.7/pcre/pcredemo.c --- tin-1.7.6/pcre/pcredemo.c 2004-08-20 10:30:53.000000000 +0200 +++ tin-1.7.7/pcre/pcredemo.c 2004-11-15 18:44:38.000000000 +0100 @@ -7,10 +7,10 @@ of calling the PCRE regular expression l pcresample documentation for a short discussion. Compile thuswise: - gcc -Wall pcredemo.c -I/opt/local/include -L/opt/local/lib \ - -R/opt/local/lib -lpcre + gcc -Wall pcredemo.c -I/usr/local/include -L/usr/local/lib \ + -R/usr/local/lib -lpcre -Replace "/opt/local/include" and "/opt/local/lib" with wherever the include and +Replace "/usr/local/include" and "/usr/local/lib" with wherever the include and library files for PCRE are installed on your system. Only some operating systems (e.g. Solaris) use the -R option. */ @@ -39,12 +39,13 @@ int subject_length; int rc, i; -/************************************************************************* -* First, sort out the command line. There is only one possible option at * -* the moment, "-g" to request repeated matching to find all occurrences, * -* like Perl's /g option. We set the variable find_all non-zero if it is * -* present. Apart from that, there must be exactly two arguments. * -*************************************************************************/ +/************************************************************************** +* First, sort out the command line. There is only one possible option at * +* the moment, "-g" to request repeated matching to find all occurrences, * +* like Perl's /g option. We set the variable find_all to a non-zero value * +* if the -g option is present. Apart from that, there must be exactly two * +* arguments. * +**************************************************************************/ find_all = 0; for (i = 1; i < argc; i++) @@ -90,7 +91,7 @@ if (re == NULL) /************************************************************************* * If the compilation succeeded, we call PCRE again, in order to do a * -* pattern match against the subject string. This just does ONE match. If * +* pattern match against the subject string. This does just ONE match. If * * further matching is needed, it will be done below. * *************************************************************************/ @@ -116,6 +117,7 @@ if (rc < 0) */ default: printf("Matching error %d\n", rc); break; } + free(re); /* Release memory used for the compiled pattern */ return 1; } @@ -149,12 +151,12 @@ for (i = 0; i < rc; i++) } -/************************************************************************* -* That concludes the basic part of this demonstration program. We have * -* compiled a pattern, and performed a single match. The code that follows* -* first shows how to access named substrings, and then how to code for * -* repeated matches on the same subject. * -*************************************************************************/ +/************************************************************************** +* That concludes the basic part of this demonstration program. We have * +* compiled a pattern, and performed a single match. The code that follows * +* first shows how to access named substrings, and then how to code for * +* repeated matches on the same subject. * +**************************************************************************/ /* See if there are any named substrings, and if so, show them by name. First we have to extract the count of named parentheses from the pattern. */ @@ -219,7 +221,11 @@ if (namecount <= 0) printf("No named sub * proceed round the loop. * *************************************************************************/ -if (!find_all) return 0; /* Finish unless -g was given */ +if (!find_all) + { + free(re); /* Release the memory used for the compiled pattern */ + return 0; /* Finish unless -g was given */ + } /* Loop for second and subsequent matches */ @@ -270,6 +276,7 @@ for (;;) if (rc < 0) { printf("Matching error %d\n", rc); + free(re); /* Release memory used for the compiled pattern */ return 1; } @@ -310,6 +317,7 @@ for (;;) } /* End of loop to find second and subsequent matches */ printf("\n"); +free(re); /* Release memory used for the compiled pattern */ return 0; } diff -Nurp tin-1.7.6/pcre/pcregrep.c tin-1.7.7/pcre/pcregrep.c --- tin-1.7.6/pcre/pcregrep.c 2004-08-20 10:30:54.000000000 +0200 +++ tin-1.7.7/pcre/pcregrep.c 2004-11-15 18:44:38.000000000 +0100 @@ -4,7 +4,38 @@ /* This is a grep program that uses the PCRE regular expression library to do its pattern matching. On a Unix or Win32 system it can recurse into -directories. */ +directories. + + Copyright (c) 1997-2004 University of Cambridge + +----------------------------------------------------------------------------- +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of Cambridge nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +----------------------------------------------------------------------------- +*/ #include #include diff -Nurp tin-1.7.6/pcre/pcreposix.c tin-1.7.7/pcre/pcreposix.c --- tin-1.7.6/pcre/pcreposix.c 2004-08-20 10:30:54.000000000 +0200 +++ tin-1.7.7/pcre/pcreposix.c 2004-11-15 18:44:38.000000000 +0100 @@ -12,26 +12,34 @@ functions. Written by: Philip Hazel - Copyright (c) 1997-2003 University of Cambridge + Copyright (c) 1997-2004 University of Cambridge ----------------------------------------------------------------------------- -Permission is granted to anyone to use this software for any purpose on any -computer system, and to redistribute it freely, subject to the following -restrictions: - -1. This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -2. The origin of this software must not be misrepresented, either by - explicit claim or by omission. - -3. Altered versions must be plainly marked as such, and must not be - misrepresented as being the original software. - -4. If PCRE is embedded in any software that is released under the GNU - General Purpose Licence (GPL), then the terms of that licence shall - supersede any condition above with which it is incompatible. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of Cambridge nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. ----------------------------------------------------------------------------- */ @@ -48,7 +56,7 @@ static const char *const estring[] = { ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19, ERR20, ERR21, ERR22, ERR23, ERR24, ERR25, ERR26, ERR27, ERR29, ERR29, ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39, ERR40, - ERR41, ERR42, ERR43, ERR44 }; + ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47 }; static const int eint[] = { REG_EESCAPE, /* "\\ at end of pattern" */ @@ -87,14 +95,17 @@ static const int eint[] = { REG_BADPAT, /* "character value in \x{...} sequence is too large" */ REG_BADPAT, /* "invalid condition (?(0)" */ REG_BADPAT, /* "\\C not allowed in lookbehind assertion" */ - REG_EESCAPE, /* "PCRE does not support \\L, \\l, \\N, \\P, \\p, \\U, \\u, or \\X" */ + REG_EESCAPE, /* "PCRE does not support \\L, \\l, \\N, \\U, or \\u" */ REG_BADPAT, /* "number after (?C is > 255" */ REG_BADPAT, /* "closing ) for (?C expected" */ REG_BADPAT, /* "recursive call could loop indefinitely" */ REG_BADPAT, /* "unrecognized character after (?P" */ REG_BADPAT, /* "syntax error after (?P" */ REG_BADPAT, /* "two named groups have the same name" */ - REG_BADPAT /* "invalid UTF-8 string" */ + REG_BADPAT, /* "invalid UTF-8 string" */ + REG_BADPAT, /* "support for \\P, \\p, and \\X has not been compiled" */ + REG_BADPAT, /* "malformed \\P or \\p sequence" */ + REG_BADPAT /* "unknown property name after \\P or \\p" */ }; /* Table of texts corresponding to POSIX error codes */ diff -Nurp tin-1.7.6/pcre/pcreposix.h tin-1.7.7/pcre/pcreposix.h --- tin-1.7.6/pcre/pcreposix.h 2004-08-20 10:30:54.000000000 +0200 +++ tin-1.7.7/pcre/pcreposix.h 2004-11-15 18:44:38.000000000 +0100 @@ -2,14 +2,43 @@ * Perl-Compatible Regular Expressions * *************************************************/ -/* Copyright (c) 1997-2003 University of Cambridge */ - #ifndef _PCREPOSIX_H #define _PCREPOSIX_H /* This is the header for the POSIX wrapper interface to the PCRE Perl- Compatible Regular Expression library. It defines the things POSIX says should -be there. I hope. */ +be there. I hope. + + Copyright (c) 1997-2004 University of Cambridge + +----------------------------------------------------------------------------- +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of Cambridge nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +----------------------------------------------------------------------------- +*/ /* Have to include stdlib.h in order to ensure that size_t is defined. */ diff -Nurp tin-1.7.6/pcre/pcretest.c tin-1.7.7/pcre/pcretest.c --- tin-1.7.6/pcre/pcretest.c 2004-08-20 10:30:54.000000000 +0200 +++ tin-1.7.7/pcre/pcretest.c 2004-11-15 18:44:38.000000000 +0100 @@ -4,7 +4,37 @@ /* This program was hacked up as a tester for PCRE. I really should have written it more tidily in the first place. Will I ever learn? It has grown and -been extended and consequently is now rather untidy in places. */ +been extended and consequently is now rather untidy in places. + +----------------------------------------------------------------------------- +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of Cambridge nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +----------------------------------------------------------------------------- +*/ + #include #include @@ -12,6 +42,7 @@ been extended and consequently is now ra #include #include #include +#include /* We need the internal info for displaying the results of pcre_study(). Also for getting the opcodes for showing compiled code. */ @@ -35,9 +66,10 @@ Makefile. */ #endif #endif -#define LOOPREPEAT 50000 +#define LOOPREPEAT 500000 #define BUFFER_SIZE 30000 +#define PBUFFER_SIZE BUFFER_SIZE #define DBUFFER_SIZE BUFFER_SIZE @@ -52,6 +84,8 @@ static int show_malloc; static int use_utf8; static size_t gotten_store; +static uschar *pbuffer = NULL; + static const int utf8_table1[] = { 0x0000007f, 0x000007ff, 0x0000ffff, 0x001fffff, 0x03ffffff, 0x7fffffff}; @@ -71,10 +105,13 @@ static const int utf8_table3[] = { /* The code for doing this is held in a separate file that is also included in pcre.c when it is compiled with the debug switch. It defines a function called print_internals(), which uses a table of opcode lengths defined by the macro -OP_LENGTHS, whose name must be OP_lengths. */ +OP_LENGTHS, whose name must be OP_lengths. It also uses a table that translates +Unicode property names to numbers; this is kept in a separate file. */ static uschar OP_lengths[] = { OP_LENGTHS }; +#include "ucp.h" +#include "ucptypetable.c" #include "printint.c" @@ -269,7 +306,7 @@ data is not zero. */ static int callout(pcre_callout_block *cb) { FILE *f = (first_callout | callout_extra)? outfile : NULL; -int i, pre_start, post_start; +int i, pre_start, post_start, subject_length; if (callout_extra) { @@ -300,16 +337,26 @@ pre_start = pchars((unsigned char *)cb-> post_start = pchars((unsigned char *)(cb->subject + cb->start_match), cb->current_position - cb->start_match, f); +subject_length = pchars((unsigned char *)cb->subject, cb->subject_length, NULL); + (void)pchars((unsigned char *)(cb->subject + cb->current_position), cb->subject_length - cb->current_position, f); if (f != NULL) fprintf(f, "\n"); /* Always print appropriate indicators, with callout number if not already -shown */ +shown. For automatic callouts, show the pattern offset. */ -if (callout_extra) fprintf(outfile, " "); - else fprintf(outfile, "%3d ", cb->callout_number); +if (cb->callout_number == 255) + { + fprintf(outfile, "%+3d ", cb->pattern_position); + if (cb->pattern_position > 99) fprintf(outfile, "\n "); + } +else + { + if (callout_extra) fprintf(outfile, " "); + else fprintf(outfile, "%3d ", cb->callout_number); + } for (i = 0; i < pre_start; i++) fprintf(outfile, " "); fprintf(outfile, "^"); @@ -320,6 +367,12 @@ if (post_start > 0) fprintf(outfile, "^"); } +for (i = 0; i < subject_length - pre_start - post_start + 4; i++) + fprintf(outfile, " "); + +fprintf(outfile, "%.*s", (cb->next_item_length == 0)? 1 : cb->next_item_length, + pbuffer + cb->pattern_position); + fprintf(outfile, "\n"); first_callout = 0; @@ -396,6 +449,23 @@ if ((rc = pcre_fullinfo(re, study, optio /************************************************* +* Byte flipping function * +*************************************************/ + +static long int +byteflip(long int value, int n) +{ +if (n == 2) return ((value & 0x00ff) << 8) | ((value & 0xff00) >> 8); +return ((value & 0x000000ff) << 24) | + ((value & 0x0000ff00) << 8) | + ((value & 0x00ff0000) >> 8) | + ((value & 0xff000000) >> 24); +} + + + + +/************************************************* * Main Program * *************************************************/ @@ -429,8 +499,15 @@ when I am debugging. */ buffer = (unsigned char *)malloc(BUFFER_SIZE); dbuffer = (unsigned char *)malloc(DBUFFER_SIZE); +pbuffer = (unsigned char *)malloc(PBUFFER_SIZE); -/* Static so that new_malloc can use it. */ +/* The outfile variable is static so that new_malloc can use it. The _setmode() +stuff is some magic that I don't understand, but which apparently does good +things in Windows. It's related to line terminations. */ + +#if defined(_WIN32) || defined(WIN32) +_setmode( _fileno( stdout ), 0x8000 ); +#endif /* defined(_WIN32) || defined(WIN32) */ outfile = stdout; @@ -462,6 +539,8 @@ while (argc > 1 && argv[op][0] == '-') printf("Compiled with\n"); (void)pcre_config(PCRE_CONFIG_UTF8, &rc); printf(" %sUTF-8 support\n", rc? "" : "No "); + (void)pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &rc); + printf(" %sUnicode properties support\n", rc? "" : "No "); (void)pcre_config(PCRE_CONFIG_NEWLINE, &rc); printf(" Newline character is %s\n", (rc == '\r')? "CR" : "LF"); (void)pcre_config(PCRE_CONFIG_LINK_SIZE, &rc); @@ -481,11 +560,12 @@ while (argc > 1 && argv[op][0] == '-') printf(" -C show PCRE compile-time options and exit\n"); printf(" -d debug: show compiled code; implies -i\n" " -i show information about compiled pattern\n" + " -m output memory used information\n" " -o set size of offsets vector to \n"); #if !defined NOPOSIX printf(" -p use POSIX interface\n"); #endif - printf(" -s output store information\n" + printf(" -s output store (memory) used information\n" " -t time compilation and execution\n"); return 1; } @@ -508,7 +588,7 @@ if (offsets == NULL) if (argc > 1) { - infile = fopen(argv[op], "r"); + infile = fopen(argv[op], "rb"); if (infile == NULL) { printf("** Failed to open %s\n", argv[op]); @@ -518,7 +598,7 @@ if (argc > 1) if (argc > 2) { - outfile = fopen(argv[op+1], "w"); + outfile = fopen(argv[op+1], "wb"); if (outfile == NULL) { printf("** Failed to open %s\n", argv[op+1]); @@ -551,13 +631,17 @@ while (!done) const char *error; unsigned char *p, *pp, *ppp; + unsigned char *to_file = NULL; const unsigned char *tables = NULL; + unsigned long int true_size, true_study_size = 0; + size_t size, regex_gotten_store; int do_study = 0; int do_debug = debug; int do_G = 0; int do_g = 0; int do_showinfo = showinfo; int do_showrest = 0; + int do_flip = 0; int erroroffset, len, delimiter; use_utf8 = 0; @@ -571,8 +655,93 @@ while (!done) while (isspace(*p)) p++; if (*p == 0) continue; - /* Get the delimiter and seek the end of the pattern; if is isn't - complete, read more. */ + /* See if the pattern is to be loaded pre-compiled from a file. */ + + if (*p == '<' && strchr((char *)(p+1), '<') == NULL) + { + unsigned long int magic; + uschar sbuf[8]; + FILE *f; + + p++; + pp = p + (int)strlen((char *)p); + while (isspace(pp[-1])) pp--; + *pp = 0; + + f = fopen((char *)p, "rb"); + if (f == NULL) + { + fprintf(outfile, "Failed to open %s: %s\n", p, strerror(errno)); + continue; + } + + if (fread(sbuf, 1, 8, f) != 8) goto FAIL_READ; + + true_size = + (sbuf[0] << 24) | (sbuf[1] << 16) | (sbuf[2] << 8) | sbuf[3]; + true_study_size = + (sbuf[4] << 24) | (sbuf[5] << 16) | (sbuf[6] << 8) | sbuf[7]; + + re = (real_pcre *)new_malloc(true_size); + regex_gotten_store = gotten_store; + + if (fread(re, 1, true_size, f) != true_size) goto FAIL_READ; + + magic = ((real_pcre *)re)->magic_number; + if (magic != MAGIC_NUMBER) + { + if (byteflip(magic, sizeof(magic)) == MAGIC_NUMBER) + { + do_flip = 1; + } + else + { + fprintf(outfile, "Data in %s is not a compiled PCRE regex\n", p); + fclose(f); + continue; + } + } + + fprintf(outfile, "Compiled regex%s loaded from %s\n", + do_flip? " (byte-inverted)" : "", p); + + /* Need to know if UTF-8 for printing data strings */ + + new_info(re, NULL, PCRE_INFO_OPTIONS, &options); + use_utf8 = (options & PCRE_UTF8) != 0; + + /* Now see if there is any following study data */ + + if (true_study_size != 0) + { + pcre_study_data *psd; + + extra = (pcre_extra *)new_malloc(sizeof(pcre_extra) + true_study_size); + extra->flags = PCRE_EXTRA_STUDY_DATA; + + psd = (pcre_study_data *)(((char *)extra) + sizeof(pcre_extra)); + extra->study_data = psd; + + if (fread(psd, 1, true_study_size, f) != true_study_size) + { + FAIL_READ: + fprintf(outfile, "Failed to read data from %s\n", p); + if (extra != NULL) new_free(extra); + if (re != NULL) new_free(re); + fclose(f); + continue; + } + fprintf(outfile, "Study data loaded from %s\n", p); + do_study = 1; /* To get the data output if requested */ + } + else fprintf(outfile, "No study data\n"); + + fclose(f); + goto SHOW_INFO; + } + + /* In-line pattern (the usual case). Get the delimiter and seek the end of + the pattern; if is isn't complete, read more. */ delimiter = *p++; @@ -617,9 +786,11 @@ while (!done) if (pp[1] == '\\') *pp++ = '\\'; - /* Terminate the pattern at the delimiter */ + /* Terminate the pattern at the delimiter, and save a copy of the pattern + for callouts. */ *pp++ = 0; + strcpy((char *)pbuffer, (char *)p); /* Look for options after final delimiter */ @@ -639,8 +810,10 @@ while (!done) case '+': do_showrest = 1; break; case 'A': options |= PCRE_ANCHORED; break; + case 'C': options |= PCRE_AUTO_CALLOUT; break; case 'D': do_debug = do_showinfo = 1; break; case 'E': options |= PCRE_DOLLAR_ENDONLY; break; + case 'F': do_flip = 1; break; case 'G': do_G = 1; break; case 'I': do_showinfo = 1; break; case 'M': log_store = 1; break; @@ -669,7 +842,15 @@ while (!done) pp = ppp; break; + case '>': + to_file = pp; + while (*pp != 0) pp++; + while (isspace(pp[-1])) pp--; + *pp = 0; + break; + case '\n': case ' ': break; + default: fprintf(outfile, "** Unknown option '%c'\n", pp[-1]); goto SKIP_DATA; @@ -685,6 +866,7 @@ while (!done) { int rc; int cflags = 0; + if ((options & PCRE_CASELESS) != 0) cflags |= REG_ICASE; if ((options & PCRE_MULTILINE) != 0) cflags |= REG_NEWLINE; rc = regcomp(&preg, (char *)p, cflags); @@ -759,14 +941,77 @@ while (!done) sizeof(real_pcre) - ((real_pcre *)re)->name_count * ((real_pcre *)re)->name_entry_size)); + /* Extract the size for possible writing before possibly flipping it, + and remember the store that was got. */ + + true_size = ((real_pcre *)re)->size; + regex_gotten_store = gotten_store; + + /* If /S was present, study the regexp to generate additional info to + help with the matching. */ + + if (do_study) + { + if (timeit) + { + register int i; + clock_t time_taken; + clock_t start_time = clock(); + for (i = 0; i < LOOPREPEAT; i++) + extra = pcre_study(re, study_options, &error); + time_taken = clock() - start_time; + if (extra != NULL) free(extra); + fprintf(outfile, " Study time %.3f milliseconds\n", + (((double)time_taken * 1000.0) / (double)LOOPREPEAT) / + (double)CLOCKS_PER_SEC); + } + extra = pcre_study(re, study_options, &error); + if (error != NULL) + fprintf(outfile, "Failed to study: %s\n", error); + else if (extra != NULL) + true_study_size = ((pcre_study_data *)(extra->study_data))->size; + } + + /* If the 'F' option was present, we flip the bytes of all the integer + fields in the regex data block and the study block. This is to make it + possible to test PCRE's handling of byte-flipped patterns, e.g. those + compiled on a different architecture. */ + + if (do_flip) + { + real_pcre *rre = (real_pcre *)re; + rre->magic_number = byteflip(rre->magic_number, sizeof(rre->magic_number)); + rre->size = byteflip(rre->size, sizeof(rre->size)); + rre->options = byteflip(rre->options, sizeof(rre->options)); + rre->top_bracket = byteflip(rre->top_bracket, sizeof(rre->top_bracket)); + rre->top_backref = byteflip(rre->top_backref, sizeof(rre->top_backref)); + rre->first_byte = byteflip(rre->first_byte, sizeof(rre->first_byte)); + rre->req_byte = byteflip(rre->req_byte, sizeof(rre->req_byte)); + rre->name_table_offset = byteflip(rre->name_table_offset, + sizeof(rre->name_table_offset)); + rre->name_entry_size = byteflip(rre->name_entry_size, + sizeof(rre->name_entry_size)); + rre->name_count = byteflip(rre->name_count, sizeof(rre->name_count)); + + if (extra != NULL) + { + pcre_study_data *rsd = (pcre_study_data *)(extra->study_data); + rsd->size = byteflip(rsd->size, sizeof(rsd->size)); + rsd->options = byteflip(rsd->options, sizeof(rsd->options)); + } + } + + /* Extract information from the compiled data if required */ + + SHOW_INFO: + if (do_showinfo) { - unsigned long int get_options; + unsigned long int get_options, all_options; int old_first_char, old_options, old_count; int count, backrefmax, first_char, need_char; int nameentrysize, namecount; const uschar *nametable; - size_t size; if (do_debug) { @@ -802,9 +1047,9 @@ while (!done) get_options, old_options); } - if (size != gotten_store) fprintf(outfile, + if (size != regex_gotten_store) fprintf(outfile, "Size disagreement: pcre_fullinfo=%d call to malloc for %d\n", - size, gotten_store); + size, regex_gotten_store); fprintf(outfile, "Capturing subpattern count = %d\n", count); if (backrefmax > 0) @@ -822,6 +1067,18 @@ while (!done) } } + /* The NOPARTIAL bit is a private bit in the options, so we have + to fish it out via out back door */ + + all_options = ((real_pcre *)re)->options; + if (do_flip) + { + all_options = byteflip(all_options, sizeof(all_options)); + } + + if ((all_options & PCRE_NOPARTIAL) != 0) + fprintf(outfile, "Partial matching not supported\n"); + if (get_options == 0) fprintf(outfile, "No options\n"); else fprintf(outfile, "Options:%s%s%s%s%s%s%s%s%s%s\n", ((get_options & PCRE_ANCHORED) != 0)? " anchored" : "", @@ -871,77 +1128,103 @@ while (!done) else fprintf(outfile, "Need char = %d%s\n", ch, caseless); } - } - - /* If /S was present, study the regexp to generate additional info to - help with the matching. */ - - if (do_study) - { - if (timeit) - { - register int i; - clock_t time_taken; - clock_t start_time = clock(); - for (i = 0; i < LOOPREPEAT; i++) - extra = pcre_study(re, study_options, &error); - time_taken = clock() - start_time; - if (extra != NULL) free(extra); - fprintf(outfile, " Study time %.3f milliseconds\n", - (((double)time_taken * 1000.0) / (double)LOOPREPEAT) / - (double)CLOCKS_PER_SEC); - } - - extra = pcre_study(re, study_options, &error); - if (error != NULL) - fprintf(outfile, "Failed to study: %s\n", error); - else if (extra == NULL) - fprintf(outfile, "Study returned NULL\n"); /* Don't output study size; at present it is in any case a fixed value, but it varies, depending on the computer architecture, and - so messes up the test suite. */ + so messes up the test suite. (And with the /F option, it might be + flipped.) */ - else if (do_showinfo) + if (do_study) { - size_t size; - uschar *start_bits = NULL; - new_info(re, extra, PCRE_INFO_STUDYSIZE, &size); - new_info(re, extra, PCRE_INFO_FIRSTTABLE, &start_bits); - /* fprintf(outfile, "Study size = %d\n", size); */ - if (start_bits == NULL) - fprintf(outfile, "No starting character set\n"); + if (extra == NULL) + fprintf(outfile, "Study returned NULL\n"); else { - int i; - int c = 24; - fprintf(outfile, "Starting character set: "); - for (i = 0; i < 256; i++) + uschar *start_bits = NULL; + new_info(re, extra, PCRE_INFO_FIRSTTABLE, &start_bits); + + if (start_bits == NULL) + fprintf(outfile, "No starting byte set\n"); + else { - if ((start_bits[i/8] & (1<<(i%8))) != 0) + int i; + int c = 24; + fprintf(outfile, "Starting byte set: "); + for (i = 0; i < 256; i++) { - if (c > 75) - { - fprintf(outfile, "\n "); - c = 2; - } - if (isprint(i) && i != ' ') + if ((start_bits[i/8] & (1<<(i&7))) != 0) { - fprintf(outfile, "%c ", i); - c += 2; - } - else - { - fprintf(outfile, "\\x%02x ", i); - c += 5; + if (c > 75) + { + fprintf(outfile, "\n "); + c = 2; + } + if (isprint(i) && i != ' ') + { + fprintf(outfile, "%c ", i); + c += 2; + } + else + { + fprintf(outfile, "\\x%02x ", i); + c += 5; + } } } + fprintf(outfile, "\n"); } - fprintf(outfile, "\n"); } } } - } + + /* If the '>' option was present, we write out the regex to a file, and + that is all. The first 8 bytes of the file are the regex length and then + the study length, in big-endian order. */ + + if (to_file != NULL) + { + FILE *f = fopen((char *)to_file, "wb"); + if (f == NULL) + { + fprintf(outfile, "Unable to open %s: %s\n", to_file, strerror(errno)); + } + else + { + uschar sbuf[8]; + sbuf[0] = (true_size >> 24) & 255; + sbuf[1] = (true_size >> 16) & 255; + sbuf[2] = (true_size >> 8) & 255; + sbuf[3] = (true_size) & 255; + + sbuf[4] = (true_study_size >> 24) & 255; + sbuf[5] = (true_study_size >> 16) & 255; + sbuf[6] = (true_study_size >> 8) & 255; + sbuf[7] = (true_study_size) & 255; + + if (fwrite(sbuf, 1, 8, f) < 8 || + fwrite(re, 1, true_size, f) < true_size) + { + fprintf(outfile, "Write error on %s: %s\n", to_file, strerror(errno)); + } + else + { + fprintf(outfile, "Compiled regex written to %s\n", to_file); + if (extra != NULL) + { + if (fwrite(extra->study_data, 1, true_study_size, f) < + true_study_size) + { + fprintf(outfile, "Write error on %s: %s\n", to_file, + strerror(errno)); + } + else fprintf(outfile, "Study data written to %s\n", to_file); + } + } + fclose(f); + } + continue; /* With next regex */ + } + } /* End of non-POSIX compile */ /* Read data lines and test them */ @@ -1045,10 +1328,14 @@ while (!done) } break; - case 0: /* Allows for an empty line */ + case 0: /* \ followed by EOF allows for an empty line */ p--; continue; + case '>': + while(isdigit(*p)) start_offset = start_offset * 10 + *p++ - '0'; + continue; + case 'A': /* Option setting */ options |= PCRE_ANCHORED; continue; @@ -1159,6 +1446,10 @@ while (!done) if (n == 0) use_offsets = NULL; /* Ensures it can't write to it */ continue; + case 'P': + options |= PCRE_PARTIAL; + continue; + case 'S': show_malloc = 1; continue; @@ -1269,7 +1560,8 @@ while (!done) min = mid; mid = (mid == max - 1)? max : (max > 0)? (min + max)/2 : mid*2; } - else if (count >= 0 || count == PCRE_ERROR_NOMATCH) + else if (count >= 0 || count == PCRE_ERROR_NOMATCH || + count == PCRE_ERROR_PARTIAL) { if (mid == min + 1) { @@ -1305,8 +1597,11 @@ while (!done) /* The normal case is just to do the match once, with the default value of match_limit. */ - else count = pcre_exec(re, extra, (char *)bptr, len, - start_offset, options | g_notempty, use_offsets, use_size_offsets); + else + { + count = pcre_exec(re, extra, (char *)bptr, len, + start_offset, options | g_notempty, use_offsets, use_size_offsets); + } if (count == 0) { @@ -1393,6 +1688,14 @@ while (!done) } } + /* There was a partial match */ + + else if (count == PCRE_ERROR_PARTIAL) + { + fprintf(outfile, "Partial match\n"); + break; /* Out of the /g loop */ + } + /* Failed to match. If this is a /g or /G loop and we previously set g_notempty after a null match, this is not necessarily the end. We want to advance the start offset, and continue. In the case of UTF-8 diff -Nurp tin-1.7.6/pcre/perltest tin-1.7.7/pcre/perltest --- tin-1.7.6/pcre/perltest 2004-08-20 10:30:54.000000000 +0200 +++ tin-1.7.7/pcre/perltest 2004-11-15 18:44:38.000000000 +0100 @@ -206,6 +206,6 @@ for (;;) } } -printf $outfile "\n"; +# printf $outfile "\n"; # End diff -Nurp tin-1.7.6/pcre/printint.c tin-1.7.7/pcre/printint.c --- tin-1.7.6/pcre/printint.c 2004-08-20 10:30:54.000000000 +0200 +++ tin-1.7.7/pcre/printint.c 2004-11-15 18:44:38.000000000 +0100 @@ -9,26 +9,34 @@ the file Tech.Notes for some information Written by: Philip Hazel - Copyright (c) 1997-2003 University of Cambridge + Copyright (c) 1997-2004 University of Cambridge ----------------------------------------------------------------------------- -Permission is granted to anyone to use this software for any purpose on any -computer system, and to redistribute it freely, subject to the following -restrictions: - -1. This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -2. The origin of this software must not be misrepresented, either by - explicit claim or by omission. - -3. Altered versions must be plainly marked as such, and must not be - misrepresented as being the original software. - -4. If PCRE is embedded in any software that is released under the GNU - General Purpose Licence (GPL), then the terms of that licence shall - supersede any condition above with which it is incompatible. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of Cambridge nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. ----------------------------------------------------------------------------- */ @@ -76,6 +84,18 @@ else c = (c & utf8_t3[a]) << s; for (i = 1; i <= a; i++) { + /* This is a check for malformed UTF-8; it should only occur if the sanity + check has been turned off. Rather than swallow random bytes, just stop if + we hit a bad one. Print it with \X instead of \x as an indication. */ + + if ((ptr[i] & 0xc0) != 0x80) + { + fprintf(f, "\\X{%x}", c); + return i - 1; + } + + /* The byte is OK */ + s -= 6; c |= (ptr[i] & 0x3f) << s; } @@ -88,17 +108,54 @@ else /************************************************* +* Find Unicode property name * +*************************************************/ + +static const char * +get_ucpname(int property) +{ +int i; +for (i = sizeof(utt)/sizeof(ucp_type_table); i >= 0; i--) + { + if (property == utt[i].value) break; + } +return (i >= 0)? utt[i].name : "??"; +} + + + +/************************************************* * Print compiled regex * *************************************************/ +/* Make this function work for a regex with integers either byte order. +However, we assume that what we are passed is a compiled regex. */ + static void print_internals(pcre *external_re, FILE *f) { real_pcre *re = (real_pcre *)external_re; -uschar *codestart = - (uschar *)re + sizeof(real_pcre) + re->name_count * re->name_entry_size; -uschar *code = codestart; -BOOL utf8 = (re->options & PCRE_UTF8) != 0; +uschar *codestart, *code; +BOOL utf8; + +unsigned int options = re->options; +int offset = re->name_table_offset; +int count = re->name_count; +int size = re->name_entry_size; + +if (re->magic_number != MAGIC_NUMBER) + { + offset = ((offset << 8) & 0xff00) | ((offset >> 8) & 0xff); + count = ((count << 8) & 0xff00) | ((count >> 8) & 0xff); + size = ((size << 8) & 0xff00) | ((size >> 8) & 0xff); + options = ((options << 24) & 0xff000000) | + ((options << 8) & 0x00ff0000) | + ((options >> 8) & 0x0000ff00) | + ((options >> 24) & 0x000000ff); + } + +code = codestart = (uschar *)re + offset + count * size; +utf8 = (options & PCRE_UTF8) != 0; for(;;) { @@ -129,18 +186,31 @@ for(;;) fprintf(f, " %.2x %s", code[1], OP_names[*code]); break; - case OP_CHARS: + case OP_CHAR: { - int charlength = code[1]; - ccode = code + 2; - extra = charlength; - fprintf(f, "%3d ", charlength); - while (charlength > 0) + fprintf(f, " "); + do { - int extrabytes = print_char(f, ccode, utf8); - ccode += 1 + extrabytes; - charlength -= 1 + extrabytes; + code++; + code += 1 + print_char(f, code, utf8); } + while (*code == OP_CHAR); + fprintf(f, "\n"); + continue; + } + break; + + case OP_CHARNC: + { + fprintf(f, " NC "); + do + { + code++; + code += 1 + print_char(f, code, utf8); + } + while (*code == OP_CHARNC); + fprintf(f, "\n"); + continue; } break; @@ -182,8 +252,16 @@ for(;;) case OP_TYPEQUERY: case OP_TYPEMINQUERY: fprintf(f, " "); - if (*code >= OP_TYPESTAR) fprintf(f, "%s", OP_names[code[1]]); - else extra = print_char(f, code+1, utf8); + if (*code >= OP_TYPESTAR) + { + fprintf(f, "%s", OP_names[code[1]]); + if (code[1] == OP_PROP || code[1] == OP_NOTPROP) + { + fprintf(f, " %s ", get_ucpname(code[2])); + extra = 1; + } + } + else extra = print_char(f, code+1, utf8); fprintf(f, "%s", OP_names[*code]); break; @@ -201,7 +279,13 @@ for(;;) case OP_TYPEEXACT: case OP_TYPEUPTO: case OP_TYPEMINUPTO: - fprintf(f, " %s{", OP_names[code[3]]); + fprintf(f, " %s", OP_names[code[3]]); + if (code[3] == OP_PROP || code[3] == OP_NOTPROP) + { + fprintf(f, " %s ", get_ucpname(code[4])); + extra = 1; + } + fprintf(f, "{"); if (*code != OP_TYPEEXACT) fprintf(f, "0,"); fprintf(f, "%d}", GET2(code,1)); if (*code == OP_TYPEMINUPTO) fprintf(f, "?"); @@ -243,7 +327,13 @@ for(;;) goto CLASS_REF_REPEAT; case OP_CALLOUT: - fprintf(f, " %s %d", OP_names[*code], code[1]); + fprintf(f, " %s %d %d %d", OP_names[*code], code[1], GET(code,2), + GET(code, 2 + LINK_SIZE)); + break; + + case OP_PROP: + case OP_NOTPROP: + fprintf(f, " %s %s", OP_names[*code], get_ucpname(code[1])); break; /* OP_XCLASS can only occur in UTF-8 mode. However, there's no harm in @@ -287,7 +377,7 @@ for(;;) if (isprint(i)) fprintf(f, "%c", i); else fprintf(f, "\\x%02x", i); if (--j > i) { - fprintf(f, "-"); + if (j != i + 1) fprintf(f, "-"); if (j == '-' || j == ']') fprintf(f, "\\"); if (isprint(j)) fprintf(f, "%c", j); else fprintf(f, "\\x%02x", j); } @@ -304,11 +394,22 @@ for(;;) int ch; while ((ch = *ccode++) != XCL_END) { - ccode += 1 + print_char(f, ccode, TRUE); - if (ch == XCL_RANGE) + if (ch == XCL_PROP) + { + fprintf(f, "\\p{%s}", get_ucpname(*ccode++)); + } + else if (ch == XCL_NOTPROP) + { + fprintf(f, "\\P{%s}", get_ucpname(*ccode++)); + } + else { - fprintf(f, "-"); ccode += 1 + print_char(f, ccode, TRUE); + if (ch == XCL_RANGE) + { + fprintf(f, "-"); + ccode += 1 + print_char(f, ccode, TRUE); + } } } } @@ -329,7 +430,7 @@ for(;;) case OP_CRQUERY: case OP_CRMINQUERY: fprintf(f, "%s", OP_names[*ccode]); - extra = OP_lengths[*ccode]; + extra += OP_lengths[*ccode]; break; case OP_CRRANGE: @@ -339,7 +440,7 @@ for(;;) if (max == 0) fprintf(f, "{%d,}", min); else fprintf(f, "{%d,%d}", min, max); if (*ccode == OP_CRMINRANGE) fprintf(f, "?"); - extra = OP_lengths[*ccode]; + extra += OP_lengths[*ccode]; break; } } diff -Nurp tin-1.7.6/pcre/study.c tin-1.7.7/pcre/study.c --- tin-1.7.6/pcre/study.c 2004-08-20 10:30:54.000000000 +0200 +++ tin-1.7.7/pcre/study.c 2004-11-15 18:44:38.000000000 +0100 @@ -9,26 +9,34 @@ the file Tech.Notes for some information Written by: Philip Hazel - Copyright (c) 1997-2003 University of Cambridge + Copyright (c) 1997-2004 University of Cambridge ----------------------------------------------------------------------------- -Permission is granted to anyone to use this software for any purpose on any -computer system, and to redistribute it freely, subject to the following -restrictions: - -1. This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -2. The origin of this software must not be misrepresented, either by - explicit claim or by omission. - -3. Altered versions must be plainly marked as such, and must not be - misrepresented as being the original software. - -4. If PCRE is embedded in any software that is released under the GNU - General Purpose Licence (GPL), then the terms of that licence shall - supersede any condition above with which it is incompatible. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of Cambridge nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. ----------------------------------------------------------------------------- */ @@ -57,7 +65,7 @@ Returns: nothing */ static void -set_bit(uschar *start_bits, int c, BOOL caseless, compile_data *cd) +set_bit(uschar *start_bits, unsigned int c, BOOL caseless, compile_data *cd) { start_bits[c/8] |= (1 << (c&7)); if (caseless && (cd->ctypes[c] & ctype_letter) != 0) @@ -123,7 +131,7 @@ do /* Skip over callout */ case OP_CALLOUT: - tcode += 2; + tcode += 2 + 2*LINK_SIZE; break; /* Skip over extended extraction bracket number */ @@ -186,11 +194,10 @@ do /* At least one single char sets the bit and stops */ case OP_EXACT: /* Fall through */ - tcode++; - - case OP_CHARS: /* Fall through */ - tcode++; + tcode += 2; + case OP_CHAR: + case OP_CHARNC: case OP_PLUS: case OP_MINPLUS: set_bit(start_bits, tcode[1], caseless, cd); @@ -403,8 +410,9 @@ pcre_study(const pcre *external_re, int uschar start_bits[32]; pcre_extra *extra; pcre_study_data *study; +const uschar *tables; const real_pcre *re = (const real_pcre *)external_re; -uschar *code = (uschar *)re + sizeof(real_pcre) + +uschar *code = (uschar *)re + re->name_table_offset + (re->name_count * re->name_entry_size); compile_data compile_block; @@ -429,12 +437,16 @@ at present. */ if ((re->options & (PCRE_ANCHORED|PCRE_FIRSTSET|PCRE_STARTLINE)) != 0) return NULL; -/* Set the character tables in the block which is passed around */ +/* Set the character tables in the block that is passed around */ -compile_block.lcc = re->tables + lcc_offset; -compile_block.fcc = re->tables + fcc_offset; -compile_block.cbits = re->tables + cbits_offset; -compile_block.ctypes = re->tables + ctypes_offset; +tables = re->tables; +if (tables == NULL) + (void)pcre_fullinfo(external_re, NULL, PCRE_INFO_DEFAULT_TABLES, &tables); + +compile_block.lcc = tables + lcc_offset; +compile_block.fcc = tables + fcc_offset; +compile_block.cbits = tables + cbits_offset; +compile_block.ctypes = tables + ctypes_offset; /* See if we can find a fixed set of initial characters for the pattern. */ diff -Nurp tin-1.7.6/pcre/testdata/testinput2 tin-1.7.7/pcre/testdata/testinput2 --- tin-1.7.6/pcre/testdata/testinput2 2004-08-20 10:30:54.000000000 +0200 +++ tin-1.7.7/pcre/testdata/testinput2 2004-11-15 18:44:39.000000000 +0100 @@ -266,6 +266,18 @@ /(?!alphabet)[ab]/S /(?<=foo\n)^bar/m + foo\nbarbar + ***Failers + rhubarb + barbell + abc\nbarton + +/^(?<=foo\n)bar/m + foo\nbarbar + ***Failers + rhubarb + barbell + abc\nbarton /(?>^abc)/m abc @@ -654,10 +666,16 @@ /^[[:alnum:]]/D +/^[[:^alnum:]]/D + /^[[:alpha:]]/D + +/^[[:^alpha:]]/D /^[[:ascii:]]/D +/^[[:^ascii:]]/D + /^[[:blank:]]/D /^[[:cntrl:]]/D @@ -890,20 +908,10 @@ /\N{name}/ -/\pP/ - -/\PP/ - -/\p{prop}/ - -/\P{prop}/ - /\u/ /\U/ -/\X/ - /[/ /[a-/ @@ -1256,4 +1264,133 @@ /(a|b)*.?c/SD +/abc(?C255)de(?C)f/D + +/abcde/CD + abcde + abcdfe + +/a*b/CD + ab + aaaab + aaaacb + +/a+b/CD + ab + aaaab + aaaacb + +/(abc|def)x/CD + abcx + defx + abcdefzx + +/(ab|cd){3,4}/C + ababab + abcdabcd + abcdcdcdcdcd + +/([ab]{,4}c|xy)/CD + Note: that { does NOT introduce a quantifier + +/([ab]{1,4}c|xy){4,5}?123/CD + aacaacaacaacaac123 + +/\b.*/I + ab cd\>1 + +/\b.*/Is + ab cd\>1 + +/(?!.bcd).*/I + Xbcd12345 + +/abcde/ + ab\P + abc\P + abcd\P + abcde\P + the quick brown abc\P + ** Failers\P + the quick brown abxyz fox\P + +"^(0?[1-9]|[12][0-9]|3[01])/(0?[1-9]|1[012])/(20)?\d\d$" + 13/05/04\P + 13/5/2004\P + 02/05/09\P + 1\P + 1/2\P + 1/2/0\P + 1/2/04\P + 0\P + 02/\P + 02/0\P + 02/1\P + ** Failers\P + \P + 123\P + 33/4/04\P + 3/13/04\P + 0/1/2003\P + 0/\P + 02/0/\P + 02/13\P + +/0{0,2}ABC/I + +/\d{3,}ABC/I + +/\d*ABC/I + +/[abc]+DE/I + +/[abc]?123/ + 123\P + a\P + b\P + c\P + c12\P + c123\P + +/^(?:\d){3,5}X/ + 1\P + 123\P + 123X + 1234\P + 1234X + 12345\P + 12345X + *** Failers + 1X + 123456\P + +/abc/>testsavedregex +testsavedregex +testsavedregex +testsavedregex +(.)*~smg + \n\n\nPartner der LCO\nde\nPartner der LINEAS Consulting\nGmbH\nLINEAS Consulting GmbH Hamburg\nPartnerfirmen\n30 days\nindex,follow\n\nja\n3\nPartner\n\n\nLCO\nLINEAS Consulting\n15.10.2003\n\n\n\n\nDie Partnerfirmen der LINEAS Consulting\nGmbH\n\n\n \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n + +/^a/IF + / End of testinput2 / diff -Nurp tin-1.7.6/pcre/testdata/testinput4 tin-1.7.7/pcre/testdata/testinput4 --- tin-1.7.6/pcre/testdata/testinput4 2004-08-20 10:30:54.000000000 +0200 +++ tin-1.7.7/pcre/testdata/testinput4 2004-11-15 18:44:39.000000000 +0100 @@ -228,19 +228,12 @@ > >X Y > >\x{100} Y -/\W/8 - A.B - A\x{100}B - /\d/8 \x{100}3 /\s/8 \x{100} X -/\w/8 - \x{100}X - /\D+/8 12abcd34 *** Failers @@ -479,7 +472,7 @@ Z \x{100} *** Failers - \x{101} + \x{102} y /[\xFF]/ @@ -514,4 +507,7 @@ catac a\x{256}a +/^\x{85}$/8i + \x{85} + / End of testinput4 / diff -Nurp tin-1.7.6/pcre/testdata/testinput5 tin-1.7.7/pcre/testdata/testinput5 --- tin-1.7.6/pcre/testdata/testinput5 2004-08-20 10:30:54.000000000 +0200 +++ tin-1.7.7/pcre/testdata/testinput5 2004-11-15 18:44:39.000000000 +0100 @@ -176,8 +176,6 @@ /[z-\x{100}]/8D -/[z-\x{100}]/8Di - /[z\Qa-d]Ä€\E]/8D \x{100} Ä€ @@ -255,4 +253,11 @@ /(\x{100}(b(?1)c)){0,2}/D8 +/\W/8 + A.B + A\x{100}B + +/\w/8 + \x{100}X + / End of testinput5 / diff -Nurp tin-1.7.6/pcre/testdata/testinput6 tin-1.7.7/pcre/testdata/testinput6 --- tin-1.7.6/pcre/testdata/testinput6 1970-01-01 01:00:00.000000000 +0100 +++ tin-1.7.7/pcre/testdata/testinput6 2004-11-15 18:44:39.000000000 +0100 @@ -0,0 +1,517 @@ +/^\pC\pL\pM\pN\pP\pS\pZ ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y [ \ ] ^ _ ` a b c d @@ -185,7 +191,7 @@ Capturing subpattern count = 1 No options No first char No need char -Starting character set: \x09 \x0a \x0c \x0d \x20 a b +Starting byte set: \x09 \x0a \x0c \x0d \x20 a b /(ab\2)/ Failed: reference to non-existent subpattern at offset 6 @@ -320,6 +326,7 @@ No need char /.*((abc)$|(def))/ Capturing subpattern count = 3 +Partial matching not supported No options First char at start or follows \n No need char @@ -396,6 +403,7 @@ Failed: missing terminating ] for charac /[^aeiou ]{3,}/ Capturing subpattern count = 0 +Partial matching not supported No options No first char No need char @@ -404,6 +412,7 @@ No need char /<.*>/ Capturing subpattern count = 0 +Partial matching not supported No options First char = '<' Need char = '>' @@ -412,6 +421,7 @@ Need char = '>' /<.*?>/ Capturing subpattern count = 0 +Partial matching not supported No options First char = '<' Need char = '>' @@ -420,6 +430,7 @@ Need char = '>' /<.*>/U Capturing subpattern count = 0 +Partial matching not supported Options: ungreedy First char = '<' Need char = '>' @@ -428,6 +439,7 @@ Need char = '>' /(?U)<.*>/ Capturing subpattern count = 0 +Partial matching not supported Options: ungreedy First char = '<' Need char = '>' @@ -436,6 +448,7 @@ Need char = '>' /<.*?>/U Capturing subpattern count = 0 +Partial matching not supported Options: ungreedy First char = '<' Need char = '>' @@ -444,6 +457,7 @@ Need char = '>' /={3,}/U Capturing subpattern count = 0 +Partial matching not supported Options: ungreedy First char = '=' Need char = '=' @@ -452,6 +466,7 @@ Need char = '=' /(?U)={3,}?/ Capturing subpattern count = 0 +Partial matching not supported Options: ungreedy First char = '=' Need char = '=' @@ -510,6 +525,7 @@ No need char /(?s).*/ Capturing subpattern count = 0 +Partial matching not supported Options: anchored dotall No first char No need char @@ -519,21 +535,21 @@ Capturing subpattern count = 0 No options No first char No need char -Starting character set: a b c d +Starting byte set: a b c d /(?i)[abcd]/S Capturing subpattern count = 0 Options: caseless No first char No need char -Starting character set: A B C D a b c d +Starting byte set: A B C D a b c d /(?m)[xy]|(b|c)/S Capturing subpattern count = 1 Options: multiline No first char No need char -Starting character set: b c x y +Starting byte set: b c x y /(^a|^b)/m Capturing subpattern count = 1 @@ -568,6 +584,7 @@ Failed: unrecognized character after (?< /((?s)blah)\s+\1/ Capturing subpattern count = 1 Max back reference = 1 +Partial matching not supported No options First char = 'b' Need char = 'h' @@ -575,6 +592,7 @@ Need char = 'h' /((?i)blah)\s+\1/ Capturing subpattern count = 1 Max back reference = 1 +Partial matching not supported No options Case state changes First char = 'b' (caseless) @@ -582,14 +600,14 @@ Need char = 'h' (caseless) /((?i)b)/DS ------------------------------------------------------------------ - 0 16 Bra 0 - 3 8 Bra 1 + 0 15 Bra 0 + 3 7 Bra 1 6 01 Opt - 8 1 b - 11 8 Ket - 14 00 Opt - 16 16 Ket - 19 End + 8 NC b + 10 7 Ket + 13 00 Opt + 15 15 Ket + 18 End ------------------------------------------------------------------ Capturing subpattern count = 1 No options @@ -600,11 +618,12 @@ Study returned NULL /(a*b|(?i:c*(?-i)d))/S Capturing subpattern count = 1 +Partial matching not supported No options Case state changes No first char No need char -Starting character set: C a b c d +Starting byte set: C a b c d /a$/ Capturing subpattern count = 0 @@ -652,6 +671,7 @@ Need char = 'c' /^((a+)(?U)([ab]+)(?-U)([bc]+)(\w*))/ Capturing subpattern count = 5 +Partial matching not supported Options: anchored No first char No need char @@ -668,27 +688,53 @@ Capturing subpattern count = 0 No options No first char No need char -Starting character set: a b +Starting byte set: a b /(?^abc)/m Capturing subpattern count = 0 @@ -744,6 +790,7 @@ No need char /(?>.*)(?<=(abcd)|(xyz))/ Capturing subpattern count = 2 +Partial matching not supported No options First char at start or follows \n No need char @@ -966,6 +1013,7 @@ copy substring 5 failed -7 /(.{20})/ Capturing subpattern count = 1 +Partial matching not supported No options No first char No need char @@ -983,6 +1031,7 @@ copy substring 1 failed -6 /(.{15})/ Capturing subpattern count = 1 +Partial matching not supported No options No first char No need char @@ -997,6 +1046,7 @@ No need char /(.{16})/ Capturing subpattern count = 1 +Partial matching not supported No options No first char No need char @@ -1062,109 +1112,116 @@ No need char /word ((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )?)?)?)?)?)?)?)?)?otherword/M -Memory allocation (code space): 428 +Memory allocation (code space): 432 Capturing subpattern count = 8 +Partial matching not supported No options First char = 'w' Need char = 'd' /.*X/D ------------------------------------------------------------------ - 0 8 Bra 0 + 0 7 Bra 0 3 Any* - 5 1 X - 8 8 Ket - 11 End + 5 X + 7 7 Ket + 10 End ------------------------------------------------------------------ Capturing subpattern count = 0 +Partial matching not supported No options First char at start or follows \n Need char = 'X' /.*X/Ds ------------------------------------------------------------------ - 0 8 Bra 0 + 0 7 Bra 0 3 Any* - 5 1 X - 8 8 Ket - 11 End + 5 X + 7 7 Ket + 10 End ------------------------------------------------------------------ Capturing subpattern count = 0 +Partial matching not supported Options: anchored dotall No first char Need char = 'X' /(.*X|^B)/D ------------------------------------------------------------------ - 0 21 Bra 0 - 3 8 Bra 1 + 0 19 Bra 0 + 3 7 Bra 1 6 Any* - 8 1 X - 11 7 Alt - 14 ^ - 15 1 B - 18 15 Ket - 21 21 Ket - 24 End + 8 X + 10 6 Alt + 13 ^ + 14 B + 16 13 Ket + 19 19 Ket + 22 End ------------------------------------------------------------------ Capturing subpattern count = 1 +Partial matching not supported No options First char at start or follows \n No need char /(.*X|^B)/Ds ------------------------------------------------------------------ - 0 21 Bra 0 - 3 8 Bra 1 + 0 19 Bra 0 + 3 7 Bra 1 6 Any* - 8 1 X - 11 7 Alt - 14 ^ - 15 1 B - 18 15 Ket - 21 21 Ket - 24 End + 8 X + 10 6 Alt + 13 ^ + 14 B + 16 13 Ket + 19 19 Ket + 22 End ------------------------------------------------------------------ Capturing subpattern count = 1 +Partial matching not supported Options: anchored dotall No first char No need char /(?s)(.*X|^B)/D ------------------------------------------------------------------ - 0 21 Bra 0 - 3 8 Bra 1 + 0 19 Bra 0 + 3 7 Bra 1 6 Any* - 8 1 X - 11 7 Alt - 14 ^ - 15 1 B - 18 15 Ket - 21 21 Ket - 24 End + 8 X + 10 6 Alt + 13 ^ + 14 B + 16 13 Ket + 19 19 Ket + 22 End ------------------------------------------------------------------ Capturing subpattern count = 1 +Partial matching not supported Options: anchored dotall No first char No need char /(?s:.*X|^B)/D ------------------------------------------------------------------ - 0 27 Bra 0 - 3 10 Bra 0 + 0 25 Bra 0 + 3 9 Bra 0 6 04 Opt 8 Any* - 10 1 X - 13 9 Alt - 16 04 Opt - 18 ^ - 19 1 B - 22 19 Ket - 25 00 Opt - 27 27 Ket - 30 End + 10 X + 12 8 Alt + 15 04 Opt + 17 ^ + 18 B + 20 17 Ket + 23 00 Opt + 25 25 Ket + 28 End ------------------------------------------------------------------ Capturing subpattern count = 0 +Partial matching not supported No options First char at start or follows \n No need char @@ -1249,6 +1306,7 @@ No need char /.*iss/g+ Capturing subpattern count = 0 +Partial matching not supported No options First char at start or follows \n Need char = 's' @@ -1349,36 +1407,42 @@ Need char = 'c' /a*/ Capturing subpattern count = 0 +Partial matching not supported No options No first char No need char /a+/ Capturing subpattern count = 0 +Partial matching not supported No options First char = 'a' No need char /(baa|a+)/ Capturing subpattern count = 1 +Partial matching not supported No options No first char Need char = 'a' /a{0,3}/ Capturing subpattern count = 0 +Partial matching not supported No options No first char No need char /baa{3,}/ Capturing subpattern count = 0 +Partial matching not supported No options First char = 'b' Need char = 'a' /"([^\\"]+|\\.)*"/ Capturing subpattern count = 1 +Partial matching not supported No options First char = '"' Need char = '"' @@ -1433,60 +1497,70 @@ Need char = 'b' /abc*/ Capturing subpattern count = 0 +Partial matching not supported No options First char = 'a' Need char = 'b' /ab.c*/ Capturing subpattern count = 0 +Partial matching not supported No options First char = 'a' Need char = 'b' /a.c*/ Capturing subpattern count = 0 +Partial matching not supported No options First char = 'a' No need char /.c*/ Capturing subpattern count = 0 +Partial matching not supported No options No first char No need char /ac*/ Capturing subpattern count = 0 +Partial matching not supported No options First char = 'a' No need char /(a.c*|b.c*)/ Capturing subpattern count = 1 +Partial matching not supported No options No first char No need char /a.c*|aba/ Capturing subpattern count = 0 +Partial matching not supported No options First char = 'a' No need char /.+a/ Capturing subpattern count = 0 +Partial matching not supported No options No first char Need char = 'a' /(?=abcda)a.*/ Capturing subpattern count = 0 +Partial matching not supported No options First char = 'a' Need char = 'a' /(?=a)a.*/ Capturing subpattern count = 0 +Partial matching not supported No options First char = 'a' No need char @@ -1499,12 +1573,14 @@ No need char /a\d*/ Capturing subpattern count = 0 +Partial matching not supported No options First char = 'a' No need char /ab\d*/ Capturing subpattern count = 0 +Partial matching not supported No options First char = 'a' Need char = 'b' @@ -1523,6 +1599,7 @@ Need char = 'd' /ab\d+/ Capturing subpattern count = 0 +Partial matching not supported No options First char = 'a' Need char = 'b' @@ -1640,6 +1717,7 @@ Study returned NULL \) # Closing ) /x Capturing subpattern count = 0 +Partial matching not supported Options: extended First char = '(' Need char = ')' @@ -1668,6 +1746,7 @@ No match /\( ( (?>[^()]+) | (?R) )* \) /xg Capturing subpattern count = 1 +Partial matching not supported Options: extended First char = '(' Need char = ')' @@ -1682,6 +1761,7 @@ Need char = ')' /\( (?: (?>[^()]+) | (?R) ) \) /x Capturing subpattern count = 0 +Partial matching not supported Options: extended First char = '(' Need char = ')' @@ -1700,6 +1780,7 @@ No match /\( (?: (?>[^()]+) | (?R) )? \) /x Capturing subpattern count = 0 +Partial matching not supported Options: extended First char = '(' Need char = ')' @@ -1710,6 +1791,7 @@ Need char = ')' /\( ( (?>[^()]+) | (?R) )* \) /x Capturing subpattern count = 1 +Partial matching not supported Options: extended First char = '(' Need char = ')' @@ -1719,6 +1801,7 @@ Need char = ')' /\( ( ( (?>[^()]+) | (?R) )* ) \) /x Capturing subpattern count = 2 +Partial matching not supported Options: extended First char = '(' Need char = ')' @@ -1729,6 +1812,7 @@ Need char = ')' /\( (123)? ( ( (?>[^()]+) | (?R) )* ) \) /x Capturing subpattern count = 3 +Partial matching not supported Options: extended First char = '(' Need char = ')' @@ -1745,6 +1829,7 @@ Need char = ')' /\( ( (123)? ( (?>[^()]+) | (?R) )* ) \) /x Capturing subpattern count = 3 +Partial matching not supported Options: extended First char = '(' Need char = ')' @@ -1761,6 +1846,7 @@ Need char = ')' /\( (((((((((( ( (?>[^()]+) | (?R) )* )))))))))) \) /x Capturing subpattern count = 11 +Partial matching not supported Options: extended First char = '(' Need char = ')' @@ -1780,6 +1866,7 @@ Need char = ')' /\( ( ( (?>[^()<>]+) | ((?>[^()]+)) | (?R) )* ) \) /x Capturing subpattern count = 3 +Partial matching not supported Options: extended First char = '(' Need char = ')' @@ -1791,6 +1878,7 @@ Need char = ')' /\( ( ( (?>[^()]+) | ((?R)) )* ) \) /x Capturing subpattern count = 3 +Partial matching not supported Options: extended First char = '(' Need char = ')' @@ -1818,6 +1906,19 @@ Options: anchored No first char No need char +/^[[:^alnum:]]/D +------------------------------------------------------------------ + 0 37 Bra 0 + 3 ^ + 4 [\x00-/:-@[-`{-\xff] + 37 37 Ket + 40 End +------------------------------------------------------------------ +Capturing subpattern count = 0 +Options: anchored +No first char +No need char + /^[[:alpha:]]/D ------------------------------------------------------------------ 0 37 Bra 0 @@ -1830,6 +1931,19 @@ Capturing subpattern count = 0 Options: anchored No first char No need char + +/^[[:^alpha:]]/D +------------------------------------------------------------------ + 0 37 Bra 0 + 3 ^ + 4 [\x00-@[-`{-\xff] + 37 37 Ket + 40 End +------------------------------------------------------------------ +Capturing subpattern count = 0 +Options: anchored +No first char +No need char /^[[:ascii:]]/D ------------------------------------------------------------------ @@ -1844,6 +1958,19 @@ Options: anchored No first char No need char +/^[[:^ascii:]]/D +------------------------------------------------------------------ + 0 37 Bra 0 + 3 ^ + 4 [\x80-\xff] + 37 37 Ket + 40 End +------------------------------------------------------------------ +Capturing subpattern count = 0 +Options: anchored +No first char +No need char + /^[[:blank:]]/D ------------------------------------------------------------------ 0 37 Bra 0 @@ -2004,7 +2131,7 @@ No need char ------------------------------------------------------------------ 0 37 Bra 0 3 ^ - 4 [\x00-/1-2:-\xff] + 4 [\x00-/12:-\xff] 37 37 Ket 40 End ------------------------------------------------------------------ @@ -2029,7 +2156,7 @@ No need char /[01[:alpha:]%]/D ------------------------------------------------------------------ 0 36 Bra 0 - 3 [%0-1A-Za-z] + 3 [%01A-Za-z] 36 36 Ket 39 End ------------------------------------------------------------------ @@ -2102,6 +2229,7 @@ Need char = 'd' /(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\w+)\s+(\270)/ Capturing subpattern count = 271 Max back reference = 270 +Partial matching not supported No options No first char No need char @@ -2560,12 +2688,12 @@ No first char No need char /a#/xMD -Memory allocation (code space): 13 +Memory allocation (code space): 9 ------------------------------------------------------------------ - 0 6 Bra 0 - 3 1 a - 6 6 Ket - 9 End + 0 5 Bra 0 + 3 a + 5 5 Ket + 8 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: extended @@ -2575,7 +2703,7 @@ No need char /[\s]/D ------------------------------------------------------------------ 0 36 Bra 0 - 3 [\x09-\x0a\x0c-\x0d ] + 3 [\x09\x0a\x0c\x0d ] 36 36 Ket 39 End ------------------------------------------------------------------ @@ -2598,12 +2726,12 @@ No need char /a(?i)b/D ------------------------------------------------------------------ - 0 11 Bra 0 - 3 1 a - 6 01 Opt - 8 1 b - 11 11 Ket - 14 End + 0 9 Bra 0 + 3 a + 5 01 Opt + 7 NC b + 9 9 Ket + 12 End ------------------------------------------------------------------ Capturing subpattern count = 0 No options @@ -2621,15 +2749,15 @@ No match /(a(?i)b)/D ------------------------------------------------------------------ - 0 19 Bra 0 - 3 11 Bra 1 - 6 1 a - 9 01 Opt - 11 1 b - 14 11 Ket - 17 00 Opt - 19 19 Ket - 22 End + 0 17 Bra 0 + 3 9 Bra 1 + 6 a + 8 01 Opt + 10 NC b + 12 9 Ket + 15 00 Opt + 17 17 Ket + 20 End ------------------------------------------------------------------ Capturing subpattern count = 1 No options @@ -2649,10 +2777,10 @@ No match / (?i)abc/xD ------------------------------------------------------------------ - 0 8 Bra 0 - 3 3 abc - 8 8 Ket - 11 End + 0 9 Bra 0 + 3 NC abc + 9 9 Ket + 12 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: caseless extended @@ -2662,10 +2790,10 @@ Need char = 'c' (caseless) /#this is a comment (?i)abc/xD ------------------------------------------------------------------ - 0 8 Bra 0 - 3 3 abc - 8 8 Ket - 11 End + 0 9 Bra 0 + 3 NC abc + 9 9 Ket + 12 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: caseless extended @@ -2674,11 +2802,10 @@ Need char = 'c' (caseless) /123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890/D ------------------------------------------------------------------ - 0 307 Bra 0 - 3 250 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 -255 50 12345678901234567890123456789012345678901234567890 -307 307 Ket -310 End + 0 603 Bra 0 + 3 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +603 603 Ket +606 End ------------------------------------------------------------------ Capturing subpattern count = 0 No options @@ -2687,11 +2814,10 @@ Need char = '0' /\Q123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890/D ------------------------------------------------------------------ - 0 307 Bra 0 - 3 250 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 -255 50 12345678901234567890123456789012345678901234567890 -307 307 Ket -310 End + 0 603 Bra 0 + 3 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +603 603 Ket +606 End ------------------------------------------------------------------ Capturing subpattern count = 0 No options @@ -2713,10 +2839,10 @@ No need char /\Q\Ex/D ------------------------------------------------------------------ - 0 6 Bra 0 - 3 1 x - 6 6 Ket - 9 End + 0 5 Bra 0 + 3 x + 5 5 Ket + 8 End ------------------------------------------------------------------ Capturing subpattern count = 0 No options @@ -2725,10 +2851,10 @@ No need char / \Q\E/D ------------------------------------------------------------------ - 0 6 Bra 0 - 3 1 - 6 6 Ket - 9 End + 0 5 Bra 0 + 3 + 5 5 Ket + 8 End ------------------------------------------------------------------ Capturing subpattern count = 0 No options @@ -2737,10 +2863,10 @@ No need char /a\Q\E/D ------------------------------------------------------------------ - 0 6 Bra 0 - 3 1 a - 6 6 Ket - 9 End + 0 5 Bra 0 + 3 a + 5 5 Ket + 8 End ------------------------------------------------------------------ Capturing subpattern count = 0 No options @@ -2755,11 +2881,10 @@ No need char /a\Q\Eb/D ------------------------------------------------------------------ - 0 9 Bra 0 - 3 1 a - 6 1 b - 9 9 Ket - 12 End + 0 7 Bra 0 + 3 ab + 7 7 Ket + 10 End ------------------------------------------------------------------ Capturing subpattern count = 0 No options @@ -2770,10 +2895,10 @@ Need char = 'b' /\Q\Eabc/D ------------------------------------------------------------------ - 0 8 Bra 0 - 3 3 abc - 8 8 Ket - 11 End + 0 9 Bra 0 + 3 abc + 9 9 Ket + 12 End ------------------------------------------------------------------ Capturing subpattern count = 0 No options @@ -2791,6 +2916,7 @@ Need char = 'c' 15 End ------------------------------------------------------------------ Capturing subpattern count = 0 +Partial matching not supported No options No first char No need char @@ -2823,36 +2949,38 @@ No need char 14 End ------------------------------------------------------------------ Capturing subpattern count = 0 +Partial matching not supported No options First char = 'x' No need char /x{1,3}+/D ------------------------------------------------------------------ - 0 16 Bra 0 - 3 10 Once - 6 1 x - 9 x{,2} - 13 10 Ket - 16 16 Ket - 19 End + 0 15 Bra 0 + 3 9 Once + 6 x + 8 x{,2} + 12 9 Ket + 15 15 Ket + 18 End ------------------------------------------------------------------ Capturing subpattern count = 0 +Partial matching not supported No options First char = 'x' No need char /(x)*+/D ------------------------------------------------------------------ - 0 19 Bra 0 - 3 13 Once + 0 18 Bra 0 + 3 12 Once 6 Brazero - 7 6 Bra 1 - 10 1 x - 13 6 KetRmax - 16 13 Ket - 19 19 Ket - 22 End + 7 5 Bra 1 + 10 x + 12 5 KetRmax + 15 12 Ket + 18 18 Ket + 21 End ------------------------------------------------------------------ Capturing subpattern count = 1 No options @@ -2861,6 +2989,7 @@ No need char /^(\w++|\s++)*$/ Capturing subpattern count = 1 +Partial matching not supported Options: anchored No first char No need char @@ -2874,6 +3003,7 @@ No match /(\d++)(\w)/ Capturing subpattern count = 2 +Partial matching not supported No options No first char No need char @@ -2888,6 +3018,7 @@ No match /a++b/ Capturing subpattern count = 0 +Partial matching not supported No options First char = 'a' Need char = 'b' @@ -2896,6 +3027,7 @@ Need char = 'b' /(a++b)/ Capturing subpattern count = 1 +Partial matching not supported No options First char = 'a' Need char = 'b' @@ -2905,6 +3037,7 @@ Need char = 'b' /(a++)b/ Capturing subpattern count = 1 +Partial matching not supported No options First char = 'a' Need char = 'b' @@ -2914,6 +3047,7 @@ Need char = 'b' /([^()]++|\([^()]*\))+/ Capturing subpattern count = 1 +Partial matching not supported No options No first char No need char @@ -2923,6 +3057,7 @@ No need char /\(([^()]++|\([^()]+\))+\)/ Capturing subpattern count = 1 +Partial matching not supported No options First char = '(' Need char = ')' @@ -2939,24 +3074,24 @@ No match /(abc){1,3}+/D ------------------------------------------------------------------ - 0 50 Bra 0 - 3 44 Once - 6 8 Bra 1 - 9 3 abc - 14 8 Ket - 17 Brazero - 18 26 Bra 0 - 21 8 Bra 1 - 24 3 abc - 29 8 Ket - 32 Brazero - 33 8 Bra 1 - 36 3 abc - 41 8 Ket - 44 26 Ket - 47 44 Ket - 50 50 Ket - 53 End + 0 53 Bra 0 + 3 47 Once + 6 9 Bra 1 + 9 abc + 15 9 Ket + 18 Brazero + 19 28 Bra 0 + 22 9 Bra 1 + 25 abc + 31 9 Ket + 34 Brazero + 35 9 Bra 1 + 38 abc + 44 9 Ket + 47 28 Ket + 50 47 Ket + 53 53 Ket + 56 End ------------------------------------------------------------------ Capturing subpattern count = 1 No options @@ -2977,16 +3112,17 @@ Failed: nothing to repeat at offset 7 /x(?U)a++b/D ------------------------------------------------------------------ - 0 17 Bra 0 - 3 1 x - 6 5 Once - 9 a+ - 11 5 Ket - 14 1 b - 17 17 Ket - 20 End + 0 15 Bra 0 + 3 x + 5 5 Once + 8 a+ + 10 5 Ket + 13 b + 15 15 Ket + 18 End ------------------------------------------------------------------ Capturing subpattern count = 0 +Partial matching not supported No options First char = 'x' Need char = 'b' @@ -2995,16 +3131,17 @@ Need char = 'b' /(?U)xa++b/D ------------------------------------------------------------------ - 0 17 Bra 0 - 3 1 x - 6 5 Once - 9 a+ - 11 5 Ket - 14 1 b - 17 17 Ket - 20 End + 0 15 Bra 0 + 3 x + 5 5 Once + 8 a+ + 10 5 Ket + 13 b + 15 15 Ket + 18 End ------------------------------------------------------------------ Capturing subpattern count = 0 +Partial matching not supported Options: ungreedy First char = 'x' Need char = 'b' @@ -3020,10 +3157,10 @@ Need char = 'b' 10 a+ 12 5 Ket 15 37 Bra 3 - 18 [a-b]+? + 18 [ab]+? 52 37 Ket 55 37 Bra 4 - 58 [b-c]+ + 58 [bc]+ 92 37 Ket 95 5 Bra 5 98 \w* @@ -3033,38 +3170,41 @@ Need char = 'b' 109 End ------------------------------------------------------------------ Capturing subpattern count = 5 +Partial matching not supported Options: anchored No first char No need char /^x(?U)a+b/D ------------------------------------------------------------------ - 0 12 Bra 0 + 0 10 Bra 0 3 ^ - 4 1 x - 7 a+? - 9 1 b - 12 12 Ket - 15 End + 4 x + 6 a+? + 8 b + 10 10 Ket + 13 End ------------------------------------------------------------------ Capturing subpattern count = 0 +Partial matching not supported Options: anchored No first char Need char = 'b' /^x(?U)(a+)b/D ------------------------------------------------------------------ - 0 18 Bra 0 + 0 16 Bra 0 3 ^ - 4 1 x - 7 5 Bra 1 - 10 a+? - 12 5 Ket - 15 1 b - 18 18 Ket - 21 End + 4 x + 6 5 Bra 1 + 9 a+? + 11 5 Ket + 14 b + 16 16 Ket + 19 End ------------------------------------------------------------------ Capturing subpattern count = 1 +Partial matching not supported Options: anchored No first char Need char = 'b' @@ -3079,34 +3219,19 @@ Failed: POSIX collating elements are not Failed: POSIX named classes are supported only within a class at offset 0 /\l/ -Failed: PCRE does not support \L, \l, \N, \P, \p, \U, \u, or \X at offset 1 +Failed: PCRE does not support \L, \l, \N, \U, or \u at offset 1 /\L/ -Failed: PCRE does not support \L, \l, \N, \P, \p, \U, \u, or \X at offset 1 +Failed: PCRE does not support \L, \l, \N, \U, or \u at offset 1 /\N{name}/ -Failed: PCRE does not support \L, \l, \N, \P, \p, \U, \u, or \X at offset 1 - -/\pP/ -Failed: PCRE does not support \L, \l, \N, \P, \p, \U, \u, or \X at offset 1 - -/\PP/ -Failed: PCRE does not support \L, \l, \N, \P, \p, \U, \u, or \X at offset 1 - -/\p{prop}/ -Failed: PCRE does not support \L, \l, \N, \P, \p, \U, \u, or \X at offset 1 - -/\P{prop}/ -Failed: PCRE does not support \L, \l, \N, \P, \p, \U, \u, or \X at offset 1 +Failed: PCRE does not support \L, \l, \N, \U, or \u at offset 1 /\u/ -Failed: PCRE does not support \L, \l, \N, \P, \p, \U, \u, or \X at offset 1 +Failed: PCRE does not support \L, \l, \N, \U, or \u at offset 1 /\U/ -Failed: PCRE does not support \L, \l, \N, \P, \p, \U, \u, or \X at offset 1 - -/\X/ -Failed: PCRE does not support \L, \l, \N, \P, \p, \U, \u, or \X at offset 1 +Failed: PCRE does not support \L, \l, \N, \U, or \u at offset 1 /[/ Failed: missing terminating ] for character class at offset 1 @@ -3121,7 +3246,7 @@ Failed: missing terminating ] for charac Memory allocation (code space): 40 ------------------------------------------------------------------ 0 36 Bra 0 - 3 [\x09-\x0a\x0c-\x0d ] + 3 [\x09\x0a\x0c\x0d ] 36 36 Ket 39 End ------------------------------------------------------------------ @@ -3158,6 +3283,7 @@ No need char /< (?: (?(R) \d++ | [^<>]*+) | (?R)) * >/x Capturing subpattern count = 0 +Partial matching not supported Options: extended First char = '<' Need char = '>' @@ -3179,14 +3305,13 @@ No match No match |8J\$WE\<\.rX\+ix\[d1b\!H\#\?vV0vrK\:ZH1\=2M\>iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|DM -Memory allocation (code space): 421 +Memory allocation (code space): 826 ------------------------------------------------------------------ - 0 417 Bra 0 - 3 250 8J$WE<.rX+ix[d1b!H#?vV0vrK:ZH1=2M>iV;?aPhFB<*vW@QW@sO9}cfZA-i'w%hKd6gt1UJP,15_#QY$M^Mss_U/]&LK9[5vQub^w[KDDqmj;2}YWFdYx.Ap]hjCPTP(n28k+3;o&WXqs/gOXdr$:r'do0;b4c(f_Gr="\4)[01T7ajQJvL$W~mL_sS/4h:x*[ZN=KLs&L5zX//>it,o:aU(;Z>pW&T7oP'2K^E: -255 159 x9'c[%z-,64JQ5AeH_G#KijUKghQw^\vea3a?kka_G$8#`*kynsxzBLru']k_[7FrVx}^=$blx>s-N%j;D*aZDnsw:YKZ%Q.Kne9#hP?+b3(SOvL,^;&u5@?5C5Bhb=m-vEh_L15Jl]U)0RP6{q%L^_z5E'Dw6X -416 \b -417 417 Ket -420 End + 0 822 Bra 0 + 3 8J$WE<.rX+ix[d1b!H#?vV0vrK:ZH1=2M>iV;?aPhFB<*vW@QW@sO9}cfZA-i'w%hKd6gt1UJP,15_#QY$M^Mss_U/]&LK9[5vQub^w[KDDqmj;2}YWFdYx.Ap]hjCPTP(n28k+3;o&WXqs/gOXdr$:r'do0;b4c(f_Gr="\4)[01T7ajQJvL$W~mL_sS/4h:x*[ZN=KLs&L5zX//>it,o:aU(;Z>pW&T7oP'2K^E:x9'c[%z-,64JQ5AeH_G#KijUKghQw^\vea3a?kka_G$8#`*kynsxzBLru']k_[7FrVx}^=$blx>s-N%j;D*aZDnsw:YKZ%Q.Kne9#hP?+b3(SOvL,^;&u5@?5C5Bhb=m-vEh_L15Jl]U)0RP6{q%L^_z5E'Dw6X +821 \b +822 822 Ket +825 End ------------------------------------------------------------------ Capturing subpattern count = 0 No options @@ -3194,14 +3319,13 @@ First char = '8' Need char = 'X' |\$\<\.X\+ix\[d1b\!H\#\?vV0vrK\:ZH1\=2M\>iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|DM -Memory allocation (code space): 416 +Memory allocation (code space): 816 ------------------------------------------------------------------ - 0 412 Bra 0 - 3 250 $<.X+ix[d1b!H#?vV0vrK:ZH1=2M>iV;?aPhFB<*vW@QW@sO9}cfZA-i'w%hKd6gt1UJP,15_#QY$M^Mss_U/]&LK9[5vQub^w[KDDqmj;2}YWFdYx.Ap]hjCPTP(n28k+3;o&WXqs/gOXdr$:r'do0;b4c(f_Gr="\4)[01T7ajQJvL$W~mL_sS/4h:x*[ZN=KLs&L5zX//>it,o:aU(;Z>pW&T7oP'2K^E:x9'c[ -255 154 %z-,64JQ5AeH_G#KijUKghQw^\vea3a?kka_G$8#`*kynsxzBLru']k_[7FrVx}^=$blx>s-N%j;D*aZDnsw:YKZ%Q.Kne9#hP?+b3(SOvL,^;&u5@?5C5Bhb=m-vEh_L15Jl]U)0RP6{q%L^_z5E'Dw6X -411 \b -412 412 Ket -415 End + 0 812 Bra 0 + 3 $<.X+ix[d1b!H#?vV0vrK:ZH1=2M>iV;?aPhFB<*vW@QW@sO9}cfZA-i'w%hKd6gt1UJP,15_#QY$M^Mss_U/]&LK9[5vQub^w[KDDqmj;2}YWFdYx.Ap]hjCPTP(n28k+3;o&WXqs/gOXdr$:r'do0;b4c(f_Gr="\4)[01T7ajQJvL$W~mL_sS/4h:x*[ZN=KLs&L5zX//>it,o:aU(;Z>pW&T7oP'2K^E:x9'c[%z-,64JQ5AeH_G#KijUKghQw^\vea3a?kka_G$8#`*kynsxzBLru']k_[7FrVx}^=$blx>s-N%j;D*aZDnsw:YKZ%Q.Kne9#hP?+b3(SOvL,^;&u5@?5C5Bhb=m-vEh_L15Jl]U)0RP6{q%L^_z5E'Dw6X +811 \b +812 812 Ket +815 End ------------------------------------------------------------------ Capturing subpattern count = 0 No options @@ -3211,12 +3335,14 @@ Need char = 'X' /(.*)\d+\1/I Capturing subpattern count = 1 Max back reference = 1 +Partial matching not supported No options No first char No need char /(.*)\d+/I Capturing subpattern count = 1 +Partial matching not supported No options First char at start or follows \n No need char @@ -3224,12 +3350,14 @@ No need char /(.*)\d+\1/Is Capturing subpattern count = 1 Max back reference = 1 +Partial matching not supported Options: dotall No first char No need char /(.*)\d+/Is Capturing subpattern count = 1 +Partial matching not supported Options: anchored dotall No first char No need char @@ -3237,6 +3365,7 @@ No need char /(.*(xyz))\d+\2/I Capturing subpattern count = 2 Max back reference = 2 +Partial matching not supported No options First char at start or follows \n Need char = 'z' @@ -3244,6 +3373,7 @@ Need char = 'z' /((.*))\d+\1/I Capturing subpattern count = 2 Max back reference = 1 +Partial matching not supported No options No first char No need char @@ -3260,6 +3390,7 @@ Need char = 'b' /(?=a).*/I Capturing subpattern count = 0 +Partial matching not supported No options First char = 'a' No need char @@ -3366,7 +3497,7 @@ Capturing subpattern count = 0 No options No first char No need char -Starting character set: a b +Starting byte set: a b /[^a]/I Capturing subpattern count = 0 @@ -3385,7 +3516,7 @@ Capturing subpattern count = 0 No options No first char Need char = '6' -Starting character set: 0 1 2 3 4 5 6 7 8 9 +Starting byte set: 0 1 2 3 4 5 6 7 8 9 /a^b/I Capturing subpattern count = 0 @@ -3418,7 +3549,7 @@ Capturing subpattern count = 0 Options: caseless No first char No need char -Starting character set: A B a b +Starting byte set: A B a b /[ab](?i)cd/IS Capturing subpattern count = 0 @@ -3426,7 +3557,7 @@ No options Case state changes No first char Need char = 'd' (caseless) -Starting character set: a b +Starting byte set: a b /abc(?C)def/ Capturing subpattern count = 0 @@ -3435,11 +3566,11 @@ First char = 'a' Need char = 'f' abcdef --->abcdef - 0 ^ ^ + 0 ^ ^ d 0: abcdef 1234abcdef --->1234abcdef - 0 ^ ^ + 0 ^ ^ d 0: abcdef *** Failers No match @@ -3447,7 +3578,7 @@ No match No match abcxyzf --->abcxyzf - 0 ^ ^ + 0 ^ ^ d No match /abc(?C)de(?C1)f/ @@ -3457,8 +3588,8 @@ First char = 'a' Need char = 'f' 123abcdef --->123abcdef - 0 ^ ^ - 1 ^ ^ + 0 ^ ^ d + 1 ^ ^ f 0: abcdef /(?C1)\dabc(?C2)def/ @@ -3468,22 +3599,22 @@ No first char Need char = 'f' 1234abcdef --->1234abcdef - 1 ^ - 1 ^ - 1 ^ - 1 ^ - 2 ^ ^ + 1 ^ \d + 1 ^ \d + 1 ^ \d + 1 ^ \d + 2 ^ ^ d 0: 4abcdef *** Failers No match abcdef --->abcdef - 1 ^ - 1 ^ - 1 ^ - 1 ^ - 1 ^ - 1 ^ + 1 ^ \d + 1 ^ \d + 1 ^ \d + 1 ^ \d + 1 ^ \d + 1 ^ \d No match /(?C255)ab/ @@ -3510,7 +3641,7 @@ Need char = 'f' No match \x83\x0\x61bcdef --->\x83\x00abcdef - 0 ^ ^ + 0 ^ ^ d 0: abcdef /(abc)(?C)de(?C1)f/ @@ -3520,8 +3651,8 @@ First char = 'a' Need char = 'f' 123abcdef --->123abcdef - 0 ^ ^ - 1 ^ ^ + 0 ^ ^ d + 1 ^ ^ f 0: abcdef 1: abc 123abcdef\C+ @@ -3529,12 +3660,12 @@ Callout 0: last capture = 1 0: 1: abc --->123abcdef - ^ ^ + ^ ^ d Callout 1: last capture = 1 0: 1: abc --->123abcdef - ^ ^ + ^ ^ f 0: abcdef 1: abc 123abcdef\C- @@ -3544,8 +3675,8 @@ Callout 1: last capture = 1 No match 123abcdef\C!1 --->123abcdef - 0 ^ ^ - 1 ^ ^ + 0 ^ ^ d + 1 ^ ^ f No match /(?C0)(abc(?C1))*/ @@ -3555,34 +3686,35 @@ No first char No need char abcabcabc --->abcabcabc - 0 ^ - 1 ^ ^ - 1 ^ ^ - 1 ^ ^ + 0 ^ (abc(?C1))* + 1 ^ ^ ) + 1 ^ ^ ) + 1 ^ ^ ) 0: abcabcabc 1: abc abcabc\C!1!3 --->abcabc - 0 ^ - 1 ^ ^ - 1 ^ ^ + 0 ^ (abc(?C1))* + 1 ^ ^ ) + 1 ^ ^ ) 0: abcabc 1: abc *** Failers --->*** Failers - 0 ^ + 0 ^ (abc(?C1))* 0: abcabcabc\C!1!3 --->abcabcabc - 0 ^ - 1 ^ ^ - 1 ^ ^ - 1 ^ ^ + 0 ^ (abc(?C1))* + 1 ^ ^ ) + 1 ^ ^ ) + 1 ^ ^ ) 0: abcabc 1: abc /(\d{3}(?C))*/ Capturing subpattern count = 1 +Partial matching not supported No options No first char No need char @@ -3590,36 +3722,36 @@ No need char Callout 0: last capture = -1 0: --->123 - ^ ^ + ^ ^ ) 0: 123 1: 123 123456\C+ Callout 0: last capture = -1 0: --->123456 - ^ ^ + ^ ^ ) Callout 0: last capture = 1 0: 1: 123 --->123456 - ^ ^ + ^ ^ ) 0: 123456 1: 456 123456789\C+ Callout 0: last capture = -1 0: --->123456789 - ^ ^ + ^ ^ ) Callout 0: last capture = 1 0: 1: 123 --->123456789 - ^ ^ + ^ ^ ) Callout 0: last capture = 1 0: 1: 456 --->123456789 - ^ ^ + ^ ^ ) 0: 123456789 1: 789 @@ -3634,11 +3766,11 @@ Callout 0: last capture = 2 1: 2: xyz --->xyzabc - ^ ^ + ^ ^ p Callout 1: last capture = -1 0: --->xyzabc - ^ + ^ x 0: xyzabc 1: xyzabc @@ -3654,12 +3786,12 @@ Callout 0: last capture = 3 2: 3: xyz --->Xxyzabc - ^ ^ + ^ ^ p Callout 1: last capture = 1 0: 1: X --->Xxyzabc - ^^ + ^^ x 0: Xxyzabc 1: X 2: xyzabc @@ -3674,7 +3806,7 @@ Callout 0: last capture = 1 0: 1: abc --->abcdef - ^ + ^ a 0: abcdef 1: abc @@ -3688,11 +3820,11 @@ Callout 1: last capture = 1 0: 1: abc --->abcxyz - ^ ^ + ^ ^ d Callout 2: last capture = -1 0: --->abcxyz - ^ + ^ a 0: abcxyz /(?<=(abc)(?C))xyz/ @@ -3705,7 +3837,7 @@ Callout 0: last capture = 1 0: 1: abc --->abcxyz - ^ + ^ ) 0: xyz 1: abc @@ -3726,7 +3858,7 @@ Capturing subpattern count = 0 No options No first char No need char -Starting character set: a b +Starting byte set: a b /(?R)/ Failed: recursive call could loop indefinitely at offset 3 @@ -3811,14 +3943,14 @@ Need char = '<' /(a(?1)b)/D ------------------------------------------------------------------ - 0 18 Bra 0 - 3 12 Bra 1 - 6 1 a - 9 3 Recurse - 12 1 b - 15 12 Ket - 18 18 Ket - 21 End + 0 16 Bra 0 + 3 10 Bra 1 + 6 a + 8 3 Recurse + 11 b + 13 10 Ket + 16 16 Ket + 19 End ------------------------------------------------------------------ Capturing subpattern count = 1 No options @@ -3827,16 +3959,16 @@ Need char = 'b' /(a(?1)+b)/D ------------------------------------------------------------------ - 0 24 Bra 0 - 3 18 Bra 1 - 6 1 a - 9 6 Bra 0 - 12 3 Recurse - 15 6 KetRmax - 18 1 b - 21 18 Ket - 24 24 Ket - 27 End + 0 22 Bra 0 + 3 16 Bra 1 + 6 a + 8 6 Bra 0 + 11 3 Recurse + 14 6 KetRmax + 17 b + 19 16 Ket + 22 22 Ket + 25 End ------------------------------------------------------------------ Capturing subpattern count = 1 No options @@ -3846,6 +3978,7 @@ Need char = 'b' /^\W*(?:((.)\W*(?1)\W*\2|)|((.)\W*(?3)\W*\4|\W*.\W*))\W*$/i Capturing subpattern count = 4 Max back reference = 4 +Partial matching not supported Options: anchored caseless No first char No need char @@ -3878,6 +4011,7 @@ No match /^(\d+|\((?1)([+*-])(?1)\)|-(?1))$/ Capturing subpattern count = 2 +Partial matching not supported Options: anchored No first char No need char @@ -3918,6 +4052,7 @@ No match /((< (?: (?(R) \d++ | [^<>]*+) | (?2)) * >))/x Capturing subpattern count = 2 +Partial matching not supported Options: extended First char = '<' Need char = '>' @@ -4000,19 +4135,19 @@ No need char /a(?Pb|c)d(?Pe)/D ------------------------------------------------------------------ - 0 33 Bra 0 - 3 1 a - 6 6 Bra 1 - 9 1 b - 12 6 Alt - 15 1 c - 18 12 Ket - 21 1 d - 24 6 Bra 2 - 27 1 e - 30 6 Ket - 33 33 Ket - 36 End + 0 28 Bra 0 + 3 a + 5 5 Bra 1 + 8 b + 10 5 Alt + 13 c + 15 10 Ket + 18 d + 20 5 Bra 2 + 23 e + 25 5 Ket + 28 28 Ket + 31 End ------------------------------------------------------------------ Capturing subpattern count = 2 Named capturing subpatterns: @@ -4032,21 +4167,21 @@ Need char = 'e' /(?:a(?Pc(?Pd)))(?Pa)/D ------------------------------------------------------------------ - 0 39 Bra 0 - 3 24 Bra 0 - 6 1 a - 9 15 Bra 1 - 12 1 c - 15 6 Bra 2 - 18 1 d - 21 6 Ket - 24 15 Ket - 27 24 Ket - 30 6 Bra 3 - 33 1 a - 36 6 Ket - 39 39 Ket - 42 End + 0 35 Bra 0 + 3 21 Bra 0 + 6 a + 8 13 Bra 1 + 11 c + 13 5 Bra 2 + 16 d + 18 5 Ket + 21 13 Ket + 24 21 Ket + 27 5 Bra 3 + 30 a + 32 5 Ket + 35 35 Ket + 38 End ------------------------------------------------------------------ Capturing subpattern count = 3 Named capturing subpatterns: @@ -4059,19 +4194,19 @@ Need char = 'a' /(?Pa)...(?P=a)bbb(?P>a)d/D ------------------------------------------------------------------ - 0 29 Bra 0 - 3 6 Bra 1 - 6 1 a - 9 6 Ket + 0 28 Bra 0 + 3 5 Bra 1 + 6 a + 8 5 Ket + 11 Any 12 Any 13 Any - 14 Any - 15 \1 - 18 3 bbb + 14 \1 + 17 bbb 23 3 Recurse - 26 1 d - 29 29 Ket - 32 End + 26 d + 28 28 Ket + 31 End ------------------------------------------------------------------ Capturing subpattern count = 1 Max back reference = 1 @@ -4089,6 +4224,7 @@ Named capturing subpatterns: one 1 three 3 two 2 +Partial matching not supported Options: anchored caseless No first char No need char @@ -4134,6 +4270,7 @@ No need char /(.*)a/sI Capturing subpattern count = 1 +Partial matching not supported Options: anchored dotall No first char Need char = 'a' @@ -4141,6 +4278,7 @@ Need char = 'a' /(.*)a\1/sI Capturing subpattern count = 1 Max back reference = 1 +Partial matching not supported Options: dotall No first char Need char = 'a' @@ -4148,12 +4286,14 @@ Need char = 'a' /(.*)a(b)\2/sI Capturing subpattern count = 2 Max back reference = 2 +Partial matching not supported Options: anchored dotall No first char Need char = 'b' /((.*)a|(.*)b)z/sI Capturing subpattern count = 3 +Partial matching not supported Options: anchored dotall No first char Need char = 'z' @@ -4161,6 +4301,7 @@ Need char = 'z' /((.*)a|(.*)b)z\1/sI Capturing subpattern count = 3 Max back reference = 1 +Partial matching not supported Options: dotall No first char Need char = 'z' @@ -4168,6 +4309,7 @@ Need char = 'z' /((.*)a|(.*)b)z\2/sI Capturing subpattern count = 3 Max back reference = 2 +Partial matching not supported Options: dotall No first char Need char = 'z' @@ -4175,6 +4317,7 @@ Need char = 'z' /((.*)a|(.*)b)z\3/sI Capturing subpattern count = 3 Max back reference = 3 +Partial matching not supported Options: dotall No first char Need char = 'z' @@ -4182,12 +4325,14 @@ Need char = 'z' /((.*)a|^(.*)b)z\3/sI Capturing subpattern count = 3 Max back reference = 3 +Partial matching not supported Options: anchored dotall No first char Need char = 'z' /(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)a/sI Capturing subpattern count = 31 +Partial matching not supported Options: anchored dotall No first char No need char @@ -4195,6 +4340,7 @@ No need char /(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)a\31/sI Capturing subpattern count = 31 Max back reference = 31 +Partial matching not supported Options: dotall No first char No need char @@ -4202,21 +4348,22 @@ No need char /(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)a\32/sI Capturing subpattern count = 32 Max back reference = 32 +Partial matching not supported Options: dotall No first char No need char /(a)(bc)/ND ------------------------------------------------------------------ - 0 22 Bra 0 - 3 6 Bra 0 - 6 1 a - 9 6 Ket - 12 7 Bra 0 - 15 2 bc - 19 7 Ket - 22 22 Ket - 25 End + 0 21 Bra 0 + 3 5 Bra 0 + 6 a + 8 5 Ket + 11 7 Bra 0 + 14 bc + 18 7 Ket + 21 21 Ket + 24 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: @@ -4227,15 +4374,15 @@ Need char = 'c' /(?Pa)(bc)/ND ------------------------------------------------------------------ - 0 22 Bra 0 - 3 6 Bra 1 - 6 1 a - 9 6 Ket - 12 7 Bra 0 - 15 2 bc - 19 7 Ket - 22 22 Ket - 25 End + 0 21 Bra 0 + 3 5 Bra 1 + 6 a + 8 5 Ket + 11 7 Bra 0 + 14 bc + 18 7 Ket + 21 21 Ket + 24 End ------------------------------------------------------------------ Capturing subpattern count = 1 Named capturing subpatterns: @@ -4249,15 +4396,15 @@ Need char = 'c' /(a)(?Pbc)/ND ------------------------------------------------------------------ - 0 22 Bra 0 - 3 6 Bra 0 - 6 1 a - 9 6 Ket - 12 7 Bra 1 - 15 2 bc - 19 7 Ket - 22 22 Ket - 25 End + 0 21 Bra 0 + 3 5 Bra 0 + 6 a + 8 5 Ket + 11 7 Bra 1 + 14 bc + 18 7 Ket + 21 21 Ket + 24 End ------------------------------------------------------------------ Capturing subpattern count = 1 Named capturing subpatterns: @@ -4268,6 +4415,7 @@ Need char = 'c' /(a+)*zz/ Capturing subpattern count = 1 +Partial matching not supported No options No first char Need char = 'z' @@ -4286,23 +4434,23 @@ First char = 'a' Need char = 'b' aaabbb --->aaabbb - 1 ^ ^ + 1 ^ ^ b 0: aaabbb 1: aaabbb aaabbb\C*0 --->aaabbb - 1 ^ ^ + 1 ^ ^ b 0: aaabbb 1: aaabbb aaabbb\C*1 --->aaabbb - 1 ^ ^ + 1 ^ ^ b Callout data = 1 0: ab 1: ab aaabbb\C*-1 --->aaabbb - 1 ^ ^ + 1 ^ ^ b Callout data = -1 No match @@ -4401,6 +4549,7 @@ Failed: two named groups have the same n Capturing subpattern count = 3 Named capturing subpatterns: elem 2 +Partial matching not supported No options First char = '[' Need char = ']' @@ -4418,6 +4567,7 @@ No match Capturing subpattern count = 3 Named capturing subpatterns: elem 2 +Partial matching not supported No options First char = '[' Need char = ']' @@ -4431,18 +4581,18 @@ Need char = ']' /(a(b(?2)c))?/D ------------------------------------------------------------------ - 0 28 Bra 0 + 0 25 Bra 0 3 Brazero - 4 21 Bra 1 - 7 1 a - 10 12 Bra 2 - 13 1 b - 16 10 Recurse - 19 1 c - 22 12 Ket - 25 21 Ket - 28 28 Ket - 31 End + 4 18 Bra 1 + 7 a + 9 10 Bra 2 + 12 b + 14 9 Recurse + 17 c + 19 10 Ket + 22 18 Ket + 25 25 Ket + 28 End ------------------------------------------------------------------ Capturing subpattern count = 2 No options @@ -4451,18 +4601,18 @@ No need char /(a(b(?2)c))*/D ------------------------------------------------------------------ - 0 28 Bra 0 + 0 25 Bra 0 3 Brazero - 4 21 Bra 1 - 7 1 a - 10 12 Bra 2 - 13 1 b - 16 10 Recurse - 19 1 c - 22 12 Ket - 25 21 KetRmax - 28 28 Ket - 31 End + 4 18 Bra 1 + 7 a + 9 10 Bra 2 + 12 b + 14 9 Recurse + 17 c + 19 10 Ket + 22 18 KetRmax + 25 25 Ket + 28 End ------------------------------------------------------------------ Capturing subpattern count = 2 No options @@ -4471,29 +4621,29 @@ No need char /(a(b(?2)c)){0,2}/D ------------------------------------------------------------------ - 0 59 Bra 0 + 0 53 Bra 0 3 Brazero - 4 52 Bra 0 - 7 21 Bra 1 - 10 1 a - 13 12 Bra 2 - 16 1 b - 19 13 Recurse - 22 1 c - 25 12 Ket - 28 21 Ket - 31 Brazero - 32 21 Bra 1 - 35 1 a - 38 12 Bra 2 - 41 1 b - 44 13 Recurse - 47 1 c - 50 12 Ket - 53 21 Ket - 56 52 Ket - 59 59 Ket - 62 End + 4 46 Bra 0 + 7 18 Bra 1 + 10 a + 12 10 Bra 2 + 15 b + 17 12 Recurse + 20 c + 22 10 Ket + 25 18 Ket + 28 Brazero + 29 18 Bra 1 + 32 a + 34 10 Bra 2 + 37 b + 39 12 Recurse + 42 c + 44 10 Ket + 47 18 Ket + 50 46 Ket + 53 53 Ket + 56 End ------------------------------------------------------------------ Capturing subpattern count = 2 No options @@ -4504,7 +4654,7 @@ No need char ------------------------------------------------------------------ 0 47 Bra 0 3 41 Once - 6 [a-b]{1,1} + 6 [ab]{1,1} 44 41 Ket 47 47 Ket 50 End @@ -4516,6 +4666,7 @@ No need char /((w\/|-|with)*(free|immediate)*.*?shipping\s*[!.-]*)/i Capturing subpattern count = 3 +Partial matching not supported Options: caseless No first char Need char = 'g' (caseless) @@ -4525,6 +4676,7 @@ Need char = 'g' (caseless) /((w\/|-|with)*(free|immediate)*.*?shipping\s*[!.-]*)/iS Capturing subpattern count = 3 +Partial matching not supported Options: caseless No first char Need char = 'g' (caseless) @@ -4535,14 +4687,15 @@ Study returned NULL /a*.*b/SD ------------------------------------------------------------------ - 0 10 Bra 0 + 0 9 Bra 0 3 a* 5 Any* - 7 1 b - 10 10 Ket - 13 End + 7 b + 9 9 Ket + 12 End ------------------------------------------------------------------ Capturing subpattern count = 0 +Partial matching not supported No options No first char Need char = 'b' @@ -4550,17 +4703,17 @@ Study returned NULL /(a|b)*.?c/SD ------------------------------------------------------------------ - 0 24 Bra 0 + 0 21 Bra 0 3 Brazero - 4 6 Bra 1 - 7 1 a - 10 6 Alt - 13 1 b - 16 12 KetRmax - 19 Any? - 21 1 c - 24 24 Ket - 27 End + 4 5 Bra 1 + 7 a + 9 5 Alt + 12 b + 14 10 KetRmax + 17 Any? + 19 c + 21 21 Ket + 24 End ------------------------------------------------------------------ Capturing subpattern count = 1 No options @@ -4568,6 +4721,885 @@ No first char Need char = 'c' Study returned NULL +/abc(?C255)de(?C)f/D +------------------------------------------------------------------ + 0 27 Bra 0 + 3 abc + 9 Callout 255 10 1 + 15 de + 19 Callout 0 16 1 + 25 f + 27 27 Ket + 30 End +------------------------------------------------------------------ +Capturing subpattern count = 0 +No options +First char = 'a' +Need char = 'f' + +/abcde/CD +------------------------------------------------------------------ + 0 49 Bra 0 + 3 Callout 255 0 1 + 9 a + 11 Callout 255 1 1 + 17 b + 19 Callout 255 2 1 + 25 c + 27 Callout 255 3 1 + 33 d + 35 Callout 255 4 1 + 41 e + 43 Callout 255 5 0 + 49 49 Ket + 52 End +------------------------------------------------------------------ +Capturing subpattern count = 0 +Options: +First char = 'a' +Need char = 'e' + abcde +--->abcde + +0 ^ a + +1 ^^ b + +2 ^ ^ c + +3 ^ ^ d + +4 ^ ^ e + +5 ^ ^ + 0: abcde + abcdfe +--->abcdfe + +0 ^ a + +1 ^^ b + +2 ^ ^ c + +3 ^ ^ d + +4 ^ ^ e +No match + +/a*b/CD +------------------------------------------------------------------ + 0 25 Bra 0 + 3 Callout 255 0 2 + 9 a* + 11 Callout 255 2 1 + 17 b + 19 Callout 255 3 0 + 25 25 Ket + 28 End +------------------------------------------------------------------ +Capturing subpattern count = 0 +Partial matching not supported +Options: +No first char +Need char = 'b' + ab +--->ab + +0 ^ a* + +2 ^^ b + +3 ^ ^ + 0: ab + aaaab +--->aaaab + +0 ^ a* + +2 ^ ^ b + +3 ^ ^ + 0: aaaab + aaaacb +--->aaaacb + +0 ^ a* + +2 ^ ^ b + +2 ^ ^ b + +2 ^ ^ b + +2 ^^ b + +2 ^ b + +0 ^ a* + +2 ^ ^ b + +2 ^ ^ b + +2 ^^ b + +2 ^ b + +0 ^ a* + +2 ^ ^ b + +2 ^^ b + +2 ^ b + +0 ^ a* + +2 ^^ b + +2 ^ b + +0 ^ a* + +2 ^ b + +0 ^ a* + +2 ^ b + +3 ^^ + 0: b + +/a+b/CD +------------------------------------------------------------------ + 0 25 Bra 0 + 3 Callout 255 0 2 + 9 a+ + 11 Callout 255 2 1 + 17 b + 19 Callout 255 3 0 + 25 25 Ket + 28 End +------------------------------------------------------------------ +Capturing subpattern count = 0 +Partial matching not supported +Options: +First char = 'a' +Need char = 'b' + ab +--->ab + +0 ^ a+ + +2 ^^ b + +3 ^ ^ + 0: ab + aaaab +--->aaaab + +0 ^ a+ + +2 ^ ^ b + +3 ^ ^ + 0: aaaab + aaaacb +--->aaaacb + +0 ^ a+ + +2 ^ ^ b + +2 ^ ^ b + +2 ^ ^ b + +2 ^^ b + +0 ^ a+ + +2 ^ ^ b + +2 ^ ^ b + +2 ^^ b + +0 ^ a+ + +2 ^ ^ b + +2 ^^ b + +0 ^ a+ + +2 ^^ b +No match + +/(abc|def)x/CD +------------------------------------------------------------------ + 0 92 Bra 0 + 3 Callout 255 0 9 + 9 33 Bra 1 + 12 Callout 255 1 1 + 18 a + 20 Callout 255 2 1 + 26 b + 28 Callout 255 3 1 + 34 c + 36 Callout 255 4 0 + 42 33 Alt + 45 Callout 255 5 1 + 51 d + 53 Callout 255 6 1 + 59 e + 61 Callout 255 7 1 + 67 f + 69 Callout 255 8 0 + 75 66 Ket + 78 Callout 255 9 1 + 84 x + 86 Callout 255 10 0 + 92 92 Ket + 95 End +------------------------------------------------------------------ +Capturing subpattern count = 1 +Options: +No first char +Need char = 'x' + abcx +--->abcx + +0 ^ (abc|def) + +1 ^ a + +2 ^^ b + +3 ^ ^ c + +4 ^ ^ | + +9 ^ ^ x ++10 ^ ^ + 0: abcx + 1: abc + defx +--->defx + +0 ^ (abc|def) + +1 ^ a + +5 ^ d + +6 ^^ e + +7 ^ ^ f + +8 ^ ^ ) + +9 ^ ^ x ++10 ^ ^ + 0: defx + 1: def + abcdefzx +--->abcdefzx + +0 ^ (abc|def) + +1 ^ a + +2 ^^ b + +3 ^ ^ c + +4 ^ ^ | + +9 ^ ^ x + +5 ^ d + +0 ^ (abc|def) + +1 ^ a + +5 ^ d + +0 ^ (abc|def) + +1 ^ a + +5 ^ d + +0 ^ (abc|def) + +1 ^ a + +5 ^ d + +6 ^^ e + +7 ^ ^ f + +8 ^ ^ ) + +9 ^ ^ x + +0 ^ (abc|def) + +1 ^ a + +5 ^ d + +0 ^ (abc|def) + +1 ^ a + +5 ^ d + +0 ^ (abc|def) + +1 ^ a + +5 ^ d + +0 ^ (abc|def) + +1 ^ a + +5 ^ d +No match + +/(ab|cd){3,4}/C +Capturing subpattern count = 1 +Options: +No first char +No need char + ababab +--->ababab + +0 ^ (ab|cd){3,4} + +1 ^ a + +2 ^^ b + +3 ^ ^ | + +1 ^ ^ a + +2 ^ ^ b + +3 ^ ^ | + +1 ^ ^ a + +2 ^ ^ b + +3 ^ ^ | + +1 ^ ^ a + +4 ^ ^ c ++12 ^ ^ + 0: ababab + 1: ab + abcdabcd +--->abcdabcd + +0 ^ (ab|cd){3,4} + +1 ^ a + +2 ^^ b + +3 ^ ^ | + +1 ^ ^ a + +4 ^ ^ c + +5 ^ ^ d + +6 ^ ^ ) + +1 ^ ^ a + +2 ^ ^ b + +3 ^ ^ | + +1 ^ ^ a + +4 ^ ^ c + +5 ^ ^ d + +6 ^ ^ ) ++12 ^ ^ + 0: abcdabcd + 1: cd + abcdcdcdcdcd +--->abcdcdcdcdcd + +0 ^ (ab|cd){3,4} + +1 ^ a + +2 ^^ b + +3 ^ ^ | + +1 ^ ^ a + +4 ^ ^ c + +5 ^ ^ d + +6 ^ ^ ) + +1 ^ ^ a + +4 ^ ^ c + +5 ^ ^ d + +6 ^ ^ ) + +1 ^ ^ a + +4 ^ ^ c + +5 ^ ^ d + +6 ^ ^ ) ++12 ^ ^ + 0: abcdcdcd + 1: cd + +/([ab]{,4}c|xy)/CD +------------------------------------------------------------------ + 0 131 Bra 0 + 3 Callout 255 0 14 + 9 88 Bra 1 + 12 Callout 255 1 4 + 18 [ab] + 51 Callout 255 5 1 + 57 { + 59 Callout 255 6 1 + 65 , + 67 Callout 255 7 1 + 73 4 + 75 Callout 255 8 1 + 81 } + 83 Callout 255 9 1 + 89 c + 91 Callout 255 10 0 + 97 25 Alt +100 Callout 255 11 1 +106 x +108 Callout 255 12 1 +114 y +116 Callout 255 13 0 +122 113 Ket +125 Callout 255 14 0 +131 131 Ket +134 End +------------------------------------------------------------------ +Capturing subpattern count = 1 +Options: +No first char +No need char + Note: that { does NOT introduce a quantifier +--->Note: that { does NOT introduce a quantifier + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] + +5 ^^ { ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] + +5 ^^ { ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] + +5 ^^ { ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x + +0 ^ ([ab]{,4}c|xy) + +1 ^ [ab] ++11 ^ x +No match + +/([ab]{1,4}c|xy){4,5}?123/CD +------------------------------------------------------------------ + 0 485 Bra 0 + 3 Callout 255 0 21 + 9 61 Bra 1 + 12 Callout 255 1 9 + 18 [ab]{1,4} + 56 Callout 255 10 1 + 62 c + 64 Callout 255 11 0 + 70 25 Alt + 73 Callout 255 12 1 + 79 x + 81 Callout 255 13 1 + 87 y + 89 Callout 255 14 0 + 95 86 Ket + 98 61 Bra 1 +101 Callout 255 1 9 +107 [ab]{1,4} +145 Callout 255 10 1 +151 c +153 Callout 255 11 0 +159 25 Alt +162 Callout 255 12 1 +168 x +170 Callout 255 13 1 +176 y +178 Callout 255 14 0 +184 86 Ket +187 61 Bra 1 +190 Callout 255 1 9 +196 [ab]{1,4} +234 Callout 255 10 1 +240 c +242 Callout 255 11 0 +248 25 Alt +251 Callout 255 12 1 +257 x +259 Callout 255 13 1 +265 y +267 Callout 255 14 0 +273 86 Ket +276 61 Bra 1 +279 Callout 255 1 9 +285 [ab]{1,4} +323 Callout 255 10 1 +329 c +331 Callout 255 11 0 +337 25 Alt +340 Callout 255 12 1 +346 x +348 Callout 255 13 1 +354 y +356 Callout 255 14 0 +362 86 Ket +365 Braminzero +366 61 Bra 1 +369 Callout 255 1 9 +375 [ab]{1,4} +413 Callout 255 10 1 +419 c +421 Callout 255 11 0 +427 25 Alt +430 Callout 255 12 1 +436 x +438 Callout 255 13 1 +444 y +446 Callout 255 14 0 +452 86 Ket +455 Callout 255 21 1 +461 1 +463 Callout 255 22 1 +469 2 +471 Callout 255 23 1 +477 3 +479 Callout 255 24 0 +485 485 Ket +488 End +------------------------------------------------------------------ +Capturing subpattern count = 1 +Partial matching not supported +Options: +No first char +Need char = '3' + aacaacaacaacaac123 +--->aacaacaacaacaac123 + +0 ^ ([ab]{1,4}c|xy){4,5}? + +1 ^ [ab]{1,4} ++10 ^ ^ c ++11 ^ ^ | + +1 ^ ^ [ab]{1,4} ++10 ^ ^ c ++11 ^ ^ | + +1 ^ ^ [ab]{1,4} ++10 ^ ^ c ++11 ^ ^ | + +1 ^ ^ [ab]{1,4} ++10 ^ ^ c ++11 ^ ^ | ++21 ^ ^ 1 + +1 ^ ^ [ab]{1,4} ++10 ^ ^ c ++11 ^ ^ | ++21 ^ ^ 1 ++22 ^ ^ 2 ++23 ^ ^ 3 ++24 ^ ^ + 0: aacaacaacaacaac123 + 1: aac + +/\b.*/I +Capturing subpattern count = 0 +Partial matching not supported +No options +No first char +No need char + ab cd\>1 + 0: cd + +/\b.*/Is +Capturing subpattern count = 0 +Partial matching not supported +Options: dotall +No first char +No need char + ab cd\>1 + 0: cd + +/(?!.bcd).*/I +Capturing subpattern count = 0 +Partial matching not supported +No options +No first char +No need char + Xbcd12345 + 0: bcd12345 + +/abcde/ +Capturing subpattern count = 0 +No options +First char = 'a' +Need char = 'e' + ab\P +Partial match + abc\P +Partial match + abcd\P +Partial match + abcde\P + 0: abcde + the quick brown abc\P +Partial match + ** Failers\P +No match + the quick brown abxyz fox\P +No match + +"^(0?[1-9]|[12][0-9]|3[01])/(0?[1-9]|1[012])/(20)?\d\d$" +Capturing subpattern count = 3 +Options: anchored +No first char +Need char = '/' + 13/05/04\P + 0: 13/05/04 + 1: 13 + 2: 05 + 13/5/2004\P + 0: 13/5/2004 + 1: 13 + 2: 5 + 3: 20 + 02/05/09\P + 0: 02/05/09 + 1: 02 + 2: 05 + 1\P +Partial match + 1/2\P +Partial match + 1/2/0\P +Partial match + 1/2/04\P + 0: 1/2/04 + 1: 1 + 2: 2 + 0\P +Partial match + 02/\P +Partial match + 02/0\P +Partial match + 02/1\P +Partial match + ** Failers\P +No match + \P +No match + 123\P +No match + 33/4/04\P +No match + 3/13/04\P +No match + 0/1/2003\P +No match + 0/\P +No match + 02/0/\P +No match + 02/13\P +No match + +/0{0,2}ABC/I +Capturing subpattern count = 0 +Partial matching not supported +No options +No first char +Need char = 'C' + +/\d{3,}ABC/I +Capturing subpattern count = 0 +Partial matching not supported +No options +No first char +Need char = 'C' + +/\d*ABC/I +Capturing subpattern count = 0 +Partial matching not supported +No options +No first char +Need char = 'C' + +/[abc]+DE/I +Capturing subpattern count = 0 +Partial matching not supported +No options +No first char +Need char = 'E' + +/[abc]?123/ +Capturing subpattern count = 0 +No options +No first char +Need char = '3' + 123\P + 0: 123 + a\P +Partial match + b\P +Partial match + c\P +Partial match + c12\P +Partial match + c123\P + 0: c123 + +/^(?:\d){3,5}X/ +Capturing subpattern count = 0 +Options: anchored +No first char +Need char = 'X' + 1\P +Partial match + 123\P +Partial match + 123X + 0: 123X + 1234\P +Partial match + 1234X + 0: 1234X + 12345\P +Partial match + 12345X + 0: 12345X + *** Failers +No match + 1X +No match + 123456\P +No match + +/abc/>testsavedregex +Capturing subpattern count = 0 +No options +First char = 'a' +Need char = 'c' +Compiled regex written to testsavedregex +testsavedregex +Capturing subpattern count = 0 +No options +First char = 'a' +Need char = 'c' +Compiled regex written to testsavedregex +testsavedregex +Capturing subpattern count = 1 +No options +No first char +No need char +Starting byte set: a b +Compiled regex written to testsavedregex +Study data written to testsavedregex +testsavedregex +Capturing subpattern count = 1 +No options +No first char +No need char +Starting byte set: a b +Compiled regex written to testsavedregex +Study data written to testsavedregex +(.)*~smg +Capturing subpattern count = 3 +Max back reference = 1 +Partial matching not supported +Options: multiline dotall +First char = '<' +Need char = '>' + \n\n\nPartner der LCO\nde\nPartner der LINEAS Consulting\nGmbH\nLINEAS Consulting GmbH Hamburg\nPartnerfirmen\n30 days\nindex,follow\n\nja\n3\nPartner\n\n\nLCO\nLINEAS Consulting\n15.10.2003\n\n\n\n\nDie Partnerfirmen der LINEAS Consulting\nGmbH\n\n\n \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n + 0: \x0a\x0aPartner der LCO\x0ade\x0aPartner der LINEAS Consulting\x0aGmbH\x0aLINEAS Consulting GmbH Hamburg\x0aPartnerfirmen\x0a30 days\x0aindex,follow\x0a\x0aja\x0a3\x0aPartner\x0a\x0a\x0aLCO\x0aLINEAS Consulting\x0a15.10.2003\x0a\x0a\x0a\x0a\x0aDie Partnerfirmen der LINEAS Consulting\x0aGmbH\x0a\x0a\x0a \x0a\x0a\x0a\x0a\x0a\x0a\x0a\x0a\x0a\x0a\x0a\x0a\x0a\x0a\x0a\x0a\x0a\x0a\x0a\x0a\x0a\x0a + 1: seite + 2: \x0a + 3: seite + +/^a/IF +Capturing subpattern count = 0 +Options: anchored +No first char +No need char + / End of testinput2 / Capturing subpattern count = 0 No options diff -Nurp tin-1.7.6/pcre/testdata/testoutput3 tin-1.7.7/pcre/testdata/testoutput3 --- tin-1.7.6/pcre/testdata/testoutput3 2004-08-20 10:30:54.000000000 +0200 +++ tin-1.7.7/pcre/testdata/testoutput3 2004-11-15 18:44:39.000000000 +0100 @@ -1,4 +1,4 @@ -PCRE version 4.5 01-December-2003 +PCRE version 5.0 13-Sep-2004 /^[\w]+/ *** Failers @@ -85,7 +85,7 @@ Capturing subpattern count = 0 No options No first char No need char -Starting character set: 0 1 2 3 4 5 6 7 8 9 A B C D E F G H I J K L M N O P +Starting byte set: 0 1 2 3 4 5 6 7 8 9 A B C D E F G H I J K L M N O P Q R S T U V W X Y Z _ a b c d e f g h i j k l m n o p q r s t u v w x y z /\w/ISLfr_FR @@ -93,7 +93,7 @@ Capturing subpattern count = 0 No options No first char No need char -Starting character set: 0 1 2 3 4 5 6 7 8 9 A B C D E F G H I J K L M N O P +Starting byte set: 0 1 2 3 4 5 6 7 8 9 A B C D E F G H I J K L M N O P Q R S T U V W X Y Z _ a b c d e f g h i j k l m n o p q r s t u v w x y z µ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö Ø Ù Ú Û Ü Ý Þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô õ ö ø ù ú û ü ý þ ÿ diff -Nurp tin-1.7.6/pcre/testdata/testoutput4 tin-1.7.7/pcre/testdata/testoutput4 --- tin-1.7.6/pcre/testdata/testoutput4 2004-08-20 10:30:54.000000000 +0200 +++ tin-1.7.7/pcre/testdata/testoutput4 2004-11-15 18:44:39.000000000 +0100 @@ -1,4 +1,4 @@ -PCRE version 4.5 01-December-2003 +PCRE version 5.0 13-Sep-2004 /-- Do not use the \x{} construct except with patterns that have the --/ /-- /8 option set, because PCRE doesn't recognize them as UTF-8 unless --/ @@ -409,12 +409,6 @@ No match > >\x{100} Y 0: >\x{100} -/\W/8 - A.B - 0: . - A\x{100}B - 0: \x{100} - /\d/8 \x{100}3 0: 3 @@ -423,10 +417,6 @@ No match \x{100} X 0: -/\w/8 - \x{100}X - 0: X - /\D+/8 12abcd34 0: abcd @@ -831,7 +821,7 @@ No match 0: \x{100} *** Failers No match - \x{101} + \x{102} No match y No match @@ -906,4 +896,8 @@ No match 0: 1: +/^\x{85}$/8i + \x{85} + 0: \x{85} + / End of testinput4 / diff -Nurp tin-1.7.6/pcre/testdata/testoutput5 tin-1.7.7/pcre/testdata/testoutput5 --- tin-1.7.6/pcre/testdata/testoutput5 2004-08-20 10:30:54.000000000 +0200 +++ tin-1.7.7/pcre/testdata/testoutput5 2004-11-15 18:44:39.000000000 +0100 @@ -1,12 +1,12 @@ -PCRE version 4.5 01-December-2003 +PCRE version 5.0 13-Sep-2004 /\x{100}/8DM -Memory allocation (code space): 11 +Memory allocation (code space): 10 ------------------------------------------------------------------ - 0 7 Bra 0 - 3 2 \x{100} - 7 7 Ket - 10 End + 0 6 Bra 0 + 3 \x{100} + 6 6 Ket + 9 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: utf8 @@ -14,12 +14,12 @@ First char = 196 Need char = 128 /\x{1000}/8DM -Memory allocation (code space): 12 +Memory allocation (code space): 11 ------------------------------------------------------------------ - 0 8 Bra 0 - 3 3 \x{1000} - 8 8 Ket - 11 End + 0 7 Bra 0 + 3 \x{1000} + 7 7 Ket + 10 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: utf8 @@ -27,12 +27,12 @@ First char = 225 Need char = 128 /\x{10000}/8DM -Memory allocation (code space): 13 +Memory allocation (code space): 12 ------------------------------------------------------------------ - 0 9 Bra 0 - 3 4 \x{10000} - 9 9 Ket - 12 End + 0 8 Bra 0 + 3 \x{10000} + 8 8 Ket + 11 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: utf8 @@ -40,12 +40,12 @@ First char = 240 Need char = 128 /\x{100000}/8DM -Memory allocation (code space): 13 +Memory allocation (code space): 12 ------------------------------------------------------------------ - 0 9 Bra 0 - 3 4 \x{100000} - 9 9 Ket - 12 End + 0 8 Bra 0 + 3 \x{100000} + 8 8 Ket + 11 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: utf8 @@ -53,12 +53,12 @@ First char = 244 Need char = 128 /\x{1000000}/8DM -Memory allocation (code space): 14 +Memory allocation (code space): 13 ------------------------------------------------------------------ - 0 10 Bra 0 - 3 5 \x{1000000} - 10 10 Ket - 13 End + 0 9 Bra 0 + 3 \x{1000000} + 9 9 Ket + 12 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: utf8 @@ -66,12 +66,12 @@ First char = 249 Need char = 128 /\x{4000000}/8DM -Memory allocation (code space): 15 +Memory allocation (code space): 14 ------------------------------------------------------------------ - 0 11 Bra 0 - 3 6 \x{4000000} - 11 11 Ket - 14 End + 0 10 Bra 0 + 3 \x{4000000} + 10 10 Ket + 13 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: utf8 @@ -79,12 +79,12 @@ First char = 252 Need char = 128 /\x{7fffFFFF}/8DM -Memory allocation (code space): 15 +Memory allocation (code space): 14 ------------------------------------------------------------------ - 0 11 Bra 0 - 3 6 \x{7fffffff} - 11 11 Ket - 14 End + 0 10 Bra 0 + 3 \x{7fffffff} + 10 10 Ket + 13 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: utf8 @@ -92,17 +92,17 @@ First char = 253 Need char = 191 /[\x{ff}]/8DM -Memory allocation (code space): 40 +Memory allocation (code space): 10 ------------------------------------------------------------------ - 0 36 Bra 0 - 3 [\xff] - 36 36 Ket - 39 End + 0 6 Bra 0 + 3 \x{ff} + 6 6 Ket + 9 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: utf8 -No first char -No need char +First char = 195 +Need char = 191 /[\x{100}]/8DM Memory allocation (code space): 47 @@ -129,10 +129,10 @@ Failed: character value in \x{...} seque /\x80/8D ------------------------------------------------------------------ - 0 7 Bra 0 - 3 2 \x{80} - 7 7 Ket - 10 End + 0 6 Bra 0 + 3 \x{80} + 6 6 Ket + 9 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: utf8 @@ -141,10 +141,10 @@ Need char = 128 /\xff/8D ------------------------------------------------------------------ - 0 7 Bra 0 - 3 2 \x{ff} - 7 7 Ket - 10 End + 0 6 Bra 0 + 3 \x{ff} + 6 6 Ket + 9 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: utf8 @@ -153,10 +153,10 @@ Need char = 191 /\x{0041}\x{2262}\x{0391}\x{002e}/D8 ------------------------------------------------------------------ - 0 12 Bra 0 - 3 7 A\x{2262}\x{391}. - 12 12 Ket - 15 End + 0 14 Bra 0 + 3 A\x{2262}\x{391}. + 14 14 Ket + 17 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: utf8 @@ -167,10 +167,10 @@ Need char = '.' /\x{D55c}\x{ad6d}\x{C5B4}/D8 ------------------------------------------------------------------ - 0 14 Bra 0 - 3 9 \x{d55c}\x{ad6d}\x{c5b4} - 14 14 Ket - 17 End + 0 15 Bra 0 + 3 \x{d55c}\x{ad6d}\x{c5b4} + 15 15 Ket + 18 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: utf8 @@ -181,10 +181,10 @@ Need char = 180 /\x{65e5}\x{672c}\x{8a9e}/D8 ------------------------------------------------------------------ - 0 14 Bra 0 - 3 9 \x{65e5}\x{672c}\x{8a9e} - 14 14 Ket - 17 End + 0 15 Bra 0 + 3 \x{65e5}\x{672c}\x{8a9e} + 15 15 Ket + 18 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: utf8 @@ -195,10 +195,10 @@ Need char = 158 /\x{80}/D8 ------------------------------------------------------------------ - 0 7 Bra 0 - 3 2 \x{80} - 7 7 Ket - 10 End + 0 6 Bra 0 + 3 \x{80} + 6 6 Ket + 9 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: utf8 @@ -207,10 +207,10 @@ Need char = 128 /\x{084}/D8 ------------------------------------------------------------------ - 0 7 Bra 0 - 3 2 \x{84} - 7 7 Ket - 10 End + 0 6 Bra 0 + 3 \x{84} + 6 6 Ket + 9 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: utf8 @@ -219,10 +219,10 @@ Need char = 132 /\x{104}/D8 ------------------------------------------------------------------ - 0 7 Bra 0 - 3 2 \x{104} - 7 7 Ket - 10 End + 0 6 Bra 0 + 3 \x{104} + 6 6 Ket + 9 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: utf8 @@ -231,10 +231,10 @@ Need char = 132 /\x{861}/D8 ------------------------------------------------------------------ - 0 8 Bra 0 - 3 3 \x{861} - 8 8 Ket - 11 End + 0 7 Bra 0 + 3 \x{861} + 7 7 Ket + 10 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: utf8 @@ -243,10 +243,10 @@ Need char = 161 /\x{212ab}/D8 ------------------------------------------------------------------ - 0 9 Bra 0 - 3 4 \x{212ab} - 9 9 Ket - 12 End + 0 8 Bra 0 + 3 \x{212ab} + 8 8 Ket + 11 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: utf8 @@ -255,14 +255,15 @@ Need char = 171 /.{3,5}X/D8 ------------------------------------------------------------------ - 0 14 Bra 0 + 0 13 Bra 0 3 Any{3} 7 Any{0,2} - 11 1 X - 14 14 Ket - 17 End + 11 X + 13 13 Ket + 16 End ------------------------------------------------------------------ Capturing subpattern count = 0 +Partial matching not supported Options: utf8 No first char Need char = 'X' @@ -279,6 +280,7 @@ Need char = 'X' 14 End ------------------------------------------------------------------ Capturing subpattern count = 0 +Partial matching not supported Options: utf8 No first char No need char @@ -349,7 +351,7 @@ No match ------------------------------------------------------------------ 0 37 Bra 0 3 ^ - 4 [a-b] + 4 [ab] 37 37 Ket 40 End ------------------------------------------------------------------ @@ -402,7 +404,7 @@ Capturing subpattern count = 0 Options: utf8 No first char No need char -Starting character set: \x00 \x01 \x02 \x03 \x04 \x05 \x06 \x07 \x08 \x09 \x0a +Starting byte set: \x00 \x01 \x02 \x03 \x04 \x05 \x06 \x07 \x08 \x09 \x0a \x0b \x0c \x0d \x0e \x0f \x10 \x11 \x12 \x13 \x14 \x15 \x16 \x17 \x18 \x19 \x1a \x1b \x1c \x1d \x1e \x1f \x20 ! " # $ % & ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = > ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y @@ -436,6 +438,7 @@ No match 16 End ------------------------------------------------------------------ Capturing subpattern count = 0 +Partial matching not supported Options: utf8 First char = 196 Need char = 128 @@ -445,75 +448,79 @@ Study returned NULL /(\x{100}+|x)/8SD ------------------------------------------------------------------ - 0 18 Bra 0 + 0 17 Bra 0 3 6 Bra 1 6 \x{100}+ - 9 6 Alt - 12 1 x - 15 12 Ket - 18 18 Ket - 21 End + 9 5 Alt + 12 x + 14 11 Ket + 17 17 Ket + 20 End ------------------------------------------------------------------ Capturing subpattern count = 1 +Partial matching not supported Options: utf8 No first char No need char -Starting character set: x \xc4 +Starting byte set: x \xc4 /(\x{100}*a|x)/8SD ------------------------------------------------------------------ - 0 21 Bra 0 - 3 9 Bra 1 + 0 19 Bra 0 + 3 8 Bra 1 6 \x{100}* - 9 1 a - 12 6 Alt - 15 1 x - 18 15 Ket - 21 21 Ket - 24 End + 9 a + 11 5 Alt + 14 x + 16 13 Ket + 19 19 Ket + 22 End ------------------------------------------------------------------ Capturing subpattern count = 1 +Partial matching not supported Options: utf8 No first char No need char -Starting character set: a x \xc4 +Starting byte set: a x \xc4 /(\x{100}{0,2}a|x)/8SD ------------------------------------------------------------------ - 0 23 Bra 0 - 3 11 Bra 1 + 0 21 Bra 0 + 3 10 Bra 1 6 \x{100}{,2} - 11 1 a - 14 6 Alt - 17 1 x - 20 17 Ket - 23 23 Ket - 26 End + 11 a + 13 5 Alt + 16 x + 18 15 Ket + 21 21 Ket + 24 End ------------------------------------------------------------------ Capturing subpattern count = 1 +Partial matching not supported Options: utf8 No first char No need char -Starting character set: a x \xc4 +Starting byte set: a x \xc4 /(\x{100}{1,2}a|x)/8SD ------------------------------------------------------------------ - 0 27 Bra 0 - 3 15 Bra 1 - 6 2 \x{100} - 10 \x{100}{,1} - 15 1 a - 18 6 Alt - 21 1 x - 24 21 Ket - 27 27 Ket - 30 End + 0 24 Bra 0 + 3 13 Bra 1 + 6 \x{100} + 9 \x{100}{,1} + 14 a + 16 5 Alt + 19 x + 21 18 Ket + 24 24 Ket + 27 End ------------------------------------------------------------------ Capturing subpattern count = 1 +Partial matching not supported Options: utf8 No first char No need char -Starting character set: x \xc4 +Starting byte set: x \xc4 /\x{100}*(\d+|"(?1)")/8 1234 @@ -541,10 +548,10 @@ No match /\x{100}/8D ------------------------------------------------------------------ - 0 7 Bra 0 - 3 2 \x{100} - 7 7 Ket - 10 End + 0 6 Bra 0 + 3 \x{100} + 6 6 Ket + 9 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: utf8 @@ -559,19 +566,21 @@ Need char = 128 9 End ------------------------------------------------------------------ Capturing subpattern count = 0 +Partial matching not supported Options: utf8 No first char No need char /a\x{100}*/8D ------------------------------------------------------------------ - 0 9 Bra 0 - 3 1 a - 6 \x{100}* - 9 9 Ket - 12 End + 0 8 Bra 0 + 3 a + 5 \x{100}* + 8 8 Ket + 11 End ------------------------------------------------------------------ Capturing subpattern count = 0 +Partial matching not supported Options: utf8 First char = 'a' No need char @@ -579,12 +588,13 @@ No need char /ab\x{100}*/8D ------------------------------------------------------------------ 0 10 Bra 0 - 3 2 ab + 3 ab 7 \x{100}* 10 10 Ket 13 End ------------------------------------------------------------------ Capturing subpattern count = 0 +Partial matching not supported Options: utf8 First char = 'a' Need char = 'b' @@ -592,12 +602,13 @@ Need char = 'b' /a\x{100}\x{101}*/8D ------------------------------------------------------------------ 0 11 Bra 0 - 3 3 a\x{100} + 3 a\x{100} 8 \x{101}* 11 11 Ket 14 End ------------------------------------------------------------------ Capturing subpattern count = 0 +Partial matching not supported Options: utf8 First char = 'a' Need char = 128 @@ -605,25 +616,27 @@ Need char = 128 /a\x{100}\x{101}+/8D ------------------------------------------------------------------ 0 11 Bra 0 - 3 3 a\x{100} + 3 a\x{100} 8 \x{101}+ 11 11 Ket 14 End ------------------------------------------------------------------ Capturing subpattern count = 0 +Partial matching not supported Options: utf8 First char = 'a' Need char = 129 /\x{100}*A/8D ------------------------------------------------------------------ - 0 9 Bra 0 + 0 8 Bra 0 3 \x{100}* - 6 1 A - 9 9 Ket - 12 End + 6 A + 8 8 Ket + 11 End ------------------------------------------------------------------ Capturing subpattern count = 0 +Partial matching not supported Options: utf8 No first char Need char = 'A' @@ -640,6 +653,7 @@ Need char = 'A' 13 End ------------------------------------------------------------------ Capturing subpattern count = 0 +Partial matching not supported Options: utf8 No first char No need char @@ -737,18 +751,6 @@ Options: utf8 No first char No need char -/[z-\x{100}]/8Di ------------------------------------------------------------------- - 0 45 Bra 0 - 3 [Zz-\xff\x{100}-\x{100}] - 45 45 Ket - 48 End ------------------------------------------------------------------- -Capturing subpattern count = 0 -Options: caseless utf8 -No first char -No need char - /[z\Qa-d]Ä€\E]/8D ------------------------------------------------------------------ 0 43 Bra 0 @@ -767,10 +769,10 @@ No need char /[\xFF]/D ------------------------------------------------------------------ - 0 6 Bra 0 - 3 1 \xff - 6 6 Ket - 9 End + 0 5 Bra 0 + 3 \xff + 5 5 Ket + 8 End ------------------------------------------------------------------ Capturing subpattern count = 0 No options @@ -781,15 +783,15 @@ No need char /[\xff]/D8 ------------------------------------------------------------------ - 0 36 Bra 0 - 3 [\xff] - 36 36 Ket - 39 End + 0 6 Bra 0 + 3 \x{ff} + 6 6 Ket + 9 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: utf8 -No first char -No need char +First char = 195 +Need char = 191 >\x{ff}< 0: \x{ff} @@ -852,10 +854,10 @@ Failed: invalid UTF-8 string at offset 1 /ÃÃÃxxx/8?D ------------------------------------------------------------------ - 0 11 Bra 0 - 3 6 \x{c3}\x{f8}xx - 11 11 Ket - 14 End + 0 15 Bra 0 + 3 \X{c0}\X{c0}\X{c0}xxx + 15 15 Ket + 18 End ------------------------------------------------------------------ Capturing subpattern count = 0 Options: utf8 no_utf8_check @@ -910,14 +912,14 @@ No match /\x{100}abc(xyz(?1))/8D ------------------------------------------------------------------ - 0 24 Bra 0 - 3 5 \x{100}abc - 10 11 Bra 1 - 13 3 xyz - 18 10 Recurse - 21 11 Ket - 24 24 Ket - 27 End + 0 27 Bra 0 + 3 \x{100}abc + 12 12 Bra 1 + 15 xyz + 21 12 Recurse + 24 12 Ket + 27 27 Ket + 30 End ------------------------------------------------------------------ Capturing subpattern count = 1 Options: utf8 @@ -926,15 +928,15 @@ Need char = 'z' /[^\x{100}]abc(xyz(?1))/8D ------------------------------------------------------------------ - 0 30 Bra 0 + 0 32 Bra 0 3 [^\x{100}] - 11 3 abc - 16 11 Bra 1 - 19 3 xyz - 24 16 Recurse - 27 11 Ket - 30 30 Ket - 33 End + 11 abc + 17 12 Bra 1 + 20 xyz + 26 17 Recurse + 29 12 Ket + 32 32 Ket + 35 End ------------------------------------------------------------------ Capturing subpattern count = 1 Options: utf8 @@ -943,15 +945,15 @@ Need char = 'z' /[ab\x{100}]abc(xyz(?1))/8D ------------------------------------------------------------------ - 0 62 Bra 0 - 3 [a-b\x{100}] - 43 3 abc - 48 11 Bra 1 - 51 3 xyz - 56 48 Recurse - 59 11 Ket - 62 62 Ket - 65 End + 0 64 Bra 0 + 3 [ab\x{100}] + 43 abc + 49 12 Bra 1 + 52 xyz + 58 49 Recurse + 61 12 Ket + 64 64 Ket + 67 End ------------------------------------------------------------------ Capturing subpattern count = 1 Options: utf8 @@ -960,18 +962,18 @@ Need char = 'z' /(\x{100}(b(?2)c))?/D8 ------------------------------------------------------------------ - 0 29 Bra 0 + 0 26 Bra 0 3 Brazero - 4 22 Bra 1 - 7 2 \x{100} - 11 12 Bra 2 - 14 1 b - 17 11 Recurse - 20 1 c - 23 12 Ket - 26 22 Ket - 29 29 Ket - 32 End + 4 19 Bra 1 + 7 \x{100} + 10 10 Bra 2 + 13 b + 15 10 Recurse + 18 c + 20 10 Ket + 23 19 Ket + 26 26 Ket + 29 End ------------------------------------------------------------------ Capturing subpattern count = 2 Options: utf8 @@ -980,29 +982,29 @@ No need char /(\x{100}(b(?2)c)){0,2}/D8 ------------------------------------------------------------------ - 0 61 Bra 0 + 0 55 Bra 0 3 Brazero - 4 54 Bra 0 - 7 22 Bra 1 - 10 2 \x{100} - 14 12 Bra 2 - 17 1 b - 20 14 Recurse - 23 1 c - 26 12 Ket - 29 22 Ket - 32 Brazero - 33 22 Bra 1 - 36 2 \x{100} - 40 12 Bra 2 - 43 1 b - 46 14 Recurse - 49 1 c - 52 12 Ket - 55 22 Ket - 58 54 Ket - 61 61 Ket - 64 End + 4 48 Bra 0 + 7 19 Bra 1 + 10 \x{100} + 13 10 Bra 2 + 16 b + 18 13 Recurse + 21 c + 23 10 Ket + 26 19 Ket + 29 Brazero + 30 19 Bra 1 + 33 \x{100} + 36 10 Bra 2 + 39 b + 41 13 Recurse + 44 c + 46 10 Ket + 49 19 Ket + 52 48 Ket + 55 55 Ket + 58 End ------------------------------------------------------------------ Capturing subpattern count = 2 Options: utf8 @@ -1011,18 +1013,18 @@ No need char /(\x{100}(b(?1)c))?/D8 ------------------------------------------------------------------ - 0 29 Bra 0 + 0 26 Bra 0 3 Brazero - 4 22 Bra 1 - 7 2 \x{100} - 11 12 Bra 2 - 14 1 b - 17 4 Recurse - 20 1 c - 23 12 Ket - 26 22 Ket - 29 29 Ket - 32 End + 4 19 Bra 1 + 7 \x{100} + 10 10 Bra 2 + 13 b + 15 4 Recurse + 18 c + 20 10 Ket + 23 19 Ket + 26 26 Ket + 29 End ------------------------------------------------------------------ Capturing subpattern count = 2 Options: utf8 @@ -1031,33 +1033,43 @@ No need char /(\x{100}(b(?1)c)){0,2}/D8 ------------------------------------------------------------------ - 0 61 Bra 0 + 0 55 Bra 0 3 Brazero - 4 54 Bra 0 - 7 22 Bra 1 - 10 2 \x{100} - 14 12 Bra 2 - 17 1 b - 20 7 Recurse - 23 1 c - 26 12 Ket - 29 22 Ket - 32 Brazero - 33 22 Bra 1 - 36 2 \x{100} - 40 12 Bra 2 - 43 1 b - 46 7 Recurse - 49 1 c - 52 12 Ket - 55 22 Ket - 58 54 Ket - 61 61 Ket - 64 End + 4 48 Bra 0 + 7 19 Bra 1 + 10 \x{100} + 13 10 Bra 2 + 16 b + 18 7 Recurse + 21 c + 23 10 Ket + 26 19 Ket + 29 Brazero + 30 19 Bra 1 + 33 \x{100} + 36 10 Bra 2 + 39 b + 41 7 Recurse + 44 c + 46 10 Ket + 49 19 Ket + 52 48 Ket + 55 55 Ket + 58 End ------------------------------------------------------------------ Capturing subpattern count = 2 Options: utf8 No first char No need char +/\W/8 + A.B + 0: . + A\x{100}B + 0: \x{100} + +/\w/8 + \x{100}X + 0: X + / End of testinput5 / diff -Nurp tin-1.7.6/pcre/testdata/testoutput6 tin-1.7.7/pcre/testdata/testoutput6 --- tin-1.7.6/pcre/testdata/testoutput6 1970-01-01 01:00:00.000000000 +0100 +++ tin-1.7.7/pcre/testdata/testoutput6 2004-11-15 18:44:39.000000000 +0100 @@ -0,0 +1,1013 @@ +PCRE version 5.0 13-Sep-2004 + +/^\pC\pL\pM\pN\pP\pS\pZf1 | ((node->f0 & f0_chhmask) << 16); + if (cc == d) break; + if (cc < d) + { + if ((node->f0 & f0_leftexists) == 0) return -1; + node ++; + } + else + { + register int roffset = (node->f2 & f2_rightmask) >> f2_rightshift; + if (roffset == 0) return -1; + node += 1 << (roffset - 1); + } + } + +switch ((*type_ptr = ((node->f0 & f0_typemask) >> f0_typeshift))) + { + case ucp_Cc: + case ucp_Cf: + case ucp_Cn: + case ucp_Co: + case ucp_Cs: + return ucp_C; + break; + + case ucp_Ll: + case ucp_Lu: + case_offset = node->f2 & f2_casemask; + if ((case_offset & 0x0100) != 0) case_offset |= 0xfffff000; + *case_ptr = (case_offset == 0)? 0 : cc + case_offset; + return ucp_L; + + case ucp_Lm: + case ucp_Lo: + case ucp_Lt: + *case_ptr = 0; + return ucp_L; + break; + + case ucp_Mc: + case ucp_Me: + case ucp_Mn: + return ucp_M; + break; + + case ucp_Nd: + case ucp_Nl: + case ucp_No: + return ucp_N; + break; + + case ucp_Pc: + case ucp_Pd: + case ucp_Pe: + case ucp_Pf: + case ucp_Pi: + case ucp_Ps: + case ucp_Po: + return ucp_P; + break; + + case ucp_Sc: + case ucp_Sk: + case ucp_Sm: + case ucp_So: + return ucp_S; + break; + + case ucp_Zl: + case ucp_Zp: + case ucp_Zs: + return ucp_Z; + break; + + default: /* "Should never happen" */ + return -1; + break; + } +} + +/* End of ucp.c */ diff -Nurp tin-1.7.6/pcre/ucp.h tin-1.7.7/pcre/ucp.h --- tin-1.7.6/pcre/ucp.h 1970-01-01 01:00:00.000000000 +0100 +++ tin-1.7.7/pcre/ucp.h 2004-11-15 18:44:38.000000000 +0100 @@ -0,0 +1,58 @@ +/************************************************* +* libucp - Unicode Property Table handler * +*************************************************/ + +/* These are the character categories that are returned by ucp_findchar */ + +enum { + ucp_C, /* Other */ + ucp_L, /* Letter */ + ucp_M, /* Mark */ + ucp_N, /* Number */ + ucp_P, /* Punctuation */ + ucp_S, /* Symbol */ + ucp_Z /* Separator */ +}; + +/* These are the detailed character types that are returned by ucp_findchar */ + +enum { + ucp_Cc, /* Control */ + ucp_Cf, /* Format */ + ucp_Cn, /* Unassigned */ + ucp_Co, /* Private use */ + ucp_Cs, /* Surrogate */ + ucp_Ll, /* Lower case letter */ + ucp_Lm, /* Modifier letter */ + ucp_Lo, /* Other letter */ + ucp_Lt, /* Title case letter */ + ucp_Lu, /* Upper case letter */ + ucp_Mc, /* Spacing mark */ + ucp_Me, /* Enclosing mark */ + ucp_Mn, /* Non-spacing mark */ + ucp_Nd, /* Decimal number */ + ucp_Nl, /* Letter number */ + ucp_No, /* Other number */ + ucp_Pc, /* Connector punctuation */ + ucp_Pd, /* Dash punctuation */ + ucp_Pe, /* Close punctuation */ + ucp_Pf, /* Final punctuation */ + ucp_Pi, /* Initial punctuation */ + ucp_Po, /* Other punctuation */ + ucp_Ps, /* Open punctuation */ + ucp_Sc, /* Currency symbol */ + ucp_Sk, /* Modifier symbol */ + ucp_Sm, /* Mathematical symbol */ + ucp_So, /* Other symbol */ + ucp_Zl, /* Line separator */ + ucp_Zp, /* Paragraph separator */ + ucp_Zs /* Space separator */ +}; + +/* For use in PCRE we make this function static so that there is no conflict if +PCRE is linked with an application that makes use of an external version - +assuming an external version is ever released... */ + +static int ucp_findchar(const int, int *, int *); + +/* End of ucp.h */ diff -Nurp tin-1.7.6/pcre/ucpinternal.h tin-1.7.7/pcre/ucpinternal.h --- tin-1.7.6/pcre/ucpinternal.h 1970-01-01 01:00:00.000000000 +0100 +++ tin-1.7.7/pcre/ucpinternal.h 2004-11-15 18:44:38.000000000 +0100 @@ -0,0 +1,91 @@ +/************************************************* +* libucp - Unicode Property Table handler * +*************************************************/ + +/* Internal header file defining the layout of compact nodes in the tree. */ + +typedef struct cnode { + unsigned short int f0; + unsigned short int f1; + unsigned short int f2; +} cnode; + +/* Things for the f0 field */ + +#define f0_leftexists 0x8000 /* Left child exists */ +#define f0_typemask 0x3f00 /* Type bits */ +#define f0_typeshift 8 /* Type shift */ +#define f0_chhmask 0x00ff /* Character high bits */ + +/* Things for the f2 field */ + +#define f2_rightmask 0xf000 /* Mask for right offset bits */ +#define f2_rightshift 12 /* Shift for right offset */ +#define f2_casemask 0x0fff /* Mask for case offset */ + +/* The tree consists of a vector of structures of type cnode, with the root +node as the first element. The three short ints (16-bits) are used as follows: + +(f0) (1) The 0x8000 bit of f0 is set if a left child exists. The child's node + is the next node in the vector. + (2) The 0x4000 bits of f0 is spare. + (3) The 0x3f00 bits of f0 contain the character type; this is a number + defined by the enumeration in ucp.h (e.g. ucp_Lu). + (4) The bottom 8 bits of f0 contain the most significant byte of the + character's 24-bit codepoint. + +(f1) (1) The f1 field contains the two least significant bytes of the + codepoint. + +(f2) (1) The 0xf000 bits of f2 contain zero if there is no right child of this + node. Otherwise, they contain one plus the exponent of the power of + two of the offset to the right node (e.g. a value of 3 means 8). The + units of the offset are node items. + + (2) The 0x0fff bits of f2 contain the signed offset from this character to + its alternate cased value. They are zero if there is no such + character. + + +----------------------------------------------------------------------------- +||.|.| type (6) | ms char (8) || ls char (16) ||....| case offset (12) || +----------------------------------------------------------------------------- + | | | + | |-> spare | + | exponent of right + |-> left child exists child offset + + +The upper/lower casing information is set only for characters that come in +pairs. There are (at present) four non-one-to-one mappings in the Unicode data. +These are ignored. They are: + + 1FBE Greek Prosgegrammeni (lower, with upper -> capital iota) + 2126 Ohm + 212A Kelvin + 212B Angstrom + +Certainly for the last three, having an alternate case would seem to be a +mistake. I don't know any Greek, so cannot comment on the first one. + + +When searching the tree, proceed as follows: + +(1) Start at the first node. + +(2) Extract the character value from f1 and the bottom 8 bits of f0; + +(3) Compare with the character being sought. If equal, we are done. + +(4) If the test character is smaller, inspect the f0_leftexists flag. If it is + not set, the character is not in the tree. If it is set, move to the next + node, and go to (2). + +(5) If the test character is bigger, extract the f2_rightmask bits from f2, and + shift them right by f2_rightshift. If the result is zero, the character is + not in the tree. Otherwise, calculate the number of nodes to skip by + shifting the value 1 left by this number minus one. Go to (2). +*/ + + +/* End of internal.h */ diff -Nurp tin-1.7.6/pcre/ucptable.c tin-1.7.7/pcre/ucptable.c --- tin-1.7.6/pcre/ucptable.c 1970-01-01 01:00:00.000000000 +0100 +++ tin-1.7.7/pcre/ucptable.c 2004-11-15 18:44:38.000000000 +0100 @@ -0,0 +1,15105 @@ +/* This source module is automatically generated from the Unicode +property table. See internal.h for a description of the layout. */ + +static cnode ucp_table[] = { + { 0x9a00, 0x2f1f, 0xe000 }, + { 0x8700, 0x1558, 0xd000 }, + { 0x8700, 0x0a99, 0xc000 }, + { 0x8500, 0x0435, 0xbfe0 }, + { 0x8500, 0x01ff, 0xafff }, + { 0x8500, 0x00ff, 0x9079 }, + { 0x8000, 0x007f, 0x8000 }, + { 0x9500, 0x003f, 0x7000 }, + { 0x8000, 0x001f, 0x6000 }, + { 0x8000, 0x000f, 0x5000 }, + { 0x8000, 0x0007, 0x4000 }, + { 0x8000, 0x0003, 0x3000 }, + { 0x8000, 0x0001, 0x2000 }, + { 0x0000, 0x0000, 0x0000 }, + { 0x0000, 0x0002, 0x0000 }, + { 0x8000, 0x0005, 0x2000 }, + { 0x0000, 0x0004, 0x0000 }, + { 0x0000, 0x0006, 0x0000 }, + { 0x8000, 0x000b, 0x3000 }, + { 0x8000, 0x0009, 0x2000 }, + { 0x0000, 0x0008, 0x0000 }, + { 0x0000, 0x000a, 0x0000 }, + { 0x8000, 0x000d, 0x2000 }, + { 0x0000, 0x000c, 0x0000 }, + { 0x0000, 0x000e, 0x0000 }, + { 0x8000, 0x0017, 0x4000 }, + { 0x8000, 0x0013, 0x3000 }, + { 0x8000, 0x0011, 0x2000 }, + { 0x0000, 0x0010, 0x0000 }, + { 0x0000, 0x0012, 0x0000 }, + { 0x8000, 0x0015, 0x2000 }, + { 0x0000, 0x0014, 0x0000 }, + { 0x0000, 0x0016, 0x0000 }, + { 0x8000, 0x001b, 0x3000 }, + { 0x8000, 0x0019, 0x2000 }, + { 0x0000, 0x0018, 0x0000 }, + { 0x0000, 0x001a, 0x0000 }, + { 0x8000, 0x001d, 0x2000 }, + { 0x0000, 0x001c, 0x0000 }, + { 0x0000, 0x001e, 0x0000 }, + { 0x9500, 0x002f, 0x5000 }, + { 0x9500, 0x0027, 0x4000 }, + { 0x9500, 0x0023, 0x3000 }, + { 0x9500, 0x0021, 0x2000 }, + { 0x1d00, 0x0020, 0x0000 }, + { 0x1500, 0x0022, 0x0000 }, + { 0x9500, 0x0025, 0x2000 }, + { 0x1700, 0x0024, 0x0000 }, + { 0x1500, 0x0026, 0x0000 }, + { 0x9900, 0x002b, 0x3000 }, + { 0x9200, 0x0029, 0x2000 }, + { 0x1600, 0x0028, 0x0000 }, + { 0x1500, 0x002a, 0x0000 }, + { 0x9100, 0x002d, 0x2000 }, + { 0x1500, 0x002c, 0x0000 }, + { 0x1500, 0x002e, 0x0000 }, + { 0x8d00, 0x0037, 0x4000 }, + { 0x8d00, 0x0033, 0x3000 }, + { 0x8d00, 0x0031, 0x2000 }, + { 0x0d00, 0x0030, 0x0000 }, + { 0x0d00, 0x0032, 0x0000 }, + { 0x8d00, 0x0035, 0x2000 }, + { 0x0d00, 0x0034, 0x0000 }, + { 0x0d00, 0x0036, 0x0000 }, + { 0x9500, 0x003b, 0x3000 }, + { 0x8d00, 0x0039, 0x2000 }, + { 0x0d00, 0x0038, 0x0000 }, + { 0x1500, 0x003a, 0x0000 }, + { 0x9900, 0x003d, 0x2000 }, + { 0x1900, 0x003c, 0x0000 }, + { 0x1900, 0x003e, 0x0000 }, + { 0x9000, 0x005f, 0x6000 }, + { 0x8900, 0x004f, 0x5020 }, + { 0x8900, 0x0047, 0x4020 }, + { 0x8900, 0x0043, 0x3020 }, + { 0x8900, 0x0041, 0x2020 }, + { 0x1500, 0x0040, 0x0000 }, + { 0x0900, 0x0042, 0x0020 }, + { 0x8900, 0x0045, 0x2020 }, + { 0x0900, 0x0044, 0x0020 }, + { 0x0900, 0x0046, 0x0020 }, + { 0x8900, 0x004b, 0x3020 }, + { 0x8900, 0x0049, 0x2020 }, + { 0x0900, 0x0048, 0x0020 }, + { 0x0900, 0x004a, 0x0020 }, + { 0x8900, 0x004d, 0x2020 }, + { 0x0900, 0x004c, 0x0020 }, + { 0x0900, 0x004e, 0x0020 }, + { 0x8900, 0x0057, 0x4020 }, + { 0x8900, 0x0053, 0x3020 }, + { 0x8900, 0x0051, 0x2020 }, + { 0x0900, 0x0050, 0x0020 }, + { 0x0900, 0x0052, 0x0020 }, + { 0x8900, 0x0055, 0x2020 }, + { 0x0900, 0x0054, 0x0020 }, + { 0x0900, 0x0056, 0x0020 }, + { 0x9600, 0x005b, 0x3000 }, + { 0x8900, 0x0059, 0x2020 }, + { 0x0900, 0x0058, 0x0020 }, + { 0x0900, 0x005a, 0x0020 }, + { 0x9200, 0x005d, 0x2000 }, + { 0x1500, 0x005c, 0x0000 }, + { 0x1800, 0x005e, 0x0000 }, + { 0x8500, 0x006f, 0x5fe0 }, + { 0x8500, 0x0067, 0x4fe0 }, + { 0x8500, 0x0063, 0x3fe0 }, + { 0x8500, 0x0061, 0x2fe0 }, + { 0x1800, 0x0060, 0x0000 }, + { 0x0500, 0x0062, 0x0fe0 }, + { 0x8500, 0x0065, 0x2fe0 }, + { 0x0500, 0x0064, 0x0fe0 }, + { 0x0500, 0x0066, 0x0fe0 }, + { 0x8500, 0x006b, 0x3fe0 }, + { 0x8500, 0x0069, 0x2fe0 }, + { 0x0500, 0x0068, 0x0fe0 }, + { 0x0500, 0x006a, 0x0fe0 }, + { 0x8500, 0x006d, 0x2fe0 }, + { 0x0500, 0x006c, 0x0fe0 }, + { 0x0500, 0x006e, 0x0fe0 }, + { 0x8500, 0x0077, 0x4fe0 }, + { 0x8500, 0x0073, 0x3fe0 }, + { 0x8500, 0x0071, 0x2fe0 }, + { 0x0500, 0x0070, 0x0fe0 }, + { 0x0500, 0x0072, 0x0fe0 }, + { 0x8500, 0x0075, 0x2fe0 }, + { 0x0500, 0x0074, 0x0fe0 }, + { 0x0500, 0x0076, 0x0fe0 }, + { 0x9600, 0x007b, 0x3000 }, + { 0x8500, 0x0079, 0x2fe0 }, + { 0x0500, 0x0078, 0x0fe0 }, + { 0x0500, 0x007a, 0x0fe0 }, + { 0x9200, 0x007d, 0x2000 }, + { 0x1900, 0x007c, 0x0000 }, + { 0x1900, 0x007e, 0x0000 }, + { 0x9500, 0x00bf, 0x7000 }, + { 0x8000, 0x009f, 0x6000 }, + { 0x8000, 0x008f, 0x5000 }, + { 0x8000, 0x0087, 0x4000 }, + { 0x8000, 0x0083, 0x3000 }, + { 0x8000, 0x0081, 0x2000 }, + { 0x0000, 0x0080, 0x0000 }, + { 0x0000, 0x0082, 0x0000 }, + { 0x8000, 0x0085, 0x2000 }, + { 0x0000, 0x0084, 0x0000 }, + { 0x0000, 0x0086, 0x0000 }, + { 0x8000, 0x008b, 0x3000 }, + { 0x8000, 0x0089, 0x2000 }, + { 0x0000, 0x0088, 0x0000 }, + { 0x0000, 0x008a, 0x0000 }, + { 0x8000, 0x008d, 0x2000 }, + { 0x0000, 0x008c, 0x0000 }, + { 0x0000, 0x008e, 0x0000 }, + { 0x8000, 0x0097, 0x4000 }, + { 0x8000, 0x0093, 0x3000 }, + { 0x8000, 0x0091, 0x2000 }, + { 0x0000, 0x0090, 0x0000 }, + { 0x0000, 0x0092, 0x0000 }, + { 0x8000, 0x0095, 0x2000 }, + { 0x0000, 0x0094, 0x0000 }, + { 0x0000, 0x0096, 0x0000 }, + { 0x8000, 0x009b, 0x3000 }, + { 0x8000, 0x0099, 0x2000 }, + { 0x0000, 0x0098, 0x0000 }, + { 0x0000, 0x009a, 0x0000 }, + { 0x8000, 0x009d, 0x2000 }, + { 0x0000, 0x009c, 0x0000 }, + { 0x0000, 0x009e, 0x0000 }, + { 0x9800, 0x00af, 0x5000 }, + { 0x9a00, 0x00a7, 0x4000 }, + { 0x9700, 0x00a3, 0x3000 }, + { 0x9500, 0x00a1, 0x2000 }, + { 0x1d00, 0x00a0, 0x0000 }, + { 0x1700, 0x00a2, 0x0000 }, + { 0x9700, 0x00a5, 0x2000 }, + { 0x1700, 0x00a4, 0x0000 }, + { 0x1a00, 0x00a6, 0x0000 }, + { 0x9400, 0x00ab, 0x3000 }, + { 0x9a00, 0x00a9, 0x2000 }, + { 0x1800, 0x00a8, 0x0000 }, + { 0x0500, 0x00aa, 0x0000 }, + { 0x8100, 0x00ad, 0x2000 }, + { 0x1900, 0x00ac, 0x0000 }, + { 0x1a00, 0x00ae, 0x0000 }, + { 0x9500, 0x00b7, 0x4000 }, + { 0x8f00, 0x00b3, 0x3000 }, + { 0x9900, 0x00b1, 0x2000 }, + { 0x1a00, 0x00b0, 0x0000 }, + { 0x0f00, 0x00b2, 0x0000 }, + { 0x8500, 0x00b5, 0x22e7 }, + { 0x1800, 0x00b4, 0x0000 }, + { 0x1a00, 0x00b6, 0x0000 }, + { 0x9300, 0x00bb, 0x3000 }, + { 0x8f00, 0x00b9, 0x2000 }, + { 0x1800, 0x00b8, 0x0000 }, + { 0x0500, 0x00ba, 0x0000 }, + { 0x8f00, 0x00bd, 0x2000 }, + { 0x0f00, 0x00bc, 0x0000 }, + { 0x0f00, 0x00be, 0x0000 }, + { 0x8500, 0x00df, 0x6000 }, + { 0x8900, 0x00cf, 0x5020 }, + { 0x8900, 0x00c7, 0x4020 }, + { 0x8900, 0x00c3, 0x3020 }, + { 0x8900, 0x00c1, 0x2020 }, + { 0x0900, 0x00c0, 0x0020 }, + { 0x0900, 0x00c2, 0x0020 }, + { 0x8900, 0x00c5, 0x2020 }, + { 0x0900, 0x00c4, 0x0020 }, + { 0x0900, 0x00c6, 0x0020 }, + { 0x8900, 0x00cb, 0x3020 }, + { 0x8900, 0x00c9, 0x2020 }, + { 0x0900, 0x00c8, 0x0020 }, + { 0x0900, 0x00ca, 0x0020 }, + { 0x8900, 0x00cd, 0x2020 }, + { 0x0900, 0x00cc, 0x0020 }, + { 0x0900, 0x00ce, 0x0020 }, + { 0x9900, 0x00d7, 0x4000 }, + { 0x8900, 0x00d3, 0x3020 }, + { 0x8900, 0x00d1, 0x2020 }, + { 0x0900, 0x00d0, 0x0020 }, + { 0x0900, 0x00d2, 0x0020 }, + { 0x8900, 0x00d5, 0x2020 }, + { 0x0900, 0x00d4, 0x0020 }, + { 0x0900, 0x00d6, 0x0020 }, + { 0x8900, 0x00db, 0x3020 }, + { 0x8900, 0x00d9, 0x2020 }, + { 0x0900, 0x00d8, 0x0020 }, + { 0x0900, 0x00da, 0x0020 }, + { 0x8900, 0x00dd, 0x2020 }, + { 0x0900, 0x00dc, 0x0020 }, + { 0x0900, 0x00de, 0x0020 }, + { 0x8500, 0x00ef, 0x5fe0 }, + { 0x8500, 0x00e7, 0x4fe0 }, + { 0x8500, 0x00e3, 0x3fe0 }, + { 0x8500, 0x00e1, 0x2fe0 }, + { 0x0500, 0x00e0, 0x0fe0 }, + { 0x0500, 0x00e2, 0x0fe0 }, + { 0x8500, 0x00e5, 0x2fe0 }, + { 0x0500, 0x00e4, 0x0fe0 }, + { 0x0500, 0x00e6, 0x0fe0 }, + { 0x8500, 0x00eb, 0x3fe0 }, + { 0x8500, 0x00e9, 0x2fe0 }, + { 0x0500, 0x00e8, 0x0fe0 }, + { 0x0500, 0x00ea, 0x0fe0 }, + { 0x8500, 0x00ed, 0x2fe0 }, + { 0x0500, 0x00ec, 0x0fe0 }, + { 0x0500, 0x00ee, 0x0fe0 }, + { 0x9900, 0x00f7, 0x4000 }, + { 0x8500, 0x00f3, 0x3fe0 }, + { 0x8500, 0x00f1, 0x2fe0 }, + { 0x0500, 0x00f0, 0x0fe0 }, + { 0x0500, 0x00f2, 0x0fe0 }, + { 0x8500, 0x00f5, 0x2fe0 }, + { 0x0500, 0x00f4, 0x0fe0 }, + { 0x0500, 0x00f6, 0x0fe0 }, + { 0x8500, 0x00fb, 0x3fe0 }, + { 0x8500, 0x00f9, 0x2fe0 }, + { 0x0500, 0x00f8, 0x0fe0 }, + { 0x0500, 0x00fa, 0x0fe0 }, + { 0x8500, 0x00fd, 0x2fe0 }, + { 0x0500, 0x00fc, 0x0fe0 }, + { 0x0500, 0x00fe, 0x0fe0 }, + { 0x8500, 0x017f, 0x8ed4 }, + { 0x8900, 0x013f, 0x7001 }, + { 0x8500, 0x011f, 0x6fff }, + { 0x8500, 0x010f, 0x5fff }, + { 0x8500, 0x0107, 0x4fff }, + { 0x8500, 0x0103, 0x3fff }, + { 0x8500, 0x0101, 0x2fff }, + { 0x0900, 0x0100, 0x0001 }, + { 0x0900, 0x0102, 0x0001 }, + { 0x8500, 0x0105, 0x2fff }, + { 0x0900, 0x0104, 0x0001 }, + { 0x0900, 0x0106, 0x0001 }, + { 0x8500, 0x010b, 0x3fff }, + { 0x8500, 0x0109, 0x2fff }, + { 0x0900, 0x0108, 0x0001 }, + { 0x0900, 0x010a, 0x0001 }, + { 0x8500, 0x010d, 0x2fff }, + { 0x0900, 0x010c, 0x0001 }, + { 0x0900, 0x010e, 0x0001 }, + { 0x8500, 0x0117, 0x4fff }, + { 0x8500, 0x0113, 0x3fff }, + { 0x8500, 0x0111, 0x2fff }, + { 0x0900, 0x0110, 0x0001 }, + { 0x0900, 0x0112, 0x0001 }, + { 0x8500, 0x0115, 0x2fff }, + { 0x0900, 0x0114, 0x0001 }, + { 0x0900, 0x0116, 0x0001 }, + { 0x8500, 0x011b, 0x3fff }, + { 0x8500, 0x0119, 0x2fff }, + { 0x0900, 0x0118, 0x0001 }, + { 0x0900, 0x011a, 0x0001 }, + { 0x8500, 0x011d, 0x2fff }, + { 0x0900, 0x011c, 0x0001 }, + { 0x0900, 0x011e, 0x0001 }, + { 0x8500, 0x012f, 0x5fff }, + { 0x8500, 0x0127, 0x4fff }, + { 0x8500, 0x0123, 0x3fff }, + { 0x8500, 0x0121, 0x2fff }, + { 0x0900, 0x0120, 0x0001 }, + { 0x0900, 0x0122, 0x0001 }, + { 0x8500, 0x0125, 0x2fff }, + { 0x0900, 0x0124, 0x0001 }, + { 0x0900, 0x0126, 0x0001 }, + { 0x8500, 0x012b, 0x3fff }, + { 0x8500, 0x0129, 0x2fff }, + { 0x0900, 0x0128, 0x0001 }, + { 0x0900, 0x012a, 0x0001 }, + { 0x8500, 0x012d, 0x2fff }, + { 0x0900, 0x012c, 0x0001 }, + { 0x0900, 0x012e, 0x0001 }, + { 0x8500, 0x0137, 0x4fff }, + { 0x8500, 0x0133, 0x3fff }, + { 0x8500, 0x0131, 0x2f18 }, + { 0x0900, 0x0130, 0x0f39 }, + { 0x0900, 0x0132, 0x0001 }, + { 0x8500, 0x0135, 0x2fff }, + { 0x0900, 0x0134, 0x0001 }, + { 0x0900, 0x0136, 0x0001 }, + { 0x8900, 0x013b, 0x3001 }, + { 0x8900, 0x0139, 0x2001 }, + { 0x0500, 0x0138, 0x0000 }, + { 0x0500, 0x013a, 0x0fff }, + { 0x8900, 0x013d, 0x2001 }, + { 0x0500, 0x013c, 0x0fff }, + { 0x0500, 0x013e, 0x0fff }, + { 0x8500, 0x015f, 0x6fff }, + { 0x8500, 0x014f, 0x5fff }, + { 0x8900, 0x0147, 0x4001 }, + { 0x8900, 0x0143, 0x3001 }, + { 0x8900, 0x0141, 0x2001 }, + { 0x0500, 0x0140, 0x0fff }, + { 0x0500, 0x0142, 0x0fff }, + { 0x8900, 0x0145, 0x2001 }, + { 0x0500, 0x0144, 0x0fff }, + { 0x0500, 0x0146, 0x0fff }, + { 0x8500, 0x014b, 0x3fff }, + { 0x8500, 0x0149, 0x2000 }, + { 0x0500, 0x0148, 0x0fff }, + { 0x0900, 0x014a, 0x0001 }, + { 0x8500, 0x014d, 0x2fff }, + { 0x0900, 0x014c, 0x0001 }, + { 0x0900, 0x014e, 0x0001 }, + { 0x8500, 0x0157, 0x4fff }, + { 0x8500, 0x0153, 0x3fff }, + { 0x8500, 0x0151, 0x2fff }, + { 0x0900, 0x0150, 0x0001 }, + { 0x0900, 0x0152, 0x0001 }, + { 0x8500, 0x0155, 0x2fff }, + { 0x0900, 0x0154, 0x0001 }, + { 0x0900, 0x0156, 0x0001 }, + { 0x8500, 0x015b, 0x3fff }, + { 0x8500, 0x0159, 0x2fff }, + { 0x0900, 0x0158, 0x0001 }, + { 0x0900, 0x015a, 0x0001 }, + { 0x8500, 0x015d, 0x2fff }, + { 0x0900, 0x015c, 0x0001 }, + { 0x0900, 0x015e, 0x0001 }, + { 0x8500, 0x016f, 0x5fff }, + { 0x8500, 0x0167, 0x4fff }, + { 0x8500, 0x0163, 0x3fff }, + { 0x8500, 0x0161, 0x2fff }, + { 0x0900, 0x0160, 0x0001 }, + { 0x0900, 0x0162, 0x0001 }, + { 0x8500, 0x0165, 0x2fff }, + { 0x0900, 0x0164, 0x0001 }, + { 0x0900, 0x0166, 0x0001 }, + { 0x8500, 0x016b, 0x3fff }, + { 0x8500, 0x0169, 0x2fff }, + { 0x0900, 0x0168, 0x0001 }, + { 0x0900, 0x016a, 0x0001 }, + { 0x8500, 0x016d, 0x2fff }, + { 0x0900, 0x016c, 0x0001 }, + { 0x0900, 0x016e, 0x0001 }, + { 0x8500, 0x0177, 0x4fff }, + { 0x8500, 0x0173, 0x3fff }, + { 0x8500, 0x0171, 0x2fff }, + { 0x0900, 0x0170, 0x0001 }, + { 0x0900, 0x0172, 0x0001 }, + { 0x8500, 0x0175, 0x2fff }, + { 0x0900, 0x0174, 0x0001 }, + { 0x0900, 0x0176, 0x0001 }, + { 0x8900, 0x017b, 0x3001 }, + { 0x8900, 0x0179, 0x2001 }, + { 0x0900, 0x0178, 0x0f87 }, + { 0x0500, 0x017a, 0x0fff }, + { 0x8900, 0x017d, 0x2001 }, + { 0x0500, 0x017c, 0x0fff }, + { 0x0500, 0x017e, 0x0fff }, + { 0x8500, 0x01bf, 0x7038 }, + { 0x8900, 0x019f, 0x60d6 }, + { 0x8900, 0x018f, 0x50ca }, + { 0x8900, 0x0187, 0x4001 }, + { 0x8500, 0x0183, 0x3fff }, + { 0x8900, 0x0181, 0x20d2 }, + { 0x0500, 0x0180, 0x0000 }, + { 0x0900, 0x0182, 0x0001 }, + { 0x8500, 0x0185, 0x2fff }, + { 0x0900, 0x0184, 0x0001 }, + { 0x0900, 0x0186, 0x00ce }, + { 0x8900, 0x018b, 0x3001 }, + { 0x8900, 0x0189, 0x20cd }, + { 0x0500, 0x0188, 0x0fff }, + { 0x0900, 0x018a, 0x00cd }, + { 0x8500, 0x018d, 0x2000 }, + { 0x0500, 0x018c, 0x0fff }, + { 0x0900, 0x018e, 0x004f }, + { 0x8900, 0x0197, 0x40d1 }, + { 0x8900, 0x0193, 0x30cd }, + { 0x8900, 0x0191, 0x2001 }, + { 0x0900, 0x0190, 0x00cb }, + { 0x0500, 0x0192, 0x0fff }, + { 0x8500, 0x0195, 0x2061 }, + { 0x0900, 0x0194, 0x00cf }, + { 0x0900, 0x0196, 0x00d3 }, + { 0x8500, 0x019b, 0x3000 }, + { 0x8500, 0x0199, 0x2fff }, + { 0x0900, 0x0198, 0x0001 }, + { 0x0500, 0x019a, 0x0000 }, + { 0x8900, 0x019d, 0x20d5 }, + { 0x0900, 0x019c, 0x00d3 }, + { 0x0500, 0x019e, 0x0082 }, + { 0x8900, 0x01af, 0x5001 }, + { 0x8900, 0x01a7, 0x4001 }, + { 0x8500, 0x01a3, 0x3fff }, + { 0x8500, 0x01a1, 0x2fff }, + { 0x0900, 0x01a0, 0x0001 }, + { 0x0900, 0x01a2, 0x0001 }, + { 0x8500, 0x01a5, 0x2fff }, + { 0x0900, 0x01a4, 0x0001 }, + { 0x0900, 0x01a6, 0x00da }, + { 0x8500, 0x01ab, 0x3000 }, + { 0x8900, 0x01a9, 0x20da }, + { 0x0500, 0x01a8, 0x0fff }, + { 0x0500, 0x01aa, 0x0000 }, + { 0x8500, 0x01ad, 0x2fff }, + { 0x0900, 0x01ac, 0x0001 }, + { 0x0900, 0x01ae, 0x00da }, + { 0x8900, 0x01b7, 0x40db }, + { 0x8900, 0x01b3, 0x3001 }, + { 0x8900, 0x01b1, 0x20d9 }, + { 0x0500, 0x01b0, 0x0fff }, + { 0x0900, 0x01b2, 0x00d9 }, + { 0x8900, 0x01b5, 0x2001 }, + { 0x0500, 0x01b4, 0x0fff }, + { 0x0500, 0x01b6, 0x0fff }, + { 0x8700, 0x01bb, 0x3000 }, + { 0x8500, 0x01b9, 0x2fff }, + { 0x0900, 0x01b8, 0x0001 }, + { 0x0500, 0x01ba, 0x0000 }, + { 0x8500, 0x01bd, 0x2fff }, + { 0x0900, 0x01bc, 0x0001 }, + { 0x0500, 0x01be, 0x0000 }, + { 0x8500, 0x01df, 0x6fff }, + { 0x8900, 0x01cf, 0x5001 }, + { 0x8900, 0x01c7, 0x4002 }, + { 0x8700, 0x01c3, 0x3000 }, + { 0x8700, 0x01c1, 0x2000 }, + { 0x0700, 0x01c0, 0x0000 }, + { 0x0700, 0x01c2, 0x0000 }, + { 0x8800, 0x01c5, 0x2000 }, + { 0x0900, 0x01c4, 0x0002 }, + { 0x0500, 0x01c6, 0x0ffe }, + { 0x8800, 0x01cb, 0x3000 }, + { 0x8500, 0x01c9, 0x2ffe }, + { 0x0800, 0x01c8, 0x0000 }, + { 0x0900, 0x01ca, 0x0002 }, + { 0x8900, 0x01cd, 0x2001 }, + { 0x0500, 0x01cc, 0x0ffe }, + { 0x0500, 0x01ce, 0x0fff }, + { 0x8900, 0x01d7, 0x4001 }, + { 0x8900, 0x01d3, 0x3001 }, + { 0x8900, 0x01d1, 0x2001 }, + { 0x0500, 0x01d0, 0x0fff }, + { 0x0500, 0x01d2, 0x0fff }, + { 0x8900, 0x01d5, 0x2001 }, + { 0x0500, 0x01d4, 0x0fff }, + { 0x0500, 0x01d6, 0x0fff }, + { 0x8900, 0x01db, 0x3001 }, + { 0x8900, 0x01d9, 0x2001 }, + { 0x0500, 0x01d8, 0x0fff }, + { 0x0500, 0x01da, 0x0fff }, + { 0x8500, 0x01dd, 0x2fb1 }, + { 0x0500, 0x01dc, 0x0fff }, + { 0x0900, 0x01de, 0x0001 }, + { 0x8500, 0x01ef, 0x5fff }, + { 0x8500, 0x01e7, 0x4fff }, + { 0x8500, 0x01e3, 0x3fff }, + { 0x8500, 0x01e1, 0x2fff }, + { 0x0900, 0x01e0, 0x0001 }, + { 0x0900, 0x01e2, 0x0001 }, + { 0x8500, 0x01e5, 0x2fff }, + { 0x0900, 0x01e4, 0x0001 }, + { 0x0900, 0x01e6, 0x0001 }, + { 0x8500, 0x01eb, 0x3fff }, + { 0x8500, 0x01e9, 0x2fff }, + { 0x0900, 0x01e8, 0x0001 }, + { 0x0900, 0x01ea, 0x0001 }, + { 0x8500, 0x01ed, 0x2fff }, + { 0x0900, 0x01ec, 0x0001 }, + { 0x0900, 0x01ee, 0x0001 }, + { 0x8900, 0x01f7, 0x4fc8 }, + { 0x8500, 0x01f3, 0x3ffe }, + { 0x8900, 0x01f1, 0x2002 }, + { 0x0500, 0x01f0, 0x0000 }, + { 0x0800, 0x01f2, 0x0000 }, + { 0x8500, 0x01f5, 0x2fff }, + { 0x0900, 0x01f4, 0x0001 }, + { 0x0900, 0x01f6, 0x0f9f }, + { 0x8500, 0x01fb, 0x3fff }, + { 0x8500, 0x01f9, 0x2fff }, + { 0x0900, 0x01f8, 0x0001 }, + { 0x0900, 0x01fa, 0x0001 }, + { 0x8500, 0x01fd, 0x2fff }, + { 0x0900, 0x01fc, 0x0001 }, + { 0x0900, 0x01fe, 0x0001 }, + { 0x8c00, 0x0318, 0x9000 }, + { 0x8500, 0x0298, 0x8000 }, + { 0x8500, 0x0258, 0x7000 }, + { 0x8500, 0x021f, 0x6fff }, + { 0x8500, 0x020f, 0x5fff }, + { 0x8500, 0x0207, 0x4fff }, + { 0x8500, 0x0203, 0x3fff }, + { 0x8500, 0x0201, 0x2fff }, + { 0x0900, 0x0200, 0x0001 }, + { 0x0900, 0x0202, 0x0001 }, + { 0x8500, 0x0205, 0x2fff }, + { 0x0900, 0x0204, 0x0001 }, + { 0x0900, 0x0206, 0x0001 }, + { 0x8500, 0x020b, 0x3fff }, + { 0x8500, 0x0209, 0x2fff }, + { 0x0900, 0x0208, 0x0001 }, + { 0x0900, 0x020a, 0x0001 }, + { 0x8500, 0x020d, 0x2fff }, + { 0x0900, 0x020c, 0x0001 }, + { 0x0900, 0x020e, 0x0001 }, + { 0x8500, 0x0217, 0x4fff }, + { 0x8500, 0x0213, 0x3fff }, + { 0x8500, 0x0211, 0x2fff }, + { 0x0900, 0x0210, 0x0001 }, + { 0x0900, 0x0212, 0x0001 }, + { 0x8500, 0x0215, 0x2fff }, + { 0x0900, 0x0214, 0x0001 }, + { 0x0900, 0x0216, 0x0001 }, + { 0x8500, 0x021b, 0x3fff }, + { 0x8500, 0x0219, 0x2fff }, + { 0x0900, 0x0218, 0x0001 }, + { 0x0900, 0x021a, 0x0001 }, + { 0x8500, 0x021d, 0x2fff }, + { 0x0900, 0x021c, 0x0001 }, + { 0x0900, 0x021e, 0x0001 }, + { 0x8500, 0x022f, 0x5fff }, + { 0x8500, 0x0227, 0x4fff }, + { 0x8500, 0x0223, 0x3fff }, + { 0x8500, 0x0221, 0x2000 }, + { 0x0900, 0x0220, 0x0f7e }, + { 0x0900, 0x0222, 0x0001 }, + { 0x8500, 0x0225, 0x2fff }, + { 0x0900, 0x0224, 0x0001 }, + { 0x0900, 0x0226, 0x0001 }, + { 0x8500, 0x022b, 0x3fff }, + { 0x8500, 0x0229, 0x2fff }, + { 0x0900, 0x0228, 0x0001 }, + { 0x0900, 0x022a, 0x0001 }, + { 0x8500, 0x022d, 0x2fff }, + { 0x0900, 0x022c, 0x0001 }, + { 0x0900, 0x022e, 0x0001 }, + { 0x8500, 0x0250, 0x4000 }, + { 0x8500, 0x0233, 0x3fff }, + { 0x8500, 0x0231, 0x2fff }, + { 0x0900, 0x0230, 0x0001 }, + { 0x0900, 0x0232, 0x0001 }, + { 0x8500, 0x0235, 0x2000 }, + { 0x0500, 0x0234, 0x0000 }, + { 0x0500, 0x0236, 0x0000 }, + { 0x8500, 0x0254, 0x3f32 }, + { 0x8500, 0x0252, 0x2000 }, + { 0x0500, 0x0251, 0x0000 }, + { 0x0500, 0x0253, 0x0f2e }, + { 0x8500, 0x0256, 0x2f33 }, + { 0x0500, 0x0255, 0x0000 }, + { 0x0500, 0x0257, 0x0f33 }, + { 0x8500, 0x0278, 0x6000 }, + { 0x8500, 0x0268, 0x5f2f }, + { 0x8500, 0x0260, 0x4f33 }, + { 0x8500, 0x025c, 0x3000 }, + { 0x8500, 0x025a, 0x2000 }, + { 0x0500, 0x0259, 0x0f36 }, + { 0x0500, 0x025b, 0x0f35 }, + { 0x8500, 0x025e, 0x2000 }, + { 0x0500, 0x025d, 0x0000 }, + { 0x0500, 0x025f, 0x0000 }, + { 0x8500, 0x0264, 0x3000 }, + { 0x8500, 0x0262, 0x2000 }, + { 0x0500, 0x0261, 0x0000 }, + { 0x0500, 0x0263, 0x0f31 }, + { 0x8500, 0x0266, 0x2000 }, + { 0x0500, 0x0265, 0x0000 }, + { 0x0500, 0x0267, 0x0000 }, + { 0x8500, 0x0270, 0x4000 }, + { 0x8500, 0x026c, 0x3000 }, + { 0x8500, 0x026a, 0x2000 }, + { 0x0500, 0x0269, 0x0f2d }, + { 0x0500, 0x026b, 0x0000 }, + { 0x8500, 0x026e, 0x2000 }, + { 0x0500, 0x026d, 0x0000 }, + { 0x0500, 0x026f, 0x0f2d }, + { 0x8500, 0x0274, 0x3000 }, + { 0x8500, 0x0272, 0x2f2b }, + { 0x0500, 0x0271, 0x0000 }, + { 0x0500, 0x0273, 0x0000 }, + { 0x8500, 0x0276, 0x2000 }, + { 0x0500, 0x0275, 0x0f2a }, + { 0x0500, 0x0277, 0x0000 }, + { 0x8500, 0x0288, 0x5f26 }, + { 0x8500, 0x0280, 0x4f26 }, + { 0x8500, 0x027c, 0x3000 }, + { 0x8500, 0x027a, 0x2000 }, + { 0x0500, 0x0279, 0x0000 }, + { 0x0500, 0x027b, 0x0000 }, + { 0x8500, 0x027e, 0x2000 }, + { 0x0500, 0x027d, 0x0000 }, + { 0x0500, 0x027f, 0x0000 }, + { 0x8500, 0x0284, 0x3000 }, + { 0x8500, 0x0282, 0x2000 }, + { 0x0500, 0x0281, 0x0000 }, + { 0x0500, 0x0283, 0x0f26 }, + { 0x8500, 0x0286, 0x2000 }, + { 0x0500, 0x0285, 0x0000 }, + { 0x0500, 0x0287, 0x0000 }, + { 0x8500, 0x0290, 0x4000 }, + { 0x8500, 0x028c, 0x3000 }, + { 0x8500, 0x028a, 0x2f27 }, + { 0x0500, 0x0289, 0x0000 }, + { 0x0500, 0x028b, 0x0f27 }, + { 0x8500, 0x028e, 0x2000 }, + { 0x0500, 0x028d, 0x0000 }, + { 0x0500, 0x028f, 0x0000 }, + { 0x8500, 0x0294, 0x3000 }, + { 0x8500, 0x0292, 0x2f25 }, + { 0x0500, 0x0291, 0x0000 }, + { 0x0500, 0x0293, 0x0000 }, + { 0x8500, 0x0296, 0x2000 }, + { 0x0500, 0x0295, 0x0000 }, + { 0x0500, 0x0297, 0x0000 }, + { 0x9800, 0x02d8, 0x7000 }, + { 0x8600, 0x02b8, 0x6000 }, + { 0x8500, 0x02a8, 0x5000 }, + { 0x8500, 0x02a0, 0x4000 }, + { 0x8500, 0x029c, 0x3000 }, + { 0x8500, 0x029a, 0x2000 }, + { 0x0500, 0x0299, 0x0000 }, + { 0x0500, 0x029b, 0x0000 }, + { 0x8500, 0x029e, 0x2000 }, + { 0x0500, 0x029d, 0x0000 }, + { 0x0500, 0x029f, 0x0000 }, + { 0x8500, 0x02a4, 0x3000 }, + { 0x8500, 0x02a2, 0x2000 }, + { 0x0500, 0x02a1, 0x0000 }, + { 0x0500, 0x02a3, 0x0000 }, + { 0x8500, 0x02a6, 0x2000 }, + { 0x0500, 0x02a5, 0x0000 }, + { 0x0500, 0x02a7, 0x0000 }, + { 0x8600, 0x02b0, 0x4000 }, + { 0x8500, 0x02ac, 0x3000 }, + { 0x8500, 0x02aa, 0x2000 }, + { 0x0500, 0x02a9, 0x0000 }, + { 0x0500, 0x02ab, 0x0000 }, + { 0x8500, 0x02ae, 0x2000 }, + { 0x0500, 0x02ad, 0x0000 }, + { 0x0500, 0x02af, 0x0000 }, + { 0x8600, 0x02b4, 0x3000 }, + { 0x8600, 0x02b2, 0x2000 }, + { 0x0600, 0x02b1, 0x0000 }, + { 0x0600, 0x02b3, 0x0000 }, + { 0x8600, 0x02b6, 0x2000 }, + { 0x0600, 0x02b5, 0x0000 }, + { 0x0600, 0x02b7, 0x0000 }, + { 0x8600, 0x02c8, 0x5000 }, + { 0x8600, 0x02c0, 0x4000 }, + { 0x8600, 0x02bc, 0x3000 }, + { 0x8600, 0x02ba, 0x2000 }, + { 0x0600, 0x02b9, 0x0000 }, + { 0x0600, 0x02bb, 0x0000 }, + { 0x8600, 0x02be, 0x2000 }, + { 0x0600, 0x02bd, 0x0000 }, + { 0x0600, 0x02bf, 0x0000 }, + { 0x9800, 0x02c4, 0x3000 }, + { 0x9800, 0x02c2, 0x2000 }, + { 0x0600, 0x02c1, 0x0000 }, + { 0x1800, 0x02c3, 0x0000 }, + { 0x8600, 0x02c6, 0x2000 }, + { 0x1800, 0x02c5, 0x0000 }, + { 0x0600, 0x02c7, 0x0000 }, + { 0x8600, 0x02d0, 0x4000 }, + { 0x8600, 0x02cc, 0x3000 }, + { 0x8600, 0x02ca, 0x2000 }, + { 0x0600, 0x02c9, 0x0000 }, + { 0x0600, 0x02cb, 0x0000 }, + { 0x8600, 0x02ce, 0x2000 }, + { 0x0600, 0x02cd, 0x0000 }, + { 0x0600, 0x02cf, 0x0000 }, + { 0x9800, 0x02d4, 0x3000 }, + { 0x9800, 0x02d2, 0x2000 }, + { 0x0600, 0x02d1, 0x0000 }, + { 0x1800, 0x02d3, 0x0000 }, + { 0x9800, 0x02d6, 0x2000 }, + { 0x1800, 0x02d5, 0x0000 }, + { 0x1800, 0x02d7, 0x0000 }, + { 0x9800, 0x02f8, 0x6000 }, + { 0x9800, 0x02e8, 0x5000 }, + { 0x8600, 0x02e0, 0x4000 }, + { 0x9800, 0x02dc, 0x3000 }, + { 0x9800, 0x02da, 0x2000 }, + { 0x1800, 0x02d9, 0x0000 }, + { 0x1800, 0x02db, 0x0000 }, + { 0x9800, 0x02de, 0x2000 }, + { 0x1800, 0x02dd, 0x0000 }, + { 0x1800, 0x02df, 0x0000 }, + { 0x8600, 0x02e4, 0x3000 }, + { 0x8600, 0x02e2, 0x2000 }, + { 0x0600, 0x02e1, 0x0000 }, + { 0x0600, 0x02e3, 0x0000 }, + { 0x9800, 0x02e6, 0x2000 }, + { 0x1800, 0x02e5, 0x0000 }, + { 0x1800, 0x02e7, 0x0000 }, + { 0x9800, 0x02f0, 0x4000 }, + { 0x9800, 0x02ec, 0x3000 }, + { 0x9800, 0x02ea, 0x2000 }, + { 0x1800, 0x02e9, 0x0000 }, + { 0x1800, 0x02eb, 0x0000 }, + { 0x8600, 0x02ee, 0x2000 }, + { 0x1800, 0x02ed, 0x0000 }, + { 0x1800, 0x02ef, 0x0000 }, + { 0x9800, 0x02f4, 0x3000 }, + { 0x9800, 0x02f2, 0x2000 }, + { 0x1800, 0x02f1, 0x0000 }, + { 0x1800, 0x02f3, 0x0000 }, + { 0x9800, 0x02f6, 0x2000 }, + { 0x1800, 0x02f5, 0x0000 }, + { 0x1800, 0x02f7, 0x0000 }, + { 0x8c00, 0x0308, 0x5000 }, + { 0x8c00, 0x0300, 0x4000 }, + { 0x9800, 0x02fc, 0x3000 }, + { 0x9800, 0x02fa, 0x2000 }, + { 0x1800, 0x02f9, 0x0000 }, + { 0x1800, 0x02fb, 0x0000 }, + { 0x9800, 0x02fe, 0x2000 }, + { 0x1800, 0x02fd, 0x0000 }, + { 0x1800, 0x02ff, 0x0000 }, + { 0x8c00, 0x0304, 0x3000 }, + { 0x8c00, 0x0302, 0x2000 }, + { 0x0c00, 0x0301, 0x0000 }, + { 0x0c00, 0x0303, 0x0000 }, + { 0x8c00, 0x0306, 0x2000 }, + { 0x0c00, 0x0305, 0x0000 }, + { 0x0c00, 0x0307, 0x0000 }, + { 0x8c00, 0x0310, 0x4000 }, + { 0x8c00, 0x030c, 0x3000 }, + { 0x8c00, 0x030a, 0x2000 }, + { 0x0c00, 0x0309, 0x0000 }, + { 0x0c00, 0x030b, 0x0000 }, + { 0x8c00, 0x030e, 0x2000 }, + { 0x0c00, 0x030d, 0x0000 }, + { 0x0c00, 0x030f, 0x0000 }, + { 0x8c00, 0x0314, 0x3000 }, + { 0x8c00, 0x0312, 0x2000 }, + { 0x0c00, 0x0311, 0x0000 }, + { 0x0c00, 0x0313, 0x0000 }, + { 0x8c00, 0x0316, 0x2000 }, + { 0x0c00, 0x0315, 0x0000 }, + { 0x0c00, 0x0317, 0x0000 }, + { 0x8500, 0x03b0, 0x8000 }, + { 0x8c00, 0x035d, 0x7000 }, + { 0x8c00, 0x0338, 0x6000 }, + { 0x8c00, 0x0328, 0x5000 }, + { 0x8c00, 0x0320, 0x4000 }, + { 0x8c00, 0x031c, 0x3000 }, + { 0x8c00, 0x031a, 0x2000 }, + { 0x0c00, 0x0319, 0x0000 }, + { 0x0c00, 0x031b, 0x0000 }, + { 0x8c00, 0x031e, 0x2000 }, + { 0x0c00, 0x031d, 0x0000 }, + { 0x0c00, 0x031f, 0x0000 }, + { 0x8c00, 0x0324, 0x3000 }, + { 0x8c00, 0x0322, 0x2000 }, + { 0x0c00, 0x0321, 0x0000 }, + { 0x0c00, 0x0323, 0x0000 }, + { 0x8c00, 0x0326, 0x2000 }, + { 0x0c00, 0x0325, 0x0000 }, + { 0x0c00, 0x0327, 0x0000 }, + { 0x8c00, 0x0330, 0x4000 }, + { 0x8c00, 0x032c, 0x3000 }, + { 0x8c00, 0x032a, 0x2000 }, + { 0x0c00, 0x0329, 0x0000 }, + { 0x0c00, 0x032b, 0x0000 }, + { 0x8c00, 0x032e, 0x2000 }, + { 0x0c00, 0x032d, 0x0000 }, + { 0x0c00, 0x032f, 0x0000 }, + { 0x8c00, 0x0334, 0x3000 }, + { 0x8c00, 0x0332, 0x2000 }, + { 0x0c00, 0x0331, 0x0000 }, + { 0x0c00, 0x0333, 0x0000 }, + { 0x8c00, 0x0336, 0x2000 }, + { 0x0c00, 0x0335, 0x0000 }, + { 0x0c00, 0x0337, 0x0000 }, + { 0x8c00, 0x0348, 0x5000 }, + { 0x8c00, 0x0340, 0x4000 }, + { 0x8c00, 0x033c, 0x3000 }, + { 0x8c00, 0x033a, 0x2000 }, + { 0x0c00, 0x0339, 0x0000 }, + { 0x0c00, 0x033b, 0x0000 }, + { 0x8c00, 0x033e, 0x2000 }, + { 0x0c00, 0x033d, 0x0000 }, + { 0x0c00, 0x033f, 0x0000 }, + { 0x8c00, 0x0344, 0x3000 }, + { 0x8c00, 0x0342, 0x2000 }, + { 0x0c00, 0x0341, 0x0000 }, + { 0x0c00, 0x0343, 0x0000 }, + { 0x8c00, 0x0346, 0x2000 }, + { 0x0c00, 0x0345, 0x0000 }, + { 0x0c00, 0x0347, 0x0000 }, + { 0x8c00, 0x0350, 0x4000 }, + { 0x8c00, 0x034c, 0x3000 }, + { 0x8c00, 0x034a, 0x2000 }, + { 0x0c00, 0x0349, 0x0000 }, + { 0x0c00, 0x034b, 0x0000 }, + { 0x8c00, 0x034e, 0x2000 }, + { 0x0c00, 0x034d, 0x0000 }, + { 0x0c00, 0x034f, 0x0000 }, + { 0x8c00, 0x0354, 0x3000 }, + { 0x8c00, 0x0352, 0x2000 }, + { 0x0c00, 0x0351, 0x0000 }, + { 0x0c00, 0x0353, 0x0000 }, + { 0x8c00, 0x0356, 0x2000 }, + { 0x0c00, 0x0355, 0x0000 }, + { 0x0c00, 0x0357, 0x0000 }, + { 0x8900, 0x038f, 0x603f }, + { 0x8c00, 0x036d, 0x5000 }, + { 0x8c00, 0x0365, 0x4000 }, + { 0x8c00, 0x0361, 0x3000 }, + { 0x8c00, 0x035f, 0x2000 }, + { 0x0c00, 0x035e, 0x0000 }, + { 0x0c00, 0x0360, 0x0000 }, + { 0x8c00, 0x0363, 0x2000 }, + { 0x0c00, 0x0362, 0x0000 }, + { 0x0c00, 0x0364, 0x0000 }, + { 0x8c00, 0x0369, 0x3000 }, + { 0x8c00, 0x0367, 0x2000 }, + { 0x0c00, 0x0366, 0x0000 }, + { 0x0c00, 0x0368, 0x0000 }, + { 0x8c00, 0x036b, 0x2000 }, + { 0x0c00, 0x036a, 0x0000 }, + { 0x0c00, 0x036c, 0x0000 }, + { 0x9800, 0x0385, 0x4000 }, + { 0x9800, 0x0375, 0x3000 }, + { 0x8c00, 0x036f, 0x2000 }, + { 0x0c00, 0x036e, 0x0000 }, + { 0x1800, 0x0374, 0x0000 }, + { 0x9500, 0x037e, 0x2000 }, + { 0x0600, 0x037a, 0x0000 }, + { 0x1800, 0x0384, 0x0000 }, + { 0x8900, 0x0389, 0x3025 }, + { 0x9500, 0x0387, 0x2000 }, + { 0x0900, 0x0386, 0x0026 }, + { 0x0900, 0x0388, 0x0025 }, + { 0x8900, 0x038c, 0x2040 }, + { 0x0900, 0x038a, 0x0025 }, + { 0x0900, 0x038e, 0x003f }, + { 0x8900, 0x039f, 0x5020 }, + { 0x8900, 0x0397, 0x4020 }, + { 0x8900, 0x0393, 0x3020 }, + { 0x8900, 0x0391, 0x2020 }, + { 0x0500, 0x0390, 0x0000 }, + { 0x0900, 0x0392, 0x0020 }, + { 0x8900, 0x0395, 0x2020 }, + { 0x0900, 0x0394, 0x0020 }, + { 0x0900, 0x0396, 0x0020 }, + { 0x8900, 0x039b, 0x3020 }, + { 0x8900, 0x0399, 0x2020 }, + { 0x0900, 0x0398, 0x0020 }, + { 0x0900, 0x039a, 0x0020 }, + { 0x8900, 0x039d, 0x2020 }, + { 0x0900, 0x039c, 0x0020 }, + { 0x0900, 0x039e, 0x0020 }, + { 0x8900, 0x03a8, 0x4020 }, + { 0x8900, 0x03a4, 0x3020 }, + { 0x8900, 0x03a1, 0x2020 }, + { 0x0900, 0x03a0, 0x0020 }, + { 0x0900, 0x03a3, 0x0020 }, + { 0x8900, 0x03a6, 0x2020 }, + { 0x0900, 0x03a5, 0x0020 }, + { 0x0900, 0x03a7, 0x0020 }, + { 0x8500, 0x03ac, 0x3fda }, + { 0x8900, 0x03aa, 0x2020 }, + { 0x0900, 0x03a9, 0x0020 }, + { 0x0900, 0x03ab, 0x0020 }, + { 0x8500, 0x03ae, 0x2fdb }, + { 0x0500, 0x03ad, 0x0fdb }, + { 0x0500, 0x03af, 0x0fdb }, + { 0x8500, 0x03f1, 0x7fb0 }, + { 0x8500, 0x03d1, 0x6fc7 }, + { 0x8500, 0x03c0, 0x5fe0 }, + { 0x8500, 0x03b8, 0x4fe0 }, + { 0x8500, 0x03b4, 0x3fe0 }, + { 0x8500, 0x03b2, 0x2fe0 }, + { 0x0500, 0x03b1, 0x0fe0 }, + { 0x0500, 0x03b3, 0x0fe0 }, + { 0x8500, 0x03b6, 0x2fe0 }, + { 0x0500, 0x03b5, 0x0fe0 }, + { 0x0500, 0x03b7, 0x0fe0 }, + { 0x8500, 0x03bc, 0x3fe0 }, + { 0x8500, 0x03ba, 0x2fe0 }, + { 0x0500, 0x03b9, 0x0fe0 }, + { 0x0500, 0x03bb, 0x0fe0 }, + { 0x8500, 0x03be, 0x2fe0 }, + { 0x0500, 0x03bd, 0x0fe0 }, + { 0x0500, 0x03bf, 0x0fe0 }, + { 0x8500, 0x03c8, 0x4fe0 }, + { 0x8500, 0x03c4, 0x3fe0 }, + { 0x8500, 0x03c2, 0x2fe1 }, + { 0x0500, 0x03c1, 0x0fe0 }, + { 0x0500, 0x03c3, 0x0fe0 }, + { 0x8500, 0x03c6, 0x2fe0 }, + { 0x0500, 0x03c5, 0x0fe0 }, + { 0x0500, 0x03c7, 0x0fe0 }, + { 0x8500, 0x03cc, 0x3fc0 }, + { 0x8500, 0x03ca, 0x2fe0 }, + { 0x0500, 0x03c9, 0x0fe0 }, + { 0x0500, 0x03cb, 0x0fe0 }, + { 0x8500, 0x03ce, 0x2fc1 }, + { 0x0500, 0x03cd, 0x0fc1 }, + { 0x0500, 0x03d0, 0x0fc2 }, + { 0x8500, 0x03e1, 0x5fff }, + { 0x8500, 0x03d9, 0x4fff }, + { 0x8500, 0x03d5, 0x3fd1 }, + { 0x8900, 0x03d3, 0x2000 }, + { 0x0900, 0x03d2, 0x0000 }, + { 0x0900, 0x03d4, 0x0000 }, + { 0x8500, 0x03d7, 0x2000 }, + { 0x0500, 0x03d6, 0x0fca }, + { 0x0900, 0x03d8, 0x0001 }, + { 0x8500, 0x03dd, 0x3fff }, + { 0x8500, 0x03db, 0x2fff }, + { 0x0900, 0x03da, 0x0001 }, + { 0x0900, 0x03dc, 0x0001 }, + { 0x8500, 0x03df, 0x2fff }, + { 0x0900, 0x03de, 0x0001 }, + { 0x0900, 0x03e0, 0x0001 }, + { 0x8500, 0x03e9, 0x4fff }, + { 0x8500, 0x03e5, 0x3fff }, + { 0x8500, 0x03e3, 0x2fff }, + { 0x0900, 0x03e2, 0x0001 }, + { 0x0900, 0x03e4, 0x0001 }, + { 0x8500, 0x03e7, 0x2fff }, + { 0x0900, 0x03e6, 0x0001 }, + { 0x0900, 0x03e8, 0x0001 }, + { 0x8500, 0x03ed, 0x3fff }, + { 0x8500, 0x03eb, 0x2fff }, + { 0x0900, 0x03ea, 0x0001 }, + { 0x0900, 0x03ec, 0x0001 }, + { 0x8500, 0x03ef, 0x2fff }, + { 0x0900, 0x03ee, 0x0001 }, + { 0x0500, 0x03f0, 0x0faa }, + { 0x8900, 0x0415, 0x6020 }, + { 0x8900, 0x0405, 0x5050 }, + { 0x8900, 0x03f9, 0x4ff9 }, + { 0x8500, 0x03f5, 0x3fa0 }, + { 0x8500, 0x03f3, 0x2000 }, + { 0x0500, 0x03f2, 0x0007 }, + { 0x0900, 0x03f4, 0x0fc4 }, + { 0x8900, 0x03f7, 0x2001 }, + { 0x1900, 0x03f6, 0x0000 }, + { 0x0500, 0x03f8, 0x0fff }, + { 0x8900, 0x0401, 0x3050 }, + { 0x8500, 0x03fb, 0x2fff }, + { 0x0900, 0x03fa, 0x0001 }, + { 0x0900, 0x0400, 0x0050 }, + { 0x8900, 0x0403, 0x2050 }, + { 0x0900, 0x0402, 0x0050 }, + { 0x0900, 0x0404, 0x0050 }, + { 0x8900, 0x040d, 0x4050 }, + { 0x8900, 0x0409, 0x3050 }, + { 0x8900, 0x0407, 0x2050 }, + { 0x0900, 0x0406, 0x0050 }, + { 0x0900, 0x0408, 0x0050 }, + { 0x8900, 0x040b, 0x2050 }, + { 0x0900, 0x040a, 0x0050 }, + { 0x0900, 0x040c, 0x0050 }, + { 0x8900, 0x0411, 0x3020 }, + { 0x8900, 0x040f, 0x2050 }, + { 0x0900, 0x040e, 0x0050 }, + { 0x0900, 0x0410, 0x0020 }, + { 0x8900, 0x0413, 0x2020 }, + { 0x0900, 0x0412, 0x0020 }, + { 0x0900, 0x0414, 0x0020 }, + { 0x8900, 0x0425, 0x5020 }, + { 0x8900, 0x041d, 0x4020 }, + { 0x8900, 0x0419, 0x3020 }, + { 0x8900, 0x0417, 0x2020 }, + { 0x0900, 0x0416, 0x0020 }, + { 0x0900, 0x0418, 0x0020 }, + { 0x8900, 0x041b, 0x2020 }, + { 0x0900, 0x041a, 0x0020 }, + { 0x0900, 0x041c, 0x0020 }, + { 0x8900, 0x0421, 0x3020 }, + { 0x8900, 0x041f, 0x2020 }, + { 0x0900, 0x041e, 0x0020 }, + { 0x0900, 0x0420, 0x0020 }, + { 0x8900, 0x0423, 0x2020 }, + { 0x0900, 0x0422, 0x0020 }, + { 0x0900, 0x0424, 0x0020 }, + { 0x8900, 0x042d, 0x4020 }, + { 0x8900, 0x0429, 0x3020 }, + { 0x8900, 0x0427, 0x2020 }, + { 0x0900, 0x0426, 0x0020 }, + { 0x0900, 0x0428, 0x0020 }, + { 0x8900, 0x042b, 0x2020 }, + { 0x0900, 0x042a, 0x0020 }, + { 0x0900, 0x042c, 0x0020 }, + { 0x8500, 0x0431, 0x3fe0 }, + { 0x8900, 0x042f, 0x2020 }, + { 0x0900, 0x042e, 0x0020 }, + { 0x0500, 0x0430, 0x0fe0 }, + { 0x8500, 0x0433, 0x2fe0 }, + { 0x0500, 0x0432, 0x0fe0 }, + { 0x0500, 0x0434, 0x0fe0 }, + { 0x8700, 0x06a4, 0xa000 }, + { 0x8500, 0x0563, 0x9fd0 }, + { 0x8900, 0x04b6, 0x8001 }, + { 0x8500, 0x0475, 0x7fff }, + { 0x8500, 0x0455, 0x6fb0 }, + { 0x8500, 0x0445, 0x5fe0 }, + { 0x8500, 0x043d, 0x4fe0 }, + { 0x8500, 0x0439, 0x3fe0 }, + { 0x8500, 0x0437, 0x2fe0 }, + { 0x0500, 0x0436, 0x0fe0 }, + { 0x0500, 0x0438, 0x0fe0 }, + { 0x8500, 0x043b, 0x2fe0 }, + { 0x0500, 0x043a, 0x0fe0 }, + { 0x0500, 0x043c, 0x0fe0 }, + { 0x8500, 0x0441, 0x3fe0 }, + { 0x8500, 0x043f, 0x2fe0 }, + { 0x0500, 0x043e, 0x0fe0 }, + { 0x0500, 0x0440, 0x0fe0 }, + { 0x8500, 0x0443, 0x2fe0 }, + { 0x0500, 0x0442, 0x0fe0 }, + { 0x0500, 0x0444, 0x0fe0 }, + { 0x8500, 0x044d, 0x4fe0 }, + { 0x8500, 0x0449, 0x3fe0 }, + { 0x8500, 0x0447, 0x2fe0 }, + { 0x0500, 0x0446, 0x0fe0 }, + { 0x0500, 0x0448, 0x0fe0 }, + { 0x8500, 0x044b, 0x2fe0 }, + { 0x0500, 0x044a, 0x0fe0 }, + { 0x0500, 0x044c, 0x0fe0 }, + { 0x8500, 0x0451, 0x3fb0 }, + { 0x8500, 0x044f, 0x2fe0 }, + { 0x0500, 0x044e, 0x0fe0 }, + { 0x0500, 0x0450, 0x0fb0 }, + { 0x8500, 0x0453, 0x2fb0 }, + { 0x0500, 0x0452, 0x0fb0 }, + { 0x0500, 0x0454, 0x0fb0 }, + { 0x8500, 0x0465, 0x5fff }, + { 0x8500, 0x045d, 0x4fb0 }, + { 0x8500, 0x0459, 0x3fb0 }, + { 0x8500, 0x0457, 0x2fb0 }, + { 0x0500, 0x0456, 0x0fb0 }, + { 0x0500, 0x0458, 0x0fb0 }, + { 0x8500, 0x045b, 0x2fb0 }, + { 0x0500, 0x045a, 0x0fb0 }, + { 0x0500, 0x045c, 0x0fb0 }, + { 0x8500, 0x0461, 0x3fff }, + { 0x8500, 0x045f, 0x2fb0 }, + { 0x0500, 0x045e, 0x0fb0 }, + { 0x0900, 0x0460, 0x0001 }, + { 0x8500, 0x0463, 0x2fff }, + { 0x0900, 0x0462, 0x0001 }, + { 0x0900, 0x0464, 0x0001 }, + { 0x8500, 0x046d, 0x4fff }, + { 0x8500, 0x0469, 0x3fff }, + { 0x8500, 0x0467, 0x2fff }, + { 0x0900, 0x0466, 0x0001 }, + { 0x0900, 0x0468, 0x0001 }, + { 0x8500, 0x046b, 0x2fff }, + { 0x0900, 0x046a, 0x0001 }, + { 0x0900, 0x046c, 0x0001 }, + { 0x8500, 0x0471, 0x3fff }, + { 0x8500, 0x046f, 0x2fff }, + { 0x0900, 0x046e, 0x0001 }, + { 0x0900, 0x0470, 0x0001 }, + { 0x8500, 0x0473, 0x2fff }, + { 0x0900, 0x0472, 0x0001 }, + { 0x0900, 0x0474, 0x0001 }, + { 0x8900, 0x0496, 0x6001 }, + { 0x8c00, 0x0485, 0x5000 }, + { 0x8500, 0x047d, 0x4fff }, + { 0x8500, 0x0479, 0x3fff }, + { 0x8500, 0x0477, 0x2fff }, + { 0x0900, 0x0476, 0x0001 }, + { 0x0900, 0x0478, 0x0001 }, + { 0x8500, 0x047b, 0x2fff }, + { 0x0900, 0x047a, 0x0001 }, + { 0x0900, 0x047c, 0x0001 }, + { 0x8500, 0x0481, 0x3fff }, + { 0x8500, 0x047f, 0x2fff }, + { 0x0900, 0x047e, 0x0001 }, + { 0x0900, 0x0480, 0x0001 }, + { 0x8c00, 0x0483, 0x2000 }, + { 0x1a00, 0x0482, 0x0000 }, + { 0x0c00, 0x0484, 0x0000 }, + { 0x8900, 0x048e, 0x4001 }, + { 0x8900, 0x048a, 0x3001 }, + { 0x8b00, 0x0488, 0x2000 }, + { 0x0c00, 0x0486, 0x0000 }, + { 0x0b00, 0x0489, 0x0000 }, + { 0x8900, 0x048c, 0x2001 }, + { 0x0500, 0x048b, 0x0fff }, + { 0x0500, 0x048d, 0x0fff }, + { 0x8900, 0x0492, 0x3001 }, + { 0x8900, 0x0490, 0x2001 }, + { 0x0500, 0x048f, 0x0fff }, + { 0x0500, 0x0491, 0x0fff }, + { 0x8900, 0x0494, 0x2001 }, + { 0x0500, 0x0493, 0x0fff }, + { 0x0500, 0x0495, 0x0fff }, + { 0x8900, 0x04a6, 0x5001 }, + { 0x8900, 0x049e, 0x4001 }, + { 0x8900, 0x049a, 0x3001 }, + { 0x8900, 0x0498, 0x2001 }, + { 0x0500, 0x0497, 0x0fff }, + { 0x0500, 0x0499, 0x0fff }, + { 0x8900, 0x049c, 0x2001 }, + { 0x0500, 0x049b, 0x0fff }, + { 0x0500, 0x049d, 0x0fff }, + { 0x8900, 0x04a2, 0x3001 }, + { 0x8900, 0x04a0, 0x2001 }, + { 0x0500, 0x049f, 0x0fff }, + { 0x0500, 0x04a1, 0x0fff }, + { 0x8900, 0x04a4, 0x2001 }, + { 0x0500, 0x04a3, 0x0fff }, + { 0x0500, 0x04a5, 0x0fff }, + { 0x8900, 0x04ae, 0x4001 }, + { 0x8900, 0x04aa, 0x3001 }, + { 0x8900, 0x04a8, 0x2001 }, + { 0x0500, 0x04a7, 0x0fff }, + { 0x0500, 0x04a9, 0x0fff }, + { 0x8900, 0x04ac, 0x2001 }, + { 0x0500, 0x04ab, 0x0fff }, + { 0x0500, 0x04ad, 0x0fff }, + { 0x8900, 0x04b2, 0x3001 }, + { 0x8900, 0x04b0, 0x2001 }, + { 0x0500, 0x04af, 0x0fff }, + { 0x0500, 0x04b1, 0x0fff }, + { 0x8900, 0x04b4, 0x2001 }, + { 0x0500, 0x04b3, 0x0fff }, + { 0x0500, 0x04b5, 0x0fff }, + { 0x8500, 0x04f9, 0x7fff }, + { 0x8500, 0x04d7, 0x6fff }, + { 0x8500, 0x04c6, 0x5fff }, + { 0x8900, 0x04be, 0x4001 }, + { 0x8900, 0x04ba, 0x3001 }, + { 0x8900, 0x04b8, 0x2001 }, + { 0x0500, 0x04b7, 0x0fff }, + { 0x0500, 0x04b9, 0x0fff }, + { 0x8900, 0x04bc, 0x2001 }, + { 0x0500, 0x04bb, 0x0fff }, + { 0x0500, 0x04bd, 0x0fff }, + { 0x8500, 0x04c2, 0x3fff }, + { 0x8900, 0x04c0, 0x2000 }, + { 0x0500, 0x04bf, 0x0fff }, + { 0x0900, 0x04c1, 0x0001 }, + { 0x8500, 0x04c4, 0x2fff }, + { 0x0900, 0x04c3, 0x0001 }, + { 0x0900, 0x04c5, 0x0001 }, + { 0x8500, 0x04ce, 0x4fff }, + { 0x8500, 0x04ca, 0x3fff }, + { 0x8500, 0x04c8, 0x2fff }, + { 0x0900, 0x04c7, 0x0001 }, + { 0x0900, 0x04c9, 0x0001 }, + { 0x8500, 0x04cc, 0x2fff }, + { 0x0900, 0x04cb, 0x0001 }, + { 0x0900, 0x04cd, 0x0001 }, + { 0x8500, 0x04d3, 0x3fff }, + { 0x8500, 0x04d1, 0x2fff }, + { 0x0900, 0x04d0, 0x0001 }, + { 0x0900, 0x04d2, 0x0001 }, + { 0x8500, 0x04d5, 0x2fff }, + { 0x0900, 0x04d4, 0x0001 }, + { 0x0900, 0x04d6, 0x0001 }, + { 0x8500, 0x04e7, 0x5fff }, + { 0x8500, 0x04df, 0x4fff }, + { 0x8500, 0x04db, 0x3fff }, + { 0x8500, 0x04d9, 0x2fff }, + { 0x0900, 0x04d8, 0x0001 }, + { 0x0900, 0x04da, 0x0001 }, + { 0x8500, 0x04dd, 0x2fff }, + { 0x0900, 0x04dc, 0x0001 }, + { 0x0900, 0x04de, 0x0001 }, + { 0x8500, 0x04e3, 0x3fff }, + { 0x8500, 0x04e1, 0x2fff }, + { 0x0900, 0x04e0, 0x0001 }, + { 0x0900, 0x04e2, 0x0001 }, + { 0x8500, 0x04e5, 0x2fff }, + { 0x0900, 0x04e4, 0x0001 }, + { 0x0900, 0x04e6, 0x0001 }, + { 0x8500, 0x04ef, 0x4fff }, + { 0x8500, 0x04eb, 0x3fff }, + { 0x8500, 0x04e9, 0x2fff }, + { 0x0900, 0x04e8, 0x0001 }, + { 0x0900, 0x04ea, 0x0001 }, + { 0x8500, 0x04ed, 0x2fff }, + { 0x0900, 0x04ec, 0x0001 }, + { 0x0900, 0x04ee, 0x0001 }, + { 0x8500, 0x04f3, 0x3fff }, + { 0x8500, 0x04f1, 0x2fff }, + { 0x0900, 0x04f0, 0x0001 }, + { 0x0900, 0x04f2, 0x0001 }, + { 0x8500, 0x04f5, 0x2fff }, + { 0x0900, 0x04f4, 0x0001 }, + { 0x0900, 0x04f8, 0x0001 }, + { 0x8900, 0x0540, 0x6030 }, + { 0x8500, 0x050f, 0x5fff }, + { 0x8500, 0x0507, 0x4fff }, + { 0x8500, 0x0503, 0x3fff }, + { 0x8500, 0x0501, 0x2fff }, + { 0x0900, 0x0500, 0x0001 }, + { 0x0900, 0x0502, 0x0001 }, + { 0x8500, 0x0505, 0x2fff }, + { 0x0900, 0x0504, 0x0001 }, + { 0x0900, 0x0506, 0x0001 }, + { 0x8500, 0x050b, 0x3fff }, + { 0x8500, 0x0509, 0x2fff }, + { 0x0900, 0x0508, 0x0001 }, + { 0x0900, 0x050a, 0x0001 }, + { 0x8500, 0x050d, 0x2fff }, + { 0x0900, 0x050c, 0x0001 }, + { 0x0900, 0x050e, 0x0001 }, + { 0x8900, 0x0538, 0x4030 }, + { 0x8900, 0x0534, 0x3030 }, + { 0x8900, 0x0532, 0x2030 }, + { 0x0900, 0x0531, 0x0030 }, + { 0x0900, 0x0533, 0x0030 }, + { 0x8900, 0x0536, 0x2030 }, + { 0x0900, 0x0535, 0x0030 }, + { 0x0900, 0x0537, 0x0030 }, + { 0x8900, 0x053c, 0x3030 }, + { 0x8900, 0x053a, 0x2030 }, + { 0x0900, 0x0539, 0x0030 }, + { 0x0900, 0x053b, 0x0030 }, + { 0x8900, 0x053e, 0x2030 }, + { 0x0900, 0x053d, 0x0030 }, + { 0x0900, 0x053f, 0x0030 }, + { 0x8900, 0x0550, 0x5030 }, + { 0x8900, 0x0548, 0x4030 }, + { 0x8900, 0x0544, 0x3030 }, + { 0x8900, 0x0542, 0x2030 }, + { 0x0900, 0x0541, 0x0030 }, + { 0x0900, 0x0543, 0x0030 }, + { 0x8900, 0x0546, 0x2030 }, + { 0x0900, 0x0545, 0x0030 }, + { 0x0900, 0x0547, 0x0030 }, + { 0x8900, 0x054c, 0x3030 }, + { 0x8900, 0x054a, 0x2030 }, + { 0x0900, 0x0549, 0x0030 }, + { 0x0900, 0x054b, 0x0030 }, + { 0x8900, 0x054e, 0x2030 }, + { 0x0900, 0x054d, 0x0030 }, + { 0x0900, 0x054f, 0x0030 }, + { 0x9500, 0x055a, 0x4000 }, + { 0x8900, 0x0554, 0x3030 }, + { 0x8900, 0x0552, 0x2030 }, + { 0x0900, 0x0551, 0x0030 }, + { 0x0900, 0x0553, 0x0030 }, + { 0x8900, 0x0556, 0x2030 }, + { 0x0900, 0x0555, 0x0030 }, + { 0x0600, 0x0559, 0x0000 }, + { 0x9500, 0x055e, 0x3000 }, + { 0x9500, 0x055c, 0x2000 }, + { 0x1500, 0x055b, 0x0000 }, + { 0x1500, 0x055d, 0x0000 }, + { 0x8500, 0x0561, 0x2fd0 }, + { 0x1500, 0x055f, 0x0000 }, + { 0x0500, 0x0562, 0x0fd0 }, + { 0x9a00, 0x060f, 0x8000 }, + { 0x8c00, 0x05ab, 0x7000 }, + { 0x8500, 0x0583, 0x6fd0 }, + { 0x8500, 0x0573, 0x5fd0 }, + { 0x8500, 0x056b, 0x4fd0 }, + { 0x8500, 0x0567, 0x3fd0 }, + { 0x8500, 0x0565, 0x2fd0 }, + { 0x0500, 0x0564, 0x0fd0 }, + { 0x0500, 0x0566, 0x0fd0 }, + { 0x8500, 0x0569, 0x2fd0 }, + { 0x0500, 0x0568, 0x0fd0 }, + { 0x0500, 0x056a, 0x0fd0 }, + { 0x8500, 0x056f, 0x3fd0 }, + { 0x8500, 0x056d, 0x2fd0 }, + { 0x0500, 0x056c, 0x0fd0 }, + { 0x0500, 0x056e, 0x0fd0 }, + { 0x8500, 0x0571, 0x2fd0 }, + { 0x0500, 0x0570, 0x0fd0 }, + { 0x0500, 0x0572, 0x0fd0 }, + { 0x8500, 0x057b, 0x4fd0 }, + { 0x8500, 0x0577, 0x3fd0 }, + { 0x8500, 0x0575, 0x2fd0 }, + { 0x0500, 0x0574, 0x0fd0 }, + { 0x0500, 0x0576, 0x0fd0 }, + { 0x8500, 0x0579, 0x2fd0 }, + { 0x0500, 0x0578, 0x0fd0 }, + { 0x0500, 0x057a, 0x0fd0 }, + { 0x8500, 0x057f, 0x3fd0 }, + { 0x8500, 0x057d, 0x2fd0 }, + { 0x0500, 0x057c, 0x0fd0 }, + { 0x0500, 0x057e, 0x0fd0 }, + { 0x8500, 0x0581, 0x2fd0 }, + { 0x0500, 0x0580, 0x0fd0 }, + { 0x0500, 0x0582, 0x0fd0 }, + { 0x8c00, 0x059a, 0x5000 }, + { 0x8c00, 0x0592, 0x4000 }, + { 0x8500, 0x0587, 0x3000 }, + { 0x8500, 0x0585, 0x2fd0 }, + { 0x0500, 0x0584, 0x0fd0 }, + { 0x0500, 0x0586, 0x0fd0 }, + { 0x9100, 0x058a, 0x2000 }, + { 0x1500, 0x0589, 0x0000 }, + { 0x0c00, 0x0591, 0x0000 }, + { 0x8c00, 0x0596, 0x3000 }, + { 0x8c00, 0x0594, 0x2000 }, + { 0x0c00, 0x0593, 0x0000 }, + { 0x0c00, 0x0595, 0x0000 }, + { 0x8c00, 0x0598, 0x2000 }, + { 0x0c00, 0x0597, 0x0000 }, + { 0x0c00, 0x0599, 0x0000 }, + { 0x8c00, 0x05a3, 0x4000 }, + { 0x8c00, 0x059e, 0x3000 }, + { 0x8c00, 0x059c, 0x2000 }, + { 0x0c00, 0x059b, 0x0000 }, + { 0x0c00, 0x059d, 0x0000 }, + { 0x8c00, 0x05a0, 0x2000 }, + { 0x0c00, 0x059f, 0x0000 }, + { 0x0c00, 0x05a1, 0x0000 }, + { 0x8c00, 0x05a7, 0x3000 }, + { 0x8c00, 0x05a5, 0x2000 }, + { 0x0c00, 0x05a4, 0x0000 }, + { 0x0c00, 0x05a6, 0x0000 }, + { 0x8c00, 0x05a9, 0x2000 }, + { 0x0c00, 0x05a8, 0x0000 }, + { 0x0c00, 0x05aa, 0x0000 }, + { 0x8700, 0x05d7, 0x6000 }, + { 0x8c00, 0x05bc, 0x5000 }, + { 0x8c00, 0x05b3, 0x4000 }, + { 0x8c00, 0x05af, 0x3000 }, + { 0x8c00, 0x05ad, 0x2000 }, + { 0x0c00, 0x05ac, 0x0000 }, + { 0x0c00, 0x05ae, 0x0000 }, + { 0x8c00, 0x05b1, 0x2000 }, + { 0x0c00, 0x05b0, 0x0000 }, + { 0x0c00, 0x05b2, 0x0000 }, + { 0x8c00, 0x05b7, 0x3000 }, + { 0x8c00, 0x05b5, 0x2000 }, + { 0x0c00, 0x05b4, 0x0000 }, + { 0x0c00, 0x05b6, 0x0000 }, + { 0x8c00, 0x05b9, 0x2000 }, + { 0x0c00, 0x05b8, 0x0000 }, + { 0x0c00, 0x05bb, 0x0000 }, + { 0x8c00, 0x05c4, 0x4000 }, + { 0x9500, 0x05c0, 0x3000 }, + { 0x9500, 0x05be, 0x2000 }, + { 0x0c00, 0x05bd, 0x0000 }, + { 0x0c00, 0x05bf, 0x0000 }, + { 0x8c00, 0x05c2, 0x2000 }, + { 0x0c00, 0x05c1, 0x0000 }, + { 0x1500, 0x05c3, 0x0000 }, + { 0x8700, 0x05d3, 0x3000 }, + { 0x8700, 0x05d1, 0x2000 }, + { 0x0700, 0x05d0, 0x0000 }, + { 0x0700, 0x05d2, 0x0000 }, + { 0x8700, 0x05d5, 0x2000 }, + { 0x0700, 0x05d4, 0x0000 }, + { 0x0700, 0x05d6, 0x0000 }, + { 0x8700, 0x05e7, 0x5000 }, + { 0x8700, 0x05df, 0x4000 }, + { 0x8700, 0x05db, 0x3000 }, + { 0x8700, 0x05d9, 0x2000 }, + { 0x0700, 0x05d8, 0x0000 }, + { 0x0700, 0x05da, 0x0000 }, + { 0x8700, 0x05dd, 0x2000 }, + { 0x0700, 0x05dc, 0x0000 }, + { 0x0700, 0x05de, 0x0000 }, + { 0x8700, 0x05e3, 0x3000 }, + { 0x8700, 0x05e1, 0x2000 }, + { 0x0700, 0x05e0, 0x0000 }, + { 0x0700, 0x05e2, 0x0000 }, + { 0x8700, 0x05e5, 0x2000 }, + { 0x0700, 0x05e4, 0x0000 }, + { 0x0700, 0x05e6, 0x0000 }, + { 0x9500, 0x05f4, 0x4000 }, + { 0x8700, 0x05f0, 0x3000 }, + { 0x8700, 0x05e9, 0x2000 }, + { 0x0700, 0x05e8, 0x0000 }, + { 0x0700, 0x05ea, 0x0000 }, + { 0x8700, 0x05f2, 0x2000 }, + { 0x0700, 0x05f1, 0x0000 }, + { 0x1500, 0x05f3, 0x0000 }, + { 0x8100, 0x0603, 0x3000 }, + { 0x8100, 0x0601, 0x2000 }, + { 0x0100, 0x0600, 0x0000 }, + { 0x0100, 0x0602, 0x0000 }, + { 0x9500, 0x060d, 0x2000 }, + { 0x1500, 0x060c, 0x0000 }, + { 0x1a00, 0x060e, 0x0000 }, + { 0x8d00, 0x0664, 0x7000 }, + { 0x8700, 0x0638, 0x6000 }, + { 0x8700, 0x0628, 0x5000 }, + { 0x9500, 0x061f, 0x4000 }, + { 0x8c00, 0x0613, 0x3000 }, + { 0x8c00, 0x0611, 0x2000 }, + { 0x0c00, 0x0610, 0x0000 }, + { 0x0c00, 0x0612, 0x0000 }, + { 0x8c00, 0x0615, 0x2000 }, + { 0x0c00, 0x0614, 0x0000 }, + { 0x1500, 0x061b, 0x0000 }, + { 0x8700, 0x0624, 0x3000 }, + { 0x8700, 0x0622, 0x2000 }, + { 0x0700, 0x0621, 0x0000 }, + { 0x0700, 0x0623, 0x0000 }, + { 0x8700, 0x0626, 0x2000 }, + { 0x0700, 0x0625, 0x0000 }, + { 0x0700, 0x0627, 0x0000 }, + { 0x8700, 0x0630, 0x4000 }, + { 0x8700, 0x062c, 0x3000 }, + { 0x8700, 0x062a, 0x2000 }, + { 0x0700, 0x0629, 0x0000 }, + { 0x0700, 0x062b, 0x0000 }, + { 0x8700, 0x062e, 0x2000 }, + { 0x0700, 0x062d, 0x0000 }, + { 0x0700, 0x062f, 0x0000 }, + { 0x8700, 0x0634, 0x3000 }, + { 0x8700, 0x0632, 0x2000 }, + { 0x0700, 0x0631, 0x0000 }, + { 0x0700, 0x0633, 0x0000 }, + { 0x8700, 0x0636, 0x2000 }, + { 0x0700, 0x0635, 0x0000 }, + { 0x0700, 0x0637, 0x0000 }, + { 0x8c00, 0x064d, 0x5000 }, + { 0x8700, 0x0645, 0x4000 }, + { 0x8700, 0x0641, 0x3000 }, + { 0x8700, 0x063a, 0x2000 }, + { 0x0700, 0x0639, 0x0000 }, + { 0x0600, 0x0640, 0x0000 }, + { 0x8700, 0x0643, 0x2000 }, + { 0x0700, 0x0642, 0x0000 }, + { 0x0700, 0x0644, 0x0000 }, + { 0x8700, 0x0649, 0x3000 }, + { 0x8700, 0x0647, 0x2000 }, + { 0x0700, 0x0646, 0x0000 }, + { 0x0700, 0x0648, 0x0000 }, + { 0x8c00, 0x064b, 0x2000 }, + { 0x0700, 0x064a, 0x0000 }, + { 0x0c00, 0x064c, 0x0000 }, + { 0x8c00, 0x0655, 0x4000 }, + { 0x8c00, 0x0651, 0x3000 }, + { 0x8c00, 0x064f, 0x2000 }, + { 0x0c00, 0x064e, 0x0000 }, + { 0x0c00, 0x0650, 0x0000 }, + { 0x8c00, 0x0653, 0x2000 }, + { 0x0c00, 0x0652, 0x0000 }, + { 0x0c00, 0x0654, 0x0000 }, + { 0x8d00, 0x0660, 0x3000 }, + { 0x8c00, 0x0657, 0x2000 }, + { 0x0c00, 0x0656, 0x0000 }, + { 0x0c00, 0x0658, 0x0000 }, + { 0x8d00, 0x0662, 0x2000 }, + { 0x0d00, 0x0661, 0x0000 }, + { 0x0d00, 0x0663, 0x0000 }, + { 0x8700, 0x0684, 0x6000 }, + { 0x8700, 0x0674, 0x5000 }, + { 0x9500, 0x066c, 0x4000 }, + { 0x8d00, 0x0668, 0x3000 }, + { 0x8d00, 0x0666, 0x2000 }, + { 0x0d00, 0x0665, 0x0000 }, + { 0x0d00, 0x0667, 0x0000 }, + { 0x9500, 0x066a, 0x2000 }, + { 0x0d00, 0x0669, 0x0000 }, + { 0x1500, 0x066b, 0x0000 }, + { 0x8c00, 0x0670, 0x3000 }, + { 0x8700, 0x066e, 0x2000 }, + { 0x1500, 0x066d, 0x0000 }, + { 0x0700, 0x066f, 0x0000 }, + { 0x8700, 0x0672, 0x2000 }, + { 0x0700, 0x0671, 0x0000 }, + { 0x0700, 0x0673, 0x0000 }, + { 0x8700, 0x067c, 0x4000 }, + { 0x8700, 0x0678, 0x3000 }, + { 0x8700, 0x0676, 0x2000 }, + { 0x0700, 0x0675, 0x0000 }, + { 0x0700, 0x0677, 0x0000 }, + { 0x8700, 0x067a, 0x2000 }, + { 0x0700, 0x0679, 0x0000 }, + { 0x0700, 0x067b, 0x0000 }, + { 0x8700, 0x0680, 0x3000 }, + { 0x8700, 0x067e, 0x2000 }, + { 0x0700, 0x067d, 0x0000 }, + { 0x0700, 0x067f, 0x0000 }, + { 0x8700, 0x0682, 0x2000 }, + { 0x0700, 0x0681, 0x0000 }, + { 0x0700, 0x0683, 0x0000 }, + { 0x8700, 0x0694, 0x5000 }, + { 0x8700, 0x068c, 0x4000 }, + { 0x8700, 0x0688, 0x3000 }, + { 0x8700, 0x0686, 0x2000 }, + { 0x0700, 0x0685, 0x0000 }, + { 0x0700, 0x0687, 0x0000 }, + { 0x8700, 0x068a, 0x2000 }, + { 0x0700, 0x0689, 0x0000 }, + { 0x0700, 0x068b, 0x0000 }, + { 0x8700, 0x0690, 0x3000 }, + { 0x8700, 0x068e, 0x2000 }, + { 0x0700, 0x068d, 0x0000 }, + { 0x0700, 0x068f, 0x0000 }, + { 0x8700, 0x0692, 0x2000 }, + { 0x0700, 0x0691, 0x0000 }, + { 0x0700, 0x0693, 0x0000 }, + { 0x8700, 0x069c, 0x4000 }, + { 0x8700, 0x0698, 0x3000 }, + { 0x8700, 0x0696, 0x2000 }, + { 0x0700, 0x0695, 0x0000 }, + { 0x0700, 0x0697, 0x0000 }, + { 0x8700, 0x069a, 0x2000 }, + { 0x0700, 0x0699, 0x0000 }, + { 0x0700, 0x069b, 0x0000 }, + { 0x8700, 0x06a0, 0x3000 }, + { 0x8700, 0x069e, 0x2000 }, + { 0x0700, 0x069d, 0x0000 }, + { 0x0700, 0x069f, 0x0000 }, + { 0x8700, 0x06a2, 0x2000 }, + { 0x0700, 0x06a1, 0x0000 }, + { 0x0700, 0x06a3, 0x0000 }, + { 0x8700, 0x0926, 0x9000 }, + { 0x8700, 0x0725, 0x8000 }, + { 0x8c00, 0x06e4, 0x7000 }, + { 0x8700, 0x06c4, 0x6000 }, + { 0x8700, 0x06b4, 0x5000 }, + { 0x8700, 0x06ac, 0x4000 }, + { 0x8700, 0x06a8, 0x3000 }, + { 0x8700, 0x06a6, 0x2000 }, + { 0x0700, 0x06a5, 0x0000 }, + { 0x0700, 0x06a7, 0x0000 }, + { 0x8700, 0x06aa, 0x2000 }, + { 0x0700, 0x06a9, 0x0000 }, + { 0x0700, 0x06ab, 0x0000 }, + { 0x8700, 0x06b0, 0x3000 }, + { 0x8700, 0x06ae, 0x2000 }, + { 0x0700, 0x06ad, 0x0000 }, + { 0x0700, 0x06af, 0x0000 }, + { 0x8700, 0x06b2, 0x2000 }, + { 0x0700, 0x06b1, 0x0000 }, + { 0x0700, 0x06b3, 0x0000 }, + { 0x8700, 0x06bc, 0x4000 }, + { 0x8700, 0x06b8, 0x3000 }, + { 0x8700, 0x06b6, 0x2000 }, + { 0x0700, 0x06b5, 0x0000 }, + { 0x0700, 0x06b7, 0x0000 }, + { 0x8700, 0x06ba, 0x2000 }, + { 0x0700, 0x06b9, 0x0000 }, + { 0x0700, 0x06bb, 0x0000 }, + { 0x8700, 0x06c0, 0x3000 }, + { 0x8700, 0x06be, 0x2000 }, + { 0x0700, 0x06bd, 0x0000 }, + { 0x0700, 0x06bf, 0x0000 }, + { 0x8700, 0x06c2, 0x2000 }, + { 0x0700, 0x06c1, 0x0000 }, + { 0x0700, 0x06c3, 0x0000 }, + { 0x9500, 0x06d4, 0x5000 }, + { 0x8700, 0x06cc, 0x4000 }, + { 0x8700, 0x06c8, 0x3000 }, + { 0x8700, 0x06c6, 0x2000 }, + { 0x0700, 0x06c5, 0x0000 }, + { 0x0700, 0x06c7, 0x0000 }, + { 0x8700, 0x06ca, 0x2000 }, + { 0x0700, 0x06c9, 0x0000 }, + { 0x0700, 0x06cb, 0x0000 }, + { 0x8700, 0x06d0, 0x3000 }, + { 0x8700, 0x06ce, 0x2000 }, + { 0x0700, 0x06cd, 0x0000 }, + { 0x0700, 0x06cf, 0x0000 }, + { 0x8700, 0x06d2, 0x2000 }, + { 0x0700, 0x06d1, 0x0000 }, + { 0x0700, 0x06d3, 0x0000 }, + { 0x8c00, 0x06dc, 0x4000 }, + { 0x8c00, 0x06d8, 0x3000 }, + { 0x8c00, 0x06d6, 0x2000 }, + { 0x0700, 0x06d5, 0x0000 }, + { 0x0c00, 0x06d7, 0x0000 }, + { 0x8c00, 0x06da, 0x2000 }, + { 0x0c00, 0x06d9, 0x0000 }, + { 0x0c00, 0x06db, 0x0000 }, + { 0x8c00, 0x06e0, 0x3000 }, + { 0x8b00, 0x06de, 0x2000 }, + { 0x0100, 0x06dd, 0x0000 }, + { 0x0c00, 0x06df, 0x0000 }, + { 0x8c00, 0x06e2, 0x2000 }, + { 0x0c00, 0x06e1, 0x0000 }, + { 0x0c00, 0x06e3, 0x0000 }, + { 0x9500, 0x0704, 0x6000 }, + { 0x8d00, 0x06f4, 0x5000 }, + { 0x8c00, 0x06ec, 0x4000 }, + { 0x8c00, 0x06e8, 0x3000 }, + { 0x8600, 0x06e6, 0x2000 }, + { 0x0600, 0x06e5, 0x0000 }, + { 0x0c00, 0x06e7, 0x0000 }, + { 0x8c00, 0x06ea, 0x2000 }, + { 0x1a00, 0x06e9, 0x0000 }, + { 0x0c00, 0x06eb, 0x0000 }, + { 0x8d00, 0x06f0, 0x3000 }, + { 0x8700, 0x06ee, 0x2000 }, + { 0x0c00, 0x06ed, 0x0000 }, + { 0x0700, 0x06ef, 0x0000 }, + { 0x8d00, 0x06f2, 0x2000 }, + { 0x0d00, 0x06f1, 0x0000 }, + { 0x0d00, 0x06f3, 0x0000 }, + { 0x8700, 0x06fc, 0x4000 }, + { 0x8d00, 0x06f8, 0x3000 }, + { 0x8d00, 0x06f6, 0x2000 }, + { 0x0d00, 0x06f5, 0x0000 }, + { 0x0d00, 0x06f7, 0x0000 }, + { 0x8700, 0x06fa, 0x2000 }, + { 0x0d00, 0x06f9, 0x0000 }, + { 0x0700, 0x06fb, 0x0000 }, + { 0x9500, 0x0700, 0x3000 }, + { 0x9a00, 0x06fe, 0x2000 }, + { 0x1a00, 0x06fd, 0x0000 }, + { 0x0700, 0x06ff, 0x0000 }, + { 0x9500, 0x0702, 0x2000 }, + { 0x1500, 0x0701, 0x0000 }, + { 0x1500, 0x0703, 0x0000 }, + { 0x8700, 0x0715, 0x5000 }, + { 0x9500, 0x070c, 0x4000 }, + { 0x9500, 0x0708, 0x3000 }, + { 0x9500, 0x0706, 0x2000 }, + { 0x1500, 0x0705, 0x0000 }, + { 0x1500, 0x0707, 0x0000 }, + { 0x9500, 0x070a, 0x2000 }, + { 0x1500, 0x0709, 0x0000 }, + { 0x1500, 0x070b, 0x0000 }, + { 0x8c00, 0x0711, 0x3000 }, + { 0x8100, 0x070f, 0x2000 }, + { 0x1500, 0x070d, 0x0000 }, + { 0x0700, 0x0710, 0x0000 }, + { 0x8700, 0x0713, 0x2000 }, + { 0x0700, 0x0712, 0x0000 }, + { 0x0700, 0x0714, 0x0000 }, + { 0x8700, 0x071d, 0x4000 }, + { 0x8700, 0x0719, 0x3000 }, + { 0x8700, 0x0717, 0x2000 }, + { 0x0700, 0x0716, 0x0000 }, + { 0x0700, 0x0718, 0x0000 }, + { 0x8700, 0x071b, 0x2000 }, + { 0x0700, 0x071a, 0x0000 }, + { 0x0700, 0x071c, 0x0000 }, + { 0x8700, 0x0721, 0x3000 }, + { 0x8700, 0x071f, 0x2000 }, + { 0x0700, 0x071e, 0x0000 }, + { 0x0700, 0x0720, 0x0000 }, + { 0x8700, 0x0723, 0x2000 }, + { 0x0700, 0x0722, 0x0000 }, + { 0x0700, 0x0724, 0x0000 }, + { 0x8700, 0x0797, 0x7000 }, + { 0x8c00, 0x0745, 0x6000 }, + { 0x8c00, 0x0735, 0x5000 }, + { 0x8700, 0x072d, 0x4000 }, + { 0x8700, 0x0729, 0x3000 }, + { 0x8700, 0x0727, 0x2000 }, + { 0x0700, 0x0726, 0x0000 }, + { 0x0700, 0x0728, 0x0000 }, + { 0x8700, 0x072b, 0x2000 }, + { 0x0700, 0x072a, 0x0000 }, + { 0x0700, 0x072c, 0x0000 }, + { 0x8c00, 0x0731, 0x3000 }, + { 0x8700, 0x072f, 0x2000 }, + { 0x0700, 0x072e, 0x0000 }, + { 0x0c00, 0x0730, 0x0000 }, + { 0x8c00, 0x0733, 0x2000 }, + { 0x0c00, 0x0732, 0x0000 }, + { 0x0c00, 0x0734, 0x0000 }, + { 0x8c00, 0x073d, 0x4000 }, + { 0x8c00, 0x0739, 0x3000 }, + { 0x8c00, 0x0737, 0x2000 }, + { 0x0c00, 0x0736, 0x0000 }, + { 0x0c00, 0x0738, 0x0000 }, + { 0x8c00, 0x073b, 0x2000 }, + { 0x0c00, 0x073a, 0x0000 }, + { 0x0c00, 0x073c, 0x0000 }, + { 0x8c00, 0x0741, 0x3000 }, + { 0x8c00, 0x073f, 0x2000 }, + { 0x0c00, 0x073e, 0x0000 }, + { 0x0c00, 0x0740, 0x0000 }, + { 0x8c00, 0x0743, 0x2000 }, + { 0x0c00, 0x0742, 0x0000 }, + { 0x0c00, 0x0744, 0x0000 }, + { 0x8700, 0x0787, 0x5000 }, + { 0x8700, 0x074f, 0x4000 }, + { 0x8c00, 0x0749, 0x3000 }, + { 0x8c00, 0x0747, 0x2000 }, + { 0x0c00, 0x0746, 0x0000 }, + { 0x0c00, 0x0748, 0x0000 }, + { 0x8700, 0x074d, 0x2000 }, + { 0x0c00, 0x074a, 0x0000 }, + { 0x0700, 0x074e, 0x0000 }, + { 0x8700, 0x0783, 0x3000 }, + { 0x8700, 0x0781, 0x2000 }, + { 0x0700, 0x0780, 0x0000 }, + { 0x0700, 0x0782, 0x0000 }, + { 0x8700, 0x0785, 0x2000 }, + { 0x0700, 0x0784, 0x0000 }, + { 0x0700, 0x0786, 0x0000 }, + { 0x8700, 0x078f, 0x4000 }, + { 0x8700, 0x078b, 0x3000 }, + { 0x8700, 0x0789, 0x2000 }, + { 0x0700, 0x0788, 0x0000 }, + { 0x0700, 0x078a, 0x0000 }, + { 0x8700, 0x078d, 0x2000 }, + { 0x0700, 0x078c, 0x0000 }, + { 0x0700, 0x078e, 0x0000 }, + { 0x8700, 0x0793, 0x3000 }, + { 0x8700, 0x0791, 0x2000 }, + { 0x0700, 0x0790, 0x0000 }, + { 0x0700, 0x0792, 0x0000 }, + { 0x8700, 0x0795, 0x2000 }, + { 0x0700, 0x0794, 0x0000 }, + { 0x0700, 0x0796, 0x0000 }, + { 0x8700, 0x0906, 0x6000 }, + { 0x8c00, 0x07a7, 0x5000 }, + { 0x8700, 0x079f, 0x4000 }, + { 0x8700, 0x079b, 0x3000 }, + { 0x8700, 0x0799, 0x2000 }, + { 0x0700, 0x0798, 0x0000 }, + { 0x0700, 0x079a, 0x0000 }, + { 0x8700, 0x079d, 0x2000 }, + { 0x0700, 0x079c, 0x0000 }, + { 0x0700, 0x079e, 0x0000 }, + { 0x8700, 0x07a3, 0x3000 }, + { 0x8700, 0x07a1, 0x2000 }, + { 0x0700, 0x07a0, 0x0000 }, + { 0x0700, 0x07a2, 0x0000 }, + { 0x8700, 0x07a5, 0x2000 }, + { 0x0700, 0x07a4, 0x0000 }, + { 0x0c00, 0x07a6, 0x0000 }, + { 0x8c00, 0x07af, 0x4000 }, + { 0x8c00, 0x07ab, 0x3000 }, + { 0x8c00, 0x07a9, 0x2000 }, + { 0x0c00, 0x07a8, 0x0000 }, + { 0x0c00, 0x07aa, 0x0000 }, + { 0x8c00, 0x07ad, 0x2000 }, + { 0x0c00, 0x07ac, 0x0000 }, + { 0x0c00, 0x07ae, 0x0000 }, + { 0x8c00, 0x0902, 0x3000 }, + { 0x8700, 0x07b1, 0x2000 }, + { 0x0c00, 0x07b0, 0x0000 }, + { 0x0c00, 0x0901, 0x0000 }, + { 0x8700, 0x0904, 0x2000 }, + { 0x0a00, 0x0903, 0x0000 }, + { 0x0700, 0x0905, 0x0000 }, + { 0x8700, 0x0916, 0x5000 }, + { 0x8700, 0x090e, 0x4000 }, + { 0x8700, 0x090a, 0x3000 }, + { 0x8700, 0x0908, 0x2000 }, + { 0x0700, 0x0907, 0x0000 }, + { 0x0700, 0x0909, 0x0000 }, + { 0x8700, 0x090c, 0x2000 }, + { 0x0700, 0x090b, 0x0000 }, + { 0x0700, 0x090d, 0x0000 }, + { 0x8700, 0x0912, 0x3000 }, + { 0x8700, 0x0910, 0x2000 }, + { 0x0700, 0x090f, 0x0000 }, + { 0x0700, 0x0911, 0x0000 }, + { 0x8700, 0x0914, 0x2000 }, + { 0x0700, 0x0913, 0x0000 }, + { 0x0700, 0x0915, 0x0000 }, + { 0x8700, 0x091e, 0x4000 }, + { 0x8700, 0x091a, 0x3000 }, + { 0x8700, 0x0918, 0x2000 }, + { 0x0700, 0x0917, 0x0000 }, + { 0x0700, 0x0919, 0x0000 }, + { 0x8700, 0x091c, 0x2000 }, + { 0x0700, 0x091b, 0x0000 }, + { 0x0700, 0x091d, 0x0000 }, + { 0x8700, 0x0922, 0x3000 }, + { 0x8700, 0x0920, 0x2000 }, + { 0x0700, 0x091f, 0x0000 }, + { 0x0700, 0x0921, 0x0000 }, + { 0x8700, 0x0924, 0x2000 }, + { 0x0700, 0x0923, 0x0000 }, + { 0x0700, 0x0925, 0x0000 }, + { 0x8c00, 0x09cd, 0x8000 }, + { 0x8d00, 0x096d, 0x7000 }, + { 0x8c00, 0x0948, 0x6000 }, + { 0x8700, 0x0936, 0x5000 }, + { 0x8700, 0x092e, 0x4000 }, + { 0x8700, 0x092a, 0x3000 }, + { 0x8700, 0x0928, 0x2000 }, + { 0x0700, 0x0927, 0x0000 }, + { 0x0700, 0x0929, 0x0000 }, + { 0x8700, 0x092c, 0x2000 }, + { 0x0700, 0x092b, 0x0000 }, + { 0x0700, 0x092d, 0x0000 }, + { 0x8700, 0x0932, 0x3000 }, + { 0x8700, 0x0930, 0x2000 }, + { 0x0700, 0x092f, 0x0000 }, + { 0x0700, 0x0931, 0x0000 }, + { 0x8700, 0x0934, 0x2000 }, + { 0x0700, 0x0933, 0x0000 }, + { 0x0700, 0x0935, 0x0000 }, + { 0x8a00, 0x0940, 0x4000 }, + { 0x8c00, 0x093c, 0x3000 }, + { 0x8700, 0x0938, 0x2000 }, + { 0x0700, 0x0937, 0x0000 }, + { 0x0700, 0x0939, 0x0000 }, + { 0x8a00, 0x093e, 0x2000 }, + { 0x0700, 0x093d, 0x0000 }, + { 0x0a00, 0x093f, 0x0000 }, + { 0x8c00, 0x0944, 0x3000 }, + { 0x8c00, 0x0942, 0x2000 }, + { 0x0c00, 0x0941, 0x0000 }, + { 0x0c00, 0x0943, 0x0000 }, + { 0x8c00, 0x0946, 0x2000 }, + { 0x0c00, 0x0945, 0x0000 }, + { 0x0c00, 0x0947, 0x0000 }, + { 0x8700, 0x095d, 0x5000 }, + { 0x8c00, 0x0952, 0x4000 }, + { 0x8a00, 0x094c, 0x3000 }, + { 0x8a00, 0x094a, 0x2000 }, + { 0x0a00, 0x0949, 0x0000 }, + { 0x0a00, 0x094b, 0x0000 }, + { 0x8700, 0x0950, 0x2000 }, + { 0x0c00, 0x094d, 0x0000 }, + { 0x0c00, 0x0951, 0x0000 }, + { 0x8700, 0x0959, 0x3000 }, + { 0x8c00, 0x0954, 0x2000 }, + { 0x0c00, 0x0953, 0x0000 }, + { 0x0700, 0x0958, 0x0000 }, + { 0x8700, 0x095b, 0x2000 }, + { 0x0700, 0x095a, 0x0000 }, + { 0x0700, 0x095c, 0x0000 }, + { 0x9500, 0x0965, 0x4000 }, + { 0x8700, 0x0961, 0x3000 }, + { 0x8700, 0x095f, 0x2000 }, + { 0x0700, 0x095e, 0x0000 }, + { 0x0700, 0x0960, 0x0000 }, + { 0x8c00, 0x0963, 0x2000 }, + { 0x0c00, 0x0962, 0x0000 }, + { 0x1500, 0x0964, 0x0000 }, + { 0x8d00, 0x0969, 0x3000 }, + { 0x8d00, 0x0967, 0x2000 }, + { 0x0d00, 0x0966, 0x0000 }, + { 0x0d00, 0x0968, 0x0000 }, + { 0x8d00, 0x096b, 0x2000 }, + { 0x0d00, 0x096a, 0x0000 }, + { 0x0d00, 0x096c, 0x0000 }, + { 0x8700, 0x09a2, 0x6000 }, + { 0x8700, 0x0990, 0x5000 }, + { 0x8700, 0x0986, 0x4000 }, + { 0x8c00, 0x0981, 0x3000 }, + { 0x8d00, 0x096f, 0x2000 }, + { 0x0d00, 0x096e, 0x0000 }, + { 0x1500, 0x0970, 0x0000 }, + { 0x8a00, 0x0983, 0x2000 }, + { 0x0a00, 0x0982, 0x0000 }, + { 0x0700, 0x0985, 0x0000 }, + { 0x8700, 0x098a, 0x3000 }, + { 0x8700, 0x0988, 0x2000 }, + { 0x0700, 0x0987, 0x0000 }, + { 0x0700, 0x0989, 0x0000 }, + { 0x8700, 0x098c, 0x2000 }, + { 0x0700, 0x098b, 0x0000 }, + { 0x0700, 0x098f, 0x0000 }, + { 0x8700, 0x099a, 0x4000 }, + { 0x8700, 0x0996, 0x3000 }, + { 0x8700, 0x0994, 0x2000 }, + { 0x0700, 0x0993, 0x0000 }, + { 0x0700, 0x0995, 0x0000 }, + { 0x8700, 0x0998, 0x2000 }, + { 0x0700, 0x0997, 0x0000 }, + { 0x0700, 0x0999, 0x0000 }, + { 0x8700, 0x099e, 0x3000 }, + { 0x8700, 0x099c, 0x2000 }, + { 0x0700, 0x099b, 0x0000 }, + { 0x0700, 0x099d, 0x0000 }, + { 0x8700, 0x09a0, 0x2000 }, + { 0x0700, 0x099f, 0x0000 }, + { 0x0700, 0x09a1, 0x0000 }, + { 0x8700, 0x09b7, 0x5000 }, + { 0x8700, 0x09ab, 0x4000 }, + { 0x8700, 0x09a6, 0x3000 }, + { 0x8700, 0x09a4, 0x2000 }, + { 0x0700, 0x09a3, 0x0000 }, + { 0x0700, 0x09a5, 0x0000 }, + { 0x8700, 0x09a8, 0x2000 }, + { 0x0700, 0x09a7, 0x0000 }, + { 0x0700, 0x09aa, 0x0000 }, + { 0x8700, 0x09af, 0x3000 }, + { 0x8700, 0x09ad, 0x2000 }, + { 0x0700, 0x09ac, 0x0000 }, + { 0x0700, 0x09ae, 0x0000 }, + { 0x8700, 0x09b2, 0x2000 }, + { 0x0700, 0x09b0, 0x0000 }, + { 0x0700, 0x09b6, 0x0000 }, + { 0x8c00, 0x09c1, 0x4000 }, + { 0x8700, 0x09bd, 0x3000 }, + { 0x8700, 0x09b9, 0x2000 }, + { 0x0700, 0x09b8, 0x0000 }, + { 0x0c00, 0x09bc, 0x0000 }, + { 0x8a00, 0x09bf, 0x2000 }, + { 0x0a00, 0x09be, 0x0000 }, + { 0x0a00, 0x09c0, 0x0000 }, + { 0x8a00, 0x09c7, 0x3000 }, + { 0x8c00, 0x09c3, 0x2000 }, + { 0x0c00, 0x09c2, 0x0000 }, + { 0x0c00, 0x09c4, 0x0000 }, + { 0x8a00, 0x09cb, 0x2000 }, + { 0x0a00, 0x09c8, 0x0000 }, + { 0x0a00, 0x09cc, 0x0000 }, + { 0x8700, 0x0a2b, 0x7000 }, + { 0x8a00, 0x0a03, 0x6000 }, + { 0x8d00, 0x09ed, 0x5000 }, + { 0x8c00, 0x09e3, 0x4000 }, + { 0x8700, 0x09df, 0x3000 }, + { 0x8700, 0x09dc, 0x2000 }, + { 0x0a00, 0x09d7, 0x0000 }, + { 0x0700, 0x09dd, 0x0000 }, + { 0x8700, 0x09e1, 0x2000 }, + { 0x0700, 0x09e0, 0x0000 }, + { 0x0c00, 0x09e2, 0x0000 }, + { 0x8d00, 0x09e9, 0x3000 }, + { 0x8d00, 0x09e7, 0x2000 }, + { 0x0d00, 0x09e6, 0x0000 }, + { 0x0d00, 0x09e8, 0x0000 }, + { 0x8d00, 0x09eb, 0x2000 }, + { 0x0d00, 0x09ea, 0x0000 }, + { 0x0d00, 0x09ec, 0x0000 }, + { 0x8f00, 0x09f5, 0x4000 }, + { 0x8700, 0x09f1, 0x3000 }, + { 0x8d00, 0x09ef, 0x2000 }, + { 0x0d00, 0x09ee, 0x0000 }, + { 0x0700, 0x09f0, 0x0000 }, + { 0x9700, 0x09f3, 0x2000 }, + { 0x1700, 0x09f2, 0x0000 }, + { 0x0f00, 0x09f4, 0x0000 }, + { 0x8f00, 0x09f9, 0x3000 }, + { 0x8f00, 0x09f7, 0x2000 }, + { 0x0f00, 0x09f6, 0x0000 }, + { 0x0f00, 0x09f8, 0x0000 }, + { 0x8c00, 0x0a01, 0x2000 }, + { 0x1a00, 0x09fa, 0x0000 }, + { 0x0c00, 0x0a02, 0x0000 }, + { 0x8700, 0x0a1a, 0x5000 }, + { 0x8700, 0x0a10, 0x4000 }, + { 0x8700, 0x0a08, 0x3000 }, + { 0x8700, 0x0a06, 0x2000 }, + { 0x0700, 0x0a05, 0x0000 }, + { 0x0700, 0x0a07, 0x0000 }, + { 0x8700, 0x0a0a, 0x2000 }, + { 0x0700, 0x0a09, 0x0000 }, + { 0x0700, 0x0a0f, 0x0000 }, + { 0x8700, 0x0a16, 0x3000 }, + { 0x8700, 0x0a14, 0x2000 }, + { 0x0700, 0x0a13, 0x0000 }, + { 0x0700, 0x0a15, 0x0000 }, + { 0x8700, 0x0a18, 0x2000 }, + { 0x0700, 0x0a17, 0x0000 }, + { 0x0700, 0x0a19, 0x0000 }, + { 0x8700, 0x0a22, 0x4000 }, + { 0x8700, 0x0a1e, 0x3000 }, + { 0x8700, 0x0a1c, 0x2000 }, + { 0x0700, 0x0a1b, 0x0000 }, + { 0x0700, 0x0a1d, 0x0000 }, + { 0x8700, 0x0a20, 0x2000 }, + { 0x0700, 0x0a1f, 0x0000 }, + { 0x0700, 0x0a21, 0x0000 }, + { 0x8700, 0x0a26, 0x3000 }, + { 0x8700, 0x0a24, 0x2000 }, + { 0x0700, 0x0a23, 0x0000 }, + { 0x0700, 0x0a25, 0x0000 }, + { 0x8700, 0x0a28, 0x2000 }, + { 0x0700, 0x0a27, 0x0000 }, + { 0x0700, 0x0a2a, 0x0000 }, + { 0x8d00, 0x0a6a, 0x6000 }, + { 0x8c00, 0x0a41, 0x5000 }, + { 0x8700, 0x0a35, 0x4000 }, + { 0x8700, 0x0a2f, 0x3000 }, + { 0x8700, 0x0a2d, 0x2000 }, + { 0x0700, 0x0a2c, 0x0000 }, + { 0x0700, 0x0a2e, 0x0000 }, + { 0x8700, 0x0a32, 0x2000 }, + { 0x0700, 0x0a30, 0x0000 }, + { 0x0700, 0x0a33, 0x0000 }, + { 0x8c00, 0x0a3c, 0x3000 }, + { 0x8700, 0x0a38, 0x2000 }, + { 0x0700, 0x0a36, 0x0000 }, + { 0x0700, 0x0a39, 0x0000 }, + { 0x8a00, 0x0a3f, 0x2000 }, + { 0x0a00, 0x0a3e, 0x0000 }, + { 0x0a00, 0x0a40, 0x0000 }, + { 0x8700, 0x0a5a, 0x4000 }, + { 0x8c00, 0x0a4b, 0x3000 }, + { 0x8c00, 0x0a47, 0x2000 }, + { 0x0c00, 0x0a42, 0x0000 }, + { 0x0c00, 0x0a48, 0x0000 }, + { 0x8c00, 0x0a4d, 0x2000 }, + { 0x0c00, 0x0a4c, 0x0000 }, + { 0x0700, 0x0a59, 0x0000 }, + { 0x8d00, 0x0a66, 0x3000 }, + { 0x8700, 0x0a5c, 0x2000 }, + { 0x0700, 0x0a5b, 0x0000 }, + { 0x0700, 0x0a5e, 0x0000 }, + { 0x8d00, 0x0a68, 0x2000 }, + { 0x0d00, 0x0a67, 0x0000 }, + { 0x0d00, 0x0a69, 0x0000 }, + { 0x8700, 0x0a87, 0x5000 }, + { 0x8700, 0x0a72, 0x4000 }, + { 0x8d00, 0x0a6e, 0x3000 }, + { 0x8d00, 0x0a6c, 0x2000 }, + { 0x0d00, 0x0a6b, 0x0000 }, + { 0x0d00, 0x0a6d, 0x0000 }, + { 0x8c00, 0x0a70, 0x2000 }, + { 0x0d00, 0x0a6f, 0x0000 }, + { 0x0c00, 0x0a71, 0x0000 }, + { 0x8c00, 0x0a82, 0x3000 }, + { 0x8700, 0x0a74, 0x2000 }, + { 0x0700, 0x0a73, 0x0000 }, + { 0x0c00, 0x0a81, 0x0000 }, + { 0x8700, 0x0a85, 0x2000 }, + { 0x0a00, 0x0a83, 0x0000 }, + { 0x0700, 0x0a86, 0x0000 }, + { 0x8700, 0x0a90, 0x4000 }, + { 0x8700, 0x0a8b, 0x3000 }, + { 0x8700, 0x0a89, 0x2000 }, + { 0x0700, 0x0a88, 0x0000 }, + { 0x0700, 0x0a8a, 0x0000 }, + { 0x8700, 0x0a8d, 0x2000 }, + { 0x0700, 0x0a8c, 0x0000 }, + { 0x0700, 0x0a8f, 0x0000 }, + { 0x8700, 0x0a95, 0x3000 }, + { 0x8700, 0x0a93, 0x2000 }, + { 0x0700, 0x0a91, 0x0000 }, + { 0x0700, 0x0a94, 0x0000 }, + { 0x8700, 0x0a97, 0x2000 }, + { 0x0700, 0x0a96, 0x0000 }, + { 0x0700, 0x0a98, 0x0000 }, + { 0x8700, 0x10ef, 0xb000 }, + { 0x8700, 0x0dc6, 0xa000 }, + { 0x8700, 0x0c31, 0x9000 }, + { 0x8700, 0x0b5f, 0x8000 }, + { 0x8a00, 0x0b03, 0x7000 }, + { 0x8a00, 0x0abe, 0x6000 }, + { 0x8700, 0x0aaa, 0x5000 }, + { 0x8700, 0x0aa1, 0x4000 }, + { 0x8700, 0x0a9d, 0x3000 }, + { 0x8700, 0x0a9b, 0x2000 }, + { 0x0700, 0x0a9a, 0x0000 }, + { 0x0700, 0x0a9c, 0x0000 }, + { 0x8700, 0x0a9f, 0x2000 }, + { 0x0700, 0x0a9e, 0x0000 }, + { 0x0700, 0x0aa0, 0x0000 }, + { 0x8700, 0x0aa5, 0x3000 }, + { 0x8700, 0x0aa3, 0x2000 }, + { 0x0700, 0x0aa2, 0x0000 }, + { 0x0700, 0x0aa4, 0x0000 }, + { 0x8700, 0x0aa7, 0x2000 }, + { 0x0700, 0x0aa6, 0x0000 }, + { 0x0700, 0x0aa8, 0x0000 }, + { 0x8700, 0x0ab3, 0x4000 }, + { 0x8700, 0x0aae, 0x3000 }, + { 0x8700, 0x0aac, 0x2000 }, + { 0x0700, 0x0aab, 0x0000 }, + { 0x0700, 0x0aad, 0x0000 }, + { 0x8700, 0x0ab0, 0x2000 }, + { 0x0700, 0x0aaf, 0x0000 }, + { 0x0700, 0x0ab2, 0x0000 }, + { 0x8700, 0x0ab8, 0x3000 }, + { 0x8700, 0x0ab6, 0x2000 }, + { 0x0700, 0x0ab5, 0x0000 }, + { 0x0700, 0x0ab7, 0x0000 }, + { 0x8c00, 0x0abc, 0x2000 }, + { 0x0700, 0x0ab9, 0x0000 }, + { 0x0700, 0x0abd, 0x0000 }, + { 0x8700, 0x0ae1, 0x5000 }, + { 0x8c00, 0x0ac7, 0x4000 }, + { 0x8c00, 0x0ac2, 0x3000 }, + { 0x8a00, 0x0ac0, 0x2000 }, + { 0x0a00, 0x0abf, 0x0000 }, + { 0x0c00, 0x0ac1, 0x0000 }, + { 0x8c00, 0x0ac4, 0x2000 }, + { 0x0c00, 0x0ac3, 0x0000 }, + { 0x0c00, 0x0ac5, 0x0000 }, + { 0x8a00, 0x0acc, 0x3000 }, + { 0x8a00, 0x0ac9, 0x2000 }, + { 0x0c00, 0x0ac8, 0x0000 }, + { 0x0a00, 0x0acb, 0x0000 }, + { 0x8700, 0x0ad0, 0x2000 }, + { 0x0c00, 0x0acd, 0x0000 }, + { 0x0700, 0x0ae0, 0x0000 }, + { 0x8d00, 0x0aeb, 0x4000 }, + { 0x8d00, 0x0ae7, 0x3000 }, + { 0x8c00, 0x0ae3, 0x2000 }, + { 0x0c00, 0x0ae2, 0x0000 }, + { 0x0d00, 0x0ae6, 0x0000 }, + { 0x8d00, 0x0ae9, 0x2000 }, + { 0x0d00, 0x0ae8, 0x0000 }, + { 0x0d00, 0x0aea, 0x0000 }, + { 0x8d00, 0x0aef, 0x3000 }, + { 0x8d00, 0x0aed, 0x2000 }, + { 0x0d00, 0x0aec, 0x0000 }, + { 0x0d00, 0x0aee, 0x0000 }, + { 0x8c00, 0x0b01, 0x2000 }, + { 0x1700, 0x0af1, 0x0000 }, + { 0x0a00, 0x0b02, 0x0000 }, + { 0x8700, 0x0b28, 0x6000 }, + { 0x8700, 0x0b18, 0x5000 }, + { 0x8700, 0x0b0c, 0x4000 }, + { 0x8700, 0x0b08, 0x3000 }, + { 0x8700, 0x0b06, 0x2000 }, + { 0x0700, 0x0b05, 0x0000 }, + { 0x0700, 0x0b07, 0x0000 }, + { 0x8700, 0x0b0a, 0x2000 }, + { 0x0700, 0x0b09, 0x0000 }, + { 0x0700, 0x0b0b, 0x0000 }, + { 0x8700, 0x0b14, 0x3000 }, + { 0x8700, 0x0b10, 0x2000 }, + { 0x0700, 0x0b0f, 0x0000 }, + { 0x0700, 0x0b13, 0x0000 }, + { 0x8700, 0x0b16, 0x2000 }, + { 0x0700, 0x0b15, 0x0000 }, + { 0x0700, 0x0b17, 0x0000 }, + { 0x8700, 0x0b20, 0x4000 }, + { 0x8700, 0x0b1c, 0x3000 }, + { 0x8700, 0x0b1a, 0x2000 }, + { 0x0700, 0x0b19, 0x0000 }, + { 0x0700, 0x0b1b, 0x0000 }, + { 0x8700, 0x0b1e, 0x2000 }, + { 0x0700, 0x0b1d, 0x0000 }, + { 0x0700, 0x0b1f, 0x0000 }, + { 0x8700, 0x0b24, 0x3000 }, + { 0x8700, 0x0b22, 0x2000 }, + { 0x0700, 0x0b21, 0x0000 }, + { 0x0700, 0x0b23, 0x0000 }, + { 0x8700, 0x0b26, 0x2000 }, + { 0x0700, 0x0b25, 0x0000 }, + { 0x0700, 0x0b27, 0x0000 }, + { 0x8700, 0x0b3d, 0x5000 }, + { 0x8700, 0x0b32, 0x4000 }, + { 0x8700, 0x0b2d, 0x3000 }, + { 0x8700, 0x0b2b, 0x2000 }, + { 0x0700, 0x0b2a, 0x0000 }, + { 0x0700, 0x0b2c, 0x0000 }, + { 0x8700, 0x0b2f, 0x2000 }, + { 0x0700, 0x0b2e, 0x0000 }, + { 0x0700, 0x0b30, 0x0000 }, + { 0x8700, 0x0b37, 0x3000 }, + { 0x8700, 0x0b35, 0x2000 }, + { 0x0700, 0x0b33, 0x0000 }, + { 0x0700, 0x0b36, 0x0000 }, + { 0x8700, 0x0b39, 0x2000 }, + { 0x0700, 0x0b38, 0x0000 }, + { 0x0c00, 0x0b3c, 0x0000 }, + { 0x8a00, 0x0b48, 0x4000 }, + { 0x8c00, 0x0b41, 0x3000 }, + { 0x8c00, 0x0b3f, 0x2000 }, + { 0x0a00, 0x0b3e, 0x0000 }, + { 0x0a00, 0x0b40, 0x0000 }, + { 0x8c00, 0x0b43, 0x2000 }, + { 0x0c00, 0x0b42, 0x0000 }, + { 0x0a00, 0x0b47, 0x0000 }, + { 0x8c00, 0x0b56, 0x3000 }, + { 0x8a00, 0x0b4c, 0x2000 }, + { 0x0a00, 0x0b4b, 0x0000 }, + { 0x0c00, 0x0b4d, 0x0000 }, + { 0x8700, 0x0b5c, 0x2000 }, + { 0x0a00, 0x0b57, 0x0000 }, + { 0x0700, 0x0b5d, 0x0000 }, + { 0x8d00, 0x0be7, 0x7000 }, + { 0x8700, 0x0b9c, 0x6000 }, + { 0x8700, 0x0b83, 0x5000 }, + { 0x8d00, 0x0b6b, 0x4000 }, + { 0x8d00, 0x0b67, 0x3000 }, + { 0x8700, 0x0b61, 0x2000 }, + { 0x0700, 0x0b60, 0x0000 }, + { 0x0d00, 0x0b66, 0x0000 }, + { 0x8d00, 0x0b69, 0x2000 }, + { 0x0d00, 0x0b68, 0x0000 }, + { 0x0d00, 0x0b6a, 0x0000 }, + { 0x8d00, 0x0b6f, 0x3000 }, + { 0x8d00, 0x0b6d, 0x2000 }, + { 0x0d00, 0x0b6c, 0x0000 }, + { 0x0d00, 0x0b6e, 0x0000 }, + { 0x8700, 0x0b71, 0x2000 }, + { 0x1a00, 0x0b70, 0x0000 }, + { 0x0c00, 0x0b82, 0x0000 }, + { 0x8700, 0x0b8f, 0x4000 }, + { 0x8700, 0x0b88, 0x3000 }, + { 0x8700, 0x0b86, 0x2000 }, + { 0x0700, 0x0b85, 0x0000 }, + { 0x0700, 0x0b87, 0x0000 }, + { 0x8700, 0x0b8a, 0x2000 }, + { 0x0700, 0x0b89, 0x0000 }, + { 0x0700, 0x0b8e, 0x0000 }, + { 0x8700, 0x0b94, 0x3000 }, + { 0x8700, 0x0b92, 0x2000 }, + { 0x0700, 0x0b90, 0x0000 }, + { 0x0700, 0x0b93, 0x0000 }, + { 0x8700, 0x0b99, 0x2000 }, + { 0x0700, 0x0b95, 0x0000 }, + { 0x0700, 0x0b9a, 0x0000 }, + { 0x8700, 0x0bb7, 0x5000 }, + { 0x8700, 0x0bae, 0x4000 }, + { 0x8700, 0x0ba4, 0x3000 }, + { 0x8700, 0x0b9f, 0x2000 }, + { 0x0700, 0x0b9e, 0x0000 }, + { 0x0700, 0x0ba3, 0x0000 }, + { 0x8700, 0x0ba9, 0x2000 }, + { 0x0700, 0x0ba8, 0x0000 }, + { 0x0700, 0x0baa, 0x0000 }, + { 0x8700, 0x0bb2, 0x3000 }, + { 0x8700, 0x0bb0, 0x2000 }, + { 0x0700, 0x0baf, 0x0000 }, + { 0x0700, 0x0bb1, 0x0000 }, + { 0x8700, 0x0bb4, 0x2000 }, + { 0x0700, 0x0bb3, 0x0000 }, + { 0x0700, 0x0bb5, 0x0000 }, + { 0x8a00, 0x0bc6, 0x4000 }, + { 0x8a00, 0x0bbf, 0x3000 }, + { 0x8700, 0x0bb9, 0x2000 }, + { 0x0700, 0x0bb8, 0x0000 }, + { 0x0a00, 0x0bbe, 0x0000 }, + { 0x8a00, 0x0bc1, 0x2000 }, + { 0x0c00, 0x0bc0, 0x0000 }, + { 0x0a00, 0x0bc2, 0x0000 }, + { 0x8a00, 0x0bcb, 0x3000 }, + { 0x8a00, 0x0bc8, 0x2000 }, + { 0x0a00, 0x0bc7, 0x0000 }, + { 0x0a00, 0x0bca, 0x0000 }, + { 0x8c00, 0x0bcd, 0x2000 }, + { 0x0a00, 0x0bcc, 0x0000 }, + { 0x0a00, 0x0bd7, 0x0000 }, + { 0x8700, 0x0c0f, 0x6000 }, + { 0x9a00, 0x0bf7, 0x5000 }, + { 0x8d00, 0x0bef, 0x4000 }, + { 0x8d00, 0x0beb, 0x3000 }, + { 0x8d00, 0x0be9, 0x2000 }, + { 0x0d00, 0x0be8, 0x0000 }, + { 0x0d00, 0x0bea, 0x0000 }, + { 0x8d00, 0x0bed, 0x2000 }, + { 0x0d00, 0x0bec, 0x0000 }, + { 0x0d00, 0x0bee, 0x0000 }, + { 0x9a00, 0x0bf3, 0x3000 }, + { 0x8f00, 0x0bf1, 0x2000 }, + { 0x0f00, 0x0bf0, 0x0000 }, + { 0x0f00, 0x0bf2, 0x0000 }, + { 0x9a00, 0x0bf5, 0x2000 }, + { 0x1a00, 0x0bf4, 0x0000 }, + { 0x1a00, 0x0bf6, 0x0000 }, + { 0x8700, 0x0c06, 0x4000 }, + { 0x8a00, 0x0c01, 0x3000 }, + { 0x9700, 0x0bf9, 0x2000 }, + { 0x1a00, 0x0bf8, 0x0000 }, + { 0x1a00, 0x0bfa, 0x0000 }, + { 0x8a00, 0x0c03, 0x2000 }, + { 0x0a00, 0x0c02, 0x0000 }, + { 0x0700, 0x0c05, 0x0000 }, + { 0x8700, 0x0c0a, 0x3000 }, + { 0x8700, 0x0c08, 0x2000 }, + { 0x0700, 0x0c07, 0x0000 }, + { 0x0700, 0x0c09, 0x0000 }, + { 0x8700, 0x0c0c, 0x2000 }, + { 0x0700, 0x0c0b, 0x0000 }, + { 0x0700, 0x0c0e, 0x0000 }, + { 0x8700, 0x0c20, 0x5000 }, + { 0x8700, 0x0c18, 0x4000 }, + { 0x8700, 0x0c14, 0x3000 }, + { 0x8700, 0x0c12, 0x2000 }, + { 0x0700, 0x0c10, 0x0000 }, + { 0x0700, 0x0c13, 0x0000 }, + { 0x8700, 0x0c16, 0x2000 }, + { 0x0700, 0x0c15, 0x0000 }, + { 0x0700, 0x0c17, 0x0000 }, + { 0x8700, 0x0c1c, 0x3000 }, + { 0x8700, 0x0c1a, 0x2000 }, + { 0x0700, 0x0c19, 0x0000 }, + { 0x0700, 0x0c1b, 0x0000 }, + { 0x8700, 0x0c1e, 0x2000 }, + { 0x0700, 0x0c1d, 0x0000 }, + { 0x0700, 0x0c1f, 0x0000 }, + { 0x8700, 0x0c28, 0x4000 }, + { 0x8700, 0x0c24, 0x3000 }, + { 0x8700, 0x0c22, 0x2000 }, + { 0x0700, 0x0c21, 0x0000 }, + { 0x0700, 0x0c23, 0x0000 }, + { 0x8700, 0x0c26, 0x2000 }, + { 0x0700, 0x0c25, 0x0000 }, + { 0x0700, 0x0c27, 0x0000 }, + { 0x8700, 0x0c2d, 0x3000 }, + { 0x8700, 0x0c2b, 0x2000 }, + { 0x0700, 0x0c2a, 0x0000 }, + { 0x0700, 0x0c2c, 0x0000 }, + { 0x8700, 0x0c2f, 0x2000 }, + { 0x0700, 0x0c2e, 0x0000 }, + { 0x0700, 0x0c30, 0x0000 }, + { 0x8700, 0x0d0e, 0x8000 }, + { 0x8700, 0x0ca1, 0x7000 }, + { 0x8d00, 0x0c6c, 0x6000 }, + { 0x8c00, 0x0c47, 0x5000 }, + { 0x8c00, 0x0c3e, 0x4000 }, + { 0x8700, 0x0c36, 0x3000 }, + { 0x8700, 0x0c33, 0x2000 }, + { 0x0700, 0x0c32, 0x0000 }, + { 0x0700, 0x0c35, 0x0000 }, + { 0x8700, 0x0c38, 0x2000 }, + { 0x0700, 0x0c37, 0x0000 }, + { 0x0700, 0x0c39, 0x0000 }, + { 0x8a00, 0x0c42, 0x3000 }, + { 0x8c00, 0x0c40, 0x2000 }, + { 0x0c00, 0x0c3f, 0x0000 }, + { 0x0a00, 0x0c41, 0x0000 }, + { 0x8a00, 0x0c44, 0x2000 }, + { 0x0a00, 0x0c43, 0x0000 }, + { 0x0c00, 0x0c46, 0x0000 }, + { 0x8700, 0x0c60, 0x4000 }, + { 0x8c00, 0x0c4c, 0x3000 }, + { 0x8c00, 0x0c4a, 0x2000 }, + { 0x0c00, 0x0c48, 0x0000 }, + { 0x0c00, 0x0c4b, 0x0000 }, + { 0x8c00, 0x0c55, 0x2000 }, + { 0x0c00, 0x0c4d, 0x0000 }, + { 0x0c00, 0x0c56, 0x0000 }, + { 0x8d00, 0x0c68, 0x3000 }, + { 0x8d00, 0x0c66, 0x2000 }, + { 0x0700, 0x0c61, 0x0000 }, + { 0x0d00, 0x0c67, 0x0000 }, + { 0x8d00, 0x0c6a, 0x2000 }, + { 0x0d00, 0x0c69, 0x0000 }, + { 0x0d00, 0x0c6b, 0x0000 }, + { 0x8700, 0x0c90, 0x5000 }, + { 0x8700, 0x0c87, 0x4000 }, + { 0x8a00, 0x0c82, 0x3000 }, + { 0x8d00, 0x0c6e, 0x2000 }, + { 0x0d00, 0x0c6d, 0x0000 }, + { 0x0d00, 0x0c6f, 0x0000 }, + { 0x8700, 0x0c85, 0x2000 }, + { 0x0a00, 0x0c83, 0x0000 }, + { 0x0700, 0x0c86, 0x0000 }, + { 0x8700, 0x0c8b, 0x3000 }, + { 0x8700, 0x0c89, 0x2000 }, + { 0x0700, 0x0c88, 0x0000 }, + { 0x0700, 0x0c8a, 0x0000 }, + { 0x8700, 0x0c8e, 0x2000 }, + { 0x0700, 0x0c8c, 0x0000 }, + { 0x0700, 0x0c8f, 0x0000 }, + { 0x8700, 0x0c99, 0x4000 }, + { 0x8700, 0x0c95, 0x3000 }, + { 0x8700, 0x0c93, 0x2000 }, + { 0x0700, 0x0c92, 0x0000 }, + { 0x0700, 0x0c94, 0x0000 }, + { 0x8700, 0x0c97, 0x2000 }, + { 0x0700, 0x0c96, 0x0000 }, + { 0x0700, 0x0c98, 0x0000 }, + { 0x8700, 0x0c9d, 0x3000 }, + { 0x8700, 0x0c9b, 0x2000 }, + { 0x0700, 0x0c9a, 0x0000 }, + { 0x0700, 0x0c9c, 0x0000 }, + { 0x8700, 0x0c9f, 0x2000 }, + { 0x0700, 0x0c9e, 0x0000 }, + { 0x0700, 0x0ca0, 0x0000 }, + { 0x8c00, 0x0cc6, 0x6000 }, + { 0x8700, 0x0cb2, 0x5000 }, + { 0x8700, 0x0caa, 0x4000 }, + { 0x8700, 0x0ca5, 0x3000 }, + { 0x8700, 0x0ca3, 0x2000 }, + { 0x0700, 0x0ca2, 0x0000 }, + { 0x0700, 0x0ca4, 0x0000 }, + { 0x8700, 0x0ca7, 0x2000 }, + { 0x0700, 0x0ca6, 0x0000 }, + { 0x0700, 0x0ca8, 0x0000 }, + { 0x8700, 0x0cae, 0x3000 }, + { 0x8700, 0x0cac, 0x2000 }, + { 0x0700, 0x0cab, 0x0000 }, + { 0x0700, 0x0cad, 0x0000 }, + { 0x8700, 0x0cb0, 0x2000 }, + { 0x0700, 0x0caf, 0x0000 }, + { 0x0700, 0x0cb1, 0x0000 }, + { 0x8700, 0x0cbd, 0x4000 }, + { 0x8700, 0x0cb7, 0x3000 }, + { 0x8700, 0x0cb5, 0x2000 }, + { 0x0700, 0x0cb3, 0x0000 }, + { 0x0700, 0x0cb6, 0x0000 }, + { 0x8700, 0x0cb9, 0x2000 }, + { 0x0700, 0x0cb8, 0x0000 }, + { 0x0c00, 0x0cbc, 0x0000 }, + { 0x8a00, 0x0cc1, 0x3000 }, + { 0x8c00, 0x0cbf, 0x2000 }, + { 0x0a00, 0x0cbe, 0x0000 }, + { 0x0a00, 0x0cc0, 0x0000 }, + { 0x8a00, 0x0cc3, 0x2000 }, + { 0x0a00, 0x0cc2, 0x0000 }, + { 0x0a00, 0x0cc4, 0x0000 }, + { 0x8d00, 0x0cea, 0x5000 }, + { 0x8a00, 0x0cd6, 0x4000 }, + { 0x8a00, 0x0ccb, 0x3000 }, + { 0x8a00, 0x0cc8, 0x2000 }, + { 0x0a00, 0x0cc7, 0x0000 }, + { 0x0a00, 0x0cca, 0x0000 }, + { 0x8c00, 0x0ccd, 0x2000 }, + { 0x0c00, 0x0ccc, 0x0000 }, + { 0x0a00, 0x0cd5, 0x0000 }, + { 0x8d00, 0x0ce6, 0x3000 }, + { 0x8700, 0x0ce0, 0x2000 }, + { 0x0700, 0x0cde, 0x0000 }, + { 0x0700, 0x0ce1, 0x0000 }, + { 0x8d00, 0x0ce8, 0x2000 }, + { 0x0d00, 0x0ce7, 0x0000 }, + { 0x0d00, 0x0ce9, 0x0000 }, + { 0x8700, 0x0d05, 0x4000 }, + { 0x8d00, 0x0cee, 0x3000 }, + { 0x8d00, 0x0cec, 0x2000 }, + { 0x0d00, 0x0ceb, 0x0000 }, + { 0x0d00, 0x0ced, 0x0000 }, + { 0x8a00, 0x0d02, 0x2000 }, + { 0x0d00, 0x0cef, 0x0000 }, + { 0x0a00, 0x0d03, 0x0000 }, + { 0x8700, 0x0d09, 0x3000 }, + { 0x8700, 0x0d07, 0x2000 }, + { 0x0700, 0x0d06, 0x0000 }, + { 0x0700, 0x0d08, 0x0000 }, + { 0x8700, 0x0d0b, 0x2000 }, + { 0x0700, 0x0d0a, 0x0000 }, + { 0x0700, 0x0d0c, 0x0000 }, + { 0x8d00, 0x0d6c, 0x7000 }, + { 0x8700, 0x0d30, 0x6000 }, + { 0x8700, 0x0d1f, 0x5000 }, + { 0x8700, 0x0d17, 0x4000 }, + { 0x8700, 0x0d13, 0x3000 }, + { 0x8700, 0x0d10, 0x2000 }, + { 0x0700, 0x0d0f, 0x0000 }, + { 0x0700, 0x0d12, 0x0000 }, + { 0x8700, 0x0d15, 0x2000 }, + { 0x0700, 0x0d14, 0x0000 }, + { 0x0700, 0x0d16, 0x0000 }, + { 0x8700, 0x0d1b, 0x3000 }, + { 0x8700, 0x0d19, 0x2000 }, + { 0x0700, 0x0d18, 0x0000 }, + { 0x0700, 0x0d1a, 0x0000 }, + { 0x8700, 0x0d1d, 0x2000 }, + { 0x0700, 0x0d1c, 0x0000 }, + { 0x0700, 0x0d1e, 0x0000 }, + { 0x8700, 0x0d27, 0x4000 }, + { 0x8700, 0x0d23, 0x3000 }, + { 0x8700, 0x0d21, 0x2000 }, + { 0x0700, 0x0d20, 0x0000 }, + { 0x0700, 0x0d22, 0x0000 }, + { 0x8700, 0x0d25, 0x2000 }, + { 0x0700, 0x0d24, 0x0000 }, + { 0x0700, 0x0d26, 0x0000 }, + { 0x8700, 0x0d2c, 0x3000 }, + { 0x8700, 0x0d2a, 0x2000 }, + { 0x0700, 0x0d28, 0x0000 }, + { 0x0700, 0x0d2b, 0x0000 }, + { 0x8700, 0x0d2e, 0x2000 }, + { 0x0700, 0x0d2d, 0x0000 }, + { 0x0700, 0x0d2f, 0x0000 }, + { 0x8a00, 0x0d46, 0x5000 }, + { 0x8700, 0x0d38, 0x4000 }, + { 0x8700, 0x0d34, 0x3000 }, + { 0x8700, 0x0d32, 0x2000 }, + { 0x0700, 0x0d31, 0x0000 }, + { 0x0700, 0x0d33, 0x0000 }, + { 0x8700, 0x0d36, 0x2000 }, + { 0x0700, 0x0d35, 0x0000 }, + { 0x0700, 0x0d37, 0x0000 }, + { 0x8a00, 0x0d40, 0x3000 }, + { 0x8a00, 0x0d3e, 0x2000 }, + { 0x0700, 0x0d39, 0x0000 }, + { 0x0a00, 0x0d3f, 0x0000 }, + { 0x8c00, 0x0d42, 0x2000 }, + { 0x0c00, 0x0d41, 0x0000 }, + { 0x0c00, 0x0d43, 0x0000 }, + { 0x8700, 0x0d60, 0x4000 }, + { 0x8a00, 0x0d4b, 0x3000 }, + { 0x8a00, 0x0d48, 0x2000 }, + { 0x0a00, 0x0d47, 0x0000 }, + { 0x0a00, 0x0d4a, 0x0000 }, + { 0x8c00, 0x0d4d, 0x2000 }, + { 0x0a00, 0x0d4c, 0x0000 }, + { 0x0a00, 0x0d57, 0x0000 }, + { 0x8d00, 0x0d68, 0x3000 }, + { 0x8d00, 0x0d66, 0x2000 }, + { 0x0700, 0x0d61, 0x0000 }, + { 0x0d00, 0x0d67, 0x0000 }, + { 0x8d00, 0x0d6a, 0x2000 }, + { 0x0d00, 0x0d69, 0x0000 }, + { 0x0d00, 0x0d6b, 0x0000 }, + { 0x8700, 0x0da2, 0x6000 }, + { 0x8700, 0x0d8f, 0x5000 }, + { 0x8700, 0x0d87, 0x4000 }, + { 0x8a00, 0x0d82, 0x3000 }, + { 0x8d00, 0x0d6e, 0x2000 }, + { 0x0d00, 0x0d6d, 0x0000 }, + { 0x0d00, 0x0d6f, 0x0000 }, + { 0x8700, 0x0d85, 0x2000 }, + { 0x0a00, 0x0d83, 0x0000 }, + { 0x0700, 0x0d86, 0x0000 }, + { 0x8700, 0x0d8b, 0x3000 }, + { 0x8700, 0x0d89, 0x2000 }, + { 0x0700, 0x0d88, 0x0000 }, + { 0x0700, 0x0d8a, 0x0000 }, + { 0x8700, 0x0d8d, 0x2000 }, + { 0x0700, 0x0d8c, 0x0000 }, + { 0x0700, 0x0d8e, 0x0000 }, + { 0x8700, 0x0d9a, 0x4000 }, + { 0x8700, 0x0d93, 0x3000 }, + { 0x8700, 0x0d91, 0x2000 }, + { 0x0700, 0x0d90, 0x0000 }, + { 0x0700, 0x0d92, 0x0000 }, + { 0x8700, 0x0d95, 0x2000 }, + { 0x0700, 0x0d94, 0x0000 }, + { 0x0700, 0x0d96, 0x0000 }, + { 0x8700, 0x0d9e, 0x3000 }, + { 0x8700, 0x0d9c, 0x2000 }, + { 0x0700, 0x0d9b, 0x0000 }, + { 0x0700, 0x0d9d, 0x0000 }, + { 0x8700, 0x0da0, 0x2000 }, + { 0x0700, 0x0d9f, 0x0000 }, + { 0x0700, 0x0da1, 0x0000 }, + { 0x8700, 0x0db3, 0x5000 }, + { 0x8700, 0x0daa, 0x4000 }, + { 0x8700, 0x0da6, 0x3000 }, + { 0x8700, 0x0da4, 0x2000 }, + { 0x0700, 0x0da3, 0x0000 }, + { 0x0700, 0x0da5, 0x0000 }, + { 0x8700, 0x0da8, 0x2000 }, + { 0x0700, 0x0da7, 0x0000 }, + { 0x0700, 0x0da9, 0x0000 }, + { 0x8700, 0x0dae, 0x3000 }, + { 0x8700, 0x0dac, 0x2000 }, + { 0x0700, 0x0dab, 0x0000 }, + { 0x0700, 0x0dad, 0x0000 }, + { 0x8700, 0x0db0, 0x2000 }, + { 0x0700, 0x0daf, 0x0000 }, + { 0x0700, 0x0db1, 0x0000 }, + { 0x8700, 0x0dbb, 0x4000 }, + { 0x8700, 0x0db7, 0x3000 }, + { 0x8700, 0x0db5, 0x2000 }, + { 0x0700, 0x0db4, 0x0000 }, + { 0x0700, 0x0db6, 0x0000 }, + { 0x8700, 0x0db9, 0x2000 }, + { 0x0700, 0x0db8, 0x0000 }, + { 0x0700, 0x0dba, 0x0000 }, + { 0x8700, 0x0dc2, 0x3000 }, + { 0x8700, 0x0dc0, 0x2000 }, + { 0x0700, 0x0dbd, 0x0000 }, + { 0x0700, 0x0dc1, 0x0000 }, + { 0x8700, 0x0dc4, 0x2000 }, + { 0x0700, 0x0dc3, 0x0000 }, + { 0x0700, 0x0dc5, 0x0000 }, + { 0x8700, 0x0f55, 0x9000 }, + { 0x8700, 0x0ea5, 0x8000 }, + { 0x8700, 0x0e2d, 0x7000 }, + { 0x8700, 0x0e0d, 0x6000 }, + { 0x8a00, 0x0ddf, 0x5000 }, + { 0x8c00, 0x0dd6, 0x4000 }, + { 0x8a00, 0x0dd1, 0x3000 }, + { 0x8a00, 0x0dcf, 0x2000 }, + { 0x0c00, 0x0dca, 0x0000 }, + { 0x0a00, 0x0dd0, 0x0000 }, + { 0x8c00, 0x0dd3, 0x2000 }, + { 0x0c00, 0x0dd2, 0x0000 }, + { 0x0c00, 0x0dd4, 0x0000 }, + { 0x8a00, 0x0ddb, 0x3000 }, + { 0x8a00, 0x0dd9, 0x2000 }, + { 0x0a00, 0x0dd8, 0x0000 }, + { 0x0a00, 0x0dda, 0x0000 }, + { 0x8a00, 0x0ddd, 0x2000 }, + { 0x0a00, 0x0ddc, 0x0000 }, + { 0x0a00, 0x0dde, 0x0000 }, + { 0x8700, 0x0e05, 0x4000 }, + { 0x8700, 0x0e01, 0x3000 }, + { 0x8a00, 0x0df3, 0x2000 }, + { 0x0a00, 0x0df2, 0x0000 }, + { 0x1500, 0x0df4, 0x0000 }, + { 0x8700, 0x0e03, 0x2000 }, + { 0x0700, 0x0e02, 0x0000 }, + { 0x0700, 0x0e04, 0x0000 }, + { 0x8700, 0x0e09, 0x3000 }, + { 0x8700, 0x0e07, 0x2000 }, + { 0x0700, 0x0e06, 0x0000 }, + { 0x0700, 0x0e08, 0x0000 }, + { 0x8700, 0x0e0b, 0x2000 }, + { 0x0700, 0x0e0a, 0x0000 }, + { 0x0700, 0x0e0c, 0x0000 }, + { 0x8700, 0x0e1d, 0x5000 }, + { 0x8700, 0x0e15, 0x4000 }, + { 0x8700, 0x0e11, 0x3000 }, + { 0x8700, 0x0e0f, 0x2000 }, + { 0x0700, 0x0e0e, 0x0000 }, + { 0x0700, 0x0e10, 0x0000 }, + { 0x8700, 0x0e13, 0x2000 }, + { 0x0700, 0x0e12, 0x0000 }, + { 0x0700, 0x0e14, 0x0000 }, + { 0x8700, 0x0e19, 0x3000 }, + { 0x8700, 0x0e17, 0x2000 }, + { 0x0700, 0x0e16, 0x0000 }, + { 0x0700, 0x0e18, 0x0000 }, + { 0x8700, 0x0e1b, 0x2000 }, + { 0x0700, 0x0e1a, 0x0000 }, + { 0x0700, 0x0e1c, 0x0000 }, + { 0x8700, 0x0e25, 0x4000 }, + { 0x8700, 0x0e21, 0x3000 }, + { 0x8700, 0x0e1f, 0x2000 }, + { 0x0700, 0x0e1e, 0x0000 }, + { 0x0700, 0x0e20, 0x0000 }, + { 0x8700, 0x0e23, 0x2000 }, + { 0x0700, 0x0e22, 0x0000 }, + { 0x0700, 0x0e24, 0x0000 }, + { 0x8700, 0x0e29, 0x3000 }, + { 0x8700, 0x0e27, 0x2000 }, + { 0x0700, 0x0e26, 0x0000 }, + { 0x0700, 0x0e28, 0x0000 }, + { 0x8700, 0x0e2b, 0x2000 }, + { 0x0700, 0x0e2a, 0x0000 }, + { 0x0700, 0x0e2c, 0x0000 }, + { 0x8d00, 0x0e51, 0x6000 }, + { 0x8700, 0x0e41, 0x5000 }, + { 0x8c00, 0x0e35, 0x4000 }, + { 0x8c00, 0x0e31, 0x3000 }, + { 0x8700, 0x0e2f, 0x2000 }, + { 0x0700, 0x0e2e, 0x0000 }, + { 0x0700, 0x0e30, 0x0000 }, + { 0x8700, 0x0e33, 0x2000 }, + { 0x0700, 0x0e32, 0x0000 }, + { 0x0c00, 0x0e34, 0x0000 }, + { 0x8c00, 0x0e39, 0x3000 }, + { 0x8c00, 0x0e37, 0x2000 }, + { 0x0c00, 0x0e36, 0x0000 }, + { 0x0c00, 0x0e38, 0x0000 }, + { 0x9700, 0x0e3f, 0x2000 }, + { 0x0c00, 0x0e3a, 0x0000 }, + { 0x0700, 0x0e40, 0x0000 }, + { 0x8c00, 0x0e49, 0x4000 }, + { 0x8700, 0x0e45, 0x3000 }, + { 0x8700, 0x0e43, 0x2000 }, + { 0x0700, 0x0e42, 0x0000 }, + { 0x0700, 0x0e44, 0x0000 }, + { 0x8c00, 0x0e47, 0x2000 }, + { 0x0600, 0x0e46, 0x0000 }, + { 0x0c00, 0x0e48, 0x0000 }, + { 0x8c00, 0x0e4d, 0x3000 }, + { 0x8c00, 0x0e4b, 0x2000 }, + { 0x0c00, 0x0e4a, 0x0000 }, + { 0x0c00, 0x0e4c, 0x0000 }, + { 0x9500, 0x0e4f, 0x2000 }, + { 0x0c00, 0x0e4e, 0x0000 }, + { 0x0d00, 0x0e50, 0x0000 }, + { 0x8700, 0x0e8a, 0x5000 }, + { 0x8d00, 0x0e59, 0x4000 }, + { 0x8d00, 0x0e55, 0x3000 }, + { 0x8d00, 0x0e53, 0x2000 }, + { 0x0d00, 0x0e52, 0x0000 }, + { 0x0d00, 0x0e54, 0x0000 }, + { 0x8d00, 0x0e57, 0x2000 }, + { 0x0d00, 0x0e56, 0x0000 }, + { 0x0d00, 0x0e58, 0x0000 }, + { 0x8700, 0x0e82, 0x3000 }, + { 0x9500, 0x0e5b, 0x2000 }, + { 0x1500, 0x0e5a, 0x0000 }, + { 0x0700, 0x0e81, 0x0000 }, + { 0x8700, 0x0e87, 0x2000 }, + { 0x0700, 0x0e84, 0x0000 }, + { 0x0700, 0x0e88, 0x0000 }, + { 0x8700, 0x0e9b, 0x4000 }, + { 0x8700, 0x0e96, 0x3000 }, + { 0x8700, 0x0e94, 0x2000 }, + { 0x0700, 0x0e8d, 0x0000 }, + { 0x0700, 0x0e95, 0x0000 }, + { 0x8700, 0x0e99, 0x2000 }, + { 0x0700, 0x0e97, 0x0000 }, + { 0x0700, 0x0e9a, 0x0000 }, + { 0x8700, 0x0e9f, 0x3000 }, + { 0x8700, 0x0e9d, 0x2000 }, + { 0x0700, 0x0e9c, 0x0000 }, + { 0x0700, 0x0e9e, 0x0000 }, + { 0x8700, 0x0ea2, 0x2000 }, + { 0x0700, 0x0ea1, 0x0000 }, + { 0x0700, 0x0ea3, 0x0000 }, + { 0x9a00, 0x0f14, 0x7000 }, + { 0x8d00, 0x0ed0, 0x6000 }, + { 0x8c00, 0x0eb9, 0x5000 }, + { 0x8c00, 0x0eb1, 0x4000 }, + { 0x8700, 0x0ead, 0x3000 }, + { 0x8700, 0x0eaa, 0x2000 }, + { 0x0700, 0x0ea7, 0x0000 }, + { 0x0700, 0x0eab, 0x0000 }, + { 0x8700, 0x0eaf, 0x2000 }, + { 0x0700, 0x0eae, 0x0000 }, + { 0x0700, 0x0eb0, 0x0000 }, + { 0x8c00, 0x0eb5, 0x3000 }, + { 0x8700, 0x0eb3, 0x2000 }, + { 0x0700, 0x0eb2, 0x0000 }, + { 0x0c00, 0x0eb4, 0x0000 }, + { 0x8c00, 0x0eb7, 0x2000 }, + { 0x0c00, 0x0eb6, 0x0000 }, + { 0x0c00, 0x0eb8, 0x0000 }, + { 0x8700, 0x0ec4, 0x4000 }, + { 0x8700, 0x0ec0, 0x3000 }, + { 0x8c00, 0x0ebc, 0x2000 }, + { 0x0c00, 0x0ebb, 0x0000 }, + { 0x0700, 0x0ebd, 0x0000 }, + { 0x8700, 0x0ec2, 0x2000 }, + { 0x0700, 0x0ec1, 0x0000 }, + { 0x0700, 0x0ec3, 0x0000 }, + { 0x8c00, 0x0eca, 0x3000 }, + { 0x8c00, 0x0ec8, 0x2000 }, + { 0x0600, 0x0ec6, 0x0000 }, + { 0x0c00, 0x0ec9, 0x0000 }, + { 0x8c00, 0x0ecc, 0x2000 }, + { 0x0c00, 0x0ecb, 0x0000 }, + { 0x0c00, 0x0ecd, 0x0000 }, + { 0x9500, 0x0f04, 0x5000 }, + { 0x8d00, 0x0ed8, 0x4000 }, + { 0x8d00, 0x0ed4, 0x3000 }, + { 0x8d00, 0x0ed2, 0x2000 }, + { 0x0d00, 0x0ed1, 0x0000 }, + { 0x0d00, 0x0ed3, 0x0000 }, + { 0x8d00, 0x0ed6, 0x2000 }, + { 0x0d00, 0x0ed5, 0x0000 }, + { 0x0d00, 0x0ed7, 0x0000 }, + { 0x8700, 0x0f00, 0x3000 }, + { 0x8700, 0x0edc, 0x2000 }, + { 0x0d00, 0x0ed9, 0x0000 }, + { 0x0700, 0x0edd, 0x0000 }, + { 0x9a00, 0x0f02, 0x2000 }, + { 0x1a00, 0x0f01, 0x0000 }, + { 0x1a00, 0x0f03, 0x0000 }, + { 0x9500, 0x0f0c, 0x4000 }, + { 0x9500, 0x0f08, 0x3000 }, + { 0x9500, 0x0f06, 0x2000 }, + { 0x1500, 0x0f05, 0x0000 }, + { 0x1500, 0x0f07, 0x0000 }, + { 0x9500, 0x0f0a, 0x2000 }, + { 0x1500, 0x0f09, 0x0000 }, + { 0x1500, 0x0f0b, 0x0000 }, + { 0x9500, 0x0f10, 0x3000 }, + { 0x9500, 0x0f0e, 0x2000 }, + { 0x1500, 0x0f0d, 0x0000 }, + { 0x1500, 0x0f0f, 0x0000 }, + { 0x9500, 0x0f12, 0x2000 }, + { 0x1500, 0x0f11, 0x0000 }, + { 0x1a00, 0x0f13, 0x0000 }, + { 0x9a00, 0x0f34, 0x6000 }, + { 0x8d00, 0x0f24, 0x5000 }, + { 0x9a00, 0x0f1c, 0x4000 }, + { 0x8c00, 0x0f18, 0x3000 }, + { 0x9a00, 0x0f16, 0x2000 }, + { 0x1a00, 0x0f15, 0x0000 }, + { 0x1a00, 0x0f17, 0x0000 }, + { 0x9a00, 0x0f1a, 0x2000 }, + { 0x0c00, 0x0f19, 0x0000 }, + { 0x1a00, 0x0f1b, 0x0000 }, + { 0x8d00, 0x0f20, 0x3000 }, + { 0x9a00, 0x0f1e, 0x2000 }, + { 0x1a00, 0x0f1d, 0x0000 }, + { 0x1a00, 0x0f1f, 0x0000 }, + { 0x8d00, 0x0f22, 0x2000 }, + { 0x0d00, 0x0f21, 0x0000 }, + { 0x0d00, 0x0f23, 0x0000 }, + { 0x8f00, 0x0f2c, 0x4000 }, + { 0x8d00, 0x0f28, 0x3000 }, + { 0x8d00, 0x0f26, 0x2000 }, + { 0x0d00, 0x0f25, 0x0000 }, + { 0x0d00, 0x0f27, 0x0000 }, + { 0x8f00, 0x0f2a, 0x2000 }, + { 0x0d00, 0x0f29, 0x0000 }, + { 0x0f00, 0x0f2b, 0x0000 }, + { 0x8f00, 0x0f30, 0x3000 }, + { 0x8f00, 0x0f2e, 0x2000 }, + { 0x0f00, 0x0f2d, 0x0000 }, + { 0x0f00, 0x0f2f, 0x0000 }, + { 0x8f00, 0x0f32, 0x2000 }, + { 0x0f00, 0x0f31, 0x0000 }, + { 0x0f00, 0x0f33, 0x0000 }, + { 0x8700, 0x0f44, 0x5000 }, + { 0x9600, 0x0f3c, 0x4000 }, + { 0x9a00, 0x0f38, 0x3000 }, + { 0x9a00, 0x0f36, 0x2000 }, + { 0x0c00, 0x0f35, 0x0000 }, + { 0x0c00, 0x0f37, 0x0000 }, + { 0x9600, 0x0f3a, 0x2000 }, + { 0x0c00, 0x0f39, 0x0000 }, + { 0x1200, 0x0f3b, 0x0000 }, + { 0x8700, 0x0f40, 0x3000 }, + { 0x8a00, 0x0f3e, 0x2000 }, + { 0x1200, 0x0f3d, 0x0000 }, + { 0x0a00, 0x0f3f, 0x0000 }, + { 0x8700, 0x0f42, 0x2000 }, + { 0x0700, 0x0f41, 0x0000 }, + { 0x0700, 0x0f43, 0x0000 }, + { 0x8700, 0x0f4d, 0x4000 }, + { 0x8700, 0x0f49, 0x3000 }, + { 0x8700, 0x0f46, 0x2000 }, + { 0x0700, 0x0f45, 0x0000 }, + { 0x0700, 0x0f47, 0x0000 }, + { 0x8700, 0x0f4b, 0x2000 }, + { 0x0700, 0x0f4a, 0x0000 }, + { 0x0700, 0x0f4c, 0x0000 }, + { 0x8700, 0x0f51, 0x3000 }, + { 0x8700, 0x0f4f, 0x2000 }, + { 0x0700, 0x0f4e, 0x0000 }, + { 0x0700, 0x0f50, 0x0000 }, + { 0x8700, 0x0f53, 0x2000 }, + { 0x0700, 0x0f52, 0x0000 }, + { 0x0700, 0x0f54, 0x0000 }, + { 0x8700, 0x1013, 0x8000 }, + { 0x8c00, 0x0fa0, 0x7000 }, + { 0x8c00, 0x0f7b, 0x6000 }, + { 0x8700, 0x0f65, 0x5000 }, + { 0x8700, 0x0f5d, 0x4000 }, + { 0x8700, 0x0f59, 0x3000 }, + { 0x8700, 0x0f57, 0x2000 }, + { 0x0700, 0x0f56, 0x0000 }, + { 0x0700, 0x0f58, 0x0000 }, + { 0x8700, 0x0f5b, 0x2000 }, + { 0x0700, 0x0f5a, 0x0000 }, + { 0x0700, 0x0f5c, 0x0000 }, + { 0x8700, 0x0f61, 0x3000 }, + { 0x8700, 0x0f5f, 0x2000 }, + { 0x0700, 0x0f5e, 0x0000 }, + { 0x0700, 0x0f60, 0x0000 }, + { 0x8700, 0x0f63, 0x2000 }, + { 0x0700, 0x0f62, 0x0000 }, + { 0x0700, 0x0f64, 0x0000 }, + { 0x8c00, 0x0f73, 0x4000 }, + { 0x8700, 0x0f69, 0x3000 }, + { 0x8700, 0x0f67, 0x2000 }, + { 0x0700, 0x0f66, 0x0000 }, + { 0x0700, 0x0f68, 0x0000 }, + { 0x8c00, 0x0f71, 0x2000 }, + { 0x0700, 0x0f6a, 0x0000 }, + { 0x0c00, 0x0f72, 0x0000 }, + { 0x8c00, 0x0f77, 0x3000 }, + { 0x8c00, 0x0f75, 0x2000 }, + { 0x0c00, 0x0f74, 0x0000 }, + { 0x0c00, 0x0f76, 0x0000 }, + { 0x8c00, 0x0f79, 0x2000 }, + { 0x0c00, 0x0f78, 0x0000 }, + { 0x0c00, 0x0f7a, 0x0000 }, + { 0x8700, 0x0f8b, 0x5000 }, + { 0x8c00, 0x0f83, 0x4000 }, + { 0x8a00, 0x0f7f, 0x3000 }, + { 0x8c00, 0x0f7d, 0x2000 }, + { 0x0c00, 0x0f7c, 0x0000 }, + { 0x0c00, 0x0f7e, 0x0000 }, + { 0x8c00, 0x0f81, 0x2000 }, + { 0x0c00, 0x0f80, 0x0000 }, + { 0x0c00, 0x0f82, 0x0000 }, + { 0x8c00, 0x0f87, 0x3000 }, + { 0x9500, 0x0f85, 0x2000 }, + { 0x0c00, 0x0f84, 0x0000 }, + { 0x0c00, 0x0f86, 0x0000 }, + { 0x8700, 0x0f89, 0x2000 }, + { 0x0700, 0x0f88, 0x0000 }, + { 0x0700, 0x0f8a, 0x0000 }, + { 0x8c00, 0x0f97, 0x4000 }, + { 0x8c00, 0x0f93, 0x3000 }, + { 0x8c00, 0x0f91, 0x2000 }, + { 0x0c00, 0x0f90, 0x0000 }, + { 0x0c00, 0x0f92, 0x0000 }, + { 0x8c00, 0x0f95, 0x2000 }, + { 0x0c00, 0x0f94, 0x0000 }, + { 0x0c00, 0x0f96, 0x0000 }, + { 0x8c00, 0x0f9c, 0x3000 }, + { 0x8c00, 0x0f9a, 0x2000 }, + { 0x0c00, 0x0f99, 0x0000 }, + { 0x0c00, 0x0f9b, 0x0000 }, + { 0x8c00, 0x0f9e, 0x2000 }, + { 0x0c00, 0x0f9d, 0x0000 }, + { 0x0c00, 0x0f9f, 0x0000 }, + { 0x9a00, 0x0fc1, 0x6000 }, + { 0x8c00, 0x0fb0, 0x5000 }, + { 0x8c00, 0x0fa8, 0x4000 }, + { 0x8c00, 0x0fa4, 0x3000 }, + { 0x8c00, 0x0fa2, 0x2000 }, + { 0x0c00, 0x0fa1, 0x0000 }, + { 0x0c00, 0x0fa3, 0x0000 }, + { 0x8c00, 0x0fa6, 0x2000 }, + { 0x0c00, 0x0fa5, 0x0000 }, + { 0x0c00, 0x0fa7, 0x0000 }, + { 0x8c00, 0x0fac, 0x3000 }, + { 0x8c00, 0x0faa, 0x2000 }, + { 0x0c00, 0x0fa9, 0x0000 }, + { 0x0c00, 0x0fab, 0x0000 }, + { 0x8c00, 0x0fae, 0x2000 }, + { 0x0c00, 0x0fad, 0x0000 }, + { 0x0c00, 0x0faf, 0x0000 }, + { 0x8c00, 0x0fb8, 0x4000 }, + { 0x8c00, 0x0fb4, 0x3000 }, + { 0x8c00, 0x0fb2, 0x2000 }, + { 0x0c00, 0x0fb1, 0x0000 }, + { 0x0c00, 0x0fb3, 0x0000 }, + { 0x8c00, 0x0fb6, 0x2000 }, + { 0x0c00, 0x0fb5, 0x0000 }, + { 0x0c00, 0x0fb7, 0x0000 }, + { 0x8c00, 0x0fbc, 0x3000 }, + { 0x8c00, 0x0fba, 0x2000 }, + { 0x0c00, 0x0fb9, 0x0000 }, + { 0x0c00, 0x0fbb, 0x0000 }, + { 0x9a00, 0x0fbf, 0x2000 }, + { 0x1a00, 0x0fbe, 0x0000 }, + { 0x1a00, 0x0fc0, 0x0000 }, + { 0x8700, 0x1003, 0x5000 }, + { 0x9a00, 0x0fc9, 0x4000 }, + { 0x9a00, 0x0fc5, 0x3000 }, + { 0x9a00, 0x0fc3, 0x2000 }, + { 0x1a00, 0x0fc2, 0x0000 }, + { 0x1a00, 0x0fc4, 0x0000 }, + { 0x9a00, 0x0fc7, 0x2000 }, + { 0x0c00, 0x0fc6, 0x0000 }, + { 0x1a00, 0x0fc8, 0x0000 }, + { 0x9a00, 0x0fcf, 0x3000 }, + { 0x9a00, 0x0fcb, 0x2000 }, + { 0x1a00, 0x0fca, 0x0000 }, + { 0x1a00, 0x0fcc, 0x0000 }, + { 0x8700, 0x1001, 0x2000 }, + { 0x0700, 0x1000, 0x0000 }, + { 0x0700, 0x1002, 0x0000 }, + { 0x8700, 0x100b, 0x4000 }, + { 0x8700, 0x1007, 0x3000 }, + { 0x8700, 0x1005, 0x2000 }, + { 0x0700, 0x1004, 0x0000 }, + { 0x0700, 0x1006, 0x0000 }, + { 0x8700, 0x1009, 0x2000 }, + { 0x0700, 0x1008, 0x0000 }, + { 0x0700, 0x100a, 0x0000 }, + { 0x8700, 0x100f, 0x3000 }, + { 0x8700, 0x100d, 0x2000 }, + { 0x0700, 0x100c, 0x0000 }, + { 0x0700, 0x100e, 0x0000 }, + { 0x8700, 0x1011, 0x2000 }, + { 0x0700, 0x1010, 0x0000 }, + { 0x0700, 0x1012, 0x0000 }, + { 0x8900, 0x10a5, 0x7000 }, + { 0x8c00, 0x1039, 0x6000 }, + { 0x8700, 0x1024, 0x5000 }, + { 0x8700, 0x101b, 0x4000 }, + { 0x8700, 0x1017, 0x3000 }, + { 0x8700, 0x1015, 0x2000 }, + { 0x0700, 0x1014, 0x0000 }, + { 0x0700, 0x1016, 0x0000 }, + { 0x8700, 0x1019, 0x2000 }, + { 0x0700, 0x1018, 0x0000 }, + { 0x0700, 0x101a, 0x0000 }, + { 0x8700, 0x101f, 0x3000 }, + { 0x8700, 0x101d, 0x2000 }, + { 0x0700, 0x101c, 0x0000 }, + { 0x0700, 0x101e, 0x0000 }, + { 0x8700, 0x1021, 0x2000 }, + { 0x0700, 0x1020, 0x0000 }, + { 0x0700, 0x1023, 0x0000 }, + { 0x8c00, 0x102e, 0x4000 }, + { 0x8700, 0x1029, 0x3000 }, + { 0x8700, 0x1026, 0x2000 }, + { 0x0700, 0x1025, 0x0000 }, + { 0x0700, 0x1027, 0x0000 }, + { 0x8a00, 0x102c, 0x2000 }, + { 0x0700, 0x102a, 0x0000 }, + { 0x0c00, 0x102d, 0x0000 }, + { 0x8c00, 0x1032, 0x3000 }, + { 0x8c00, 0x1030, 0x2000 }, + { 0x0c00, 0x102f, 0x0000 }, + { 0x0a00, 0x1031, 0x0000 }, + { 0x8c00, 0x1037, 0x2000 }, + { 0x0c00, 0x1036, 0x0000 }, + { 0x0a00, 0x1038, 0x0000 }, + { 0x9500, 0x104f, 0x5000 }, + { 0x8d00, 0x1047, 0x4000 }, + { 0x8d00, 0x1043, 0x3000 }, + { 0x8d00, 0x1041, 0x2000 }, + { 0x0d00, 0x1040, 0x0000 }, + { 0x0d00, 0x1042, 0x0000 }, + { 0x8d00, 0x1045, 0x2000 }, + { 0x0d00, 0x1044, 0x0000 }, + { 0x0d00, 0x1046, 0x0000 }, + { 0x9500, 0x104b, 0x3000 }, + { 0x8d00, 0x1049, 0x2000 }, + { 0x0d00, 0x1048, 0x0000 }, + { 0x1500, 0x104a, 0x0000 }, + { 0x9500, 0x104d, 0x2000 }, + { 0x1500, 0x104c, 0x0000 }, + { 0x1500, 0x104e, 0x0000 }, + { 0x8a00, 0x1057, 0x4000 }, + { 0x8700, 0x1053, 0x3000 }, + { 0x8700, 0x1051, 0x2000 }, + { 0x0700, 0x1050, 0x0000 }, + { 0x0700, 0x1052, 0x0000 }, + { 0x8700, 0x1055, 0x2000 }, + { 0x0700, 0x1054, 0x0000 }, + { 0x0a00, 0x1056, 0x0000 }, + { 0x8900, 0x10a1, 0x3000 }, + { 0x8c00, 0x1059, 0x2000 }, + { 0x0c00, 0x1058, 0x0000 }, + { 0x0900, 0x10a0, 0x0000 }, + { 0x8900, 0x10a3, 0x2000 }, + { 0x0900, 0x10a2, 0x0000 }, + { 0x0900, 0x10a4, 0x0000 }, + { 0x8900, 0x10c5, 0x6000 }, + { 0x8900, 0x10b5, 0x5000 }, + { 0x8900, 0x10ad, 0x4000 }, + { 0x8900, 0x10a9, 0x3000 }, + { 0x8900, 0x10a7, 0x2000 }, + { 0x0900, 0x10a6, 0x0000 }, + { 0x0900, 0x10a8, 0x0000 }, + { 0x8900, 0x10ab, 0x2000 }, + { 0x0900, 0x10aa, 0x0000 }, + { 0x0900, 0x10ac, 0x0000 }, + { 0x8900, 0x10b1, 0x3000 }, + { 0x8900, 0x10af, 0x2000 }, + { 0x0900, 0x10ae, 0x0000 }, + { 0x0900, 0x10b0, 0x0000 }, + { 0x8900, 0x10b3, 0x2000 }, + { 0x0900, 0x10b2, 0x0000 }, + { 0x0900, 0x10b4, 0x0000 }, + { 0x8900, 0x10bd, 0x4000 }, + { 0x8900, 0x10b9, 0x3000 }, + { 0x8900, 0x10b7, 0x2000 }, + { 0x0900, 0x10b6, 0x0000 }, + { 0x0900, 0x10b8, 0x0000 }, + { 0x8900, 0x10bb, 0x2000 }, + { 0x0900, 0x10ba, 0x0000 }, + { 0x0900, 0x10bc, 0x0000 }, + { 0x8900, 0x10c1, 0x3000 }, + { 0x8900, 0x10bf, 0x2000 }, + { 0x0900, 0x10be, 0x0000 }, + { 0x0900, 0x10c0, 0x0000 }, + { 0x8900, 0x10c3, 0x2000 }, + { 0x0900, 0x10c2, 0x0000 }, + { 0x0900, 0x10c4, 0x0000 }, + { 0x8700, 0x10df, 0x5000 }, + { 0x8700, 0x10d7, 0x4000 }, + { 0x8700, 0x10d3, 0x3000 }, + { 0x8700, 0x10d1, 0x2000 }, + { 0x0700, 0x10d0, 0x0000 }, + { 0x0700, 0x10d2, 0x0000 }, + { 0x8700, 0x10d5, 0x2000 }, + { 0x0700, 0x10d4, 0x0000 }, + { 0x0700, 0x10d6, 0x0000 }, + { 0x8700, 0x10db, 0x3000 }, + { 0x8700, 0x10d9, 0x2000 }, + { 0x0700, 0x10d8, 0x0000 }, + { 0x0700, 0x10da, 0x0000 }, + { 0x8700, 0x10dd, 0x2000 }, + { 0x0700, 0x10dc, 0x0000 }, + { 0x0700, 0x10de, 0x0000 }, + { 0x8700, 0x10e7, 0x4000 }, + { 0x8700, 0x10e3, 0x3000 }, + { 0x8700, 0x10e1, 0x2000 }, + { 0x0700, 0x10e0, 0x0000 }, + { 0x0700, 0x10e2, 0x0000 }, + { 0x8700, 0x10e5, 0x2000 }, + { 0x0700, 0x10e4, 0x0000 }, + { 0x0700, 0x10e6, 0x0000 }, + { 0x8700, 0x10eb, 0x3000 }, + { 0x8700, 0x10e9, 0x2000 }, + { 0x0700, 0x10e8, 0x0000 }, + { 0x0700, 0x10ea, 0x0000 }, + { 0x8700, 0x10ed, 0x2000 }, + { 0x0700, 0x10ec, 0x0000 }, + { 0x0700, 0x10ee, 0x0000 }, + { 0x8700, 0x1322, 0xa000 }, + { 0x8700, 0x1205, 0x9000 }, + { 0x8700, 0x117a, 0x8000 }, + { 0x8700, 0x1135, 0x7000 }, + { 0x8700, 0x1115, 0x6000 }, + { 0x8700, 0x1105, 0x5000 }, + { 0x8700, 0x10f7, 0x4000 }, + { 0x8700, 0x10f3, 0x3000 }, + { 0x8700, 0x10f1, 0x2000 }, + { 0x0700, 0x10f0, 0x0000 }, + { 0x0700, 0x10f2, 0x0000 }, + { 0x8700, 0x10f5, 0x2000 }, + { 0x0700, 0x10f4, 0x0000 }, + { 0x0700, 0x10f6, 0x0000 }, + { 0x8700, 0x1101, 0x3000 }, + { 0x9500, 0x10fb, 0x2000 }, + { 0x0700, 0x10f8, 0x0000 }, + { 0x0700, 0x1100, 0x0000 }, + { 0x8700, 0x1103, 0x2000 }, + { 0x0700, 0x1102, 0x0000 }, + { 0x0700, 0x1104, 0x0000 }, + { 0x8700, 0x110d, 0x4000 }, + { 0x8700, 0x1109, 0x3000 }, + { 0x8700, 0x1107, 0x2000 }, + { 0x0700, 0x1106, 0x0000 }, + { 0x0700, 0x1108, 0x0000 }, + { 0x8700, 0x110b, 0x2000 }, + { 0x0700, 0x110a, 0x0000 }, + { 0x0700, 0x110c, 0x0000 }, + { 0x8700, 0x1111, 0x3000 }, + { 0x8700, 0x110f, 0x2000 }, + { 0x0700, 0x110e, 0x0000 }, + { 0x0700, 0x1110, 0x0000 }, + { 0x8700, 0x1113, 0x2000 }, + { 0x0700, 0x1112, 0x0000 }, + { 0x0700, 0x1114, 0x0000 }, + { 0x8700, 0x1125, 0x5000 }, + { 0x8700, 0x111d, 0x4000 }, + { 0x8700, 0x1119, 0x3000 }, + { 0x8700, 0x1117, 0x2000 }, + { 0x0700, 0x1116, 0x0000 }, + { 0x0700, 0x1118, 0x0000 }, + { 0x8700, 0x111b, 0x2000 }, + { 0x0700, 0x111a, 0x0000 }, + { 0x0700, 0x111c, 0x0000 }, + { 0x8700, 0x1121, 0x3000 }, + { 0x8700, 0x111f, 0x2000 }, + { 0x0700, 0x111e, 0x0000 }, + { 0x0700, 0x1120, 0x0000 }, + { 0x8700, 0x1123, 0x2000 }, + { 0x0700, 0x1122, 0x0000 }, + { 0x0700, 0x1124, 0x0000 }, + { 0x8700, 0x112d, 0x4000 }, + { 0x8700, 0x1129, 0x3000 }, + { 0x8700, 0x1127, 0x2000 }, + { 0x0700, 0x1126, 0x0000 }, + { 0x0700, 0x1128, 0x0000 }, + { 0x8700, 0x112b, 0x2000 }, + { 0x0700, 0x112a, 0x0000 }, + { 0x0700, 0x112c, 0x0000 }, + { 0x8700, 0x1131, 0x3000 }, + { 0x8700, 0x112f, 0x2000 }, + { 0x0700, 0x112e, 0x0000 }, + { 0x0700, 0x1130, 0x0000 }, + { 0x8700, 0x1133, 0x2000 }, + { 0x0700, 0x1132, 0x0000 }, + { 0x0700, 0x1134, 0x0000 }, + { 0x8700, 0x1155, 0x6000 }, + { 0x8700, 0x1145, 0x5000 }, + { 0x8700, 0x113d, 0x4000 }, + { 0x8700, 0x1139, 0x3000 }, + { 0x8700, 0x1137, 0x2000 }, + { 0x0700, 0x1136, 0x0000 }, + { 0x0700, 0x1138, 0x0000 }, + { 0x8700, 0x113b, 0x2000 }, + { 0x0700, 0x113a, 0x0000 }, + { 0x0700, 0x113c, 0x0000 }, + { 0x8700, 0x1141, 0x3000 }, + { 0x8700, 0x113f, 0x2000 }, + { 0x0700, 0x113e, 0x0000 }, + { 0x0700, 0x1140, 0x0000 }, + { 0x8700, 0x1143, 0x2000 }, + { 0x0700, 0x1142, 0x0000 }, + { 0x0700, 0x1144, 0x0000 }, + { 0x8700, 0x114d, 0x4000 }, + { 0x8700, 0x1149, 0x3000 }, + { 0x8700, 0x1147, 0x2000 }, + { 0x0700, 0x1146, 0x0000 }, + { 0x0700, 0x1148, 0x0000 }, + { 0x8700, 0x114b, 0x2000 }, + { 0x0700, 0x114a, 0x0000 }, + { 0x0700, 0x114c, 0x0000 }, + { 0x8700, 0x1151, 0x3000 }, + { 0x8700, 0x114f, 0x2000 }, + { 0x0700, 0x114e, 0x0000 }, + { 0x0700, 0x1150, 0x0000 }, + { 0x8700, 0x1153, 0x2000 }, + { 0x0700, 0x1152, 0x0000 }, + { 0x0700, 0x1154, 0x0000 }, + { 0x8700, 0x116a, 0x5000 }, + { 0x8700, 0x1162, 0x4000 }, + { 0x8700, 0x1159, 0x3000 }, + { 0x8700, 0x1157, 0x2000 }, + { 0x0700, 0x1156, 0x0000 }, + { 0x0700, 0x1158, 0x0000 }, + { 0x8700, 0x1160, 0x2000 }, + { 0x0700, 0x115f, 0x0000 }, + { 0x0700, 0x1161, 0x0000 }, + { 0x8700, 0x1166, 0x3000 }, + { 0x8700, 0x1164, 0x2000 }, + { 0x0700, 0x1163, 0x0000 }, + { 0x0700, 0x1165, 0x0000 }, + { 0x8700, 0x1168, 0x2000 }, + { 0x0700, 0x1167, 0x0000 }, + { 0x0700, 0x1169, 0x0000 }, + { 0x8700, 0x1172, 0x4000 }, + { 0x8700, 0x116e, 0x3000 }, + { 0x8700, 0x116c, 0x2000 }, + { 0x0700, 0x116b, 0x0000 }, + { 0x0700, 0x116d, 0x0000 }, + { 0x8700, 0x1170, 0x2000 }, + { 0x0700, 0x116f, 0x0000 }, + { 0x0700, 0x1171, 0x0000 }, + { 0x8700, 0x1176, 0x3000 }, + { 0x8700, 0x1174, 0x2000 }, + { 0x0700, 0x1173, 0x0000 }, + { 0x0700, 0x1175, 0x0000 }, + { 0x8700, 0x1178, 0x2000 }, + { 0x0700, 0x1177, 0x0000 }, + { 0x0700, 0x1179, 0x0000 }, + { 0x8700, 0x11bf, 0x7000 }, + { 0x8700, 0x119a, 0x6000 }, + { 0x8700, 0x118a, 0x5000 }, + { 0x8700, 0x1182, 0x4000 }, + { 0x8700, 0x117e, 0x3000 }, + { 0x8700, 0x117c, 0x2000 }, + { 0x0700, 0x117b, 0x0000 }, + { 0x0700, 0x117d, 0x0000 }, + { 0x8700, 0x1180, 0x2000 }, + { 0x0700, 0x117f, 0x0000 }, + { 0x0700, 0x1181, 0x0000 }, + { 0x8700, 0x1186, 0x3000 }, + { 0x8700, 0x1184, 0x2000 }, + { 0x0700, 0x1183, 0x0000 }, + { 0x0700, 0x1185, 0x0000 }, + { 0x8700, 0x1188, 0x2000 }, + { 0x0700, 0x1187, 0x0000 }, + { 0x0700, 0x1189, 0x0000 }, + { 0x8700, 0x1192, 0x4000 }, + { 0x8700, 0x118e, 0x3000 }, + { 0x8700, 0x118c, 0x2000 }, + { 0x0700, 0x118b, 0x0000 }, + { 0x0700, 0x118d, 0x0000 }, + { 0x8700, 0x1190, 0x2000 }, + { 0x0700, 0x118f, 0x0000 }, + { 0x0700, 0x1191, 0x0000 }, + { 0x8700, 0x1196, 0x3000 }, + { 0x8700, 0x1194, 0x2000 }, + { 0x0700, 0x1193, 0x0000 }, + { 0x0700, 0x1195, 0x0000 }, + { 0x8700, 0x1198, 0x2000 }, + { 0x0700, 0x1197, 0x0000 }, + { 0x0700, 0x1199, 0x0000 }, + { 0x8700, 0x11af, 0x5000 }, + { 0x8700, 0x11a2, 0x4000 }, + { 0x8700, 0x119e, 0x3000 }, + { 0x8700, 0x119c, 0x2000 }, + { 0x0700, 0x119b, 0x0000 }, + { 0x0700, 0x119d, 0x0000 }, + { 0x8700, 0x11a0, 0x2000 }, + { 0x0700, 0x119f, 0x0000 }, + { 0x0700, 0x11a1, 0x0000 }, + { 0x8700, 0x11ab, 0x3000 }, + { 0x8700, 0x11a9, 0x2000 }, + { 0x0700, 0x11a8, 0x0000 }, + { 0x0700, 0x11aa, 0x0000 }, + { 0x8700, 0x11ad, 0x2000 }, + { 0x0700, 0x11ac, 0x0000 }, + { 0x0700, 0x11ae, 0x0000 }, + { 0x8700, 0x11b7, 0x4000 }, + { 0x8700, 0x11b3, 0x3000 }, + { 0x8700, 0x11b1, 0x2000 }, + { 0x0700, 0x11b0, 0x0000 }, + { 0x0700, 0x11b2, 0x0000 }, + { 0x8700, 0x11b5, 0x2000 }, + { 0x0700, 0x11b4, 0x0000 }, + { 0x0700, 0x11b6, 0x0000 }, + { 0x8700, 0x11bb, 0x3000 }, + { 0x8700, 0x11b9, 0x2000 }, + { 0x0700, 0x11b8, 0x0000 }, + { 0x0700, 0x11ba, 0x0000 }, + { 0x8700, 0x11bd, 0x2000 }, + { 0x0700, 0x11bc, 0x0000 }, + { 0x0700, 0x11be, 0x0000 }, + { 0x8700, 0x11df, 0x6000 }, + { 0x8700, 0x11cf, 0x5000 }, + { 0x8700, 0x11c7, 0x4000 }, + { 0x8700, 0x11c3, 0x3000 }, + { 0x8700, 0x11c1, 0x2000 }, + { 0x0700, 0x11c0, 0x0000 }, + { 0x0700, 0x11c2, 0x0000 }, + { 0x8700, 0x11c5, 0x2000 }, + { 0x0700, 0x11c4, 0x0000 }, + { 0x0700, 0x11c6, 0x0000 }, + { 0x8700, 0x11cb, 0x3000 }, + { 0x8700, 0x11c9, 0x2000 }, + { 0x0700, 0x11c8, 0x0000 }, + { 0x0700, 0x11ca, 0x0000 }, + { 0x8700, 0x11cd, 0x2000 }, + { 0x0700, 0x11cc, 0x0000 }, + { 0x0700, 0x11ce, 0x0000 }, + { 0x8700, 0x11d7, 0x4000 }, + { 0x8700, 0x11d3, 0x3000 }, + { 0x8700, 0x11d1, 0x2000 }, + { 0x0700, 0x11d0, 0x0000 }, + { 0x0700, 0x11d2, 0x0000 }, + { 0x8700, 0x11d5, 0x2000 }, + { 0x0700, 0x11d4, 0x0000 }, + { 0x0700, 0x11d6, 0x0000 }, + { 0x8700, 0x11db, 0x3000 }, + { 0x8700, 0x11d9, 0x2000 }, + { 0x0700, 0x11d8, 0x0000 }, + { 0x0700, 0x11da, 0x0000 }, + { 0x8700, 0x11dd, 0x2000 }, + { 0x0700, 0x11dc, 0x0000 }, + { 0x0700, 0x11de, 0x0000 }, + { 0x8700, 0x11ef, 0x5000 }, + { 0x8700, 0x11e7, 0x4000 }, + { 0x8700, 0x11e3, 0x3000 }, + { 0x8700, 0x11e1, 0x2000 }, + { 0x0700, 0x11e0, 0x0000 }, + { 0x0700, 0x11e2, 0x0000 }, + { 0x8700, 0x11e5, 0x2000 }, + { 0x0700, 0x11e4, 0x0000 }, + { 0x0700, 0x11e6, 0x0000 }, + { 0x8700, 0x11eb, 0x3000 }, + { 0x8700, 0x11e9, 0x2000 }, + { 0x0700, 0x11e8, 0x0000 }, + { 0x0700, 0x11ea, 0x0000 }, + { 0x8700, 0x11ed, 0x2000 }, + { 0x0700, 0x11ec, 0x0000 }, + { 0x0700, 0x11ee, 0x0000 }, + { 0x8700, 0x11f7, 0x4000 }, + { 0x8700, 0x11f3, 0x3000 }, + { 0x8700, 0x11f1, 0x2000 }, + { 0x0700, 0x11f0, 0x0000 }, + { 0x0700, 0x11f2, 0x0000 }, + { 0x8700, 0x11f5, 0x2000 }, + { 0x0700, 0x11f4, 0x0000 }, + { 0x0700, 0x11f6, 0x0000 }, + { 0x8700, 0x1201, 0x3000 }, + { 0x8700, 0x11f9, 0x2000 }, + { 0x0700, 0x11f8, 0x0000 }, + { 0x0700, 0x1200, 0x0000 }, + { 0x8700, 0x1203, 0x2000 }, + { 0x0700, 0x1202, 0x0000 }, + { 0x0700, 0x1204, 0x0000 }, + { 0x8700, 0x1292, 0x8000 }, + { 0x8700, 0x1246, 0x7000 }, + { 0x8700, 0x1226, 0x6000 }, + { 0x8700, 0x1216, 0x5000 }, + { 0x8700, 0x120e, 0x4000 }, + { 0x8700, 0x120a, 0x3000 }, + { 0x8700, 0x1208, 0x2000 }, + { 0x0700, 0x1206, 0x0000 }, + { 0x0700, 0x1209, 0x0000 }, + { 0x8700, 0x120c, 0x2000 }, + { 0x0700, 0x120b, 0x0000 }, + { 0x0700, 0x120d, 0x0000 }, + { 0x8700, 0x1212, 0x3000 }, + { 0x8700, 0x1210, 0x2000 }, + { 0x0700, 0x120f, 0x0000 }, + { 0x0700, 0x1211, 0x0000 }, + { 0x8700, 0x1214, 0x2000 }, + { 0x0700, 0x1213, 0x0000 }, + { 0x0700, 0x1215, 0x0000 }, + { 0x8700, 0x121e, 0x4000 }, + { 0x8700, 0x121a, 0x3000 }, + { 0x8700, 0x1218, 0x2000 }, + { 0x0700, 0x1217, 0x0000 }, + { 0x0700, 0x1219, 0x0000 }, + { 0x8700, 0x121c, 0x2000 }, + { 0x0700, 0x121b, 0x0000 }, + { 0x0700, 0x121d, 0x0000 }, + { 0x8700, 0x1222, 0x3000 }, + { 0x8700, 0x1220, 0x2000 }, + { 0x0700, 0x121f, 0x0000 }, + { 0x0700, 0x1221, 0x0000 }, + { 0x8700, 0x1224, 0x2000 }, + { 0x0700, 0x1223, 0x0000 }, + { 0x0700, 0x1225, 0x0000 }, + { 0x8700, 0x1236, 0x5000 }, + { 0x8700, 0x122e, 0x4000 }, + { 0x8700, 0x122a, 0x3000 }, + { 0x8700, 0x1228, 0x2000 }, + { 0x0700, 0x1227, 0x0000 }, + { 0x0700, 0x1229, 0x0000 }, + { 0x8700, 0x122c, 0x2000 }, + { 0x0700, 0x122b, 0x0000 }, + { 0x0700, 0x122d, 0x0000 }, + { 0x8700, 0x1232, 0x3000 }, + { 0x8700, 0x1230, 0x2000 }, + { 0x0700, 0x122f, 0x0000 }, + { 0x0700, 0x1231, 0x0000 }, + { 0x8700, 0x1234, 0x2000 }, + { 0x0700, 0x1233, 0x0000 }, + { 0x0700, 0x1235, 0x0000 }, + { 0x8700, 0x123e, 0x4000 }, + { 0x8700, 0x123a, 0x3000 }, + { 0x8700, 0x1238, 0x2000 }, + { 0x0700, 0x1237, 0x0000 }, + { 0x0700, 0x1239, 0x0000 }, + { 0x8700, 0x123c, 0x2000 }, + { 0x0700, 0x123b, 0x0000 }, + { 0x0700, 0x123d, 0x0000 }, + { 0x8700, 0x1242, 0x3000 }, + { 0x8700, 0x1240, 0x2000 }, + { 0x0700, 0x123f, 0x0000 }, + { 0x0700, 0x1241, 0x0000 }, + { 0x8700, 0x1244, 0x2000 }, + { 0x0700, 0x1243, 0x0000 }, + { 0x0700, 0x1245, 0x0000 }, + { 0x8700, 0x126e, 0x6000 }, + { 0x8700, 0x125c, 0x5000 }, + { 0x8700, 0x1252, 0x4000 }, + { 0x8700, 0x124c, 0x3000 }, + { 0x8700, 0x124a, 0x2000 }, + { 0x0700, 0x1248, 0x0000 }, + { 0x0700, 0x124b, 0x0000 }, + { 0x8700, 0x1250, 0x2000 }, + { 0x0700, 0x124d, 0x0000 }, + { 0x0700, 0x1251, 0x0000 }, + { 0x8700, 0x1256, 0x3000 }, + { 0x8700, 0x1254, 0x2000 }, + { 0x0700, 0x1253, 0x0000 }, + { 0x0700, 0x1255, 0x0000 }, + { 0x8700, 0x125a, 0x2000 }, + { 0x0700, 0x1258, 0x0000 }, + { 0x0700, 0x125b, 0x0000 }, + { 0x8700, 0x1266, 0x4000 }, + { 0x8700, 0x1262, 0x3000 }, + { 0x8700, 0x1260, 0x2000 }, + { 0x0700, 0x125d, 0x0000 }, + { 0x0700, 0x1261, 0x0000 }, + { 0x8700, 0x1264, 0x2000 }, + { 0x0700, 0x1263, 0x0000 }, + { 0x0700, 0x1265, 0x0000 }, + { 0x8700, 0x126a, 0x3000 }, + { 0x8700, 0x1268, 0x2000 }, + { 0x0700, 0x1267, 0x0000 }, + { 0x0700, 0x1269, 0x0000 }, + { 0x8700, 0x126c, 0x2000 }, + { 0x0700, 0x126b, 0x0000 }, + { 0x0700, 0x126d, 0x0000 }, + { 0x8700, 0x127e, 0x5000 }, + { 0x8700, 0x1276, 0x4000 }, + { 0x8700, 0x1272, 0x3000 }, + { 0x8700, 0x1270, 0x2000 }, + { 0x0700, 0x126f, 0x0000 }, + { 0x0700, 0x1271, 0x0000 }, + { 0x8700, 0x1274, 0x2000 }, + { 0x0700, 0x1273, 0x0000 }, + { 0x0700, 0x1275, 0x0000 }, + { 0x8700, 0x127a, 0x3000 }, + { 0x8700, 0x1278, 0x2000 }, + { 0x0700, 0x1277, 0x0000 }, + { 0x0700, 0x1279, 0x0000 }, + { 0x8700, 0x127c, 0x2000 }, + { 0x0700, 0x127b, 0x0000 }, + { 0x0700, 0x127d, 0x0000 }, + { 0x8700, 0x1286, 0x4000 }, + { 0x8700, 0x1282, 0x3000 }, + { 0x8700, 0x1280, 0x2000 }, + { 0x0700, 0x127f, 0x0000 }, + { 0x0700, 0x1281, 0x0000 }, + { 0x8700, 0x1284, 0x2000 }, + { 0x0700, 0x1283, 0x0000 }, + { 0x0700, 0x1285, 0x0000 }, + { 0x8700, 0x128c, 0x3000 }, + { 0x8700, 0x128a, 0x2000 }, + { 0x0700, 0x1288, 0x0000 }, + { 0x0700, 0x128b, 0x0000 }, + { 0x8700, 0x1290, 0x2000 }, + { 0x0700, 0x128d, 0x0000 }, + { 0x0700, 0x1291, 0x0000 }, + { 0x8700, 0x12dc, 0x7000 }, + { 0x8700, 0x12b4, 0x6000 }, + { 0x8700, 0x12a2, 0x5000 }, + { 0x8700, 0x129a, 0x4000 }, + { 0x8700, 0x1296, 0x3000 }, + { 0x8700, 0x1294, 0x2000 }, + { 0x0700, 0x1293, 0x0000 }, + { 0x0700, 0x1295, 0x0000 }, + { 0x8700, 0x1298, 0x2000 }, + { 0x0700, 0x1297, 0x0000 }, + { 0x0700, 0x1299, 0x0000 }, + { 0x8700, 0x129e, 0x3000 }, + { 0x8700, 0x129c, 0x2000 }, + { 0x0700, 0x129b, 0x0000 }, + { 0x0700, 0x129d, 0x0000 }, + { 0x8700, 0x12a0, 0x2000 }, + { 0x0700, 0x129f, 0x0000 }, + { 0x0700, 0x12a1, 0x0000 }, + { 0x8700, 0x12aa, 0x4000 }, + { 0x8700, 0x12a6, 0x3000 }, + { 0x8700, 0x12a4, 0x2000 }, + { 0x0700, 0x12a3, 0x0000 }, + { 0x0700, 0x12a5, 0x0000 }, + { 0x8700, 0x12a8, 0x2000 }, + { 0x0700, 0x12a7, 0x0000 }, + { 0x0700, 0x12a9, 0x0000 }, + { 0x8700, 0x12ae, 0x3000 }, + { 0x8700, 0x12ac, 0x2000 }, + { 0x0700, 0x12ab, 0x0000 }, + { 0x0700, 0x12ad, 0x0000 }, + { 0x8700, 0x12b2, 0x2000 }, + { 0x0700, 0x12b0, 0x0000 }, + { 0x0700, 0x12b3, 0x0000 }, + { 0x8700, 0x12ca, 0x5000 }, + { 0x8700, 0x12be, 0x4000 }, + { 0x8700, 0x12ba, 0x3000 }, + { 0x8700, 0x12b8, 0x2000 }, + { 0x0700, 0x12b5, 0x0000 }, + { 0x0700, 0x12b9, 0x0000 }, + { 0x8700, 0x12bc, 0x2000 }, + { 0x0700, 0x12bb, 0x0000 }, + { 0x0700, 0x12bd, 0x0000 }, + { 0x8700, 0x12c4, 0x3000 }, + { 0x8700, 0x12c2, 0x2000 }, + { 0x0700, 0x12c0, 0x0000 }, + { 0x0700, 0x12c3, 0x0000 }, + { 0x8700, 0x12c8, 0x2000 }, + { 0x0700, 0x12c5, 0x0000 }, + { 0x0700, 0x12c9, 0x0000 }, + { 0x8700, 0x12d3, 0x4000 }, + { 0x8700, 0x12ce, 0x3000 }, + { 0x8700, 0x12cc, 0x2000 }, + { 0x0700, 0x12cb, 0x0000 }, + { 0x0700, 0x12cd, 0x0000 }, + { 0x8700, 0x12d1, 0x2000 }, + { 0x0700, 0x12d0, 0x0000 }, + { 0x0700, 0x12d2, 0x0000 }, + { 0x8700, 0x12d8, 0x3000 }, + { 0x8700, 0x12d5, 0x2000 }, + { 0x0700, 0x12d4, 0x0000 }, + { 0x0700, 0x12d6, 0x0000 }, + { 0x8700, 0x12da, 0x2000 }, + { 0x0700, 0x12d9, 0x0000 }, + { 0x0700, 0x12db, 0x0000 }, + { 0x8700, 0x12fd, 0x6000 }, + { 0x8700, 0x12ec, 0x5000 }, + { 0x8700, 0x12e4, 0x4000 }, + { 0x8700, 0x12e0, 0x3000 }, + { 0x8700, 0x12de, 0x2000 }, + { 0x0700, 0x12dd, 0x0000 }, + { 0x0700, 0x12df, 0x0000 }, + { 0x8700, 0x12e2, 0x2000 }, + { 0x0700, 0x12e1, 0x0000 }, + { 0x0700, 0x12e3, 0x0000 }, + { 0x8700, 0x12e8, 0x3000 }, + { 0x8700, 0x12e6, 0x2000 }, + { 0x0700, 0x12e5, 0x0000 }, + { 0x0700, 0x12e7, 0x0000 }, + { 0x8700, 0x12ea, 0x2000 }, + { 0x0700, 0x12e9, 0x0000 }, + { 0x0700, 0x12eb, 0x0000 }, + { 0x8700, 0x12f5, 0x4000 }, + { 0x8700, 0x12f1, 0x3000 }, + { 0x8700, 0x12ee, 0x2000 }, + { 0x0700, 0x12ed, 0x0000 }, + { 0x0700, 0x12f0, 0x0000 }, + { 0x8700, 0x12f3, 0x2000 }, + { 0x0700, 0x12f2, 0x0000 }, + { 0x0700, 0x12f4, 0x0000 }, + { 0x8700, 0x12f9, 0x3000 }, + { 0x8700, 0x12f7, 0x2000 }, + { 0x0700, 0x12f6, 0x0000 }, + { 0x0700, 0x12f8, 0x0000 }, + { 0x8700, 0x12fb, 0x2000 }, + { 0x0700, 0x12fa, 0x0000 }, + { 0x0700, 0x12fc, 0x0000 }, + { 0x8700, 0x130d, 0x5000 }, + { 0x8700, 0x1305, 0x4000 }, + { 0x8700, 0x1301, 0x3000 }, + { 0x8700, 0x12ff, 0x2000 }, + { 0x0700, 0x12fe, 0x0000 }, + { 0x0700, 0x1300, 0x0000 }, + { 0x8700, 0x1303, 0x2000 }, + { 0x0700, 0x1302, 0x0000 }, + { 0x0700, 0x1304, 0x0000 }, + { 0x8700, 0x1309, 0x3000 }, + { 0x8700, 0x1307, 0x2000 }, + { 0x0700, 0x1306, 0x0000 }, + { 0x0700, 0x1308, 0x0000 }, + { 0x8700, 0x130b, 0x2000 }, + { 0x0700, 0x130a, 0x0000 }, + { 0x0700, 0x130c, 0x0000 }, + { 0x8700, 0x1319, 0x4000 }, + { 0x8700, 0x1313, 0x3000 }, + { 0x8700, 0x1310, 0x2000 }, + { 0x0700, 0x130e, 0x0000 }, + { 0x0700, 0x1312, 0x0000 }, + { 0x8700, 0x1315, 0x2000 }, + { 0x0700, 0x1314, 0x0000 }, + { 0x0700, 0x1318, 0x0000 }, + { 0x8700, 0x131d, 0x3000 }, + { 0x8700, 0x131b, 0x2000 }, + { 0x0700, 0x131a, 0x0000 }, + { 0x0700, 0x131c, 0x0000 }, + { 0x8700, 0x1320, 0x2000 }, + { 0x0700, 0x131e, 0x0000 }, + { 0x0700, 0x1321, 0x0000 }, + { 0x8700, 0x1458, 0x9000 }, + { 0x8700, 0x13cc, 0x8000 }, + { 0x8d00, 0x1369, 0x7000 }, + { 0x8700, 0x1342, 0x6000 }, + { 0x8700, 0x1332, 0x5000 }, + { 0x8700, 0x132a, 0x4000 }, + { 0x8700, 0x1326, 0x3000 }, + { 0x8700, 0x1324, 0x2000 }, + { 0x0700, 0x1323, 0x0000 }, + { 0x0700, 0x1325, 0x0000 }, + { 0x8700, 0x1328, 0x2000 }, + { 0x0700, 0x1327, 0x0000 }, + { 0x0700, 0x1329, 0x0000 }, + { 0x8700, 0x132e, 0x3000 }, + { 0x8700, 0x132c, 0x2000 }, + { 0x0700, 0x132b, 0x0000 }, + { 0x0700, 0x132d, 0x0000 }, + { 0x8700, 0x1330, 0x2000 }, + { 0x0700, 0x132f, 0x0000 }, + { 0x0700, 0x1331, 0x0000 }, + { 0x8700, 0x133a, 0x4000 }, + { 0x8700, 0x1336, 0x3000 }, + { 0x8700, 0x1334, 0x2000 }, + { 0x0700, 0x1333, 0x0000 }, + { 0x0700, 0x1335, 0x0000 }, + { 0x8700, 0x1338, 0x2000 }, + { 0x0700, 0x1337, 0x0000 }, + { 0x0700, 0x1339, 0x0000 }, + { 0x8700, 0x133e, 0x3000 }, + { 0x8700, 0x133c, 0x2000 }, + { 0x0700, 0x133b, 0x0000 }, + { 0x0700, 0x133d, 0x0000 }, + { 0x8700, 0x1340, 0x2000 }, + { 0x0700, 0x133f, 0x0000 }, + { 0x0700, 0x1341, 0x0000 }, + { 0x8700, 0x1353, 0x5000 }, + { 0x8700, 0x134b, 0x4000 }, + { 0x8700, 0x1346, 0x3000 }, + { 0x8700, 0x1344, 0x2000 }, + { 0x0700, 0x1343, 0x0000 }, + { 0x0700, 0x1345, 0x0000 }, + { 0x8700, 0x1349, 0x2000 }, + { 0x0700, 0x1348, 0x0000 }, + { 0x0700, 0x134a, 0x0000 }, + { 0x8700, 0x134f, 0x3000 }, + { 0x8700, 0x134d, 0x2000 }, + { 0x0700, 0x134c, 0x0000 }, + { 0x0700, 0x134e, 0x0000 }, + { 0x8700, 0x1351, 0x2000 }, + { 0x0700, 0x1350, 0x0000 }, + { 0x0700, 0x1352, 0x0000 }, + { 0x9500, 0x1361, 0x4000 }, + { 0x8700, 0x1357, 0x3000 }, + { 0x8700, 0x1355, 0x2000 }, + { 0x0700, 0x1354, 0x0000 }, + { 0x0700, 0x1356, 0x0000 }, + { 0x8700, 0x1359, 0x2000 }, + { 0x0700, 0x1358, 0x0000 }, + { 0x0700, 0x135a, 0x0000 }, + { 0x9500, 0x1365, 0x3000 }, + { 0x9500, 0x1363, 0x2000 }, + { 0x1500, 0x1362, 0x0000 }, + { 0x1500, 0x1364, 0x0000 }, + { 0x9500, 0x1367, 0x2000 }, + { 0x1500, 0x1366, 0x0000 }, + { 0x1500, 0x1368, 0x0000 }, + { 0x8700, 0x13ac, 0x6000 }, + { 0x8f00, 0x1379, 0x5000 }, + { 0x8d00, 0x1371, 0x4000 }, + { 0x8d00, 0x136d, 0x3000 }, + { 0x8d00, 0x136b, 0x2000 }, + { 0x0d00, 0x136a, 0x0000 }, + { 0x0d00, 0x136c, 0x0000 }, + { 0x8d00, 0x136f, 0x2000 }, + { 0x0d00, 0x136e, 0x0000 }, + { 0x0d00, 0x1370, 0x0000 }, + { 0x8f00, 0x1375, 0x3000 }, + { 0x8f00, 0x1373, 0x2000 }, + { 0x0f00, 0x1372, 0x0000 }, + { 0x0f00, 0x1374, 0x0000 }, + { 0x8f00, 0x1377, 0x2000 }, + { 0x0f00, 0x1376, 0x0000 }, + { 0x0f00, 0x1378, 0x0000 }, + { 0x8700, 0x13a4, 0x4000 }, + { 0x8700, 0x13a0, 0x3000 }, + { 0x8f00, 0x137b, 0x2000 }, + { 0x0f00, 0x137a, 0x0000 }, + { 0x0f00, 0x137c, 0x0000 }, + { 0x8700, 0x13a2, 0x2000 }, + { 0x0700, 0x13a1, 0x0000 }, + { 0x0700, 0x13a3, 0x0000 }, + { 0x8700, 0x13a8, 0x3000 }, + { 0x8700, 0x13a6, 0x2000 }, + { 0x0700, 0x13a5, 0x0000 }, + { 0x0700, 0x13a7, 0x0000 }, + { 0x8700, 0x13aa, 0x2000 }, + { 0x0700, 0x13a9, 0x0000 }, + { 0x0700, 0x13ab, 0x0000 }, + { 0x8700, 0x13bc, 0x5000 }, + { 0x8700, 0x13b4, 0x4000 }, + { 0x8700, 0x13b0, 0x3000 }, + { 0x8700, 0x13ae, 0x2000 }, + { 0x0700, 0x13ad, 0x0000 }, + { 0x0700, 0x13af, 0x0000 }, + { 0x8700, 0x13b2, 0x2000 }, + { 0x0700, 0x13b1, 0x0000 }, + { 0x0700, 0x13b3, 0x0000 }, + { 0x8700, 0x13b8, 0x3000 }, + { 0x8700, 0x13b6, 0x2000 }, + { 0x0700, 0x13b5, 0x0000 }, + { 0x0700, 0x13b7, 0x0000 }, + { 0x8700, 0x13ba, 0x2000 }, + { 0x0700, 0x13b9, 0x0000 }, + { 0x0700, 0x13bb, 0x0000 }, + { 0x8700, 0x13c4, 0x4000 }, + { 0x8700, 0x13c0, 0x3000 }, + { 0x8700, 0x13be, 0x2000 }, + { 0x0700, 0x13bd, 0x0000 }, + { 0x0700, 0x13bf, 0x0000 }, + { 0x8700, 0x13c2, 0x2000 }, + { 0x0700, 0x13c1, 0x0000 }, + { 0x0700, 0x13c3, 0x0000 }, + { 0x8700, 0x13c8, 0x3000 }, + { 0x8700, 0x13c6, 0x2000 }, + { 0x0700, 0x13c5, 0x0000 }, + { 0x0700, 0x13c7, 0x0000 }, + { 0x8700, 0x13ca, 0x2000 }, + { 0x0700, 0x13c9, 0x0000 }, + { 0x0700, 0x13cb, 0x0000 }, + { 0x8700, 0x1418, 0x7000 }, + { 0x8700, 0x13ec, 0x6000 }, + { 0x8700, 0x13dc, 0x5000 }, + { 0x8700, 0x13d4, 0x4000 }, + { 0x8700, 0x13d0, 0x3000 }, + { 0x8700, 0x13ce, 0x2000 }, + { 0x0700, 0x13cd, 0x0000 }, + { 0x0700, 0x13cf, 0x0000 }, + { 0x8700, 0x13d2, 0x2000 }, + { 0x0700, 0x13d1, 0x0000 }, + { 0x0700, 0x13d3, 0x0000 }, + { 0x8700, 0x13d8, 0x3000 }, + { 0x8700, 0x13d6, 0x2000 }, + { 0x0700, 0x13d5, 0x0000 }, + { 0x0700, 0x13d7, 0x0000 }, + { 0x8700, 0x13da, 0x2000 }, + { 0x0700, 0x13d9, 0x0000 }, + { 0x0700, 0x13db, 0x0000 }, + { 0x8700, 0x13e4, 0x4000 }, + { 0x8700, 0x13e0, 0x3000 }, + { 0x8700, 0x13de, 0x2000 }, + { 0x0700, 0x13dd, 0x0000 }, + { 0x0700, 0x13df, 0x0000 }, + { 0x8700, 0x13e2, 0x2000 }, + { 0x0700, 0x13e1, 0x0000 }, + { 0x0700, 0x13e3, 0x0000 }, + { 0x8700, 0x13e8, 0x3000 }, + { 0x8700, 0x13e6, 0x2000 }, + { 0x0700, 0x13e5, 0x0000 }, + { 0x0700, 0x13e7, 0x0000 }, + { 0x8700, 0x13ea, 0x2000 }, + { 0x0700, 0x13e9, 0x0000 }, + { 0x0700, 0x13eb, 0x0000 }, + { 0x8700, 0x1408, 0x5000 }, + { 0x8700, 0x13f4, 0x4000 }, + { 0x8700, 0x13f0, 0x3000 }, + { 0x8700, 0x13ee, 0x2000 }, + { 0x0700, 0x13ed, 0x0000 }, + { 0x0700, 0x13ef, 0x0000 }, + { 0x8700, 0x13f2, 0x2000 }, + { 0x0700, 0x13f1, 0x0000 }, + { 0x0700, 0x13f3, 0x0000 }, + { 0x8700, 0x1404, 0x3000 }, + { 0x8700, 0x1402, 0x2000 }, + { 0x0700, 0x1401, 0x0000 }, + { 0x0700, 0x1403, 0x0000 }, + { 0x8700, 0x1406, 0x2000 }, + { 0x0700, 0x1405, 0x0000 }, + { 0x0700, 0x1407, 0x0000 }, + { 0x8700, 0x1410, 0x4000 }, + { 0x8700, 0x140c, 0x3000 }, + { 0x8700, 0x140a, 0x2000 }, + { 0x0700, 0x1409, 0x0000 }, + { 0x0700, 0x140b, 0x0000 }, + { 0x8700, 0x140e, 0x2000 }, + { 0x0700, 0x140d, 0x0000 }, + { 0x0700, 0x140f, 0x0000 }, + { 0x8700, 0x1414, 0x3000 }, + { 0x8700, 0x1412, 0x2000 }, + { 0x0700, 0x1411, 0x0000 }, + { 0x0700, 0x1413, 0x0000 }, + { 0x8700, 0x1416, 0x2000 }, + { 0x0700, 0x1415, 0x0000 }, + { 0x0700, 0x1417, 0x0000 }, + { 0x8700, 0x1438, 0x6000 }, + { 0x8700, 0x1428, 0x5000 }, + { 0x8700, 0x1420, 0x4000 }, + { 0x8700, 0x141c, 0x3000 }, + { 0x8700, 0x141a, 0x2000 }, + { 0x0700, 0x1419, 0x0000 }, + { 0x0700, 0x141b, 0x0000 }, + { 0x8700, 0x141e, 0x2000 }, + { 0x0700, 0x141d, 0x0000 }, + { 0x0700, 0x141f, 0x0000 }, + { 0x8700, 0x1424, 0x3000 }, + { 0x8700, 0x1422, 0x2000 }, + { 0x0700, 0x1421, 0x0000 }, + { 0x0700, 0x1423, 0x0000 }, + { 0x8700, 0x1426, 0x2000 }, + { 0x0700, 0x1425, 0x0000 }, + { 0x0700, 0x1427, 0x0000 }, + { 0x8700, 0x1430, 0x4000 }, + { 0x8700, 0x142c, 0x3000 }, + { 0x8700, 0x142a, 0x2000 }, + { 0x0700, 0x1429, 0x0000 }, + { 0x0700, 0x142b, 0x0000 }, + { 0x8700, 0x142e, 0x2000 }, + { 0x0700, 0x142d, 0x0000 }, + { 0x0700, 0x142f, 0x0000 }, + { 0x8700, 0x1434, 0x3000 }, + { 0x8700, 0x1432, 0x2000 }, + { 0x0700, 0x1431, 0x0000 }, + { 0x0700, 0x1433, 0x0000 }, + { 0x8700, 0x1436, 0x2000 }, + { 0x0700, 0x1435, 0x0000 }, + { 0x0700, 0x1437, 0x0000 }, + { 0x8700, 0x1448, 0x5000 }, + { 0x8700, 0x1440, 0x4000 }, + { 0x8700, 0x143c, 0x3000 }, + { 0x8700, 0x143a, 0x2000 }, + { 0x0700, 0x1439, 0x0000 }, + { 0x0700, 0x143b, 0x0000 }, + { 0x8700, 0x143e, 0x2000 }, + { 0x0700, 0x143d, 0x0000 }, + { 0x0700, 0x143f, 0x0000 }, + { 0x8700, 0x1444, 0x3000 }, + { 0x8700, 0x1442, 0x2000 }, + { 0x0700, 0x1441, 0x0000 }, + { 0x0700, 0x1443, 0x0000 }, + { 0x8700, 0x1446, 0x2000 }, + { 0x0700, 0x1445, 0x0000 }, + { 0x0700, 0x1447, 0x0000 }, + { 0x8700, 0x1450, 0x4000 }, + { 0x8700, 0x144c, 0x3000 }, + { 0x8700, 0x144a, 0x2000 }, + { 0x0700, 0x1449, 0x0000 }, + { 0x0700, 0x144b, 0x0000 }, + { 0x8700, 0x144e, 0x2000 }, + { 0x0700, 0x144d, 0x0000 }, + { 0x0700, 0x144f, 0x0000 }, + { 0x8700, 0x1454, 0x3000 }, + { 0x8700, 0x1452, 0x2000 }, + { 0x0700, 0x1451, 0x0000 }, + { 0x0700, 0x1453, 0x0000 }, + { 0x8700, 0x1456, 0x2000 }, + { 0x0700, 0x1455, 0x0000 }, + { 0x0700, 0x1457, 0x0000 }, + { 0x8700, 0x14d8, 0x8000 }, + { 0x8700, 0x1498, 0x7000 }, + { 0x8700, 0x1478, 0x6000 }, + { 0x8700, 0x1468, 0x5000 }, + { 0x8700, 0x1460, 0x4000 }, + { 0x8700, 0x145c, 0x3000 }, + { 0x8700, 0x145a, 0x2000 }, + { 0x0700, 0x1459, 0x0000 }, + { 0x0700, 0x145b, 0x0000 }, + { 0x8700, 0x145e, 0x2000 }, + { 0x0700, 0x145d, 0x0000 }, + { 0x0700, 0x145f, 0x0000 }, + { 0x8700, 0x1464, 0x3000 }, + { 0x8700, 0x1462, 0x2000 }, + { 0x0700, 0x1461, 0x0000 }, + { 0x0700, 0x1463, 0x0000 }, + { 0x8700, 0x1466, 0x2000 }, + { 0x0700, 0x1465, 0x0000 }, + { 0x0700, 0x1467, 0x0000 }, + { 0x8700, 0x1470, 0x4000 }, + { 0x8700, 0x146c, 0x3000 }, + { 0x8700, 0x146a, 0x2000 }, + { 0x0700, 0x1469, 0x0000 }, + { 0x0700, 0x146b, 0x0000 }, + { 0x8700, 0x146e, 0x2000 }, + { 0x0700, 0x146d, 0x0000 }, + { 0x0700, 0x146f, 0x0000 }, + { 0x8700, 0x1474, 0x3000 }, + { 0x8700, 0x1472, 0x2000 }, + { 0x0700, 0x1471, 0x0000 }, + { 0x0700, 0x1473, 0x0000 }, + { 0x8700, 0x1476, 0x2000 }, + { 0x0700, 0x1475, 0x0000 }, + { 0x0700, 0x1477, 0x0000 }, + { 0x8700, 0x1488, 0x5000 }, + { 0x8700, 0x1480, 0x4000 }, + { 0x8700, 0x147c, 0x3000 }, + { 0x8700, 0x147a, 0x2000 }, + { 0x0700, 0x1479, 0x0000 }, + { 0x0700, 0x147b, 0x0000 }, + { 0x8700, 0x147e, 0x2000 }, + { 0x0700, 0x147d, 0x0000 }, + { 0x0700, 0x147f, 0x0000 }, + { 0x8700, 0x1484, 0x3000 }, + { 0x8700, 0x1482, 0x2000 }, + { 0x0700, 0x1481, 0x0000 }, + { 0x0700, 0x1483, 0x0000 }, + { 0x8700, 0x1486, 0x2000 }, + { 0x0700, 0x1485, 0x0000 }, + { 0x0700, 0x1487, 0x0000 }, + { 0x8700, 0x1490, 0x4000 }, + { 0x8700, 0x148c, 0x3000 }, + { 0x8700, 0x148a, 0x2000 }, + { 0x0700, 0x1489, 0x0000 }, + { 0x0700, 0x148b, 0x0000 }, + { 0x8700, 0x148e, 0x2000 }, + { 0x0700, 0x148d, 0x0000 }, + { 0x0700, 0x148f, 0x0000 }, + { 0x8700, 0x1494, 0x3000 }, + { 0x8700, 0x1492, 0x2000 }, + { 0x0700, 0x1491, 0x0000 }, + { 0x0700, 0x1493, 0x0000 }, + { 0x8700, 0x1496, 0x2000 }, + { 0x0700, 0x1495, 0x0000 }, + { 0x0700, 0x1497, 0x0000 }, + { 0x8700, 0x14b8, 0x6000 }, + { 0x8700, 0x14a8, 0x5000 }, + { 0x8700, 0x14a0, 0x4000 }, + { 0x8700, 0x149c, 0x3000 }, + { 0x8700, 0x149a, 0x2000 }, + { 0x0700, 0x1499, 0x0000 }, + { 0x0700, 0x149b, 0x0000 }, + { 0x8700, 0x149e, 0x2000 }, + { 0x0700, 0x149d, 0x0000 }, + { 0x0700, 0x149f, 0x0000 }, + { 0x8700, 0x14a4, 0x3000 }, + { 0x8700, 0x14a2, 0x2000 }, + { 0x0700, 0x14a1, 0x0000 }, + { 0x0700, 0x14a3, 0x0000 }, + { 0x8700, 0x14a6, 0x2000 }, + { 0x0700, 0x14a5, 0x0000 }, + { 0x0700, 0x14a7, 0x0000 }, + { 0x8700, 0x14b0, 0x4000 }, + { 0x8700, 0x14ac, 0x3000 }, + { 0x8700, 0x14aa, 0x2000 }, + { 0x0700, 0x14a9, 0x0000 }, + { 0x0700, 0x14ab, 0x0000 }, + { 0x8700, 0x14ae, 0x2000 }, + { 0x0700, 0x14ad, 0x0000 }, + { 0x0700, 0x14af, 0x0000 }, + { 0x8700, 0x14b4, 0x3000 }, + { 0x8700, 0x14b2, 0x2000 }, + { 0x0700, 0x14b1, 0x0000 }, + { 0x0700, 0x14b3, 0x0000 }, + { 0x8700, 0x14b6, 0x2000 }, + { 0x0700, 0x14b5, 0x0000 }, + { 0x0700, 0x14b7, 0x0000 }, + { 0x8700, 0x14c8, 0x5000 }, + { 0x8700, 0x14c0, 0x4000 }, + { 0x8700, 0x14bc, 0x3000 }, + { 0x8700, 0x14ba, 0x2000 }, + { 0x0700, 0x14b9, 0x0000 }, + { 0x0700, 0x14bb, 0x0000 }, + { 0x8700, 0x14be, 0x2000 }, + { 0x0700, 0x14bd, 0x0000 }, + { 0x0700, 0x14bf, 0x0000 }, + { 0x8700, 0x14c4, 0x3000 }, + { 0x8700, 0x14c2, 0x2000 }, + { 0x0700, 0x14c1, 0x0000 }, + { 0x0700, 0x14c3, 0x0000 }, + { 0x8700, 0x14c6, 0x2000 }, + { 0x0700, 0x14c5, 0x0000 }, + { 0x0700, 0x14c7, 0x0000 }, + { 0x8700, 0x14d0, 0x4000 }, + { 0x8700, 0x14cc, 0x3000 }, + { 0x8700, 0x14ca, 0x2000 }, + { 0x0700, 0x14c9, 0x0000 }, + { 0x0700, 0x14cb, 0x0000 }, + { 0x8700, 0x14ce, 0x2000 }, + { 0x0700, 0x14cd, 0x0000 }, + { 0x0700, 0x14cf, 0x0000 }, + { 0x8700, 0x14d4, 0x3000 }, + { 0x8700, 0x14d2, 0x2000 }, + { 0x0700, 0x14d1, 0x0000 }, + { 0x0700, 0x14d3, 0x0000 }, + { 0x8700, 0x14d6, 0x2000 }, + { 0x0700, 0x14d5, 0x0000 }, + { 0x0700, 0x14d7, 0x0000 }, + { 0x8700, 0x1518, 0x7000 }, + { 0x8700, 0x14f8, 0x6000 }, + { 0x8700, 0x14e8, 0x5000 }, + { 0x8700, 0x14e0, 0x4000 }, + { 0x8700, 0x14dc, 0x3000 }, + { 0x8700, 0x14da, 0x2000 }, + { 0x0700, 0x14d9, 0x0000 }, + { 0x0700, 0x14db, 0x0000 }, + { 0x8700, 0x14de, 0x2000 }, + { 0x0700, 0x14dd, 0x0000 }, + { 0x0700, 0x14df, 0x0000 }, + { 0x8700, 0x14e4, 0x3000 }, + { 0x8700, 0x14e2, 0x2000 }, + { 0x0700, 0x14e1, 0x0000 }, + { 0x0700, 0x14e3, 0x0000 }, + { 0x8700, 0x14e6, 0x2000 }, + { 0x0700, 0x14e5, 0x0000 }, + { 0x0700, 0x14e7, 0x0000 }, + { 0x8700, 0x14f0, 0x4000 }, + { 0x8700, 0x14ec, 0x3000 }, + { 0x8700, 0x14ea, 0x2000 }, + { 0x0700, 0x14e9, 0x0000 }, + { 0x0700, 0x14eb, 0x0000 }, + { 0x8700, 0x14ee, 0x2000 }, + { 0x0700, 0x14ed, 0x0000 }, + { 0x0700, 0x14ef, 0x0000 }, + { 0x8700, 0x14f4, 0x3000 }, + { 0x8700, 0x14f2, 0x2000 }, + { 0x0700, 0x14f1, 0x0000 }, + { 0x0700, 0x14f3, 0x0000 }, + { 0x8700, 0x14f6, 0x2000 }, + { 0x0700, 0x14f5, 0x0000 }, + { 0x0700, 0x14f7, 0x0000 }, + { 0x8700, 0x1508, 0x5000 }, + { 0x8700, 0x1500, 0x4000 }, + { 0x8700, 0x14fc, 0x3000 }, + { 0x8700, 0x14fa, 0x2000 }, + { 0x0700, 0x14f9, 0x0000 }, + { 0x0700, 0x14fb, 0x0000 }, + { 0x8700, 0x14fe, 0x2000 }, + { 0x0700, 0x14fd, 0x0000 }, + { 0x0700, 0x14ff, 0x0000 }, + { 0x8700, 0x1504, 0x3000 }, + { 0x8700, 0x1502, 0x2000 }, + { 0x0700, 0x1501, 0x0000 }, + { 0x0700, 0x1503, 0x0000 }, + { 0x8700, 0x1506, 0x2000 }, + { 0x0700, 0x1505, 0x0000 }, + { 0x0700, 0x1507, 0x0000 }, + { 0x8700, 0x1510, 0x4000 }, + { 0x8700, 0x150c, 0x3000 }, + { 0x8700, 0x150a, 0x2000 }, + { 0x0700, 0x1509, 0x0000 }, + { 0x0700, 0x150b, 0x0000 }, + { 0x8700, 0x150e, 0x2000 }, + { 0x0700, 0x150d, 0x0000 }, + { 0x0700, 0x150f, 0x0000 }, + { 0x8700, 0x1514, 0x3000 }, + { 0x8700, 0x1512, 0x2000 }, + { 0x0700, 0x1511, 0x0000 }, + { 0x0700, 0x1513, 0x0000 }, + { 0x8700, 0x1516, 0x2000 }, + { 0x0700, 0x1515, 0x0000 }, + { 0x0700, 0x1517, 0x0000 }, + { 0x8700, 0x1538, 0x6000 }, + { 0x8700, 0x1528, 0x5000 }, + { 0x8700, 0x1520, 0x4000 }, + { 0x8700, 0x151c, 0x3000 }, + { 0x8700, 0x151a, 0x2000 }, + { 0x0700, 0x1519, 0x0000 }, + { 0x0700, 0x151b, 0x0000 }, + { 0x8700, 0x151e, 0x2000 }, + { 0x0700, 0x151d, 0x0000 }, + { 0x0700, 0x151f, 0x0000 }, + { 0x8700, 0x1524, 0x3000 }, + { 0x8700, 0x1522, 0x2000 }, + { 0x0700, 0x1521, 0x0000 }, + { 0x0700, 0x1523, 0x0000 }, + { 0x8700, 0x1526, 0x2000 }, + { 0x0700, 0x1525, 0x0000 }, + { 0x0700, 0x1527, 0x0000 }, + { 0x8700, 0x1530, 0x4000 }, + { 0x8700, 0x152c, 0x3000 }, + { 0x8700, 0x152a, 0x2000 }, + { 0x0700, 0x1529, 0x0000 }, + { 0x0700, 0x152b, 0x0000 }, + { 0x8700, 0x152e, 0x2000 }, + { 0x0700, 0x152d, 0x0000 }, + { 0x0700, 0x152f, 0x0000 }, + { 0x8700, 0x1534, 0x3000 }, + { 0x8700, 0x1532, 0x2000 }, + { 0x0700, 0x1531, 0x0000 }, + { 0x0700, 0x1533, 0x0000 }, + { 0x8700, 0x1536, 0x2000 }, + { 0x0700, 0x1535, 0x0000 }, + { 0x0700, 0x1537, 0x0000 }, + { 0x8700, 0x1548, 0x5000 }, + { 0x8700, 0x1540, 0x4000 }, + { 0x8700, 0x153c, 0x3000 }, + { 0x8700, 0x153a, 0x2000 }, + { 0x0700, 0x1539, 0x0000 }, + { 0x0700, 0x153b, 0x0000 }, + { 0x8700, 0x153e, 0x2000 }, + { 0x0700, 0x153d, 0x0000 }, + { 0x0700, 0x153f, 0x0000 }, + { 0x8700, 0x1544, 0x3000 }, + { 0x8700, 0x1542, 0x2000 }, + { 0x0700, 0x1541, 0x0000 }, + { 0x0700, 0x1543, 0x0000 }, + { 0x8700, 0x1546, 0x2000 }, + { 0x0700, 0x1545, 0x0000 }, + { 0x0700, 0x1547, 0x0000 }, + { 0x8700, 0x1550, 0x4000 }, + { 0x8700, 0x154c, 0x3000 }, + { 0x8700, 0x154a, 0x2000 }, + { 0x0700, 0x1549, 0x0000 }, + { 0x0700, 0x154b, 0x0000 }, + { 0x8700, 0x154e, 0x2000 }, + { 0x0700, 0x154d, 0x0000 }, + { 0x0700, 0x154f, 0x0000 }, + { 0x8700, 0x1554, 0x3000 }, + { 0x8700, 0x1552, 0x2000 }, + { 0x0700, 0x1551, 0x0000 }, + { 0x0700, 0x1553, 0x0000 }, + { 0x8700, 0x1556, 0x2000 }, + { 0x0700, 0x1555, 0x0000 }, + { 0x0700, 0x1557, 0x0000 }, + { 0x9900, 0x22ae, 0xc000 }, + { 0x8900, 0x1e24, 0xb001 }, + { 0x8700, 0x17a2, 0xa000 }, + { 0x8700, 0x1658, 0x9000 }, + { 0x8700, 0x15d8, 0x8000 }, + { 0x8700, 0x1598, 0x7000 }, + { 0x8700, 0x1578, 0x6000 }, + { 0x8700, 0x1568, 0x5000 }, + { 0x8700, 0x1560, 0x4000 }, + { 0x8700, 0x155c, 0x3000 }, + { 0x8700, 0x155a, 0x2000 }, + { 0x0700, 0x1559, 0x0000 }, + { 0x0700, 0x155b, 0x0000 }, + { 0x8700, 0x155e, 0x2000 }, + { 0x0700, 0x155d, 0x0000 }, + { 0x0700, 0x155f, 0x0000 }, + { 0x8700, 0x1564, 0x3000 }, + { 0x8700, 0x1562, 0x2000 }, + { 0x0700, 0x1561, 0x0000 }, + { 0x0700, 0x1563, 0x0000 }, + { 0x8700, 0x1566, 0x2000 }, + { 0x0700, 0x1565, 0x0000 }, + { 0x0700, 0x1567, 0x0000 }, + { 0x8700, 0x1570, 0x4000 }, + { 0x8700, 0x156c, 0x3000 }, + { 0x8700, 0x156a, 0x2000 }, + { 0x0700, 0x1569, 0x0000 }, + { 0x0700, 0x156b, 0x0000 }, + { 0x8700, 0x156e, 0x2000 }, + { 0x0700, 0x156d, 0x0000 }, + { 0x0700, 0x156f, 0x0000 }, + { 0x8700, 0x1574, 0x3000 }, + { 0x8700, 0x1572, 0x2000 }, + { 0x0700, 0x1571, 0x0000 }, + { 0x0700, 0x1573, 0x0000 }, + { 0x8700, 0x1576, 0x2000 }, + { 0x0700, 0x1575, 0x0000 }, + { 0x0700, 0x1577, 0x0000 }, + { 0x8700, 0x1588, 0x5000 }, + { 0x8700, 0x1580, 0x4000 }, + { 0x8700, 0x157c, 0x3000 }, + { 0x8700, 0x157a, 0x2000 }, + { 0x0700, 0x1579, 0x0000 }, + { 0x0700, 0x157b, 0x0000 }, + { 0x8700, 0x157e, 0x2000 }, + { 0x0700, 0x157d, 0x0000 }, + { 0x0700, 0x157f, 0x0000 }, + { 0x8700, 0x1584, 0x3000 }, + { 0x8700, 0x1582, 0x2000 }, + { 0x0700, 0x1581, 0x0000 }, + { 0x0700, 0x1583, 0x0000 }, + { 0x8700, 0x1586, 0x2000 }, + { 0x0700, 0x1585, 0x0000 }, + { 0x0700, 0x1587, 0x0000 }, + { 0x8700, 0x1590, 0x4000 }, + { 0x8700, 0x158c, 0x3000 }, + { 0x8700, 0x158a, 0x2000 }, + { 0x0700, 0x1589, 0x0000 }, + { 0x0700, 0x158b, 0x0000 }, + { 0x8700, 0x158e, 0x2000 }, + { 0x0700, 0x158d, 0x0000 }, + { 0x0700, 0x158f, 0x0000 }, + { 0x8700, 0x1594, 0x3000 }, + { 0x8700, 0x1592, 0x2000 }, + { 0x0700, 0x1591, 0x0000 }, + { 0x0700, 0x1593, 0x0000 }, + { 0x8700, 0x1596, 0x2000 }, + { 0x0700, 0x1595, 0x0000 }, + { 0x0700, 0x1597, 0x0000 }, + { 0x8700, 0x15b8, 0x6000 }, + { 0x8700, 0x15a8, 0x5000 }, + { 0x8700, 0x15a0, 0x4000 }, + { 0x8700, 0x159c, 0x3000 }, + { 0x8700, 0x159a, 0x2000 }, + { 0x0700, 0x1599, 0x0000 }, + { 0x0700, 0x159b, 0x0000 }, + { 0x8700, 0x159e, 0x2000 }, + { 0x0700, 0x159d, 0x0000 }, + { 0x0700, 0x159f, 0x0000 }, + { 0x8700, 0x15a4, 0x3000 }, + { 0x8700, 0x15a2, 0x2000 }, + { 0x0700, 0x15a1, 0x0000 }, + { 0x0700, 0x15a3, 0x0000 }, + { 0x8700, 0x15a6, 0x2000 }, + { 0x0700, 0x15a5, 0x0000 }, + { 0x0700, 0x15a7, 0x0000 }, + { 0x8700, 0x15b0, 0x4000 }, + { 0x8700, 0x15ac, 0x3000 }, + { 0x8700, 0x15aa, 0x2000 }, + { 0x0700, 0x15a9, 0x0000 }, + { 0x0700, 0x15ab, 0x0000 }, + { 0x8700, 0x15ae, 0x2000 }, + { 0x0700, 0x15ad, 0x0000 }, + { 0x0700, 0x15af, 0x0000 }, + { 0x8700, 0x15b4, 0x3000 }, + { 0x8700, 0x15b2, 0x2000 }, + { 0x0700, 0x15b1, 0x0000 }, + { 0x0700, 0x15b3, 0x0000 }, + { 0x8700, 0x15b6, 0x2000 }, + { 0x0700, 0x15b5, 0x0000 }, + { 0x0700, 0x15b7, 0x0000 }, + { 0x8700, 0x15c8, 0x5000 }, + { 0x8700, 0x15c0, 0x4000 }, + { 0x8700, 0x15bc, 0x3000 }, + { 0x8700, 0x15ba, 0x2000 }, + { 0x0700, 0x15b9, 0x0000 }, + { 0x0700, 0x15bb, 0x0000 }, + { 0x8700, 0x15be, 0x2000 }, + { 0x0700, 0x15bd, 0x0000 }, + { 0x0700, 0x15bf, 0x0000 }, + { 0x8700, 0x15c4, 0x3000 }, + { 0x8700, 0x15c2, 0x2000 }, + { 0x0700, 0x15c1, 0x0000 }, + { 0x0700, 0x15c3, 0x0000 }, + { 0x8700, 0x15c6, 0x2000 }, + { 0x0700, 0x15c5, 0x0000 }, + { 0x0700, 0x15c7, 0x0000 }, + { 0x8700, 0x15d0, 0x4000 }, + { 0x8700, 0x15cc, 0x3000 }, + { 0x8700, 0x15ca, 0x2000 }, + { 0x0700, 0x15c9, 0x0000 }, + { 0x0700, 0x15cb, 0x0000 }, + { 0x8700, 0x15ce, 0x2000 }, + { 0x0700, 0x15cd, 0x0000 }, + { 0x0700, 0x15cf, 0x0000 }, + { 0x8700, 0x15d4, 0x3000 }, + { 0x8700, 0x15d2, 0x2000 }, + { 0x0700, 0x15d1, 0x0000 }, + { 0x0700, 0x15d3, 0x0000 }, + { 0x8700, 0x15d6, 0x2000 }, + { 0x0700, 0x15d5, 0x0000 }, + { 0x0700, 0x15d7, 0x0000 }, + { 0x8700, 0x1618, 0x7000 }, + { 0x8700, 0x15f8, 0x6000 }, + { 0x8700, 0x15e8, 0x5000 }, + { 0x8700, 0x15e0, 0x4000 }, + { 0x8700, 0x15dc, 0x3000 }, + { 0x8700, 0x15da, 0x2000 }, + { 0x0700, 0x15d9, 0x0000 }, + { 0x0700, 0x15db, 0x0000 }, + { 0x8700, 0x15de, 0x2000 }, + { 0x0700, 0x15dd, 0x0000 }, + { 0x0700, 0x15df, 0x0000 }, + { 0x8700, 0x15e4, 0x3000 }, + { 0x8700, 0x15e2, 0x2000 }, + { 0x0700, 0x15e1, 0x0000 }, + { 0x0700, 0x15e3, 0x0000 }, + { 0x8700, 0x15e6, 0x2000 }, + { 0x0700, 0x15e5, 0x0000 }, + { 0x0700, 0x15e7, 0x0000 }, + { 0x8700, 0x15f0, 0x4000 }, + { 0x8700, 0x15ec, 0x3000 }, + { 0x8700, 0x15ea, 0x2000 }, + { 0x0700, 0x15e9, 0x0000 }, + { 0x0700, 0x15eb, 0x0000 }, + { 0x8700, 0x15ee, 0x2000 }, + { 0x0700, 0x15ed, 0x0000 }, + { 0x0700, 0x15ef, 0x0000 }, + { 0x8700, 0x15f4, 0x3000 }, + { 0x8700, 0x15f2, 0x2000 }, + { 0x0700, 0x15f1, 0x0000 }, + { 0x0700, 0x15f3, 0x0000 }, + { 0x8700, 0x15f6, 0x2000 }, + { 0x0700, 0x15f5, 0x0000 }, + { 0x0700, 0x15f7, 0x0000 }, + { 0x8700, 0x1608, 0x5000 }, + { 0x8700, 0x1600, 0x4000 }, + { 0x8700, 0x15fc, 0x3000 }, + { 0x8700, 0x15fa, 0x2000 }, + { 0x0700, 0x15f9, 0x0000 }, + { 0x0700, 0x15fb, 0x0000 }, + { 0x8700, 0x15fe, 0x2000 }, + { 0x0700, 0x15fd, 0x0000 }, + { 0x0700, 0x15ff, 0x0000 }, + { 0x8700, 0x1604, 0x3000 }, + { 0x8700, 0x1602, 0x2000 }, + { 0x0700, 0x1601, 0x0000 }, + { 0x0700, 0x1603, 0x0000 }, + { 0x8700, 0x1606, 0x2000 }, + { 0x0700, 0x1605, 0x0000 }, + { 0x0700, 0x1607, 0x0000 }, + { 0x8700, 0x1610, 0x4000 }, + { 0x8700, 0x160c, 0x3000 }, + { 0x8700, 0x160a, 0x2000 }, + { 0x0700, 0x1609, 0x0000 }, + { 0x0700, 0x160b, 0x0000 }, + { 0x8700, 0x160e, 0x2000 }, + { 0x0700, 0x160d, 0x0000 }, + { 0x0700, 0x160f, 0x0000 }, + { 0x8700, 0x1614, 0x3000 }, + { 0x8700, 0x1612, 0x2000 }, + { 0x0700, 0x1611, 0x0000 }, + { 0x0700, 0x1613, 0x0000 }, + { 0x8700, 0x1616, 0x2000 }, + { 0x0700, 0x1615, 0x0000 }, + { 0x0700, 0x1617, 0x0000 }, + { 0x8700, 0x1638, 0x6000 }, + { 0x8700, 0x1628, 0x5000 }, + { 0x8700, 0x1620, 0x4000 }, + { 0x8700, 0x161c, 0x3000 }, + { 0x8700, 0x161a, 0x2000 }, + { 0x0700, 0x1619, 0x0000 }, + { 0x0700, 0x161b, 0x0000 }, + { 0x8700, 0x161e, 0x2000 }, + { 0x0700, 0x161d, 0x0000 }, + { 0x0700, 0x161f, 0x0000 }, + { 0x8700, 0x1624, 0x3000 }, + { 0x8700, 0x1622, 0x2000 }, + { 0x0700, 0x1621, 0x0000 }, + { 0x0700, 0x1623, 0x0000 }, + { 0x8700, 0x1626, 0x2000 }, + { 0x0700, 0x1625, 0x0000 }, + { 0x0700, 0x1627, 0x0000 }, + { 0x8700, 0x1630, 0x4000 }, + { 0x8700, 0x162c, 0x3000 }, + { 0x8700, 0x162a, 0x2000 }, + { 0x0700, 0x1629, 0x0000 }, + { 0x0700, 0x162b, 0x0000 }, + { 0x8700, 0x162e, 0x2000 }, + { 0x0700, 0x162d, 0x0000 }, + { 0x0700, 0x162f, 0x0000 }, + { 0x8700, 0x1634, 0x3000 }, + { 0x8700, 0x1632, 0x2000 }, + { 0x0700, 0x1631, 0x0000 }, + { 0x0700, 0x1633, 0x0000 }, + { 0x8700, 0x1636, 0x2000 }, + { 0x0700, 0x1635, 0x0000 }, + { 0x0700, 0x1637, 0x0000 }, + { 0x8700, 0x1648, 0x5000 }, + { 0x8700, 0x1640, 0x4000 }, + { 0x8700, 0x163c, 0x3000 }, + { 0x8700, 0x163a, 0x2000 }, + { 0x0700, 0x1639, 0x0000 }, + { 0x0700, 0x163b, 0x0000 }, + { 0x8700, 0x163e, 0x2000 }, + { 0x0700, 0x163d, 0x0000 }, + { 0x0700, 0x163f, 0x0000 }, + { 0x8700, 0x1644, 0x3000 }, + { 0x8700, 0x1642, 0x2000 }, + { 0x0700, 0x1641, 0x0000 }, + { 0x0700, 0x1643, 0x0000 }, + { 0x8700, 0x1646, 0x2000 }, + { 0x0700, 0x1645, 0x0000 }, + { 0x0700, 0x1647, 0x0000 }, + { 0x8700, 0x1650, 0x4000 }, + { 0x8700, 0x164c, 0x3000 }, + { 0x8700, 0x164a, 0x2000 }, + { 0x0700, 0x1649, 0x0000 }, + { 0x0700, 0x164b, 0x0000 }, + { 0x8700, 0x164e, 0x2000 }, + { 0x0700, 0x164d, 0x0000 }, + { 0x0700, 0x164f, 0x0000 }, + { 0x8700, 0x1654, 0x3000 }, + { 0x8700, 0x1652, 0x2000 }, + { 0x0700, 0x1651, 0x0000 }, + { 0x0700, 0x1653, 0x0000 }, + { 0x8700, 0x1656, 0x2000 }, + { 0x0700, 0x1655, 0x0000 }, + { 0x0700, 0x1657, 0x0000 }, + { 0x8700, 0x16e4, 0x8000 }, + { 0x8700, 0x16a4, 0x7000 }, + { 0x8700, 0x1681, 0x6000 }, + { 0x8700, 0x1668, 0x5000 }, + { 0x8700, 0x1660, 0x4000 }, + { 0x8700, 0x165c, 0x3000 }, + { 0x8700, 0x165a, 0x2000 }, + { 0x0700, 0x1659, 0x0000 }, + { 0x0700, 0x165b, 0x0000 }, + { 0x8700, 0x165e, 0x2000 }, + { 0x0700, 0x165d, 0x0000 }, + { 0x0700, 0x165f, 0x0000 }, + { 0x8700, 0x1664, 0x3000 }, + { 0x8700, 0x1662, 0x2000 }, + { 0x0700, 0x1661, 0x0000 }, + { 0x0700, 0x1663, 0x0000 }, + { 0x8700, 0x1666, 0x2000 }, + { 0x0700, 0x1665, 0x0000 }, + { 0x0700, 0x1667, 0x0000 }, + { 0x8700, 0x1670, 0x4000 }, + { 0x8700, 0x166c, 0x3000 }, + { 0x8700, 0x166a, 0x2000 }, + { 0x0700, 0x1669, 0x0000 }, + { 0x0700, 0x166b, 0x0000 }, + { 0x9500, 0x166e, 0x2000 }, + { 0x1500, 0x166d, 0x0000 }, + { 0x0700, 0x166f, 0x0000 }, + { 0x8700, 0x1674, 0x3000 }, + { 0x8700, 0x1672, 0x2000 }, + { 0x0700, 0x1671, 0x0000 }, + { 0x0700, 0x1673, 0x0000 }, + { 0x8700, 0x1676, 0x2000 }, + { 0x0700, 0x1675, 0x0000 }, + { 0x1d00, 0x1680, 0x0000 }, + { 0x8700, 0x1691, 0x5000 }, + { 0x8700, 0x1689, 0x4000 }, + { 0x8700, 0x1685, 0x3000 }, + { 0x8700, 0x1683, 0x2000 }, + { 0x0700, 0x1682, 0x0000 }, + { 0x0700, 0x1684, 0x0000 }, + { 0x8700, 0x1687, 0x2000 }, + { 0x0700, 0x1686, 0x0000 }, + { 0x0700, 0x1688, 0x0000 }, + { 0x8700, 0x168d, 0x3000 }, + { 0x8700, 0x168b, 0x2000 }, + { 0x0700, 0x168a, 0x0000 }, + { 0x0700, 0x168c, 0x0000 }, + { 0x8700, 0x168f, 0x2000 }, + { 0x0700, 0x168e, 0x0000 }, + { 0x0700, 0x1690, 0x0000 }, + { 0x8700, 0x1699, 0x4000 }, + { 0x8700, 0x1695, 0x3000 }, + { 0x8700, 0x1693, 0x2000 }, + { 0x0700, 0x1692, 0x0000 }, + { 0x0700, 0x1694, 0x0000 }, + { 0x8700, 0x1697, 0x2000 }, + { 0x0700, 0x1696, 0x0000 }, + { 0x0700, 0x1698, 0x0000 }, + { 0x8700, 0x16a0, 0x3000 }, + { 0x9600, 0x169b, 0x2000 }, + { 0x0700, 0x169a, 0x0000 }, + { 0x1200, 0x169c, 0x0000 }, + { 0x8700, 0x16a2, 0x2000 }, + { 0x0700, 0x16a1, 0x0000 }, + { 0x0700, 0x16a3, 0x0000 }, + { 0x8700, 0x16c4, 0x6000 }, + { 0x8700, 0x16b4, 0x5000 }, + { 0x8700, 0x16ac, 0x4000 }, + { 0x8700, 0x16a8, 0x3000 }, + { 0x8700, 0x16a6, 0x2000 }, + { 0x0700, 0x16a5, 0x0000 }, + { 0x0700, 0x16a7, 0x0000 }, + { 0x8700, 0x16aa, 0x2000 }, + { 0x0700, 0x16a9, 0x0000 }, + { 0x0700, 0x16ab, 0x0000 }, + { 0x8700, 0x16b0, 0x3000 }, + { 0x8700, 0x16ae, 0x2000 }, + { 0x0700, 0x16ad, 0x0000 }, + { 0x0700, 0x16af, 0x0000 }, + { 0x8700, 0x16b2, 0x2000 }, + { 0x0700, 0x16b1, 0x0000 }, + { 0x0700, 0x16b3, 0x0000 }, + { 0x8700, 0x16bc, 0x4000 }, + { 0x8700, 0x16b8, 0x3000 }, + { 0x8700, 0x16b6, 0x2000 }, + { 0x0700, 0x16b5, 0x0000 }, + { 0x0700, 0x16b7, 0x0000 }, + { 0x8700, 0x16ba, 0x2000 }, + { 0x0700, 0x16b9, 0x0000 }, + { 0x0700, 0x16bb, 0x0000 }, + { 0x8700, 0x16c0, 0x3000 }, + { 0x8700, 0x16be, 0x2000 }, + { 0x0700, 0x16bd, 0x0000 }, + { 0x0700, 0x16bf, 0x0000 }, + { 0x8700, 0x16c2, 0x2000 }, + { 0x0700, 0x16c1, 0x0000 }, + { 0x0700, 0x16c3, 0x0000 }, + { 0x8700, 0x16d4, 0x5000 }, + { 0x8700, 0x16cc, 0x4000 }, + { 0x8700, 0x16c8, 0x3000 }, + { 0x8700, 0x16c6, 0x2000 }, + { 0x0700, 0x16c5, 0x0000 }, + { 0x0700, 0x16c7, 0x0000 }, + { 0x8700, 0x16ca, 0x2000 }, + { 0x0700, 0x16c9, 0x0000 }, + { 0x0700, 0x16cb, 0x0000 }, + { 0x8700, 0x16d0, 0x3000 }, + { 0x8700, 0x16ce, 0x2000 }, + { 0x0700, 0x16cd, 0x0000 }, + { 0x0700, 0x16cf, 0x0000 }, + { 0x8700, 0x16d2, 0x2000 }, + { 0x0700, 0x16d1, 0x0000 }, + { 0x0700, 0x16d3, 0x0000 }, + { 0x8700, 0x16dc, 0x4000 }, + { 0x8700, 0x16d8, 0x3000 }, + { 0x8700, 0x16d6, 0x2000 }, + { 0x0700, 0x16d5, 0x0000 }, + { 0x0700, 0x16d7, 0x0000 }, + { 0x8700, 0x16da, 0x2000 }, + { 0x0700, 0x16d9, 0x0000 }, + { 0x0700, 0x16db, 0x0000 }, + { 0x8700, 0x16e0, 0x3000 }, + { 0x8700, 0x16de, 0x2000 }, + { 0x0700, 0x16dd, 0x0000 }, + { 0x0700, 0x16df, 0x0000 }, + { 0x8700, 0x16e2, 0x2000 }, + { 0x0700, 0x16e1, 0x0000 }, + { 0x0700, 0x16e3, 0x0000 }, + { 0x8700, 0x1748, 0x7000 }, + { 0x8c00, 0x1714, 0x6000 }, + { 0x8700, 0x1703, 0x5000 }, + { 0x9500, 0x16ec, 0x4000 }, + { 0x8700, 0x16e8, 0x3000 }, + { 0x8700, 0x16e6, 0x2000 }, + { 0x0700, 0x16e5, 0x0000 }, + { 0x0700, 0x16e7, 0x0000 }, + { 0x8700, 0x16ea, 0x2000 }, + { 0x0700, 0x16e9, 0x0000 }, + { 0x1500, 0x16eb, 0x0000 }, + { 0x8e00, 0x16f0, 0x3000 }, + { 0x8e00, 0x16ee, 0x2000 }, + { 0x1500, 0x16ed, 0x0000 }, + { 0x0e00, 0x16ef, 0x0000 }, + { 0x8700, 0x1701, 0x2000 }, + { 0x0700, 0x1700, 0x0000 }, + { 0x0700, 0x1702, 0x0000 }, + { 0x8700, 0x170b, 0x4000 }, + { 0x8700, 0x1707, 0x3000 }, + { 0x8700, 0x1705, 0x2000 }, + { 0x0700, 0x1704, 0x0000 }, + { 0x0700, 0x1706, 0x0000 }, + { 0x8700, 0x1709, 0x2000 }, + { 0x0700, 0x1708, 0x0000 }, + { 0x0700, 0x170a, 0x0000 }, + { 0x8700, 0x1710, 0x3000 }, + { 0x8700, 0x170e, 0x2000 }, + { 0x0700, 0x170c, 0x0000 }, + { 0x0700, 0x170f, 0x0000 }, + { 0x8c00, 0x1712, 0x2000 }, + { 0x0700, 0x1711, 0x0000 }, + { 0x0c00, 0x1713, 0x0000 }, + { 0x8700, 0x172f, 0x5000 }, + { 0x8700, 0x1727, 0x4000 }, + { 0x8700, 0x1723, 0x3000 }, + { 0x8700, 0x1721, 0x2000 }, + { 0x0700, 0x1720, 0x0000 }, + { 0x0700, 0x1722, 0x0000 }, + { 0x8700, 0x1725, 0x2000 }, + { 0x0700, 0x1724, 0x0000 }, + { 0x0700, 0x1726, 0x0000 }, + { 0x8700, 0x172b, 0x3000 }, + { 0x8700, 0x1729, 0x2000 }, + { 0x0700, 0x1728, 0x0000 }, + { 0x0700, 0x172a, 0x0000 }, + { 0x8700, 0x172d, 0x2000 }, + { 0x0700, 0x172c, 0x0000 }, + { 0x0700, 0x172e, 0x0000 }, + { 0x8700, 0x1740, 0x4000 }, + { 0x8c00, 0x1733, 0x3000 }, + { 0x8700, 0x1731, 0x2000 }, + { 0x0700, 0x1730, 0x0000 }, + { 0x0c00, 0x1732, 0x0000 }, + { 0x9500, 0x1735, 0x2000 }, + { 0x0c00, 0x1734, 0x0000 }, + { 0x1500, 0x1736, 0x0000 }, + { 0x8700, 0x1744, 0x3000 }, + { 0x8700, 0x1742, 0x2000 }, + { 0x0700, 0x1741, 0x0000 }, + { 0x0700, 0x1743, 0x0000 }, + { 0x8700, 0x1746, 0x2000 }, + { 0x0700, 0x1745, 0x0000 }, + { 0x0700, 0x1747, 0x0000 }, + { 0x8700, 0x1782, 0x6000 }, + { 0x8700, 0x1764, 0x5000 }, + { 0x8700, 0x1750, 0x4000 }, + { 0x8700, 0x174c, 0x3000 }, + { 0x8700, 0x174a, 0x2000 }, + { 0x0700, 0x1749, 0x0000 }, + { 0x0700, 0x174b, 0x0000 }, + { 0x8700, 0x174e, 0x2000 }, + { 0x0700, 0x174d, 0x0000 }, + { 0x0700, 0x174f, 0x0000 }, + { 0x8700, 0x1760, 0x3000 }, + { 0x8c00, 0x1752, 0x2000 }, + { 0x0700, 0x1751, 0x0000 }, + { 0x0c00, 0x1753, 0x0000 }, + { 0x8700, 0x1762, 0x2000 }, + { 0x0700, 0x1761, 0x0000 }, + { 0x0700, 0x1763, 0x0000 }, + { 0x8700, 0x176c, 0x4000 }, + { 0x8700, 0x1768, 0x3000 }, + { 0x8700, 0x1766, 0x2000 }, + { 0x0700, 0x1765, 0x0000 }, + { 0x0700, 0x1767, 0x0000 }, + { 0x8700, 0x176a, 0x2000 }, + { 0x0700, 0x1769, 0x0000 }, + { 0x0700, 0x176b, 0x0000 }, + { 0x8c00, 0x1772, 0x3000 }, + { 0x8700, 0x176f, 0x2000 }, + { 0x0700, 0x176e, 0x0000 }, + { 0x0700, 0x1770, 0x0000 }, + { 0x8700, 0x1780, 0x2000 }, + { 0x0c00, 0x1773, 0x0000 }, + { 0x0700, 0x1781, 0x0000 }, + { 0x8700, 0x1792, 0x5000 }, + { 0x8700, 0x178a, 0x4000 }, + { 0x8700, 0x1786, 0x3000 }, + { 0x8700, 0x1784, 0x2000 }, + { 0x0700, 0x1783, 0x0000 }, + { 0x0700, 0x1785, 0x0000 }, + { 0x8700, 0x1788, 0x2000 }, + { 0x0700, 0x1787, 0x0000 }, + { 0x0700, 0x1789, 0x0000 }, + { 0x8700, 0x178e, 0x3000 }, + { 0x8700, 0x178c, 0x2000 }, + { 0x0700, 0x178b, 0x0000 }, + { 0x0700, 0x178d, 0x0000 }, + { 0x8700, 0x1790, 0x2000 }, + { 0x0700, 0x178f, 0x0000 }, + { 0x0700, 0x1791, 0x0000 }, + { 0x8700, 0x179a, 0x4000 }, + { 0x8700, 0x1796, 0x3000 }, + { 0x8700, 0x1794, 0x2000 }, + { 0x0700, 0x1793, 0x0000 }, + { 0x0700, 0x1795, 0x0000 }, + { 0x8700, 0x1798, 0x2000 }, + { 0x0700, 0x1797, 0x0000 }, + { 0x0700, 0x1799, 0x0000 }, + { 0x8700, 0x179e, 0x3000 }, + { 0x8700, 0x179c, 0x2000 }, + { 0x0700, 0x179b, 0x0000 }, + { 0x0700, 0x179d, 0x0000 }, + { 0x8700, 0x17a0, 0x2000 }, + { 0x0700, 0x179f, 0x0000 }, + { 0x0700, 0x17a1, 0x0000 }, + { 0x8700, 0x1915, 0x9000 }, + { 0x8700, 0x1837, 0x8000 }, + { 0x8d00, 0x17e4, 0x7000 }, + { 0x8a00, 0x17c2, 0x6000 }, + { 0x8700, 0x17b2, 0x5000 }, + { 0x8700, 0x17aa, 0x4000 }, + { 0x8700, 0x17a6, 0x3000 }, + { 0x8700, 0x17a4, 0x2000 }, + { 0x0700, 0x17a3, 0x0000 }, + { 0x0700, 0x17a5, 0x0000 }, + { 0x8700, 0x17a8, 0x2000 }, + { 0x0700, 0x17a7, 0x0000 }, + { 0x0700, 0x17a9, 0x0000 }, + { 0x8700, 0x17ae, 0x3000 }, + { 0x8700, 0x17ac, 0x2000 }, + { 0x0700, 0x17ab, 0x0000 }, + { 0x0700, 0x17ad, 0x0000 }, + { 0x8700, 0x17b0, 0x2000 }, + { 0x0700, 0x17af, 0x0000 }, + { 0x0700, 0x17b1, 0x0000 }, + { 0x8c00, 0x17ba, 0x4000 }, + { 0x8a00, 0x17b6, 0x3000 }, + { 0x8100, 0x17b4, 0x2000 }, + { 0x0700, 0x17b3, 0x0000 }, + { 0x0100, 0x17b5, 0x0000 }, + { 0x8c00, 0x17b8, 0x2000 }, + { 0x0c00, 0x17b7, 0x0000 }, + { 0x0c00, 0x17b9, 0x0000 }, + { 0x8a00, 0x17be, 0x3000 }, + { 0x8c00, 0x17bc, 0x2000 }, + { 0x0c00, 0x17bb, 0x0000 }, + { 0x0c00, 0x17bd, 0x0000 }, + { 0x8a00, 0x17c0, 0x2000 }, + { 0x0a00, 0x17bf, 0x0000 }, + { 0x0a00, 0x17c1, 0x0000 }, + { 0x8c00, 0x17d2, 0x5000 }, + { 0x8c00, 0x17ca, 0x4000 }, + { 0x8c00, 0x17c6, 0x3000 }, + { 0x8a00, 0x17c4, 0x2000 }, + { 0x0a00, 0x17c3, 0x0000 }, + { 0x0a00, 0x17c5, 0x0000 }, + { 0x8a00, 0x17c8, 0x2000 }, + { 0x0a00, 0x17c7, 0x0000 }, + { 0x0c00, 0x17c9, 0x0000 }, + { 0x8c00, 0x17ce, 0x3000 }, + { 0x8c00, 0x17cc, 0x2000 }, + { 0x0c00, 0x17cb, 0x0000 }, + { 0x0c00, 0x17cd, 0x0000 }, + { 0x8c00, 0x17d0, 0x2000 }, + { 0x0c00, 0x17cf, 0x0000 }, + { 0x0c00, 0x17d1, 0x0000 }, + { 0x9500, 0x17da, 0x4000 }, + { 0x9500, 0x17d6, 0x3000 }, + { 0x9500, 0x17d4, 0x2000 }, + { 0x0c00, 0x17d3, 0x0000 }, + { 0x1500, 0x17d5, 0x0000 }, + { 0x9500, 0x17d8, 0x2000 }, + { 0x0600, 0x17d7, 0x0000 }, + { 0x1500, 0x17d9, 0x0000 }, + { 0x8d00, 0x17e0, 0x3000 }, + { 0x8700, 0x17dc, 0x2000 }, + { 0x1700, 0x17db, 0x0000 }, + { 0x0c00, 0x17dd, 0x0000 }, + { 0x8d00, 0x17e2, 0x2000 }, + { 0x0d00, 0x17e1, 0x0000 }, + { 0x0d00, 0x17e3, 0x0000 }, + { 0x8d00, 0x1811, 0x6000 }, + { 0x9500, 0x1800, 0x5000 }, + { 0x8f00, 0x17f2, 0x4000 }, + { 0x8d00, 0x17e8, 0x3000 }, + { 0x8d00, 0x17e6, 0x2000 }, + { 0x0d00, 0x17e5, 0x0000 }, + { 0x0d00, 0x17e7, 0x0000 }, + { 0x8f00, 0x17f0, 0x2000 }, + { 0x0d00, 0x17e9, 0x0000 }, + { 0x0f00, 0x17f1, 0x0000 }, + { 0x8f00, 0x17f6, 0x3000 }, + { 0x8f00, 0x17f4, 0x2000 }, + { 0x0f00, 0x17f3, 0x0000 }, + { 0x0f00, 0x17f5, 0x0000 }, + { 0x8f00, 0x17f8, 0x2000 }, + { 0x0f00, 0x17f7, 0x0000 }, + { 0x0f00, 0x17f9, 0x0000 }, + { 0x9500, 0x1808, 0x4000 }, + { 0x9500, 0x1804, 0x3000 }, + { 0x9500, 0x1802, 0x2000 }, + { 0x1500, 0x1801, 0x0000 }, + { 0x1500, 0x1803, 0x0000 }, + { 0x9100, 0x1806, 0x2000 }, + { 0x1500, 0x1805, 0x0000 }, + { 0x1500, 0x1807, 0x0000 }, + { 0x8c00, 0x180c, 0x3000 }, + { 0x9500, 0x180a, 0x2000 }, + { 0x1500, 0x1809, 0x0000 }, + { 0x0c00, 0x180b, 0x0000 }, + { 0x9d00, 0x180e, 0x2000 }, + { 0x0c00, 0x180d, 0x0000 }, + { 0x0d00, 0x1810, 0x0000 }, + { 0x8700, 0x1827, 0x5000 }, + { 0x8d00, 0x1819, 0x4000 }, + { 0x8d00, 0x1815, 0x3000 }, + { 0x8d00, 0x1813, 0x2000 }, + { 0x0d00, 0x1812, 0x0000 }, + { 0x0d00, 0x1814, 0x0000 }, + { 0x8d00, 0x1817, 0x2000 }, + { 0x0d00, 0x1816, 0x0000 }, + { 0x0d00, 0x1818, 0x0000 }, + { 0x8700, 0x1823, 0x3000 }, + { 0x8700, 0x1821, 0x2000 }, + { 0x0700, 0x1820, 0x0000 }, + { 0x0700, 0x1822, 0x0000 }, + { 0x8700, 0x1825, 0x2000 }, + { 0x0700, 0x1824, 0x0000 }, + { 0x0700, 0x1826, 0x0000 }, + { 0x8700, 0x182f, 0x4000 }, + { 0x8700, 0x182b, 0x3000 }, + { 0x8700, 0x1829, 0x2000 }, + { 0x0700, 0x1828, 0x0000 }, + { 0x0700, 0x182a, 0x0000 }, + { 0x8700, 0x182d, 0x2000 }, + { 0x0700, 0x182c, 0x0000 }, + { 0x0700, 0x182e, 0x0000 }, + { 0x8700, 0x1833, 0x3000 }, + { 0x8700, 0x1831, 0x2000 }, + { 0x0700, 0x1830, 0x0000 }, + { 0x0700, 0x1832, 0x0000 }, + { 0x8700, 0x1835, 0x2000 }, + { 0x0700, 0x1834, 0x0000 }, + { 0x0700, 0x1836, 0x0000 }, + { 0x8700, 0x1877, 0x7000 }, + { 0x8700, 0x1857, 0x6000 }, + { 0x8700, 0x1847, 0x5000 }, + { 0x8700, 0x183f, 0x4000 }, + { 0x8700, 0x183b, 0x3000 }, + { 0x8700, 0x1839, 0x2000 }, + { 0x0700, 0x1838, 0x0000 }, + { 0x0700, 0x183a, 0x0000 }, + { 0x8700, 0x183d, 0x2000 }, + { 0x0700, 0x183c, 0x0000 }, + { 0x0700, 0x183e, 0x0000 }, + { 0x8600, 0x1843, 0x3000 }, + { 0x8700, 0x1841, 0x2000 }, + { 0x0700, 0x1840, 0x0000 }, + { 0x0700, 0x1842, 0x0000 }, + { 0x8700, 0x1845, 0x2000 }, + { 0x0700, 0x1844, 0x0000 }, + { 0x0700, 0x1846, 0x0000 }, + { 0x8700, 0x184f, 0x4000 }, + { 0x8700, 0x184b, 0x3000 }, + { 0x8700, 0x1849, 0x2000 }, + { 0x0700, 0x1848, 0x0000 }, + { 0x0700, 0x184a, 0x0000 }, + { 0x8700, 0x184d, 0x2000 }, + { 0x0700, 0x184c, 0x0000 }, + { 0x0700, 0x184e, 0x0000 }, + { 0x8700, 0x1853, 0x3000 }, + { 0x8700, 0x1851, 0x2000 }, + { 0x0700, 0x1850, 0x0000 }, + { 0x0700, 0x1852, 0x0000 }, + { 0x8700, 0x1855, 0x2000 }, + { 0x0700, 0x1854, 0x0000 }, + { 0x0700, 0x1856, 0x0000 }, + { 0x8700, 0x1867, 0x5000 }, + { 0x8700, 0x185f, 0x4000 }, + { 0x8700, 0x185b, 0x3000 }, + { 0x8700, 0x1859, 0x2000 }, + { 0x0700, 0x1858, 0x0000 }, + { 0x0700, 0x185a, 0x0000 }, + { 0x8700, 0x185d, 0x2000 }, + { 0x0700, 0x185c, 0x0000 }, + { 0x0700, 0x185e, 0x0000 }, + { 0x8700, 0x1863, 0x3000 }, + { 0x8700, 0x1861, 0x2000 }, + { 0x0700, 0x1860, 0x0000 }, + { 0x0700, 0x1862, 0x0000 }, + { 0x8700, 0x1865, 0x2000 }, + { 0x0700, 0x1864, 0x0000 }, + { 0x0700, 0x1866, 0x0000 }, + { 0x8700, 0x186f, 0x4000 }, + { 0x8700, 0x186b, 0x3000 }, + { 0x8700, 0x1869, 0x2000 }, + { 0x0700, 0x1868, 0x0000 }, + { 0x0700, 0x186a, 0x0000 }, + { 0x8700, 0x186d, 0x2000 }, + { 0x0700, 0x186c, 0x0000 }, + { 0x0700, 0x186e, 0x0000 }, + { 0x8700, 0x1873, 0x3000 }, + { 0x8700, 0x1871, 0x2000 }, + { 0x0700, 0x1870, 0x0000 }, + { 0x0700, 0x1872, 0x0000 }, + { 0x8700, 0x1875, 0x2000 }, + { 0x0700, 0x1874, 0x0000 }, + { 0x0700, 0x1876, 0x0000 }, + { 0x8700, 0x189f, 0x6000 }, + { 0x8700, 0x188f, 0x5000 }, + { 0x8700, 0x1887, 0x4000 }, + { 0x8700, 0x1883, 0x3000 }, + { 0x8700, 0x1881, 0x2000 }, + { 0x0700, 0x1880, 0x0000 }, + { 0x0700, 0x1882, 0x0000 }, + { 0x8700, 0x1885, 0x2000 }, + { 0x0700, 0x1884, 0x0000 }, + { 0x0700, 0x1886, 0x0000 }, + { 0x8700, 0x188b, 0x3000 }, + { 0x8700, 0x1889, 0x2000 }, + { 0x0700, 0x1888, 0x0000 }, + { 0x0700, 0x188a, 0x0000 }, + { 0x8700, 0x188d, 0x2000 }, + { 0x0700, 0x188c, 0x0000 }, + { 0x0700, 0x188e, 0x0000 }, + { 0x8700, 0x1897, 0x4000 }, + { 0x8700, 0x1893, 0x3000 }, + { 0x8700, 0x1891, 0x2000 }, + { 0x0700, 0x1890, 0x0000 }, + { 0x0700, 0x1892, 0x0000 }, + { 0x8700, 0x1895, 0x2000 }, + { 0x0700, 0x1894, 0x0000 }, + { 0x0700, 0x1896, 0x0000 }, + { 0x8700, 0x189b, 0x3000 }, + { 0x8700, 0x1899, 0x2000 }, + { 0x0700, 0x1898, 0x0000 }, + { 0x0700, 0x189a, 0x0000 }, + { 0x8700, 0x189d, 0x2000 }, + { 0x0700, 0x189c, 0x0000 }, + { 0x0700, 0x189e, 0x0000 }, + { 0x8700, 0x1905, 0x5000 }, + { 0x8700, 0x18a7, 0x4000 }, + { 0x8700, 0x18a3, 0x3000 }, + { 0x8700, 0x18a1, 0x2000 }, + { 0x0700, 0x18a0, 0x0000 }, + { 0x0700, 0x18a2, 0x0000 }, + { 0x8700, 0x18a5, 0x2000 }, + { 0x0700, 0x18a4, 0x0000 }, + { 0x0700, 0x18a6, 0x0000 }, + { 0x8700, 0x1901, 0x3000 }, + { 0x8c00, 0x18a9, 0x2000 }, + { 0x0700, 0x18a8, 0x0000 }, + { 0x0700, 0x1900, 0x0000 }, + { 0x8700, 0x1903, 0x2000 }, + { 0x0700, 0x1902, 0x0000 }, + { 0x0700, 0x1904, 0x0000 }, + { 0x8700, 0x190d, 0x4000 }, + { 0x8700, 0x1909, 0x3000 }, + { 0x8700, 0x1907, 0x2000 }, + { 0x0700, 0x1906, 0x0000 }, + { 0x0700, 0x1908, 0x0000 }, + { 0x8700, 0x190b, 0x2000 }, + { 0x0700, 0x190a, 0x0000 }, + { 0x0700, 0x190c, 0x0000 }, + { 0x8700, 0x1911, 0x3000 }, + { 0x8700, 0x190f, 0x2000 }, + { 0x0700, 0x190e, 0x0000 }, + { 0x0700, 0x1910, 0x0000 }, + { 0x8700, 0x1913, 0x2000 }, + { 0x0700, 0x1912, 0x0000 }, + { 0x0700, 0x1914, 0x0000 }, + { 0x8500, 0x1d10, 0x8000 }, + { 0x8700, 0x1963, 0x7000 }, + { 0x9a00, 0x1940, 0x6000 }, + { 0x8c00, 0x1928, 0x5000 }, + { 0x8c00, 0x1920, 0x4000 }, + { 0x8700, 0x1919, 0x3000 }, + { 0x8700, 0x1917, 0x2000 }, + { 0x0700, 0x1916, 0x0000 }, + { 0x0700, 0x1918, 0x0000 }, + { 0x8700, 0x191b, 0x2000 }, + { 0x0700, 0x191a, 0x0000 }, + { 0x0700, 0x191c, 0x0000 }, + { 0x8a00, 0x1924, 0x3000 }, + { 0x8c00, 0x1922, 0x2000 }, + { 0x0c00, 0x1921, 0x0000 }, + { 0x0a00, 0x1923, 0x0000 }, + { 0x8a00, 0x1926, 0x2000 }, + { 0x0a00, 0x1925, 0x0000 }, + { 0x0c00, 0x1927, 0x0000 }, + { 0x8a00, 0x1934, 0x4000 }, + { 0x8a00, 0x1930, 0x3000 }, + { 0x8a00, 0x192a, 0x2000 }, + { 0x0a00, 0x1929, 0x0000 }, + { 0x0a00, 0x192b, 0x0000 }, + { 0x8c00, 0x1932, 0x2000 }, + { 0x0a00, 0x1931, 0x0000 }, + { 0x0a00, 0x1933, 0x0000 }, + { 0x8a00, 0x1938, 0x3000 }, + { 0x8a00, 0x1936, 0x2000 }, + { 0x0a00, 0x1935, 0x0000 }, + { 0x0a00, 0x1937, 0x0000 }, + { 0x8c00, 0x193a, 0x2000 }, + { 0x0c00, 0x1939, 0x0000 }, + { 0x0c00, 0x193b, 0x0000 }, + { 0x8700, 0x1953, 0x5000 }, + { 0x8d00, 0x194b, 0x4000 }, + { 0x8d00, 0x1947, 0x3000 }, + { 0x9500, 0x1945, 0x2000 }, + { 0x1500, 0x1944, 0x0000 }, + { 0x0d00, 0x1946, 0x0000 }, + { 0x8d00, 0x1949, 0x2000 }, + { 0x0d00, 0x1948, 0x0000 }, + { 0x0d00, 0x194a, 0x0000 }, + { 0x8d00, 0x194f, 0x3000 }, + { 0x8d00, 0x194d, 0x2000 }, + { 0x0d00, 0x194c, 0x0000 }, + { 0x0d00, 0x194e, 0x0000 }, + { 0x8700, 0x1951, 0x2000 }, + { 0x0700, 0x1950, 0x0000 }, + { 0x0700, 0x1952, 0x0000 }, + { 0x8700, 0x195b, 0x4000 }, + { 0x8700, 0x1957, 0x3000 }, + { 0x8700, 0x1955, 0x2000 }, + { 0x0700, 0x1954, 0x0000 }, + { 0x0700, 0x1956, 0x0000 }, + { 0x8700, 0x1959, 0x2000 }, + { 0x0700, 0x1958, 0x0000 }, + { 0x0700, 0x195a, 0x0000 }, + { 0x8700, 0x195f, 0x3000 }, + { 0x8700, 0x195d, 0x2000 }, + { 0x0700, 0x195c, 0x0000 }, + { 0x0700, 0x195e, 0x0000 }, + { 0x8700, 0x1961, 0x2000 }, + { 0x0700, 0x1960, 0x0000 }, + { 0x0700, 0x1962, 0x0000 }, + { 0x9a00, 0x19f0, 0x6000 }, + { 0x9a00, 0x19e0, 0x5000 }, + { 0x8700, 0x196b, 0x4000 }, + { 0x8700, 0x1967, 0x3000 }, + { 0x8700, 0x1965, 0x2000 }, + { 0x0700, 0x1964, 0x0000 }, + { 0x0700, 0x1966, 0x0000 }, + { 0x8700, 0x1969, 0x2000 }, + { 0x0700, 0x1968, 0x0000 }, + { 0x0700, 0x196a, 0x0000 }, + { 0x8700, 0x1971, 0x3000 }, + { 0x8700, 0x196d, 0x2000 }, + { 0x0700, 0x196c, 0x0000 }, + { 0x0700, 0x1970, 0x0000 }, + { 0x8700, 0x1973, 0x2000 }, + { 0x0700, 0x1972, 0x0000 }, + { 0x0700, 0x1974, 0x0000 }, + { 0x9a00, 0x19e8, 0x4000 }, + { 0x9a00, 0x19e4, 0x3000 }, + { 0x9a00, 0x19e2, 0x2000 }, + { 0x1a00, 0x19e1, 0x0000 }, + { 0x1a00, 0x19e3, 0x0000 }, + { 0x9a00, 0x19e6, 0x2000 }, + { 0x1a00, 0x19e5, 0x0000 }, + { 0x1a00, 0x19e7, 0x0000 }, + { 0x9a00, 0x19ec, 0x3000 }, + { 0x9a00, 0x19ea, 0x2000 }, + { 0x1a00, 0x19e9, 0x0000 }, + { 0x1a00, 0x19eb, 0x0000 }, + { 0x9a00, 0x19ee, 0x2000 }, + { 0x1a00, 0x19ed, 0x0000 }, + { 0x1a00, 0x19ef, 0x0000 }, + { 0x8500, 0x1d00, 0x5000 }, + { 0x9a00, 0x19f8, 0x4000 }, + { 0x9a00, 0x19f4, 0x3000 }, + { 0x9a00, 0x19f2, 0x2000 }, + { 0x1a00, 0x19f1, 0x0000 }, + { 0x1a00, 0x19f3, 0x0000 }, + { 0x9a00, 0x19f6, 0x2000 }, + { 0x1a00, 0x19f5, 0x0000 }, + { 0x1a00, 0x19f7, 0x0000 }, + { 0x9a00, 0x19fc, 0x3000 }, + { 0x9a00, 0x19fa, 0x2000 }, + { 0x1a00, 0x19f9, 0x0000 }, + { 0x1a00, 0x19fb, 0x0000 }, + { 0x9a00, 0x19fe, 0x2000 }, + { 0x1a00, 0x19fd, 0x0000 }, + { 0x1a00, 0x19ff, 0x0000 }, + { 0x8500, 0x1d08, 0x4000 }, + { 0x8500, 0x1d04, 0x3000 }, + { 0x8500, 0x1d02, 0x2000 }, + { 0x0500, 0x1d01, 0x0000 }, + { 0x0500, 0x1d03, 0x0000 }, + { 0x8500, 0x1d06, 0x2000 }, + { 0x0500, 0x1d05, 0x0000 }, + { 0x0500, 0x1d07, 0x0000 }, + { 0x8500, 0x1d0c, 0x3000 }, + { 0x8500, 0x1d0a, 0x2000 }, + { 0x0500, 0x1d09, 0x0000 }, + { 0x0500, 0x1d0b, 0x0000 }, + { 0x8500, 0x1d0e, 0x2000 }, + { 0x0500, 0x1d0d, 0x0000 }, + { 0x0500, 0x1d0f, 0x0000 }, + { 0x8600, 0x1d50, 0x7000 }, + { 0x8600, 0x1d30, 0x6000 }, + { 0x8500, 0x1d20, 0x5000 }, + { 0x8500, 0x1d18, 0x4000 }, + { 0x8500, 0x1d14, 0x3000 }, + { 0x8500, 0x1d12, 0x2000 }, + { 0x0500, 0x1d11, 0x0000 }, + { 0x0500, 0x1d13, 0x0000 }, + { 0x8500, 0x1d16, 0x2000 }, + { 0x0500, 0x1d15, 0x0000 }, + { 0x0500, 0x1d17, 0x0000 }, + { 0x8500, 0x1d1c, 0x3000 }, + { 0x8500, 0x1d1a, 0x2000 }, + { 0x0500, 0x1d19, 0x0000 }, + { 0x0500, 0x1d1b, 0x0000 }, + { 0x8500, 0x1d1e, 0x2000 }, + { 0x0500, 0x1d1d, 0x0000 }, + { 0x0500, 0x1d1f, 0x0000 }, + { 0x8500, 0x1d28, 0x4000 }, + { 0x8500, 0x1d24, 0x3000 }, + { 0x8500, 0x1d22, 0x2000 }, + { 0x0500, 0x1d21, 0x0000 }, + { 0x0500, 0x1d23, 0x0000 }, + { 0x8500, 0x1d26, 0x2000 }, + { 0x0500, 0x1d25, 0x0000 }, + { 0x0500, 0x1d27, 0x0000 }, + { 0x8600, 0x1d2c, 0x3000 }, + { 0x8500, 0x1d2a, 0x2000 }, + { 0x0500, 0x1d29, 0x0000 }, + { 0x0500, 0x1d2b, 0x0000 }, + { 0x8600, 0x1d2e, 0x2000 }, + { 0x0600, 0x1d2d, 0x0000 }, + { 0x0600, 0x1d2f, 0x0000 }, + { 0x8600, 0x1d40, 0x5000 }, + { 0x8600, 0x1d38, 0x4000 }, + { 0x8600, 0x1d34, 0x3000 }, + { 0x8600, 0x1d32, 0x2000 }, + { 0x0600, 0x1d31, 0x0000 }, + { 0x0600, 0x1d33, 0x0000 }, + { 0x8600, 0x1d36, 0x2000 }, + { 0x0600, 0x1d35, 0x0000 }, + { 0x0600, 0x1d37, 0x0000 }, + { 0x8600, 0x1d3c, 0x3000 }, + { 0x8600, 0x1d3a, 0x2000 }, + { 0x0600, 0x1d39, 0x0000 }, + { 0x0600, 0x1d3b, 0x0000 }, + { 0x8600, 0x1d3e, 0x2000 }, + { 0x0600, 0x1d3d, 0x0000 }, + { 0x0600, 0x1d3f, 0x0000 }, + { 0x8600, 0x1d48, 0x4000 }, + { 0x8600, 0x1d44, 0x3000 }, + { 0x8600, 0x1d42, 0x2000 }, + { 0x0600, 0x1d41, 0x0000 }, + { 0x0600, 0x1d43, 0x0000 }, + { 0x8600, 0x1d46, 0x2000 }, + { 0x0600, 0x1d45, 0x0000 }, + { 0x0600, 0x1d47, 0x0000 }, + { 0x8600, 0x1d4c, 0x3000 }, + { 0x8600, 0x1d4a, 0x2000 }, + { 0x0600, 0x1d49, 0x0000 }, + { 0x0600, 0x1d4b, 0x0000 }, + { 0x8600, 0x1d4e, 0x2000 }, + { 0x0600, 0x1d4d, 0x0000 }, + { 0x0600, 0x1d4f, 0x0000 }, + { 0x8900, 0x1e04, 0x6001 }, + { 0x8600, 0x1d60, 0x5000 }, + { 0x8600, 0x1d58, 0x4000 }, + { 0x8600, 0x1d54, 0x3000 }, + { 0x8600, 0x1d52, 0x2000 }, + { 0x0600, 0x1d51, 0x0000 }, + { 0x0600, 0x1d53, 0x0000 }, + { 0x8600, 0x1d56, 0x2000 }, + { 0x0600, 0x1d55, 0x0000 }, + { 0x0600, 0x1d57, 0x0000 }, + { 0x8600, 0x1d5c, 0x3000 }, + { 0x8600, 0x1d5a, 0x2000 }, + { 0x0600, 0x1d59, 0x0000 }, + { 0x0600, 0x1d5b, 0x0000 }, + { 0x8600, 0x1d5e, 0x2000 }, + { 0x0600, 0x1d5d, 0x0000 }, + { 0x0600, 0x1d5f, 0x0000 }, + { 0x8500, 0x1d68, 0x4000 }, + { 0x8500, 0x1d64, 0x3000 }, + { 0x8500, 0x1d62, 0x2000 }, + { 0x0600, 0x1d61, 0x0000 }, + { 0x0500, 0x1d63, 0x0000 }, + { 0x8500, 0x1d66, 0x2000 }, + { 0x0500, 0x1d65, 0x0000 }, + { 0x0500, 0x1d67, 0x0000 }, + { 0x8900, 0x1e00, 0x3001 }, + { 0x8500, 0x1d6a, 0x2000 }, + { 0x0500, 0x1d69, 0x0000 }, + { 0x0500, 0x1d6b, 0x0000 }, + { 0x8900, 0x1e02, 0x2001 }, + { 0x0500, 0x1e01, 0x0fff }, + { 0x0500, 0x1e03, 0x0fff }, + { 0x8900, 0x1e14, 0x5001 }, + { 0x8900, 0x1e0c, 0x4001 }, + { 0x8900, 0x1e08, 0x3001 }, + { 0x8900, 0x1e06, 0x2001 }, + { 0x0500, 0x1e05, 0x0fff }, + { 0x0500, 0x1e07, 0x0fff }, + { 0x8900, 0x1e0a, 0x2001 }, + { 0x0500, 0x1e09, 0x0fff }, + { 0x0500, 0x1e0b, 0x0fff }, + { 0x8900, 0x1e10, 0x3001 }, + { 0x8900, 0x1e0e, 0x2001 }, + { 0x0500, 0x1e0d, 0x0fff }, + { 0x0500, 0x1e0f, 0x0fff }, + { 0x8900, 0x1e12, 0x2001 }, + { 0x0500, 0x1e11, 0x0fff }, + { 0x0500, 0x1e13, 0x0fff }, + { 0x8900, 0x1e1c, 0x4001 }, + { 0x8900, 0x1e18, 0x3001 }, + { 0x8900, 0x1e16, 0x2001 }, + { 0x0500, 0x1e15, 0x0fff }, + { 0x0500, 0x1e17, 0x0fff }, + { 0x8900, 0x1e1a, 0x2001 }, + { 0x0500, 0x1e19, 0x0fff }, + { 0x0500, 0x1e1b, 0x0fff }, + { 0x8900, 0x1e20, 0x3001 }, + { 0x8900, 0x1e1e, 0x2001 }, + { 0x0500, 0x1e1d, 0x0fff }, + { 0x0500, 0x1e1f, 0x0fff }, + { 0x8900, 0x1e22, 0x2001 }, + { 0x0500, 0x1e21, 0x0fff }, + { 0x0500, 0x1e23, 0x0fff }, + { 0x9600, 0x2045, 0xa000 }, + { 0x8500, 0x1f32, 0x9008 }, + { 0x8900, 0x1ea8, 0x8001 }, + { 0x8900, 0x1e64, 0x7001 }, + { 0x8900, 0x1e44, 0x6001 }, + { 0x8900, 0x1e34, 0x5001 }, + { 0x8900, 0x1e2c, 0x4001 }, + { 0x8900, 0x1e28, 0x3001 }, + { 0x8900, 0x1e26, 0x2001 }, + { 0x0500, 0x1e25, 0x0fff }, + { 0x0500, 0x1e27, 0x0fff }, + { 0x8900, 0x1e2a, 0x2001 }, + { 0x0500, 0x1e29, 0x0fff }, + { 0x0500, 0x1e2b, 0x0fff }, + { 0x8900, 0x1e30, 0x3001 }, + { 0x8900, 0x1e2e, 0x2001 }, + { 0x0500, 0x1e2d, 0x0fff }, + { 0x0500, 0x1e2f, 0x0fff }, + { 0x8900, 0x1e32, 0x2001 }, + { 0x0500, 0x1e31, 0x0fff }, + { 0x0500, 0x1e33, 0x0fff }, + { 0x8900, 0x1e3c, 0x4001 }, + { 0x8900, 0x1e38, 0x3001 }, + { 0x8900, 0x1e36, 0x2001 }, + { 0x0500, 0x1e35, 0x0fff }, + { 0x0500, 0x1e37, 0x0fff }, + { 0x8900, 0x1e3a, 0x2001 }, + { 0x0500, 0x1e39, 0x0fff }, + { 0x0500, 0x1e3b, 0x0fff }, + { 0x8900, 0x1e40, 0x3001 }, + { 0x8900, 0x1e3e, 0x2001 }, + { 0x0500, 0x1e3d, 0x0fff }, + { 0x0500, 0x1e3f, 0x0fff }, + { 0x8900, 0x1e42, 0x2001 }, + { 0x0500, 0x1e41, 0x0fff }, + { 0x0500, 0x1e43, 0x0fff }, + { 0x8900, 0x1e54, 0x5001 }, + { 0x8900, 0x1e4c, 0x4001 }, + { 0x8900, 0x1e48, 0x3001 }, + { 0x8900, 0x1e46, 0x2001 }, + { 0x0500, 0x1e45, 0x0fff }, + { 0x0500, 0x1e47, 0x0fff }, + { 0x8900, 0x1e4a, 0x2001 }, + { 0x0500, 0x1e49, 0x0fff }, + { 0x0500, 0x1e4b, 0x0fff }, + { 0x8900, 0x1e50, 0x3001 }, + { 0x8900, 0x1e4e, 0x2001 }, + { 0x0500, 0x1e4d, 0x0fff }, + { 0x0500, 0x1e4f, 0x0fff }, + { 0x8900, 0x1e52, 0x2001 }, + { 0x0500, 0x1e51, 0x0fff }, + { 0x0500, 0x1e53, 0x0fff }, + { 0x8900, 0x1e5c, 0x4001 }, + { 0x8900, 0x1e58, 0x3001 }, + { 0x8900, 0x1e56, 0x2001 }, + { 0x0500, 0x1e55, 0x0fff }, + { 0x0500, 0x1e57, 0x0fff }, + { 0x8900, 0x1e5a, 0x2001 }, + { 0x0500, 0x1e59, 0x0fff }, + { 0x0500, 0x1e5b, 0x0fff }, + { 0x8900, 0x1e60, 0x3001 }, + { 0x8900, 0x1e5e, 0x2001 }, + { 0x0500, 0x1e5d, 0x0fff }, + { 0x0500, 0x1e5f, 0x0fff }, + { 0x8900, 0x1e62, 0x2001 }, + { 0x0500, 0x1e61, 0x0fff }, + { 0x0500, 0x1e63, 0x0fff }, + { 0x8900, 0x1e84, 0x6001 }, + { 0x8900, 0x1e74, 0x5001 }, + { 0x8900, 0x1e6c, 0x4001 }, + { 0x8900, 0x1e68, 0x3001 }, + { 0x8900, 0x1e66, 0x2001 }, + { 0x0500, 0x1e65, 0x0fff }, + { 0x0500, 0x1e67, 0x0fff }, + { 0x8900, 0x1e6a, 0x2001 }, + { 0x0500, 0x1e69, 0x0fff }, + { 0x0500, 0x1e6b, 0x0fff }, + { 0x8900, 0x1e70, 0x3001 }, + { 0x8900, 0x1e6e, 0x2001 }, + { 0x0500, 0x1e6d, 0x0fff }, + { 0x0500, 0x1e6f, 0x0fff }, + { 0x8900, 0x1e72, 0x2001 }, + { 0x0500, 0x1e71, 0x0fff }, + { 0x0500, 0x1e73, 0x0fff }, + { 0x8900, 0x1e7c, 0x4001 }, + { 0x8900, 0x1e78, 0x3001 }, + { 0x8900, 0x1e76, 0x2001 }, + { 0x0500, 0x1e75, 0x0fff }, + { 0x0500, 0x1e77, 0x0fff }, + { 0x8900, 0x1e7a, 0x2001 }, + { 0x0500, 0x1e79, 0x0fff }, + { 0x0500, 0x1e7b, 0x0fff }, + { 0x8900, 0x1e80, 0x3001 }, + { 0x8900, 0x1e7e, 0x2001 }, + { 0x0500, 0x1e7d, 0x0fff }, + { 0x0500, 0x1e7f, 0x0fff }, + { 0x8900, 0x1e82, 0x2001 }, + { 0x0500, 0x1e81, 0x0fff }, + { 0x0500, 0x1e83, 0x0fff }, + { 0x8900, 0x1e94, 0x5001 }, + { 0x8900, 0x1e8c, 0x4001 }, + { 0x8900, 0x1e88, 0x3001 }, + { 0x8900, 0x1e86, 0x2001 }, + { 0x0500, 0x1e85, 0x0fff }, + { 0x0500, 0x1e87, 0x0fff }, + { 0x8900, 0x1e8a, 0x2001 }, + { 0x0500, 0x1e89, 0x0fff }, + { 0x0500, 0x1e8b, 0x0fff }, + { 0x8900, 0x1e90, 0x3001 }, + { 0x8900, 0x1e8e, 0x2001 }, + { 0x0500, 0x1e8d, 0x0fff }, + { 0x0500, 0x1e8f, 0x0fff }, + { 0x8900, 0x1e92, 0x2001 }, + { 0x0500, 0x1e91, 0x0fff }, + { 0x0500, 0x1e93, 0x0fff }, + { 0x8900, 0x1ea0, 0x4001 }, + { 0x8500, 0x1e98, 0x3000 }, + { 0x8500, 0x1e96, 0x2000 }, + { 0x0500, 0x1e95, 0x0fff }, + { 0x0500, 0x1e97, 0x0000 }, + { 0x8500, 0x1e9a, 0x2000 }, + { 0x0500, 0x1e99, 0x0000 }, + { 0x0500, 0x1e9b, 0x0fc5 }, + { 0x8900, 0x1ea4, 0x3001 }, + { 0x8900, 0x1ea2, 0x2001 }, + { 0x0500, 0x1ea1, 0x0fff }, + { 0x0500, 0x1ea3, 0x0fff }, + { 0x8900, 0x1ea6, 0x2001 }, + { 0x0500, 0x1ea5, 0x0fff }, + { 0x0500, 0x1ea7, 0x0fff }, + { 0x8900, 0x1ee8, 0x7001 }, + { 0x8900, 0x1ec8, 0x6001 }, + { 0x8900, 0x1eb8, 0x5001 }, + { 0x8900, 0x1eb0, 0x4001 }, + { 0x8900, 0x1eac, 0x3001 }, + { 0x8900, 0x1eaa, 0x2001 }, + { 0x0500, 0x1ea9, 0x0fff }, + { 0x0500, 0x1eab, 0x0fff }, + { 0x8900, 0x1eae, 0x2001 }, + { 0x0500, 0x1ead, 0x0fff }, + { 0x0500, 0x1eaf, 0x0fff }, + { 0x8900, 0x1eb4, 0x3001 }, + { 0x8900, 0x1eb2, 0x2001 }, + { 0x0500, 0x1eb1, 0x0fff }, + { 0x0500, 0x1eb3, 0x0fff }, + { 0x8900, 0x1eb6, 0x2001 }, + { 0x0500, 0x1eb5, 0x0fff }, + { 0x0500, 0x1eb7, 0x0fff }, + { 0x8900, 0x1ec0, 0x4001 }, + { 0x8900, 0x1ebc, 0x3001 }, + { 0x8900, 0x1eba, 0x2001 }, + { 0x0500, 0x1eb9, 0x0fff }, + { 0x0500, 0x1ebb, 0x0fff }, + { 0x8900, 0x1ebe, 0x2001 }, + { 0x0500, 0x1ebd, 0x0fff }, + { 0x0500, 0x1ebf, 0x0fff }, + { 0x8900, 0x1ec4, 0x3001 }, + { 0x8900, 0x1ec2, 0x2001 }, + { 0x0500, 0x1ec1, 0x0fff }, + { 0x0500, 0x1ec3, 0x0fff }, + { 0x8900, 0x1ec6, 0x2001 }, + { 0x0500, 0x1ec5, 0x0fff }, + { 0x0500, 0x1ec7, 0x0fff }, + { 0x8900, 0x1ed8, 0x5001 }, + { 0x8900, 0x1ed0, 0x4001 }, + { 0x8900, 0x1ecc, 0x3001 }, + { 0x8900, 0x1eca, 0x2001 }, + { 0x0500, 0x1ec9, 0x0fff }, + { 0x0500, 0x1ecb, 0x0fff }, + { 0x8900, 0x1ece, 0x2001 }, + { 0x0500, 0x1ecd, 0x0fff }, + { 0x0500, 0x1ecf, 0x0fff }, + { 0x8900, 0x1ed4, 0x3001 }, + { 0x8900, 0x1ed2, 0x2001 }, + { 0x0500, 0x1ed1, 0x0fff }, + { 0x0500, 0x1ed3, 0x0fff }, + { 0x8900, 0x1ed6, 0x2001 }, + { 0x0500, 0x1ed5, 0x0fff }, + { 0x0500, 0x1ed7, 0x0fff }, + { 0x8900, 0x1ee0, 0x4001 }, + { 0x8900, 0x1edc, 0x3001 }, + { 0x8900, 0x1eda, 0x2001 }, + { 0x0500, 0x1ed9, 0x0fff }, + { 0x0500, 0x1edb, 0x0fff }, + { 0x8900, 0x1ede, 0x2001 }, + { 0x0500, 0x1edd, 0x0fff }, + { 0x0500, 0x1edf, 0x0fff }, + { 0x8900, 0x1ee4, 0x3001 }, + { 0x8900, 0x1ee2, 0x2001 }, + { 0x0500, 0x1ee1, 0x0fff }, + { 0x0500, 0x1ee3, 0x0fff }, + { 0x8900, 0x1ee6, 0x2001 }, + { 0x0500, 0x1ee5, 0x0fff }, + { 0x0500, 0x1ee7, 0x0fff }, + { 0x8900, 0x1f0e, 0x6ff8 }, + { 0x8900, 0x1ef8, 0x5001 }, + { 0x8900, 0x1ef0, 0x4001 }, + { 0x8900, 0x1eec, 0x3001 }, + { 0x8900, 0x1eea, 0x2001 }, + { 0x0500, 0x1ee9, 0x0fff }, + { 0x0500, 0x1eeb, 0x0fff }, + { 0x8900, 0x1eee, 0x2001 }, + { 0x0500, 0x1eed, 0x0fff }, + { 0x0500, 0x1eef, 0x0fff }, + { 0x8900, 0x1ef4, 0x3001 }, + { 0x8900, 0x1ef2, 0x2001 }, + { 0x0500, 0x1ef1, 0x0fff }, + { 0x0500, 0x1ef3, 0x0fff }, + { 0x8900, 0x1ef6, 0x2001 }, + { 0x0500, 0x1ef5, 0x0fff }, + { 0x0500, 0x1ef7, 0x0fff }, + { 0x8500, 0x1f06, 0x4008 }, + { 0x8500, 0x1f02, 0x3008 }, + { 0x8500, 0x1f00, 0x2008 }, + { 0x0500, 0x1ef9, 0x0fff }, + { 0x0500, 0x1f01, 0x0008 }, + { 0x8500, 0x1f04, 0x2008 }, + { 0x0500, 0x1f03, 0x0008 }, + { 0x0500, 0x1f05, 0x0008 }, + { 0x8900, 0x1f0a, 0x3ff8 }, + { 0x8900, 0x1f08, 0x2ff8 }, + { 0x0500, 0x1f07, 0x0008 }, + { 0x0900, 0x1f09, 0x0ff8 }, + { 0x8900, 0x1f0c, 0x2ff8 }, + { 0x0900, 0x1f0b, 0x0ff8 }, + { 0x0900, 0x1f0d, 0x0ff8 }, + { 0x8500, 0x1f22, 0x5008 }, + { 0x8900, 0x1f18, 0x4ff8 }, + { 0x8500, 0x1f12, 0x3008 }, + { 0x8500, 0x1f10, 0x2008 }, + { 0x0900, 0x1f0f, 0x0ff8 }, + { 0x0500, 0x1f11, 0x0008 }, + { 0x8500, 0x1f14, 0x2008 }, + { 0x0500, 0x1f13, 0x0008 }, + { 0x0500, 0x1f15, 0x0008 }, + { 0x8900, 0x1f1c, 0x3ff8 }, + { 0x8900, 0x1f1a, 0x2ff8 }, + { 0x0900, 0x1f19, 0x0ff8 }, + { 0x0900, 0x1f1b, 0x0ff8 }, + { 0x8500, 0x1f20, 0x2008 }, + { 0x0900, 0x1f1d, 0x0ff8 }, + { 0x0500, 0x1f21, 0x0008 }, + { 0x8900, 0x1f2a, 0x4ff8 }, + { 0x8500, 0x1f26, 0x3008 }, + { 0x8500, 0x1f24, 0x2008 }, + { 0x0500, 0x1f23, 0x0008 }, + { 0x0500, 0x1f25, 0x0008 }, + { 0x8900, 0x1f28, 0x2ff8 }, + { 0x0500, 0x1f27, 0x0008 }, + { 0x0900, 0x1f29, 0x0ff8 }, + { 0x8900, 0x1f2e, 0x3ff8 }, + { 0x8900, 0x1f2c, 0x2ff8 }, + { 0x0900, 0x1f2b, 0x0ff8 }, + { 0x0900, 0x1f2d, 0x0ff8 }, + { 0x8500, 0x1f30, 0x2008 }, + { 0x0900, 0x1f2f, 0x0ff8 }, + { 0x0500, 0x1f31, 0x0008 }, + { 0x9800, 0x1fbd, 0x8000 }, + { 0x8500, 0x1f7a, 0x7070 }, + { 0x8500, 0x1f56, 0x6000 }, + { 0x8500, 0x1f42, 0x5008 }, + { 0x8900, 0x1f3a, 0x4ff8 }, + { 0x8500, 0x1f36, 0x3008 }, + { 0x8500, 0x1f34, 0x2008 }, + { 0x0500, 0x1f33, 0x0008 }, + { 0x0500, 0x1f35, 0x0008 }, + { 0x8900, 0x1f38, 0x2ff8 }, + { 0x0500, 0x1f37, 0x0008 }, + { 0x0900, 0x1f39, 0x0ff8 }, + { 0x8900, 0x1f3e, 0x3ff8 }, + { 0x8900, 0x1f3c, 0x2ff8 }, + { 0x0900, 0x1f3b, 0x0ff8 }, + { 0x0900, 0x1f3d, 0x0ff8 }, + { 0x8500, 0x1f40, 0x2008 }, + { 0x0900, 0x1f3f, 0x0ff8 }, + { 0x0500, 0x1f41, 0x0008 }, + { 0x8900, 0x1f4c, 0x4ff8 }, + { 0x8900, 0x1f48, 0x3ff8 }, + { 0x8500, 0x1f44, 0x2008 }, + { 0x0500, 0x1f43, 0x0008 }, + { 0x0500, 0x1f45, 0x0008 }, + { 0x8900, 0x1f4a, 0x2ff8 }, + { 0x0900, 0x1f49, 0x0ff8 }, + { 0x0900, 0x1f4b, 0x0ff8 }, + { 0x8500, 0x1f52, 0x3000 }, + { 0x8500, 0x1f50, 0x2000 }, + { 0x0900, 0x1f4d, 0x0ff8 }, + { 0x0500, 0x1f51, 0x0008 }, + { 0x8500, 0x1f54, 0x2000 }, + { 0x0500, 0x1f53, 0x0008 }, + { 0x0500, 0x1f55, 0x0008 }, + { 0x8900, 0x1f6a, 0x5ff8 }, + { 0x8500, 0x1f62, 0x4008 }, + { 0x8900, 0x1f5d, 0x3ff8 }, + { 0x8900, 0x1f59, 0x2ff8 }, + { 0x0500, 0x1f57, 0x0008 }, + { 0x0900, 0x1f5b, 0x0ff8 }, + { 0x8500, 0x1f60, 0x2008 }, + { 0x0900, 0x1f5f, 0x0ff8 }, + { 0x0500, 0x1f61, 0x0008 }, + { 0x8500, 0x1f66, 0x3008 }, + { 0x8500, 0x1f64, 0x2008 }, + { 0x0500, 0x1f63, 0x0008 }, + { 0x0500, 0x1f65, 0x0008 }, + { 0x8900, 0x1f68, 0x2ff8 }, + { 0x0500, 0x1f67, 0x0008 }, + { 0x0900, 0x1f69, 0x0ff8 }, + { 0x8500, 0x1f72, 0x4056 }, + { 0x8900, 0x1f6e, 0x3ff8 }, + { 0x8900, 0x1f6c, 0x2ff8 }, + { 0x0900, 0x1f6b, 0x0ff8 }, + { 0x0900, 0x1f6d, 0x0ff8 }, + { 0x8500, 0x1f70, 0x204a }, + { 0x0900, 0x1f6f, 0x0ff8 }, + { 0x0500, 0x1f71, 0x004a }, + { 0x8500, 0x1f76, 0x3064 }, + { 0x8500, 0x1f74, 0x2056 }, + { 0x0500, 0x1f73, 0x0056 }, + { 0x0500, 0x1f75, 0x0056 }, + { 0x8500, 0x1f78, 0x2080 }, + { 0x0500, 0x1f77, 0x0064 }, + { 0x0500, 0x1f79, 0x0080 }, + { 0x8800, 0x1f9c, 0x6000 }, + { 0x8800, 0x1f8c, 0x5000 }, + { 0x8500, 0x1f84, 0x4008 }, + { 0x8500, 0x1f80, 0x3008 }, + { 0x8500, 0x1f7c, 0x207e }, + { 0x0500, 0x1f7b, 0x0070 }, + { 0x0500, 0x1f7d, 0x007e }, + { 0x8500, 0x1f82, 0x2008 }, + { 0x0500, 0x1f81, 0x0008 }, + { 0x0500, 0x1f83, 0x0008 }, + { 0x8800, 0x1f88, 0x3000 }, + { 0x8500, 0x1f86, 0x2008 }, + { 0x0500, 0x1f85, 0x0008 }, + { 0x0500, 0x1f87, 0x0008 }, + { 0x8800, 0x1f8a, 0x2000 }, + { 0x0800, 0x1f89, 0x0000 }, + { 0x0800, 0x1f8b, 0x0000 }, + { 0x8500, 0x1f94, 0x4008 }, + { 0x8500, 0x1f90, 0x3008 }, + { 0x8800, 0x1f8e, 0x2000 }, + { 0x0800, 0x1f8d, 0x0000 }, + { 0x0800, 0x1f8f, 0x0000 }, + { 0x8500, 0x1f92, 0x2008 }, + { 0x0500, 0x1f91, 0x0008 }, + { 0x0500, 0x1f93, 0x0008 }, + { 0x8800, 0x1f98, 0x3000 }, + { 0x8500, 0x1f96, 0x2008 }, + { 0x0500, 0x1f95, 0x0008 }, + { 0x0500, 0x1f97, 0x0008 }, + { 0x8800, 0x1f9a, 0x2000 }, + { 0x0800, 0x1f99, 0x0000 }, + { 0x0800, 0x1f9b, 0x0000 }, + { 0x8800, 0x1fac, 0x5000 }, + { 0x8500, 0x1fa4, 0x4008 }, + { 0x8500, 0x1fa0, 0x3008 }, + { 0x8800, 0x1f9e, 0x2000 }, + { 0x0800, 0x1f9d, 0x0000 }, + { 0x0800, 0x1f9f, 0x0000 }, + { 0x8500, 0x1fa2, 0x2008 }, + { 0x0500, 0x1fa1, 0x0008 }, + { 0x0500, 0x1fa3, 0x0008 }, + { 0x8800, 0x1fa8, 0x3000 }, + { 0x8500, 0x1fa6, 0x2008 }, + { 0x0500, 0x1fa5, 0x0008 }, + { 0x0500, 0x1fa7, 0x0008 }, + { 0x8800, 0x1faa, 0x2000 }, + { 0x0800, 0x1fa9, 0x0000 }, + { 0x0800, 0x1fab, 0x0000 }, + { 0x8500, 0x1fb4, 0x4000 }, + { 0x8500, 0x1fb0, 0x3008 }, + { 0x8800, 0x1fae, 0x2000 }, + { 0x0800, 0x1fad, 0x0000 }, + { 0x0800, 0x1faf, 0x0000 }, + { 0x8500, 0x1fb2, 0x2000 }, + { 0x0500, 0x1fb1, 0x0008 }, + { 0x0500, 0x1fb3, 0x0009 }, + { 0x8900, 0x1fb9, 0x3ff8 }, + { 0x8500, 0x1fb7, 0x2000 }, + { 0x0500, 0x1fb6, 0x0000 }, + { 0x0900, 0x1fb8, 0x0ff8 }, + { 0x8900, 0x1fbb, 0x2fb6 }, + { 0x0900, 0x1fba, 0x0fb6 }, + { 0x0800, 0x1fbc, 0x0000 }, + { 0x9d00, 0x2005, 0x7000 }, + { 0x8500, 0x1fe1, 0x6008 }, + { 0x9800, 0x1fce, 0x5000 }, + { 0x8500, 0x1fc6, 0x4000 }, + { 0x9800, 0x1fc1, 0x3000 }, + { 0x9800, 0x1fbf, 0x2000 }, + { 0x0500, 0x1fbe, 0x0000 }, + { 0x1800, 0x1fc0, 0x0000 }, + { 0x8500, 0x1fc3, 0x2009 }, + { 0x0500, 0x1fc2, 0x0000 }, + { 0x0500, 0x1fc4, 0x0000 }, + { 0x8900, 0x1fca, 0x3faa }, + { 0x8900, 0x1fc8, 0x2faa }, + { 0x0500, 0x1fc7, 0x0000 }, + { 0x0900, 0x1fc9, 0x0faa }, + { 0x8800, 0x1fcc, 0x2000 }, + { 0x0900, 0x1fcb, 0x0faa }, + { 0x1800, 0x1fcd, 0x0000 }, + { 0x8900, 0x1fd8, 0x4ff8 }, + { 0x8500, 0x1fd2, 0x3000 }, + { 0x8500, 0x1fd0, 0x2008 }, + { 0x1800, 0x1fcf, 0x0000 }, + { 0x0500, 0x1fd1, 0x0008 }, + { 0x8500, 0x1fd6, 0x2000 }, + { 0x0500, 0x1fd3, 0x0000 }, + { 0x0500, 0x1fd7, 0x0000 }, + { 0x9800, 0x1fdd, 0x3000 }, + { 0x8900, 0x1fda, 0x2f9c }, + { 0x0900, 0x1fd9, 0x0ff8 }, + { 0x0900, 0x1fdb, 0x0f9c }, + { 0x9800, 0x1fdf, 0x2000 }, + { 0x1800, 0x1fde, 0x0000 }, + { 0x0500, 0x1fe0, 0x0008 }, + { 0x8500, 0x1ff3, 0x5009 }, + { 0x8900, 0x1fe9, 0x4ff8 }, + { 0x8500, 0x1fe5, 0x3007 }, + { 0x8500, 0x1fe3, 0x2000 }, + { 0x0500, 0x1fe2, 0x0000 }, + { 0x0500, 0x1fe4, 0x0000 }, + { 0x8500, 0x1fe7, 0x2000 }, + { 0x0500, 0x1fe6, 0x0000 }, + { 0x0900, 0x1fe8, 0x0ff8 }, + { 0x9800, 0x1fed, 0x3000 }, + { 0x8900, 0x1feb, 0x2f90 }, + { 0x0900, 0x1fea, 0x0f90 }, + { 0x0900, 0x1fec, 0x0ff9 }, + { 0x9800, 0x1fef, 0x2000 }, + { 0x1800, 0x1fee, 0x0000 }, + { 0x0500, 0x1ff2, 0x0000 }, + { 0x8800, 0x1ffc, 0x4000 }, + { 0x8900, 0x1ff8, 0x3f80 }, + { 0x8500, 0x1ff6, 0x2000 }, + { 0x0500, 0x1ff4, 0x0000 }, + { 0x0500, 0x1ff7, 0x0000 }, + { 0x8900, 0x1ffa, 0x2f82 }, + { 0x0900, 0x1ff9, 0x0f80 }, + { 0x0900, 0x1ffb, 0x0f82 }, + { 0x9d00, 0x2001, 0x3000 }, + { 0x9800, 0x1ffe, 0x2000 }, + { 0x1800, 0x1ffd, 0x0000 }, + { 0x1d00, 0x2000, 0x0000 }, + { 0x9d00, 0x2003, 0x2000 }, + { 0x1d00, 0x2002, 0x0000 }, + { 0x1d00, 0x2004, 0x0000 }, + { 0x9500, 0x2025, 0x6000 }, + { 0x9100, 0x2015, 0x5000 }, + { 0x8100, 0x200d, 0x4000 }, + { 0x9d00, 0x2009, 0x3000 }, + { 0x9d00, 0x2007, 0x2000 }, + { 0x1d00, 0x2006, 0x0000 }, + { 0x1d00, 0x2008, 0x0000 }, + { 0x9d00, 0x200b, 0x2000 }, + { 0x1d00, 0x200a, 0x0000 }, + { 0x0100, 0x200c, 0x0000 }, + { 0x9100, 0x2011, 0x3000 }, + { 0x8100, 0x200f, 0x2000 }, + { 0x0100, 0x200e, 0x0000 }, + { 0x1100, 0x2010, 0x0000 }, + { 0x9100, 0x2013, 0x2000 }, + { 0x1100, 0x2012, 0x0000 }, + { 0x1100, 0x2014, 0x0000 }, + { 0x9300, 0x201d, 0x4000 }, + { 0x9300, 0x2019, 0x3000 }, + { 0x9500, 0x2017, 0x2000 }, + { 0x1500, 0x2016, 0x0000 }, + { 0x1400, 0x2018, 0x0000 }, + { 0x9400, 0x201b, 0x2000 }, + { 0x1600, 0x201a, 0x0000 }, + { 0x1400, 0x201c, 0x0000 }, + { 0x9500, 0x2021, 0x3000 }, + { 0x9400, 0x201f, 0x2000 }, + { 0x1600, 0x201e, 0x0000 }, + { 0x1500, 0x2020, 0x0000 }, + { 0x9500, 0x2023, 0x2000 }, + { 0x1500, 0x2022, 0x0000 }, + { 0x1500, 0x2024, 0x0000 }, + { 0x9500, 0x2035, 0x5000 }, + { 0x8100, 0x202d, 0x4000 }, + { 0x9c00, 0x2029, 0x3000 }, + { 0x9500, 0x2027, 0x2000 }, + { 0x1500, 0x2026, 0x0000 }, + { 0x1b00, 0x2028, 0x0000 }, + { 0x8100, 0x202b, 0x2000 }, + { 0x0100, 0x202a, 0x0000 }, + { 0x0100, 0x202c, 0x0000 }, + { 0x9500, 0x2031, 0x3000 }, + { 0x9d00, 0x202f, 0x2000 }, + { 0x0100, 0x202e, 0x0000 }, + { 0x1500, 0x2030, 0x0000 }, + { 0x9500, 0x2033, 0x2000 }, + { 0x1500, 0x2032, 0x0000 }, + { 0x1500, 0x2034, 0x0000 }, + { 0x9500, 0x203d, 0x4000 }, + { 0x9400, 0x2039, 0x3000 }, + { 0x9500, 0x2037, 0x2000 }, + { 0x1500, 0x2036, 0x0000 }, + { 0x1500, 0x2038, 0x0000 }, + { 0x9500, 0x203b, 0x2000 }, + { 0x1300, 0x203a, 0x0000 }, + { 0x1500, 0x203c, 0x0000 }, + { 0x9500, 0x2041, 0x3000 }, + { 0x9000, 0x203f, 0x2000 }, + { 0x1500, 0x203e, 0x0000 }, + { 0x1000, 0x2040, 0x0000 }, + { 0x9500, 0x2043, 0x2000 }, + { 0x1500, 0x2042, 0x0000 }, + { 0x1900, 0x2044, 0x0000 }, + { 0x9900, 0x21ae, 0x9000 }, + { 0x8900, 0x211a, 0x8000 }, + { 0x9700, 0x20a7, 0x7000 }, + { 0x8f00, 0x2076, 0x6000 }, + { 0x9500, 0x2057, 0x5000 }, + { 0x9500, 0x204d, 0x4000 }, + { 0x9500, 0x2049, 0x3000 }, + { 0x9500, 0x2047, 0x2000 }, + { 0x1200, 0x2046, 0x0000 }, + { 0x1500, 0x2048, 0x0000 }, + { 0x9500, 0x204b, 0x2000 }, + { 0x1500, 0x204a, 0x0000 }, + { 0x1500, 0x204c, 0x0000 }, + { 0x9500, 0x2051, 0x3000 }, + { 0x9500, 0x204f, 0x2000 }, + { 0x1500, 0x204e, 0x0000 }, + { 0x1500, 0x2050, 0x0000 }, + { 0x9500, 0x2053, 0x2000 }, + { 0x1900, 0x2052, 0x0000 }, + { 0x1000, 0x2054, 0x0000 }, + { 0x8100, 0x206c, 0x4000 }, + { 0x8100, 0x2062, 0x3000 }, + { 0x8100, 0x2060, 0x2000 }, + { 0x1d00, 0x205f, 0x0000 }, + { 0x0100, 0x2061, 0x0000 }, + { 0x8100, 0x206a, 0x2000 }, + { 0x0100, 0x2063, 0x0000 }, + { 0x0100, 0x206b, 0x0000 }, + { 0x8f00, 0x2070, 0x3000 }, + { 0x8100, 0x206e, 0x2000 }, + { 0x0100, 0x206d, 0x0000 }, + { 0x0100, 0x206f, 0x0000 }, + { 0x8f00, 0x2074, 0x2000 }, + { 0x0500, 0x2071, 0x0000 }, + { 0x0f00, 0x2075, 0x0000 }, + { 0x8f00, 0x2086, 0x5000 }, + { 0x9200, 0x207e, 0x4000 }, + { 0x9900, 0x207a, 0x3000 }, + { 0x8f00, 0x2078, 0x2000 }, + { 0x0f00, 0x2077, 0x0000 }, + { 0x0f00, 0x2079, 0x0000 }, + { 0x9900, 0x207c, 0x2000 }, + { 0x1900, 0x207b, 0x0000 }, + { 0x1600, 0x207d, 0x0000 }, + { 0x8f00, 0x2082, 0x3000 }, + { 0x8f00, 0x2080, 0x2000 }, + { 0x0500, 0x207f, 0x0000 }, + { 0x0f00, 0x2081, 0x0000 }, + { 0x8f00, 0x2084, 0x2000 }, + { 0x0f00, 0x2083, 0x0000 }, + { 0x0f00, 0x2085, 0x0000 }, + { 0x9200, 0x208e, 0x4000 }, + { 0x9900, 0x208a, 0x3000 }, + { 0x8f00, 0x2088, 0x2000 }, + { 0x0f00, 0x2087, 0x0000 }, + { 0x0f00, 0x2089, 0x0000 }, + { 0x9900, 0x208c, 0x2000 }, + { 0x1900, 0x208b, 0x0000 }, + { 0x1600, 0x208d, 0x0000 }, + { 0x9700, 0x20a3, 0x3000 }, + { 0x9700, 0x20a1, 0x2000 }, + { 0x1700, 0x20a0, 0x0000 }, + { 0x1700, 0x20a2, 0x0000 }, + { 0x9700, 0x20a5, 0x2000 }, + { 0x1700, 0x20a4, 0x0000 }, + { 0x1700, 0x20a6, 0x0000 }, + { 0x8c00, 0x20e5, 0x6000 }, + { 0x8c00, 0x20d5, 0x5000 }, + { 0x9700, 0x20af, 0x4000 }, + { 0x9700, 0x20ab, 0x3000 }, + { 0x9700, 0x20a9, 0x2000 }, + { 0x1700, 0x20a8, 0x0000 }, + { 0x1700, 0x20aa, 0x0000 }, + { 0x9700, 0x20ad, 0x2000 }, + { 0x1700, 0x20ac, 0x0000 }, + { 0x1700, 0x20ae, 0x0000 }, + { 0x8c00, 0x20d1, 0x3000 }, + { 0x9700, 0x20b1, 0x2000 }, + { 0x1700, 0x20b0, 0x0000 }, + { 0x0c00, 0x20d0, 0x0000 }, + { 0x8c00, 0x20d3, 0x2000 }, + { 0x0c00, 0x20d2, 0x0000 }, + { 0x0c00, 0x20d4, 0x0000 }, + { 0x8b00, 0x20dd, 0x4000 }, + { 0x8c00, 0x20d9, 0x3000 }, + { 0x8c00, 0x20d7, 0x2000 }, + { 0x0c00, 0x20d6, 0x0000 }, + { 0x0c00, 0x20d8, 0x0000 }, + { 0x8c00, 0x20db, 0x2000 }, + { 0x0c00, 0x20da, 0x0000 }, + { 0x0c00, 0x20dc, 0x0000 }, + { 0x8c00, 0x20e1, 0x3000 }, + { 0x8b00, 0x20df, 0x2000 }, + { 0x0b00, 0x20de, 0x0000 }, + { 0x0b00, 0x20e0, 0x0000 }, + { 0x8b00, 0x20e3, 0x2000 }, + { 0x0b00, 0x20e2, 0x0000 }, + { 0x0b00, 0x20e4, 0x0000 }, + { 0x8500, 0x210a, 0x5000 }, + { 0x8900, 0x2102, 0x4000 }, + { 0x8c00, 0x20e9, 0x3000 }, + { 0x8c00, 0x20e7, 0x2000 }, + { 0x0c00, 0x20e6, 0x0000 }, + { 0x0c00, 0x20e8, 0x0000 }, + { 0x9a00, 0x2100, 0x2000 }, + { 0x0c00, 0x20ea, 0x0000 }, + { 0x1a00, 0x2101, 0x0000 }, + { 0x9a00, 0x2106, 0x3000 }, + { 0x9a00, 0x2104, 0x2000 }, + { 0x1a00, 0x2103, 0x0000 }, + { 0x1a00, 0x2105, 0x0000 }, + { 0x9a00, 0x2108, 0x2000 }, + { 0x0900, 0x2107, 0x0000 }, + { 0x1a00, 0x2109, 0x0000 }, + { 0x8900, 0x2112, 0x4000 }, + { 0x8500, 0x210e, 0x3000 }, + { 0x8900, 0x210c, 0x2000 }, + { 0x0900, 0x210b, 0x0000 }, + { 0x0900, 0x210d, 0x0000 }, + { 0x8900, 0x2110, 0x2000 }, + { 0x0500, 0x210f, 0x0000 }, + { 0x0900, 0x2111, 0x0000 }, + { 0x9a00, 0x2116, 0x3000 }, + { 0x9a00, 0x2114, 0x2000 }, + { 0x0500, 0x2113, 0x0000 }, + { 0x0900, 0x2115, 0x0000 }, + { 0x9a00, 0x2118, 0x2000 }, + { 0x1a00, 0x2117, 0x0000 }, + { 0x0900, 0x2119, 0x0000 }, + { 0x8e00, 0x2162, 0x7000 }, + { 0x9a00, 0x213a, 0x6000 }, + { 0x8900, 0x212a, 0x5000 }, + { 0x9a00, 0x2122, 0x4000 }, + { 0x9a00, 0x211e, 0x3000 }, + { 0x8900, 0x211c, 0x2000 }, + { 0x0900, 0x211b, 0x0000 }, + { 0x0900, 0x211d, 0x0000 }, + { 0x9a00, 0x2120, 0x2000 }, + { 0x1a00, 0x211f, 0x0000 }, + { 0x1a00, 0x2121, 0x0000 }, + { 0x8900, 0x2126, 0x3000 }, + { 0x8900, 0x2124, 0x2000 }, + { 0x1a00, 0x2123, 0x0000 }, + { 0x1a00, 0x2125, 0x0000 }, + { 0x8900, 0x2128, 0x2000 }, + { 0x1a00, 0x2127, 0x0000 }, + { 0x1a00, 0x2129, 0x0000 }, + { 0x9a00, 0x2132, 0x4000 }, + { 0x9a00, 0x212e, 0x3000 }, + { 0x8900, 0x212c, 0x2000 }, + { 0x0900, 0x212b, 0x0000 }, + { 0x0900, 0x212d, 0x0000 }, + { 0x8900, 0x2130, 0x2000 }, + { 0x0500, 0x212f, 0x0000 }, + { 0x0900, 0x2131, 0x0000 }, + { 0x8700, 0x2136, 0x3000 }, + { 0x8500, 0x2134, 0x2000 }, + { 0x0900, 0x2133, 0x0000 }, + { 0x0700, 0x2135, 0x0000 }, + { 0x8700, 0x2138, 0x2000 }, + { 0x0700, 0x2137, 0x0000 }, + { 0x0500, 0x2139, 0x0000 }, + { 0x9900, 0x214b, 0x5000 }, + { 0x9900, 0x2143, 0x4000 }, + { 0x8900, 0x213f, 0x3000 }, + { 0x8500, 0x213d, 0x2000 }, + { 0x1a00, 0x213b, 0x0000 }, + { 0x0900, 0x213e, 0x0000 }, + { 0x9900, 0x2141, 0x2000 }, + { 0x1900, 0x2140, 0x0000 }, + { 0x1900, 0x2142, 0x0000 }, + { 0x8500, 0x2147, 0x3000 }, + { 0x8900, 0x2145, 0x2000 }, + { 0x1900, 0x2144, 0x0000 }, + { 0x0500, 0x2146, 0x0000 }, + { 0x8500, 0x2149, 0x2000 }, + { 0x0500, 0x2148, 0x0000 }, + { 0x1a00, 0x214a, 0x0000 }, + { 0x8f00, 0x215a, 0x4000 }, + { 0x8f00, 0x2156, 0x3000 }, + { 0x8f00, 0x2154, 0x2000 }, + { 0x0f00, 0x2153, 0x0000 }, + { 0x0f00, 0x2155, 0x0000 }, + { 0x8f00, 0x2158, 0x2000 }, + { 0x0f00, 0x2157, 0x0000 }, + { 0x0f00, 0x2159, 0x0000 }, + { 0x8f00, 0x215e, 0x3000 }, + { 0x8f00, 0x215c, 0x2000 }, + { 0x0f00, 0x215b, 0x0000 }, + { 0x0f00, 0x215d, 0x0000 }, + { 0x8e00, 0x2160, 0x2000 }, + { 0x0f00, 0x215f, 0x0000 }, + { 0x0e00, 0x2161, 0x0000 }, + { 0x8e00, 0x2182, 0x6000 }, + { 0x8e00, 0x2172, 0x5000 }, + { 0x8e00, 0x216a, 0x4000 }, + { 0x8e00, 0x2166, 0x3000 }, + { 0x8e00, 0x2164, 0x2000 }, + { 0x0e00, 0x2163, 0x0000 }, + { 0x0e00, 0x2165, 0x0000 }, + { 0x8e00, 0x2168, 0x2000 }, + { 0x0e00, 0x2167, 0x0000 }, + { 0x0e00, 0x2169, 0x0000 }, + { 0x8e00, 0x216e, 0x3000 }, + { 0x8e00, 0x216c, 0x2000 }, + { 0x0e00, 0x216b, 0x0000 }, + { 0x0e00, 0x216d, 0x0000 }, + { 0x8e00, 0x2170, 0x2000 }, + { 0x0e00, 0x216f, 0x0000 }, + { 0x0e00, 0x2171, 0x0000 }, + { 0x8e00, 0x217a, 0x4000 }, + { 0x8e00, 0x2176, 0x3000 }, + { 0x8e00, 0x2174, 0x2000 }, + { 0x0e00, 0x2173, 0x0000 }, + { 0x0e00, 0x2175, 0x0000 }, + { 0x8e00, 0x2178, 0x2000 }, + { 0x0e00, 0x2177, 0x0000 }, + { 0x0e00, 0x2179, 0x0000 }, + { 0x8e00, 0x217e, 0x3000 }, + { 0x8e00, 0x217c, 0x2000 }, + { 0x0e00, 0x217b, 0x0000 }, + { 0x0e00, 0x217d, 0x0000 }, + { 0x8e00, 0x2180, 0x2000 }, + { 0x0e00, 0x217f, 0x0000 }, + { 0x0e00, 0x2181, 0x0000 }, + { 0x9a00, 0x219e, 0x5000 }, + { 0x9a00, 0x2196, 0x4000 }, + { 0x9900, 0x2192, 0x3000 }, + { 0x9900, 0x2190, 0x2000 }, + { 0x0e00, 0x2183, 0x0000 }, + { 0x1900, 0x2191, 0x0000 }, + { 0x9900, 0x2194, 0x2000 }, + { 0x1900, 0x2193, 0x0000 }, + { 0x1a00, 0x2195, 0x0000 }, + { 0x9900, 0x219a, 0x3000 }, + { 0x9a00, 0x2198, 0x2000 }, + { 0x1a00, 0x2197, 0x0000 }, + { 0x1a00, 0x2199, 0x0000 }, + { 0x9a00, 0x219c, 0x2000 }, + { 0x1900, 0x219b, 0x0000 }, + { 0x1a00, 0x219d, 0x0000 }, + { 0x9900, 0x21a6, 0x4000 }, + { 0x9a00, 0x21a2, 0x3000 }, + { 0x9900, 0x21a0, 0x2000 }, + { 0x1a00, 0x219f, 0x0000 }, + { 0x1a00, 0x21a1, 0x0000 }, + { 0x9a00, 0x21a4, 0x2000 }, + { 0x1900, 0x21a3, 0x0000 }, + { 0x1a00, 0x21a5, 0x0000 }, + { 0x9a00, 0x21aa, 0x3000 }, + { 0x9a00, 0x21a8, 0x2000 }, + { 0x1a00, 0x21a7, 0x0000 }, + { 0x1a00, 0x21a9, 0x0000 }, + { 0x9a00, 0x21ac, 0x2000 }, + { 0x1a00, 0x21ab, 0x0000 }, + { 0x1a00, 0x21ad, 0x0000 }, + { 0x9900, 0x222e, 0x8000 }, + { 0x9a00, 0x21ee, 0x7000 }, + { 0x9900, 0x21ce, 0x6000 }, + { 0x9a00, 0x21be, 0x5000 }, + { 0x9a00, 0x21b6, 0x4000 }, + { 0x9a00, 0x21b2, 0x3000 }, + { 0x9a00, 0x21b0, 0x2000 }, + { 0x1a00, 0x21af, 0x0000 }, + { 0x1a00, 0x21b1, 0x0000 }, + { 0x9a00, 0x21b4, 0x2000 }, + { 0x1a00, 0x21b3, 0x0000 }, + { 0x1a00, 0x21b5, 0x0000 }, + { 0x9a00, 0x21ba, 0x3000 }, + { 0x9a00, 0x21b8, 0x2000 }, + { 0x1a00, 0x21b7, 0x0000 }, + { 0x1a00, 0x21b9, 0x0000 }, + { 0x9a00, 0x21bc, 0x2000 }, + { 0x1a00, 0x21bb, 0x0000 }, + { 0x1a00, 0x21bd, 0x0000 }, + { 0x9a00, 0x21c6, 0x4000 }, + { 0x9a00, 0x21c2, 0x3000 }, + { 0x9a00, 0x21c0, 0x2000 }, + { 0x1a00, 0x21bf, 0x0000 }, + { 0x1a00, 0x21c1, 0x0000 }, + { 0x9a00, 0x21c4, 0x2000 }, + { 0x1a00, 0x21c3, 0x0000 }, + { 0x1a00, 0x21c5, 0x0000 }, + { 0x9a00, 0x21ca, 0x3000 }, + { 0x9a00, 0x21c8, 0x2000 }, + { 0x1a00, 0x21c7, 0x0000 }, + { 0x1a00, 0x21c9, 0x0000 }, + { 0x9a00, 0x21cc, 0x2000 }, + { 0x1a00, 0x21cb, 0x0000 }, + { 0x1a00, 0x21cd, 0x0000 }, + { 0x9a00, 0x21de, 0x5000 }, + { 0x9a00, 0x21d6, 0x4000 }, + { 0x9900, 0x21d2, 0x3000 }, + { 0x9a00, 0x21d0, 0x2000 }, + { 0x1900, 0x21cf, 0x0000 }, + { 0x1a00, 0x21d1, 0x0000 }, + { 0x9900, 0x21d4, 0x2000 }, + { 0x1a00, 0x21d3, 0x0000 }, + { 0x1a00, 0x21d5, 0x0000 }, + { 0x9a00, 0x21da, 0x3000 }, + { 0x9a00, 0x21d8, 0x2000 }, + { 0x1a00, 0x21d7, 0x0000 }, + { 0x1a00, 0x21d9, 0x0000 }, + { 0x9a00, 0x21dc, 0x2000 }, + { 0x1a00, 0x21db, 0x0000 }, + { 0x1a00, 0x21dd, 0x0000 }, + { 0x9a00, 0x21e6, 0x4000 }, + { 0x9a00, 0x21e2, 0x3000 }, + { 0x9a00, 0x21e0, 0x2000 }, + { 0x1a00, 0x21df, 0x0000 }, + { 0x1a00, 0x21e1, 0x0000 }, + { 0x9a00, 0x21e4, 0x2000 }, + { 0x1a00, 0x21e3, 0x0000 }, + { 0x1a00, 0x21e5, 0x0000 }, + { 0x9a00, 0x21ea, 0x3000 }, + { 0x9a00, 0x21e8, 0x2000 }, + { 0x1a00, 0x21e7, 0x0000 }, + { 0x1a00, 0x21e9, 0x0000 }, + { 0x9a00, 0x21ec, 0x2000 }, + { 0x1a00, 0x21eb, 0x0000 }, + { 0x1a00, 0x21ed, 0x0000 }, + { 0x9900, 0x220e, 0x6000 }, + { 0x9900, 0x21fe, 0x5000 }, + { 0x9900, 0x21f6, 0x4000 }, + { 0x9a00, 0x21f2, 0x3000 }, + { 0x9a00, 0x21f0, 0x2000 }, + { 0x1a00, 0x21ef, 0x0000 }, + { 0x1a00, 0x21f1, 0x0000 }, + { 0x9900, 0x21f4, 0x2000 }, + { 0x1a00, 0x21f3, 0x0000 }, + { 0x1900, 0x21f5, 0x0000 }, + { 0x9900, 0x21fa, 0x3000 }, + { 0x9900, 0x21f8, 0x2000 }, + { 0x1900, 0x21f7, 0x0000 }, + { 0x1900, 0x21f9, 0x0000 }, + { 0x9900, 0x21fc, 0x2000 }, + { 0x1900, 0x21fb, 0x0000 }, + { 0x1900, 0x21fd, 0x0000 }, + { 0x9900, 0x2206, 0x4000 }, + { 0x9900, 0x2202, 0x3000 }, + { 0x9900, 0x2200, 0x2000 }, + { 0x1900, 0x21ff, 0x0000 }, + { 0x1900, 0x2201, 0x0000 }, + { 0x9900, 0x2204, 0x2000 }, + { 0x1900, 0x2203, 0x0000 }, + { 0x1900, 0x2205, 0x0000 }, + { 0x9900, 0x220a, 0x3000 }, + { 0x9900, 0x2208, 0x2000 }, + { 0x1900, 0x2207, 0x0000 }, + { 0x1900, 0x2209, 0x0000 }, + { 0x9900, 0x220c, 0x2000 }, + { 0x1900, 0x220b, 0x0000 }, + { 0x1900, 0x220d, 0x0000 }, + { 0x9900, 0x221e, 0x5000 }, + { 0x9900, 0x2216, 0x4000 }, + { 0x9900, 0x2212, 0x3000 }, + { 0x9900, 0x2210, 0x2000 }, + { 0x1900, 0x220f, 0x0000 }, + { 0x1900, 0x2211, 0x0000 }, + { 0x9900, 0x2214, 0x2000 }, + { 0x1900, 0x2213, 0x0000 }, + { 0x1900, 0x2215, 0x0000 }, + { 0x9900, 0x221a, 0x3000 }, + { 0x9900, 0x2218, 0x2000 }, + { 0x1900, 0x2217, 0x0000 }, + { 0x1900, 0x2219, 0x0000 }, + { 0x9900, 0x221c, 0x2000 }, + { 0x1900, 0x221b, 0x0000 }, + { 0x1900, 0x221d, 0x0000 }, + { 0x9900, 0x2226, 0x4000 }, + { 0x9900, 0x2222, 0x3000 }, + { 0x9900, 0x2220, 0x2000 }, + { 0x1900, 0x221f, 0x0000 }, + { 0x1900, 0x2221, 0x0000 }, + { 0x9900, 0x2224, 0x2000 }, + { 0x1900, 0x2223, 0x0000 }, + { 0x1900, 0x2225, 0x0000 }, + { 0x9900, 0x222a, 0x3000 }, + { 0x9900, 0x2228, 0x2000 }, + { 0x1900, 0x2227, 0x0000 }, + { 0x1900, 0x2229, 0x0000 }, + { 0x9900, 0x222c, 0x2000 }, + { 0x1900, 0x222b, 0x0000 }, + { 0x1900, 0x222d, 0x0000 }, + { 0x9900, 0x226e, 0x7000 }, + { 0x9900, 0x224e, 0x6000 }, + { 0x9900, 0x223e, 0x5000 }, + { 0x9900, 0x2236, 0x4000 }, + { 0x9900, 0x2232, 0x3000 }, + { 0x9900, 0x2230, 0x2000 }, + { 0x1900, 0x222f, 0x0000 }, + { 0x1900, 0x2231, 0x0000 }, + { 0x9900, 0x2234, 0x2000 }, + { 0x1900, 0x2233, 0x0000 }, + { 0x1900, 0x2235, 0x0000 }, + { 0x9900, 0x223a, 0x3000 }, + { 0x9900, 0x2238, 0x2000 }, + { 0x1900, 0x2237, 0x0000 }, + { 0x1900, 0x2239, 0x0000 }, + { 0x9900, 0x223c, 0x2000 }, + { 0x1900, 0x223b, 0x0000 }, + { 0x1900, 0x223d, 0x0000 }, + { 0x9900, 0x2246, 0x4000 }, + { 0x9900, 0x2242, 0x3000 }, + { 0x9900, 0x2240, 0x2000 }, + { 0x1900, 0x223f, 0x0000 }, + { 0x1900, 0x2241, 0x0000 }, + { 0x9900, 0x2244, 0x2000 }, + { 0x1900, 0x2243, 0x0000 }, + { 0x1900, 0x2245, 0x0000 }, + { 0x9900, 0x224a, 0x3000 }, + { 0x9900, 0x2248, 0x2000 }, + { 0x1900, 0x2247, 0x0000 }, + { 0x1900, 0x2249, 0x0000 }, + { 0x9900, 0x224c, 0x2000 }, + { 0x1900, 0x224b, 0x0000 }, + { 0x1900, 0x224d, 0x0000 }, + { 0x9900, 0x225e, 0x5000 }, + { 0x9900, 0x2256, 0x4000 }, + { 0x9900, 0x2252, 0x3000 }, + { 0x9900, 0x2250, 0x2000 }, + { 0x1900, 0x224f, 0x0000 }, + { 0x1900, 0x2251, 0x0000 }, + { 0x9900, 0x2254, 0x2000 }, + { 0x1900, 0x2253, 0x0000 }, + { 0x1900, 0x2255, 0x0000 }, + { 0x9900, 0x225a, 0x3000 }, + { 0x9900, 0x2258, 0x2000 }, + { 0x1900, 0x2257, 0x0000 }, + { 0x1900, 0x2259, 0x0000 }, + { 0x9900, 0x225c, 0x2000 }, + { 0x1900, 0x225b, 0x0000 }, + { 0x1900, 0x225d, 0x0000 }, + { 0x9900, 0x2266, 0x4000 }, + { 0x9900, 0x2262, 0x3000 }, + { 0x9900, 0x2260, 0x2000 }, + { 0x1900, 0x225f, 0x0000 }, + { 0x1900, 0x2261, 0x0000 }, + { 0x9900, 0x2264, 0x2000 }, + { 0x1900, 0x2263, 0x0000 }, + { 0x1900, 0x2265, 0x0000 }, + { 0x9900, 0x226a, 0x3000 }, + { 0x9900, 0x2268, 0x2000 }, + { 0x1900, 0x2267, 0x0000 }, + { 0x1900, 0x2269, 0x0000 }, + { 0x9900, 0x226c, 0x2000 }, + { 0x1900, 0x226b, 0x0000 }, + { 0x1900, 0x226d, 0x0000 }, + { 0x9900, 0x228e, 0x6000 }, + { 0x9900, 0x227e, 0x5000 }, + { 0x9900, 0x2276, 0x4000 }, + { 0x9900, 0x2272, 0x3000 }, + { 0x9900, 0x2270, 0x2000 }, + { 0x1900, 0x226f, 0x0000 }, + { 0x1900, 0x2271, 0x0000 }, + { 0x9900, 0x2274, 0x2000 }, + { 0x1900, 0x2273, 0x0000 }, + { 0x1900, 0x2275, 0x0000 }, + { 0x9900, 0x227a, 0x3000 }, + { 0x9900, 0x2278, 0x2000 }, + { 0x1900, 0x2277, 0x0000 }, + { 0x1900, 0x2279, 0x0000 }, + { 0x9900, 0x227c, 0x2000 }, + { 0x1900, 0x227b, 0x0000 }, + { 0x1900, 0x227d, 0x0000 }, + { 0x9900, 0x2286, 0x4000 }, + { 0x9900, 0x2282, 0x3000 }, + { 0x9900, 0x2280, 0x2000 }, + { 0x1900, 0x227f, 0x0000 }, + { 0x1900, 0x2281, 0x0000 }, + { 0x9900, 0x2284, 0x2000 }, + { 0x1900, 0x2283, 0x0000 }, + { 0x1900, 0x2285, 0x0000 }, + { 0x9900, 0x228a, 0x3000 }, + { 0x9900, 0x2288, 0x2000 }, + { 0x1900, 0x2287, 0x0000 }, + { 0x1900, 0x2289, 0x0000 }, + { 0x9900, 0x228c, 0x2000 }, + { 0x1900, 0x228b, 0x0000 }, + { 0x1900, 0x228d, 0x0000 }, + { 0x9900, 0x229e, 0x5000 }, + { 0x9900, 0x2296, 0x4000 }, + { 0x9900, 0x2292, 0x3000 }, + { 0x9900, 0x2290, 0x2000 }, + { 0x1900, 0x228f, 0x0000 }, + { 0x1900, 0x2291, 0x0000 }, + { 0x9900, 0x2294, 0x2000 }, + { 0x1900, 0x2293, 0x0000 }, + { 0x1900, 0x2295, 0x0000 }, + { 0x9900, 0x229a, 0x3000 }, + { 0x9900, 0x2298, 0x2000 }, + { 0x1900, 0x2297, 0x0000 }, + { 0x1900, 0x2299, 0x0000 }, + { 0x9900, 0x229c, 0x2000 }, + { 0x1900, 0x229b, 0x0000 }, + { 0x1900, 0x229d, 0x0000 }, + { 0x9900, 0x22a6, 0x4000 }, + { 0x9900, 0x22a2, 0x3000 }, + { 0x9900, 0x22a0, 0x2000 }, + { 0x1900, 0x229f, 0x0000 }, + { 0x1900, 0x22a1, 0x0000 }, + { 0x9900, 0x22a4, 0x2000 }, + { 0x1900, 0x22a3, 0x0000 }, + { 0x1900, 0x22a5, 0x0000 }, + { 0x9900, 0x22aa, 0x3000 }, + { 0x9900, 0x22a8, 0x2000 }, + { 0x1900, 0x22a7, 0x0000 }, + { 0x1900, 0x22a9, 0x0000 }, + { 0x9900, 0x22ac, 0x2000 }, + { 0x1900, 0x22ab, 0x0000 }, + { 0x1900, 0x22ad, 0x0000 }, + { 0x8f00, 0x2787, 0xb000 }, + { 0x9a00, 0x250b, 0xa000 }, + { 0x9900, 0x23ae, 0x9000 }, + { 0x9a00, 0x232e, 0x8000 }, + { 0x9900, 0x22ee, 0x7000 }, + { 0x9900, 0x22ce, 0x6000 }, + { 0x9900, 0x22be, 0x5000 }, + { 0x9900, 0x22b6, 0x4000 }, + { 0x9900, 0x22b2, 0x3000 }, + { 0x9900, 0x22b0, 0x2000 }, + { 0x1900, 0x22af, 0x0000 }, + { 0x1900, 0x22b1, 0x0000 }, + { 0x9900, 0x22b4, 0x2000 }, + { 0x1900, 0x22b3, 0x0000 }, + { 0x1900, 0x22b5, 0x0000 }, + { 0x9900, 0x22ba, 0x3000 }, + { 0x9900, 0x22b8, 0x2000 }, + { 0x1900, 0x22b7, 0x0000 }, + { 0x1900, 0x22b9, 0x0000 }, + { 0x9900, 0x22bc, 0x2000 }, + { 0x1900, 0x22bb, 0x0000 }, + { 0x1900, 0x22bd, 0x0000 }, + { 0x9900, 0x22c6, 0x4000 }, + { 0x9900, 0x22c2, 0x3000 }, + { 0x9900, 0x22c0, 0x2000 }, + { 0x1900, 0x22bf, 0x0000 }, + { 0x1900, 0x22c1, 0x0000 }, + { 0x9900, 0x22c4, 0x2000 }, + { 0x1900, 0x22c3, 0x0000 }, + { 0x1900, 0x22c5, 0x0000 }, + { 0x9900, 0x22ca, 0x3000 }, + { 0x9900, 0x22c8, 0x2000 }, + { 0x1900, 0x22c7, 0x0000 }, + { 0x1900, 0x22c9, 0x0000 }, + { 0x9900, 0x22cc, 0x2000 }, + { 0x1900, 0x22cb, 0x0000 }, + { 0x1900, 0x22cd, 0x0000 }, + { 0x9900, 0x22de, 0x5000 }, + { 0x9900, 0x22d6, 0x4000 }, + { 0x9900, 0x22d2, 0x3000 }, + { 0x9900, 0x22d0, 0x2000 }, + { 0x1900, 0x22cf, 0x0000 }, + { 0x1900, 0x22d1, 0x0000 }, + { 0x9900, 0x22d4, 0x2000 }, + { 0x1900, 0x22d3, 0x0000 }, + { 0x1900, 0x22d5, 0x0000 }, + { 0x9900, 0x22da, 0x3000 }, + { 0x9900, 0x22d8, 0x2000 }, + { 0x1900, 0x22d7, 0x0000 }, + { 0x1900, 0x22d9, 0x0000 }, + { 0x9900, 0x22dc, 0x2000 }, + { 0x1900, 0x22db, 0x0000 }, + { 0x1900, 0x22dd, 0x0000 }, + { 0x9900, 0x22e6, 0x4000 }, + { 0x9900, 0x22e2, 0x3000 }, + { 0x9900, 0x22e0, 0x2000 }, + { 0x1900, 0x22df, 0x0000 }, + { 0x1900, 0x22e1, 0x0000 }, + { 0x9900, 0x22e4, 0x2000 }, + { 0x1900, 0x22e3, 0x0000 }, + { 0x1900, 0x22e5, 0x0000 }, + { 0x9900, 0x22ea, 0x3000 }, + { 0x9900, 0x22e8, 0x2000 }, + { 0x1900, 0x22e7, 0x0000 }, + { 0x1900, 0x22e9, 0x0000 }, + { 0x9900, 0x22ec, 0x2000 }, + { 0x1900, 0x22eb, 0x0000 }, + { 0x1900, 0x22ed, 0x0000 }, + { 0x9a00, 0x230e, 0x6000 }, + { 0x9900, 0x22fe, 0x5000 }, + { 0x9900, 0x22f6, 0x4000 }, + { 0x9900, 0x22f2, 0x3000 }, + { 0x9900, 0x22f0, 0x2000 }, + { 0x1900, 0x22ef, 0x0000 }, + { 0x1900, 0x22f1, 0x0000 }, + { 0x9900, 0x22f4, 0x2000 }, + { 0x1900, 0x22f3, 0x0000 }, + { 0x1900, 0x22f5, 0x0000 }, + { 0x9900, 0x22fa, 0x3000 }, + { 0x9900, 0x22f8, 0x2000 }, + { 0x1900, 0x22f7, 0x0000 }, + { 0x1900, 0x22f9, 0x0000 }, + { 0x9900, 0x22fc, 0x2000 }, + { 0x1900, 0x22fb, 0x0000 }, + { 0x1900, 0x22fd, 0x0000 }, + { 0x9a00, 0x2306, 0x4000 }, + { 0x9a00, 0x2302, 0x3000 }, + { 0x9a00, 0x2300, 0x2000 }, + { 0x1900, 0x22ff, 0x0000 }, + { 0x1a00, 0x2301, 0x0000 }, + { 0x9a00, 0x2304, 0x2000 }, + { 0x1a00, 0x2303, 0x0000 }, + { 0x1a00, 0x2305, 0x0000 }, + { 0x9900, 0x230a, 0x3000 }, + { 0x9900, 0x2308, 0x2000 }, + { 0x1a00, 0x2307, 0x0000 }, + { 0x1900, 0x2309, 0x0000 }, + { 0x9a00, 0x230c, 0x2000 }, + { 0x1900, 0x230b, 0x0000 }, + { 0x1a00, 0x230d, 0x0000 }, + { 0x9a00, 0x231e, 0x5000 }, + { 0x9a00, 0x2316, 0x4000 }, + { 0x9a00, 0x2312, 0x3000 }, + { 0x9a00, 0x2310, 0x2000 }, + { 0x1a00, 0x230f, 0x0000 }, + { 0x1a00, 0x2311, 0x0000 }, + { 0x9a00, 0x2314, 0x2000 }, + { 0x1a00, 0x2313, 0x0000 }, + { 0x1a00, 0x2315, 0x0000 }, + { 0x9a00, 0x231a, 0x3000 }, + { 0x9a00, 0x2318, 0x2000 }, + { 0x1a00, 0x2317, 0x0000 }, + { 0x1a00, 0x2319, 0x0000 }, + { 0x9a00, 0x231c, 0x2000 }, + { 0x1a00, 0x231b, 0x0000 }, + { 0x1a00, 0x231d, 0x0000 }, + { 0x9a00, 0x2326, 0x4000 }, + { 0x9a00, 0x2322, 0x3000 }, + { 0x9900, 0x2320, 0x2000 }, + { 0x1a00, 0x231f, 0x0000 }, + { 0x1900, 0x2321, 0x0000 }, + { 0x9a00, 0x2324, 0x2000 }, + { 0x1a00, 0x2323, 0x0000 }, + { 0x1a00, 0x2325, 0x0000 }, + { 0x9200, 0x232a, 0x3000 }, + { 0x9a00, 0x2328, 0x2000 }, + { 0x1a00, 0x2327, 0x0000 }, + { 0x1600, 0x2329, 0x0000 }, + { 0x9a00, 0x232c, 0x2000 }, + { 0x1a00, 0x232b, 0x0000 }, + { 0x1a00, 0x232d, 0x0000 }, + { 0x9a00, 0x236e, 0x7000 }, + { 0x9a00, 0x234e, 0x6000 }, + { 0x9a00, 0x233e, 0x5000 }, + { 0x9a00, 0x2336, 0x4000 }, + { 0x9a00, 0x2332, 0x3000 }, + { 0x9a00, 0x2330, 0x2000 }, + { 0x1a00, 0x232f, 0x0000 }, + { 0x1a00, 0x2331, 0x0000 }, + { 0x9a00, 0x2334, 0x2000 }, + { 0x1a00, 0x2333, 0x0000 }, + { 0x1a00, 0x2335, 0x0000 }, + { 0x9a00, 0x233a, 0x3000 }, + { 0x9a00, 0x2338, 0x2000 }, + { 0x1a00, 0x2337, 0x0000 }, + { 0x1a00, 0x2339, 0x0000 }, + { 0x9a00, 0x233c, 0x2000 }, + { 0x1a00, 0x233b, 0x0000 }, + { 0x1a00, 0x233d, 0x0000 }, + { 0x9a00, 0x2346, 0x4000 }, + { 0x9a00, 0x2342, 0x3000 }, + { 0x9a00, 0x2340, 0x2000 }, + { 0x1a00, 0x233f, 0x0000 }, + { 0x1a00, 0x2341, 0x0000 }, + { 0x9a00, 0x2344, 0x2000 }, + { 0x1a00, 0x2343, 0x0000 }, + { 0x1a00, 0x2345, 0x0000 }, + { 0x9a00, 0x234a, 0x3000 }, + { 0x9a00, 0x2348, 0x2000 }, + { 0x1a00, 0x2347, 0x0000 }, + { 0x1a00, 0x2349, 0x0000 }, + { 0x9a00, 0x234c, 0x2000 }, + { 0x1a00, 0x234b, 0x0000 }, + { 0x1a00, 0x234d, 0x0000 }, + { 0x9a00, 0x235e, 0x5000 }, + { 0x9a00, 0x2356, 0x4000 }, + { 0x9a00, 0x2352, 0x3000 }, + { 0x9a00, 0x2350, 0x2000 }, + { 0x1a00, 0x234f, 0x0000 }, + { 0x1a00, 0x2351, 0x0000 }, + { 0x9a00, 0x2354, 0x2000 }, + { 0x1a00, 0x2353, 0x0000 }, + { 0x1a00, 0x2355, 0x0000 }, + { 0x9a00, 0x235a, 0x3000 }, + { 0x9a00, 0x2358, 0x2000 }, + { 0x1a00, 0x2357, 0x0000 }, + { 0x1a00, 0x2359, 0x0000 }, + { 0x9a00, 0x235c, 0x2000 }, + { 0x1a00, 0x235b, 0x0000 }, + { 0x1a00, 0x235d, 0x0000 }, + { 0x9a00, 0x2366, 0x4000 }, + { 0x9a00, 0x2362, 0x3000 }, + { 0x9a00, 0x2360, 0x2000 }, + { 0x1a00, 0x235f, 0x0000 }, + { 0x1a00, 0x2361, 0x0000 }, + { 0x9a00, 0x2364, 0x2000 }, + { 0x1a00, 0x2363, 0x0000 }, + { 0x1a00, 0x2365, 0x0000 }, + { 0x9a00, 0x236a, 0x3000 }, + { 0x9a00, 0x2368, 0x2000 }, + { 0x1a00, 0x2367, 0x0000 }, + { 0x1a00, 0x2369, 0x0000 }, + { 0x9a00, 0x236c, 0x2000 }, + { 0x1a00, 0x236b, 0x0000 }, + { 0x1a00, 0x236d, 0x0000 }, + { 0x9a00, 0x238e, 0x6000 }, + { 0x9a00, 0x237e, 0x5000 }, + { 0x9a00, 0x2376, 0x4000 }, + { 0x9a00, 0x2372, 0x3000 }, + { 0x9a00, 0x2370, 0x2000 }, + { 0x1a00, 0x236f, 0x0000 }, + { 0x1a00, 0x2371, 0x0000 }, + { 0x9a00, 0x2374, 0x2000 }, + { 0x1a00, 0x2373, 0x0000 }, + { 0x1a00, 0x2375, 0x0000 }, + { 0x9a00, 0x237a, 0x3000 }, + { 0x9a00, 0x2378, 0x2000 }, + { 0x1a00, 0x2377, 0x0000 }, + { 0x1a00, 0x2379, 0x0000 }, + { 0x9900, 0x237c, 0x2000 }, + { 0x1a00, 0x237b, 0x0000 }, + { 0x1a00, 0x237d, 0x0000 }, + { 0x9a00, 0x2386, 0x4000 }, + { 0x9a00, 0x2382, 0x3000 }, + { 0x9a00, 0x2380, 0x2000 }, + { 0x1a00, 0x237f, 0x0000 }, + { 0x1a00, 0x2381, 0x0000 }, + { 0x9a00, 0x2384, 0x2000 }, + { 0x1a00, 0x2383, 0x0000 }, + { 0x1a00, 0x2385, 0x0000 }, + { 0x9a00, 0x238a, 0x3000 }, + { 0x9a00, 0x2388, 0x2000 }, + { 0x1a00, 0x2387, 0x0000 }, + { 0x1a00, 0x2389, 0x0000 }, + { 0x9a00, 0x238c, 0x2000 }, + { 0x1a00, 0x238b, 0x0000 }, + { 0x1a00, 0x238d, 0x0000 }, + { 0x9900, 0x239e, 0x5000 }, + { 0x9a00, 0x2396, 0x4000 }, + { 0x9a00, 0x2392, 0x3000 }, + { 0x9a00, 0x2390, 0x2000 }, + { 0x1a00, 0x238f, 0x0000 }, + { 0x1a00, 0x2391, 0x0000 }, + { 0x9a00, 0x2394, 0x2000 }, + { 0x1a00, 0x2393, 0x0000 }, + { 0x1a00, 0x2395, 0x0000 }, + { 0x9a00, 0x239a, 0x3000 }, + { 0x9a00, 0x2398, 0x2000 }, + { 0x1a00, 0x2397, 0x0000 }, + { 0x1a00, 0x2399, 0x0000 }, + { 0x9900, 0x239c, 0x2000 }, + { 0x1900, 0x239b, 0x0000 }, + { 0x1900, 0x239d, 0x0000 }, + { 0x9900, 0x23a6, 0x4000 }, + { 0x9900, 0x23a2, 0x3000 }, + { 0x9900, 0x23a0, 0x2000 }, + { 0x1900, 0x239f, 0x0000 }, + { 0x1900, 0x23a1, 0x0000 }, + { 0x9900, 0x23a4, 0x2000 }, + { 0x1900, 0x23a3, 0x0000 }, + { 0x1900, 0x23a5, 0x0000 }, + { 0x9900, 0x23aa, 0x3000 }, + { 0x9900, 0x23a8, 0x2000 }, + { 0x1900, 0x23a7, 0x0000 }, + { 0x1900, 0x23a9, 0x0000 }, + { 0x9900, 0x23ac, 0x2000 }, + { 0x1900, 0x23ab, 0x0000 }, + { 0x1900, 0x23ad, 0x0000 }, + { 0x8f00, 0x248b, 0x8000 }, + { 0x9a00, 0x241d, 0x7000 }, + { 0x9a00, 0x23ce, 0x6000 }, + { 0x9a00, 0x23be, 0x5000 }, + { 0x9500, 0x23b6, 0x4000 }, + { 0x9900, 0x23b2, 0x3000 }, + { 0x9900, 0x23b0, 0x2000 }, + { 0x1900, 0x23af, 0x0000 }, + { 0x1900, 0x23b1, 0x0000 }, + { 0x9600, 0x23b4, 0x2000 }, + { 0x1900, 0x23b3, 0x0000 }, + { 0x1200, 0x23b5, 0x0000 }, + { 0x9a00, 0x23ba, 0x3000 }, + { 0x9a00, 0x23b8, 0x2000 }, + { 0x1a00, 0x23b7, 0x0000 }, + { 0x1a00, 0x23b9, 0x0000 }, + { 0x9a00, 0x23bc, 0x2000 }, + { 0x1a00, 0x23bb, 0x0000 }, + { 0x1a00, 0x23bd, 0x0000 }, + { 0x9a00, 0x23c6, 0x4000 }, + { 0x9a00, 0x23c2, 0x3000 }, + { 0x9a00, 0x23c0, 0x2000 }, + { 0x1a00, 0x23bf, 0x0000 }, + { 0x1a00, 0x23c1, 0x0000 }, + { 0x9a00, 0x23c4, 0x2000 }, + { 0x1a00, 0x23c3, 0x0000 }, + { 0x1a00, 0x23c5, 0x0000 }, + { 0x9a00, 0x23ca, 0x3000 }, + { 0x9a00, 0x23c8, 0x2000 }, + { 0x1a00, 0x23c7, 0x0000 }, + { 0x1a00, 0x23c9, 0x0000 }, + { 0x9a00, 0x23cc, 0x2000 }, + { 0x1a00, 0x23cb, 0x0000 }, + { 0x1a00, 0x23cd, 0x0000 }, + { 0x9a00, 0x240d, 0x5000 }, + { 0x9a00, 0x2405, 0x4000 }, + { 0x9a00, 0x2401, 0x3000 }, + { 0x9a00, 0x23d0, 0x2000 }, + { 0x1a00, 0x23cf, 0x0000 }, + { 0x1a00, 0x2400, 0x0000 }, + { 0x9a00, 0x2403, 0x2000 }, + { 0x1a00, 0x2402, 0x0000 }, + { 0x1a00, 0x2404, 0x0000 }, + { 0x9a00, 0x2409, 0x3000 }, + { 0x9a00, 0x2407, 0x2000 }, + { 0x1a00, 0x2406, 0x0000 }, + { 0x1a00, 0x2408, 0x0000 }, + { 0x9a00, 0x240b, 0x2000 }, + { 0x1a00, 0x240a, 0x0000 }, + { 0x1a00, 0x240c, 0x0000 }, + { 0x9a00, 0x2415, 0x4000 }, + { 0x9a00, 0x2411, 0x3000 }, + { 0x9a00, 0x240f, 0x2000 }, + { 0x1a00, 0x240e, 0x0000 }, + { 0x1a00, 0x2410, 0x0000 }, + { 0x9a00, 0x2413, 0x2000 }, + { 0x1a00, 0x2412, 0x0000 }, + { 0x1a00, 0x2414, 0x0000 }, + { 0x9a00, 0x2419, 0x3000 }, + { 0x9a00, 0x2417, 0x2000 }, + { 0x1a00, 0x2416, 0x0000 }, + { 0x1a00, 0x2418, 0x0000 }, + { 0x9a00, 0x241b, 0x2000 }, + { 0x1a00, 0x241a, 0x0000 }, + { 0x1a00, 0x241c, 0x0000 }, + { 0x8f00, 0x246b, 0x6000 }, + { 0x9a00, 0x2446, 0x5000 }, + { 0x9a00, 0x2425, 0x4000 }, + { 0x9a00, 0x2421, 0x3000 }, + { 0x9a00, 0x241f, 0x2000 }, + { 0x1a00, 0x241e, 0x0000 }, + { 0x1a00, 0x2420, 0x0000 }, + { 0x9a00, 0x2423, 0x2000 }, + { 0x1a00, 0x2422, 0x0000 }, + { 0x1a00, 0x2424, 0x0000 }, + { 0x9a00, 0x2442, 0x3000 }, + { 0x9a00, 0x2440, 0x2000 }, + { 0x1a00, 0x2426, 0x0000 }, + { 0x1a00, 0x2441, 0x0000 }, + { 0x9a00, 0x2444, 0x2000 }, + { 0x1a00, 0x2443, 0x0000 }, + { 0x1a00, 0x2445, 0x0000 }, + { 0x8f00, 0x2463, 0x4000 }, + { 0x9a00, 0x244a, 0x3000 }, + { 0x9a00, 0x2448, 0x2000 }, + { 0x1a00, 0x2447, 0x0000 }, + { 0x1a00, 0x2449, 0x0000 }, + { 0x8f00, 0x2461, 0x2000 }, + { 0x0f00, 0x2460, 0x0000 }, + { 0x0f00, 0x2462, 0x0000 }, + { 0x8f00, 0x2467, 0x3000 }, + { 0x8f00, 0x2465, 0x2000 }, + { 0x0f00, 0x2464, 0x0000 }, + { 0x0f00, 0x2466, 0x0000 }, + { 0x8f00, 0x2469, 0x2000 }, + { 0x0f00, 0x2468, 0x0000 }, + { 0x0f00, 0x246a, 0x0000 }, + { 0x8f00, 0x247b, 0x5000 }, + { 0x8f00, 0x2473, 0x4000 }, + { 0x8f00, 0x246f, 0x3000 }, + { 0x8f00, 0x246d, 0x2000 }, + { 0x0f00, 0x246c, 0x0000 }, + { 0x0f00, 0x246e, 0x0000 }, + { 0x8f00, 0x2471, 0x2000 }, + { 0x0f00, 0x2470, 0x0000 }, + { 0x0f00, 0x2472, 0x0000 }, + { 0x8f00, 0x2477, 0x3000 }, + { 0x8f00, 0x2475, 0x2000 }, + { 0x0f00, 0x2474, 0x0000 }, + { 0x0f00, 0x2476, 0x0000 }, + { 0x8f00, 0x2479, 0x2000 }, + { 0x0f00, 0x2478, 0x0000 }, + { 0x0f00, 0x247a, 0x0000 }, + { 0x8f00, 0x2483, 0x4000 }, + { 0x8f00, 0x247f, 0x3000 }, + { 0x8f00, 0x247d, 0x2000 }, + { 0x0f00, 0x247c, 0x0000 }, + { 0x0f00, 0x247e, 0x0000 }, + { 0x8f00, 0x2481, 0x2000 }, + { 0x0f00, 0x2480, 0x0000 }, + { 0x0f00, 0x2482, 0x0000 }, + { 0x8f00, 0x2487, 0x3000 }, + { 0x8f00, 0x2485, 0x2000 }, + { 0x0f00, 0x2484, 0x0000 }, + { 0x0f00, 0x2486, 0x0000 }, + { 0x8f00, 0x2489, 0x2000 }, + { 0x0f00, 0x2488, 0x0000 }, + { 0x0f00, 0x248a, 0x0000 }, + { 0x9a00, 0x24cb, 0x7000 }, + { 0x9a00, 0x24ab, 0x6000 }, + { 0x8f00, 0x249b, 0x5000 }, + { 0x8f00, 0x2493, 0x4000 }, + { 0x8f00, 0x248f, 0x3000 }, + { 0x8f00, 0x248d, 0x2000 }, + { 0x0f00, 0x248c, 0x0000 }, + { 0x0f00, 0x248e, 0x0000 }, + { 0x8f00, 0x2491, 0x2000 }, + { 0x0f00, 0x2490, 0x0000 }, + { 0x0f00, 0x2492, 0x0000 }, + { 0x8f00, 0x2497, 0x3000 }, + { 0x8f00, 0x2495, 0x2000 }, + { 0x0f00, 0x2494, 0x0000 }, + { 0x0f00, 0x2496, 0x0000 }, + { 0x8f00, 0x2499, 0x2000 }, + { 0x0f00, 0x2498, 0x0000 }, + { 0x0f00, 0x249a, 0x0000 }, + { 0x9a00, 0x24a3, 0x4000 }, + { 0x9a00, 0x249f, 0x3000 }, + { 0x9a00, 0x249d, 0x2000 }, + { 0x1a00, 0x249c, 0x0000 }, + { 0x1a00, 0x249e, 0x0000 }, + { 0x9a00, 0x24a1, 0x2000 }, + { 0x1a00, 0x24a0, 0x0000 }, + { 0x1a00, 0x24a2, 0x0000 }, + { 0x9a00, 0x24a7, 0x3000 }, + { 0x9a00, 0x24a5, 0x2000 }, + { 0x1a00, 0x24a4, 0x0000 }, + { 0x1a00, 0x24a6, 0x0000 }, + { 0x9a00, 0x24a9, 0x2000 }, + { 0x1a00, 0x24a8, 0x0000 }, + { 0x1a00, 0x24aa, 0x0000 }, + { 0x9a00, 0x24bb, 0x5000 }, + { 0x9a00, 0x24b3, 0x4000 }, + { 0x9a00, 0x24af, 0x3000 }, + { 0x9a00, 0x24ad, 0x2000 }, + { 0x1a00, 0x24ac, 0x0000 }, + { 0x1a00, 0x24ae, 0x0000 }, + { 0x9a00, 0x24b1, 0x2000 }, + { 0x1a00, 0x24b0, 0x0000 }, + { 0x1a00, 0x24b2, 0x0000 }, + { 0x9a00, 0x24b7, 0x3000 }, + { 0x9a00, 0x24b5, 0x2000 }, + { 0x1a00, 0x24b4, 0x0000 }, + { 0x1a00, 0x24b6, 0x0000 }, + { 0x9a00, 0x24b9, 0x2000 }, + { 0x1a00, 0x24b8, 0x0000 }, + { 0x1a00, 0x24ba, 0x0000 }, + { 0x9a00, 0x24c3, 0x4000 }, + { 0x9a00, 0x24bf, 0x3000 }, + { 0x9a00, 0x24bd, 0x2000 }, + { 0x1a00, 0x24bc, 0x0000 }, + { 0x1a00, 0x24be, 0x0000 }, + { 0x9a00, 0x24c1, 0x2000 }, + { 0x1a00, 0x24c0, 0x0000 }, + { 0x1a00, 0x24c2, 0x0000 }, + { 0x9a00, 0x24c7, 0x3000 }, + { 0x9a00, 0x24c5, 0x2000 }, + { 0x1a00, 0x24c4, 0x0000 }, + { 0x1a00, 0x24c6, 0x0000 }, + { 0x9a00, 0x24c9, 0x2000 }, + { 0x1a00, 0x24c8, 0x0000 }, + { 0x1a00, 0x24ca, 0x0000 }, + { 0x8f00, 0x24eb, 0x6000 }, + { 0x9a00, 0x24db, 0x5000 }, + { 0x9a00, 0x24d3, 0x4000 }, + { 0x9a00, 0x24cf, 0x3000 }, + { 0x9a00, 0x24cd, 0x2000 }, + { 0x1a00, 0x24cc, 0x0000 }, + { 0x1a00, 0x24ce, 0x0000 }, + { 0x9a00, 0x24d1, 0x2000 }, + { 0x1a00, 0x24d0, 0x0000 }, + { 0x1a00, 0x24d2, 0x0000 }, + { 0x9a00, 0x24d7, 0x3000 }, + { 0x9a00, 0x24d5, 0x2000 }, + { 0x1a00, 0x24d4, 0x0000 }, + { 0x1a00, 0x24d6, 0x0000 }, + { 0x9a00, 0x24d9, 0x2000 }, + { 0x1a00, 0x24d8, 0x0000 }, + { 0x1a00, 0x24da, 0x0000 }, + { 0x9a00, 0x24e3, 0x4000 }, + { 0x9a00, 0x24df, 0x3000 }, + { 0x9a00, 0x24dd, 0x2000 }, + { 0x1a00, 0x24dc, 0x0000 }, + { 0x1a00, 0x24de, 0x0000 }, + { 0x9a00, 0x24e1, 0x2000 }, + { 0x1a00, 0x24e0, 0x0000 }, + { 0x1a00, 0x24e2, 0x0000 }, + { 0x9a00, 0x24e7, 0x3000 }, + { 0x9a00, 0x24e5, 0x2000 }, + { 0x1a00, 0x24e4, 0x0000 }, + { 0x1a00, 0x24e6, 0x0000 }, + { 0x9a00, 0x24e9, 0x2000 }, + { 0x1a00, 0x24e8, 0x0000 }, + { 0x0f00, 0x24ea, 0x0000 }, + { 0x8f00, 0x24fb, 0x5000 }, + { 0x8f00, 0x24f3, 0x4000 }, + { 0x8f00, 0x24ef, 0x3000 }, + { 0x8f00, 0x24ed, 0x2000 }, + { 0x0f00, 0x24ec, 0x0000 }, + { 0x0f00, 0x24ee, 0x0000 }, + { 0x8f00, 0x24f1, 0x2000 }, + { 0x0f00, 0x24f0, 0x0000 }, + { 0x0f00, 0x24f2, 0x0000 }, + { 0x8f00, 0x24f7, 0x3000 }, + { 0x8f00, 0x24f5, 0x2000 }, + { 0x0f00, 0x24f4, 0x0000 }, + { 0x0f00, 0x24f6, 0x0000 }, + { 0x8f00, 0x24f9, 0x2000 }, + { 0x0f00, 0x24f8, 0x0000 }, + { 0x0f00, 0x24fa, 0x0000 }, + { 0x9a00, 0x2503, 0x4000 }, + { 0x8f00, 0x24ff, 0x3000 }, + { 0x8f00, 0x24fd, 0x2000 }, + { 0x0f00, 0x24fc, 0x0000 }, + { 0x0f00, 0x24fe, 0x0000 }, + { 0x9a00, 0x2501, 0x2000 }, + { 0x1a00, 0x2500, 0x0000 }, + { 0x1a00, 0x2502, 0x0000 }, + { 0x9a00, 0x2507, 0x3000 }, + { 0x9a00, 0x2505, 0x2000 }, + { 0x1a00, 0x2504, 0x0000 }, + { 0x1a00, 0x2506, 0x0000 }, + { 0x9a00, 0x2509, 0x2000 }, + { 0x1a00, 0x2508, 0x0000 }, + { 0x1a00, 0x250a, 0x0000 }, + { 0x9a00, 0x260b, 0x9000 }, + { 0x9a00, 0x258b, 0x8000 }, + { 0x9a00, 0x254b, 0x7000 }, + { 0x9a00, 0x252b, 0x6000 }, + { 0x9a00, 0x251b, 0x5000 }, + { 0x9a00, 0x2513, 0x4000 }, + { 0x9a00, 0x250f, 0x3000 }, + { 0x9a00, 0x250d, 0x2000 }, + { 0x1a00, 0x250c, 0x0000 }, + { 0x1a00, 0x250e, 0x0000 }, + { 0x9a00, 0x2511, 0x2000 }, + { 0x1a00, 0x2510, 0x0000 }, + { 0x1a00, 0x2512, 0x0000 }, + { 0x9a00, 0x2517, 0x3000 }, + { 0x9a00, 0x2515, 0x2000 }, + { 0x1a00, 0x2514, 0x0000 }, + { 0x1a00, 0x2516, 0x0000 }, + { 0x9a00, 0x2519, 0x2000 }, + { 0x1a00, 0x2518, 0x0000 }, + { 0x1a00, 0x251a, 0x0000 }, + { 0x9a00, 0x2523, 0x4000 }, + { 0x9a00, 0x251f, 0x3000 }, + { 0x9a00, 0x251d, 0x2000 }, + { 0x1a00, 0x251c, 0x0000 }, + { 0x1a00, 0x251e, 0x0000 }, + { 0x9a00, 0x2521, 0x2000 }, + { 0x1a00, 0x2520, 0x0000 }, + { 0x1a00, 0x2522, 0x0000 }, + { 0x9a00, 0x2527, 0x3000 }, + { 0x9a00, 0x2525, 0x2000 }, + { 0x1a00, 0x2524, 0x0000 }, + { 0x1a00, 0x2526, 0x0000 }, + { 0x9a00, 0x2529, 0x2000 }, + { 0x1a00, 0x2528, 0x0000 }, + { 0x1a00, 0x252a, 0x0000 }, + { 0x9a00, 0x253b, 0x5000 }, + { 0x9a00, 0x2533, 0x4000 }, + { 0x9a00, 0x252f, 0x3000 }, + { 0x9a00, 0x252d, 0x2000 }, + { 0x1a00, 0x252c, 0x0000 }, + { 0x1a00, 0x252e, 0x0000 }, + { 0x9a00, 0x2531, 0x2000 }, + { 0x1a00, 0x2530, 0x0000 }, + { 0x1a00, 0x2532, 0x0000 }, + { 0x9a00, 0x2537, 0x3000 }, + { 0x9a00, 0x2535, 0x2000 }, + { 0x1a00, 0x2534, 0x0000 }, + { 0x1a00, 0x2536, 0x0000 }, + { 0x9a00, 0x2539, 0x2000 }, + { 0x1a00, 0x2538, 0x0000 }, + { 0x1a00, 0x253a, 0x0000 }, + { 0x9a00, 0x2543, 0x4000 }, + { 0x9a00, 0x253f, 0x3000 }, + { 0x9a00, 0x253d, 0x2000 }, + { 0x1a00, 0x253c, 0x0000 }, + { 0x1a00, 0x253e, 0x0000 }, + { 0x9a00, 0x2541, 0x2000 }, + { 0x1a00, 0x2540, 0x0000 }, + { 0x1a00, 0x2542, 0x0000 }, + { 0x9a00, 0x2547, 0x3000 }, + { 0x9a00, 0x2545, 0x2000 }, + { 0x1a00, 0x2544, 0x0000 }, + { 0x1a00, 0x2546, 0x0000 }, + { 0x9a00, 0x2549, 0x2000 }, + { 0x1a00, 0x2548, 0x0000 }, + { 0x1a00, 0x254a, 0x0000 }, + { 0x9a00, 0x256b, 0x6000 }, + { 0x9a00, 0x255b, 0x5000 }, + { 0x9a00, 0x2553, 0x4000 }, + { 0x9a00, 0x254f, 0x3000 }, + { 0x9a00, 0x254d, 0x2000 }, + { 0x1a00, 0x254c, 0x0000 }, + { 0x1a00, 0x254e, 0x0000 }, + { 0x9a00, 0x2551, 0x2000 }, + { 0x1a00, 0x2550, 0x0000 }, + { 0x1a00, 0x2552, 0x0000 }, + { 0x9a00, 0x2557, 0x3000 }, + { 0x9a00, 0x2555, 0x2000 }, + { 0x1a00, 0x2554, 0x0000 }, + { 0x1a00, 0x2556, 0x0000 }, + { 0x9a00, 0x2559, 0x2000 }, + { 0x1a00, 0x2558, 0x0000 }, + { 0x1a00, 0x255a, 0x0000 }, + { 0x9a00, 0x2563, 0x4000 }, + { 0x9a00, 0x255f, 0x3000 }, + { 0x9a00, 0x255d, 0x2000 }, + { 0x1a00, 0x255c, 0x0000 }, + { 0x1a00, 0x255e, 0x0000 }, + { 0x9a00, 0x2561, 0x2000 }, + { 0x1a00, 0x2560, 0x0000 }, + { 0x1a00, 0x2562, 0x0000 }, + { 0x9a00, 0x2567, 0x3000 }, + { 0x9a00, 0x2565, 0x2000 }, + { 0x1a00, 0x2564, 0x0000 }, + { 0x1a00, 0x2566, 0x0000 }, + { 0x9a00, 0x2569, 0x2000 }, + { 0x1a00, 0x2568, 0x0000 }, + { 0x1a00, 0x256a, 0x0000 }, + { 0x9a00, 0x257b, 0x5000 }, + { 0x9a00, 0x2573, 0x4000 }, + { 0x9a00, 0x256f, 0x3000 }, + { 0x9a00, 0x256d, 0x2000 }, + { 0x1a00, 0x256c, 0x0000 }, + { 0x1a00, 0x256e, 0x0000 }, + { 0x9a00, 0x2571, 0x2000 }, + { 0x1a00, 0x2570, 0x0000 }, + { 0x1a00, 0x2572, 0x0000 }, + { 0x9a00, 0x2577, 0x3000 }, + { 0x9a00, 0x2575, 0x2000 }, + { 0x1a00, 0x2574, 0x0000 }, + { 0x1a00, 0x2576, 0x0000 }, + { 0x9a00, 0x2579, 0x2000 }, + { 0x1a00, 0x2578, 0x0000 }, + { 0x1a00, 0x257a, 0x0000 }, + { 0x9a00, 0x2583, 0x4000 }, + { 0x9a00, 0x257f, 0x3000 }, + { 0x9a00, 0x257d, 0x2000 }, + { 0x1a00, 0x257c, 0x0000 }, + { 0x1a00, 0x257e, 0x0000 }, + { 0x9a00, 0x2581, 0x2000 }, + { 0x1a00, 0x2580, 0x0000 }, + { 0x1a00, 0x2582, 0x0000 }, + { 0x9a00, 0x2587, 0x3000 }, + { 0x9a00, 0x2585, 0x2000 }, + { 0x1a00, 0x2584, 0x0000 }, + { 0x1a00, 0x2586, 0x0000 }, + { 0x9a00, 0x2589, 0x2000 }, + { 0x1a00, 0x2588, 0x0000 }, + { 0x1a00, 0x258a, 0x0000 }, + { 0x9a00, 0x25cb, 0x7000 }, + { 0x9a00, 0x25ab, 0x6000 }, + { 0x9a00, 0x259b, 0x5000 }, + { 0x9a00, 0x2593, 0x4000 }, + { 0x9a00, 0x258f, 0x3000 }, + { 0x9a00, 0x258d, 0x2000 }, + { 0x1a00, 0x258c, 0x0000 }, + { 0x1a00, 0x258e, 0x0000 }, + { 0x9a00, 0x2591, 0x2000 }, + { 0x1a00, 0x2590, 0x0000 }, + { 0x1a00, 0x2592, 0x0000 }, + { 0x9a00, 0x2597, 0x3000 }, + { 0x9a00, 0x2595, 0x2000 }, + { 0x1a00, 0x2594, 0x0000 }, + { 0x1a00, 0x2596, 0x0000 }, + { 0x9a00, 0x2599, 0x2000 }, + { 0x1a00, 0x2598, 0x0000 }, + { 0x1a00, 0x259a, 0x0000 }, + { 0x9a00, 0x25a3, 0x4000 }, + { 0x9a00, 0x259f, 0x3000 }, + { 0x9a00, 0x259d, 0x2000 }, + { 0x1a00, 0x259c, 0x0000 }, + { 0x1a00, 0x259e, 0x0000 }, + { 0x9a00, 0x25a1, 0x2000 }, + { 0x1a00, 0x25a0, 0x0000 }, + { 0x1a00, 0x25a2, 0x0000 }, + { 0x9a00, 0x25a7, 0x3000 }, + { 0x9a00, 0x25a5, 0x2000 }, + { 0x1a00, 0x25a4, 0x0000 }, + { 0x1a00, 0x25a6, 0x0000 }, + { 0x9a00, 0x25a9, 0x2000 }, + { 0x1a00, 0x25a8, 0x0000 }, + { 0x1a00, 0x25aa, 0x0000 }, + { 0x9a00, 0x25bb, 0x5000 }, + { 0x9a00, 0x25b3, 0x4000 }, + { 0x9a00, 0x25af, 0x3000 }, + { 0x9a00, 0x25ad, 0x2000 }, + { 0x1a00, 0x25ac, 0x0000 }, + { 0x1a00, 0x25ae, 0x0000 }, + { 0x9a00, 0x25b1, 0x2000 }, + { 0x1a00, 0x25b0, 0x0000 }, + { 0x1a00, 0x25b2, 0x0000 }, + { 0x9900, 0x25b7, 0x3000 }, + { 0x9a00, 0x25b5, 0x2000 }, + { 0x1a00, 0x25b4, 0x0000 }, + { 0x1a00, 0x25b6, 0x0000 }, + { 0x9a00, 0x25b9, 0x2000 }, + { 0x1a00, 0x25b8, 0x0000 }, + { 0x1a00, 0x25ba, 0x0000 }, + { 0x9a00, 0x25c3, 0x4000 }, + { 0x9a00, 0x25bf, 0x3000 }, + { 0x9a00, 0x25bd, 0x2000 }, + { 0x1a00, 0x25bc, 0x0000 }, + { 0x1a00, 0x25be, 0x0000 }, + { 0x9900, 0x25c1, 0x2000 }, + { 0x1a00, 0x25c0, 0x0000 }, + { 0x1a00, 0x25c2, 0x0000 }, + { 0x9a00, 0x25c7, 0x3000 }, + { 0x9a00, 0x25c5, 0x2000 }, + { 0x1a00, 0x25c4, 0x0000 }, + { 0x1a00, 0x25c6, 0x0000 }, + { 0x9a00, 0x25c9, 0x2000 }, + { 0x1a00, 0x25c8, 0x0000 }, + { 0x1a00, 0x25ca, 0x0000 }, + { 0x9a00, 0x25eb, 0x6000 }, + { 0x9a00, 0x25db, 0x5000 }, + { 0x9a00, 0x25d3, 0x4000 }, + { 0x9a00, 0x25cf, 0x3000 }, + { 0x9a00, 0x25cd, 0x2000 }, + { 0x1a00, 0x25cc, 0x0000 }, + { 0x1a00, 0x25ce, 0x0000 }, + { 0x9a00, 0x25d1, 0x2000 }, + { 0x1a00, 0x25d0, 0x0000 }, + { 0x1a00, 0x25d2, 0x0000 }, + { 0x9a00, 0x25d7, 0x3000 }, + { 0x9a00, 0x25d5, 0x2000 }, + { 0x1a00, 0x25d4, 0x0000 }, + { 0x1a00, 0x25d6, 0x0000 }, + { 0x9a00, 0x25d9, 0x2000 }, + { 0x1a00, 0x25d8, 0x0000 }, + { 0x1a00, 0x25da, 0x0000 }, + { 0x9a00, 0x25e3, 0x4000 }, + { 0x9a00, 0x25df, 0x3000 }, + { 0x9a00, 0x25dd, 0x2000 }, + { 0x1a00, 0x25dc, 0x0000 }, + { 0x1a00, 0x25de, 0x0000 }, + { 0x9a00, 0x25e1, 0x2000 }, + { 0x1a00, 0x25e0, 0x0000 }, + { 0x1a00, 0x25e2, 0x0000 }, + { 0x9a00, 0x25e7, 0x3000 }, + { 0x9a00, 0x25e5, 0x2000 }, + { 0x1a00, 0x25e4, 0x0000 }, + { 0x1a00, 0x25e6, 0x0000 }, + { 0x9a00, 0x25e9, 0x2000 }, + { 0x1a00, 0x25e8, 0x0000 }, + { 0x1a00, 0x25ea, 0x0000 }, + { 0x9900, 0x25fb, 0x5000 }, + { 0x9a00, 0x25f3, 0x4000 }, + { 0x9a00, 0x25ef, 0x3000 }, + { 0x9a00, 0x25ed, 0x2000 }, + { 0x1a00, 0x25ec, 0x0000 }, + { 0x1a00, 0x25ee, 0x0000 }, + { 0x9a00, 0x25f1, 0x2000 }, + { 0x1a00, 0x25f0, 0x0000 }, + { 0x1a00, 0x25f2, 0x0000 }, + { 0x9a00, 0x25f7, 0x3000 }, + { 0x9a00, 0x25f5, 0x2000 }, + { 0x1a00, 0x25f4, 0x0000 }, + { 0x1a00, 0x25f6, 0x0000 }, + { 0x9900, 0x25f9, 0x2000 }, + { 0x1900, 0x25f8, 0x0000 }, + { 0x1900, 0x25fa, 0x0000 }, + { 0x9a00, 0x2603, 0x4000 }, + { 0x9900, 0x25ff, 0x3000 }, + { 0x9900, 0x25fd, 0x2000 }, + { 0x1900, 0x25fc, 0x0000 }, + { 0x1900, 0x25fe, 0x0000 }, + { 0x9a00, 0x2601, 0x2000 }, + { 0x1a00, 0x2600, 0x0000 }, + { 0x1a00, 0x2602, 0x0000 }, + { 0x9a00, 0x2607, 0x3000 }, + { 0x9a00, 0x2605, 0x2000 }, + { 0x1a00, 0x2604, 0x0000 }, + { 0x1a00, 0x2606, 0x0000 }, + { 0x9a00, 0x2609, 0x2000 }, + { 0x1a00, 0x2608, 0x0000 }, + { 0x1a00, 0x260a, 0x0000 }, + { 0x9a00, 0x268e, 0x8000 }, + { 0x9a00, 0x264c, 0x7000 }, + { 0x9a00, 0x262c, 0x6000 }, + { 0x9a00, 0x261c, 0x5000 }, + { 0x9a00, 0x2613, 0x4000 }, + { 0x9a00, 0x260f, 0x3000 }, + { 0x9a00, 0x260d, 0x2000 }, + { 0x1a00, 0x260c, 0x0000 }, + { 0x1a00, 0x260e, 0x0000 }, + { 0x9a00, 0x2611, 0x2000 }, + { 0x1a00, 0x2610, 0x0000 }, + { 0x1a00, 0x2612, 0x0000 }, + { 0x9a00, 0x2617, 0x3000 }, + { 0x9a00, 0x2615, 0x2000 }, + { 0x1a00, 0x2614, 0x0000 }, + { 0x1a00, 0x2616, 0x0000 }, + { 0x9a00, 0x261a, 0x2000 }, + { 0x1a00, 0x2619, 0x0000 }, + { 0x1a00, 0x261b, 0x0000 }, + { 0x9a00, 0x2624, 0x4000 }, + { 0x9a00, 0x2620, 0x3000 }, + { 0x9a00, 0x261e, 0x2000 }, + { 0x1a00, 0x261d, 0x0000 }, + { 0x1a00, 0x261f, 0x0000 }, + { 0x9a00, 0x2622, 0x2000 }, + { 0x1a00, 0x2621, 0x0000 }, + { 0x1a00, 0x2623, 0x0000 }, + { 0x9a00, 0x2628, 0x3000 }, + { 0x9a00, 0x2626, 0x2000 }, + { 0x1a00, 0x2625, 0x0000 }, + { 0x1a00, 0x2627, 0x0000 }, + { 0x9a00, 0x262a, 0x2000 }, + { 0x1a00, 0x2629, 0x0000 }, + { 0x1a00, 0x262b, 0x0000 }, + { 0x9a00, 0x263c, 0x5000 }, + { 0x9a00, 0x2634, 0x4000 }, + { 0x9a00, 0x2630, 0x3000 }, + { 0x9a00, 0x262e, 0x2000 }, + { 0x1a00, 0x262d, 0x0000 }, + { 0x1a00, 0x262f, 0x0000 }, + { 0x9a00, 0x2632, 0x2000 }, + { 0x1a00, 0x2631, 0x0000 }, + { 0x1a00, 0x2633, 0x0000 }, + { 0x9a00, 0x2638, 0x3000 }, + { 0x9a00, 0x2636, 0x2000 }, + { 0x1a00, 0x2635, 0x0000 }, + { 0x1a00, 0x2637, 0x0000 }, + { 0x9a00, 0x263a, 0x2000 }, + { 0x1a00, 0x2639, 0x0000 }, + { 0x1a00, 0x263b, 0x0000 }, + { 0x9a00, 0x2644, 0x4000 }, + { 0x9a00, 0x2640, 0x3000 }, + { 0x9a00, 0x263e, 0x2000 }, + { 0x1a00, 0x263d, 0x0000 }, + { 0x1a00, 0x263f, 0x0000 }, + { 0x9a00, 0x2642, 0x2000 }, + { 0x1a00, 0x2641, 0x0000 }, + { 0x1a00, 0x2643, 0x0000 }, + { 0x9a00, 0x2648, 0x3000 }, + { 0x9a00, 0x2646, 0x2000 }, + { 0x1a00, 0x2645, 0x0000 }, + { 0x1a00, 0x2647, 0x0000 }, + { 0x9a00, 0x264a, 0x2000 }, + { 0x1a00, 0x2649, 0x0000 }, + { 0x1a00, 0x264b, 0x0000 }, + { 0x9a00, 0x266c, 0x6000 }, + { 0x9a00, 0x265c, 0x5000 }, + { 0x9a00, 0x2654, 0x4000 }, + { 0x9a00, 0x2650, 0x3000 }, + { 0x9a00, 0x264e, 0x2000 }, + { 0x1a00, 0x264d, 0x0000 }, + { 0x1a00, 0x264f, 0x0000 }, + { 0x9a00, 0x2652, 0x2000 }, + { 0x1a00, 0x2651, 0x0000 }, + { 0x1a00, 0x2653, 0x0000 }, + { 0x9a00, 0x2658, 0x3000 }, + { 0x9a00, 0x2656, 0x2000 }, + { 0x1a00, 0x2655, 0x0000 }, + { 0x1a00, 0x2657, 0x0000 }, + { 0x9a00, 0x265a, 0x2000 }, + { 0x1a00, 0x2659, 0x0000 }, + { 0x1a00, 0x265b, 0x0000 }, + { 0x9a00, 0x2664, 0x4000 }, + { 0x9a00, 0x2660, 0x3000 }, + { 0x9a00, 0x265e, 0x2000 }, + { 0x1a00, 0x265d, 0x0000 }, + { 0x1a00, 0x265f, 0x0000 }, + { 0x9a00, 0x2662, 0x2000 }, + { 0x1a00, 0x2661, 0x0000 }, + { 0x1a00, 0x2663, 0x0000 }, + { 0x9a00, 0x2668, 0x3000 }, + { 0x9a00, 0x2666, 0x2000 }, + { 0x1a00, 0x2665, 0x0000 }, + { 0x1a00, 0x2667, 0x0000 }, + { 0x9a00, 0x266a, 0x2000 }, + { 0x1a00, 0x2669, 0x0000 }, + { 0x1a00, 0x266b, 0x0000 }, + { 0x9a00, 0x267c, 0x5000 }, + { 0x9a00, 0x2674, 0x4000 }, + { 0x9a00, 0x2670, 0x3000 }, + { 0x9a00, 0x266e, 0x2000 }, + { 0x1a00, 0x266d, 0x0000 }, + { 0x1900, 0x266f, 0x0000 }, + { 0x9a00, 0x2672, 0x2000 }, + { 0x1a00, 0x2671, 0x0000 }, + { 0x1a00, 0x2673, 0x0000 }, + { 0x9a00, 0x2678, 0x3000 }, + { 0x9a00, 0x2676, 0x2000 }, + { 0x1a00, 0x2675, 0x0000 }, + { 0x1a00, 0x2677, 0x0000 }, + { 0x9a00, 0x267a, 0x2000 }, + { 0x1a00, 0x2679, 0x0000 }, + { 0x1a00, 0x267b, 0x0000 }, + { 0x9a00, 0x2686, 0x4000 }, + { 0x9a00, 0x2682, 0x3000 }, + { 0x9a00, 0x2680, 0x2000 }, + { 0x1a00, 0x267d, 0x0000 }, + { 0x1a00, 0x2681, 0x0000 }, + { 0x9a00, 0x2684, 0x2000 }, + { 0x1a00, 0x2683, 0x0000 }, + { 0x1a00, 0x2685, 0x0000 }, + { 0x9a00, 0x268a, 0x3000 }, + { 0x9a00, 0x2688, 0x2000 }, + { 0x1a00, 0x2687, 0x0000 }, + { 0x1a00, 0x2689, 0x0000 }, + { 0x9a00, 0x268c, 0x2000 }, + { 0x1a00, 0x268b, 0x0000 }, + { 0x1a00, 0x268d, 0x0000 }, + { 0x9a00, 0x273f, 0x7000 }, + { 0x9a00, 0x271e, 0x6000 }, + { 0x9a00, 0x270e, 0x5000 }, + { 0x9a00, 0x2703, 0x4000 }, + { 0x9a00, 0x26a0, 0x3000 }, + { 0x9a00, 0x2690, 0x2000 }, + { 0x1a00, 0x268f, 0x0000 }, + { 0x1a00, 0x2691, 0x0000 }, + { 0x9a00, 0x2701, 0x2000 }, + { 0x1a00, 0x26a1, 0x0000 }, + { 0x1a00, 0x2702, 0x0000 }, + { 0x9a00, 0x2708, 0x3000 }, + { 0x9a00, 0x2706, 0x2000 }, + { 0x1a00, 0x2704, 0x0000 }, + { 0x1a00, 0x2707, 0x0000 }, + { 0x9a00, 0x270c, 0x2000 }, + { 0x1a00, 0x2709, 0x0000 }, + { 0x1a00, 0x270d, 0x0000 }, + { 0x9a00, 0x2716, 0x4000 }, + { 0x9a00, 0x2712, 0x3000 }, + { 0x9a00, 0x2710, 0x2000 }, + { 0x1a00, 0x270f, 0x0000 }, + { 0x1a00, 0x2711, 0x0000 }, + { 0x9a00, 0x2714, 0x2000 }, + { 0x1a00, 0x2713, 0x0000 }, + { 0x1a00, 0x2715, 0x0000 }, + { 0x9a00, 0x271a, 0x3000 }, + { 0x9a00, 0x2718, 0x2000 }, + { 0x1a00, 0x2717, 0x0000 }, + { 0x1a00, 0x2719, 0x0000 }, + { 0x9a00, 0x271c, 0x2000 }, + { 0x1a00, 0x271b, 0x0000 }, + { 0x1a00, 0x271d, 0x0000 }, + { 0x9a00, 0x272f, 0x5000 }, + { 0x9a00, 0x2726, 0x4000 }, + { 0x9a00, 0x2722, 0x3000 }, + { 0x9a00, 0x2720, 0x2000 }, + { 0x1a00, 0x271f, 0x0000 }, + { 0x1a00, 0x2721, 0x0000 }, + { 0x9a00, 0x2724, 0x2000 }, + { 0x1a00, 0x2723, 0x0000 }, + { 0x1a00, 0x2725, 0x0000 }, + { 0x9a00, 0x272b, 0x3000 }, + { 0x9a00, 0x2729, 0x2000 }, + { 0x1a00, 0x2727, 0x0000 }, + { 0x1a00, 0x272a, 0x0000 }, + { 0x9a00, 0x272d, 0x2000 }, + { 0x1a00, 0x272c, 0x0000 }, + { 0x1a00, 0x272e, 0x0000 }, + { 0x9a00, 0x2737, 0x4000 }, + { 0x9a00, 0x2733, 0x3000 }, + { 0x9a00, 0x2731, 0x2000 }, + { 0x1a00, 0x2730, 0x0000 }, + { 0x1a00, 0x2732, 0x0000 }, + { 0x9a00, 0x2735, 0x2000 }, + { 0x1a00, 0x2734, 0x0000 }, + { 0x1a00, 0x2736, 0x0000 }, + { 0x9a00, 0x273b, 0x3000 }, + { 0x9a00, 0x2739, 0x2000 }, + { 0x1a00, 0x2738, 0x0000 }, + { 0x1a00, 0x273a, 0x0000 }, + { 0x9a00, 0x273d, 0x2000 }, + { 0x1a00, 0x273c, 0x0000 }, + { 0x1a00, 0x273e, 0x0000 }, + { 0x9a00, 0x2767, 0x6000 }, + { 0x9a00, 0x2751, 0x5000 }, + { 0x9a00, 0x2747, 0x4000 }, + { 0x9a00, 0x2743, 0x3000 }, + { 0x9a00, 0x2741, 0x2000 }, + { 0x1a00, 0x2740, 0x0000 }, + { 0x1a00, 0x2742, 0x0000 }, + { 0x9a00, 0x2745, 0x2000 }, + { 0x1a00, 0x2744, 0x0000 }, + { 0x1a00, 0x2746, 0x0000 }, + { 0x9a00, 0x274b, 0x3000 }, + { 0x9a00, 0x2749, 0x2000 }, + { 0x1a00, 0x2748, 0x0000 }, + { 0x1a00, 0x274a, 0x0000 }, + { 0x9a00, 0x274f, 0x2000 }, + { 0x1a00, 0x274d, 0x0000 }, + { 0x1a00, 0x2750, 0x0000 }, + { 0x9a00, 0x275d, 0x4000 }, + { 0x9a00, 0x2759, 0x3000 }, + { 0x9a00, 0x2756, 0x2000 }, + { 0x1a00, 0x2752, 0x0000 }, + { 0x1a00, 0x2758, 0x0000 }, + { 0x9a00, 0x275b, 0x2000 }, + { 0x1a00, 0x275a, 0x0000 }, + { 0x1a00, 0x275c, 0x0000 }, + { 0x9a00, 0x2763, 0x3000 }, + { 0x9a00, 0x2761, 0x2000 }, + { 0x1a00, 0x275e, 0x0000 }, + { 0x1a00, 0x2762, 0x0000 }, + { 0x9a00, 0x2765, 0x2000 }, + { 0x1a00, 0x2764, 0x0000 }, + { 0x1a00, 0x2766, 0x0000 }, + { 0x8f00, 0x2777, 0x5000 }, + { 0x9200, 0x276f, 0x4000 }, + { 0x9200, 0x276b, 0x3000 }, + { 0x9200, 0x2769, 0x2000 }, + { 0x1600, 0x2768, 0x0000 }, + { 0x1600, 0x276a, 0x0000 }, + { 0x9200, 0x276d, 0x2000 }, + { 0x1600, 0x276c, 0x0000 }, + { 0x1600, 0x276e, 0x0000 }, + { 0x9200, 0x2773, 0x3000 }, + { 0x9200, 0x2771, 0x2000 }, + { 0x1600, 0x2770, 0x0000 }, + { 0x1600, 0x2772, 0x0000 }, + { 0x9200, 0x2775, 0x2000 }, + { 0x1600, 0x2774, 0x0000 }, + { 0x0f00, 0x2776, 0x0000 }, + { 0x8f00, 0x277f, 0x4000 }, + { 0x8f00, 0x277b, 0x3000 }, + { 0x8f00, 0x2779, 0x2000 }, + { 0x0f00, 0x2778, 0x0000 }, + { 0x0f00, 0x277a, 0x0000 }, + { 0x8f00, 0x277d, 0x2000 }, + { 0x0f00, 0x277c, 0x0000 }, + { 0x0f00, 0x277e, 0x0000 }, + { 0x8f00, 0x2783, 0x3000 }, + { 0x8f00, 0x2781, 0x2000 }, + { 0x0f00, 0x2780, 0x0000 }, + { 0x0f00, 0x2782, 0x0000 }, + { 0x8f00, 0x2785, 0x2000 }, + { 0x0f00, 0x2784, 0x0000 }, + { 0x0f00, 0x2786, 0x0000 }, + { 0x9900, 0x29a0, 0xa000 }, + { 0x9a00, 0x28a0, 0x9000 }, + { 0x9a00, 0x2820, 0x8000 }, + { 0x9900, 0x27dc, 0x7000 }, + { 0x9a00, 0x27aa, 0x6000 }, + { 0x9a00, 0x279a, 0x5000 }, + { 0x8f00, 0x278f, 0x4000 }, + { 0x8f00, 0x278b, 0x3000 }, + { 0x8f00, 0x2789, 0x2000 }, + { 0x0f00, 0x2788, 0x0000 }, + { 0x0f00, 0x278a, 0x0000 }, + { 0x8f00, 0x278d, 0x2000 }, + { 0x0f00, 0x278c, 0x0000 }, + { 0x0f00, 0x278e, 0x0000 }, + { 0x8f00, 0x2793, 0x3000 }, + { 0x8f00, 0x2791, 0x2000 }, + { 0x0f00, 0x2790, 0x0000 }, + { 0x0f00, 0x2792, 0x0000 }, + { 0x9a00, 0x2798, 0x2000 }, + { 0x1a00, 0x2794, 0x0000 }, + { 0x1a00, 0x2799, 0x0000 }, + { 0x9a00, 0x27a2, 0x4000 }, + { 0x9a00, 0x279e, 0x3000 }, + { 0x9a00, 0x279c, 0x2000 }, + { 0x1a00, 0x279b, 0x0000 }, + { 0x1a00, 0x279d, 0x0000 }, + { 0x9a00, 0x27a0, 0x2000 }, + { 0x1a00, 0x279f, 0x0000 }, + { 0x1a00, 0x27a1, 0x0000 }, + { 0x9a00, 0x27a6, 0x3000 }, + { 0x9a00, 0x27a4, 0x2000 }, + { 0x1a00, 0x27a3, 0x0000 }, + { 0x1a00, 0x27a5, 0x0000 }, + { 0x9a00, 0x27a8, 0x2000 }, + { 0x1a00, 0x27a7, 0x0000 }, + { 0x1a00, 0x27a9, 0x0000 }, + { 0x9a00, 0x27bb, 0x5000 }, + { 0x9a00, 0x27b3, 0x4000 }, + { 0x9a00, 0x27ae, 0x3000 }, + { 0x9a00, 0x27ac, 0x2000 }, + { 0x1a00, 0x27ab, 0x0000 }, + { 0x1a00, 0x27ad, 0x0000 }, + { 0x9a00, 0x27b1, 0x2000 }, + { 0x1a00, 0x27af, 0x0000 }, + { 0x1a00, 0x27b2, 0x0000 }, + { 0x9a00, 0x27b7, 0x3000 }, + { 0x9a00, 0x27b5, 0x2000 }, + { 0x1a00, 0x27b4, 0x0000 }, + { 0x1a00, 0x27b6, 0x0000 }, + { 0x9a00, 0x27b9, 0x2000 }, + { 0x1a00, 0x27b8, 0x0000 }, + { 0x1a00, 0x27ba, 0x0000 }, + { 0x9900, 0x27d4, 0x4000 }, + { 0x9900, 0x27d0, 0x3000 }, + { 0x9a00, 0x27bd, 0x2000 }, + { 0x1a00, 0x27bc, 0x0000 }, + { 0x1a00, 0x27be, 0x0000 }, + { 0x9900, 0x27d2, 0x2000 }, + { 0x1900, 0x27d1, 0x0000 }, + { 0x1900, 0x27d3, 0x0000 }, + { 0x9900, 0x27d8, 0x3000 }, + { 0x9900, 0x27d6, 0x2000 }, + { 0x1900, 0x27d5, 0x0000 }, + { 0x1900, 0x27d7, 0x0000 }, + { 0x9900, 0x27da, 0x2000 }, + { 0x1900, 0x27d9, 0x0000 }, + { 0x1900, 0x27db, 0x0000 }, + { 0x9a00, 0x2800, 0x6000 }, + { 0x9900, 0x27f0, 0x5000 }, + { 0x9900, 0x27e4, 0x4000 }, + { 0x9900, 0x27e0, 0x3000 }, + { 0x9900, 0x27de, 0x2000 }, + { 0x1900, 0x27dd, 0x0000 }, + { 0x1900, 0x27df, 0x0000 }, + { 0x9900, 0x27e2, 0x2000 }, + { 0x1900, 0x27e1, 0x0000 }, + { 0x1900, 0x27e3, 0x0000 }, + { 0x9600, 0x27e8, 0x3000 }, + { 0x9600, 0x27e6, 0x2000 }, + { 0x1900, 0x27e5, 0x0000 }, + { 0x1200, 0x27e7, 0x0000 }, + { 0x9600, 0x27ea, 0x2000 }, + { 0x1200, 0x27e9, 0x0000 }, + { 0x1200, 0x27eb, 0x0000 }, + { 0x9900, 0x27f8, 0x4000 }, + { 0x9900, 0x27f4, 0x3000 }, + { 0x9900, 0x27f2, 0x2000 }, + { 0x1900, 0x27f1, 0x0000 }, + { 0x1900, 0x27f3, 0x0000 }, + { 0x9900, 0x27f6, 0x2000 }, + { 0x1900, 0x27f5, 0x0000 }, + { 0x1900, 0x27f7, 0x0000 }, + { 0x9900, 0x27fc, 0x3000 }, + { 0x9900, 0x27fa, 0x2000 }, + { 0x1900, 0x27f9, 0x0000 }, + { 0x1900, 0x27fb, 0x0000 }, + { 0x9900, 0x27fe, 0x2000 }, + { 0x1900, 0x27fd, 0x0000 }, + { 0x1900, 0x27ff, 0x0000 }, + { 0x9a00, 0x2810, 0x5000 }, + { 0x9a00, 0x2808, 0x4000 }, + { 0x9a00, 0x2804, 0x3000 }, + { 0x9a00, 0x2802, 0x2000 }, + { 0x1a00, 0x2801, 0x0000 }, + { 0x1a00, 0x2803, 0x0000 }, + { 0x9a00, 0x2806, 0x2000 }, + { 0x1a00, 0x2805, 0x0000 }, + { 0x1a00, 0x2807, 0x0000 }, + { 0x9a00, 0x280c, 0x3000 }, + { 0x9a00, 0x280a, 0x2000 }, + { 0x1a00, 0x2809, 0x0000 }, + { 0x1a00, 0x280b, 0x0000 }, + { 0x9a00, 0x280e, 0x2000 }, + { 0x1a00, 0x280d, 0x0000 }, + { 0x1a00, 0x280f, 0x0000 }, + { 0x9a00, 0x2818, 0x4000 }, + { 0x9a00, 0x2814, 0x3000 }, + { 0x9a00, 0x2812, 0x2000 }, + { 0x1a00, 0x2811, 0x0000 }, + { 0x1a00, 0x2813, 0x0000 }, + { 0x9a00, 0x2816, 0x2000 }, + { 0x1a00, 0x2815, 0x0000 }, + { 0x1a00, 0x2817, 0x0000 }, + { 0x9a00, 0x281c, 0x3000 }, + { 0x9a00, 0x281a, 0x2000 }, + { 0x1a00, 0x2819, 0x0000 }, + { 0x1a00, 0x281b, 0x0000 }, + { 0x9a00, 0x281e, 0x2000 }, + { 0x1a00, 0x281d, 0x0000 }, + { 0x1a00, 0x281f, 0x0000 }, + { 0x9a00, 0x2860, 0x7000 }, + { 0x9a00, 0x2840, 0x6000 }, + { 0x9a00, 0x2830, 0x5000 }, + { 0x9a00, 0x2828, 0x4000 }, + { 0x9a00, 0x2824, 0x3000 }, + { 0x9a00, 0x2822, 0x2000 }, + { 0x1a00, 0x2821, 0x0000 }, + { 0x1a00, 0x2823, 0x0000 }, + { 0x9a00, 0x2826, 0x2000 }, + { 0x1a00, 0x2825, 0x0000 }, + { 0x1a00, 0x2827, 0x0000 }, + { 0x9a00, 0x282c, 0x3000 }, + { 0x9a00, 0x282a, 0x2000 }, + { 0x1a00, 0x2829, 0x0000 }, + { 0x1a00, 0x282b, 0x0000 }, + { 0x9a00, 0x282e, 0x2000 }, + { 0x1a00, 0x282d, 0x0000 }, + { 0x1a00, 0x282f, 0x0000 }, + { 0x9a00, 0x2838, 0x4000 }, + { 0x9a00, 0x2834, 0x3000 }, + { 0x9a00, 0x2832, 0x2000 }, + { 0x1a00, 0x2831, 0x0000 }, + { 0x1a00, 0x2833, 0x0000 }, + { 0x9a00, 0x2836, 0x2000 }, + { 0x1a00, 0x2835, 0x0000 }, + { 0x1a00, 0x2837, 0x0000 }, + { 0x9a00, 0x283c, 0x3000 }, + { 0x9a00, 0x283a, 0x2000 }, + { 0x1a00, 0x2839, 0x0000 }, + { 0x1a00, 0x283b, 0x0000 }, + { 0x9a00, 0x283e, 0x2000 }, + { 0x1a00, 0x283d, 0x0000 }, + { 0x1a00, 0x283f, 0x0000 }, + { 0x9a00, 0x2850, 0x5000 }, + { 0x9a00, 0x2848, 0x4000 }, + { 0x9a00, 0x2844, 0x3000 }, + { 0x9a00, 0x2842, 0x2000 }, + { 0x1a00, 0x2841, 0x0000 }, + { 0x1a00, 0x2843, 0x0000 }, + { 0x9a00, 0x2846, 0x2000 }, + { 0x1a00, 0x2845, 0x0000 }, + { 0x1a00, 0x2847, 0x0000 }, + { 0x9a00, 0x284c, 0x3000 }, + { 0x9a00, 0x284a, 0x2000 }, + { 0x1a00, 0x2849, 0x0000 }, + { 0x1a00, 0x284b, 0x0000 }, + { 0x9a00, 0x284e, 0x2000 }, + { 0x1a00, 0x284d, 0x0000 }, + { 0x1a00, 0x284f, 0x0000 }, + { 0x9a00, 0x2858, 0x4000 }, + { 0x9a00, 0x2854, 0x3000 }, + { 0x9a00, 0x2852, 0x2000 }, + { 0x1a00, 0x2851, 0x0000 }, + { 0x1a00, 0x2853, 0x0000 }, + { 0x9a00, 0x2856, 0x2000 }, + { 0x1a00, 0x2855, 0x0000 }, + { 0x1a00, 0x2857, 0x0000 }, + { 0x9a00, 0x285c, 0x3000 }, + { 0x9a00, 0x285a, 0x2000 }, + { 0x1a00, 0x2859, 0x0000 }, + { 0x1a00, 0x285b, 0x0000 }, + { 0x9a00, 0x285e, 0x2000 }, + { 0x1a00, 0x285d, 0x0000 }, + { 0x1a00, 0x285f, 0x0000 }, + { 0x9a00, 0x2880, 0x6000 }, + { 0x9a00, 0x2870, 0x5000 }, + { 0x9a00, 0x2868, 0x4000 }, + { 0x9a00, 0x2864, 0x3000 }, + { 0x9a00, 0x2862, 0x2000 }, + { 0x1a00, 0x2861, 0x0000 }, + { 0x1a00, 0x2863, 0x0000 }, + { 0x9a00, 0x2866, 0x2000 }, + { 0x1a00, 0x2865, 0x0000 }, + { 0x1a00, 0x2867, 0x0000 }, + { 0x9a00, 0x286c, 0x3000 }, + { 0x9a00, 0x286a, 0x2000 }, + { 0x1a00, 0x2869, 0x0000 }, + { 0x1a00, 0x286b, 0x0000 }, + { 0x9a00, 0x286e, 0x2000 }, + { 0x1a00, 0x286d, 0x0000 }, + { 0x1a00, 0x286f, 0x0000 }, + { 0x9a00, 0x2878, 0x4000 }, + { 0x9a00, 0x2874, 0x3000 }, + { 0x9a00, 0x2872, 0x2000 }, + { 0x1a00, 0x2871, 0x0000 }, + { 0x1a00, 0x2873, 0x0000 }, + { 0x9a00, 0x2876, 0x2000 }, + { 0x1a00, 0x2875, 0x0000 }, + { 0x1a00, 0x2877, 0x0000 }, + { 0x9a00, 0x287c, 0x3000 }, + { 0x9a00, 0x287a, 0x2000 }, + { 0x1a00, 0x2879, 0x0000 }, + { 0x1a00, 0x287b, 0x0000 }, + { 0x9a00, 0x287e, 0x2000 }, + { 0x1a00, 0x287d, 0x0000 }, + { 0x1a00, 0x287f, 0x0000 }, + { 0x9a00, 0x2890, 0x5000 }, + { 0x9a00, 0x2888, 0x4000 }, + { 0x9a00, 0x2884, 0x3000 }, + { 0x9a00, 0x2882, 0x2000 }, + { 0x1a00, 0x2881, 0x0000 }, + { 0x1a00, 0x2883, 0x0000 }, + { 0x9a00, 0x2886, 0x2000 }, + { 0x1a00, 0x2885, 0x0000 }, + { 0x1a00, 0x2887, 0x0000 }, + { 0x9a00, 0x288c, 0x3000 }, + { 0x9a00, 0x288a, 0x2000 }, + { 0x1a00, 0x2889, 0x0000 }, + { 0x1a00, 0x288b, 0x0000 }, + { 0x9a00, 0x288e, 0x2000 }, + { 0x1a00, 0x288d, 0x0000 }, + { 0x1a00, 0x288f, 0x0000 }, + { 0x9a00, 0x2898, 0x4000 }, + { 0x9a00, 0x2894, 0x3000 }, + { 0x9a00, 0x2892, 0x2000 }, + { 0x1a00, 0x2891, 0x0000 }, + { 0x1a00, 0x2893, 0x0000 }, + { 0x9a00, 0x2896, 0x2000 }, + { 0x1a00, 0x2895, 0x0000 }, + { 0x1a00, 0x2897, 0x0000 }, + { 0x9a00, 0x289c, 0x3000 }, + { 0x9a00, 0x289a, 0x2000 }, + { 0x1a00, 0x2899, 0x0000 }, + { 0x1a00, 0x289b, 0x0000 }, + { 0x9a00, 0x289e, 0x2000 }, + { 0x1a00, 0x289d, 0x0000 }, + { 0x1a00, 0x289f, 0x0000 }, + { 0x9900, 0x2920, 0x8000 }, + { 0x9a00, 0x28e0, 0x7000 }, + { 0x9a00, 0x28c0, 0x6000 }, + { 0x9a00, 0x28b0, 0x5000 }, + { 0x9a00, 0x28a8, 0x4000 }, + { 0x9a00, 0x28a4, 0x3000 }, + { 0x9a00, 0x28a2, 0x2000 }, + { 0x1a00, 0x28a1, 0x0000 }, + { 0x1a00, 0x28a3, 0x0000 }, + { 0x9a00, 0x28a6, 0x2000 }, + { 0x1a00, 0x28a5, 0x0000 }, + { 0x1a00, 0x28a7, 0x0000 }, + { 0x9a00, 0x28ac, 0x3000 }, + { 0x9a00, 0x28aa, 0x2000 }, + { 0x1a00, 0x28a9, 0x0000 }, + { 0x1a00, 0x28ab, 0x0000 }, + { 0x9a00, 0x28ae, 0x2000 }, + { 0x1a00, 0x28ad, 0x0000 }, + { 0x1a00, 0x28af, 0x0000 }, + { 0x9a00, 0x28b8, 0x4000 }, + { 0x9a00, 0x28b4, 0x3000 }, + { 0x9a00, 0x28b2, 0x2000 }, + { 0x1a00, 0x28b1, 0x0000 }, + { 0x1a00, 0x28b3, 0x0000 }, + { 0x9a00, 0x28b6, 0x2000 }, + { 0x1a00, 0x28b5, 0x0000 }, + { 0x1a00, 0x28b7, 0x0000 }, + { 0x9a00, 0x28bc, 0x3000 }, + { 0x9a00, 0x28ba, 0x2000 }, + { 0x1a00, 0x28b9, 0x0000 }, + { 0x1a00, 0x28bb, 0x0000 }, + { 0x9a00, 0x28be, 0x2000 }, + { 0x1a00, 0x28bd, 0x0000 }, + { 0x1a00, 0x28bf, 0x0000 }, + { 0x9a00, 0x28d0, 0x5000 }, + { 0x9a00, 0x28c8, 0x4000 }, + { 0x9a00, 0x28c4, 0x3000 }, + { 0x9a00, 0x28c2, 0x2000 }, + { 0x1a00, 0x28c1, 0x0000 }, + { 0x1a00, 0x28c3, 0x0000 }, + { 0x9a00, 0x28c6, 0x2000 }, + { 0x1a00, 0x28c5, 0x0000 }, + { 0x1a00, 0x28c7, 0x0000 }, + { 0x9a00, 0x28cc, 0x3000 }, + { 0x9a00, 0x28ca, 0x2000 }, + { 0x1a00, 0x28c9, 0x0000 }, + { 0x1a00, 0x28cb, 0x0000 }, + { 0x9a00, 0x28ce, 0x2000 }, + { 0x1a00, 0x28cd, 0x0000 }, + { 0x1a00, 0x28cf, 0x0000 }, + { 0x9a00, 0x28d8, 0x4000 }, + { 0x9a00, 0x28d4, 0x3000 }, + { 0x9a00, 0x28d2, 0x2000 }, + { 0x1a00, 0x28d1, 0x0000 }, + { 0x1a00, 0x28d3, 0x0000 }, + { 0x9a00, 0x28d6, 0x2000 }, + { 0x1a00, 0x28d5, 0x0000 }, + { 0x1a00, 0x28d7, 0x0000 }, + { 0x9a00, 0x28dc, 0x3000 }, + { 0x9a00, 0x28da, 0x2000 }, + { 0x1a00, 0x28d9, 0x0000 }, + { 0x1a00, 0x28db, 0x0000 }, + { 0x9a00, 0x28de, 0x2000 }, + { 0x1a00, 0x28dd, 0x0000 }, + { 0x1a00, 0x28df, 0x0000 }, + { 0x9900, 0x2900, 0x6000 }, + { 0x9a00, 0x28f0, 0x5000 }, + { 0x9a00, 0x28e8, 0x4000 }, + { 0x9a00, 0x28e4, 0x3000 }, + { 0x9a00, 0x28e2, 0x2000 }, + { 0x1a00, 0x28e1, 0x0000 }, + { 0x1a00, 0x28e3, 0x0000 }, + { 0x9a00, 0x28e6, 0x2000 }, + { 0x1a00, 0x28e5, 0x0000 }, + { 0x1a00, 0x28e7, 0x0000 }, + { 0x9a00, 0x28ec, 0x3000 }, + { 0x9a00, 0x28ea, 0x2000 }, + { 0x1a00, 0x28e9, 0x0000 }, + { 0x1a00, 0x28eb, 0x0000 }, + { 0x9a00, 0x28ee, 0x2000 }, + { 0x1a00, 0x28ed, 0x0000 }, + { 0x1a00, 0x28ef, 0x0000 }, + { 0x9a00, 0x28f8, 0x4000 }, + { 0x9a00, 0x28f4, 0x3000 }, + { 0x9a00, 0x28f2, 0x2000 }, + { 0x1a00, 0x28f1, 0x0000 }, + { 0x1a00, 0x28f3, 0x0000 }, + { 0x9a00, 0x28f6, 0x2000 }, + { 0x1a00, 0x28f5, 0x0000 }, + { 0x1a00, 0x28f7, 0x0000 }, + { 0x9a00, 0x28fc, 0x3000 }, + { 0x9a00, 0x28fa, 0x2000 }, + { 0x1a00, 0x28f9, 0x0000 }, + { 0x1a00, 0x28fb, 0x0000 }, + { 0x9a00, 0x28fe, 0x2000 }, + { 0x1a00, 0x28fd, 0x0000 }, + { 0x1a00, 0x28ff, 0x0000 }, + { 0x9900, 0x2910, 0x5000 }, + { 0x9900, 0x2908, 0x4000 }, + { 0x9900, 0x2904, 0x3000 }, + { 0x9900, 0x2902, 0x2000 }, + { 0x1900, 0x2901, 0x0000 }, + { 0x1900, 0x2903, 0x0000 }, + { 0x9900, 0x2906, 0x2000 }, + { 0x1900, 0x2905, 0x0000 }, + { 0x1900, 0x2907, 0x0000 }, + { 0x9900, 0x290c, 0x3000 }, + { 0x9900, 0x290a, 0x2000 }, + { 0x1900, 0x2909, 0x0000 }, + { 0x1900, 0x290b, 0x0000 }, + { 0x9900, 0x290e, 0x2000 }, + { 0x1900, 0x290d, 0x0000 }, + { 0x1900, 0x290f, 0x0000 }, + { 0x9900, 0x2918, 0x4000 }, + { 0x9900, 0x2914, 0x3000 }, + { 0x9900, 0x2912, 0x2000 }, + { 0x1900, 0x2911, 0x0000 }, + { 0x1900, 0x2913, 0x0000 }, + { 0x9900, 0x2916, 0x2000 }, + { 0x1900, 0x2915, 0x0000 }, + { 0x1900, 0x2917, 0x0000 }, + { 0x9900, 0x291c, 0x3000 }, + { 0x9900, 0x291a, 0x2000 }, + { 0x1900, 0x2919, 0x0000 }, + { 0x1900, 0x291b, 0x0000 }, + { 0x9900, 0x291e, 0x2000 }, + { 0x1900, 0x291d, 0x0000 }, + { 0x1900, 0x291f, 0x0000 }, + { 0x9900, 0x2960, 0x7000 }, + { 0x9900, 0x2940, 0x6000 }, + { 0x9900, 0x2930, 0x5000 }, + { 0x9900, 0x2928, 0x4000 }, + { 0x9900, 0x2924, 0x3000 }, + { 0x9900, 0x2922, 0x2000 }, + { 0x1900, 0x2921, 0x0000 }, + { 0x1900, 0x2923, 0x0000 }, + { 0x9900, 0x2926, 0x2000 }, + { 0x1900, 0x2925, 0x0000 }, + { 0x1900, 0x2927, 0x0000 }, + { 0x9900, 0x292c, 0x3000 }, + { 0x9900, 0x292a, 0x2000 }, + { 0x1900, 0x2929, 0x0000 }, + { 0x1900, 0x292b, 0x0000 }, + { 0x9900, 0x292e, 0x2000 }, + { 0x1900, 0x292d, 0x0000 }, + { 0x1900, 0x292f, 0x0000 }, + { 0x9900, 0x2938, 0x4000 }, + { 0x9900, 0x2934, 0x3000 }, + { 0x9900, 0x2932, 0x2000 }, + { 0x1900, 0x2931, 0x0000 }, + { 0x1900, 0x2933, 0x0000 }, + { 0x9900, 0x2936, 0x2000 }, + { 0x1900, 0x2935, 0x0000 }, + { 0x1900, 0x2937, 0x0000 }, + { 0x9900, 0x293c, 0x3000 }, + { 0x9900, 0x293a, 0x2000 }, + { 0x1900, 0x2939, 0x0000 }, + { 0x1900, 0x293b, 0x0000 }, + { 0x9900, 0x293e, 0x2000 }, + { 0x1900, 0x293d, 0x0000 }, + { 0x1900, 0x293f, 0x0000 }, + { 0x9900, 0x2950, 0x5000 }, + { 0x9900, 0x2948, 0x4000 }, + { 0x9900, 0x2944, 0x3000 }, + { 0x9900, 0x2942, 0x2000 }, + { 0x1900, 0x2941, 0x0000 }, + { 0x1900, 0x2943, 0x0000 }, + { 0x9900, 0x2946, 0x2000 }, + { 0x1900, 0x2945, 0x0000 }, + { 0x1900, 0x2947, 0x0000 }, + { 0x9900, 0x294c, 0x3000 }, + { 0x9900, 0x294a, 0x2000 }, + { 0x1900, 0x2949, 0x0000 }, + { 0x1900, 0x294b, 0x0000 }, + { 0x9900, 0x294e, 0x2000 }, + { 0x1900, 0x294d, 0x0000 }, + { 0x1900, 0x294f, 0x0000 }, + { 0x9900, 0x2958, 0x4000 }, + { 0x9900, 0x2954, 0x3000 }, + { 0x9900, 0x2952, 0x2000 }, + { 0x1900, 0x2951, 0x0000 }, + { 0x1900, 0x2953, 0x0000 }, + { 0x9900, 0x2956, 0x2000 }, + { 0x1900, 0x2955, 0x0000 }, + { 0x1900, 0x2957, 0x0000 }, + { 0x9900, 0x295c, 0x3000 }, + { 0x9900, 0x295a, 0x2000 }, + { 0x1900, 0x2959, 0x0000 }, + { 0x1900, 0x295b, 0x0000 }, + { 0x9900, 0x295e, 0x2000 }, + { 0x1900, 0x295d, 0x0000 }, + { 0x1900, 0x295f, 0x0000 }, + { 0x9900, 0x2980, 0x6000 }, + { 0x9900, 0x2970, 0x5000 }, + { 0x9900, 0x2968, 0x4000 }, + { 0x9900, 0x2964, 0x3000 }, + { 0x9900, 0x2962, 0x2000 }, + { 0x1900, 0x2961, 0x0000 }, + { 0x1900, 0x2963, 0x0000 }, + { 0x9900, 0x2966, 0x2000 }, + { 0x1900, 0x2965, 0x0000 }, + { 0x1900, 0x2967, 0x0000 }, + { 0x9900, 0x296c, 0x3000 }, + { 0x9900, 0x296a, 0x2000 }, + { 0x1900, 0x2969, 0x0000 }, + { 0x1900, 0x296b, 0x0000 }, + { 0x9900, 0x296e, 0x2000 }, + { 0x1900, 0x296d, 0x0000 }, + { 0x1900, 0x296f, 0x0000 }, + { 0x9900, 0x2978, 0x4000 }, + { 0x9900, 0x2974, 0x3000 }, + { 0x9900, 0x2972, 0x2000 }, + { 0x1900, 0x2971, 0x0000 }, + { 0x1900, 0x2973, 0x0000 }, + { 0x9900, 0x2976, 0x2000 }, + { 0x1900, 0x2975, 0x0000 }, + { 0x1900, 0x2977, 0x0000 }, + { 0x9900, 0x297c, 0x3000 }, + { 0x9900, 0x297a, 0x2000 }, + { 0x1900, 0x2979, 0x0000 }, + { 0x1900, 0x297b, 0x0000 }, + { 0x9900, 0x297e, 0x2000 }, + { 0x1900, 0x297d, 0x0000 }, + { 0x1900, 0x297f, 0x0000 }, + { 0x9200, 0x2990, 0x5000 }, + { 0x9200, 0x2988, 0x4000 }, + { 0x9200, 0x2984, 0x3000 }, + { 0x9900, 0x2982, 0x2000 }, + { 0x1900, 0x2981, 0x0000 }, + { 0x1600, 0x2983, 0x0000 }, + { 0x9200, 0x2986, 0x2000 }, + { 0x1600, 0x2985, 0x0000 }, + { 0x1600, 0x2987, 0x0000 }, + { 0x9200, 0x298c, 0x3000 }, + { 0x9200, 0x298a, 0x2000 }, + { 0x1600, 0x2989, 0x0000 }, + { 0x1600, 0x298b, 0x0000 }, + { 0x9200, 0x298e, 0x2000 }, + { 0x1600, 0x298d, 0x0000 }, + { 0x1600, 0x298f, 0x0000 }, + { 0x9200, 0x2998, 0x4000 }, + { 0x9200, 0x2994, 0x3000 }, + { 0x9200, 0x2992, 0x2000 }, + { 0x1600, 0x2991, 0x0000 }, + { 0x1600, 0x2993, 0x0000 }, + { 0x9200, 0x2996, 0x2000 }, + { 0x1600, 0x2995, 0x0000 }, + { 0x1600, 0x2997, 0x0000 }, + { 0x9900, 0x299c, 0x3000 }, + { 0x9900, 0x299a, 0x2000 }, + { 0x1900, 0x2999, 0x0000 }, + { 0x1900, 0x299b, 0x0000 }, + { 0x9900, 0x299e, 0x2000 }, + { 0x1900, 0x299d, 0x0000 }, + { 0x1900, 0x299f, 0x0000 }, + { 0x9900, 0x2aa0, 0x9000 }, + { 0x9900, 0x2a20, 0x8000 }, + { 0x9900, 0x29e0, 0x7000 }, + { 0x9900, 0x29c0, 0x6000 }, + { 0x9900, 0x29b0, 0x5000 }, + { 0x9900, 0x29a8, 0x4000 }, + { 0x9900, 0x29a4, 0x3000 }, + { 0x9900, 0x29a2, 0x2000 }, + { 0x1900, 0x29a1, 0x0000 }, + { 0x1900, 0x29a3, 0x0000 }, + { 0x9900, 0x29a6, 0x2000 }, + { 0x1900, 0x29a5, 0x0000 }, + { 0x1900, 0x29a7, 0x0000 }, + { 0x9900, 0x29ac, 0x3000 }, + { 0x9900, 0x29aa, 0x2000 }, + { 0x1900, 0x29a9, 0x0000 }, + { 0x1900, 0x29ab, 0x0000 }, + { 0x9900, 0x29ae, 0x2000 }, + { 0x1900, 0x29ad, 0x0000 }, + { 0x1900, 0x29af, 0x0000 }, + { 0x9900, 0x29b8, 0x4000 }, + { 0x9900, 0x29b4, 0x3000 }, + { 0x9900, 0x29b2, 0x2000 }, + { 0x1900, 0x29b1, 0x0000 }, + { 0x1900, 0x29b3, 0x0000 }, + { 0x9900, 0x29b6, 0x2000 }, + { 0x1900, 0x29b5, 0x0000 }, + { 0x1900, 0x29b7, 0x0000 }, + { 0x9900, 0x29bc, 0x3000 }, + { 0x9900, 0x29ba, 0x2000 }, + { 0x1900, 0x29b9, 0x0000 }, + { 0x1900, 0x29bb, 0x0000 }, + { 0x9900, 0x29be, 0x2000 }, + { 0x1900, 0x29bd, 0x0000 }, + { 0x1900, 0x29bf, 0x0000 }, + { 0x9900, 0x29d0, 0x5000 }, + { 0x9900, 0x29c8, 0x4000 }, + { 0x9900, 0x29c4, 0x3000 }, + { 0x9900, 0x29c2, 0x2000 }, + { 0x1900, 0x29c1, 0x0000 }, + { 0x1900, 0x29c3, 0x0000 }, + { 0x9900, 0x29c6, 0x2000 }, + { 0x1900, 0x29c5, 0x0000 }, + { 0x1900, 0x29c7, 0x0000 }, + { 0x9900, 0x29cc, 0x3000 }, + { 0x9900, 0x29ca, 0x2000 }, + { 0x1900, 0x29c9, 0x0000 }, + { 0x1900, 0x29cb, 0x0000 }, + { 0x9900, 0x29ce, 0x2000 }, + { 0x1900, 0x29cd, 0x0000 }, + { 0x1900, 0x29cf, 0x0000 }, + { 0x9600, 0x29d8, 0x4000 }, + { 0x9900, 0x29d4, 0x3000 }, + { 0x9900, 0x29d2, 0x2000 }, + { 0x1900, 0x29d1, 0x0000 }, + { 0x1900, 0x29d3, 0x0000 }, + { 0x9900, 0x29d6, 0x2000 }, + { 0x1900, 0x29d5, 0x0000 }, + { 0x1900, 0x29d7, 0x0000 }, + { 0x9900, 0x29dc, 0x3000 }, + { 0x9600, 0x29da, 0x2000 }, + { 0x1200, 0x29d9, 0x0000 }, + { 0x1200, 0x29db, 0x0000 }, + { 0x9900, 0x29de, 0x2000 }, + { 0x1900, 0x29dd, 0x0000 }, + { 0x1900, 0x29df, 0x0000 }, + { 0x9900, 0x2a00, 0x6000 }, + { 0x9900, 0x29f0, 0x5000 }, + { 0x9900, 0x29e8, 0x4000 }, + { 0x9900, 0x29e4, 0x3000 }, + { 0x9900, 0x29e2, 0x2000 }, + { 0x1900, 0x29e1, 0x0000 }, + { 0x1900, 0x29e3, 0x0000 }, + { 0x9900, 0x29e6, 0x2000 }, + { 0x1900, 0x29e5, 0x0000 }, + { 0x1900, 0x29e7, 0x0000 }, + { 0x9900, 0x29ec, 0x3000 }, + { 0x9900, 0x29ea, 0x2000 }, + { 0x1900, 0x29e9, 0x0000 }, + { 0x1900, 0x29eb, 0x0000 }, + { 0x9900, 0x29ee, 0x2000 }, + { 0x1900, 0x29ed, 0x0000 }, + { 0x1900, 0x29ef, 0x0000 }, + { 0x9900, 0x29f8, 0x4000 }, + { 0x9900, 0x29f4, 0x3000 }, + { 0x9900, 0x29f2, 0x2000 }, + { 0x1900, 0x29f1, 0x0000 }, + { 0x1900, 0x29f3, 0x0000 }, + { 0x9900, 0x29f6, 0x2000 }, + { 0x1900, 0x29f5, 0x0000 }, + { 0x1900, 0x29f7, 0x0000 }, + { 0x9600, 0x29fc, 0x3000 }, + { 0x9900, 0x29fa, 0x2000 }, + { 0x1900, 0x29f9, 0x0000 }, + { 0x1900, 0x29fb, 0x0000 }, + { 0x9900, 0x29fe, 0x2000 }, + { 0x1200, 0x29fd, 0x0000 }, + { 0x1900, 0x29ff, 0x0000 }, + { 0x9900, 0x2a10, 0x5000 }, + { 0x9900, 0x2a08, 0x4000 }, + { 0x9900, 0x2a04, 0x3000 }, + { 0x9900, 0x2a02, 0x2000 }, + { 0x1900, 0x2a01, 0x0000 }, + { 0x1900, 0x2a03, 0x0000 }, + { 0x9900, 0x2a06, 0x2000 }, + { 0x1900, 0x2a05, 0x0000 }, + { 0x1900, 0x2a07, 0x0000 }, + { 0x9900, 0x2a0c, 0x3000 }, + { 0x9900, 0x2a0a, 0x2000 }, + { 0x1900, 0x2a09, 0x0000 }, + { 0x1900, 0x2a0b, 0x0000 }, + { 0x9900, 0x2a0e, 0x2000 }, + { 0x1900, 0x2a0d, 0x0000 }, + { 0x1900, 0x2a0f, 0x0000 }, + { 0x9900, 0x2a18, 0x4000 }, + { 0x9900, 0x2a14, 0x3000 }, + { 0x9900, 0x2a12, 0x2000 }, + { 0x1900, 0x2a11, 0x0000 }, + { 0x1900, 0x2a13, 0x0000 }, + { 0x9900, 0x2a16, 0x2000 }, + { 0x1900, 0x2a15, 0x0000 }, + { 0x1900, 0x2a17, 0x0000 }, + { 0x9900, 0x2a1c, 0x3000 }, + { 0x9900, 0x2a1a, 0x2000 }, + { 0x1900, 0x2a19, 0x0000 }, + { 0x1900, 0x2a1b, 0x0000 }, + { 0x9900, 0x2a1e, 0x2000 }, + { 0x1900, 0x2a1d, 0x0000 }, + { 0x1900, 0x2a1f, 0x0000 }, + { 0x9900, 0x2a60, 0x7000 }, + { 0x9900, 0x2a40, 0x6000 }, + { 0x9900, 0x2a30, 0x5000 }, + { 0x9900, 0x2a28, 0x4000 }, + { 0x9900, 0x2a24, 0x3000 }, + { 0x9900, 0x2a22, 0x2000 }, + { 0x1900, 0x2a21, 0x0000 }, + { 0x1900, 0x2a23, 0x0000 }, + { 0x9900, 0x2a26, 0x2000 }, + { 0x1900, 0x2a25, 0x0000 }, + { 0x1900, 0x2a27, 0x0000 }, + { 0x9900, 0x2a2c, 0x3000 }, + { 0x9900, 0x2a2a, 0x2000 }, + { 0x1900, 0x2a29, 0x0000 }, + { 0x1900, 0x2a2b, 0x0000 }, + { 0x9900, 0x2a2e, 0x2000 }, + { 0x1900, 0x2a2d, 0x0000 }, + { 0x1900, 0x2a2f, 0x0000 }, + { 0x9900, 0x2a38, 0x4000 }, + { 0x9900, 0x2a34, 0x3000 }, + { 0x9900, 0x2a32, 0x2000 }, + { 0x1900, 0x2a31, 0x0000 }, + { 0x1900, 0x2a33, 0x0000 }, + { 0x9900, 0x2a36, 0x2000 }, + { 0x1900, 0x2a35, 0x0000 }, + { 0x1900, 0x2a37, 0x0000 }, + { 0x9900, 0x2a3c, 0x3000 }, + { 0x9900, 0x2a3a, 0x2000 }, + { 0x1900, 0x2a39, 0x0000 }, + { 0x1900, 0x2a3b, 0x0000 }, + { 0x9900, 0x2a3e, 0x2000 }, + { 0x1900, 0x2a3d, 0x0000 }, + { 0x1900, 0x2a3f, 0x0000 }, + { 0x9900, 0x2a50, 0x5000 }, + { 0x9900, 0x2a48, 0x4000 }, + { 0x9900, 0x2a44, 0x3000 }, + { 0x9900, 0x2a42, 0x2000 }, + { 0x1900, 0x2a41, 0x0000 }, + { 0x1900, 0x2a43, 0x0000 }, + { 0x9900, 0x2a46, 0x2000 }, + { 0x1900, 0x2a45, 0x0000 }, + { 0x1900, 0x2a47, 0x0000 }, + { 0x9900, 0x2a4c, 0x3000 }, + { 0x9900, 0x2a4a, 0x2000 }, + { 0x1900, 0x2a49, 0x0000 }, + { 0x1900, 0x2a4b, 0x0000 }, + { 0x9900, 0x2a4e, 0x2000 }, + { 0x1900, 0x2a4d, 0x0000 }, + { 0x1900, 0x2a4f, 0x0000 }, + { 0x9900, 0x2a58, 0x4000 }, + { 0x9900, 0x2a54, 0x3000 }, + { 0x9900, 0x2a52, 0x2000 }, + { 0x1900, 0x2a51, 0x0000 }, + { 0x1900, 0x2a53, 0x0000 }, + { 0x9900, 0x2a56, 0x2000 }, + { 0x1900, 0x2a55, 0x0000 }, + { 0x1900, 0x2a57, 0x0000 }, + { 0x9900, 0x2a5c, 0x3000 }, + { 0x9900, 0x2a5a, 0x2000 }, + { 0x1900, 0x2a59, 0x0000 }, + { 0x1900, 0x2a5b, 0x0000 }, + { 0x9900, 0x2a5e, 0x2000 }, + { 0x1900, 0x2a5d, 0x0000 }, + { 0x1900, 0x2a5f, 0x0000 }, + { 0x9900, 0x2a80, 0x6000 }, + { 0x9900, 0x2a70, 0x5000 }, + { 0x9900, 0x2a68, 0x4000 }, + { 0x9900, 0x2a64, 0x3000 }, + { 0x9900, 0x2a62, 0x2000 }, + { 0x1900, 0x2a61, 0x0000 }, + { 0x1900, 0x2a63, 0x0000 }, + { 0x9900, 0x2a66, 0x2000 }, + { 0x1900, 0x2a65, 0x0000 }, + { 0x1900, 0x2a67, 0x0000 }, + { 0x9900, 0x2a6c, 0x3000 }, + { 0x9900, 0x2a6a, 0x2000 }, + { 0x1900, 0x2a69, 0x0000 }, + { 0x1900, 0x2a6b, 0x0000 }, + { 0x9900, 0x2a6e, 0x2000 }, + { 0x1900, 0x2a6d, 0x0000 }, + { 0x1900, 0x2a6f, 0x0000 }, + { 0x9900, 0x2a78, 0x4000 }, + { 0x9900, 0x2a74, 0x3000 }, + { 0x9900, 0x2a72, 0x2000 }, + { 0x1900, 0x2a71, 0x0000 }, + { 0x1900, 0x2a73, 0x0000 }, + { 0x9900, 0x2a76, 0x2000 }, + { 0x1900, 0x2a75, 0x0000 }, + { 0x1900, 0x2a77, 0x0000 }, + { 0x9900, 0x2a7c, 0x3000 }, + { 0x9900, 0x2a7a, 0x2000 }, + { 0x1900, 0x2a79, 0x0000 }, + { 0x1900, 0x2a7b, 0x0000 }, + { 0x9900, 0x2a7e, 0x2000 }, + { 0x1900, 0x2a7d, 0x0000 }, + { 0x1900, 0x2a7f, 0x0000 }, + { 0x9900, 0x2a90, 0x5000 }, + { 0x9900, 0x2a88, 0x4000 }, + { 0x9900, 0x2a84, 0x3000 }, + { 0x9900, 0x2a82, 0x2000 }, + { 0x1900, 0x2a81, 0x0000 }, + { 0x1900, 0x2a83, 0x0000 }, + { 0x9900, 0x2a86, 0x2000 }, + { 0x1900, 0x2a85, 0x0000 }, + { 0x1900, 0x2a87, 0x0000 }, + { 0x9900, 0x2a8c, 0x3000 }, + { 0x9900, 0x2a8a, 0x2000 }, + { 0x1900, 0x2a89, 0x0000 }, + { 0x1900, 0x2a8b, 0x0000 }, + { 0x9900, 0x2a8e, 0x2000 }, + { 0x1900, 0x2a8d, 0x0000 }, + { 0x1900, 0x2a8f, 0x0000 }, + { 0x9900, 0x2a98, 0x4000 }, + { 0x9900, 0x2a94, 0x3000 }, + { 0x9900, 0x2a92, 0x2000 }, + { 0x1900, 0x2a91, 0x0000 }, + { 0x1900, 0x2a93, 0x0000 }, + { 0x9900, 0x2a96, 0x2000 }, + { 0x1900, 0x2a95, 0x0000 }, + { 0x1900, 0x2a97, 0x0000 }, + { 0x9900, 0x2a9c, 0x3000 }, + { 0x9900, 0x2a9a, 0x2000 }, + { 0x1900, 0x2a99, 0x0000 }, + { 0x1900, 0x2a9b, 0x0000 }, + { 0x9900, 0x2a9e, 0x2000 }, + { 0x1900, 0x2a9d, 0x0000 }, + { 0x1900, 0x2a9f, 0x0000 }, + { 0x9a00, 0x2e92, 0x8000 }, + { 0x9900, 0x2ae0, 0x7000 }, + { 0x9900, 0x2ac0, 0x6000 }, + { 0x9900, 0x2ab0, 0x5000 }, + { 0x9900, 0x2aa8, 0x4000 }, + { 0x9900, 0x2aa4, 0x3000 }, + { 0x9900, 0x2aa2, 0x2000 }, + { 0x1900, 0x2aa1, 0x0000 }, + { 0x1900, 0x2aa3, 0x0000 }, + { 0x9900, 0x2aa6, 0x2000 }, + { 0x1900, 0x2aa5, 0x0000 }, + { 0x1900, 0x2aa7, 0x0000 }, + { 0x9900, 0x2aac, 0x3000 }, + { 0x9900, 0x2aaa, 0x2000 }, + { 0x1900, 0x2aa9, 0x0000 }, + { 0x1900, 0x2aab, 0x0000 }, + { 0x9900, 0x2aae, 0x2000 }, + { 0x1900, 0x2aad, 0x0000 }, + { 0x1900, 0x2aaf, 0x0000 }, + { 0x9900, 0x2ab8, 0x4000 }, + { 0x9900, 0x2ab4, 0x3000 }, + { 0x9900, 0x2ab2, 0x2000 }, + { 0x1900, 0x2ab1, 0x0000 }, + { 0x1900, 0x2ab3, 0x0000 }, + { 0x9900, 0x2ab6, 0x2000 }, + { 0x1900, 0x2ab5, 0x0000 }, + { 0x1900, 0x2ab7, 0x0000 }, + { 0x9900, 0x2abc, 0x3000 }, + { 0x9900, 0x2aba, 0x2000 }, + { 0x1900, 0x2ab9, 0x0000 }, + { 0x1900, 0x2abb, 0x0000 }, + { 0x9900, 0x2abe, 0x2000 }, + { 0x1900, 0x2abd, 0x0000 }, + { 0x1900, 0x2abf, 0x0000 }, + { 0x9900, 0x2ad0, 0x5000 }, + { 0x9900, 0x2ac8, 0x4000 }, + { 0x9900, 0x2ac4, 0x3000 }, + { 0x9900, 0x2ac2, 0x2000 }, + { 0x1900, 0x2ac1, 0x0000 }, + { 0x1900, 0x2ac3, 0x0000 }, + { 0x9900, 0x2ac6, 0x2000 }, + { 0x1900, 0x2ac5, 0x0000 }, + { 0x1900, 0x2ac7, 0x0000 }, + { 0x9900, 0x2acc, 0x3000 }, + { 0x9900, 0x2aca, 0x2000 }, + { 0x1900, 0x2ac9, 0x0000 }, + { 0x1900, 0x2acb, 0x0000 }, + { 0x9900, 0x2ace, 0x2000 }, + { 0x1900, 0x2acd, 0x0000 }, + { 0x1900, 0x2acf, 0x0000 }, + { 0x9900, 0x2ad8, 0x4000 }, + { 0x9900, 0x2ad4, 0x3000 }, + { 0x9900, 0x2ad2, 0x2000 }, + { 0x1900, 0x2ad1, 0x0000 }, + { 0x1900, 0x2ad3, 0x0000 }, + { 0x9900, 0x2ad6, 0x2000 }, + { 0x1900, 0x2ad5, 0x0000 }, + { 0x1900, 0x2ad7, 0x0000 }, + { 0x9900, 0x2adc, 0x3000 }, + { 0x9900, 0x2ada, 0x2000 }, + { 0x1900, 0x2ad9, 0x0000 }, + { 0x1900, 0x2adb, 0x0000 }, + { 0x9900, 0x2ade, 0x2000 }, + { 0x1900, 0x2add, 0x0000 }, + { 0x1900, 0x2adf, 0x0000 }, + { 0x9a00, 0x2b00, 0x6000 }, + { 0x9900, 0x2af0, 0x5000 }, + { 0x9900, 0x2ae8, 0x4000 }, + { 0x9900, 0x2ae4, 0x3000 }, + { 0x9900, 0x2ae2, 0x2000 }, + { 0x1900, 0x2ae1, 0x0000 }, + { 0x1900, 0x2ae3, 0x0000 }, + { 0x9900, 0x2ae6, 0x2000 }, + { 0x1900, 0x2ae5, 0x0000 }, + { 0x1900, 0x2ae7, 0x0000 }, + { 0x9900, 0x2aec, 0x3000 }, + { 0x9900, 0x2aea, 0x2000 }, + { 0x1900, 0x2ae9, 0x0000 }, + { 0x1900, 0x2aeb, 0x0000 }, + { 0x9900, 0x2aee, 0x2000 }, + { 0x1900, 0x2aed, 0x0000 }, + { 0x1900, 0x2aef, 0x0000 }, + { 0x9900, 0x2af8, 0x4000 }, + { 0x9900, 0x2af4, 0x3000 }, + { 0x9900, 0x2af2, 0x2000 }, + { 0x1900, 0x2af1, 0x0000 }, + { 0x1900, 0x2af3, 0x0000 }, + { 0x9900, 0x2af6, 0x2000 }, + { 0x1900, 0x2af5, 0x0000 }, + { 0x1900, 0x2af7, 0x0000 }, + { 0x9900, 0x2afc, 0x3000 }, + { 0x9900, 0x2afa, 0x2000 }, + { 0x1900, 0x2af9, 0x0000 }, + { 0x1900, 0x2afb, 0x0000 }, + { 0x9900, 0x2afe, 0x2000 }, + { 0x1900, 0x2afd, 0x0000 }, + { 0x1900, 0x2aff, 0x0000 }, + { 0x9a00, 0x2e82, 0x5000 }, + { 0x9a00, 0x2b08, 0x4000 }, + { 0x9a00, 0x2b04, 0x3000 }, + { 0x9a00, 0x2b02, 0x2000 }, + { 0x1a00, 0x2b01, 0x0000 }, + { 0x1a00, 0x2b03, 0x0000 }, + { 0x9a00, 0x2b06, 0x2000 }, + { 0x1a00, 0x2b05, 0x0000 }, + { 0x1a00, 0x2b07, 0x0000 }, + { 0x9a00, 0x2b0c, 0x3000 }, + { 0x9a00, 0x2b0a, 0x2000 }, + { 0x1a00, 0x2b09, 0x0000 }, + { 0x1a00, 0x2b0b, 0x0000 }, + { 0x9a00, 0x2e80, 0x2000 }, + { 0x1a00, 0x2b0d, 0x0000 }, + { 0x1a00, 0x2e81, 0x0000 }, + { 0x9a00, 0x2e8a, 0x4000 }, + { 0x9a00, 0x2e86, 0x3000 }, + { 0x9a00, 0x2e84, 0x2000 }, + { 0x1a00, 0x2e83, 0x0000 }, + { 0x1a00, 0x2e85, 0x0000 }, + { 0x9a00, 0x2e88, 0x2000 }, + { 0x1a00, 0x2e87, 0x0000 }, + { 0x1a00, 0x2e89, 0x0000 }, + { 0x9a00, 0x2e8e, 0x3000 }, + { 0x9a00, 0x2e8c, 0x2000 }, + { 0x1a00, 0x2e8b, 0x0000 }, + { 0x1a00, 0x2e8d, 0x0000 }, + { 0x9a00, 0x2e90, 0x2000 }, + { 0x1a00, 0x2e8f, 0x0000 }, + { 0x1a00, 0x2e91, 0x0000 }, + { 0x9a00, 0x2ed3, 0x7000 }, + { 0x9a00, 0x2eb3, 0x6000 }, + { 0x9a00, 0x2ea3, 0x5000 }, + { 0x9a00, 0x2e9b, 0x4000 }, + { 0x9a00, 0x2e96, 0x3000 }, + { 0x9a00, 0x2e94, 0x2000 }, + { 0x1a00, 0x2e93, 0x0000 }, + { 0x1a00, 0x2e95, 0x0000 }, + { 0x9a00, 0x2e98, 0x2000 }, + { 0x1a00, 0x2e97, 0x0000 }, + { 0x1a00, 0x2e99, 0x0000 }, + { 0x9a00, 0x2e9f, 0x3000 }, + { 0x9a00, 0x2e9d, 0x2000 }, + { 0x1a00, 0x2e9c, 0x0000 }, + { 0x1a00, 0x2e9e, 0x0000 }, + { 0x9a00, 0x2ea1, 0x2000 }, + { 0x1a00, 0x2ea0, 0x0000 }, + { 0x1a00, 0x2ea2, 0x0000 }, + { 0x9a00, 0x2eab, 0x4000 }, + { 0x9a00, 0x2ea7, 0x3000 }, + { 0x9a00, 0x2ea5, 0x2000 }, + { 0x1a00, 0x2ea4, 0x0000 }, + { 0x1a00, 0x2ea6, 0x0000 }, + { 0x9a00, 0x2ea9, 0x2000 }, + { 0x1a00, 0x2ea8, 0x0000 }, + { 0x1a00, 0x2eaa, 0x0000 }, + { 0x9a00, 0x2eaf, 0x3000 }, + { 0x9a00, 0x2ead, 0x2000 }, + { 0x1a00, 0x2eac, 0x0000 }, + { 0x1a00, 0x2eae, 0x0000 }, + { 0x9a00, 0x2eb1, 0x2000 }, + { 0x1a00, 0x2eb0, 0x0000 }, + { 0x1a00, 0x2eb2, 0x0000 }, + { 0x9a00, 0x2ec3, 0x5000 }, + { 0x9a00, 0x2ebb, 0x4000 }, + { 0x9a00, 0x2eb7, 0x3000 }, + { 0x9a00, 0x2eb5, 0x2000 }, + { 0x1a00, 0x2eb4, 0x0000 }, + { 0x1a00, 0x2eb6, 0x0000 }, + { 0x9a00, 0x2eb9, 0x2000 }, + { 0x1a00, 0x2eb8, 0x0000 }, + { 0x1a00, 0x2eba, 0x0000 }, + { 0x9a00, 0x2ebf, 0x3000 }, + { 0x9a00, 0x2ebd, 0x2000 }, + { 0x1a00, 0x2ebc, 0x0000 }, + { 0x1a00, 0x2ebe, 0x0000 }, + { 0x9a00, 0x2ec1, 0x2000 }, + { 0x1a00, 0x2ec0, 0x0000 }, + { 0x1a00, 0x2ec2, 0x0000 }, + { 0x9a00, 0x2ecb, 0x4000 }, + { 0x9a00, 0x2ec7, 0x3000 }, + { 0x9a00, 0x2ec5, 0x2000 }, + { 0x1a00, 0x2ec4, 0x0000 }, + { 0x1a00, 0x2ec6, 0x0000 }, + { 0x9a00, 0x2ec9, 0x2000 }, + { 0x1a00, 0x2ec8, 0x0000 }, + { 0x1a00, 0x2eca, 0x0000 }, + { 0x9a00, 0x2ecf, 0x3000 }, + { 0x9a00, 0x2ecd, 0x2000 }, + { 0x1a00, 0x2ecc, 0x0000 }, + { 0x1a00, 0x2ece, 0x0000 }, + { 0x9a00, 0x2ed1, 0x2000 }, + { 0x1a00, 0x2ed0, 0x0000 }, + { 0x1a00, 0x2ed2, 0x0000 }, + { 0x9a00, 0x2ef3, 0x6000 }, + { 0x9a00, 0x2ee3, 0x5000 }, + { 0x9a00, 0x2edb, 0x4000 }, + { 0x9a00, 0x2ed7, 0x3000 }, + { 0x9a00, 0x2ed5, 0x2000 }, + { 0x1a00, 0x2ed4, 0x0000 }, + { 0x1a00, 0x2ed6, 0x0000 }, + { 0x9a00, 0x2ed9, 0x2000 }, + { 0x1a00, 0x2ed8, 0x0000 }, + { 0x1a00, 0x2eda, 0x0000 }, + { 0x9a00, 0x2edf, 0x3000 }, + { 0x9a00, 0x2edd, 0x2000 }, + { 0x1a00, 0x2edc, 0x0000 }, + { 0x1a00, 0x2ede, 0x0000 }, + { 0x9a00, 0x2ee1, 0x2000 }, + { 0x1a00, 0x2ee0, 0x0000 }, + { 0x1a00, 0x2ee2, 0x0000 }, + { 0x9a00, 0x2eeb, 0x4000 }, + { 0x9a00, 0x2ee7, 0x3000 }, + { 0x9a00, 0x2ee5, 0x2000 }, + { 0x1a00, 0x2ee4, 0x0000 }, + { 0x1a00, 0x2ee6, 0x0000 }, + { 0x9a00, 0x2ee9, 0x2000 }, + { 0x1a00, 0x2ee8, 0x0000 }, + { 0x1a00, 0x2eea, 0x0000 }, + { 0x9a00, 0x2eef, 0x3000 }, + { 0x9a00, 0x2eed, 0x2000 }, + { 0x1a00, 0x2eec, 0x0000 }, + { 0x1a00, 0x2eee, 0x0000 }, + { 0x9a00, 0x2ef1, 0x2000 }, + { 0x1a00, 0x2ef0, 0x0000 }, + { 0x1a00, 0x2ef2, 0x0000 }, + { 0x9a00, 0x2f0f, 0x5000 }, + { 0x9a00, 0x2f07, 0x4000 }, + { 0x9a00, 0x2f03, 0x3000 }, + { 0x9a00, 0x2f01, 0x2000 }, + { 0x1a00, 0x2f00, 0x0000 }, + { 0x1a00, 0x2f02, 0x0000 }, + { 0x9a00, 0x2f05, 0x2000 }, + { 0x1a00, 0x2f04, 0x0000 }, + { 0x1a00, 0x2f06, 0x0000 }, + { 0x9a00, 0x2f0b, 0x3000 }, + { 0x9a00, 0x2f09, 0x2000 }, + { 0x1a00, 0x2f08, 0x0000 }, + { 0x1a00, 0x2f0a, 0x0000 }, + { 0x9a00, 0x2f0d, 0x2000 }, + { 0x1a00, 0x2f0c, 0x0000 }, + { 0x1a00, 0x2f0e, 0x0000 }, + { 0x9a00, 0x2f17, 0x4000 }, + { 0x9a00, 0x2f13, 0x3000 }, + { 0x9a00, 0x2f11, 0x2000 }, + { 0x1a00, 0x2f10, 0x0000 }, + { 0x1a00, 0x2f12, 0x0000 }, + { 0x9a00, 0x2f15, 0x2000 }, + { 0x1a00, 0x2f14, 0x0000 }, + { 0x1a00, 0x2f16, 0x0000 }, + { 0x9a00, 0x2f1b, 0x3000 }, + { 0x9a00, 0x2f19, 0x2000 }, + { 0x1a00, 0x2f18, 0x0000 }, + { 0x1a00, 0x2f1a, 0x0000 }, + { 0x9a00, 0x2f1d, 0x2000 }, + { 0x1a00, 0x2f1c, 0x0000 }, + { 0x1a00, 0x2f1e, 0x0000 }, + { 0x8701, 0x00f0, 0xd000 }, + { 0x8700, 0xa34d, 0xc000 }, + { 0x9a00, 0x3391, 0xb000 }, + { 0x8700, 0x3149, 0xa000 }, + { 0x9500, 0x303d, 0x9000 }, + { 0x9a00, 0x2f9f, 0x8000 }, + { 0x9a00, 0x2f5f, 0x7000 }, + { 0x9a00, 0x2f3f, 0x6000 }, + { 0x9a00, 0x2f2f, 0x5000 }, + { 0x9a00, 0x2f27, 0x4000 }, + { 0x9a00, 0x2f23, 0x3000 }, + { 0x9a00, 0x2f21, 0x2000 }, + { 0x1a00, 0x2f20, 0x0000 }, + { 0x1a00, 0x2f22, 0x0000 }, + { 0x9a00, 0x2f25, 0x2000 }, + { 0x1a00, 0x2f24, 0x0000 }, + { 0x1a00, 0x2f26, 0x0000 }, + { 0x9a00, 0x2f2b, 0x3000 }, + { 0x9a00, 0x2f29, 0x2000 }, + { 0x1a00, 0x2f28, 0x0000 }, + { 0x1a00, 0x2f2a, 0x0000 }, + { 0x9a00, 0x2f2d, 0x2000 }, + { 0x1a00, 0x2f2c, 0x0000 }, + { 0x1a00, 0x2f2e, 0x0000 }, + { 0x9a00, 0x2f37, 0x4000 }, + { 0x9a00, 0x2f33, 0x3000 }, + { 0x9a00, 0x2f31, 0x2000 }, + { 0x1a00, 0x2f30, 0x0000 }, + { 0x1a00, 0x2f32, 0x0000 }, + { 0x9a00, 0x2f35, 0x2000 }, + { 0x1a00, 0x2f34, 0x0000 }, + { 0x1a00, 0x2f36, 0x0000 }, + { 0x9a00, 0x2f3b, 0x3000 }, + { 0x9a00, 0x2f39, 0x2000 }, + { 0x1a00, 0x2f38, 0x0000 }, + { 0x1a00, 0x2f3a, 0x0000 }, + { 0x9a00, 0x2f3d, 0x2000 }, + { 0x1a00, 0x2f3c, 0x0000 }, + { 0x1a00, 0x2f3e, 0x0000 }, + { 0x9a00, 0x2f4f, 0x5000 }, + { 0x9a00, 0x2f47, 0x4000 }, + { 0x9a00, 0x2f43, 0x3000 }, + { 0x9a00, 0x2f41, 0x2000 }, + { 0x1a00, 0x2f40, 0x0000 }, + { 0x1a00, 0x2f42, 0x0000 }, + { 0x9a00, 0x2f45, 0x2000 }, + { 0x1a00, 0x2f44, 0x0000 }, + { 0x1a00, 0x2f46, 0x0000 }, + { 0x9a00, 0x2f4b, 0x3000 }, + { 0x9a00, 0x2f49, 0x2000 }, + { 0x1a00, 0x2f48, 0x0000 }, + { 0x1a00, 0x2f4a, 0x0000 }, + { 0x9a00, 0x2f4d, 0x2000 }, + { 0x1a00, 0x2f4c, 0x0000 }, + { 0x1a00, 0x2f4e, 0x0000 }, + { 0x9a00, 0x2f57, 0x4000 }, + { 0x9a00, 0x2f53, 0x3000 }, + { 0x9a00, 0x2f51, 0x2000 }, + { 0x1a00, 0x2f50, 0x0000 }, + { 0x1a00, 0x2f52, 0x0000 }, + { 0x9a00, 0x2f55, 0x2000 }, + { 0x1a00, 0x2f54, 0x0000 }, + { 0x1a00, 0x2f56, 0x0000 }, + { 0x9a00, 0x2f5b, 0x3000 }, + { 0x9a00, 0x2f59, 0x2000 }, + { 0x1a00, 0x2f58, 0x0000 }, + { 0x1a00, 0x2f5a, 0x0000 }, + { 0x9a00, 0x2f5d, 0x2000 }, + { 0x1a00, 0x2f5c, 0x0000 }, + { 0x1a00, 0x2f5e, 0x0000 }, + { 0x9a00, 0x2f7f, 0x6000 }, + { 0x9a00, 0x2f6f, 0x5000 }, + { 0x9a00, 0x2f67, 0x4000 }, + { 0x9a00, 0x2f63, 0x3000 }, + { 0x9a00, 0x2f61, 0x2000 }, + { 0x1a00, 0x2f60, 0x0000 }, + { 0x1a00, 0x2f62, 0x0000 }, + { 0x9a00, 0x2f65, 0x2000 }, + { 0x1a00, 0x2f64, 0x0000 }, + { 0x1a00, 0x2f66, 0x0000 }, + { 0x9a00, 0x2f6b, 0x3000 }, + { 0x9a00, 0x2f69, 0x2000 }, + { 0x1a00, 0x2f68, 0x0000 }, + { 0x1a00, 0x2f6a, 0x0000 }, + { 0x9a00, 0x2f6d, 0x2000 }, + { 0x1a00, 0x2f6c, 0x0000 }, + { 0x1a00, 0x2f6e, 0x0000 }, + { 0x9a00, 0x2f77, 0x4000 }, + { 0x9a00, 0x2f73, 0x3000 }, + { 0x9a00, 0x2f71, 0x2000 }, + { 0x1a00, 0x2f70, 0x0000 }, + { 0x1a00, 0x2f72, 0x0000 }, + { 0x9a00, 0x2f75, 0x2000 }, + { 0x1a00, 0x2f74, 0x0000 }, + { 0x1a00, 0x2f76, 0x0000 }, + { 0x9a00, 0x2f7b, 0x3000 }, + { 0x9a00, 0x2f79, 0x2000 }, + { 0x1a00, 0x2f78, 0x0000 }, + { 0x1a00, 0x2f7a, 0x0000 }, + { 0x9a00, 0x2f7d, 0x2000 }, + { 0x1a00, 0x2f7c, 0x0000 }, + { 0x1a00, 0x2f7e, 0x0000 }, + { 0x9a00, 0x2f8f, 0x5000 }, + { 0x9a00, 0x2f87, 0x4000 }, + { 0x9a00, 0x2f83, 0x3000 }, + { 0x9a00, 0x2f81, 0x2000 }, + { 0x1a00, 0x2f80, 0x0000 }, + { 0x1a00, 0x2f82, 0x0000 }, + { 0x9a00, 0x2f85, 0x2000 }, + { 0x1a00, 0x2f84, 0x0000 }, + { 0x1a00, 0x2f86, 0x0000 }, + { 0x9a00, 0x2f8b, 0x3000 }, + { 0x9a00, 0x2f89, 0x2000 }, + { 0x1a00, 0x2f88, 0x0000 }, + { 0x1a00, 0x2f8a, 0x0000 }, + { 0x9a00, 0x2f8d, 0x2000 }, + { 0x1a00, 0x2f8c, 0x0000 }, + { 0x1a00, 0x2f8e, 0x0000 }, + { 0x9a00, 0x2f97, 0x4000 }, + { 0x9a00, 0x2f93, 0x3000 }, + { 0x9a00, 0x2f91, 0x2000 }, + { 0x1a00, 0x2f90, 0x0000 }, + { 0x1a00, 0x2f92, 0x0000 }, + { 0x9a00, 0x2f95, 0x2000 }, + { 0x1a00, 0x2f94, 0x0000 }, + { 0x1a00, 0x2f96, 0x0000 }, + { 0x9a00, 0x2f9b, 0x3000 }, + { 0x9a00, 0x2f99, 0x2000 }, + { 0x1a00, 0x2f98, 0x0000 }, + { 0x1a00, 0x2f9a, 0x0000 }, + { 0x9a00, 0x2f9d, 0x2000 }, + { 0x1a00, 0x2f9c, 0x0000 }, + { 0x1a00, 0x2f9e, 0x0000 }, + { 0x9a00, 0x2ff9, 0x7000 }, + { 0x9a00, 0x2fbf, 0x6000 }, + { 0x9a00, 0x2faf, 0x5000 }, + { 0x9a00, 0x2fa7, 0x4000 }, + { 0x9a00, 0x2fa3, 0x3000 }, + { 0x9a00, 0x2fa1, 0x2000 }, + { 0x1a00, 0x2fa0, 0x0000 }, + { 0x1a00, 0x2fa2, 0x0000 }, + { 0x9a00, 0x2fa5, 0x2000 }, + { 0x1a00, 0x2fa4, 0x0000 }, + { 0x1a00, 0x2fa6, 0x0000 }, + { 0x9a00, 0x2fab, 0x3000 }, + { 0x9a00, 0x2fa9, 0x2000 }, + { 0x1a00, 0x2fa8, 0x0000 }, + { 0x1a00, 0x2faa, 0x0000 }, + { 0x9a00, 0x2fad, 0x2000 }, + { 0x1a00, 0x2fac, 0x0000 }, + { 0x1a00, 0x2fae, 0x0000 }, + { 0x9a00, 0x2fb7, 0x4000 }, + { 0x9a00, 0x2fb3, 0x3000 }, + { 0x9a00, 0x2fb1, 0x2000 }, + { 0x1a00, 0x2fb0, 0x0000 }, + { 0x1a00, 0x2fb2, 0x0000 }, + { 0x9a00, 0x2fb5, 0x2000 }, + { 0x1a00, 0x2fb4, 0x0000 }, + { 0x1a00, 0x2fb6, 0x0000 }, + { 0x9a00, 0x2fbb, 0x3000 }, + { 0x9a00, 0x2fb9, 0x2000 }, + { 0x1a00, 0x2fb8, 0x0000 }, + { 0x1a00, 0x2fba, 0x0000 }, + { 0x9a00, 0x2fbd, 0x2000 }, + { 0x1a00, 0x2fbc, 0x0000 }, + { 0x1a00, 0x2fbe, 0x0000 }, + { 0x9a00, 0x2fcf, 0x5000 }, + { 0x9a00, 0x2fc7, 0x4000 }, + { 0x9a00, 0x2fc3, 0x3000 }, + { 0x9a00, 0x2fc1, 0x2000 }, + { 0x1a00, 0x2fc0, 0x0000 }, + { 0x1a00, 0x2fc2, 0x0000 }, + { 0x9a00, 0x2fc5, 0x2000 }, + { 0x1a00, 0x2fc4, 0x0000 }, + { 0x1a00, 0x2fc6, 0x0000 }, + { 0x9a00, 0x2fcb, 0x3000 }, + { 0x9a00, 0x2fc9, 0x2000 }, + { 0x1a00, 0x2fc8, 0x0000 }, + { 0x1a00, 0x2fca, 0x0000 }, + { 0x9a00, 0x2fcd, 0x2000 }, + { 0x1a00, 0x2fcc, 0x0000 }, + { 0x1a00, 0x2fce, 0x0000 }, + { 0x9a00, 0x2ff1, 0x4000 }, + { 0x9a00, 0x2fd3, 0x3000 }, + { 0x9a00, 0x2fd1, 0x2000 }, + { 0x1a00, 0x2fd0, 0x0000 }, + { 0x1a00, 0x2fd2, 0x0000 }, + { 0x9a00, 0x2fd5, 0x2000 }, + { 0x1a00, 0x2fd4, 0x0000 }, + { 0x1a00, 0x2ff0, 0x0000 }, + { 0x9a00, 0x2ff5, 0x3000 }, + { 0x9a00, 0x2ff3, 0x2000 }, + { 0x1a00, 0x2ff2, 0x0000 }, + { 0x1a00, 0x2ff4, 0x0000 }, + { 0x9a00, 0x2ff7, 0x2000 }, + { 0x1a00, 0x2ff6, 0x0000 }, + { 0x1a00, 0x2ff8, 0x0000 }, + { 0x9600, 0x301d, 0x6000 }, + { 0x9200, 0x300d, 0x5000 }, + { 0x8600, 0x3005, 0x4000 }, + { 0x9500, 0x3001, 0x3000 }, + { 0x9a00, 0x2ffb, 0x2000 }, + { 0x1a00, 0x2ffa, 0x0000 }, + { 0x1d00, 0x3000, 0x0000 }, + { 0x9500, 0x3003, 0x2000 }, + { 0x1500, 0x3002, 0x0000 }, + { 0x1a00, 0x3004, 0x0000 }, + { 0x9200, 0x3009, 0x3000 }, + { 0x8e00, 0x3007, 0x2000 }, + { 0x0700, 0x3006, 0x0000 }, + { 0x1600, 0x3008, 0x0000 }, + { 0x9200, 0x300b, 0x2000 }, + { 0x1600, 0x300a, 0x0000 }, + { 0x1600, 0x300c, 0x0000 }, + { 0x9200, 0x3015, 0x4000 }, + { 0x9200, 0x3011, 0x3000 }, + { 0x9200, 0x300f, 0x2000 }, + { 0x1600, 0x300e, 0x0000 }, + { 0x1600, 0x3010, 0x0000 }, + { 0x9a00, 0x3013, 0x2000 }, + { 0x1a00, 0x3012, 0x0000 }, + { 0x1600, 0x3014, 0x0000 }, + { 0x9200, 0x3019, 0x3000 }, + { 0x9200, 0x3017, 0x2000 }, + { 0x1600, 0x3016, 0x0000 }, + { 0x1600, 0x3018, 0x0000 }, + { 0x9200, 0x301b, 0x2000 }, + { 0x1600, 0x301a, 0x0000 }, + { 0x1100, 0x301c, 0x0000 }, + { 0x8c00, 0x302d, 0x5000 }, + { 0x8e00, 0x3025, 0x4000 }, + { 0x8e00, 0x3021, 0x3000 }, + { 0x9200, 0x301f, 0x2000 }, + { 0x1200, 0x301e, 0x0000 }, + { 0x1a00, 0x3020, 0x0000 }, + { 0x8e00, 0x3023, 0x2000 }, + { 0x0e00, 0x3022, 0x0000 }, + { 0x0e00, 0x3024, 0x0000 }, + { 0x8e00, 0x3029, 0x3000 }, + { 0x8e00, 0x3027, 0x2000 }, + { 0x0e00, 0x3026, 0x0000 }, + { 0x0e00, 0x3028, 0x0000 }, + { 0x8c00, 0x302b, 0x2000 }, + { 0x0c00, 0x302a, 0x0000 }, + { 0x0c00, 0x302c, 0x0000 }, + { 0x8600, 0x3035, 0x4000 }, + { 0x8600, 0x3031, 0x3000 }, + { 0x8c00, 0x302f, 0x2000 }, + { 0x0c00, 0x302e, 0x0000 }, + { 0x1100, 0x3030, 0x0000 }, + { 0x8600, 0x3033, 0x2000 }, + { 0x0600, 0x3032, 0x0000 }, + { 0x0600, 0x3034, 0x0000 }, + { 0x8e00, 0x3039, 0x3000 }, + { 0x9a00, 0x3037, 0x2000 }, + { 0x1a00, 0x3036, 0x0000 }, + { 0x0e00, 0x3038, 0x0000 }, + { 0x8600, 0x303b, 0x2000 }, + { 0x0e00, 0x303a, 0x0000 }, + { 0x0700, 0x303c, 0x0000 }, + { 0x8700, 0x30c0, 0x8000 }, + { 0x8700, 0x307e, 0x7000 }, + { 0x8700, 0x305e, 0x6000 }, + { 0x8700, 0x304e, 0x5000 }, + { 0x8700, 0x3046, 0x4000 }, + { 0x8700, 0x3042, 0x3000 }, + { 0x9a00, 0x303f, 0x2000 }, + { 0x1a00, 0x303e, 0x0000 }, + { 0x0700, 0x3041, 0x0000 }, + { 0x8700, 0x3044, 0x2000 }, + { 0x0700, 0x3043, 0x0000 }, + { 0x0700, 0x3045, 0x0000 }, + { 0x8700, 0x304a, 0x3000 }, + { 0x8700, 0x3048, 0x2000 }, + { 0x0700, 0x3047, 0x0000 }, + { 0x0700, 0x3049, 0x0000 }, + { 0x8700, 0x304c, 0x2000 }, + { 0x0700, 0x304b, 0x0000 }, + { 0x0700, 0x304d, 0x0000 }, + { 0x8700, 0x3056, 0x4000 }, + { 0x8700, 0x3052, 0x3000 }, + { 0x8700, 0x3050, 0x2000 }, + { 0x0700, 0x304f, 0x0000 }, + { 0x0700, 0x3051, 0x0000 }, + { 0x8700, 0x3054, 0x2000 }, + { 0x0700, 0x3053, 0x0000 }, + { 0x0700, 0x3055, 0x0000 }, + { 0x8700, 0x305a, 0x3000 }, + { 0x8700, 0x3058, 0x2000 }, + { 0x0700, 0x3057, 0x0000 }, + { 0x0700, 0x3059, 0x0000 }, + { 0x8700, 0x305c, 0x2000 }, + { 0x0700, 0x305b, 0x0000 }, + { 0x0700, 0x305d, 0x0000 }, + { 0x8700, 0x306e, 0x5000 }, + { 0x8700, 0x3066, 0x4000 }, + { 0x8700, 0x3062, 0x3000 }, + { 0x8700, 0x3060, 0x2000 }, + { 0x0700, 0x305f, 0x0000 }, + { 0x0700, 0x3061, 0x0000 }, + { 0x8700, 0x3064, 0x2000 }, + { 0x0700, 0x3063, 0x0000 }, + { 0x0700, 0x3065, 0x0000 }, + { 0x8700, 0x306a, 0x3000 }, + { 0x8700, 0x3068, 0x2000 }, + { 0x0700, 0x3067, 0x0000 }, + { 0x0700, 0x3069, 0x0000 }, + { 0x8700, 0x306c, 0x2000 }, + { 0x0700, 0x306b, 0x0000 }, + { 0x0700, 0x306d, 0x0000 }, + { 0x8700, 0x3076, 0x4000 }, + { 0x8700, 0x3072, 0x3000 }, + { 0x8700, 0x3070, 0x2000 }, + { 0x0700, 0x306f, 0x0000 }, + { 0x0700, 0x3071, 0x0000 }, + { 0x8700, 0x3074, 0x2000 }, + { 0x0700, 0x3073, 0x0000 }, + { 0x0700, 0x3075, 0x0000 }, + { 0x8700, 0x307a, 0x3000 }, + { 0x8700, 0x3078, 0x2000 }, + { 0x0700, 0x3077, 0x0000 }, + { 0x0700, 0x3079, 0x0000 }, + { 0x8700, 0x307c, 0x2000 }, + { 0x0700, 0x307b, 0x0000 }, + { 0x0700, 0x307d, 0x0000 }, + { 0x9100, 0x30a0, 0x6000 }, + { 0x8700, 0x308e, 0x5000 }, + { 0x8700, 0x3086, 0x4000 }, + { 0x8700, 0x3082, 0x3000 }, + { 0x8700, 0x3080, 0x2000 }, + { 0x0700, 0x307f, 0x0000 }, + { 0x0700, 0x3081, 0x0000 }, + { 0x8700, 0x3084, 0x2000 }, + { 0x0700, 0x3083, 0x0000 }, + { 0x0700, 0x3085, 0x0000 }, + { 0x8700, 0x308a, 0x3000 }, + { 0x8700, 0x3088, 0x2000 }, + { 0x0700, 0x3087, 0x0000 }, + { 0x0700, 0x3089, 0x0000 }, + { 0x8700, 0x308c, 0x2000 }, + { 0x0700, 0x308b, 0x0000 }, + { 0x0700, 0x308d, 0x0000 }, + { 0x8700, 0x3096, 0x4000 }, + { 0x8700, 0x3092, 0x3000 }, + { 0x8700, 0x3090, 0x2000 }, + { 0x0700, 0x308f, 0x0000 }, + { 0x0700, 0x3091, 0x0000 }, + { 0x8700, 0x3094, 0x2000 }, + { 0x0700, 0x3093, 0x0000 }, + { 0x0700, 0x3095, 0x0000 }, + { 0x9800, 0x309c, 0x3000 }, + { 0x8c00, 0x309a, 0x2000 }, + { 0x0c00, 0x3099, 0x0000 }, + { 0x1800, 0x309b, 0x0000 }, + { 0x8600, 0x309e, 0x2000 }, + { 0x0600, 0x309d, 0x0000 }, + { 0x0700, 0x309f, 0x0000 }, + { 0x8700, 0x30b0, 0x5000 }, + { 0x8700, 0x30a8, 0x4000 }, + { 0x8700, 0x30a4, 0x3000 }, + { 0x8700, 0x30a2, 0x2000 }, + { 0x0700, 0x30a1, 0x0000 }, + { 0x0700, 0x30a3, 0x0000 }, + { 0x8700, 0x30a6, 0x2000 }, + { 0x0700, 0x30a5, 0x0000 }, + { 0x0700, 0x30a7, 0x0000 }, + { 0x8700, 0x30ac, 0x3000 }, + { 0x8700, 0x30aa, 0x2000 }, + { 0x0700, 0x30a9, 0x0000 }, + { 0x0700, 0x30ab, 0x0000 }, + { 0x8700, 0x30ae, 0x2000 }, + { 0x0700, 0x30ad, 0x0000 }, + { 0x0700, 0x30af, 0x0000 }, + { 0x8700, 0x30b8, 0x4000 }, + { 0x8700, 0x30b4, 0x3000 }, + { 0x8700, 0x30b2, 0x2000 }, + { 0x0700, 0x30b1, 0x0000 }, + { 0x0700, 0x30b3, 0x0000 }, + { 0x8700, 0x30b6, 0x2000 }, + { 0x0700, 0x30b5, 0x0000 }, + { 0x0700, 0x30b7, 0x0000 }, + { 0x8700, 0x30bc, 0x3000 }, + { 0x8700, 0x30ba, 0x2000 }, + { 0x0700, 0x30b9, 0x0000 }, + { 0x0700, 0x30bb, 0x0000 }, + { 0x8700, 0x30be, 0x2000 }, + { 0x0700, 0x30bd, 0x0000 }, + { 0x0700, 0x30bf, 0x0000 }, + { 0x8700, 0x3105, 0x7000 }, + { 0x8700, 0x30e0, 0x6000 }, + { 0x8700, 0x30d0, 0x5000 }, + { 0x8700, 0x30c8, 0x4000 }, + { 0x8700, 0x30c4, 0x3000 }, + { 0x8700, 0x30c2, 0x2000 }, + { 0x0700, 0x30c1, 0x0000 }, + { 0x0700, 0x30c3, 0x0000 }, + { 0x8700, 0x30c6, 0x2000 }, + { 0x0700, 0x30c5, 0x0000 }, + { 0x0700, 0x30c7, 0x0000 }, + { 0x8700, 0x30cc, 0x3000 }, + { 0x8700, 0x30ca, 0x2000 }, + { 0x0700, 0x30c9, 0x0000 }, + { 0x0700, 0x30cb, 0x0000 }, + { 0x8700, 0x30ce, 0x2000 }, + { 0x0700, 0x30cd, 0x0000 }, + { 0x0700, 0x30cf, 0x0000 }, + { 0x8700, 0x30d8, 0x4000 }, + { 0x8700, 0x30d4, 0x3000 }, + { 0x8700, 0x30d2, 0x2000 }, + { 0x0700, 0x30d1, 0x0000 }, + { 0x0700, 0x30d3, 0x0000 }, + { 0x8700, 0x30d6, 0x2000 }, + { 0x0700, 0x30d5, 0x0000 }, + { 0x0700, 0x30d7, 0x0000 }, + { 0x8700, 0x30dc, 0x3000 }, + { 0x8700, 0x30da, 0x2000 }, + { 0x0700, 0x30d9, 0x0000 }, + { 0x0700, 0x30db, 0x0000 }, + { 0x8700, 0x30de, 0x2000 }, + { 0x0700, 0x30dd, 0x0000 }, + { 0x0700, 0x30df, 0x0000 }, + { 0x8700, 0x30f0, 0x5000 }, + { 0x8700, 0x30e8, 0x4000 }, + { 0x8700, 0x30e4, 0x3000 }, + { 0x8700, 0x30e2, 0x2000 }, + { 0x0700, 0x30e1, 0x0000 }, + { 0x0700, 0x30e3, 0x0000 }, + { 0x8700, 0x30e6, 0x2000 }, + { 0x0700, 0x30e5, 0x0000 }, + { 0x0700, 0x30e7, 0x0000 }, + { 0x8700, 0x30ec, 0x3000 }, + { 0x8700, 0x30ea, 0x2000 }, + { 0x0700, 0x30e9, 0x0000 }, + { 0x0700, 0x30eb, 0x0000 }, + { 0x8700, 0x30ee, 0x2000 }, + { 0x0700, 0x30ed, 0x0000 }, + { 0x0700, 0x30ef, 0x0000 }, + { 0x8700, 0x30f8, 0x4000 }, + { 0x8700, 0x30f4, 0x3000 }, + { 0x8700, 0x30f2, 0x2000 }, + { 0x0700, 0x30f1, 0x0000 }, + { 0x0700, 0x30f3, 0x0000 }, + { 0x8700, 0x30f6, 0x2000 }, + { 0x0700, 0x30f5, 0x0000 }, + { 0x0700, 0x30f7, 0x0000 }, + { 0x8600, 0x30fc, 0x3000 }, + { 0x8700, 0x30fa, 0x2000 }, + { 0x0700, 0x30f9, 0x0000 }, + { 0x1000, 0x30fb, 0x0000 }, + { 0x8600, 0x30fe, 0x2000 }, + { 0x0600, 0x30fd, 0x0000 }, + { 0x0700, 0x30ff, 0x0000 }, + { 0x8700, 0x3125, 0x6000 }, + { 0x8700, 0x3115, 0x5000 }, + { 0x8700, 0x310d, 0x4000 }, + { 0x8700, 0x3109, 0x3000 }, + { 0x8700, 0x3107, 0x2000 }, + { 0x0700, 0x3106, 0x0000 }, + { 0x0700, 0x3108, 0x0000 }, + { 0x8700, 0x310b, 0x2000 }, + { 0x0700, 0x310a, 0x0000 }, + { 0x0700, 0x310c, 0x0000 }, + { 0x8700, 0x3111, 0x3000 }, + { 0x8700, 0x310f, 0x2000 }, + { 0x0700, 0x310e, 0x0000 }, + { 0x0700, 0x3110, 0x0000 }, + { 0x8700, 0x3113, 0x2000 }, + { 0x0700, 0x3112, 0x0000 }, + { 0x0700, 0x3114, 0x0000 }, + { 0x8700, 0x311d, 0x4000 }, + { 0x8700, 0x3119, 0x3000 }, + { 0x8700, 0x3117, 0x2000 }, + { 0x0700, 0x3116, 0x0000 }, + { 0x0700, 0x3118, 0x0000 }, + { 0x8700, 0x311b, 0x2000 }, + { 0x0700, 0x311a, 0x0000 }, + { 0x0700, 0x311c, 0x0000 }, + { 0x8700, 0x3121, 0x3000 }, + { 0x8700, 0x311f, 0x2000 }, + { 0x0700, 0x311e, 0x0000 }, + { 0x0700, 0x3120, 0x0000 }, + { 0x8700, 0x3123, 0x2000 }, + { 0x0700, 0x3122, 0x0000 }, + { 0x0700, 0x3124, 0x0000 }, + { 0x8700, 0x3139, 0x5000 }, + { 0x8700, 0x3131, 0x4000 }, + { 0x8700, 0x3129, 0x3000 }, + { 0x8700, 0x3127, 0x2000 }, + { 0x0700, 0x3126, 0x0000 }, + { 0x0700, 0x3128, 0x0000 }, + { 0x8700, 0x312b, 0x2000 }, + { 0x0700, 0x312a, 0x0000 }, + { 0x0700, 0x312c, 0x0000 }, + { 0x8700, 0x3135, 0x3000 }, + { 0x8700, 0x3133, 0x2000 }, + { 0x0700, 0x3132, 0x0000 }, + { 0x0700, 0x3134, 0x0000 }, + { 0x8700, 0x3137, 0x2000 }, + { 0x0700, 0x3136, 0x0000 }, + { 0x0700, 0x3138, 0x0000 }, + { 0x8700, 0x3141, 0x4000 }, + { 0x8700, 0x313d, 0x3000 }, + { 0x8700, 0x313b, 0x2000 }, + { 0x0700, 0x313a, 0x0000 }, + { 0x0700, 0x313c, 0x0000 }, + { 0x8700, 0x313f, 0x2000 }, + { 0x0700, 0x313e, 0x0000 }, + { 0x0700, 0x3140, 0x0000 }, + { 0x8700, 0x3145, 0x3000 }, + { 0x8700, 0x3143, 0x2000 }, + { 0x0700, 0x3142, 0x0000 }, + { 0x0700, 0x3144, 0x0000 }, + { 0x8700, 0x3147, 0x2000 }, + { 0x0700, 0x3146, 0x0000 }, + { 0x0700, 0x3148, 0x0000 }, + { 0x9a00, 0x3290, 0x9000 }, + { 0x9a00, 0x3202, 0x8000 }, + { 0x8700, 0x3189, 0x7000 }, + { 0x8700, 0x3169, 0x6000 }, + { 0x8700, 0x3159, 0x5000 }, + { 0x8700, 0x3151, 0x4000 }, + { 0x8700, 0x314d, 0x3000 }, + { 0x8700, 0x314b, 0x2000 }, + { 0x0700, 0x314a, 0x0000 }, + { 0x0700, 0x314c, 0x0000 }, + { 0x8700, 0x314f, 0x2000 }, + { 0x0700, 0x314e, 0x0000 }, + { 0x0700, 0x3150, 0x0000 }, + { 0x8700, 0x3155, 0x3000 }, + { 0x8700, 0x3153, 0x2000 }, + { 0x0700, 0x3152, 0x0000 }, + { 0x0700, 0x3154, 0x0000 }, + { 0x8700, 0x3157, 0x2000 }, + { 0x0700, 0x3156, 0x0000 }, + { 0x0700, 0x3158, 0x0000 }, + { 0x8700, 0x3161, 0x4000 }, + { 0x8700, 0x315d, 0x3000 }, + { 0x8700, 0x315b, 0x2000 }, + { 0x0700, 0x315a, 0x0000 }, + { 0x0700, 0x315c, 0x0000 }, + { 0x8700, 0x315f, 0x2000 }, + { 0x0700, 0x315e, 0x0000 }, + { 0x0700, 0x3160, 0x0000 }, + { 0x8700, 0x3165, 0x3000 }, + { 0x8700, 0x3163, 0x2000 }, + { 0x0700, 0x3162, 0x0000 }, + { 0x0700, 0x3164, 0x0000 }, + { 0x8700, 0x3167, 0x2000 }, + { 0x0700, 0x3166, 0x0000 }, + { 0x0700, 0x3168, 0x0000 }, + { 0x8700, 0x3179, 0x5000 }, + { 0x8700, 0x3171, 0x4000 }, + { 0x8700, 0x316d, 0x3000 }, + { 0x8700, 0x316b, 0x2000 }, + { 0x0700, 0x316a, 0x0000 }, + { 0x0700, 0x316c, 0x0000 }, + { 0x8700, 0x316f, 0x2000 }, + { 0x0700, 0x316e, 0x0000 }, + { 0x0700, 0x3170, 0x0000 }, + { 0x8700, 0x3175, 0x3000 }, + { 0x8700, 0x3173, 0x2000 }, + { 0x0700, 0x3172, 0x0000 }, + { 0x0700, 0x3174, 0x0000 }, + { 0x8700, 0x3177, 0x2000 }, + { 0x0700, 0x3176, 0x0000 }, + { 0x0700, 0x3178, 0x0000 }, + { 0x8700, 0x3181, 0x4000 }, + { 0x8700, 0x317d, 0x3000 }, + { 0x8700, 0x317b, 0x2000 }, + { 0x0700, 0x317a, 0x0000 }, + { 0x0700, 0x317c, 0x0000 }, + { 0x8700, 0x317f, 0x2000 }, + { 0x0700, 0x317e, 0x0000 }, + { 0x0700, 0x3180, 0x0000 }, + { 0x8700, 0x3185, 0x3000 }, + { 0x8700, 0x3183, 0x2000 }, + { 0x0700, 0x3182, 0x0000 }, + { 0x0700, 0x3184, 0x0000 }, + { 0x8700, 0x3187, 0x2000 }, + { 0x0700, 0x3186, 0x0000 }, + { 0x0700, 0x3188, 0x0000 }, + { 0x8700, 0x31aa, 0x6000 }, + { 0x9a00, 0x319a, 0x5000 }, + { 0x8f00, 0x3192, 0x4000 }, + { 0x8700, 0x318d, 0x3000 }, + { 0x8700, 0x318b, 0x2000 }, + { 0x0700, 0x318a, 0x0000 }, + { 0x0700, 0x318c, 0x0000 }, + { 0x9a00, 0x3190, 0x2000 }, + { 0x0700, 0x318e, 0x0000 }, + { 0x1a00, 0x3191, 0x0000 }, + { 0x9a00, 0x3196, 0x3000 }, + { 0x8f00, 0x3194, 0x2000 }, + { 0x0f00, 0x3193, 0x0000 }, + { 0x0f00, 0x3195, 0x0000 }, + { 0x9a00, 0x3198, 0x2000 }, + { 0x1a00, 0x3197, 0x0000 }, + { 0x1a00, 0x3199, 0x0000 }, + { 0x8700, 0x31a2, 0x4000 }, + { 0x9a00, 0x319e, 0x3000 }, + { 0x9a00, 0x319c, 0x2000 }, + { 0x1a00, 0x319b, 0x0000 }, + { 0x1a00, 0x319d, 0x0000 }, + { 0x8700, 0x31a0, 0x2000 }, + { 0x1a00, 0x319f, 0x0000 }, + { 0x0700, 0x31a1, 0x0000 }, + { 0x8700, 0x31a6, 0x3000 }, + { 0x8700, 0x31a4, 0x2000 }, + { 0x0700, 0x31a3, 0x0000 }, + { 0x0700, 0x31a5, 0x0000 }, + { 0x8700, 0x31a8, 0x2000 }, + { 0x0700, 0x31a7, 0x0000 }, + { 0x0700, 0x31a9, 0x0000 }, + { 0x8700, 0x31f2, 0x5000 }, + { 0x8700, 0x31b2, 0x4000 }, + { 0x8700, 0x31ae, 0x3000 }, + { 0x8700, 0x31ac, 0x2000 }, + { 0x0700, 0x31ab, 0x0000 }, + { 0x0700, 0x31ad, 0x0000 }, + { 0x8700, 0x31b0, 0x2000 }, + { 0x0700, 0x31af, 0x0000 }, + { 0x0700, 0x31b1, 0x0000 }, + { 0x8700, 0x31b6, 0x3000 }, + { 0x8700, 0x31b4, 0x2000 }, + { 0x0700, 0x31b3, 0x0000 }, + { 0x0700, 0x31b5, 0x0000 }, + { 0x8700, 0x31f0, 0x2000 }, + { 0x0700, 0x31b7, 0x0000 }, + { 0x0700, 0x31f1, 0x0000 }, + { 0x8700, 0x31fa, 0x4000 }, + { 0x8700, 0x31f6, 0x3000 }, + { 0x8700, 0x31f4, 0x2000 }, + { 0x0700, 0x31f3, 0x0000 }, + { 0x0700, 0x31f5, 0x0000 }, + { 0x8700, 0x31f8, 0x2000 }, + { 0x0700, 0x31f7, 0x0000 }, + { 0x0700, 0x31f9, 0x0000 }, + { 0x8700, 0x31fe, 0x3000 }, + { 0x8700, 0x31fc, 0x2000 }, + { 0x0700, 0x31fb, 0x0000 }, + { 0x0700, 0x31fd, 0x0000 }, + { 0x9a00, 0x3200, 0x2000 }, + { 0x0700, 0x31ff, 0x0000 }, + { 0x1a00, 0x3201, 0x0000 }, + { 0x9a00, 0x3243, 0x7000 }, + { 0x8f00, 0x3223, 0x6000 }, + { 0x9a00, 0x3212, 0x5000 }, + { 0x9a00, 0x320a, 0x4000 }, + { 0x9a00, 0x3206, 0x3000 }, + { 0x9a00, 0x3204, 0x2000 }, + { 0x1a00, 0x3203, 0x0000 }, + { 0x1a00, 0x3205, 0x0000 }, + { 0x9a00, 0x3208, 0x2000 }, + { 0x1a00, 0x3207, 0x0000 }, + { 0x1a00, 0x3209, 0x0000 }, + { 0x9a00, 0x320e, 0x3000 }, + { 0x9a00, 0x320c, 0x2000 }, + { 0x1a00, 0x320b, 0x0000 }, + { 0x1a00, 0x320d, 0x0000 }, + { 0x9a00, 0x3210, 0x2000 }, + { 0x1a00, 0x320f, 0x0000 }, + { 0x1a00, 0x3211, 0x0000 }, + { 0x9a00, 0x321a, 0x4000 }, + { 0x9a00, 0x3216, 0x3000 }, + { 0x9a00, 0x3214, 0x2000 }, + { 0x1a00, 0x3213, 0x0000 }, + { 0x1a00, 0x3215, 0x0000 }, + { 0x9a00, 0x3218, 0x2000 }, + { 0x1a00, 0x3217, 0x0000 }, + { 0x1a00, 0x3219, 0x0000 }, + { 0x9a00, 0x321e, 0x3000 }, + { 0x9a00, 0x321c, 0x2000 }, + { 0x1a00, 0x321b, 0x0000 }, + { 0x1a00, 0x321d, 0x0000 }, + { 0x8f00, 0x3221, 0x2000 }, + { 0x0f00, 0x3220, 0x0000 }, + { 0x0f00, 0x3222, 0x0000 }, + { 0x9a00, 0x3233, 0x5000 }, + { 0x9a00, 0x322b, 0x4000 }, + { 0x8f00, 0x3227, 0x3000 }, + { 0x8f00, 0x3225, 0x2000 }, + { 0x0f00, 0x3224, 0x0000 }, + { 0x0f00, 0x3226, 0x0000 }, + { 0x8f00, 0x3229, 0x2000 }, + { 0x0f00, 0x3228, 0x0000 }, + { 0x1a00, 0x322a, 0x0000 }, + { 0x9a00, 0x322f, 0x3000 }, + { 0x9a00, 0x322d, 0x2000 }, + { 0x1a00, 0x322c, 0x0000 }, + { 0x1a00, 0x322e, 0x0000 }, + { 0x9a00, 0x3231, 0x2000 }, + { 0x1a00, 0x3230, 0x0000 }, + { 0x1a00, 0x3232, 0x0000 }, + { 0x9a00, 0x323b, 0x4000 }, + { 0x9a00, 0x3237, 0x3000 }, + { 0x9a00, 0x3235, 0x2000 }, + { 0x1a00, 0x3234, 0x0000 }, + { 0x1a00, 0x3236, 0x0000 }, + { 0x9a00, 0x3239, 0x2000 }, + { 0x1a00, 0x3238, 0x0000 }, + { 0x1a00, 0x323a, 0x0000 }, + { 0x9a00, 0x323f, 0x3000 }, + { 0x9a00, 0x323d, 0x2000 }, + { 0x1a00, 0x323c, 0x0000 }, + { 0x1a00, 0x323e, 0x0000 }, + { 0x9a00, 0x3241, 0x2000 }, + { 0x1a00, 0x3240, 0x0000 }, + { 0x1a00, 0x3242, 0x0000 }, + { 0x9a00, 0x326f, 0x6000 }, + { 0x8f00, 0x325f, 0x5000 }, + { 0x8f00, 0x3257, 0x4000 }, + { 0x8f00, 0x3253, 0x3000 }, + { 0x8f00, 0x3251, 0x2000 }, + { 0x1a00, 0x3250, 0x0000 }, + { 0x0f00, 0x3252, 0x0000 }, + { 0x8f00, 0x3255, 0x2000 }, + { 0x0f00, 0x3254, 0x0000 }, + { 0x0f00, 0x3256, 0x0000 }, + { 0x8f00, 0x325b, 0x3000 }, + { 0x8f00, 0x3259, 0x2000 }, + { 0x0f00, 0x3258, 0x0000 }, + { 0x0f00, 0x325a, 0x0000 }, + { 0x8f00, 0x325d, 0x2000 }, + { 0x0f00, 0x325c, 0x0000 }, + { 0x0f00, 0x325e, 0x0000 }, + { 0x9a00, 0x3267, 0x4000 }, + { 0x9a00, 0x3263, 0x3000 }, + { 0x9a00, 0x3261, 0x2000 }, + { 0x1a00, 0x3260, 0x0000 }, + { 0x1a00, 0x3262, 0x0000 }, + { 0x9a00, 0x3265, 0x2000 }, + { 0x1a00, 0x3264, 0x0000 }, + { 0x1a00, 0x3266, 0x0000 }, + { 0x9a00, 0x326b, 0x3000 }, + { 0x9a00, 0x3269, 0x2000 }, + { 0x1a00, 0x3268, 0x0000 }, + { 0x1a00, 0x326a, 0x0000 }, + { 0x9a00, 0x326d, 0x2000 }, + { 0x1a00, 0x326c, 0x0000 }, + { 0x1a00, 0x326e, 0x0000 }, + { 0x8f00, 0x3280, 0x5000 }, + { 0x9a00, 0x3277, 0x4000 }, + { 0x9a00, 0x3273, 0x3000 }, + { 0x9a00, 0x3271, 0x2000 }, + { 0x1a00, 0x3270, 0x0000 }, + { 0x1a00, 0x3272, 0x0000 }, + { 0x9a00, 0x3275, 0x2000 }, + { 0x1a00, 0x3274, 0x0000 }, + { 0x1a00, 0x3276, 0x0000 }, + { 0x9a00, 0x327b, 0x3000 }, + { 0x9a00, 0x3279, 0x2000 }, + { 0x1a00, 0x3278, 0x0000 }, + { 0x1a00, 0x327a, 0x0000 }, + { 0x9a00, 0x327d, 0x2000 }, + { 0x1a00, 0x327c, 0x0000 }, + { 0x1a00, 0x327f, 0x0000 }, + { 0x8f00, 0x3288, 0x4000 }, + { 0x8f00, 0x3284, 0x3000 }, + { 0x8f00, 0x3282, 0x2000 }, + { 0x0f00, 0x3281, 0x0000 }, + { 0x0f00, 0x3283, 0x0000 }, + { 0x8f00, 0x3286, 0x2000 }, + { 0x0f00, 0x3285, 0x0000 }, + { 0x0f00, 0x3287, 0x0000 }, + { 0x9a00, 0x328c, 0x3000 }, + { 0x9a00, 0x328a, 0x2000 }, + { 0x0f00, 0x3289, 0x0000 }, + { 0x1a00, 0x328b, 0x0000 }, + { 0x9a00, 0x328e, 0x2000 }, + { 0x1a00, 0x328d, 0x0000 }, + { 0x1a00, 0x328f, 0x0000 }, + { 0x9a00, 0x3311, 0x8000 }, + { 0x9a00, 0x32d0, 0x7000 }, + { 0x9a00, 0x32b0, 0x6000 }, + { 0x9a00, 0x32a0, 0x5000 }, + { 0x9a00, 0x3298, 0x4000 }, + { 0x9a00, 0x3294, 0x3000 }, + { 0x9a00, 0x3292, 0x2000 }, + { 0x1a00, 0x3291, 0x0000 }, + { 0x1a00, 0x3293, 0x0000 }, + { 0x9a00, 0x3296, 0x2000 }, + { 0x1a00, 0x3295, 0x0000 }, + { 0x1a00, 0x3297, 0x0000 }, + { 0x9a00, 0x329c, 0x3000 }, + { 0x9a00, 0x329a, 0x2000 }, + { 0x1a00, 0x3299, 0x0000 }, + { 0x1a00, 0x329b, 0x0000 }, + { 0x9a00, 0x329e, 0x2000 }, + { 0x1a00, 0x329d, 0x0000 }, + { 0x1a00, 0x329f, 0x0000 }, + { 0x9a00, 0x32a8, 0x4000 }, + { 0x9a00, 0x32a4, 0x3000 }, + { 0x9a00, 0x32a2, 0x2000 }, + { 0x1a00, 0x32a1, 0x0000 }, + { 0x1a00, 0x32a3, 0x0000 }, + { 0x9a00, 0x32a6, 0x2000 }, + { 0x1a00, 0x32a5, 0x0000 }, + { 0x1a00, 0x32a7, 0x0000 }, + { 0x9a00, 0x32ac, 0x3000 }, + { 0x9a00, 0x32aa, 0x2000 }, + { 0x1a00, 0x32a9, 0x0000 }, + { 0x1a00, 0x32ab, 0x0000 }, + { 0x9a00, 0x32ae, 0x2000 }, + { 0x1a00, 0x32ad, 0x0000 }, + { 0x1a00, 0x32af, 0x0000 }, + { 0x9a00, 0x32c0, 0x5000 }, + { 0x8f00, 0x32b8, 0x4000 }, + { 0x8f00, 0x32b4, 0x3000 }, + { 0x8f00, 0x32b2, 0x2000 }, + { 0x0f00, 0x32b1, 0x0000 }, + { 0x0f00, 0x32b3, 0x0000 }, + { 0x8f00, 0x32b6, 0x2000 }, + { 0x0f00, 0x32b5, 0x0000 }, + { 0x0f00, 0x32b7, 0x0000 }, + { 0x8f00, 0x32bc, 0x3000 }, + { 0x8f00, 0x32ba, 0x2000 }, + { 0x0f00, 0x32b9, 0x0000 }, + { 0x0f00, 0x32bb, 0x0000 }, + { 0x8f00, 0x32be, 0x2000 }, + { 0x0f00, 0x32bd, 0x0000 }, + { 0x0f00, 0x32bf, 0x0000 }, + { 0x9a00, 0x32c8, 0x4000 }, + { 0x9a00, 0x32c4, 0x3000 }, + { 0x9a00, 0x32c2, 0x2000 }, + { 0x1a00, 0x32c1, 0x0000 }, + { 0x1a00, 0x32c3, 0x0000 }, + { 0x9a00, 0x32c6, 0x2000 }, + { 0x1a00, 0x32c5, 0x0000 }, + { 0x1a00, 0x32c7, 0x0000 }, + { 0x9a00, 0x32cc, 0x3000 }, + { 0x9a00, 0x32ca, 0x2000 }, + { 0x1a00, 0x32c9, 0x0000 }, + { 0x1a00, 0x32cb, 0x0000 }, + { 0x9a00, 0x32ce, 0x2000 }, + { 0x1a00, 0x32cd, 0x0000 }, + { 0x1a00, 0x32cf, 0x0000 }, + { 0x9a00, 0x32f0, 0x6000 }, + { 0x9a00, 0x32e0, 0x5000 }, + { 0x9a00, 0x32d8, 0x4000 }, + { 0x9a00, 0x32d4, 0x3000 }, + { 0x9a00, 0x32d2, 0x2000 }, + { 0x1a00, 0x32d1, 0x0000 }, + { 0x1a00, 0x32d3, 0x0000 }, + { 0x9a00, 0x32d6, 0x2000 }, + { 0x1a00, 0x32d5, 0x0000 }, + { 0x1a00, 0x32d7, 0x0000 }, + { 0x9a00, 0x32dc, 0x3000 }, + { 0x9a00, 0x32da, 0x2000 }, + { 0x1a00, 0x32d9, 0x0000 }, + { 0x1a00, 0x32db, 0x0000 }, + { 0x9a00, 0x32de, 0x2000 }, + { 0x1a00, 0x32dd, 0x0000 }, + { 0x1a00, 0x32df, 0x0000 }, + { 0x9a00, 0x32e8, 0x4000 }, + { 0x9a00, 0x32e4, 0x3000 }, + { 0x9a00, 0x32e2, 0x2000 }, + { 0x1a00, 0x32e1, 0x0000 }, + { 0x1a00, 0x32e3, 0x0000 }, + { 0x9a00, 0x32e6, 0x2000 }, + { 0x1a00, 0x32e5, 0x0000 }, + { 0x1a00, 0x32e7, 0x0000 }, + { 0x9a00, 0x32ec, 0x3000 }, + { 0x9a00, 0x32ea, 0x2000 }, + { 0x1a00, 0x32e9, 0x0000 }, + { 0x1a00, 0x32eb, 0x0000 }, + { 0x9a00, 0x32ee, 0x2000 }, + { 0x1a00, 0x32ed, 0x0000 }, + { 0x1a00, 0x32ef, 0x0000 }, + { 0x9a00, 0x3301, 0x5000 }, + { 0x9a00, 0x32f8, 0x4000 }, + { 0x9a00, 0x32f4, 0x3000 }, + { 0x9a00, 0x32f2, 0x2000 }, + { 0x1a00, 0x32f1, 0x0000 }, + { 0x1a00, 0x32f3, 0x0000 }, + { 0x9a00, 0x32f6, 0x2000 }, + { 0x1a00, 0x32f5, 0x0000 }, + { 0x1a00, 0x32f7, 0x0000 }, + { 0x9a00, 0x32fc, 0x3000 }, + { 0x9a00, 0x32fa, 0x2000 }, + { 0x1a00, 0x32f9, 0x0000 }, + { 0x1a00, 0x32fb, 0x0000 }, + { 0x9a00, 0x32fe, 0x2000 }, + { 0x1a00, 0x32fd, 0x0000 }, + { 0x1a00, 0x3300, 0x0000 }, + { 0x9a00, 0x3309, 0x4000 }, + { 0x9a00, 0x3305, 0x3000 }, + { 0x9a00, 0x3303, 0x2000 }, + { 0x1a00, 0x3302, 0x0000 }, + { 0x1a00, 0x3304, 0x0000 }, + { 0x9a00, 0x3307, 0x2000 }, + { 0x1a00, 0x3306, 0x0000 }, + { 0x1a00, 0x3308, 0x0000 }, + { 0x9a00, 0x330d, 0x3000 }, + { 0x9a00, 0x330b, 0x2000 }, + { 0x1a00, 0x330a, 0x0000 }, + { 0x1a00, 0x330c, 0x0000 }, + { 0x9a00, 0x330f, 0x2000 }, + { 0x1a00, 0x330e, 0x0000 }, + { 0x1a00, 0x3310, 0x0000 }, + { 0x9a00, 0x3351, 0x7000 }, + { 0x9a00, 0x3331, 0x6000 }, + { 0x9a00, 0x3321, 0x5000 }, + { 0x9a00, 0x3319, 0x4000 }, + { 0x9a00, 0x3315, 0x3000 }, + { 0x9a00, 0x3313, 0x2000 }, + { 0x1a00, 0x3312, 0x0000 }, + { 0x1a00, 0x3314, 0x0000 }, + { 0x9a00, 0x3317, 0x2000 }, + { 0x1a00, 0x3316, 0x0000 }, + { 0x1a00, 0x3318, 0x0000 }, + { 0x9a00, 0x331d, 0x3000 }, + { 0x9a00, 0x331b, 0x2000 }, + { 0x1a00, 0x331a, 0x0000 }, + { 0x1a00, 0x331c, 0x0000 }, + { 0x9a00, 0x331f, 0x2000 }, + { 0x1a00, 0x331e, 0x0000 }, + { 0x1a00, 0x3320, 0x0000 }, + { 0x9a00, 0x3329, 0x4000 }, + { 0x9a00, 0x3325, 0x3000 }, + { 0x9a00, 0x3323, 0x2000 }, + { 0x1a00, 0x3322, 0x0000 }, + { 0x1a00, 0x3324, 0x0000 }, + { 0x9a00, 0x3327, 0x2000 }, + { 0x1a00, 0x3326, 0x0000 }, + { 0x1a00, 0x3328, 0x0000 }, + { 0x9a00, 0x332d, 0x3000 }, + { 0x9a00, 0x332b, 0x2000 }, + { 0x1a00, 0x332a, 0x0000 }, + { 0x1a00, 0x332c, 0x0000 }, + { 0x9a00, 0x332f, 0x2000 }, + { 0x1a00, 0x332e, 0x0000 }, + { 0x1a00, 0x3330, 0x0000 }, + { 0x9a00, 0x3341, 0x5000 }, + { 0x9a00, 0x3339, 0x4000 }, + { 0x9a00, 0x3335, 0x3000 }, + { 0x9a00, 0x3333, 0x2000 }, + { 0x1a00, 0x3332, 0x0000 }, + { 0x1a00, 0x3334, 0x0000 }, + { 0x9a00, 0x3337, 0x2000 }, + { 0x1a00, 0x3336, 0x0000 }, + { 0x1a00, 0x3338, 0x0000 }, + { 0x9a00, 0x333d, 0x3000 }, + { 0x9a00, 0x333b, 0x2000 }, + { 0x1a00, 0x333a, 0x0000 }, + { 0x1a00, 0x333c, 0x0000 }, + { 0x9a00, 0x333f, 0x2000 }, + { 0x1a00, 0x333e, 0x0000 }, + { 0x1a00, 0x3340, 0x0000 }, + { 0x9a00, 0x3349, 0x4000 }, + { 0x9a00, 0x3345, 0x3000 }, + { 0x9a00, 0x3343, 0x2000 }, + { 0x1a00, 0x3342, 0x0000 }, + { 0x1a00, 0x3344, 0x0000 }, + { 0x9a00, 0x3347, 0x2000 }, + { 0x1a00, 0x3346, 0x0000 }, + { 0x1a00, 0x3348, 0x0000 }, + { 0x9a00, 0x334d, 0x3000 }, + { 0x9a00, 0x334b, 0x2000 }, + { 0x1a00, 0x334a, 0x0000 }, + { 0x1a00, 0x334c, 0x0000 }, + { 0x9a00, 0x334f, 0x2000 }, + { 0x1a00, 0x334e, 0x0000 }, + { 0x1a00, 0x3350, 0x0000 }, + { 0x9a00, 0x3371, 0x6000 }, + { 0x9a00, 0x3361, 0x5000 }, + { 0x9a00, 0x3359, 0x4000 }, + { 0x9a00, 0x3355, 0x3000 }, + { 0x9a00, 0x3353, 0x2000 }, + { 0x1a00, 0x3352, 0x0000 }, + { 0x1a00, 0x3354, 0x0000 }, + { 0x9a00, 0x3357, 0x2000 }, + { 0x1a00, 0x3356, 0x0000 }, + { 0x1a00, 0x3358, 0x0000 }, + { 0x9a00, 0x335d, 0x3000 }, + { 0x9a00, 0x335b, 0x2000 }, + { 0x1a00, 0x335a, 0x0000 }, + { 0x1a00, 0x335c, 0x0000 }, + { 0x9a00, 0x335f, 0x2000 }, + { 0x1a00, 0x335e, 0x0000 }, + { 0x1a00, 0x3360, 0x0000 }, + { 0x9a00, 0x3369, 0x4000 }, + { 0x9a00, 0x3365, 0x3000 }, + { 0x9a00, 0x3363, 0x2000 }, + { 0x1a00, 0x3362, 0x0000 }, + { 0x1a00, 0x3364, 0x0000 }, + { 0x9a00, 0x3367, 0x2000 }, + { 0x1a00, 0x3366, 0x0000 }, + { 0x1a00, 0x3368, 0x0000 }, + { 0x9a00, 0x336d, 0x3000 }, + { 0x9a00, 0x336b, 0x2000 }, + { 0x1a00, 0x336a, 0x0000 }, + { 0x1a00, 0x336c, 0x0000 }, + { 0x9a00, 0x336f, 0x2000 }, + { 0x1a00, 0x336e, 0x0000 }, + { 0x1a00, 0x3370, 0x0000 }, + { 0x9a00, 0x3381, 0x5000 }, + { 0x9a00, 0x3379, 0x4000 }, + { 0x9a00, 0x3375, 0x3000 }, + { 0x9a00, 0x3373, 0x2000 }, + { 0x1a00, 0x3372, 0x0000 }, + { 0x1a00, 0x3374, 0x0000 }, + { 0x9a00, 0x3377, 0x2000 }, + { 0x1a00, 0x3376, 0x0000 }, + { 0x1a00, 0x3378, 0x0000 }, + { 0x9a00, 0x337d, 0x3000 }, + { 0x9a00, 0x337b, 0x2000 }, + { 0x1a00, 0x337a, 0x0000 }, + { 0x1a00, 0x337c, 0x0000 }, + { 0x9a00, 0x337f, 0x2000 }, + { 0x1a00, 0x337e, 0x0000 }, + { 0x1a00, 0x3380, 0x0000 }, + { 0x9a00, 0x3389, 0x4000 }, + { 0x9a00, 0x3385, 0x3000 }, + { 0x9a00, 0x3383, 0x2000 }, + { 0x1a00, 0x3382, 0x0000 }, + { 0x1a00, 0x3384, 0x0000 }, + { 0x9a00, 0x3387, 0x2000 }, + { 0x1a00, 0x3386, 0x0000 }, + { 0x1a00, 0x3388, 0x0000 }, + { 0x9a00, 0x338d, 0x3000 }, + { 0x9a00, 0x338b, 0x2000 }, + { 0x1a00, 0x338a, 0x0000 }, + { 0x1a00, 0x338c, 0x0000 }, + { 0x9a00, 0x338f, 0x2000 }, + { 0x1a00, 0x338e, 0x0000 }, + { 0x1a00, 0x3390, 0x0000 }, + { 0x8700, 0xa14d, 0xa000 }, + { 0x8700, 0xa04d, 0x9000 }, + { 0x9a00, 0x4dcf, 0x8000 }, + { 0x9a00, 0x33d1, 0x7000 }, + { 0x9a00, 0x33b1, 0x6000 }, + { 0x9a00, 0x33a1, 0x5000 }, + { 0x9a00, 0x3399, 0x4000 }, + { 0x9a00, 0x3395, 0x3000 }, + { 0x9a00, 0x3393, 0x2000 }, + { 0x1a00, 0x3392, 0x0000 }, + { 0x1a00, 0x3394, 0x0000 }, + { 0x9a00, 0x3397, 0x2000 }, + { 0x1a00, 0x3396, 0x0000 }, + { 0x1a00, 0x3398, 0x0000 }, + { 0x9a00, 0x339d, 0x3000 }, + { 0x9a00, 0x339b, 0x2000 }, + { 0x1a00, 0x339a, 0x0000 }, + { 0x1a00, 0x339c, 0x0000 }, + { 0x9a00, 0x339f, 0x2000 }, + { 0x1a00, 0x339e, 0x0000 }, + { 0x1a00, 0x33a0, 0x0000 }, + { 0x9a00, 0x33a9, 0x4000 }, + { 0x9a00, 0x33a5, 0x3000 }, + { 0x9a00, 0x33a3, 0x2000 }, + { 0x1a00, 0x33a2, 0x0000 }, + { 0x1a00, 0x33a4, 0x0000 }, + { 0x9a00, 0x33a7, 0x2000 }, + { 0x1a00, 0x33a6, 0x0000 }, + { 0x1a00, 0x33a8, 0x0000 }, + { 0x9a00, 0x33ad, 0x3000 }, + { 0x9a00, 0x33ab, 0x2000 }, + { 0x1a00, 0x33aa, 0x0000 }, + { 0x1a00, 0x33ac, 0x0000 }, + { 0x9a00, 0x33af, 0x2000 }, + { 0x1a00, 0x33ae, 0x0000 }, + { 0x1a00, 0x33b0, 0x0000 }, + { 0x9a00, 0x33c1, 0x5000 }, + { 0x9a00, 0x33b9, 0x4000 }, + { 0x9a00, 0x33b5, 0x3000 }, + { 0x9a00, 0x33b3, 0x2000 }, + { 0x1a00, 0x33b2, 0x0000 }, + { 0x1a00, 0x33b4, 0x0000 }, + { 0x9a00, 0x33b7, 0x2000 }, + { 0x1a00, 0x33b6, 0x0000 }, + { 0x1a00, 0x33b8, 0x0000 }, + { 0x9a00, 0x33bd, 0x3000 }, + { 0x9a00, 0x33bb, 0x2000 }, + { 0x1a00, 0x33ba, 0x0000 }, + { 0x1a00, 0x33bc, 0x0000 }, + { 0x9a00, 0x33bf, 0x2000 }, + { 0x1a00, 0x33be, 0x0000 }, + { 0x1a00, 0x33c0, 0x0000 }, + { 0x9a00, 0x33c9, 0x4000 }, + { 0x9a00, 0x33c5, 0x3000 }, + { 0x9a00, 0x33c3, 0x2000 }, + { 0x1a00, 0x33c2, 0x0000 }, + { 0x1a00, 0x33c4, 0x0000 }, + { 0x9a00, 0x33c7, 0x2000 }, + { 0x1a00, 0x33c6, 0x0000 }, + { 0x1a00, 0x33c8, 0x0000 }, + { 0x9a00, 0x33cd, 0x3000 }, + { 0x9a00, 0x33cb, 0x2000 }, + { 0x1a00, 0x33ca, 0x0000 }, + { 0x1a00, 0x33cc, 0x0000 }, + { 0x9a00, 0x33cf, 0x2000 }, + { 0x1a00, 0x33ce, 0x0000 }, + { 0x1a00, 0x33d0, 0x0000 }, + { 0x9a00, 0x33f1, 0x6000 }, + { 0x9a00, 0x33e1, 0x5000 }, + { 0x9a00, 0x33d9, 0x4000 }, + { 0x9a00, 0x33d5, 0x3000 }, + { 0x9a00, 0x33d3, 0x2000 }, + { 0x1a00, 0x33d2, 0x0000 }, + { 0x1a00, 0x33d4, 0x0000 }, + { 0x9a00, 0x33d7, 0x2000 }, + { 0x1a00, 0x33d6, 0x0000 }, + { 0x1a00, 0x33d8, 0x0000 }, + { 0x9a00, 0x33dd, 0x3000 }, + { 0x9a00, 0x33db, 0x2000 }, + { 0x1a00, 0x33da, 0x0000 }, + { 0x1a00, 0x33dc, 0x0000 }, + { 0x9a00, 0x33df, 0x2000 }, + { 0x1a00, 0x33de, 0x0000 }, + { 0x1a00, 0x33e0, 0x0000 }, + { 0x9a00, 0x33e9, 0x4000 }, + { 0x9a00, 0x33e5, 0x3000 }, + { 0x9a00, 0x33e3, 0x2000 }, + { 0x1a00, 0x33e2, 0x0000 }, + { 0x1a00, 0x33e4, 0x0000 }, + { 0x9a00, 0x33e7, 0x2000 }, + { 0x1a00, 0x33e6, 0x0000 }, + { 0x1a00, 0x33e8, 0x0000 }, + { 0x9a00, 0x33ed, 0x3000 }, + { 0x9a00, 0x33eb, 0x2000 }, + { 0x1a00, 0x33ea, 0x0000 }, + { 0x1a00, 0x33ec, 0x0000 }, + { 0x9a00, 0x33ef, 0x2000 }, + { 0x1a00, 0x33ee, 0x0000 }, + { 0x1a00, 0x33f0, 0x0000 }, + { 0x8700, 0x4db5, 0x5000 }, + { 0x9a00, 0x33f9, 0x4000 }, + { 0x9a00, 0x33f5, 0x3000 }, + { 0x9a00, 0x33f3, 0x2000 }, + { 0x1a00, 0x33f2, 0x0000 }, + { 0x1a00, 0x33f4, 0x0000 }, + { 0x9a00, 0x33f7, 0x2000 }, + { 0x1a00, 0x33f6, 0x0000 }, + { 0x1a00, 0x33f8, 0x0000 }, + { 0x9a00, 0x33fd, 0x3000 }, + { 0x9a00, 0x33fb, 0x2000 }, + { 0x1a00, 0x33fa, 0x0000 }, + { 0x1a00, 0x33fc, 0x0000 }, + { 0x9a00, 0x33ff, 0x2000 }, + { 0x1a00, 0x33fe, 0x0000 }, + { 0x0700, 0x3400, 0x0000 }, + { 0x9a00, 0x4dc7, 0x4000 }, + { 0x9a00, 0x4dc3, 0x3000 }, + { 0x9a00, 0x4dc1, 0x2000 }, + { 0x1a00, 0x4dc0, 0x0000 }, + { 0x1a00, 0x4dc2, 0x0000 }, + { 0x9a00, 0x4dc5, 0x2000 }, + { 0x1a00, 0x4dc4, 0x0000 }, + { 0x1a00, 0x4dc6, 0x0000 }, + { 0x9a00, 0x4dcb, 0x3000 }, + { 0x9a00, 0x4dc9, 0x2000 }, + { 0x1a00, 0x4dc8, 0x0000 }, + { 0x1a00, 0x4dca, 0x0000 }, + { 0x9a00, 0x4dcd, 0x2000 }, + { 0x1a00, 0x4dcc, 0x0000 }, + { 0x1a00, 0x4dce, 0x0000 }, + { 0x8700, 0xa00d, 0x7000 }, + { 0x9a00, 0x4def, 0x6000 }, + { 0x9a00, 0x4ddf, 0x5000 }, + { 0x9a00, 0x4dd7, 0x4000 }, + { 0x9a00, 0x4dd3, 0x3000 }, + { 0x9a00, 0x4dd1, 0x2000 }, + { 0x1a00, 0x4dd0, 0x0000 }, + { 0x1a00, 0x4dd2, 0x0000 }, + { 0x9a00, 0x4dd5, 0x2000 }, + { 0x1a00, 0x4dd4, 0x0000 }, + { 0x1a00, 0x4dd6, 0x0000 }, + { 0x9a00, 0x4ddb, 0x3000 }, + { 0x9a00, 0x4dd9, 0x2000 }, + { 0x1a00, 0x4dd8, 0x0000 }, + { 0x1a00, 0x4dda, 0x0000 }, + { 0x9a00, 0x4ddd, 0x2000 }, + { 0x1a00, 0x4ddc, 0x0000 }, + { 0x1a00, 0x4dde, 0x0000 }, + { 0x9a00, 0x4de7, 0x4000 }, + { 0x9a00, 0x4de3, 0x3000 }, + { 0x9a00, 0x4de1, 0x2000 }, + { 0x1a00, 0x4de0, 0x0000 }, + { 0x1a00, 0x4de2, 0x0000 }, + { 0x9a00, 0x4de5, 0x2000 }, + { 0x1a00, 0x4de4, 0x0000 }, + { 0x1a00, 0x4de6, 0x0000 }, + { 0x9a00, 0x4deb, 0x3000 }, + { 0x9a00, 0x4de9, 0x2000 }, + { 0x1a00, 0x4de8, 0x0000 }, + { 0x1a00, 0x4dea, 0x0000 }, + { 0x9a00, 0x4ded, 0x2000 }, + { 0x1a00, 0x4dec, 0x0000 }, + { 0x1a00, 0x4dee, 0x0000 }, + { 0x9a00, 0x4dff, 0x5000 }, + { 0x9a00, 0x4df7, 0x4000 }, + { 0x9a00, 0x4df3, 0x3000 }, + { 0x9a00, 0x4df1, 0x2000 }, + { 0x1a00, 0x4df0, 0x0000 }, + { 0x1a00, 0x4df2, 0x0000 }, + { 0x9a00, 0x4df5, 0x2000 }, + { 0x1a00, 0x4df4, 0x0000 }, + { 0x1a00, 0x4df6, 0x0000 }, + { 0x9a00, 0x4dfb, 0x3000 }, + { 0x9a00, 0x4df9, 0x2000 }, + { 0x1a00, 0x4df8, 0x0000 }, + { 0x1a00, 0x4dfa, 0x0000 }, + { 0x9a00, 0x4dfd, 0x2000 }, + { 0x1a00, 0x4dfc, 0x0000 }, + { 0x1a00, 0x4dfe, 0x0000 }, + { 0x8700, 0xa005, 0x4000 }, + { 0x8700, 0xa001, 0x3000 }, + { 0x8700, 0x9fa5, 0x2000 }, + { 0x0700, 0x4e00, 0x0000 }, + { 0x0700, 0xa000, 0x0000 }, + { 0x8700, 0xa003, 0x2000 }, + { 0x0700, 0xa002, 0x0000 }, + { 0x0700, 0xa004, 0x0000 }, + { 0x8700, 0xa009, 0x3000 }, + { 0x8700, 0xa007, 0x2000 }, + { 0x0700, 0xa006, 0x0000 }, + { 0x0700, 0xa008, 0x0000 }, + { 0x8700, 0xa00b, 0x2000 }, + { 0x0700, 0xa00a, 0x0000 }, + { 0x0700, 0xa00c, 0x0000 }, + { 0x8700, 0xa02d, 0x6000 }, + { 0x8700, 0xa01d, 0x5000 }, + { 0x8700, 0xa015, 0x4000 }, + { 0x8700, 0xa011, 0x3000 }, + { 0x8700, 0xa00f, 0x2000 }, + { 0x0700, 0xa00e, 0x0000 }, + { 0x0700, 0xa010, 0x0000 }, + { 0x8700, 0xa013, 0x2000 }, + { 0x0700, 0xa012, 0x0000 }, + { 0x0700, 0xa014, 0x0000 }, + { 0x8700, 0xa019, 0x3000 }, + { 0x8700, 0xa017, 0x2000 }, + { 0x0700, 0xa016, 0x0000 }, + { 0x0700, 0xa018, 0x0000 }, + { 0x8700, 0xa01b, 0x2000 }, + { 0x0700, 0xa01a, 0x0000 }, + { 0x0700, 0xa01c, 0x0000 }, + { 0x8700, 0xa025, 0x4000 }, + { 0x8700, 0xa021, 0x3000 }, + { 0x8700, 0xa01f, 0x2000 }, + { 0x0700, 0xa01e, 0x0000 }, + { 0x0700, 0xa020, 0x0000 }, + { 0x8700, 0xa023, 0x2000 }, + { 0x0700, 0xa022, 0x0000 }, + { 0x0700, 0xa024, 0x0000 }, + { 0x8700, 0xa029, 0x3000 }, + { 0x8700, 0xa027, 0x2000 }, + { 0x0700, 0xa026, 0x0000 }, + { 0x0700, 0xa028, 0x0000 }, + { 0x8700, 0xa02b, 0x2000 }, + { 0x0700, 0xa02a, 0x0000 }, + { 0x0700, 0xa02c, 0x0000 }, + { 0x8700, 0xa03d, 0x5000 }, + { 0x8700, 0xa035, 0x4000 }, + { 0x8700, 0xa031, 0x3000 }, + { 0x8700, 0xa02f, 0x2000 }, + { 0x0700, 0xa02e, 0x0000 }, + { 0x0700, 0xa030, 0x0000 }, + { 0x8700, 0xa033, 0x2000 }, + { 0x0700, 0xa032, 0x0000 }, + { 0x0700, 0xa034, 0x0000 }, + { 0x8700, 0xa039, 0x3000 }, + { 0x8700, 0xa037, 0x2000 }, + { 0x0700, 0xa036, 0x0000 }, + { 0x0700, 0xa038, 0x0000 }, + { 0x8700, 0xa03b, 0x2000 }, + { 0x0700, 0xa03a, 0x0000 }, + { 0x0700, 0xa03c, 0x0000 }, + { 0x8700, 0xa045, 0x4000 }, + { 0x8700, 0xa041, 0x3000 }, + { 0x8700, 0xa03f, 0x2000 }, + { 0x0700, 0xa03e, 0x0000 }, + { 0x0700, 0xa040, 0x0000 }, + { 0x8700, 0xa043, 0x2000 }, + { 0x0700, 0xa042, 0x0000 }, + { 0x0700, 0xa044, 0x0000 }, + { 0x8700, 0xa049, 0x3000 }, + { 0x8700, 0xa047, 0x2000 }, + { 0x0700, 0xa046, 0x0000 }, + { 0x0700, 0xa048, 0x0000 }, + { 0x8700, 0xa04b, 0x2000 }, + { 0x0700, 0xa04a, 0x0000 }, + { 0x0700, 0xa04c, 0x0000 }, + { 0x8700, 0xa0cd, 0x8000 }, + { 0x8700, 0xa08d, 0x7000 }, + { 0x8700, 0xa06d, 0x6000 }, + { 0x8700, 0xa05d, 0x5000 }, + { 0x8700, 0xa055, 0x4000 }, + { 0x8700, 0xa051, 0x3000 }, + { 0x8700, 0xa04f, 0x2000 }, + { 0x0700, 0xa04e, 0x0000 }, + { 0x0700, 0xa050, 0x0000 }, + { 0x8700, 0xa053, 0x2000 }, + { 0x0700, 0xa052, 0x0000 }, + { 0x0700, 0xa054, 0x0000 }, + { 0x8700, 0xa059, 0x3000 }, + { 0x8700, 0xa057, 0x2000 }, + { 0x0700, 0xa056, 0x0000 }, + { 0x0700, 0xa058, 0x0000 }, + { 0x8700, 0xa05b, 0x2000 }, + { 0x0700, 0xa05a, 0x0000 }, + { 0x0700, 0xa05c, 0x0000 }, + { 0x8700, 0xa065, 0x4000 }, + { 0x8700, 0xa061, 0x3000 }, + { 0x8700, 0xa05f, 0x2000 }, + { 0x0700, 0xa05e, 0x0000 }, + { 0x0700, 0xa060, 0x0000 }, + { 0x8700, 0xa063, 0x2000 }, + { 0x0700, 0xa062, 0x0000 }, + { 0x0700, 0xa064, 0x0000 }, + { 0x8700, 0xa069, 0x3000 }, + { 0x8700, 0xa067, 0x2000 }, + { 0x0700, 0xa066, 0x0000 }, + { 0x0700, 0xa068, 0x0000 }, + { 0x8700, 0xa06b, 0x2000 }, + { 0x0700, 0xa06a, 0x0000 }, + { 0x0700, 0xa06c, 0x0000 }, + { 0x8700, 0xa07d, 0x5000 }, + { 0x8700, 0xa075, 0x4000 }, + { 0x8700, 0xa071, 0x3000 }, + { 0x8700, 0xa06f, 0x2000 }, + { 0x0700, 0xa06e, 0x0000 }, + { 0x0700, 0xa070, 0x0000 }, + { 0x8700, 0xa073, 0x2000 }, + { 0x0700, 0xa072, 0x0000 }, + { 0x0700, 0xa074, 0x0000 }, + { 0x8700, 0xa079, 0x3000 }, + { 0x8700, 0xa077, 0x2000 }, + { 0x0700, 0xa076, 0x0000 }, + { 0x0700, 0xa078, 0x0000 }, + { 0x8700, 0xa07b, 0x2000 }, + { 0x0700, 0xa07a, 0x0000 }, + { 0x0700, 0xa07c, 0x0000 }, + { 0x8700, 0xa085, 0x4000 }, + { 0x8700, 0xa081, 0x3000 }, + { 0x8700, 0xa07f, 0x2000 }, + { 0x0700, 0xa07e, 0x0000 }, + { 0x0700, 0xa080, 0x0000 }, + { 0x8700, 0xa083, 0x2000 }, + { 0x0700, 0xa082, 0x0000 }, + { 0x0700, 0xa084, 0x0000 }, + { 0x8700, 0xa089, 0x3000 }, + { 0x8700, 0xa087, 0x2000 }, + { 0x0700, 0xa086, 0x0000 }, + { 0x0700, 0xa088, 0x0000 }, + { 0x8700, 0xa08b, 0x2000 }, + { 0x0700, 0xa08a, 0x0000 }, + { 0x0700, 0xa08c, 0x0000 }, + { 0x8700, 0xa0ad, 0x6000 }, + { 0x8700, 0xa09d, 0x5000 }, + { 0x8700, 0xa095, 0x4000 }, + { 0x8700, 0xa091, 0x3000 }, + { 0x8700, 0xa08f, 0x2000 }, + { 0x0700, 0xa08e, 0x0000 }, + { 0x0700, 0xa090, 0x0000 }, + { 0x8700, 0xa093, 0x2000 }, + { 0x0700, 0xa092, 0x0000 }, + { 0x0700, 0xa094, 0x0000 }, + { 0x8700, 0xa099, 0x3000 }, + { 0x8700, 0xa097, 0x2000 }, + { 0x0700, 0xa096, 0x0000 }, + { 0x0700, 0xa098, 0x0000 }, + { 0x8700, 0xa09b, 0x2000 }, + { 0x0700, 0xa09a, 0x0000 }, + { 0x0700, 0xa09c, 0x0000 }, + { 0x8700, 0xa0a5, 0x4000 }, + { 0x8700, 0xa0a1, 0x3000 }, + { 0x8700, 0xa09f, 0x2000 }, + { 0x0700, 0xa09e, 0x0000 }, + { 0x0700, 0xa0a0, 0x0000 }, + { 0x8700, 0xa0a3, 0x2000 }, + { 0x0700, 0xa0a2, 0x0000 }, + { 0x0700, 0xa0a4, 0x0000 }, + { 0x8700, 0xa0a9, 0x3000 }, + { 0x8700, 0xa0a7, 0x2000 }, + { 0x0700, 0xa0a6, 0x0000 }, + { 0x0700, 0xa0a8, 0x0000 }, + { 0x8700, 0xa0ab, 0x2000 }, + { 0x0700, 0xa0aa, 0x0000 }, + { 0x0700, 0xa0ac, 0x0000 }, + { 0x8700, 0xa0bd, 0x5000 }, + { 0x8700, 0xa0b5, 0x4000 }, + { 0x8700, 0xa0b1, 0x3000 }, + { 0x8700, 0xa0af, 0x2000 }, + { 0x0700, 0xa0ae, 0x0000 }, + { 0x0700, 0xa0b0, 0x0000 }, + { 0x8700, 0xa0b3, 0x2000 }, + { 0x0700, 0xa0b2, 0x0000 }, + { 0x0700, 0xa0b4, 0x0000 }, + { 0x8700, 0xa0b9, 0x3000 }, + { 0x8700, 0xa0b7, 0x2000 }, + { 0x0700, 0xa0b6, 0x0000 }, + { 0x0700, 0xa0b8, 0x0000 }, + { 0x8700, 0xa0bb, 0x2000 }, + { 0x0700, 0xa0ba, 0x0000 }, + { 0x0700, 0xa0bc, 0x0000 }, + { 0x8700, 0xa0c5, 0x4000 }, + { 0x8700, 0xa0c1, 0x3000 }, + { 0x8700, 0xa0bf, 0x2000 }, + { 0x0700, 0xa0be, 0x0000 }, + { 0x0700, 0xa0c0, 0x0000 }, + { 0x8700, 0xa0c3, 0x2000 }, + { 0x0700, 0xa0c2, 0x0000 }, + { 0x0700, 0xa0c4, 0x0000 }, + { 0x8700, 0xa0c9, 0x3000 }, + { 0x8700, 0xa0c7, 0x2000 }, + { 0x0700, 0xa0c6, 0x0000 }, + { 0x0700, 0xa0c8, 0x0000 }, + { 0x8700, 0xa0cb, 0x2000 }, + { 0x0700, 0xa0ca, 0x0000 }, + { 0x0700, 0xa0cc, 0x0000 }, + { 0x8700, 0xa10d, 0x7000 }, + { 0x8700, 0xa0ed, 0x6000 }, + { 0x8700, 0xa0dd, 0x5000 }, + { 0x8700, 0xa0d5, 0x4000 }, + { 0x8700, 0xa0d1, 0x3000 }, + { 0x8700, 0xa0cf, 0x2000 }, + { 0x0700, 0xa0ce, 0x0000 }, + { 0x0700, 0xa0d0, 0x0000 }, + { 0x8700, 0xa0d3, 0x2000 }, + { 0x0700, 0xa0d2, 0x0000 }, + { 0x0700, 0xa0d4, 0x0000 }, + { 0x8700, 0xa0d9, 0x3000 }, + { 0x8700, 0xa0d7, 0x2000 }, + { 0x0700, 0xa0d6, 0x0000 }, + { 0x0700, 0xa0d8, 0x0000 }, + { 0x8700, 0xa0db, 0x2000 }, + { 0x0700, 0xa0da, 0x0000 }, + { 0x0700, 0xa0dc, 0x0000 }, + { 0x8700, 0xa0e5, 0x4000 }, + { 0x8700, 0xa0e1, 0x3000 }, + { 0x8700, 0xa0df, 0x2000 }, + { 0x0700, 0xa0de, 0x0000 }, + { 0x0700, 0xa0e0, 0x0000 }, + { 0x8700, 0xa0e3, 0x2000 }, + { 0x0700, 0xa0e2, 0x0000 }, + { 0x0700, 0xa0e4, 0x0000 }, + { 0x8700, 0xa0e9, 0x3000 }, + { 0x8700, 0xa0e7, 0x2000 }, + { 0x0700, 0xa0e6, 0x0000 }, + { 0x0700, 0xa0e8, 0x0000 }, + { 0x8700, 0xa0eb, 0x2000 }, + { 0x0700, 0xa0ea, 0x0000 }, + { 0x0700, 0xa0ec, 0x0000 }, + { 0x8700, 0xa0fd, 0x5000 }, + { 0x8700, 0xa0f5, 0x4000 }, + { 0x8700, 0xa0f1, 0x3000 }, + { 0x8700, 0xa0ef, 0x2000 }, + { 0x0700, 0xa0ee, 0x0000 }, + { 0x0700, 0xa0f0, 0x0000 }, + { 0x8700, 0xa0f3, 0x2000 }, + { 0x0700, 0xa0f2, 0x0000 }, + { 0x0700, 0xa0f4, 0x0000 }, + { 0x8700, 0xa0f9, 0x3000 }, + { 0x8700, 0xa0f7, 0x2000 }, + { 0x0700, 0xa0f6, 0x0000 }, + { 0x0700, 0xa0f8, 0x0000 }, + { 0x8700, 0xa0fb, 0x2000 }, + { 0x0700, 0xa0fa, 0x0000 }, + { 0x0700, 0xa0fc, 0x0000 }, + { 0x8700, 0xa105, 0x4000 }, + { 0x8700, 0xa101, 0x3000 }, + { 0x8700, 0xa0ff, 0x2000 }, + { 0x0700, 0xa0fe, 0x0000 }, + { 0x0700, 0xa100, 0x0000 }, + { 0x8700, 0xa103, 0x2000 }, + { 0x0700, 0xa102, 0x0000 }, + { 0x0700, 0xa104, 0x0000 }, + { 0x8700, 0xa109, 0x3000 }, + { 0x8700, 0xa107, 0x2000 }, + { 0x0700, 0xa106, 0x0000 }, + { 0x0700, 0xa108, 0x0000 }, + { 0x8700, 0xa10b, 0x2000 }, + { 0x0700, 0xa10a, 0x0000 }, + { 0x0700, 0xa10c, 0x0000 }, + { 0x8700, 0xa12d, 0x6000 }, + { 0x8700, 0xa11d, 0x5000 }, + { 0x8700, 0xa115, 0x4000 }, + { 0x8700, 0xa111, 0x3000 }, + { 0x8700, 0xa10f, 0x2000 }, + { 0x0700, 0xa10e, 0x0000 }, + { 0x0700, 0xa110, 0x0000 }, + { 0x8700, 0xa113, 0x2000 }, + { 0x0700, 0xa112, 0x0000 }, + { 0x0700, 0xa114, 0x0000 }, + { 0x8700, 0xa119, 0x3000 }, + { 0x8700, 0xa117, 0x2000 }, + { 0x0700, 0xa116, 0x0000 }, + { 0x0700, 0xa118, 0x0000 }, + { 0x8700, 0xa11b, 0x2000 }, + { 0x0700, 0xa11a, 0x0000 }, + { 0x0700, 0xa11c, 0x0000 }, + { 0x8700, 0xa125, 0x4000 }, + { 0x8700, 0xa121, 0x3000 }, + { 0x8700, 0xa11f, 0x2000 }, + { 0x0700, 0xa11e, 0x0000 }, + { 0x0700, 0xa120, 0x0000 }, + { 0x8700, 0xa123, 0x2000 }, + { 0x0700, 0xa122, 0x0000 }, + { 0x0700, 0xa124, 0x0000 }, + { 0x8700, 0xa129, 0x3000 }, + { 0x8700, 0xa127, 0x2000 }, + { 0x0700, 0xa126, 0x0000 }, + { 0x0700, 0xa128, 0x0000 }, + { 0x8700, 0xa12b, 0x2000 }, + { 0x0700, 0xa12a, 0x0000 }, + { 0x0700, 0xa12c, 0x0000 }, + { 0x8700, 0xa13d, 0x5000 }, + { 0x8700, 0xa135, 0x4000 }, + { 0x8700, 0xa131, 0x3000 }, + { 0x8700, 0xa12f, 0x2000 }, + { 0x0700, 0xa12e, 0x0000 }, + { 0x0700, 0xa130, 0x0000 }, + { 0x8700, 0xa133, 0x2000 }, + { 0x0700, 0xa132, 0x0000 }, + { 0x0700, 0xa134, 0x0000 }, + { 0x8700, 0xa139, 0x3000 }, + { 0x8700, 0xa137, 0x2000 }, + { 0x0700, 0xa136, 0x0000 }, + { 0x0700, 0xa138, 0x0000 }, + { 0x8700, 0xa13b, 0x2000 }, + { 0x0700, 0xa13a, 0x0000 }, + { 0x0700, 0xa13c, 0x0000 }, + { 0x8700, 0xa145, 0x4000 }, + { 0x8700, 0xa141, 0x3000 }, + { 0x8700, 0xa13f, 0x2000 }, + { 0x0700, 0xa13e, 0x0000 }, + { 0x0700, 0xa140, 0x0000 }, + { 0x8700, 0xa143, 0x2000 }, + { 0x0700, 0xa142, 0x0000 }, + { 0x0700, 0xa144, 0x0000 }, + { 0x8700, 0xa149, 0x3000 }, + { 0x8700, 0xa147, 0x2000 }, + { 0x0700, 0xa146, 0x0000 }, + { 0x0700, 0xa148, 0x0000 }, + { 0x8700, 0xa14b, 0x2000 }, + { 0x0700, 0xa14a, 0x0000 }, + { 0x0700, 0xa14c, 0x0000 }, + { 0x8700, 0xa24d, 0x9000 }, + { 0x8700, 0xa1cd, 0x8000 }, + { 0x8700, 0xa18d, 0x7000 }, + { 0x8700, 0xa16d, 0x6000 }, + { 0x8700, 0xa15d, 0x5000 }, + { 0x8700, 0xa155, 0x4000 }, + { 0x8700, 0xa151, 0x3000 }, + { 0x8700, 0xa14f, 0x2000 }, + { 0x0700, 0xa14e, 0x0000 }, + { 0x0700, 0xa150, 0x0000 }, + { 0x8700, 0xa153, 0x2000 }, + { 0x0700, 0xa152, 0x0000 }, + { 0x0700, 0xa154, 0x0000 }, + { 0x8700, 0xa159, 0x3000 }, + { 0x8700, 0xa157, 0x2000 }, + { 0x0700, 0xa156, 0x0000 }, + { 0x0700, 0xa158, 0x0000 }, + { 0x8700, 0xa15b, 0x2000 }, + { 0x0700, 0xa15a, 0x0000 }, + { 0x0700, 0xa15c, 0x0000 }, + { 0x8700, 0xa165, 0x4000 }, + { 0x8700, 0xa161, 0x3000 }, + { 0x8700, 0xa15f, 0x2000 }, + { 0x0700, 0xa15e, 0x0000 }, + { 0x0700, 0xa160, 0x0000 }, + { 0x8700, 0xa163, 0x2000 }, + { 0x0700, 0xa162, 0x0000 }, + { 0x0700, 0xa164, 0x0000 }, + { 0x8700, 0xa169, 0x3000 }, + { 0x8700, 0xa167, 0x2000 }, + { 0x0700, 0xa166, 0x0000 }, + { 0x0700, 0xa168, 0x0000 }, + { 0x8700, 0xa16b, 0x2000 }, + { 0x0700, 0xa16a, 0x0000 }, + { 0x0700, 0xa16c, 0x0000 }, + { 0x8700, 0xa17d, 0x5000 }, + { 0x8700, 0xa175, 0x4000 }, + { 0x8700, 0xa171, 0x3000 }, + { 0x8700, 0xa16f, 0x2000 }, + { 0x0700, 0xa16e, 0x0000 }, + { 0x0700, 0xa170, 0x0000 }, + { 0x8700, 0xa173, 0x2000 }, + { 0x0700, 0xa172, 0x0000 }, + { 0x0700, 0xa174, 0x0000 }, + { 0x8700, 0xa179, 0x3000 }, + { 0x8700, 0xa177, 0x2000 }, + { 0x0700, 0xa176, 0x0000 }, + { 0x0700, 0xa178, 0x0000 }, + { 0x8700, 0xa17b, 0x2000 }, + { 0x0700, 0xa17a, 0x0000 }, + { 0x0700, 0xa17c, 0x0000 }, + { 0x8700, 0xa185, 0x4000 }, + { 0x8700, 0xa181, 0x3000 }, + { 0x8700, 0xa17f, 0x2000 }, + { 0x0700, 0xa17e, 0x0000 }, + { 0x0700, 0xa180, 0x0000 }, + { 0x8700, 0xa183, 0x2000 }, + { 0x0700, 0xa182, 0x0000 }, + { 0x0700, 0xa184, 0x0000 }, + { 0x8700, 0xa189, 0x3000 }, + { 0x8700, 0xa187, 0x2000 }, + { 0x0700, 0xa186, 0x0000 }, + { 0x0700, 0xa188, 0x0000 }, + { 0x8700, 0xa18b, 0x2000 }, + { 0x0700, 0xa18a, 0x0000 }, + { 0x0700, 0xa18c, 0x0000 }, + { 0x8700, 0xa1ad, 0x6000 }, + { 0x8700, 0xa19d, 0x5000 }, + { 0x8700, 0xa195, 0x4000 }, + { 0x8700, 0xa191, 0x3000 }, + { 0x8700, 0xa18f, 0x2000 }, + { 0x0700, 0xa18e, 0x0000 }, + { 0x0700, 0xa190, 0x0000 }, + { 0x8700, 0xa193, 0x2000 }, + { 0x0700, 0xa192, 0x0000 }, + { 0x0700, 0xa194, 0x0000 }, + { 0x8700, 0xa199, 0x3000 }, + { 0x8700, 0xa197, 0x2000 }, + { 0x0700, 0xa196, 0x0000 }, + { 0x0700, 0xa198, 0x0000 }, + { 0x8700, 0xa19b, 0x2000 }, + { 0x0700, 0xa19a, 0x0000 }, + { 0x0700, 0xa19c, 0x0000 }, + { 0x8700, 0xa1a5, 0x4000 }, + { 0x8700, 0xa1a1, 0x3000 }, + { 0x8700, 0xa19f, 0x2000 }, + { 0x0700, 0xa19e, 0x0000 }, + { 0x0700, 0xa1a0, 0x0000 }, + { 0x8700, 0xa1a3, 0x2000 }, + { 0x0700, 0xa1a2, 0x0000 }, + { 0x0700, 0xa1a4, 0x0000 }, + { 0x8700, 0xa1a9, 0x3000 }, + { 0x8700, 0xa1a7, 0x2000 }, + { 0x0700, 0xa1a6, 0x0000 }, + { 0x0700, 0xa1a8, 0x0000 }, + { 0x8700, 0xa1ab, 0x2000 }, + { 0x0700, 0xa1aa, 0x0000 }, + { 0x0700, 0xa1ac, 0x0000 }, + { 0x8700, 0xa1bd, 0x5000 }, + { 0x8700, 0xa1b5, 0x4000 }, + { 0x8700, 0xa1b1, 0x3000 }, + { 0x8700, 0xa1af, 0x2000 }, + { 0x0700, 0xa1ae, 0x0000 }, + { 0x0700, 0xa1b0, 0x0000 }, + { 0x8700, 0xa1b3, 0x2000 }, + { 0x0700, 0xa1b2, 0x0000 }, + { 0x0700, 0xa1b4, 0x0000 }, + { 0x8700, 0xa1b9, 0x3000 }, + { 0x8700, 0xa1b7, 0x2000 }, + { 0x0700, 0xa1b6, 0x0000 }, + { 0x0700, 0xa1b8, 0x0000 }, + { 0x8700, 0xa1bb, 0x2000 }, + { 0x0700, 0xa1ba, 0x0000 }, + { 0x0700, 0xa1bc, 0x0000 }, + { 0x8700, 0xa1c5, 0x4000 }, + { 0x8700, 0xa1c1, 0x3000 }, + { 0x8700, 0xa1bf, 0x2000 }, + { 0x0700, 0xa1be, 0x0000 }, + { 0x0700, 0xa1c0, 0x0000 }, + { 0x8700, 0xa1c3, 0x2000 }, + { 0x0700, 0xa1c2, 0x0000 }, + { 0x0700, 0xa1c4, 0x0000 }, + { 0x8700, 0xa1c9, 0x3000 }, + { 0x8700, 0xa1c7, 0x2000 }, + { 0x0700, 0xa1c6, 0x0000 }, + { 0x0700, 0xa1c8, 0x0000 }, + { 0x8700, 0xa1cb, 0x2000 }, + { 0x0700, 0xa1ca, 0x0000 }, + { 0x0700, 0xa1cc, 0x0000 }, + { 0x8700, 0xa20d, 0x7000 }, + { 0x8700, 0xa1ed, 0x6000 }, + { 0x8700, 0xa1dd, 0x5000 }, + { 0x8700, 0xa1d5, 0x4000 }, + { 0x8700, 0xa1d1, 0x3000 }, + { 0x8700, 0xa1cf, 0x2000 }, + { 0x0700, 0xa1ce, 0x0000 }, + { 0x0700, 0xa1d0, 0x0000 }, + { 0x8700, 0xa1d3, 0x2000 }, + { 0x0700, 0xa1d2, 0x0000 }, + { 0x0700, 0xa1d4, 0x0000 }, + { 0x8700, 0xa1d9, 0x3000 }, + { 0x8700, 0xa1d7, 0x2000 }, + { 0x0700, 0xa1d6, 0x0000 }, + { 0x0700, 0xa1d8, 0x0000 }, + { 0x8700, 0xa1db, 0x2000 }, + { 0x0700, 0xa1da, 0x0000 }, + { 0x0700, 0xa1dc, 0x0000 }, + { 0x8700, 0xa1e5, 0x4000 }, + { 0x8700, 0xa1e1, 0x3000 }, + { 0x8700, 0xa1df, 0x2000 }, + { 0x0700, 0xa1de, 0x0000 }, + { 0x0700, 0xa1e0, 0x0000 }, + { 0x8700, 0xa1e3, 0x2000 }, + { 0x0700, 0xa1e2, 0x0000 }, + { 0x0700, 0xa1e4, 0x0000 }, + { 0x8700, 0xa1e9, 0x3000 }, + { 0x8700, 0xa1e7, 0x2000 }, + { 0x0700, 0xa1e6, 0x0000 }, + { 0x0700, 0xa1e8, 0x0000 }, + { 0x8700, 0xa1eb, 0x2000 }, + { 0x0700, 0xa1ea, 0x0000 }, + { 0x0700, 0xa1ec, 0x0000 }, + { 0x8700, 0xa1fd, 0x5000 }, + { 0x8700, 0xa1f5, 0x4000 }, + { 0x8700, 0xa1f1, 0x3000 }, + { 0x8700, 0xa1ef, 0x2000 }, + { 0x0700, 0xa1ee, 0x0000 }, + { 0x0700, 0xa1f0, 0x0000 }, + { 0x8700, 0xa1f3, 0x2000 }, + { 0x0700, 0xa1f2, 0x0000 }, + { 0x0700, 0xa1f4, 0x0000 }, + { 0x8700, 0xa1f9, 0x3000 }, + { 0x8700, 0xa1f7, 0x2000 }, + { 0x0700, 0xa1f6, 0x0000 }, + { 0x0700, 0xa1f8, 0x0000 }, + { 0x8700, 0xa1fb, 0x2000 }, + { 0x0700, 0xa1fa, 0x0000 }, + { 0x0700, 0xa1fc, 0x0000 }, + { 0x8700, 0xa205, 0x4000 }, + { 0x8700, 0xa201, 0x3000 }, + { 0x8700, 0xa1ff, 0x2000 }, + { 0x0700, 0xa1fe, 0x0000 }, + { 0x0700, 0xa200, 0x0000 }, + { 0x8700, 0xa203, 0x2000 }, + { 0x0700, 0xa202, 0x0000 }, + { 0x0700, 0xa204, 0x0000 }, + { 0x8700, 0xa209, 0x3000 }, + { 0x8700, 0xa207, 0x2000 }, + { 0x0700, 0xa206, 0x0000 }, + { 0x0700, 0xa208, 0x0000 }, + { 0x8700, 0xa20b, 0x2000 }, + { 0x0700, 0xa20a, 0x0000 }, + { 0x0700, 0xa20c, 0x0000 }, + { 0x8700, 0xa22d, 0x6000 }, + { 0x8700, 0xa21d, 0x5000 }, + { 0x8700, 0xa215, 0x4000 }, + { 0x8700, 0xa211, 0x3000 }, + { 0x8700, 0xa20f, 0x2000 }, + { 0x0700, 0xa20e, 0x0000 }, + { 0x0700, 0xa210, 0x0000 }, + { 0x8700, 0xa213, 0x2000 }, + { 0x0700, 0xa212, 0x0000 }, + { 0x0700, 0xa214, 0x0000 }, + { 0x8700, 0xa219, 0x3000 }, + { 0x8700, 0xa217, 0x2000 }, + { 0x0700, 0xa216, 0x0000 }, + { 0x0700, 0xa218, 0x0000 }, + { 0x8700, 0xa21b, 0x2000 }, + { 0x0700, 0xa21a, 0x0000 }, + { 0x0700, 0xa21c, 0x0000 }, + { 0x8700, 0xa225, 0x4000 }, + { 0x8700, 0xa221, 0x3000 }, + { 0x8700, 0xa21f, 0x2000 }, + { 0x0700, 0xa21e, 0x0000 }, + { 0x0700, 0xa220, 0x0000 }, + { 0x8700, 0xa223, 0x2000 }, + { 0x0700, 0xa222, 0x0000 }, + { 0x0700, 0xa224, 0x0000 }, + { 0x8700, 0xa229, 0x3000 }, + { 0x8700, 0xa227, 0x2000 }, + { 0x0700, 0xa226, 0x0000 }, + { 0x0700, 0xa228, 0x0000 }, + { 0x8700, 0xa22b, 0x2000 }, + { 0x0700, 0xa22a, 0x0000 }, + { 0x0700, 0xa22c, 0x0000 }, + { 0x8700, 0xa23d, 0x5000 }, + { 0x8700, 0xa235, 0x4000 }, + { 0x8700, 0xa231, 0x3000 }, + { 0x8700, 0xa22f, 0x2000 }, + { 0x0700, 0xa22e, 0x0000 }, + { 0x0700, 0xa230, 0x0000 }, + { 0x8700, 0xa233, 0x2000 }, + { 0x0700, 0xa232, 0x0000 }, + { 0x0700, 0xa234, 0x0000 }, + { 0x8700, 0xa239, 0x3000 }, + { 0x8700, 0xa237, 0x2000 }, + { 0x0700, 0xa236, 0x0000 }, + { 0x0700, 0xa238, 0x0000 }, + { 0x8700, 0xa23b, 0x2000 }, + { 0x0700, 0xa23a, 0x0000 }, + { 0x0700, 0xa23c, 0x0000 }, + { 0x8700, 0xa245, 0x4000 }, + { 0x8700, 0xa241, 0x3000 }, + { 0x8700, 0xa23f, 0x2000 }, + { 0x0700, 0xa23e, 0x0000 }, + { 0x0700, 0xa240, 0x0000 }, + { 0x8700, 0xa243, 0x2000 }, + { 0x0700, 0xa242, 0x0000 }, + { 0x0700, 0xa244, 0x0000 }, + { 0x8700, 0xa249, 0x3000 }, + { 0x8700, 0xa247, 0x2000 }, + { 0x0700, 0xa246, 0x0000 }, + { 0x0700, 0xa248, 0x0000 }, + { 0x8700, 0xa24b, 0x2000 }, + { 0x0700, 0xa24a, 0x0000 }, + { 0x0700, 0xa24c, 0x0000 }, + { 0x8700, 0xa2cd, 0x8000 }, + { 0x8700, 0xa28d, 0x7000 }, + { 0x8700, 0xa26d, 0x6000 }, + { 0x8700, 0xa25d, 0x5000 }, + { 0x8700, 0xa255, 0x4000 }, + { 0x8700, 0xa251, 0x3000 }, + { 0x8700, 0xa24f, 0x2000 }, + { 0x0700, 0xa24e, 0x0000 }, + { 0x0700, 0xa250, 0x0000 }, + { 0x8700, 0xa253, 0x2000 }, + { 0x0700, 0xa252, 0x0000 }, + { 0x0700, 0xa254, 0x0000 }, + { 0x8700, 0xa259, 0x3000 }, + { 0x8700, 0xa257, 0x2000 }, + { 0x0700, 0xa256, 0x0000 }, + { 0x0700, 0xa258, 0x0000 }, + { 0x8700, 0xa25b, 0x2000 }, + { 0x0700, 0xa25a, 0x0000 }, + { 0x0700, 0xa25c, 0x0000 }, + { 0x8700, 0xa265, 0x4000 }, + { 0x8700, 0xa261, 0x3000 }, + { 0x8700, 0xa25f, 0x2000 }, + { 0x0700, 0xa25e, 0x0000 }, + { 0x0700, 0xa260, 0x0000 }, + { 0x8700, 0xa263, 0x2000 }, + { 0x0700, 0xa262, 0x0000 }, + { 0x0700, 0xa264, 0x0000 }, + { 0x8700, 0xa269, 0x3000 }, + { 0x8700, 0xa267, 0x2000 }, + { 0x0700, 0xa266, 0x0000 }, + { 0x0700, 0xa268, 0x0000 }, + { 0x8700, 0xa26b, 0x2000 }, + { 0x0700, 0xa26a, 0x0000 }, + { 0x0700, 0xa26c, 0x0000 }, + { 0x8700, 0xa27d, 0x5000 }, + { 0x8700, 0xa275, 0x4000 }, + { 0x8700, 0xa271, 0x3000 }, + { 0x8700, 0xa26f, 0x2000 }, + { 0x0700, 0xa26e, 0x0000 }, + { 0x0700, 0xa270, 0x0000 }, + { 0x8700, 0xa273, 0x2000 }, + { 0x0700, 0xa272, 0x0000 }, + { 0x0700, 0xa274, 0x0000 }, + { 0x8700, 0xa279, 0x3000 }, + { 0x8700, 0xa277, 0x2000 }, + { 0x0700, 0xa276, 0x0000 }, + { 0x0700, 0xa278, 0x0000 }, + { 0x8700, 0xa27b, 0x2000 }, + { 0x0700, 0xa27a, 0x0000 }, + { 0x0700, 0xa27c, 0x0000 }, + { 0x8700, 0xa285, 0x4000 }, + { 0x8700, 0xa281, 0x3000 }, + { 0x8700, 0xa27f, 0x2000 }, + { 0x0700, 0xa27e, 0x0000 }, + { 0x0700, 0xa280, 0x0000 }, + { 0x8700, 0xa283, 0x2000 }, + { 0x0700, 0xa282, 0x0000 }, + { 0x0700, 0xa284, 0x0000 }, + { 0x8700, 0xa289, 0x3000 }, + { 0x8700, 0xa287, 0x2000 }, + { 0x0700, 0xa286, 0x0000 }, + { 0x0700, 0xa288, 0x0000 }, + { 0x8700, 0xa28b, 0x2000 }, + { 0x0700, 0xa28a, 0x0000 }, + { 0x0700, 0xa28c, 0x0000 }, + { 0x8700, 0xa2ad, 0x6000 }, + { 0x8700, 0xa29d, 0x5000 }, + { 0x8700, 0xa295, 0x4000 }, + { 0x8700, 0xa291, 0x3000 }, + { 0x8700, 0xa28f, 0x2000 }, + { 0x0700, 0xa28e, 0x0000 }, + { 0x0700, 0xa290, 0x0000 }, + { 0x8700, 0xa293, 0x2000 }, + { 0x0700, 0xa292, 0x0000 }, + { 0x0700, 0xa294, 0x0000 }, + { 0x8700, 0xa299, 0x3000 }, + { 0x8700, 0xa297, 0x2000 }, + { 0x0700, 0xa296, 0x0000 }, + { 0x0700, 0xa298, 0x0000 }, + { 0x8700, 0xa29b, 0x2000 }, + { 0x0700, 0xa29a, 0x0000 }, + { 0x0700, 0xa29c, 0x0000 }, + { 0x8700, 0xa2a5, 0x4000 }, + { 0x8700, 0xa2a1, 0x3000 }, + { 0x8700, 0xa29f, 0x2000 }, + { 0x0700, 0xa29e, 0x0000 }, + { 0x0700, 0xa2a0, 0x0000 }, + { 0x8700, 0xa2a3, 0x2000 }, + { 0x0700, 0xa2a2, 0x0000 }, + { 0x0700, 0xa2a4, 0x0000 }, + { 0x8700, 0xa2a9, 0x3000 }, + { 0x8700, 0xa2a7, 0x2000 }, + { 0x0700, 0xa2a6, 0x0000 }, + { 0x0700, 0xa2a8, 0x0000 }, + { 0x8700, 0xa2ab, 0x2000 }, + { 0x0700, 0xa2aa, 0x0000 }, + { 0x0700, 0xa2ac, 0x0000 }, + { 0x8700, 0xa2bd, 0x5000 }, + { 0x8700, 0xa2b5, 0x4000 }, + { 0x8700, 0xa2b1, 0x3000 }, + { 0x8700, 0xa2af, 0x2000 }, + { 0x0700, 0xa2ae, 0x0000 }, + { 0x0700, 0xa2b0, 0x0000 }, + { 0x8700, 0xa2b3, 0x2000 }, + { 0x0700, 0xa2b2, 0x0000 }, + { 0x0700, 0xa2b4, 0x0000 }, + { 0x8700, 0xa2b9, 0x3000 }, + { 0x8700, 0xa2b7, 0x2000 }, + { 0x0700, 0xa2b6, 0x0000 }, + { 0x0700, 0xa2b8, 0x0000 }, + { 0x8700, 0xa2bb, 0x2000 }, + { 0x0700, 0xa2ba, 0x0000 }, + { 0x0700, 0xa2bc, 0x0000 }, + { 0x8700, 0xa2c5, 0x4000 }, + { 0x8700, 0xa2c1, 0x3000 }, + { 0x8700, 0xa2bf, 0x2000 }, + { 0x0700, 0xa2be, 0x0000 }, + { 0x0700, 0xa2c0, 0x0000 }, + { 0x8700, 0xa2c3, 0x2000 }, + { 0x0700, 0xa2c2, 0x0000 }, + { 0x0700, 0xa2c4, 0x0000 }, + { 0x8700, 0xa2c9, 0x3000 }, + { 0x8700, 0xa2c7, 0x2000 }, + { 0x0700, 0xa2c6, 0x0000 }, + { 0x0700, 0xa2c8, 0x0000 }, + { 0x8700, 0xa2cb, 0x2000 }, + { 0x0700, 0xa2ca, 0x0000 }, + { 0x0700, 0xa2cc, 0x0000 }, + { 0x8700, 0xa30d, 0x7000 }, + { 0x8700, 0xa2ed, 0x6000 }, + { 0x8700, 0xa2dd, 0x5000 }, + { 0x8700, 0xa2d5, 0x4000 }, + { 0x8700, 0xa2d1, 0x3000 }, + { 0x8700, 0xa2cf, 0x2000 }, + { 0x0700, 0xa2ce, 0x0000 }, + { 0x0700, 0xa2d0, 0x0000 }, + { 0x8700, 0xa2d3, 0x2000 }, + { 0x0700, 0xa2d2, 0x0000 }, + { 0x0700, 0xa2d4, 0x0000 }, + { 0x8700, 0xa2d9, 0x3000 }, + { 0x8700, 0xa2d7, 0x2000 }, + { 0x0700, 0xa2d6, 0x0000 }, + { 0x0700, 0xa2d8, 0x0000 }, + { 0x8700, 0xa2db, 0x2000 }, + { 0x0700, 0xa2da, 0x0000 }, + { 0x0700, 0xa2dc, 0x0000 }, + { 0x8700, 0xa2e5, 0x4000 }, + { 0x8700, 0xa2e1, 0x3000 }, + { 0x8700, 0xa2df, 0x2000 }, + { 0x0700, 0xa2de, 0x0000 }, + { 0x0700, 0xa2e0, 0x0000 }, + { 0x8700, 0xa2e3, 0x2000 }, + { 0x0700, 0xa2e2, 0x0000 }, + { 0x0700, 0xa2e4, 0x0000 }, + { 0x8700, 0xa2e9, 0x3000 }, + { 0x8700, 0xa2e7, 0x2000 }, + { 0x0700, 0xa2e6, 0x0000 }, + { 0x0700, 0xa2e8, 0x0000 }, + { 0x8700, 0xa2eb, 0x2000 }, + { 0x0700, 0xa2ea, 0x0000 }, + { 0x0700, 0xa2ec, 0x0000 }, + { 0x8700, 0xa2fd, 0x5000 }, + { 0x8700, 0xa2f5, 0x4000 }, + { 0x8700, 0xa2f1, 0x3000 }, + { 0x8700, 0xa2ef, 0x2000 }, + { 0x0700, 0xa2ee, 0x0000 }, + { 0x0700, 0xa2f0, 0x0000 }, + { 0x8700, 0xa2f3, 0x2000 }, + { 0x0700, 0xa2f2, 0x0000 }, + { 0x0700, 0xa2f4, 0x0000 }, + { 0x8700, 0xa2f9, 0x3000 }, + { 0x8700, 0xa2f7, 0x2000 }, + { 0x0700, 0xa2f6, 0x0000 }, + { 0x0700, 0xa2f8, 0x0000 }, + { 0x8700, 0xa2fb, 0x2000 }, + { 0x0700, 0xa2fa, 0x0000 }, + { 0x0700, 0xa2fc, 0x0000 }, + { 0x8700, 0xa305, 0x4000 }, + { 0x8700, 0xa301, 0x3000 }, + { 0x8700, 0xa2ff, 0x2000 }, + { 0x0700, 0xa2fe, 0x0000 }, + { 0x0700, 0xa300, 0x0000 }, + { 0x8700, 0xa303, 0x2000 }, + { 0x0700, 0xa302, 0x0000 }, + { 0x0700, 0xa304, 0x0000 }, + { 0x8700, 0xa309, 0x3000 }, + { 0x8700, 0xa307, 0x2000 }, + { 0x0700, 0xa306, 0x0000 }, + { 0x0700, 0xa308, 0x0000 }, + { 0x8700, 0xa30b, 0x2000 }, + { 0x0700, 0xa30a, 0x0000 }, + { 0x0700, 0xa30c, 0x0000 }, + { 0x8700, 0xa32d, 0x6000 }, + { 0x8700, 0xa31d, 0x5000 }, + { 0x8700, 0xa315, 0x4000 }, + { 0x8700, 0xa311, 0x3000 }, + { 0x8700, 0xa30f, 0x2000 }, + { 0x0700, 0xa30e, 0x0000 }, + { 0x0700, 0xa310, 0x0000 }, + { 0x8700, 0xa313, 0x2000 }, + { 0x0700, 0xa312, 0x0000 }, + { 0x0700, 0xa314, 0x0000 }, + { 0x8700, 0xa319, 0x3000 }, + { 0x8700, 0xa317, 0x2000 }, + { 0x0700, 0xa316, 0x0000 }, + { 0x0700, 0xa318, 0x0000 }, + { 0x8700, 0xa31b, 0x2000 }, + { 0x0700, 0xa31a, 0x0000 }, + { 0x0700, 0xa31c, 0x0000 }, + { 0x8700, 0xa325, 0x4000 }, + { 0x8700, 0xa321, 0x3000 }, + { 0x8700, 0xa31f, 0x2000 }, + { 0x0700, 0xa31e, 0x0000 }, + { 0x0700, 0xa320, 0x0000 }, + { 0x8700, 0xa323, 0x2000 }, + { 0x0700, 0xa322, 0x0000 }, + { 0x0700, 0xa324, 0x0000 }, + { 0x8700, 0xa329, 0x3000 }, + { 0x8700, 0xa327, 0x2000 }, + { 0x0700, 0xa326, 0x0000 }, + { 0x0700, 0xa328, 0x0000 }, + { 0x8700, 0xa32b, 0x2000 }, + { 0x0700, 0xa32a, 0x0000 }, + { 0x0700, 0xa32c, 0x0000 }, + { 0x8700, 0xa33d, 0x5000 }, + { 0x8700, 0xa335, 0x4000 }, + { 0x8700, 0xa331, 0x3000 }, + { 0x8700, 0xa32f, 0x2000 }, + { 0x0700, 0xa32e, 0x0000 }, + { 0x0700, 0xa330, 0x0000 }, + { 0x8700, 0xa333, 0x2000 }, + { 0x0700, 0xa332, 0x0000 }, + { 0x0700, 0xa334, 0x0000 }, + { 0x8700, 0xa339, 0x3000 }, + { 0x8700, 0xa337, 0x2000 }, + { 0x0700, 0xa336, 0x0000 }, + { 0x0700, 0xa338, 0x0000 }, + { 0x8700, 0xa33b, 0x2000 }, + { 0x0700, 0xa33a, 0x0000 }, + { 0x0700, 0xa33c, 0x0000 }, + { 0x8700, 0xa345, 0x4000 }, + { 0x8700, 0xa341, 0x3000 }, + { 0x8700, 0xa33f, 0x2000 }, + { 0x0700, 0xa33e, 0x0000 }, + { 0x0700, 0xa340, 0x0000 }, + { 0x8700, 0xa343, 0x2000 }, + { 0x0700, 0xa342, 0x0000 }, + { 0x0700, 0xa344, 0x0000 }, + { 0x8700, 0xa349, 0x3000 }, + { 0x8700, 0xa347, 0x2000 }, + { 0x0700, 0xa346, 0x0000 }, + { 0x0700, 0xa348, 0x0000 }, + { 0x8700, 0xa34b, 0x2000 }, + { 0x0700, 0xa34a, 0x0000 }, + { 0x0700, 0xa34c, 0x0000 }, + { 0x8700, 0xfc4d, 0xb000 }, + { 0x8700, 0xf97f, 0xa000 }, + { 0x8700, 0xa44d, 0x9000 }, + { 0x8700, 0xa3cd, 0x8000 }, + { 0x8700, 0xa38d, 0x7000 }, + { 0x8700, 0xa36d, 0x6000 }, + { 0x8700, 0xa35d, 0x5000 }, + { 0x8700, 0xa355, 0x4000 }, + { 0x8700, 0xa351, 0x3000 }, + { 0x8700, 0xa34f, 0x2000 }, + { 0x0700, 0xa34e, 0x0000 }, + { 0x0700, 0xa350, 0x0000 }, + { 0x8700, 0xa353, 0x2000 }, + { 0x0700, 0xa352, 0x0000 }, + { 0x0700, 0xa354, 0x0000 }, + { 0x8700, 0xa359, 0x3000 }, + { 0x8700, 0xa357, 0x2000 }, + { 0x0700, 0xa356, 0x0000 }, + { 0x0700, 0xa358, 0x0000 }, + { 0x8700, 0xa35b, 0x2000 }, + { 0x0700, 0xa35a, 0x0000 }, + { 0x0700, 0xa35c, 0x0000 }, + { 0x8700, 0xa365, 0x4000 }, + { 0x8700, 0xa361, 0x3000 }, + { 0x8700, 0xa35f, 0x2000 }, + { 0x0700, 0xa35e, 0x0000 }, + { 0x0700, 0xa360, 0x0000 }, + { 0x8700, 0xa363, 0x2000 }, + { 0x0700, 0xa362, 0x0000 }, + { 0x0700, 0xa364, 0x0000 }, + { 0x8700, 0xa369, 0x3000 }, + { 0x8700, 0xa367, 0x2000 }, + { 0x0700, 0xa366, 0x0000 }, + { 0x0700, 0xa368, 0x0000 }, + { 0x8700, 0xa36b, 0x2000 }, + { 0x0700, 0xa36a, 0x0000 }, + { 0x0700, 0xa36c, 0x0000 }, + { 0x8700, 0xa37d, 0x5000 }, + { 0x8700, 0xa375, 0x4000 }, + { 0x8700, 0xa371, 0x3000 }, + { 0x8700, 0xa36f, 0x2000 }, + { 0x0700, 0xa36e, 0x0000 }, + { 0x0700, 0xa370, 0x0000 }, + { 0x8700, 0xa373, 0x2000 }, + { 0x0700, 0xa372, 0x0000 }, + { 0x0700, 0xa374, 0x0000 }, + { 0x8700, 0xa379, 0x3000 }, + { 0x8700, 0xa377, 0x2000 }, + { 0x0700, 0xa376, 0x0000 }, + { 0x0700, 0xa378, 0x0000 }, + { 0x8700, 0xa37b, 0x2000 }, + { 0x0700, 0xa37a, 0x0000 }, + { 0x0700, 0xa37c, 0x0000 }, + { 0x8700, 0xa385, 0x4000 }, + { 0x8700, 0xa381, 0x3000 }, + { 0x8700, 0xa37f, 0x2000 }, + { 0x0700, 0xa37e, 0x0000 }, + { 0x0700, 0xa380, 0x0000 }, + { 0x8700, 0xa383, 0x2000 }, + { 0x0700, 0xa382, 0x0000 }, + { 0x0700, 0xa384, 0x0000 }, + { 0x8700, 0xa389, 0x3000 }, + { 0x8700, 0xa387, 0x2000 }, + { 0x0700, 0xa386, 0x0000 }, + { 0x0700, 0xa388, 0x0000 }, + { 0x8700, 0xa38b, 0x2000 }, + { 0x0700, 0xa38a, 0x0000 }, + { 0x0700, 0xa38c, 0x0000 }, + { 0x8700, 0xa3ad, 0x6000 }, + { 0x8700, 0xa39d, 0x5000 }, + { 0x8700, 0xa395, 0x4000 }, + { 0x8700, 0xa391, 0x3000 }, + { 0x8700, 0xa38f, 0x2000 }, + { 0x0700, 0xa38e, 0x0000 }, + { 0x0700, 0xa390, 0x0000 }, + { 0x8700, 0xa393, 0x2000 }, + { 0x0700, 0xa392, 0x0000 }, + { 0x0700, 0xa394, 0x0000 }, + { 0x8700, 0xa399, 0x3000 }, + { 0x8700, 0xa397, 0x2000 }, + { 0x0700, 0xa396, 0x0000 }, + { 0x0700, 0xa398, 0x0000 }, + { 0x8700, 0xa39b, 0x2000 }, + { 0x0700, 0xa39a, 0x0000 }, + { 0x0700, 0xa39c, 0x0000 }, + { 0x8700, 0xa3a5, 0x4000 }, + { 0x8700, 0xa3a1, 0x3000 }, + { 0x8700, 0xa39f, 0x2000 }, + { 0x0700, 0xa39e, 0x0000 }, + { 0x0700, 0xa3a0, 0x0000 }, + { 0x8700, 0xa3a3, 0x2000 }, + { 0x0700, 0xa3a2, 0x0000 }, + { 0x0700, 0xa3a4, 0x0000 }, + { 0x8700, 0xa3a9, 0x3000 }, + { 0x8700, 0xa3a7, 0x2000 }, + { 0x0700, 0xa3a6, 0x0000 }, + { 0x0700, 0xa3a8, 0x0000 }, + { 0x8700, 0xa3ab, 0x2000 }, + { 0x0700, 0xa3aa, 0x0000 }, + { 0x0700, 0xa3ac, 0x0000 }, + { 0x8700, 0xa3bd, 0x5000 }, + { 0x8700, 0xa3b5, 0x4000 }, + { 0x8700, 0xa3b1, 0x3000 }, + { 0x8700, 0xa3af, 0x2000 }, + { 0x0700, 0xa3ae, 0x0000 }, + { 0x0700, 0xa3b0, 0x0000 }, + { 0x8700, 0xa3b3, 0x2000 }, + { 0x0700, 0xa3b2, 0x0000 }, + { 0x0700, 0xa3b4, 0x0000 }, + { 0x8700, 0xa3b9, 0x3000 }, + { 0x8700, 0xa3b7, 0x2000 }, + { 0x0700, 0xa3b6, 0x0000 }, + { 0x0700, 0xa3b8, 0x0000 }, + { 0x8700, 0xa3bb, 0x2000 }, + { 0x0700, 0xa3ba, 0x0000 }, + { 0x0700, 0xa3bc, 0x0000 }, + { 0x8700, 0xa3c5, 0x4000 }, + { 0x8700, 0xa3c1, 0x3000 }, + { 0x8700, 0xa3bf, 0x2000 }, + { 0x0700, 0xa3be, 0x0000 }, + { 0x0700, 0xa3c0, 0x0000 }, + { 0x8700, 0xa3c3, 0x2000 }, + { 0x0700, 0xa3c2, 0x0000 }, + { 0x0700, 0xa3c4, 0x0000 }, + { 0x8700, 0xa3c9, 0x3000 }, + { 0x8700, 0xa3c7, 0x2000 }, + { 0x0700, 0xa3c6, 0x0000 }, + { 0x0700, 0xa3c8, 0x0000 }, + { 0x8700, 0xa3cb, 0x2000 }, + { 0x0700, 0xa3ca, 0x0000 }, + { 0x0700, 0xa3cc, 0x0000 }, + { 0x8700, 0xa40d, 0x7000 }, + { 0x8700, 0xa3ed, 0x6000 }, + { 0x8700, 0xa3dd, 0x5000 }, + { 0x8700, 0xa3d5, 0x4000 }, + { 0x8700, 0xa3d1, 0x3000 }, + { 0x8700, 0xa3cf, 0x2000 }, + { 0x0700, 0xa3ce, 0x0000 }, + { 0x0700, 0xa3d0, 0x0000 }, + { 0x8700, 0xa3d3, 0x2000 }, + { 0x0700, 0xa3d2, 0x0000 }, + { 0x0700, 0xa3d4, 0x0000 }, + { 0x8700, 0xa3d9, 0x3000 }, + { 0x8700, 0xa3d7, 0x2000 }, + { 0x0700, 0xa3d6, 0x0000 }, + { 0x0700, 0xa3d8, 0x0000 }, + { 0x8700, 0xa3db, 0x2000 }, + { 0x0700, 0xa3da, 0x0000 }, + { 0x0700, 0xa3dc, 0x0000 }, + { 0x8700, 0xa3e5, 0x4000 }, + { 0x8700, 0xa3e1, 0x3000 }, + { 0x8700, 0xa3df, 0x2000 }, + { 0x0700, 0xa3de, 0x0000 }, + { 0x0700, 0xa3e0, 0x0000 }, + { 0x8700, 0xa3e3, 0x2000 }, + { 0x0700, 0xa3e2, 0x0000 }, + { 0x0700, 0xa3e4, 0x0000 }, + { 0x8700, 0xa3e9, 0x3000 }, + { 0x8700, 0xa3e7, 0x2000 }, + { 0x0700, 0xa3e6, 0x0000 }, + { 0x0700, 0xa3e8, 0x0000 }, + { 0x8700, 0xa3eb, 0x2000 }, + { 0x0700, 0xa3ea, 0x0000 }, + { 0x0700, 0xa3ec, 0x0000 }, + { 0x8700, 0xa3fd, 0x5000 }, + { 0x8700, 0xa3f5, 0x4000 }, + { 0x8700, 0xa3f1, 0x3000 }, + { 0x8700, 0xa3ef, 0x2000 }, + { 0x0700, 0xa3ee, 0x0000 }, + { 0x0700, 0xa3f0, 0x0000 }, + { 0x8700, 0xa3f3, 0x2000 }, + { 0x0700, 0xa3f2, 0x0000 }, + { 0x0700, 0xa3f4, 0x0000 }, + { 0x8700, 0xa3f9, 0x3000 }, + { 0x8700, 0xa3f7, 0x2000 }, + { 0x0700, 0xa3f6, 0x0000 }, + { 0x0700, 0xa3f8, 0x0000 }, + { 0x8700, 0xa3fb, 0x2000 }, + { 0x0700, 0xa3fa, 0x0000 }, + { 0x0700, 0xa3fc, 0x0000 }, + { 0x8700, 0xa405, 0x4000 }, + { 0x8700, 0xa401, 0x3000 }, + { 0x8700, 0xa3ff, 0x2000 }, + { 0x0700, 0xa3fe, 0x0000 }, + { 0x0700, 0xa400, 0x0000 }, + { 0x8700, 0xa403, 0x2000 }, + { 0x0700, 0xa402, 0x0000 }, + { 0x0700, 0xa404, 0x0000 }, + { 0x8700, 0xa409, 0x3000 }, + { 0x8700, 0xa407, 0x2000 }, + { 0x0700, 0xa406, 0x0000 }, + { 0x0700, 0xa408, 0x0000 }, + { 0x8700, 0xa40b, 0x2000 }, + { 0x0700, 0xa40a, 0x0000 }, + { 0x0700, 0xa40c, 0x0000 }, + { 0x8700, 0xa42d, 0x6000 }, + { 0x8700, 0xa41d, 0x5000 }, + { 0x8700, 0xa415, 0x4000 }, + { 0x8700, 0xa411, 0x3000 }, + { 0x8700, 0xa40f, 0x2000 }, + { 0x0700, 0xa40e, 0x0000 }, + { 0x0700, 0xa410, 0x0000 }, + { 0x8700, 0xa413, 0x2000 }, + { 0x0700, 0xa412, 0x0000 }, + { 0x0700, 0xa414, 0x0000 }, + { 0x8700, 0xa419, 0x3000 }, + { 0x8700, 0xa417, 0x2000 }, + { 0x0700, 0xa416, 0x0000 }, + { 0x0700, 0xa418, 0x0000 }, + { 0x8700, 0xa41b, 0x2000 }, + { 0x0700, 0xa41a, 0x0000 }, + { 0x0700, 0xa41c, 0x0000 }, + { 0x8700, 0xa425, 0x4000 }, + { 0x8700, 0xa421, 0x3000 }, + { 0x8700, 0xa41f, 0x2000 }, + { 0x0700, 0xa41e, 0x0000 }, + { 0x0700, 0xa420, 0x0000 }, + { 0x8700, 0xa423, 0x2000 }, + { 0x0700, 0xa422, 0x0000 }, + { 0x0700, 0xa424, 0x0000 }, + { 0x8700, 0xa429, 0x3000 }, + { 0x8700, 0xa427, 0x2000 }, + { 0x0700, 0xa426, 0x0000 }, + { 0x0700, 0xa428, 0x0000 }, + { 0x8700, 0xa42b, 0x2000 }, + { 0x0700, 0xa42a, 0x0000 }, + { 0x0700, 0xa42c, 0x0000 }, + { 0x8700, 0xa43d, 0x5000 }, + { 0x8700, 0xa435, 0x4000 }, + { 0x8700, 0xa431, 0x3000 }, + { 0x8700, 0xa42f, 0x2000 }, + { 0x0700, 0xa42e, 0x0000 }, + { 0x0700, 0xa430, 0x0000 }, + { 0x8700, 0xa433, 0x2000 }, + { 0x0700, 0xa432, 0x0000 }, + { 0x0700, 0xa434, 0x0000 }, + { 0x8700, 0xa439, 0x3000 }, + { 0x8700, 0xa437, 0x2000 }, + { 0x0700, 0xa436, 0x0000 }, + { 0x0700, 0xa438, 0x0000 }, + { 0x8700, 0xa43b, 0x2000 }, + { 0x0700, 0xa43a, 0x0000 }, + { 0x0700, 0xa43c, 0x0000 }, + { 0x8700, 0xa445, 0x4000 }, + { 0x8700, 0xa441, 0x3000 }, + { 0x8700, 0xa43f, 0x2000 }, + { 0x0700, 0xa43e, 0x0000 }, + { 0x0700, 0xa440, 0x0000 }, + { 0x8700, 0xa443, 0x2000 }, + { 0x0700, 0xa442, 0x0000 }, + { 0x0700, 0xa444, 0x0000 }, + { 0x8700, 0xa449, 0x3000 }, + { 0x8700, 0xa447, 0x2000 }, + { 0x0700, 0xa446, 0x0000 }, + { 0x0700, 0xa448, 0x0000 }, + { 0x8700, 0xa44b, 0x2000 }, + { 0x0700, 0xa44a, 0x0000 }, + { 0x0700, 0xa44c, 0x0000 }, + { 0x8300, 0xf8ff, 0x8000 }, + { 0x9a00, 0xa490, 0x7000 }, + { 0x8700, 0xa46d, 0x6000 }, + { 0x8700, 0xa45d, 0x5000 }, + { 0x8700, 0xa455, 0x4000 }, + { 0x8700, 0xa451, 0x3000 }, + { 0x8700, 0xa44f, 0x2000 }, + { 0x0700, 0xa44e, 0x0000 }, + { 0x0700, 0xa450, 0x0000 }, + { 0x8700, 0xa453, 0x2000 }, + { 0x0700, 0xa452, 0x0000 }, + { 0x0700, 0xa454, 0x0000 }, + { 0x8700, 0xa459, 0x3000 }, + { 0x8700, 0xa457, 0x2000 }, + { 0x0700, 0xa456, 0x0000 }, + { 0x0700, 0xa458, 0x0000 }, + { 0x8700, 0xa45b, 0x2000 }, + { 0x0700, 0xa45a, 0x0000 }, + { 0x0700, 0xa45c, 0x0000 }, + { 0x8700, 0xa465, 0x4000 }, + { 0x8700, 0xa461, 0x3000 }, + { 0x8700, 0xa45f, 0x2000 }, + { 0x0700, 0xa45e, 0x0000 }, + { 0x0700, 0xa460, 0x0000 }, + { 0x8700, 0xa463, 0x2000 }, + { 0x0700, 0xa462, 0x0000 }, + { 0x0700, 0xa464, 0x0000 }, + { 0x8700, 0xa469, 0x3000 }, + { 0x8700, 0xa467, 0x2000 }, + { 0x0700, 0xa466, 0x0000 }, + { 0x0700, 0xa468, 0x0000 }, + { 0x8700, 0xa46b, 0x2000 }, + { 0x0700, 0xa46a, 0x0000 }, + { 0x0700, 0xa46c, 0x0000 }, + { 0x8700, 0xa47d, 0x5000 }, + { 0x8700, 0xa475, 0x4000 }, + { 0x8700, 0xa471, 0x3000 }, + { 0x8700, 0xa46f, 0x2000 }, + { 0x0700, 0xa46e, 0x0000 }, + { 0x0700, 0xa470, 0x0000 }, + { 0x8700, 0xa473, 0x2000 }, + { 0x0700, 0xa472, 0x0000 }, + { 0x0700, 0xa474, 0x0000 }, + { 0x8700, 0xa479, 0x3000 }, + { 0x8700, 0xa477, 0x2000 }, + { 0x0700, 0xa476, 0x0000 }, + { 0x0700, 0xa478, 0x0000 }, + { 0x8700, 0xa47b, 0x2000 }, + { 0x0700, 0xa47a, 0x0000 }, + { 0x0700, 0xa47c, 0x0000 }, + { 0x8700, 0xa485, 0x4000 }, + { 0x8700, 0xa481, 0x3000 }, + { 0x8700, 0xa47f, 0x2000 }, + { 0x0700, 0xa47e, 0x0000 }, + { 0x0700, 0xa480, 0x0000 }, + { 0x8700, 0xa483, 0x2000 }, + { 0x0700, 0xa482, 0x0000 }, + { 0x0700, 0xa484, 0x0000 }, + { 0x8700, 0xa489, 0x3000 }, + { 0x8700, 0xa487, 0x2000 }, + { 0x0700, 0xa486, 0x0000 }, + { 0x0700, 0xa488, 0x0000 }, + { 0x8700, 0xa48b, 0x2000 }, + { 0x0700, 0xa48a, 0x0000 }, + { 0x0700, 0xa48c, 0x0000 }, + { 0x9a00, 0xa4b0, 0x6000 }, + { 0x9a00, 0xa4a0, 0x5000 }, + { 0x9a00, 0xa498, 0x4000 }, + { 0x9a00, 0xa494, 0x3000 }, + { 0x9a00, 0xa492, 0x2000 }, + { 0x1a00, 0xa491, 0x0000 }, + { 0x1a00, 0xa493, 0x0000 }, + { 0x9a00, 0xa496, 0x2000 }, + { 0x1a00, 0xa495, 0x0000 }, + { 0x1a00, 0xa497, 0x0000 }, + { 0x9a00, 0xa49c, 0x3000 }, + { 0x9a00, 0xa49a, 0x2000 }, + { 0x1a00, 0xa499, 0x0000 }, + { 0x1a00, 0xa49b, 0x0000 }, + { 0x9a00, 0xa49e, 0x2000 }, + { 0x1a00, 0xa49d, 0x0000 }, + { 0x1a00, 0xa49f, 0x0000 }, + { 0x9a00, 0xa4a8, 0x4000 }, + { 0x9a00, 0xa4a4, 0x3000 }, + { 0x9a00, 0xa4a2, 0x2000 }, + { 0x1a00, 0xa4a1, 0x0000 }, + { 0x1a00, 0xa4a3, 0x0000 }, + { 0x9a00, 0xa4a6, 0x2000 }, + { 0x1a00, 0xa4a5, 0x0000 }, + { 0x1a00, 0xa4a7, 0x0000 }, + { 0x9a00, 0xa4ac, 0x3000 }, + { 0x9a00, 0xa4aa, 0x2000 }, + { 0x1a00, 0xa4a9, 0x0000 }, + { 0x1a00, 0xa4ab, 0x0000 }, + { 0x9a00, 0xa4ae, 0x2000 }, + { 0x1a00, 0xa4ad, 0x0000 }, + { 0x1a00, 0xa4af, 0x0000 }, + { 0x9a00, 0xa4c0, 0x5000 }, + { 0x9a00, 0xa4b8, 0x4000 }, + { 0x9a00, 0xa4b4, 0x3000 }, + { 0x9a00, 0xa4b2, 0x2000 }, + { 0x1a00, 0xa4b1, 0x0000 }, + { 0x1a00, 0xa4b3, 0x0000 }, + { 0x9a00, 0xa4b6, 0x2000 }, + { 0x1a00, 0xa4b5, 0x0000 }, + { 0x1a00, 0xa4b7, 0x0000 }, + { 0x9a00, 0xa4bc, 0x3000 }, + { 0x9a00, 0xa4ba, 0x2000 }, + { 0x1a00, 0xa4b9, 0x0000 }, + { 0x1a00, 0xa4bb, 0x0000 }, + { 0x9a00, 0xa4be, 0x2000 }, + { 0x1a00, 0xa4bd, 0x0000 }, + { 0x1a00, 0xa4bf, 0x0000 }, + { 0x8700, 0xd7a3, 0x4000 }, + { 0x9a00, 0xa4c4, 0x3000 }, + { 0x9a00, 0xa4c2, 0x2000 }, + { 0x1a00, 0xa4c1, 0x0000 }, + { 0x1a00, 0xa4c3, 0x0000 }, + { 0x9a00, 0xa4c6, 0x2000 }, + { 0x1a00, 0xa4c5, 0x0000 }, + { 0x0700, 0xac00, 0x0000 }, + { 0x8400, 0xdbff, 0x3000 }, + { 0x8400, 0xdb7f, 0x2000 }, + { 0x0400, 0xd800, 0x0000 }, + { 0x0400, 0xdb80, 0x0000 }, + { 0x8400, 0xdfff, 0x2000 }, + { 0x0400, 0xdc00, 0x0000 }, + { 0x0300, 0xe000, 0x0000 }, + { 0x8700, 0xf93f, 0x7000 }, + { 0x8700, 0xf91f, 0x6000 }, + { 0x8700, 0xf90f, 0x5000 }, + { 0x8700, 0xf907, 0x4000 }, + { 0x8700, 0xf903, 0x3000 }, + { 0x8700, 0xf901, 0x2000 }, + { 0x0700, 0xf900, 0x0000 }, + { 0x0700, 0xf902, 0x0000 }, + { 0x8700, 0xf905, 0x2000 }, + { 0x0700, 0xf904, 0x0000 }, + { 0x0700, 0xf906, 0x0000 }, + { 0x8700, 0xf90b, 0x3000 }, + { 0x8700, 0xf909, 0x2000 }, + { 0x0700, 0xf908, 0x0000 }, + { 0x0700, 0xf90a, 0x0000 }, + { 0x8700, 0xf90d, 0x2000 }, + { 0x0700, 0xf90c, 0x0000 }, + { 0x0700, 0xf90e, 0x0000 }, + { 0x8700, 0xf917, 0x4000 }, + { 0x8700, 0xf913, 0x3000 }, + { 0x8700, 0xf911, 0x2000 }, + { 0x0700, 0xf910, 0x0000 }, + { 0x0700, 0xf912, 0x0000 }, + { 0x8700, 0xf915, 0x2000 }, + { 0x0700, 0xf914, 0x0000 }, + { 0x0700, 0xf916, 0x0000 }, + { 0x8700, 0xf91b, 0x3000 }, + { 0x8700, 0xf919, 0x2000 }, + { 0x0700, 0xf918, 0x0000 }, + { 0x0700, 0xf91a, 0x0000 }, + { 0x8700, 0xf91d, 0x2000 }, + { 0x0700, 0xf91c, 0x0000 }, + { 0x0700, 0xf91e, 0x0000 }, + { 0x8700, 0xf92f, 0x5000 }, + { 0x8700, 0xf927, 0x4000 }, + { 0x8700, 0xf923, 0x3000 }, + { 0x8700, 0xf921, 0x2000 }, + { 0x0700, 0xf920, 0x0000 }, + { 0x0700, 0xf922, 0x0000 }, + { 0x8700, 0xf925, 0x2000 }, + { 0x0700, 0xf924, 0x0000 }, + { 0x0700, 0xf926, 0x0000 }, + { 0x8700, 0xf92b, 0x3000 }, + { 0x8700, 0xf929, 0x2000 }, + { 0x0700, 0xf928, 0x0000 }, + { 0x0700, 0xf92a, 0x0000 }, + { 0x8700, 0xf92d, 0x2000 }, + { 0x0700, 0xf92c, 0x0000 }, + { 0x0700, 0xf92e, 0x0000 }, + { 0x8700, 0xf937, 0x4000 }, + { 0x8700, 0xf933, 0x3000 }, + { 0x8700, 0xf931, 0x2000 }, + { 0x0700, 0xf930, 0x0000 }, + { 0x0700, 0xf932, 0x0000 }, + { 0x8700, 0xf935, 0x2000 }, + { 0x0700, 0xf934, 0x0000 }, + { 0x0700, 0xf936, 0x0000 }, + { 0x8700, 0xf93b, 0x3000 }, + { 0x8700, 0xf939, 0x2000 }, + { 0x0700, 0xf938, 0x0000 }, + { 0x0700, 0xf93a, 0x0000 }, + { 0x8700, 0xf93d, 0x2000 }, + { 0x0700, 0xf93c, 0x0000 }, + { 0x0700, 0xf93e, 0x0000 }, + { 0x8700, 0xf95f, 0x6000 }, + { 0x8700, 0xf94f, 0x5000 }, + { 0x8700, 0xf947, 0x4000 }, + { 0x8700, 0xf943, 0x3000 }, + { 0x8700, 0xf941, 0x2000 }, + { 0x0700, 0xf940, 0x0000 }, + { 0x0700, 0xf942, 0x0000 }, + { 0x8700, 0xf945, 0x2000 }, + { 0x0700, 0xf944, 0x0000 }, + { 0x0700, 0xf946, 0x0000 }, + { 0x8700, 0xf94b, 0x3000 }, + { 0x8700, 0xf949, 0x2000 }, + { 0x0700, 0xf948, 0x0000 }, + { 0x0700, 0xf94a, 0x0000 }, + { 0x8700, 0xf94d, 0x2000 }, + { 0x0700, 0xf94c, 0x0000 }, + { 0x0700, 0xf94e, 0x0000 }, + { 0x8700, 0xf957, 0x4000 }, + { 0x8700, 0xf953, 0x3000 }, + { 0x8700, 0xf951, 0x2000 }, + { 0x0700, 0xf950, 0x0000 }, + { 0x0700, 0xf952, 0x0000 }, + { 0x8700, 0xf955, 0x2000 }, + { 0x0700, 0xf954, 0x0000 }, + { 0x0700, 0xf956, 0x0000 }, + { 0x8700, 0xf95b, 0x3000 }, + { 0x8700, 0xf959, 0x2000 }, + { 0x0700, 0xf958, 0x0000 }, + { 0x0700, 0xf95a, 0x0000 }, + { 0x8700, 0xf95d, 0x2000 }, + { 0x0700, 0xf95c, 0x0000 }, + { 0x0700, 0xf95e, 0x0000 }, + { 0x8700, 0xf96f, 0x5000 }, + { 0x8700, 0xf967, 0x4000 }, + { 0x8700, 0xf963, 0x3000 }, + { 0x8700, 0xf961, 0x2000 }, + { 0x0700, 0xf960, 0x0000 }, + { 0x0700, 0xf962, 0x0000 }, + { 0x8700, 0xf965, 0x2000 }, + { 0x0700, 0xf964, 0x0000 }, + { 0x0700, 0xf966, 0x0000 }, + { 0x8700, 0xf96b, 0x3000 }, + { 0x8700, 0xf969, 0x2000 }, + { 0x0700, 0xf968, 0x0000 }, + { 0x0700, 0xf96a, 0x0000 }, + { 0x8700, 0xf96d, 0x2000 }, + { 0x0700, 0xf96c, 0x0000 }, + { 0x0700, 0xf96e, 0x0000 }, + { 0x8700, 0xf977, 0x4000 }, + { 0x8700, 0xf973, 0x3000 }, + { 0x8700, 0xf971, 0x2000 }, + { 0x0700, 0xf970, 0x0000 }, + { 0x0700, 0xf972, 0x0000 }, + { 0x8700, 0xf975, 0x2000 }, + { 0x0700, 0xf974, 0x0000 }, + { 0x0700, 0xf976, 0x0000 }, + { 0x8700, 0xf97b, 0x3000 }, + { 0x8700, 0xf979, 0x2000 }, + { 0x0700, 0xf978, 0x0000 }, + { 0x0700, 0xf97a, 0x0000 }, + { 0x8700, 0xf97d, 0x2000 }, + { 0x0700, 0xf97c, 0x0000 }, + { 0x0700, 0xf97e, 0x0000 }, + { 0x8700, 0xfb27, 0x9000 }, + { 0x8700, 0xf9ff, 0x8000 }, + { 0x8700, 0xf9bf, 0x7000 }, + { 0x8700, 0xf99f, 0x6000 }, + { 0x8700, 0xf98f, 0x5000 }, + { 0x8700, 0xf987, 0x4000 }, + { 0x8700, 0xf983, 0x3000 }, + { 0x8700, 0xf981, 0x2000 }, + { 0x0700, 0xf980, 0x0000 }, + { 0x0700, 0xf982, 0x0000 }, + { 0x8700, 0xf985, 0x2000 }, + { 0x0700, 0xf984, 0x0000 }, + { 0x0700, 0xf986, 0x0000 }, + { 0x8700, 0xf98b, 0x3000 }, + { 0x8700, 0xf989, 0x2000 }, + { 0x0700, 0xf988, 0x0000 }, + { 0x0700, 0xf98a, 0x0000 }, + { 0x8700, 0xf98d, 0x2000 }, + { 0x0700, 0xf98c, 0x0000 }, + { 0x0700, 0xf98e, 0x0000 }, + { 0x8700, 0xf997, 0x4000 }, + { 0x8700, 0xf993, 0x3000 }, + { 0x8700, 0xf991, 0x2000 }, + { 0x0700, 0xf990, 0x0000 }, + { 0x0700, 0xf992, 0x0000 }, + { 0x8700, 0xf995, 0x2000 }, + { 0x0700, 0xf994, 0x0000 }, + { 0x0700, 0xf996, 0x0000 }, + { 0x8700, 0xf99b, 0x3000 }, + { 0x8700, 0xf999, 0x2000 }, + { 0x0700, 0xf998, 0x0000 }, + { 0x0700, 0xf99a, 0x0000 }, + { 0x8700, 0xf99d, 0x2000 }, + { 0x0700, 0xf99c, 0x0000 }, + { 0x0700, 0xf99e, 0x0000 }, + { 0x8700, 0xf9af, 0x5000 }, + { 0x8700, 0xf9a7, 0x4000 }, + { 0x8700, 0xf9a3, 0x3000 }, + { 0x8700, 0xf9a1, 0x2000 }, + { 0x0700, 0xf9a0, 0x0000 }, + { 0x0700, 0xf9a2, 0x0000 }, + { 0x8700, 0xf9a5, 0x2000 }, + { 0x0700, 0xf9a4, 0x0000 }, + { 0x0700, 0xf9a6, 0x0000 }, + { 0x8700, 0xf9ab, 0x3000 }, + { 0x8700, 0xf9a9, 0x2000 }, + { 0x0700, 0xf9a8, 0x0000 }, + { 0x0700, 0xf9aa, 0x0000 }, + { 0x8700, 0xf9ad, 0x2000 }, + { 0x0700, 0xf9ac, 0x0000 }, + { 0x0700, 0xf9ae, 0x0000 }, + { 0x8700, 0xf9b7, 0x4000 }, + { 0x8700, 0xf9b3, 0x3000 }, + { 0x8700, 0xf9b1, 0x2000 }, + { 0x0700, 0xf9b0, 0x0000 }, + { 0x0700, 0xf9b2, 0x0000 }, + { 0x8700, 0xf9b5, 0x2000 }, + { 0x0700, 0xf9b4, 0x0000 }, + { 0x0700, 0xf9b6, 0x0000 }, + { 0x8700, 0xf9bb, 0x3000 }, + { 0x8700, 0xf9b9, 0x2000 }, + { 0x0700, 0xf9b8, 0x0000 }, + { 0x0700, 0xf9ba, 0x0000 }, + { 0x8700, 0xf9bd, 0x2000 }, + { 0x0700, 0xf9bc, 0x0000 }, + { 0x0700, 0xf9be, 0x0000 }, + { 0x8700, 0xf9df, 0x6000 }, + { 0x8700, 0xf9cf, 0x5000 }, + { 0x8700, 0xf9c7, 0x4000 }, + { 0x8700, 0xf9c3, 0x3000 }, + { 0x8700, 0xf9c1, 0x2000 }, + { 0x0700, 0xf9c0, 0x0000 }, + { 0x0700, 0xf9c2, 0x0000 }, + { 0x8700, 0xf9c5, 0x2000 }, + { 0x0700, 0xf9c4, 0x0000 }, + { 0x0700, 0xf9c6, 0x0000 }, + { 0x8700, 0xf9cb, 0x3000 }, + { 0x8700, 0xf9c9, 0x2000 }, + { 0x0700, 0xf9c8, 0x0000 }, + { 0x0700, 0xf9ca, 0x0000 }, + { 0x8700, 0xf9cd, 0x2000 }, + { 0x0700, 0xf9cc, 0x0000 }, + { 0x0700, 0xf9ce, 0x0000 }, + { 0x8700, 0xf9d7, 0x4000 }, + { 0x8700, 0xf9d3, 0x3000 }, + { 0x8700, 0xf9d1, 0x2000 }, + { 0x0700, 0xf9d0, 0x0000 }, + { 0x0700, 0xf9d2, 0x0000 }, + { 0x8700, 0xf9d5, 0x2000 }, + { 0x0700, 0xf9d4, 0x0000 }, + { 0x0700, 0xf9d6, 0x0000 }, + { 0x8700, 0xf9db, 0x3000 }, + { 0x8700, 0xf9d9, 0x2000 }, + { 0x0700, 0xf9d8, 0x0000 }, + { 0x0700, 0xf9da, 0x0000 }, + { 0x8700, 0xf9dd, 0x2000 }, + { 0x0700, 0xf9dc, 0x0000 }, + { 0x0700, 0xf9de, 0x0000 }, + { 0x8700, 0xf9ef, 0x5000 }, + { 0x8700, 0xf9e7, 0x4000 }, + { 0x8700, 0xf9e3, 0x3000 }, + { 0x8700, 0xf9e1, 0x2000 }, + { 0x0700, 0xf9e0, 0x0000 }, + { 0x0700, 0xf9e2, 0x0000 }, + { 0x8700, 0xf9e5, 0x2000 }, + { 0x0700, 0xf9e4, 0x0000 }, + { 0x0700, 0xf9e6, 0x0000 }, + { 0x8700, 0xf9eb, 0x3000 }, + { 0x8700, 0xf9e9, 0x2000 }, + { 0x0700, 0xf9e8, 0x0000 }, + { 0x0700, 0xf9ea, 0x0000 }, + { 0x8700, 0xf9ed, 0x2000 }, + { 0x0700, 0xf9ec, 0x0000 }, + { 0x0700, 0xf9ee, 0x0000 }, + { 0x8700, 0xf9f7, 0x4000 }, + { 0x8700, 0xf9f3, 0x3000 }, + { 0x8700, 0xf9f1, 0x2000 }, + { 0x0700, 0xf9f0, 0x0000 }, + { 0x0700, 0xf9f2, 0x0000 }, + { 0x8700, 0xf9f5, 0x2000 }, + { 0x0700, 0xf9f4, 0x0000 }, + { 0x0700, 0xf9f6, 0x0000 }, + { 0x8700, 0xf9fb, 0x3000 }, + { 0x8700, 0xf9f9, 0x2000 }, + { 0x0700, 0xf9f8, 0x0000 }, + { 0x0700, 0xf9fa, 0x0000 }, + { 0x8700, 0xf9fd, 0x2000 }, + { 0x0700, 0xf9fc, 0x0000 }, + { 0x0700, 0xf9fe, 0x0000 }, + { 0x8700, 0xfa41, 0x7000 }, + { 0x8700, 0xfa1f, 0x6000 }, + { 0x8700, 0xfa0f, 0x5000 }, + { 0x8700, 0xfa07, 0x4000 }, + { 0x8700, 0xfa03, 0x3000 }, + { 0x8700, 0xfa01, 0x2000 }, + { 0x0700, 0xfa00, 0x0000 }, + { 0x0700, 0xfa02, 0x0000 }, + { 0x8700, 0xfa05, 0x2000 }, + { 0x0700, 0xfa04, 0x0000 }, + { 0x0700, 0xfa06, 0x0000 }, + { 0x8700, 0xfa0b, 0x3000 }, + { 0x8700, 0xfa09, 0x2000 }, + { 0x0700, 0xfa08, 0x0000 }, + { 0x0700, 0xfa0a, 0x0000 }, + { 0x8700, 0xfa0d, 0x2000 }, + { 0x0700, 0xfa0c, 0x0000 }, + { 0x0700, 0xfa0e, 0x0000 }, + { 0x8700, 0xfa17, 0x4000 }, + { 0x8700, 0xfa13, 0x3000 }, + { 0x8700, 0xfa11, 0x2000 }, + { 0x0700, 0xfa10, 0x0000 }, + { 0x0700, 0xfa12, 0x0000 }, + { 0x8700, 0xfa15, 0x2000 }, + { 0x0700, 0xfa14, 0x0000 }, + { 0x0700, 0xfa16, 0x0000 }, + { 0x8700, 0xfa1b, 0x3000 }, + { 0x8700, 0xfa19, 0x2000 }, + { 0x0700, 0xfa18, 0x0000 }, + { 0x0700, 0xfa1a, 0x0000 }, + { 0x8700, 0xfa1d, 0x2000 }, + { 0x0700, 0xfa1c, 0x0000 }, + { 0x0700, 0xfa1e, 0x0000 }, + { 0x8700, 0xfa31, 0x5000 }, + { 0x8700, 0xfa27, 0x4000 }, + { 0x8700, 0xfa23, 0x3000 }, + { 0x8700, 0xfa21, 0x2000 }, + { 0x0700, 0xfa20, 0x0000 }, + { 0x0700, 0xfa22, 0x0000 }, + { 0x8700, 0xfa25, 0x2000 }, + { 0x0700, 0xfa24, 0x0000 }, + { 0x0700, 0xfa26, 0x0000 }, + { 0x8700, 0xfa2b, 0x3000 }, + { 0x8700, 0xfa29, 0x2000 }, + { 0x0700, 0xfa28, 0x0000 }, + { 0x0700, 0xfa2a, 0x0000 }, + { 0x8700, 0xfa2d, 0x2000 }, + { 0x0700, 0xfa2c, 0x0000 }, + { 0x0700, 0xfa30, 0x0000 }, + { 0x8700, 0xfa39, 0x4000 }, + { 0x8700, 0xfa35, 0x3000 }, + { 0x8700, 0xfa33, 0x2000 }, + { 0x0700, 0xfa32, 0x0000 }, + { 0x0700, 0xfa34, 0x0000 }, + { 0x8700, 0xfa37, 0x2000 }, + { 0x0700, 0xfa36, 0x0000 }, + { 0x0700, 0xfa38, 0x0000 }, + { 0x8700, 0xfa3d, 0x3000 }, + { 0x8700, 0xfa3b, 0x2000 }, + { 0x0700, 0xfa3a, 0x0000 }, + { 0x0700, 0xfa3c, 0x0000 }, + { 0x8700, 0xfa3f, 0x2000 }, + { 0x0700, 0xfa3e, 0x0000 }, + { 0x0700, 0xfa40, 0x0000 }, + { 0x8700, 0xfa61, 0x6000 }, + { 0x8700, 0xfa51, 0x5000 }, + { 0x8700, 0xfa49, 0x4000 }, + { 0x8700, 0xfa45, 0x3000 }, + { 0x8700, 0xfa43, 0x2000 }, + { 0x0700, 0xfa42, 0x0000 }, + { 0x0700, 0xfa44, 0x0000 }, + { 0x8700, 0xfa47, 0x2000 }, + { 0x0700, 0xfa46, 0x0000 }, + { 0x0700, 0xfa48, 0x0000 }, + { 0x8700, 0xfa4d, 0x3000 }, + { 0x8700, 0xfa4b, 0x2000 }, + { 0x0700, 0xfa4a, 0x0000 }, + { 0x0700, 0xfa4c, 0x0000 }, + { 0x8700, 0xfa4f, 0x2000 }, + { 0x0700, 0xfa4e, 0x0000 }, + { 0x0700, 0xfa50, 0x0000 }, + { 0x8700, 0xfa59, 0x4000 }, + { 0x8700, 0xfa55, 0x3000 }, + { 0x8700, 0xfa53, 0x2000 }, + { 0x0700, 0xfa52, 0x0000 }, + { 0x0700, 0xfa54, 0x0000 }, + { 0x8700, 0xfa57, 0x2000 }, + { 0x0700, 0xfa56, 0x0000 }, + { 0x0700, 0xfa58, 0x0000 }, + { 0x8700, 0xfa5d, 0x3000 }, + { 0x8700, 0xfa5b, 0x2000 }, + { 0x0700, 0xfa5a, 0x0000 }, + { 0x0700, 0xfa5c, 0x0000 }, + { 0x8700, 0xfa5f, 0x2000 }, + { 0x0700, 0xfa5e, 0x0000 }, + { 0x0700, 0xfa60, 0x0000 }, + { 0x8500, 0xfb06, 0x5000 }, + { 0x8700, 0xfa69, 0x4000 }, + { 0x8700, 0xfa65, 0x3000 }, + { 0x8700, 0xfa63, 0x2000 }, + { 0x0700, 0xfa62, 0x0000 }, + { 0x0700, 0xfa64, 0x0000 }, + { 0x8700, 0xfa67, 0x2000 }, + { 0x0700, 0xfa66, 0x0000 }, + { 0x0700, 0xfa68, 0x0000 }, + { 0x8500, 0xfb02, 0x3000 }, + { 0x8500, 0xfb00, 0x2000 }, + { 0x0700, 0xfa6a, 0x0000 }, + { 0x0500, 0xfb01, 0x0000 }, + { 0x8500, 0xfb04, 0x2000 }, + { 0x0500, 0xfb03, 0x0000 }, + { 0x0500, 0xfb05, 0x0000 }, + { 0x8700, 0xfb1f, 0x4000 }, + { 0x8500, 0xfb16, 0x3000 }, + { 0x8500, 0xfb14, 0x2000 }, + { 0x0500, 0xfb13, 0x0000 }, + { 0x0500, 0xfb15, 0x0000 }, + { 0x8700, 0xfb1d, 0x2000 }, + { 0x0500, 0xfb17, 0x0000 }, + { 0x0c00, 0xfb1e, 0x0000 }, + { 0x8700, 0xfb23, 0x3000 }, + { 0x8700, 0xfb21, 0x2000 }, + { 0x0700, 0xfb20, 0x0000 }, + { 0x0700, 0xfb22, 0x0000 }, + { 0x8700, 0xfb25, 0x2000 }, + { 0x0700, 0xfb24, 0x0000 }, + { 0x0700, 0xfb26, 0x0000 }, + { 0x8700, 0xfbac, 0x8000 }, + { 0x8700, 0xfb6c, 0x7000 }, + { 0x8700, 0xfb4c, 0x6000 }, + { 0x8700, 0xfb38, 0x5000 }, + { 0x8700, 0xfb2f, 0x4000 }, + { 0x8700, 0xfb2b, 0x3000 }, + { 0x9900, 0xfb29, 0x2000 }, + { 0x0700, 0xfb28, 0x0000 }, + { 0x0700, 0xfb2a, 0x0000 }, + { 0x8700, 0xfb2d, 0x2000 }, + { 0x0700, 0xfb2c, 0x0000 }, + { 0x0700, 0xfb2e, 0x0000 }, + { 0x8700, 0xfb33, 0x3000 }, + { 0x8700, 0xfb31, 0x2000 }, + { 0x0700, 0xfb30, 0x0000 }, + { 0x0700, 0xfb32, 0x0000 }, + { 0x8700, 0xfb35, 0x2000 }, + { 0x0700, 0xfb34, 0x0000 }, + { 0x0700, 0xfb36, 0x0000 }, + { 0x8700, 0xfb43, 0x4000 }, + { 0x8700, 0xfb3c, 0x3000 }, + { 0x8700, 0xfb3a, 0x2000 }, + { 0x0700, 0xfb39, 0x0000 }, + { 0x0700, 0xfb3b, 0x0000 }, + { 0x8700, 0xfb40, 0x2000 }, + { 0x0700, 0xfb3e, 0x0000 }, + { 0x0700, 0xfb41, 0x0000 }, + { 0x8700, 0xfb48, 0x3000 }, + { 0x8700, 0xfb46, 0x2000 }, + { 0x0700, 0xfb44, 0x0000 }, + { 0x0700, 0xfb47, 0x0000 }, + { 0x8700, 0xfb4a, 0x2000 }, + { 0x0700, 0xfb49, 0x0000 }, + { 0x0700, 0xfb4b, 0x0000 }, + { 0x8700, 0xfb5c, 0x5000 }, + { 0x8700, 0xfb54, 0x4000 }, + { 0x8700, 0xfb50, 0x3000 }, + { 0x8700, 0xfb4e, 0x2000 }, + { 0x0700, 0xfb4d, 0x0000 }, + { 0x0700, 0xfb4f, 0x0000 }, + { 0x8700, 0xfb52, 0x2000 }, + { 0x0700, 0xfb51, 0x0000 }, + { 0x0700, 0xfb53, 0x0000 }, + { 0x8700, 0xfb58, 0x3000 }, + { 0x8700, 0xfb56, 0x2000 }, + { 0x0700, 0xfb55, 0x0000 }, + { 0x0700, 0xfb57, 0x0000 }, + { 0x8700, 0xfb5a, 0x2000 }, + { 0x0700, 0xfb59, 0x0000 }, + { 0x0700, 0xfb5b, 0x0000 }, + { 0x8700, 0xfb64, 0x4000 }, + { 0x8700, 0xfb60, 0x3000 }, + { 0x8700, 0xfb5e, 0x2000 }, + { 0x0700, 0xfb5d, 0x0000 }, + { 0x0700, 0xfb5f, 0x0000 }, + { 0x8700, 0xfb62, 0x2000 }, + { 0x0700, 0xfb61, 0x0000 }, + { 0x0700, 0xfb63, 0x0000 }, + { 0x8700, 0xfb68, 0x3000 }, + { 0x8700, 0xfb66, 0x2000 }, + { 0x0700, 0xfb65, 0x0000 }, + { 0x0700, 0xfb67, 0x0000 }, + { 0x8700, 0xfb6a, 0x2000 }, + { 0x0700, 0xfb69, 0x0000 }, + { 0x0700, 0xfb6b, 0x0000 }, + { 0x8700, 0xfb8c, 0x6000 }, + { 0x8700, 0xfb7c, 0x5000 }, + { 0x8700, 0xfb74, 0x4000 }, + { 0x8700, 0xfb70, 0x3000 }, + { 0x8700, 0xfb6e, 0x2000 }, + { 0x0700, 0xfb6d, 0x0000 }, + { 0x0700, 0xfb6f, 0x0000 }, + { 0x8700, 0xfb72, 0x2000 }, + { 0x0700, 0xfb71, 0x0000 }, + { 0x0700, 0xfb73, 0x0000 }, + { 0x8700, 0xfb78, 0x3000 }, + { 0x8700, 0xfb76, 0x2000 }, + { 0x0700, 0xfb75, 0x0000 }, + { 0x0700, 0xfb77, 0x0000 }, + { 0x8700, 0xfb7a, 0x2000 }, + { 0x0700, 0xfb79, 0x0000 }, + { 0x0700, 0xfb7b, 0x0000 }, + { 0x8700, 0xfb84, 0x4000 }, + { 0x8700, 0xfb80, 0x3000 }, + { 0x8700, 0xfb7e, 0x2000 }, + { 0x0700, 0xfb7d, 0x0000 }, + { 0x0700, 0xfb7f, 0x0000 }, + { 0x8700, 0xfb82, 0x2000 }, + { 0x0700, 0xfb81, 0x0000 }, + { 0x0700, 0xfb83, 0x0000 }, + { 0x8700, 0xfb88, 0x3000 }, + { 0x8700, 0xfb86, 0x2000 }, + { 0x0700, 0xfb85, 0x0000 }, + { 0x0700, 0xfb87, 0x0000 }, + { 0x8700, 0xfb8a, 0x2000 }, + { 0x0700, 0xfb89, 0x0000 }, + { 0x0700, 0xfb8b, 0x0000 }, + { 0x8700, 0xfb9c, 0x5000 }, + { 0x8700, 0xfb94, 0x4000 }, + { 0x8700, 0xfb90, 0x3000 }, + { 0x8700, 0xfb8e, 0x2000 }, + { 0x0700, 0xfb8d, 0x0000 }, + { 0x0700, 0xfb8f, 0x0000 }, + { 0x8700, 0xfb92, 0x2000 }, + { 0x0700, 0xfb91, 0x0000 }, + { 0x0700, 0xfb93, 0x0000 }, + { 0x8700, 0xfb98, 0x3000 }, + { 0x8700, 0xfb96, 0x2000 }, + { 0x0700, 0xfb95, 0x0000 }, + { 0x0700, 0xfb97, 0x0000 }, + { 0x8700, 0xfb9a, 0x2000 }, + { 0x0700, 0xfb99, 0x0000 }, + { 0x0700, 0xfb9b, 0x0000 }, + { 0x8700, 0xfba4, 0x4000 }, + { 0x8700, 0xfba0, 0x3000 }, + { 0x8700, 0xfb9e, 0x2000 }, + { 0x0700, 0xfb9d, 0x0000 }, + { 0x0700, 0xfb9f, 0x0000 }, + { 0x8700, 0xfba2, 0x2000 }, + { 0x0700, 0xfba1, 0x0000 }, + { 0x0700, 0xfba3, 0x0000 }, + { 0x8700, 0xfba8, 0x3000 }, + { 0x8700, 0xfba6, 0x2000 }, + { 0x0700, 0xfba5, 0x0000 }, + { 0x0700, 0xfba7, 0x0000 }, + { 0x8700, 0xfbaa, 0x2000 }, + { 0x0700, 0xfba9, 0x0000 }, + { 0x0700, 0xfbab, 0x0000 }, + { 0x8700, 0xfc0d, 0x7000 }, + { 0x8700, 0xfbed, 0x6000 }, + { 0x8700, 0xfbdd, 0x5000 }, + { 0x8700, 0xfbd5, 0x4000 }, + { 0x8700, 0xfbb0, 0x3000 }, + { 0x8700, 0xfbae, 0x2000 }, + { 0x0700, 0xfbad, 0x0000 }, + { 0x0700, 0xfbaf, 0x0000 }, + { 0x8700, 0xfbd3, 0x2000 }, + { 0x0700, 0xfbb1, 0x0000 }, + { 0x0700, 0xfbd4, 0x0000 }, + { 0x8700, 0xfbd9, 0x3000 }, + { 0x8700, 0xfbd7, 0x2000 }, + { 0x0700, 0xfbd6, 0x0000 }, + { 0x0700, 0xfbd8, 0x0000 }, + { 0x8700, 0xfbdb, 0x2000 }, + { 0x0700, 0xfbda, 0x0000 }, + { 0x0700, 0xfbdc, 0x0000 }, + { 0x8700, 0xfbe5, 0x4000 }, + { 0x8700, 0xfbe1, 0x3000 }, + { 0x8700, 0xfbdf, 0x2000 }, + { 0x0700, 0xfbde, 0x0000 }, + { 0x0700, 0xfbe0, 0x0000 }, + { 0x8700, 0xfbe3, 0x2000 }, + { 0x0700, 0xfbe2, 0x0000 }, + { 0x0700, 0xfbe4, 0x0000 }, + { 0x8700, 0xfbe9, 0x3000 }, + { 0x8700, 0xfbe7, 0x2000 }, + { 0x0700, 0xfbe6, 0x0000 }, + { 0x0700, 0xfbe8, 0x0000 }, + { 0x8700, 0xfbeb, 0x2000 }, + { 0x0700, 0xfbea, 0x0000 }, + { 0x0700, 0xfbec, 0x0000 }, + { 0x8700, 0xfbfd, 0x5000 }, + { 0x8700, 0xfbf5, 0x4000 }, + { 0x8700, 0xfbf1, 0x3000 }, + { 0x8700, 0xfbef, 0x2000 }, + { 0x0700, 0xfbee, 0x0000 }, + { 0x0700, 0xfbf0, 0x0000 }, + { 0x8700, 0xfbf3, 0x2000 }, + { 0x0700, 0xfbf2, 0x0000 }, + { 0x0700, 0xfbf4, 0x0000 }, + { 0x8700, 0xfbf9, 0x3000 }, + { 0x8700, 0xfbf7, 0x2000 }, + { 0x0700, 0xfbf6, 0x0000 }, + { 0x0700, 0xfbf8, 0x0000 }, + { 0x8700, 0xfbfb, 0x2000 }, + { 0x0700, 0xfbfa, 0x0000 }, + { 0x0700, 0xfbfc, 0x0000 }, + { 0x8700, 0xfc05, 0x4000 }, + { 0x8700, 0xfc01, 0x3000 }, + { 0x8700, 0xfbff, 0x2000 }, + { 0x0700, 0xfbfe, 0x0000 }, + { 0x0700, 0xfc00, 0x0000 }, + { 0x8700, 0xfc03, 0x2000 }, + { 0x0700, 0xfc02, 0x0000 }, + { 0x0700, 0xfc04, 0x0000 }, + { 0x8700, 0xfc09, 0x3000 }, + { 0x8700, 0xfc07, 0x2000 }, + { 0x0700, 0xfc06, 0x0000 }, + { 0x0700, 0xfc08, 0x0000 }, + { 0x8700, 0xfc0b, 0x2000 }, + { 0x0700, 0xfc0a, 0x0000 }, + { 0x0700, 0xfc0c, 0x0000 }, + { 0x8700, 0xfc2d, 0x6000 }, + { 0x8700, 0xfc1d, 0x5000 }, + { 0x8700, 0xfc15, 0x4000 }, + { 0x8700, 0xfc11, 0x3000 }, + { 0x8700, 0xfc0f, 0x2000 }, + { 0x0700, 0xfc0e, 0x0000 }, + { 0x0700, 0xfc10, 0x0000 }, + { 0x8700, 0xfc13, 0x2000 }, + { 0x0700, 0xfc12, 0x0000 }, + { 0x0700, 0xfc14, 0x0000 }, + { 0x8700, 0xfc19, 0x3000 }, + { 0x8700, 0xfc17, 0x2000 }, + { 0x0700, 0xfc16, 0x0000 }, + { 0x0700, 0xfc18, 0x0000 }, + { 0x8700, 0xfc1b, 0x2000 }, + { 0x0700, 0xfc1a, 0x0000 }, + { 0x0700, 0xfc1c, 0x0000 }, + { 0x8700, 0xfc25, 0x4000 }, + { 0x8700, 0xfc21, 0x3000 }, + { 0x8700, 0xfc1f, 0x2000 }, + { 0x0700, 0xfc1e, 0x0000 }, + { 0x0700, 0xfc20, 0x0000 }, + { 0x8700, 0xfc23, 0x2000 }, + { 0x0700, 0xfc22, 0x0000 }, + { 0x0700, 0xfc24, 0x0000 }, + { 0x8700, 0xfc29, 0x3000 }, + { 0x8700, 0xfc27, 0x2000 }, + { 0x0700, 0xfc26, 0x0000 }, + { 0x0700, 0xfc28, 0x0000 }, + { 0x8700, 0xfc2b, 0x2000 }, + { 0x0700, 0xfc2a, 0x0000 }, + { 0x0700, 0xfc2c, 0x0000 }, + { 0x8700, 0xfc3d, 0x5000 }, + { 0x8700, 0xfc35, 0x4000 }, + { 0x8700, 0xfc31, 0x3000 }, + { 0x8700, 0xfc2f, 0x2000 }, + { 0x0700, 0xfc2e, 0x0000 }, + { 0x0700, 0xfc30, 0x0000 }, + { 0x8700, 0xfc33, 0x2000 }, + { 0x0700, 0xfc32, 0x0000 }, + { 0x0700, 0xfc34, 0x0000 }, + { 0x8700, 0xfc39, 0x3000 }, + { 0x8700, 0xfc37, 0x2000 }, + { 0x0700, 0xfc36, 0x0000 }, + { 0x0700, 0xfc38, 0x0000 }, + { 0x8700, 0xfc3b, 0x2000 }, + { 0x0700, 0xfc3a, 0x0000 }, + { 0x0700, 0xfc3c, 0x0000 }, + { 0x8700, 0xfc45, 0x4000 }, + { 0x8700, 0xfc41, 0x3000 }, + { 0x8700, 0xfc3f, 0x2000 }, + { 0x0700, 0xfc3e, 0x0000 }, + { 0x0700, 0xfc40, 0x0000 }, + { 0x8700, 0xfc43, 0x2000 }, + { 0x0700, 0xfc42, 0x0000 }, + { 0x0700, 0xfc44, 0x0000 }, + { 0x8700, 0xfc49, 0x3000 }, + { 0x8700, 0xfc47, 0x2000 }, + { 0x0700, 0xfc46, 0x0000 }, + { 0x0700, 0xfc48, 0x0000 }, + { 0x8700, 0xfc4b, 0x2000 }, + { 0x0700, 0xfc4a, 0x0000 }, + { 0x0700, 0xfc4c, 0x0000 }, + { 0x8700, 0xfeac, 0xa000 }, + { 0x8700, 0xfd5d, 0x9000 }, + { 0x8700, 0xfccd, 0x8000 }, + { 0x8700, 0xfc8d, 0x7000 }, + { 0x8700, 0xfc6d, 0x6000 }, + { 0x8700, 0xfc5d, 0x5000 }, + { 0x8700, 0xfc55, 0x4000 }, + { 0x8700, 0xfc51, 0x3000 }, + { 0x8700, 0xfc4f, 0x2000 }, + { 0x0700, 0xfc4e, 0x0000 }, + { 0x0700, 0xfc50, 0x0000 }, + { 0x8700, 0xfc53, 0x2000 }, + { 0x0700, 0xfc52, 0x0000 }, + { 0x0700, 0xfc54, 0x0000 }, + { 0x8700, 0xfc59, 0x3000 }, + { 0x8700, 0xfc57, 0x2000 }, + { 0x0700, 0xfc56, 0x0000 }, + { 0x0700, 0xfc58, 0x0000 }, + { 0x8700, 0xfc5b, 0x2000 }, + { 0x0700, 0xfc5a, 0x0000 }, + { 0x0700, 0xfc5c, 0x0000 }, + { 0x8700, 0xfc65, 0x4000 }, + { 0x8700, 0xfc61, 0x3000 }, + { 0x8700, 0xfc5f, 0x2000 }, + { 0x0700, 0xfc5e, 0x0000 }, + { 0x0700, 0xfc60, 0x0000 }, + { 0x8700, 0xfc63, 0x2000 }, + { 0x0700, 0xfc62, 0x0000 }, + { 0x0700, 0xfc64, 0x0000 }, + { 0x8700, 0xfc69, 0x3000 }, + { 0x8700, 0xfc67, 0x2000 }, + { 0x0700, 0xfc66, 0x0000 }, + { 0x0700, 0xfc68, 0x0000 }, + { 0x8700, 0xfc6b, 0x2000 }, + { 0x0700, 0xfc6a, 0x0000 }, + { 0x0700, 0xfc6c, 0x0000 }, + { 0x8700, 0xfc7d, 0x5000 }, + { 0x8700, 0xfc75, 0x4000 }, + { 0x8700, 0xfc71, 0x3000 }, + { 0x8700, 0xfc6f, 0x2000 }, + { 0x0700, 0xfc6e, 0x0000 }, + { 0x0700, 0xfc70, 0x0000 }, + { 0x8700, 0xfc73, 0x2000 }, + { 0x0700, 0xfc72, 0x0000 }, + { 0x0700, 0xfc74, 0x0000 }, + { 0x8700, 0xfc79, 0x3000 }, + { 0x8700, 0xfc77, 0x2000 }, + { 0x0700, 0xfc76, 0x0000 }, + { 0x0700, 0xfc78, 0x0000 }, + { 0x8700, 0xfc7b, 0x2000 }, + { 0x0700, 0xfc7a, 0x0000 }, + { 0x0700, 0xfc7c, 0x0000 }, + { 0x8700, 0xfc85, 0x4000 }, + { 0x8700, 0xfc81, 0x3000 }, + { 0x8700, 0xfc7f, 0x2000 }, + { 0x0700, 0xfc7e, 0x0000 }, + { 0x0700, 0xfc80, 0x0000 }, + { 0x8700, 0xfc83, 0x2000 }, + { 0x0700, 0xfc82, 0x0000 }, + { 0x0700, 0xfc84, 0x0000 }, + { 0x8700, 0xfc89, 0x3000 }, + { 0x8700, 0xfc87, 0x2000 }, + { 0x0700, 0xfc86, 0x0000 }, + { 0x0700, 0xfc88, 0x0000 }, + { 0x8700, 0xfc8b, 0x2000 }, + { 0x0700, 0xfc8a, 0x0000 }, + { 0x0700, 0xfc8c, 0x0000 }, + { 0x8700, 0xfcad, 0x6000 }, + { 0x8700, 0xfc9d, 0x5000 }, + { 0x8700, 0xfc95, 0x4000 }, + { 0x8700, 0xfc91, 0x3000 }, + { 0x8700, 0xfc8f, 0x2000 }, + { 0x0700, 0xfc8e, 0x0000 }, + { 0x0700, 0xfc90, 0x0000 }, + { 0x8700, 0xfc93, 0x2000 }, + { 0x0700, 0xfc92, 0x0000 }, + { 0x0700, 0xfc94, 0x0000 }, + { 0x8700, 0xfc99, 0x3000 }, + { 0x8700, 0xfc97, 0x2000 }, + { 0x0700, 0xfc96, 0x0000 }, + { 0x0700, 0xfc98, 0x0000 }, + { 0x8700, 0xfc9b, 0x2000 }, + { 0x0700, 0xfc9a, 0x0000 }, + { 0x0700, 0xfc9c, 0x0000 }, + { 0x8700, 0xfca5, 0x4000 }, + { 0x8700, 0xfca1, 0x3000 }, + { 0x8700, 0xfc9f, 0x2000 }, + { 0x0700, 0xfc9e, 0x0000 }, + { 0x0700, 0xfca0, 0x0000 }, + { 0x8700, 0xfca3, 0x2000 }, + { 0x0700, 0xfca2, 0x0000 }, + { 0x0700, 0xfca4, 0x0000 }, + { 0x8700, 0xfca9, 0x3000 }, + { 0x8700, 0xfca7, 0x2000 }, + { 0x0700, 0xfca6, 0x0000 }, + { 0x0700, 0xfca8, 0x0000 }, + { 0x8700, 0xfcab, 0x2000 }, + { 0x0700, 0xfcaa, 0x0000 }, + { 0x0700, 0xfcac, 0x0000 }, + { 0x8700, 0xfcbd, 0x5000 }, + { 0x8700, 0xfcb5, 0x4000 }, + { 0x8700, 0xfcb1, 0x3000 }, + { 0x8700, 0xfcaf, 0x2000 }, + { 0x0700, 0xfcae, 0x0000 }, + { 0x0700, 0xfcb0, 0x0000 }, + { 0x8700, 0xfcb3, 0x2000 }, + { 0x0700, 0xfcb2, 0x0000 }, + { 0x0700, 0xfcb4, 0x0000 }, + { 0x8700, 0xfcb9, 0x3000 }, + { 0x8700, 0xfcb7, 0x2000 }, + { 0x0700, 0xfcb6, 0x0000 }, + { 0x0700, 0xfcb8, 0x0000 }, + { 0x8700, 0xfcbb, 0x2000 }, + { 0x0700, 0xfcba, 0x0000 }, + { 0x0700, 0xfcbc, 0x0000 }, + { 0x8700, 0xfcc5, 0x4000 }, + { 0x8700, 0xfcc1, 0x3000 }, + { 0x8700, 0xfcbf, 0x2000 }, + { 0x0700, 0xfcbe, 0x0000 }, + { 0x0700, 0xfcc0, 0x0000 }, + { 0x8700, 0xfcc3, 0x2000 }, + { 0x0700, 0xfcc2, 0x0000 }, + { 0x0700, 0xfcc4, 0x0000 }, + { 0x8700, 0xfcc9, 0x3000 }, + { 0x8700, 0xfcc7, 0x2000 }, + { 0x0700, 0xfcc6, 0x0000 }, + { 0x0700, 0xfcc8, 0x0000 }, + { 0x8700, 0xfccb, 0x2000 }, + { 0x0700, 0xfcca, 0x0000 }, + { 0x0700, 0xfccc, 0x0000 }, + { 0x8700, 0xfd0d, 0x7000 }, + { 0x8700, 0xfced, 0x6000 }, + { 0x8700, 0xfcdd, 0x5000 }, + { 0x8700, 0xfcd5, 0x4000 }, + { 0x8700, 0xfcd1, 0x3000 }, + { 0x8700, 0xfccf, 0x2000 }, + { 0x0700, 0xfcce, 0x0000 }, + { 0x0700, 0xfcd0, 0x0000 }, + { 0x8700, 0xfcd3, 0x2000 }, + { 0x0700, 0xfcd2, 0x0000 }, + { 0x0700, 0xfcd4, 0x0000 }, + { 0x8700, 0xfcd9, 0x3000 }, + { 0x8700, 0xfcd7, 0x2000 }, + { 0x0700, 0xfcd6, 0x0000 }, + { 0x0700, 0xfcd8, 0x0000 }, + { 0x8700, 0xfcdb, 0x2000 }, + { 0x0700, 0xfcda, 0x0000 }, + { 0x0700, 0xfcdc, 0x0000 }, + { 0x8700, 0xfce5, 0x4000 }, + { 0x8700, 0xfce1, 0x3000 }, + { 0x8700, 0xfcdf, 0x2000 }, + { 0x0700, 0xfcde, 0x0000 }, + { 0x0700, 0xfce0, 0x0000 }, + { 0x8700, 0xfce3, 0x2000 }, + { 0x0700, 0xfce2, 0x0000 }, + { 0x0700, 0xfce4, 0x0000 }, + { 0x8700, 0xfce9, 0x3000 }, + { 0x8700, 0xfce7, 0x2000 }, + { 0x0700, 0xfce6, 0x0000 }, + { 0x0700, 0xfce8, 0x0000 }, + { 0x8700, 0xfceb, 0x2000 }, + { 0x0700, 0xfcea, 0x0000 }, + { 0x0700, 0xfcec, 0x0000 }, + { 0x8700, 0xfcfd, 0x5000 }, + { 0x8700, 0xfcf5, 0x4000 }, + { 0x8700, 0xfcf1, 0x3000 }, + { 0x8700, 0xfcef, 0x2000 }, + { 0x0700, 0xfcee, 0x0000 }, + { 0x0700, 0xfcf0, 0x0000 }, + { 0x8700, 0xfcf3, 0x2000 }, + { 0x0700, 0xfcf2, 0x0000 }, + { 0x0700, 0xfcf4, 0x0000 }, + { 0x8700, 0xfcf9, 0x3000 }, + { 0x8700, 0xfcf7, 0x2000 }, + { 0x0700, 0xfcf6, 0x0000 }, + { 0x0700, 0xfcf8, 0x0000 }, + { 0x8700, 0xfcfb, 0x2000 }, + { 0x0700, 0xfcfa, 0x0000 }, + { 0x0700, 0xfcfc, 0x0000 }, + { 0x8700, 0xfd05, 0x4000 }, + { 0x8700, 0xfd01, 0x3000 }, + { 0x8700, 0xfcff, 0x2000 }, + { 0x0700, 0xfcfe, 0x0000 }, + { 0x0700, 0xfd00, 0x0000 }, + { 0x8700, 0xfd03, 0x2000 }, + { 0x0700, 0xfd02, 0x0000 }, + { 0x0700, 0xfd04, 0x0000 }, + { 0x8700, 0xfd09, 0x3000 }, + { 0x8700, 0xfd07, 0x2000 }, + { 0x0700, 0xfd06, 0x0000 }, + { 0x0700, 0xfd08, 0x0000 }, + { 0x8700, 0xfd0b, 0x2000 }, + { 0x0700, 0xfd0a, 0x0000 }, + { 0x0700, 0xfd0c, 0x0000 }, + { 0x8700, 0xfd2d, 0x6000 }, + { 0x8700, 0xfd1d, 0x5000 }, + { 0x8700, 0xfd15, 0x4000 }, + { 0x8700, 0xfd11, 0x3000 }, + { 0x8700, 0xfd0f, 0x2000 }, + { 0x0700, 0xfd0e, 0x0000 }, + { 0x0700, 0xfd10, 0x0000 }, + { 0x8700, 0xfd13, 0x2000 }, + { 0x0700, 0xfd12, 0x0000 }, + { 0x0700, 0xfd14, 0x0000 }, + { 0x8700, 0xfd19, 0x3000 }, + { 0x8700, 0xfd17, 0x2000 }, + { 0x0700, 0xfd16, 0x0000 }, + { 0x0700, 0xfd18, 0x0000 }, + { 0x8700, 0xfd1b, 0x2000 }, + { 0x0700, 0xfd1a, 0x0000 }, + { 0x0700, 0xfd1c, 0x0000 }, + { 0x8700, 0xfd25, 0x4000 }, + { 0x8700, 0xfd21, 0x3000 }, + { 0x8700, 0xfd1f, 0x2000 }, + { 0x0700, 0xfd1e, 0x0000 }, + { 0x0700, 0xfd20, 0x0000 }, + { 0x8700, 0xfd23, 0x2000 }, + { 0x0700, 0xfd22, 0x0000 }, + { 0x0700, 0xfd24, 0x0000 }, + { 0x8700, 0xfd29, 0x3000 }, + { 0x8700, 0xfd27, 0x2000 }, + { 0x0700, 0xfd26, 0x0000 }, + { 0x0700, 0xfd28, 0x0000 }, + { 0x8700, 0xfd2b, 0x2000 }, + { 0x0700, 0xfd2a, 0x0000 }, + { 0x0700, 0xfd2c, 0x0000 }, + { 0x8700, 0xfd3d, 0x5000 }, + { 0x8700, 0xfd35, 0x4000 }, + { 0x8700, 0xfd31, 0x3000 }, + { 0x8700, 0xfd2f, 0x2000 }, + { 0x0700, 0xfd2e, 0x0000 }, + { 0x0700, 0xfd30, 0x0000 }, + { 0x8700, 0xfd33, 0x2000 }, + { 0x0700, 0xfd32, 0x0000 }, + { 0x0700, 0xfd34, 0x0000 }, + { 0x8700, 0xfd39, 0x3000 }, + { 0x8700, 0xfd37, 0x2000 }, + { 0x0700, 0xfd36, 0x0000 }, + { 0x0700, 0xfd38, 0x0000 }, + { 0x8700, 0xfd3b, 0x2000 }, + { 0x0700, 0xfd3a, 0x0000 }, + { 0x0700, 0xfd3c, 0x0000 }, + { 0x8700, 0xfd55, 0x4000 }, + { 0x8700, 0xfd51, 0x3000 }, + { 0x9200, 0xfd3f, 0x2000 }, + { 0x1600, 0xfd3e, 0x0000 }, + { 0x0700, 0xfd50, 0x0000 }, + { 0x8700, 0xfd53, 0x2000 }, + { 0x0700, 0xfd52, 0x0000 }, + { 0x0700, 0xfd54, 0x0000 }, + { 0x8700, 0xfd59, 0x3000 }, + { 0x8700, 0xfd57, 0x2000 }, + { 0x0700, 0xfd56, 0x0000 }, + { 0x0700, 0xfd58, 0x0000 }, + { 0x8700, 0xfd5b, 0x2000 }, + { 0x0700, 0xfd5a, 0x0000 }, + { 0x0700, 0xfd5c, 0x0000 }, + { 0x8c00, 0xfe09, 0x8000 }, + { 0x8700, 0xfd9f, 0x7000 }, + { 0x8700, 0xfd7d, 0x6000 }, + { 0x8700, 0xfd6d, 0x5000 }, + { 0x8700, 0xfd65, 0x4000 }, + { 0x8700, 0xfd61, 0x3000 }, + { 0x8700, 0xfd5f, 0x2000 }, + { 0x0700, 0xfd5e, 0x0000 }, + { 0x0700, 0xfd60, 0x0000 }, + { 0x8700, 0xfd63, 0x2000 }, + { 0x0700, 0xfd62, 0x0000 }, + { 0x0700, 0xfd64, 0x0000 }, + { 0x8700, 0xfd69, 0x3000 }, + { 0x8700, 0xfd67, 0x2000 }, + { 0x0700, 0xfd66, 0x0000 }, + { 0x0700, 0xfd68, 0x0000 }, + { 0x8700, 0xfd6b, 0x2000 }, + { 0x0700, 0xfd6a, 0x0000 }, + { 0x0700, 0xfd6c, 0x0000 }, + { 0x8700, 0xfd75, 0x4000 }, + { 0x8700, 0xfd71, 0x3000 }, + { 0x8700, 0xfd6f, 0x2000 }, + { 0x0700, 0xfd6e, 0x0000 }, + { 0x0700, 0xfd70, 0x0000 }, + { 0x8700, 0xfd73, 0x2000 }, + { 0x0700, 0xfd72, 0x0000 }, + { 0x0700, 0xfd74, 0x0000 }, + { 0x8700, 0xfd79, 0x3000 }, + { 0x8700, 0xfd77, 0x2000 }, + { 0x0700, 0xfd76, 0x0000 }, + { 0x0700, 0xfd78, 0x0000 }, + { 0x8700, 0xfd7b, 0x2000 }, + { 0x0700, 0xfd7a, 0x0000 }, + { 0x0700, 0xfd7c, 0x0000 }, + { 0x8700, 0xfd8d, 0x5000 }, + { 0x8700, 0xfd85, 0x4000 }, + { 0x8700, 0xfd81, 0x3000 }, + { 0x8700, 0xfd7f, 0x2000 }, + { 0x0700, 0xfd7e, 0x0000 }, + { 0x0700, 0xfd80, 0x0000 }, + { 0x8700, 0xfd83, 0x2000 }, + { 0x0700, 0xfd82, 0x0000 }, + { 0x0700, 0xfd84, 0x0000 }, + { 0x8700, 0xfd89, 0x3000 }, + { 0x8700, 0xfd87, 0x2000 }, + { 0x0700, 0xfd86, 0x0000 }, + { 0x0700, 0xfd88, 0x0000 }, + { 0x8700, 0xfd8b, 0x2000 }, + { 0x0700, 0xfd8a, 0x0000 }, + { 0x0700, 0xfd8c, 0x0000 }, + { 0x8700, 0xfd97, 0x4000 }, + { 0x8700, 0xfd93, 0x3000 }, + { 0x8700, 0xfd8f, 0x2000 }, + { 0x0700, 0xfd8e, 0x0000 }, + { 0x0700, 0xfd92, 0x0000 }, + { 0x8700, 0xfd95, 0x2000 }, + { 0x0700, 0xfd94, 0x0000 }, + { 0x0700, 0xfd96, 0x0000 }, + { 0x8700, 0xfd9b, 0x3000 }, + { 0x8700, 0xfd99, 0x2000 }, + { 0x0700, 0xfd98, 0x0000 }, + { 0x0700, 0xfd9a, 0x0000 }, + { 0x8700, 0xfd9d, 0x2000 }, + { 0x0700, 0xfd9c, 0x0000 }, + { 0x0700, 0xfd9e, 0x0000 }, + { 0x8700, 0xfdbf, 0x6000 }, + { 0x8700, 0xfdaf, 0x5000 }, + { 0x8700, 0xfda7, 0x4000 }, + { 0x8700, 0xfda3, 0x3000 }, + { 0x8700, 0xfda1, 0x2000 }, + { 0x0700, 0xfda0, 0x0000 }, + { 0x0700, 0xfda2, 0x0000 }, + { 0x8700, 0xfda5, 0x2000 }, + { 0x0700, 0xfda4, 0x0000 }, + { 0x0700, 0xfda6, 0x0000 }, + { 0x8700, 0xfdab, 0x3000 }, + { 0x8700, 0xfda9, 0x2000 }, + { 0x0700, 0xfda8, 0x0000 }, + { 0x0700, 0xfdaa, 0x0000 }, + { 0x8700, 0xfdad, 0x2000 }, + { 0x0700, 0xfdac, 0x0000 }, + { 0x0700, 0xfdae, 0x0000 }, + { 0x8700, 0xfdb7, 0x4000 }, + { 0x8700, 0xfdb3, 0x3000 }, + { 0x8700, 0xfdb1, 0x2000 }, + { 0x0700, 0xfdb0, 0x0000 }, + { 0x0700, 0xfdb2, 0x0000 }, + { 0x8700, 0xfdb5, 0x2000 }, + { 0x0700, 0xfdb4, 0x0000 }, + { 0x0700, 0xfdb6, 0x0000 }, + { 0x8700, 0xfdbb, 0x3000 }, + { 0x8700, 0xfdb9, 0x2000 }, + { 0x0700, 0xfdb8, 0x0000 }, + { 0x0700, 0xfdba, 0x0000 }, + { 0x8700, 0xfdbd, 0x2000 }, + { 0x0700, 0xfdbc, 0x0000 }, + { 0x0700, 0xfdbe, 0x0000 }, + { 0x8700, 0xfdf7, 0x5000 }, + { 0x8700, 0xfdc7, 0x4000 }, + { 0x8700, 0xfdc3, 0x3000 }, + { 0x8700, 0xfdc1, 0x2000 }, + { 0x0700, 0xfdc0, 0x0000 }, + { 0x0700, 0xfdc2, 0x0000 }, + { 0x8700, 0xfdc5, 0x2000 }, + { 0x0700, 0xfdc4, 0x0000 }, + { 0x0700, 0xfdc6, 0x0000 }, + { 0x8700, 0xfdf3, 0x3000 }, + { 0x8700, 0xfdf1, 0x2000 }, + { 0x0700, 0xfdf0, 0x0000 }, + { 0x0700, 0xfdf2, 0x0000 }, + { 0x8700, 0xfdf5, 0x2000 }, + { 0x0700, 0xfdf4, 0x0000 }, + { 0x0700, 0xfdf6, 0x0000 }, + { 0x8c00, 0xfe01, 0x4000 }, + { 0x8700, 0xfdfb, 0x3000 }, + { 0x8700, 0xfdf9, 0x2000 }, + { 0x0700, 0xfdf8, 0x0000 }, + { 0x0700, 0xfdfa, 0x0000 }, + { 0x9a00, 0xfdfd, 0x2000 }, + { 0x1700, 0xfdfc, 0x0000 }, + { 0x0c00, 0xfe00, 0x0000 }, + { 0x8c00, 0xfe05, 0x3000 }, + { 0x8c00, 0xfe03, 0x2000 }, + { 0x0c00, 0xfe02, 0x0000 }, + { 0x0c00, 0xfe04, 0x0000 }, + { 0x8c00, 0xfe07, 0x2000 }, + { 0x0c00, 0xfe06, 0x0000 }, + { 0x0c00, 0xfe08, 0x0000 }, + { 0x9900, 0xfe66, 0x7000 }, + { 0x9500, 0xfe45, 0x6000 }, + { 0x9600, 0xfe35, 0x5000 }, + { 0x8c00, 0xfe21, 0x4000 }, + { 0x8c00, 0xfe0d, 0x3000 }, + { 0x8c00, 0xfe0b, 0x2000 }, + { 0x0c00, 0xfe0a, 0x0000 }, + { 0x0c00, 0xfe0c, 0x0000 }, + { 0x8c00, 0xfe0f, 0x2000 }, + { 0x0c00, 0xfe0e, 0x0000 }, + { 0x0c00, 0xfe20, 0x0000 }, + { 0x9100, 0xfe31, 0x3000 }, + { 0x8c00, 0xfe23, 0x2000 }, + { 0x0c00, 0xfe22, 0x0000 }, + { 0x1500, 0xfe30, 0x0000 }, + { 0x9000, 0xfe33, 0x2000 }, + { 0x1100, 0xfe32, 0x0000 }, + { 0x1000, 0xfe34, 0x0000 }, + { 0x9600, 0xfe3d, 0x4000 }, + { 0x9600, 0xfe39, 0x3000 }, + { 0x9600, 0xfe37, 0x2000 }, + { 0x1200, 0xfe36, 0x0000 }, + { 0x1200, 0xfe38, 0x0000 }, + { 0x9600, 0xfe3b, 0x2000 }, + { 0x1200, 0xfe3a, 0x0000 }, + { 0x1200, 0xfe3c, 0x0000 }, + { 0x9600, 0xfe41, 0x3000 }, + { 0x9600, 0xfe3f, 0x2000 }, + { 0x1200, 0xfe3e, 0x0000 }, + { 0x1200, 0xfe40, 0x0000 }, + { 0x9600, 0xfe43, 0x2000 }, + { 0x1200, 0xfe42, 0x0000 }, + { 0x1200, 0xfe44, 0x0000 }, + { 0x9500, 0xfe56, 0x5000 }, + { 0x9000, 0xfe4d, 0x4000 }, + { 0x9500, 0xfe49, 0x3000 }, + { 0x9600, 0xfe47, 0x2000 }, + { 0x1500, 0xfe46, 0x0000 }, + { 0x1200, 0xfe48, 0x0000 }, + { 0x9500, 0xfe4b, 0x2000 }, + { 0x1500, 0xfe4a, 0x0000 }, + { 0x1500, 0xfe4c, 0x0000 }, + { 0x9500, 0xfe51, 0x3000 }, + { 0x9000, 0xfe4f, 0x2000 }, + { 0x1000, 0xfe4e, 0x0000 }, + { 0x1500, 0xfe50, 0x0000 }, + { 0x9500, 0xfe54, 0x2000 }, + { 0x1500, 0xfe52, 0x0000 }, + { 0x1500, 0xfe55, 0x0000 }, + { 0x9200, 0xfe5e, 0x4000 }, + { 0x9200, 0xfe5a, 0x3000 }, + { 0x9100, 0xfe58, 0x2000 }, + { 0x1500, 0xfe57, 0x0000 }, + { 0x1600, 0xfe59, 0x0000 }, + { 0x9200, 0xfe5c, 0x2000 }, + { 0x1600, 0xfe5b, 0x0000 }, + { 0x1600, 0xfe5d, 0x0000 }, + { 0x9900, 0xfe62, 0x3000 }, + { 0x9500, 0xfe60, 0x2000 }, + { 0x1500, 0xfe5f, 0x0000 }, + { 0x1500, 0xfe61, 0x0000 }, + { 0x9900, 0xfe64, 0x2000 }, + { 0x1100, 0xfe63, 0x0000 }, + { 0x1900, 0xfe65, 0x0000 }, + { 0x8700, 0xfe8c, 0x6000 }, + { 0x8700, 0xfe7c, 0x5000 }, + { 0x8700, 0xfe73, 0x4000 }, + { 0x9500, 0xfe6b, 0x3000 }, + { 0x9700, 0xfe69, 0x2000 }, + { 0x1500, 0xfe68, 0x0000 }, + { 0x1500, 0xfe6a, 0x0000 }, + { 0x8700, 0xfe71, 0x2000 }, + { 0x0700, 0xfe70, 0x0000 }, + { 0x0700, 0xfe72, 0x0000 }, + { 0x8700, 0xfe78, 0x3000 }, + { 0x8700, 0xfe76, 0x2000 }, + { 0x0700, 0xfe74, 0x0000 }, + { 0x0700, 0xfe77, 0x0000 }, + { 0x8700, 0xfe7a, 0x2000 }, + { 0x0700, 0xfe79, 0x0000 }, + { 0x0700, 0xfe7b, 0x0000 }, + { 0x8700, 0xfe84, 0x4000 }, + { 0x8700, 0xfe80, 0x3000 }, + { 0x8700, 0xfe7e, 0x2000 }, + { 0x0700, 0xfe7d, 0x0000 }, + { 0x0700, 0xfe7f, 0x0000 }, + { 0x8700, 0xfe82, 0x2000 }, + { 0x0700, 0xfe81, 0x0000 }, + { 0x0700, 0xfe83, 0x0000 }, + { 0x8700, 0xfe88, 0x3000 }, + { 0x8700, 0xfe86, 0x2000 }, + { 0x0700, 0xfe85, 0x0000 }, + { 0x0700, 0xfe87, 0x0000 }, + { 0x8700, 0xfe8a, 0x2000 }, + { 0x0700, 0xfe89, 0x0000 }, + { 0x0700, 0xfe8b, 0x0000 }, + { 0x8700, 0xfe9c, 0x5000 }, + { 0x8700, 0xfe94, 0x4000 }, + { 0x8700, 0xfe90, 0x3000 }, + { 0x8700, 0xfe8e, 0x2000 }, + { 0x0700, 0xfe8d, 0x0000 }, + { 0x0700, 0xfe8f, 0x0000 }, + { 0x8700, 0xfe92, 0x2000 }, + { 0x0700, 0xfe91, 0x0000 }, + { 0x0700, 0xfe93, 0x0000 }, + { 0x8700, 0xfe98, 0x3000 }, + { 0x8700, 0xfe96, 0x2000 }, + { 0x0700, 0xfe95, 0x0000 }, + { 0x0700, 0xfe97, 0x0000 }, + { 0x8700, 0xfe9a, 0x2000 }, + { 0x0700, 0xfe99, 0x0000 }, + { 0x0700, 0xfe9b, 0x0000 }, + { 0x8700, 0xfea4, 0x4000 }, + { 0x8700, 0xfea0, 0x3000 }, + { 0x8700, 0xfe9e, 0x2000 }, + { 0x0700, 0xfe9d, 0x0000 }, + { 0x0700, 0xfe9f, 0x0000 }, + { 0x8700, 0xfea2, 0x2000 }, + { 0x0700, 0xfea1, 0x0000 }, + { 0x0700, 0xfea3, 0x0000 }, + { 0x8700, 0xfea8, 0x3000 }, + { 0x8700, 0xfea6, 0x2000 }, + { 0x0700, 0xfea5, 0x0000 }, + { 0x0700, 0xfea7, 0x0000 }, + { 0x8700, 0xfeaa, 0x2000 }, + { 0x0700, 0xfea9, 0x0000 }, + { 0x0700, 0xfeab, 0x0000 }, + { 0x8700, 0xffaf, 0x9000 }, + { 0x8900, 0xff2f, 0x8020 }, + { 0x8700, 0xfeec, 0x7000 }, + { 0x8700, 0xfecc, 0x6000 }, + { 0x8700, 0xfebc, 0x5000 }, + { 0x8700, 0xfeb4, 0x4000 }, + { 0x8700, 0xfeb0, 0x3000 }, + { 0x8700, 0xfeae, 0x2000 }, + { 0x0700, 0xfead, 0x0000 }, + { 0x0700, 0xfeaf, 0x0000 }, + { 0x8700, 0xfeb2, 0x2000 }, + { 0x0700, 0xfeb1, 0x0000 }, + { 0x0700, 0xfeb3, 0x0000 }, + { 0x8700, 0xfeb8, 0x3000 }, + { 0x8700, 0xfeb6, 0x2000 }, + { 0x0700, 0xfeb5, 0x0000 }, + { 0x0700, 0xfeb7, 0x0000 }, + { 0x8700, 0xfeba, 0x2000 }, + { 0x0700, 0xfeb9, 0x0000 }, + { 0x0700, 0xfebb, 0x0000 }, + { 0x8700, 0xfec4, 0x4000 }, + { 0x8700, 0xfec0, 0x3000 }, + { 0x8700, 0xfebe, 0x2000 }, + { 0x0700, 0xfebd, 0x0000 }, + { 0x0700, 0xfebf, 0x0000 }, + { 0x8700, 0xfec2, 0x2000 }, + { 0x0700, 0xfec1, 0x0000 }, + { 0x0700, 0xfec3, 0x0000 }, + { 0x8700, 0xfec8, 0x3000 }, + { 0x8700, 0xfec6, 0x2000 }, + { 0x0700, 0xfec5, 0x0000 }, + { 0x0700, 0xfec7, 0x0000 }, + { 0x8700, 0xfeca, 0x2000 }, + { 0x0700, 0xfec9, 0x0000 }, + { 0x0700, 0xfecb, 0x0000 }, + { 0x8700, 0xfedc, 0x5000 }, + { 0x8700, 0xfed4, 0x4000 }, + { 0x8700, 0xfed0, 0x3000 }, + { 0x8700, 0xfece, 0x2000 }, + { 0x0700, 0xfecd, 0x0000 }, + { 0x0700, 0xfecf, 0x0000 }, + { 0x8700, 0xfed2, 0x2000 }, + { 0x0700, 0xfed1, 0x0000 }, + { 0x0700, 0xfed3, 0x0000 }, + { 0x8700, 0xfed8, 0x3000 }, + { 0x8700, 0xfed6, 0x2000 }, + { 0x0700, 0xfed5, 0x0000 }, + { 0x0700, 0xfed7, 0x0000 }, + { 0x8700, 0xfeda, 0x2000 }, + { 0x0700, 0xfed9, 0x0000 }, + { 0x0700, 0xfedb, 0x0000 }, + { 0x8700, 0xfee4, 0x4000 }, + { 0x8700, 0xfee0, 0x3000 }, + { 0x8700, 0xfede, 0x2000 }, + { 0x0700, 0xfedd, 0x0000 }, + { 0x0700, 0xfedf, 0x0000 }, + { 0x8700, 0xfee2, 0x2000 }, + { 0x0700, 0xfee1, 0x0000 }, + { 0x0700, 0xfee3, 0x0000 }, + { 0x8700, 0xfee8, 0x3000 }, + { 0x8700, 0xfee6, 0x2000 }, + { 0x0700, 0xfee5, 0x0000 }, + { 0x0700, 0xfee7, 0x0000 }, + { 0x8700, 0xfeea, 0x2000 }, + { 0x0700, 0xfee9, 0x0000 }, + { 0x0700, 0xfeeb, 0x0000 }, + { 0x9500, 0xff0f, 0x6000 }, + { 0x8700, 0xfefc, 0x5000 }, + { 0x8700, 0xfef4, 0x4000 }, + { 0x8700, 0xfef0, 0x3000 }, + { 0x8700, 0xfeee, 0x2000 }, + { 0x0700, 0xfeed, 0x0000 }, + { 0x0700, 0xfeef, 0x0000 }, + { 0x8700, 0xfef2, 0x2000 }, + { 0x0700, 0xfef1, 0x0000 }, + { 0x0700, 0xfef3, 0x0000 }, + { 0x8700, 0xfef8, 0x3000 }, + { 0x8700, 0xfef6, 0x2000 }, + { 0x0700, 0xfef5, 0x0000 }, + { 0x0700, 0xfef7, 0x0000 }, + { 0x8700, 0xfefa, 0x2000 }, + { 0x0700, 0xfef9, 0x0000 }, + { 0x0700, 0xfefb, 0x0000 }, + { 0x9500, 0xff07, 0x4000 }, + { 0x9500, 0xff03, 0x3000 }, + { 0x9500, 0xff01, 0x2000 }, + { 0x0100, 0xfeff, 0x0000 }, + { 0x1500, 0xff02, 0x0000 }, + { 0x9500, 0xff05, 0x2000 }, + { 0x1700, 0xff04, 0x0000 }, + { 0x1500, 0xff06, 0x0000 }, + { 0x9900, 0xff0b, 0x3000 }, + { 0x9200, 0xff09, 0x2000 }, + { 0x1600, 0xff08, 0x0000 }, + { 0x1500, 0xff0a, 0x0000 }, + { 0x9100, 0xff0d, 0x2000 }, + { 0x1500, 0xff0c, 0x0000 }, + { 0x1500, 0xff0e, 0x0000 }, + { 0x9500, 0xff1f, 0x5000 }, + { 0x8d00, 0xff17, 0x4000 }, + { 0x8d00, 0xff13, 0x3000 }, + { 0x8d00, 0xff11, 0x2000 }, + { 0x0d00, 0xff10, 0x0000 }, + { 0x0d00, 0xff12, 0x0000 }, + { 0x8d00, 0xff15, 0x2000 }, + { 0x0d00, 0xff14, 0x0000 }, + { 0x0d00, 0xff16, 0x0000 }, + { 0x9500, 0xff1b, 0x3000 }, + { 0x8d00, 0xff19, 0x2000 }, + { 0x0d00, 0xff18, 0x0000 }, + { 0x1500, 0xff1a, 0x0000 }, + { 0x9900, 0xff1d, 0x2000 }, + { 0x1900, 0xff1c, 0x0000 }, + { 0x1900, 0xff1e, 0x0000 }, + { 0x8900, 0xff27, 0x4020 }, + { 0x8900, 0xff23, 0x3020 }, + { 0x8900, 0xff21, 0x2020 }, + { 0x1500, 0xff20, 0x0000 }, + { 0x0900, 0xff22, 0x0020 }, + { 0x8900, 0xff25, 0x2020 }, + { 0x0900, 0xff24, 0x0020 }, + { 0x0900, 0xff26, 0x0020 }, + { 0x8900, 0xff2b, 0x3020 }, + { 0x8900, 0xff29, 0x2020 }, + { 0x0900, 0xff28, 0x0020 }, + { 0x0900, 0xff2a, 0x0020 }, + { 0x8900, 0xff2d, 0x2020 }, + { 0x0900, 0xff2c, 0x0020 }, + { 0x0900, 0xff2e, 0x0020 }, + { 0x8700, 0xff6f, 0x7000 }, + { 0x8500, 0xff4f, 0x6fe0 }, + { 0x9000, 0xff3f, 0x5000 }, + { 0x8900, 0xff37, 0x4020 }, + { 0x8900, 0xff33, 0x3020 }, + { 0x8900, 0xff31, 0x2020 }, + { 0x0900, 0xff30, 0x0020 }, + { 0x0900, 0xff32, 0x0020 }, + { 0x8900, 0xff35, 0x2020 }, + { 0x0900, 0xff34, 0x0020 }, + { 0x0900, 0xff36, 0x0020 }, + { 0x9600, 0xff3b, 0x3000 }, + { 0x8900, 0xff39, 0x2020 }, + { 0x0900, 0xff38, 0x0020 }, + { 0x0900, 0xff3a, 0x0020 }, + { 0x9200, 0xff3d, 0x2000 }, + { 0x1500, 0xff3c, 0x0000 }, + { 0x1800, 0xff3e, 0x0000 }, + { 0x8500, 0xff47, 0x4fe0 }, + { 0x8500, 0xff43, 0x3fe0 }, + { 0x8500, 0xff41, 0x2fe0 }, + { 0x1800, 0xff40, 0x0000 }, + { 0x0500, 0xff42, 0x0fe0 }, + { 0x8500, 0xff45, 0x2fe0 }, + { 0x0500, 0xff44, 0x0fe0 }, + { 0x0500, 0xff46, 0x0fe0 }, + { 0x8500, 0xff4b, 0x3fe0 }, + { 0x8500, 0xff49, 0x2fe0 }, + { 0x0500, 0xff48, 0x0fe0 }, + { 0x0500, 0xff4a, 0x0fe0 }, + { 0x8500, 0xff4d, 0x2fe0 }, + { 0x0500, 0xff4c, 0x0fe0 }, + { 0x0500, 0xff4e, 0x0fe0 }, + { 0x9600, 0xff5f, 0x5000 }, + { 0x8500, 0xff57, 0x4fe0 }, + { 0x8500, 0xff53, 0x3fe0 }, + { 0x8500, 0xff51, 0x2fe0 }, + { 0x0500, 0xff50, 0x0fe0 }, + { 0x0500, 0xff52, 0x0fe0 }, + { 0x8500, 0xff55, 0x2fe0 }, + { 0x0500, 0xff54, 0x0fe0 }, + { 0x0500, 0xff56, 0x0fe0 }, + { 0x9600, 0xff5b, 0x3000 }, + { 0x8500, 0xff59, 0x2fe0 }, + { 0x0500, 0xff58, 0x0fe0 }, + { 0x0500, 0xff5a, 0x0fe0 }, + { 0x9200, 0xff5d, 0x2000 }, + { 0x1900, 0xff5c, 0x0000 }, + { 0x1900, 0xff5e, 0x0000 }, + { 0x8700, 0xff67, 0x4000 }, + { 0x9200, 0xff63, 0x3000 }, + { 0x9500, 0xff61, 0x2000 }, + { 0x1200, 0xff60, 0x0000 }, + { 0x1600, 0xff62, 0x0000 }, + { 0x9000, 0xff65, 0x2000 }, + { 0x1500, 0xff64, 0x0000 }, + { 0x0700, 0xff66, 0x0000 }, + { 0x8700, 0xff6b, 0x3000 }, + { 0x8700, 0xff69, 0x2000 }, + { 0x0700, 0xff68, 0x0000 }, + { 0x0700, 0xff6a, 0x0000 }, + { 0x8700, 0xff6d, 0x2000 }, + { 0x0700, 0xff6c, 0x0000 }, + { 0x0700, 0xff6e, 0x0000 }, + { 0x8700, 0xff8f, 0x6000 }, + { 0x8700, 0xff7f, 0x5000 }, + { 0x8700, 0xff77, 0x4000 }, + { 0x8700, 0xff73, 0x3000 }, + { 0x8700, 0xff71, 0x2000 }, + { 0x0600, 0xff70, 0x0000 }, + { 0x0700, 0xff72, 0x0000 }, + { 0x8700, 0xff75, 0x2000 }, + { 0x0700, 0xff74, 0x0000 }, + { 0x0700, 0xff76, 0x0000 }, + { 0x8700, 0xff7b, 0x3000 }, + { 0x8700, 0xff79, 0x2000 }, + { 0x0700, 0xff78, 0x0000 }, + { 0x0700, 0xff7a, 0x0000 }, + { 0x8700, 0xff7d, 0x2000 }, + { 0x0700, 0xff7c, 0x0000 }, + { 0x0700, 0xff7e, 0x0000 }, + { 0x8700, 0xff87, 0x4000 }, + { 0x8700, 0xff83, 0x3000 }, + { 0x8700, 0xff81, 0x2000 }, + { 0x0700, 0xff80, 0x0000 }, + { 0x0700, 0xff82, 0x0000 }, + { 0x8700, 0xff85, 0x2000 }, + { 0x0700, 0xff84, 0x0000 }, + { 0x0700, 0xff86, 0x0000 }, + { 0x8700, 0xff8b, 0x3000 }, + { 0x8700, 0xff89, 0x2000 }, + { 0x0700, 0xff88, 0x0000 }, + { 0x0700, 0xff8a, 0x0000 }, + { 0x8700, 0xff8d, 0x2000 }, + { 0x0700, 0xff8c, 0x0000 }, + { 0x0700, 0xff8e, 0x0000 }, + { 0x8600, 0xff9f, 0x5000 }, + { 0x8700, 0xff97, 0x4000 }, + { 0x8700, 0xff93, 0x3000 }, + { 0x8700, 0xff91, 0x2000 }, + { 0x0700, 0xff90, 0x0000 }, + { 0x0700, 0xff92, 0x0000 }, + { 0x8700, 0xff95, 0x2000 }, + { 0x0700, 0xff94, 0x0000 }, + { 0x0700, 0xff96, 0x0000 }, + { 0x8700, 0xff9b, 0x3000 }, + { 0x8700, 0xff99, 0x2000 }, + { 0x0700, 0xff98, 0x0000 }, + { 0x0700, 0xff9a, 0x0000 }, + { 0x8700, 0xff9d, 0x2000 }, + { 0x0700, 0xff9c, 0x0000 }, + { 0x0600, 0xff9e, 0x0000 }, + { 0x8700, 0xffa7, 0x4000 }, + { 0x8700, 0xffa3, 0x3000 }, + { 0x8700, 0xffa1, 0x2000 }, + { 0x0700, 0xffa0, 0x0000 }, + { 0x0700, 0xffa2, 0x0000 }, + { 0x8700, 0xffa5, 0x2000 }, + { 0x0700, 0xffa4, 0x0000 }, + { 0x0700, 0xffa6, 0x0000 }, + { 0x8700, 0xffab, 0x3000 }, + { 0x8700, 0xffa9, 0x2000 }, + { 0x0700, 0xffa8, 0x0000 }, + { 0x0700, 0xffaa, 0x0000 }, + { 0x8700, 0xffad, 0x2000 }, + { 0x0700, 0xffac, 0x0000 }, + { 0x0700, 0xffae, 0x0000 }, + { 0x8701, 0x004c, 0x8000 }, + { 0x8701, 0x0008, 0x7000 }, + { 0x8700, 0xffd6, 0x6000 }, + { 0x8700, 0xffc2, 0x5000 }, + { 0x8700, 0xffb7, 0x4000 }, + { 0x8700, 0xffb3, 0x3000 }, + { 0x8700, 0xffb1, 0x2000 }, + { 0x0700, 0xffb0, 0x0000 }, + { 0x0700, 0xffb2, 0x0000 }, + { 0x8700, 0xffb5, 0x2000 }, + { 0x0700, 0xffb4, 0x0000 }, + { 0x0700, 0xffb6, 0x0000 }, + { 0x8700, 0xffbb, 0x3000 }, + { 0x8700, 0xffb9, 0x2000 }, + { 0x0700, 0xffb8, 0x0000 }, + { 0x0700, 0xffba, 0x0000 }, + { 0x8700, 0xffbd, 0x2000 }, + { 0x0700, 0xffbc, 0x0000 }, + { 0x0700, 0xffbe, 0x0000 }, + { 0x8700, 0xffcc, 0x4000 }, + { 0x8700, 0xffc6, 0x3000 }, + { 0x8700, 0xffc4, 0x2000 }, + { 0x0700, 0xffc3, 0x0000 }, + { 0x0700, 0xffc5, 0x0000 }, + { 0x8700, 0xffca, 0x2000 }, + { 0x0700, 0xffc7, 0x0000 }, + { 0x0700, 0xffcb, 0x0000 }, + { 0x8700, 0xffd2, 0x3000 }, + { 0x8700, 0xffce, 0x2000 }, + { 0x0700, 0xffcd, 0x0000 }, + { 0x0700, 0xffcf, 0x0000 }, + { 0x8700, 0xffd4, 0x2000 }, + { 0x0700, 0xffd3, 0x0000 }, + { 0x0700, 0xffd5, 0x0000 }, + { 0x9900, 0xffec, 0x5000 }, + { 0x9800, 0xffe3, 0x4000 }, + { 0x8700, 0xffdc, 0x3000 }, + { 0x8700, 0xffda, 0x2000 }, + { 0x0700, 0xffd7, 0x0000 }, + { 0x0700, 0xffdb, 0x0000 }, + { 0x9700, 0xffe1, 0x2000 }, + { 0x1700, 0xffe0, 0x0000 }, + { 0x1900, 0xffe2, 0x0000 }, + { 0x9a00, 0xffe8, 0x3000 }, + { 0x9700, 0xffe5, 0x2000 }, + { 0x1a00, 0xffe4, 0x0000 }, + { 0x1700, 0xffe6, 0x0000 }, + { 0x9900, 0xffea, 0x2000 }, + { 0x1900, 0xffe9, 0x0000 }, + { 0x1900, 0xffeb, 0x0000 }, + { 0x8701, 0x0000, 0x4000 }, + { 0x8100, 0xfffa, 0x3000 }, + { 0x9a00, 0xffee, 0x2000 }, + { 0x1a00, 0xffed, 0x0000 }, + { 0x0100, 0xfff9, 0x0000 }, + { 0x9a00, 0xfffc, 0x2000 }, + { 0x0100, 0xfffb, 0x0000 }, + { 0x1a00, 0xfffd, 0x0000 }, + { 0x8701, 0x0004, 0x3000 }, + { 0x8701, 0x0002, 0x2000 }, + { 0x0701, 0x0001, 0x0000 }, + { 0x0701, 0x0003, 0x0000 }, + { 0x8701, 0x0006, 0x2000 }, + { 0x0701, 0x0005, 0x0000 }, + { 0x0701, 0x0007, 0x0000 }, + { 0x8701, 0x002a, 0x6000 }, + { 0x8701, 0x0019, 0x5000 }, + { 0x8701, 0x0011, 0x4000 }, + { 0x8701, 0x000d, 0x3000 }, + { 0x8701, 0x000a, 0x2000 }, + { 0x0701, 0x0009, 0x0000 }, + { 0x0701, 0x000b, 0x0000 }, + { 0x8701, 0x000f, 0x2000 }, + { 0x0701, 0x000e, 0x0000 }, + { 0x0701, 0x0010, 0x0000 }, + { 0x8701, 0x0015, 0x3000 }, + { 0x8701, 0x0013, 0x2000 }, + { 0x0701, 0x0012, 0x0000 }, + { 0x0701, 0x0014, 0x0000 }, + { 0x8701, 0x0017, 0x2000 }, + { 0x0701, 0x0016, 0x0000 }, + { 0x0701, 0x0018, 0x0000 }, + { 0x8701, 0x0021, 0x4000 }, + { 0x8701, 0x001d, 0x3000 }, + { 0x8701, 0x001b, 0x2000 }, + { 0x0701, 0x001a, 0x0000 }, + { 0x0701, 0x001c, 0x0000 }, + { 0x8701, 0x001f, 0x2000 }, + { 0x0701, 0x001e, 0x0000 }, + { 0x0701, 0x0020, 0x0000 }, + { 0x8701, 0x0025, 0x3000 }, + { 0x8701, 0x0023, 0x2000 }, + { 0x0701, 0x0022, 0x0000 }, + { 0x0701, 0x0024, 0x0000 }, + { 0x8701, 0x0028, 0x2000 }, + { 0x0701, 0x0026, 0x0000 }, + { 0x0701, 0x0029, 0x0000 }, + { 0x8701, 0x003a, 0x5000 }, + { 0x8701, 0x0032, 0x4000 }, + { 0x8701, 0x002e, 0x3000 }, + { 0x8701, 0x002c, 0x2000 }, + { 0x0701, 0x002b, 0x0000 }, + { 0x0701, 0x002d, 0x0000 }, + { 0x8701, 0x0030, 0x2000 }, + { 0x0701, 0x002f, 0x0000 }, + { 0x0701, 0x0031, 0x0000 }, + { 0x8701, 0x0036, 0x3000 }, + { 0x8701, 0x0034, 0x2000 }, + { 0x0701, 0x0033, 0x0000 }, + { 0x0701, 0x0035, 0x0000 }, + { 0x8701, 0x0038, 0x2000 }, + { 0x0701, 0x0037, 0x0000 }, + { 0x0701, 0x0039, 0x0000 }, + { 0x8701, 0x0044, 0x4000 }, + { 0x8701, 0x0040, 0x3000 }, + { 0x8701, 0x003d, 0x2000 }, + { 0x0701, 0x003c, 0x0000 }, + { 0x0701, 0x003f, 0x0000 }, + { 0x8701, 0x0042, 0x2000 }, + { 0x0701, 0x0041, 0x0000 }, + { 0x0701, 0x0043, 0x0000 }, + { 0x8701, 0x0048, 0x3000 }, + { 0x8701, 0x0046, 0x2000 }, + { 0x0701, 0x0045, 0x0000 }, + { 0x0701, 0x0047, 0x0000 }, + { 0x8701, 0x004a, 0x2000 }, + { 0x0701, 0x0049, 0x0000 }, + { 0x0701, 0x004b, 0x0000 }, + { 0x8701, 0x00b0, 0x7000 }, + { 0x8701, 0x0090, 0x6000 }, + { 0x8701, 0x0080, 0x5000 }, + { 0x8701, 0x0056, 0x4000 }, + { 0x8701, 0x0052, 0x3000 }, + { 0x8701, 0x0050, 0x2000 }, + { 0x0701, 0x004d, 0x0000 }, + { 0x0701, 0x0051, 0x0000 }, + { 0x8701, 0x0054, 0x2000 }, + { 0x0701, 0x0053, 0x0000 }, + { 0x0701, 0x0055, 0x0000 }, + { 0x8701, 0x005a, 0x3000 }, + { 0x8701, 0x0058, 0x2000 }, + { 0x0701, 0x0057, 0x0000 }, + { 0x0701, 0x0059, 0x0000 }, + { 0x8701, 0x005c, 0x2000 }, + { 0x0701, 0x005b, 0x0000 }, + { 0x0701, 0x005d, 0x0000 }, + { 0x8701, 0x0088, 0x4000 }, + { 0x8701, 0x0084, 0x3000 }, + { 0x8701, 0x0082, 0x2000 }, + { 0x0701, 0x0081, 0x0000 }, + { 0x0701, 0x0083, 0x0000 }, + { 0x8701, 0x0086, 0x2000 }, + { 0x0701, 0x0085, 0x0000 }, + { 0x0701, 0x0087, 0x0000 }, + { 0x8701, 0x008c, 0x3000 }, + { 0x8701, 0x008a, 0x2000 }, + { 0x0701, 0x0089, 0x0000 }, + { 0x0701, 0x008b, 0x0000 }, + { 0x8701, 0x008e, 0x2000 }, + { 0x0701, 0x008d, 0x0000 }, + { 0x0701, 0x008f, 0x0000 }, + { 0x8701, 0x00a0, 0x5000 }, + { 0x8701, 0x0098, 0x4000 }, + { 0x8701, 0x0094, 0x3000 }, + { 0x8701, 0x0092, 0x2000 }, + { 0x0701, 0x0091, 0x0000 }, + { 0x0701, 0x0093, 0x0000 }, + { 0x8701, 0x0096, 0x2000 }, + { 0x0701, 0x0095, 0x0000 }, + { 0x0701, 0x0097, 0x0000 }, + { 0x8701, 0x009c, 0x3000 }, + { 0x8701, 0x009a, 0x2000 }, + { 0x0701, 0x0099, 0x0000 }, + { 0x0701, 0x009b, 0x0000 }, + { 0x8701, 0x009e, 0x2000 }, + { 0x0701, 0x009d, 0x0000 }, + { 0x0701, 0x009f, 0x0000 }, + { 0x8701, 0x00a8, 0x4000 }, + { 0x8701, 0x00a4, 0x3000 }, + { 0x8701, 0x00a2, 0x2000 }, + { 0x0701, 0x00a1, 0x0000 }, + { 0x0701, 0x00a3, 0x0000 }, + { 0x8701, 0x00a6, 0x2000 }, + { 0x0701, 0x00a5, 0x0000 }, + { 0x0701, 0x00a7, 0x0000 }, + { 0x8701, 0x00ac, 0x3000 }, + { 0x8701, 0x00aa, 0x2000 }, + { 0x0701, 0x00a9, 0x0000 }, + { 0x0701, 0x00ab, 0x0000 }, + { 0x8701, 0x00ae, 0x2000 }, + { 0x0701, 0x00ad, 0x0000 }, + { 0x0701, 0x00af, 0x0000 }, + { 0x8701, 0x00d0, 0x6000 }, + { 0x8701, 0x00c0, 0x5000 }, + { 0x8701, 0x00b8, 0x4000 }, + { 0x8701, 0x00b4, 0x3000 }, + { 0x8701, 0x00b2, 0x2000 }, + { 0x0701, 0x00b1, 0x0000 }, + { 0x0701, 0x00b3, 0x0000 }, + { 0x8701, 0x00b6, 0x2000 }, + { 0x0701, 0x00b5, 0x0000 }, + { 0x0701, 0x00b7, 0x0000 }, + { 0x8701, 0x00bc, 0x3000 }, + { 0x8701, 0x00ba, 0x2000 }, + { 0x0701, 0x00b9, 0x0000 }, + { 0x0701, 0x00bb, 0x0000 }, + { 0x8701, 0x00be, 0x2000 }, + { 0x0701, 0x00bd, 0x0000 }, + { 0x0701, 0x00bf, 0x0000 }, + { 0x8701, 0x00c8, 0x4000 }, + { 0x8701, 0x00c4, 0x3000 }, + { 0x8701, 0x00c2, 0x2000 }, + { 0x0701, 0x00c1, 0x0000 }, + { 0x0701, 0x00c3, 0x0000 }, + { 0x8701, 0x00c6, 0x2000 }, + { 0x0701, 0x00c5, 0x0000 }, + { 0x0701, 0x00c7, 0x0000 }, + { 0x8701, 0x00cc, 0x3000 }, + { 0x8701, 0x00ca, 0x2000 }, + { 0x0701, 0x00c9, 0x0000 }, + { 0x0701, 0x00cb, 0x0000 }, + { 0x8701, 0x00ce, 0x2000 }, + { 0x0701, 0x00cd, 0x0000 }, + { 0x0701, 0x00cf, 0x0000 }, + { 0x8701, 0x00e0, 0x5000 }, + { 0x8701, 0x00d8, 0x4000 }, + { 0x8701, 0x00d4, 0x3000 }, + { 0x8701, 0x00d2, 0x2000 }, + { 0x0701, 0x00d1, 0x0000 }, + { 0x0701, 0x00d3, 0x0000 }, + { 0x8701, 0x00d6, 0x2000 }, + { 0x0701, 0x00d5, 0x0000 }, + { 0x0701, 0x00d7, 0x0000 }, + { 0x8701, 0x00dc, 0x3000 }, + { 0x8701, 0x00da, 0x2000 }, + { 0x0701, 0x00d9, 0x0000 }, + { 0x0701, 0x00db, 0x0000 }, + { 0x8701, 0x00de, 0x2000 }, + { 0x0701, 0x00dd, 0x0000 }, + { 0x0701, 0x00df, 0x0000 }, + { 0x8701, 0x00e8, 0x4000 }, + { 0x8701, 0x00e4, 0x3000 }, + { 0x8701, 0x00e2, 0x2000 }, + { 0x0701, 0x00e1, 0x0000 }, + { 0x0701, 0x00e3, 0x0000 }, + { 0x8701, 0x00e6, 0x2000 }, + { 0x0701, 0x00e5, 0x0000 }, + { 0x0701, 0x00e7, 0x0000 }, + { 0x8701, 0x00ec, 0x3000 }, + { 0x8701, 0x00ea, 0x2000 }, + { 0x0701, 0x00e9, 0x0000 }, + { 0x0701, 0x00eb, 0x0000 }, + { 0x8701, 0x00ee, 0x2000 }, + { 0x0701, 0x00ed, 0x0000 }, + { 0x0701, 0x00ef, 0x0000 }, + { 0x8501, 0xd459, 0xb000 }, + { 0x9a01, 0xd080, 0xa000 }, + { 0x8701, 0x045f, 0x9000 }, + { 0x8701, 0x0349, 0x8000 }, + { 0x9a01, 0x013c, 0x7000 }, + { 0x8f01, 0x0119, 0x6000 }, + { 0x8f01, 0x0109, 0x5000 }, + { 0x8701, 0x00f8, 0x4000 }, + { 0x8701, 0x00f4, 0x3000 }, + { 0x8701, 0x00f2, 0x2000 }, + { 0x0701, 0x00f1, 0x0000 }, + { 0x0701, 0x00f3, 0x0000 }, + { 0x8701, 0x00f6, 0x2000 }, + { 0x0701, 0x00f5, 0x0000 }, + { 0x0701, 0x00f7, 0x0000 }, + { 0x9501, 0x0101, 0x3000 }, + { 0x8701, 0x00fa, 0x2000 }, + { 0x0701, 0x00f9, 0x0000 }, + { 0x1501, 0x0100, 0x0000 }, + { 0x8f01, 0x0107, 0x2000 }, + { 0x1a01, 0x0102, 0x0000 }, + { 0x0f01, 0x0108, 0x0000 }, + { 0x8f01, 0x0111, 0x4000 }, + { 0x8f01, 0x010d, 0x3000 }, + { 0x8f01, 0x010b, 0x2000 }, + { 0x0f01, 0x010a, 0x0000 }, + { 0x0f01, 0x010c, 0x0000 }, + { 0x8f01, 0x010f, 0x2000 }, + { 0x0f01, 0x010e, 0x0000 }, + { 0x0f01, 0x0110, 0x0000 }, + { 0x8f01, 0x0115, 0x3000 }, + { 0x8f01, 0x0113, 0x2000 }, + { 0x0f01, 0x0112, 0x0000 }, + { 0x0f01, 0x0114, 0x0000 }, + { 0x8f01, 0x0117, 0x2000 }, + { 0x0f01, 0x0116, 0x0000 }, + { 0x0f01, 0x0118, 0x0000 }, + { 0x8f01, 0x0129, 0x5000 }, + { 0x8f01, 0x0121, 0x4000 }, + { 0x8f01, 0x011d, 0x3000 }, + { 0x8f01, 0x011b, 0x2000 }, + { 0x0f01, 0x011a, 0x0000 }, + { 0x0f01, 0x011c, 0x0000 }, + { 0x8f01, 0x011f, 0x2000 }, + { 0x0f01, 0x011e, 0x0000 }, + { 0x0f01, 0x0120, 0x0000 }, + { 0x8f01, 0x0125, 0x3000 }, + { 0x8f01, 0x0123, 0x2000 }, + { 0x0f01, 0x0122, 0x0000 }, + { 0x0f01, 0x0124, 0x0000 }, + { 0x8f01, 0x0127, 0x2000 }, + { 0x0f01, 0x0126, 0x0000 }, + { 0x0f01, 0x0128, 0x0000 }, + { 0x8f01, 0x0131, 0x4000 }, + { 0x8f01, 0x012d, 0x3000 }, + { 0x8f01, 0x012b, 0x2000 }, + { 0x0f01, 0x012a, 0x0000 }, + { 0x0f01, 0x012c, 0x0000 }, + { 0x8f01, 0x012f, 0x2000 }, + { 0x0f01, 0x012e, 0x0000 }, + { 0x0f01, 0x0130, 0x0000 }, + { 0x9a01, 0x0138, 0x3000 }, + { 0x8f01, 0x0133, 0x2000 }, + { 0x0f01, 0x0132, 0x0000 }, + { 0x1a01, 0x0137, 0x0000 }, + { 0x9a01, 0x013a, 0x2000 }, + { 0x1a01, 0x0139, 0x0000 }, + { 0x1a01, 0x013b, 0x0000 }, + { 0x8701, 0x031c, 0x6000 }, + { 0x8701, 0x030c, 0x5000 }, + { 0x8701, 0x0304, 0x4000 }, + { 0x8701, 0x0300, 0x3000 }, + { 0x9a01, 0x013e, 0x2000 }, + { 0x1a01, 0x013d, 0x0000 }, + { 0x1a01, 0x013f, 0x0000 }, + { 0x8701, 0x0302, 0x2000 }, + { 0x0701, 0x0301, 0x0000 }, + { 0x0701, 0x0303, 0x0000 }, + { 0x8701, 0x0308, 0x3000 }, + { 0x8701, 0x0306, 0x2000 }, + { 0x0701, 0x0305, 0x0000 }, + { 0x0701, 0x0307, 0x0000 }, + { 0x8701, 0x030a, 0x2000 }, + { 0x0701, 0x0309, 0x0000 }, + { 0x0701, 0x030b, 0x0000 }, + { 0x8701, 0x0314, 0x4000 }, + { 0x8701, 0x0310, 0x3000 }, + { 0x8701, 0x030e, 0x2000 }, + { 0x0701, 0x030d, 0x0000 }, + { 0x0701, 0x030f, 0x0000 }, + { 0x8701, 0x0312, 0x2000 }, + { 0x0701, 0x0311, 0x0000 }, + { 0x0701, 0x0313, 0x0000 }, + { 0x8701, 0x0318, 0x3000 }, + { 0x8701, 0x0316, 0x2000 }, + { 0x0701, 0x0315, 0x0000 }, + { 0x0701, 0x0317, 0x0000 }, + { 0x8701, 0x031a, 0x2000 }, + { 0x0701, 0x0319, 0x0000 }, + { 0x0701, 0x031b, 0x0000 }, + { 0x8701, 0x0339, 0x5000 }, + { 0x8701, 0x0331, 0x4000 }, + { 0x8f01, 0x0321, 0x3000 }, + { 0x8701, 0x031e, 0x2000 }, + { 0x0701, 0x031d, 0x0000 }, + { 0x0f01, 0x0320, 0x0000 }, + { 0x8f01, 0x0323, 0x2000 }, + { 0x0f01, 0x0322, 0x0000 }, + { 0x0701, 0x0330, 0x0000 }, + { 0x8701, 0x0335, 0x3000 }, + { 0x8701, 0x0333, 0x2000 }, + { 0x0701, 0x0332, 0x0000 }, + { 0x0701, 0x0334, 0x0000 }, + { 0x8701, 0x0337, 0x2000 }, + { 0x0701, 0x0336, 0x0000 }, + { 0x0701, 0x0338, 0x0000 }, + { 0x8701, 0x0341, 0x4000 }, + { 0x8701, 0x033d, 0x3000 }, + { 0x8701, 0x033b, 0x2000 }, + { 0x0701, 0x033a, 0x0000 }, + { 0x0701, 0x033c, 0x0000 }, + { 0x8701, 0x033f, 0x2000 }, + { 0x0701, 0x033e, 0x0000 }, + { 0x0701, 0x0340, 0x0000 }, + { 0x8701, 0x0345, 0x3000 }, + { 0x8701, 0x0343, 0x2000 }, + { 0x0701, 0x0342, 0x0000 }, + { 0x0701, 0x0344, 0x0000 }, + { 0x8701, 0x0347, 0x2000 }, + { 0x0701, 0x0346, 0x0000 }, + { 0x0701, 0x0348, 0x0000 }, + { 0x8901, 0x041f, 0x7028 }, + { 0x9501, 0x039f, 0x6000 }, + { 0x8701, 0x038e, 0x5000 }, + { 0x8701, 0x0386, 0x4000 }, + { 0x8701, 0x0382, 0x3000 }, + { 0x8701, 0x0380, 0x2000 }, + { 0x0e01, 0x034a, 0x0000 }, + { 0x0701, 0x0381, 0x0000 }, + { 0x8701, 0x0384, 0x2000 }, + { 0x0701, 0x0383, 0x0000 }, + { 0x0701, 0x0385, 0x0000 }, + { 0x8701, 0x038a, 0x3000 }, + { 0x8701, 0x0388, 0x2000 }, + { 0x0701, 0x0387, 0x0000 }, + { 0x0701, 0x0389, 0x0000 }, + { 0x8701, 0x038c, 0x2000 }, + { 0x0701, 0x038b, 0x0000 }, + { 0x0701, 0x038d, 0x0000 }, + { 0x8701, 0x0396, 0x4000 }, + { 0x8701, 0x0392, 0x3000 }, + { 0x8701, 0x0390, 0x2000 }, + { 0x0701, 0x038f, 0x0000 }, + { 0x0701, 0x0391, 0x0000 }, + { 0x8701, 0x0394, 0x2000 }, + { 0x0701, 0x0393, 0x0000 }, + { 0x0701, 0x0395, 0x0000 }, + { 0x8701, 0x039a, 0x3000 }, + { 0x8701, 0x0398, 0x2000 }, + { 0x0701, 0x0397, 0x0000 }, + { 0x0701, 0x0399, 0x0000 }, + { 0x8701, 0x039c, 0x2000 }, + { 0x0701, 0x039b, 0x0000 }, + { 0x0701, 0x039d, 0x0000 }, + { 0x8901, 0x040f, 0x5028 }, + { 0x8901, 0x0407, 0x4028 }, + { 0x8901, 0x0403, 0x3028 }, + { 0x8901, 0x0401, 0x2028 }, + { 0x0901, 0x0400, 0x0028 }, + { 0x0901, 0x0402, 0x0028 }, + { 0x8901, 0x0405, 0x2028 }, + { 0x0901, 0x0404, 0x0028 }, + { 0x0901, 0x0406, 0x0028 }, + { 0x8901, 0x040b, 0x3028 }, + { 0x8901, 0x0409, 0x2028 }, + { 0x0901, 0x0408, 0x0028 }, + { 0x0901, 0x040a, 0x0028 }, + { 0x8901, 0x040d, 0x2028 }, + { 0x0901, 0x040c, 0x0028 }, + { 0x0901, 0x040e, 0x0028 }, + { 0x8901, 0x0417, 0x4028 }, + { 0x8901, 0x0413, 0x3028 }, + { 0x8901, 0x0411, 0x2028 }, + { 0x0901, 0x0410, 0x0028 }, + { 0x0901, 0x0412, 0x0028 }, + { 0x8901, 0x0415, 0x2028 }, + { 0x0901, 0x0414, 0x0028 }, + { 0x0901, 0x0416, 0x0028 }, + { 0x8901, 0x041b, 0x3028 }, + { 0x8901, 0x0419, 0x2028 }, + { 0x0901, 0x0418, 0x0028 }, + { 0x0901, 0x041a, 0x0028 }, + { 0x8901, 0x041d, 0x2028 }, + { 0x0901, 0x041c, 0x0028 }, + { 0x0901, 0x041e, 0x0028 }, + { 0x8501, 0x043f, 0x6fd8 }, + { 0x8501, 0x042f, 0x5fd8 }, + { 0x8901, 0x0427, 0x4028 }, + { 0x8901, 0x0423, 0x3028 }, + { 0x8901, 0x0421, 0x2028 }, + { 0x0901, 0x0420, 0x0028 }, + { 0x0901, 0x0422, 0x0028 }, + { 0x8901, 0x0425, 0x2028 }, + { 0x0901, 0x0424, 0x0028 }, + { 0x0901, 0x0426, 0x0028 }, + { 0x8501, 0x042b, 0x3fd8 }, + { 0x8501, 0x0429, 0x2fd8 }, + { 0x0501, 0x0428, 0x0fd8 }, + { 0x0501, 0x042a, 0x0fd8 }, + { 0x8501, 0x042d, 0x2fd8 }, + { 0x0501, 0x042c, 0x0fd8 }, + { 0x0501, 0x042e, 0x0fd8 }, + { 0x8501, 0x0437, 0x4fd8 }, + { 0x8501, 0x0433, 0x3fd8 }, + { 0x8501, 0x0431, 0x2fd8 }, + { 0x0501, 0x0430, 0x0fd8 }, + { 0x0501, 0x0432, 0x0fd8 }, + { 0x8501, 0x0435, 0x2fd8 }, + { 0x0501, 0x0434, 0x0fd8 }, + { 0x0501, 0x0436, 0x0fd8 }, + { 0x8501, 0x043b, 0x3fd8 }, + { 0x8501, 0x0439, 0x2fd8 }, + { 0x0501, 0x0438, 0x0fd8 }, + { 0x0501, 0x043a, 0x0fd8 }, + { 0x8501, 0x043d, 0x2fd8 }, + { 0x0501, 0x043c, 0x0fd8 }, + { 0x0501, 0x043e, 0x0fd8 }, + { 0x8501, 0x044f, 0x5fd8 }, + { 0x8501, 0x0447, 0x4fd8 }, + { 0x8501, 0x0443, 0x3fd8 }, + { 0x8501, 0x0441, 0x2fd8 }, + { 0x0501, 0x0440, 0x0fd8 }, + { 0x0501, 0x0442, 0x0fd8 }, + { 0x8501, 0x0445, 0x2fd8 }, + { 0x0501, 0x0444, 0x0fd8 }, + { 0x0501, 0x0446, 0x0fd8 }, + { 0x8501, 0x044b, 0x3fd8 }, + { 0x8501, 0x0449, 0x2fd8 }, + { 0x0501, 0x0448, 0x0fd8 }, + { 0x0501, 0x044a, 0x0fd8 }, + { 0x8501, 0x044d, 0x2fd8 }, + { 0x0501, 0x044c, 0x0fd8 }, + { 0x0501, 0x044e, 0x0fd8 }, + { 0x8701, 0x0457, 0x4000 }, + { 0x8701, 0x0453, 0x3000 }, + { 0x8701, 0x0451, 0x2000 }, + { 0x0701, 0x0450, 0x0000 }, + { 0x0701, 0x0452, 0x0000 }, + { 0x8701, 0x0455, 0x2000 }, + { 0x0701, 0x0454, 0x0000 }, + { 0x0701, 0x0456, 0x0000 }, + { 0x8701, 0x045b, 0x3000 }, + { 0x8701, 0x0459, 0x2000 }, + { 0x0701, 0x0458, 0x0000 }, + { 0x0701, 0x045a, 0x0000 }, + { 0x8701, 0x045d, 0x2000 }, + { 0x0701, 0x045c, 0x0000 }, + { 0x0701, 0x045e, 0x0000 }, + { 0x9a01, 0xd000, 0x8000 }, + { 0x8d01, 0x04a1, 0x7000 }, + { 0x8701, 0x047f, 0x6000 }, + { 0x8701, 0x046f, 0x5000 }, + { 0x8701, 0x0467, 0x4000 }, + { 0x8701, 0x0463, 0x3000 }, + { 0x8701, 0x0461, 0x2000 }, + { 0x0701, 0x0460, 0x0000 }, + { 0x0701, 0x0462, 0x0000 }, + { 0x8701, 0x0465, 0x2000 }, + { 0x0701, 0x0464, 0x0000 }, + { 0x0701, 0x0466, 0x0000 }, + { 0x8701, 0x046b, 0x3000 }, + { 0x8701, 0x0469, 0x2000 }, + { 0x0701, 0x0468, 0x0000 }, + { 0x0701, 0x046a, 0x0000 }, + { 0x8701, 0x046d, 0x2000 }, + { 0x0701, 0x046c, 0x0000 }, + { 0x0701, 0x046e, 0x0000 }, + { 0x8701, 0x0477, 0x4000 }, + { 0x8701, 0x0473, 0x3000 }, + { 0x8701, 0x0471, 0x2000 }, + { 0x0701, 0x0470, 0x0000 }, + { 0x0701, 0x0472, 0x0000 }, + { 0x8701, 0x0475, 0x2000 }, + { 0x0701, 0x0474, 0x0000 }, + { 0x0701, 0x0476, 0x0000 }, + { 0x8701, 0x047b, 0x3000 }, + { 0x8701, 0x0479, 0x2000 }, + { 0x0701, 0x0478, 0x0000 }, + { 0x0701, 0x047a, 0x0000 }, + { 0x8701, 0x047d, 0x2000 }, + { 0x0701, 0x047c, 0x0000 }, + { 0x0701, 0x047e, 0x0000 }, + { 0x8701, 0x048f, 0x5000 }, + { 0x8701, 0x0487, 0x4000 }, + { 0x8701, 0x0483, 0x3000 }, + { 0x8701, 0x0481, 0x2000 }, + { 0x0701, 0x0480, 0x0000 }, + { 0x0701, 0x0482, 0x0000 }, + { 0x8701, 0x0485, 0x2000 }, + { 0x0701, 0x0484, 0x0000 }, + { 0x0701, 0x0486, 0x0000 }, + { 0x8701, 0x048b, 0x3000 }, + { 0x8701, 0x0489, 0x2000 }, + { 0x0701, 0x0488, 0x0000 }, + { 0x0701, 0x048a, 0x0000 }, + { 0x8701, 0x048d, 0x2000 }, + { 0x0701, 0x048c, 0x0000 }, + { 0x0701, 0x048e, 0x0000 }, + { 0x8701, 0x0497, 0x4000 }, + { 0x8701, 0x0493, 0x3000 }, + { 0x8701, 0x0491, 0x2000 }, + { 0x0701, 0x0490, 0x0000 }, + { 0x0701, 0x0492, 0x0000 }, + { 0x8701, 0x0495, 0x2000 }, + { 0x0701, 0x0494, 0x0000 }, + { 0x0701, 0x0496, 0x0000 }, + { 0x8701, 0x049b, 0x3000 }, + { 0x8701, 0x0499, 0x2000 }, + { 0x0701, 0x0498, 0x0000 }, + { 0x0701, 0x049a, 0x0000 }, + { 0x8701, 0x049d, 0x2000 }, + { 0x0701, 0x049c, 0x0000 }, + { 0x0d01, 0x04a0, 0x0000 }, + { 0x8701, 0x081a, 0x6000 }, + { 0x8701, 0x080a, 0x5000 }, + { 0x8d01, 0x04a9, 0x4000 }, + { 0x8d01, 0x04a5, 0x3000 }, + { 0x8d01, 0x04a3, 0x2000 }, + { 0x0d01, 0x04a2, 0x0000 }, + { 0x0d01, 0x04a4, 0x0000 }, + { 0x8d01, 0x04a7, 0x2000 }, + { 0x0d01, 0x04a6, 0x0000 }, + { 0x0d01, 0x04a8, 0x0000 }, + { 0x8701, 0x0803, 0x3000 }, + { 0x8701, 0x0801, 0x2000 }, + { 0x0701, 0x0800, 0x0000 }, + { 0x0701, 0x0802, 0x0000 }, + { 0x8701, 0x0805, 0x2000 }, + { 0x0701, 0x0804, 0x0000 }, + { 0x0701, 0x0808, 0x0000 }, + { 0x8701, 0x0812, 0x4000 }, + { 0x8701, 0x080e, 0x3000 }, + { 0x8701, 0x080c, 0x2000 }, + { 0x0701, 0x080b, 0x0000 }, + { 0x0701, 0x080d, 0x0000 }, + { 0x8701, 0x0810, 0x2000 }, + { 0x0701, 0x080f, 0x0000 }, + { 0x0701, 0x0811, 0x0000 }, + { 0x8701, 0x0816, 0x3000 }, + { 0x8701, 0x0814, 0x2000 }, + { 0x0701, 0x0813, 0x0000 }, + { 0x0701, 0x0815, 0x0000 }, + { 0x8701, 0x0818, 0x2000 }, + { 0x0701, 0x0817, 0x0000 }, + { 0x0701, 0x0819, 0x0000 }, + { 0x8701, 0x082a, 0x5000 }, + { 0x8701, 0x0822, 0x4000 }, + { 0x8701, 0x081e, 0x3000 }, + { 0x8701, 0x081c, 0x2000 }, + { 0x0701, 0x081b, 0x0000 }, + { 0x0701, 0x081d, 0x0000 }, + { 0x8701, 0x0820, 0x2000 }, + { 0x0701, 0x081f, 0x0000 }, + { 0x0701, 0x0821, 0x0000 }, + { 0x8701, 0x0826, 0x3000 }, + { 0x8701, 0x0824, 0x2000 }, + { 0x0701, 0x0823, 0x0000 }, + { 0x0701, 0x0825, 0x0000 }, + { 0x8701, 0x0828, 0x2000 }, + { 0x0701, 0x0827, 0x0000 }, + { 0x0701, 0x0829, 0x0000 }, + { 0x8701, 0x0832, 0x4000 }, + { 0x8701, 0x082e, 0x3000 }, + { 0x8701, 0x082c, 0x2000 }, + { 0x0701, 0x082b, 0x0000 }, + { 0x0701, 0x082d, 0x0000 }, + { 0x8701, 0x0830, 0x2000 }, + { 0x0701, 0x082f, 0x0000 }, + { 0x0701, 0x0831, 0x0000 }, + { 0x8701, 0x0837, 0x3000 }, + { 0x8701, 0x0834, 0x2000 }, + { 0x0701, 0x0833, 0x0000 }, + { 0x0701, 0x0835, 0x0000 }, + { 0x8701, 0x083c, 0x2000 }, + { 0x0701, 0x0838, 0x0000 }, + { 0x0701, 0x083f, 0x0000 }, + { 0x9a01, 0xd040, 0x7000 }, + { 0x9a01, 0xd020, 0x6000 }, + { 0x9a01, 0xd010, 0x5000 }, + { 0x9a01, 0xd008, 0x4000 }, + { 0x9a01, 0xd004, 0x3000 }, + { 0x9a01, 0xd002, 0x2000 }, + { 0x1a01, 0xd001, 0x0000 }, + { 0x1a01, 0xd003, 0x0000 }, + { 0x9a01, 0xd006, 0x2000 }, + { 0x1a01, 0xd005, 0x0000 }, + { 0x1a01, 0xd007, 0x0000 }, + { 0x9a01, 0xd00c, 0x3000 }, + { 0x9a01, 0xd00a, 0x2000 }, + { 0x1a01, 0xd009, 0x0000 }, + { 0x1a01, 0xd00b, 0x0000 }, + { 0x9a01, 0xd00e, 0x2000 }, + { 0x1a01, 0xd00d, 0x0000 }, + { 0x1a01, 0xd00f, 0x0000 }, + { 0x9a01, 0xd018, 0x4000 }, + { 0x9a01, 0xd014, 0x3000 }, + { 0x9a01, 0xd012, 0x2000 }, + { 0x1a01, 0xd011, 0x0000 }, + { 0x1a01, 0xd013, 0x0000 }, + { 0x9a01, 0xd016, 0x2000 }, + { 0x1a01, 0xd015, 0x0000 }, + { 0x1a01, 0xd017, 0x0000 }, + { 0x9a01, 0xd01c, 0x3000 }, + { 0x9a01, 0xd01a, 0x2000 }, + { 0x1a01, 0xd019, 0x0000 }, + { 0x1a01, 0xd01b, 0x0000 }, + { 0x9a01, 0xd01e, 0x2000 }, + { 0x1a01, 0xd01d, 0x0000 }, + { 0x1a01, 0xd01f, 0x0000 }, + { 0x9a01, 0xd030, 0x5000 }, + { 0x9a01, 0xd028, 0x4000 }, + { 0x9a01, 0xd024, 0x3000 }, + { 0x9a01, 0xd022, 0x2000 }, + { 0x1a01, 0xd021, 0x0000 }, + { 0x1a01, 0xd023, 0x0000 }, + { 0x9a01, 0xd026, 0x2000 }, + { 0x1a01, 0xd025, 0x0000 }, + { 0x1a01, 0xd027, 0x0000 }, + { 0x9a01, 0xd02c, 0x3000 }, + { 0x9a01, 0xd02a, 0x2000 }, + { 0x1a01, 0xd029, 0x0000 }, + { 0x1a01, 0xd02b, 0x0000 }, + { 0x9a01, 0xd02e, 0x2000 }, + { 0x1a01, 0xd02d, 0x0000 }, + { 0x1a01, 0xd02f, 0x0000 }, + { 0x9a01, 0xd038, 0x4000 }, + { 0x9a01, 0xd034, 0x3000 }, + { 0x9a01, 0xd032, 0x2000 }, + { 0x1a01, 0xd031, 0x0000 }, + { 0x1a01, 0xd033, 0x0000 }, + { 0x9a01, 0xd036, 0x2000 }, + { 0x1a01, 0xd035, 0x0000 }, + { 0x1a01, 0xd037, 0x0000 }, + { 0x9a01, 0xd03c, 0x3000 }, + { 0x9a01, 0xd03a, 0x2000 }, + { 0x1a01, 0xd039, 0x0000 }, + { 0x1a01, 0xd03b, 0x0000 }, + { 0x9a01, 0xd03e, 0x2000 }, + { 0x1a01, 0xd03d, 0x0000 }, + { 0x1a01, 0xd03f, 0x0000 }, + { 0x9a01, 0xd060, 0x6000 }, + { 0x9a01, 0xd050, 0x5000 }, + { 0x9a01, 0xd048, 0x4000 }, + { 0x9a01, 0xd044, 0x3000 }, + { 0x9a01, 0xd042, 0x2000 }, + { 0x1a01, 0xd041, 0x0000 }, + { 0x1a01, 0xd043, 0x0000 }, + { 0x9a01, 0xd046, 0x2000 }, + { 0x1a01, 0xd045, 0x0000 }, + { 0x1a01, 0xd047, 0x0000 }, + { 0x9a01, 0xd04c, 0x3000 }, + { 0x9a01, 0xd04a, 0x2000 }, + { 0x1a01, 0xd049, 0x0000 }, + { 0x1a01, 0xd04b, 0x0000 }, + { 0x9a01, 0xd04e, 0x2000 }, + { 0x1a01, 0xd04d, 0x0000 }, + { 0x1a01, 0xd04f, 0x0000 }, + { 0x9a01, 0xd058, 0x4000 }, + { 0x9a01, 0xd054, 0x3000 }, + { 0x9a01, 0xd052, 0x2000 }, + { 0x1a01, 0xd051, 0x0000 }, + { 0x1a01, 0xd053, 0x0000 }, + { 0x9a01, 0xd056, 0x2000 }, + { 0x1a01, 0xd055, 0x0000 }, + { 0x1a01, 0xd057, 0x0000 }, + { 0x9a01, 0xd05c, 0x3000 }, + { 0x9a01, 0xd05a, 0x2000 }, + { 0x1a01, 0xd059, 0x0000 }, + { 0x1a01, 0xd05b, 0x0000 }, + { 0x9a01, 0xd05e, 0x2000 }, + { 0x1a01, 0xd05d, 0x0000 }, + { 0x1a01, 0xd05f, 0x0000 }, + { 0x9a01, 0xd070, 0x5000 }, + { 0x9a01, 0xd068, 0x4000 }, + { 0x9a01, 0xd064, 0x3000 }, + { 0x9a01, 0xd062, 0x2000 }, + { 0x1a01, 0xd061, 0x0000 }, + { 0x1a01, 0xd063, 0x0000 }, + { 0x9a01, 0xd066, 0x2000 }, + { 0x1a01, 0xd065, 0x0000 }, + { 0x1a01, 0xd067, 0x0000 }, + { 0x9a01, 0xd06c, 0x3000 }, + { 0x9a01, 0xd06a, 0x2000 }, + { 0x1a01, 0xd069, 0x0000 }, + { 0x1a01, 0xd06b, 0x0000 }, + { 0x9a01, 0xd06e, 0x2000 }, + { 0x1a01, 0xd06d, 0x0000 }, + { 0x1a01, 0xd06f, 0x0000 }, + { 0x9a01, 0xd078, 0x4000 }, + { 0x9a01, 0xd074, 0x3000 }, + { 0x9a01, 0xd072, 0x2000 }, + { 0x1a01, 0xd071, 0x0000 }, + { 0x1a01, 0xd073, 0x0000 }, + { 0x9a01, 0xd076, 0x2000 }, + { 0x1a01, 0xd075, 0x0000 }, + { 0x1a01, 0xd077, 0x0000 }, + { 0x9a01, 0xd07c, 0x3000 }, + { 0x9a01, 0xd07a, 0x2000 }, + { 0x1a01, 0xd079, 0x0000 }, + { 0x1a01, 0xd07b, 0x0000 }, + { 0x9a01, 0xd07e, 0x2000 }, + { 0x1a01, 0xd07d, 0x0000 }, + { 0x1a01, 0xd07f, 0x0000 }, + { 0x9a01, 0xd18d, 0x9000 }, + { 0x9a01, 0xd10a, 0x8000 }, + { 0x9a01, 0xd0c0, 0x7000 }, + { 0x9a01, 0xd0a0, 0x6000 }, + { 0x9a01, 0xd090, 0x5000 }, + { 0x9a01, 0xd088, 0x4000 }, + { 0x9a01, 0xd084, 0x3000 }, + { 0x9a01, 0xd082, 0x2000 }, + { 0x1a01, 0xd081, 0x0000 }, + { 0x1a01, 0xd083, 0x0000 }, + { 0x9a01, 0xd086, 0x2000 }, + { 0x1a01, 0xd085, 0x0000 }, + { 0x1a01, 0xd087, 0x0000 }, + { 0x9a01, 0xd08c, 0x3000 }, + { 0x9a01, 0xd08a, 0x2000 }, + { 0x1a01, 0xd089, 0x0000 }, + { 0x1a01, 0xd08b, 0x0000 }, + { 0x9a01, 0xd08e, 0x2000 }, + { 0x1a01, 0xd08d, 0x0000 }, + { 0x1a01, 0xd08f, 0x0000 }, + { 0x9a01, 0xd098, 0x4000 }, + { 0x9a01, 0xd094, 0x3000 }, + { 0x9a01, 0xd092, 0x2000 }, + { 0x1a01, 0xd091, 0x0000 }, + { 0x1a01, 0xd093, 0x0000 }, + { 0x9a01, 0xd096, 0x2000 }, + { 0x1a01, 0xd095, 0x0000 }, + { 0x1a01, 0xd097, 0x0000 }, + { 0x9a01, 0xd09c, 0x3000 }, + { 0x9a01, 0xd09a, 0x2000 }, + { 0x1a01, 0xd099, 0x0000 }, + { 0x1a01, 0xd09b, 0x0000 }, + { 0x9a01, 0xd09e, 0x2000 }, + { 0x1a01, 0xd09d, 0x0000 }, + { 0x1a01, 0xd09f, 0x0000 }, + { 0x9a01, 0xd0b0, 0x5000 }, + { 0x9a01, 0xd0a8, 0x4000 }, + { 0x9a01, 0xd0a4, 0x3000 }, + { 0x9a01, 0xd0a2, 0x2000 }, + { 0x1a01, 0xd0a1, 0x0000 }, + { 0x1a01, 0xd0a3, 0x0000 }, + { 0x9a01, 0xd0a6, 0x2000 }, + { 0x1a01, 0xd0a5, 0x0000 }, + { 0x1a01, 0xd0a7, 0x0000 }, + { 0x9a01, 0xd0ac, 0x3000 }, + { 0x9a01, 0xd0aa, 0x2000 }, + { 0x1a01, 0xd0a9, 0x0000 }, + { 0x1a01, 0xd0ab, 0x0000 }, + { 0x9a01, 0xd0ae, 0x2000 }, + { 0x1a01, 0xd0ad, 0x0000 }, + { 0x1a01, 0xd0af, 0x0000 }, + { 0x9a01, 0xd0b8, 0x4000 }, + { 0x9a01, 0xd0b4, 0x3000 }, + { 0x9a01, 0xd0b2, 0x2000 }, + { 0x1a01, 0xd0b1, 0x0000 }, + { 0x1a01, 0xd0b3, 0x0000 }, + { 0x9a01, 0xd0b6, 0x2000 }, + { 0x1a01, 0xd0b5, 0x0000 }, + { 0x1a01, 0xd0b7, 0x0000 }, + { 0x9a01, 0xd0bc, 0x3000 }, + { 0x9a01, 0xd0ba, 0x2000 }, + { 0x1a01, 0xd0b9, 0x0000 }, + { 0x1a01, 0xd0bb, 0x0000 }, + { 0x9a01, 0xd0be, 0x2000 }, + { 0x1a01, 0xd0bd, 0x0000 }, + { 0x1a01, 0xd0bf, 0x0000 }, + { 0x9a01, 0xd0e0, 0x6000 }, + { 0x9a01, 0xd0d0, 0x5000 }, + { 0x9a01, 0xd0c8, 0x4000 }, + { 0x9a01, 0xd0c4, 0x3000 }, + { 0x9a01, 0xd0c2, 0x2000 }, + { 0x1a01, 0xd0c1, 0x0000 }, + { 0x1a01, 0xd0c3, 0x0000 }, + { 0x9a01, 0xd0c6, 0x2000 }, + { 0x1a01, 0xd0c5, 0x0000 }, + { 0x1a01, 0xd0c7, 0x0000 }, + { 0x9a01, 0xd0cc, 0x3000 }, + { 0x9a01, 0xd0ca, 0x2000 }, + { 0x1a01, 0xd0c9, 0x0000 }, + { 0x1a01, 0xd0cb, 0x0000 }, + { 0x9a01, 0xd0ce, 0x2000 }, + { 0x1a01, 0xd0cd, 0x0000 }, + { 0x1a01, 0xd0cf, 0x0000 }, + { 0x9a01, 0xd0d8, 0x4000 }, + { 0x9a01, 0xd0d4, 0x3000 }, + { 0x9a01, 0xd0d2, 0x2000 }, + { 0x1a01, 0xd0d1, 0x0000 }, + { 0x1a01, 0xd0d3, 0x0000 }, + { 0x9a01, 0xd0d6, 0x2000 }, + { 0x1a01, 0xd0d5, 0x0000 }, + { 0x1a01, 0xd0d7, 0x0000 }, + { 0x9a01, 0xd0dc, 0x3000 }, + { 0x9a01, 0xd0da, 0x2000 }, + { 0x1a01, 0xd0d9, 0x0000 }, + { 0x1a01, 0xd0db, 0x0000 }, + { 0x9a01, 0xd0de, 0x2000 }, + { 0x1a01, 0xd0dd, 0x0000 }, + { 0x1a01, 0xd0df, 0x0000 }, + { 0x9a01, 0xd0f0, 0x5000 }, + { 0x9a01, 0xd0e8, 0x4000 }, + { 0x9a01, 0xd0e4, 0x3000 }, + { 0x9a01, 0xd0e2, 0x2000 }, + { 0x1a01, 0xd0e1, 0x0000 }, + { 0x1a01, 0xd0e3, 0x0000 }, + { 0x9a01, 0xd0e6, 0x2000 }, + { 0x1a01, 0xd0e5, 0x0000 }, + { 0x1a01, 0xd0e7, 0x0000 }, + { 0x9a01, 0xd0ec, 0x3000 }, + { 0x9a01, 0xd0ea, 0x2000 }, + { 0x1a01, 0xd0e9, 0x0000 }, + { 0x1a01, 0xd0eb, 0x0000 }, + { 0x9a01, 0xd0ee, 0x2000 }, + { 0x1a01, 0xd0ed, 0x0000 }, + { 0x1a01, 0xd0ef, 0x0000 }, + { 0x9a01, 0xd102, 0x4000 }, + { 0x9a01, 0xd0f4, 0x3000 }, + { 0x9a01, 0xd0f2, 0x2000 }, + { 0x1a01, 0xd0f1, 0x0000 }, + { 0x1a01, 0xd0f3, 0x0000 }, + { 0x9a01, 0xd100, 0x2000 }, + { 0x1a01, 0xd0f5, 0x0000 }, + { 0x1a01, 0xd101, 0x0000 }, + { 0x9a01, 0xd106, 0x3000 }, + { 0x9a01, 0xd104, 0x2000 }, + { 0x1a01, 0xd103, 0x0000 }, + { 0x1a01, 0xd105, 0x0000 }, + { 0x9a01, 0xd108, 0x2000 }, + { 0x1a01, 0xd107, 0x0000 }, + { 0x1a01, 0xd109, 0x0000 }, + { 0x9a01, 0xd14d, 0x7000 }, + { 0x9a01, 0xd12d, 0x6000 }, + { 0x9a01, 0xd11a, 0x5000 }, + { 0x9a01, 0xd112, 0x4000 }, + { 0x9a01, 0xd10e, 0x3000 }, + { 0x9a01, 0xd10c, 0x2000 }, + { 0x1a01, 0xd10b, 0x0000 }, + { 0x1a01, 0xd10d, 0x0000 }, + { 0x9a01, 0xd110, 0x2000 }, + { 0x1a01, 0xd10f, 0x0000 }, + { 0x1a01, 0xd111, 0x0000 }, + { 0x9a01, 0xd116, 0x3000 }, + { 0x9a01, 0xd114, 0x2000 }, + { 0x1a01, 0xd113, 0x0000 }, + { 0x1a01, 0xd115, 0x0000 }, + { 0x9a01, 0xd118, 0x2000 }, + { 0x1a01, 0xd117, 0x0000 }, + { 0x1a01, 0xd119, 0x0000 }, + { 0x9a01, 0xd122, 0x4000 }, + { 0x9a01, 0xd11e, 0x3000 }, + { 0x9a01, 0xd11c, 0x2000 }, + { 0x1a01, 0xd11b, 0x0000 }, + { 0x1a01, 0xd11d, 0x0000 }, + { 0x9a01, 0xd120, 0x2000 }, + { 0x1a01, 0xd11f, 0x0000 }, + { 0x1a01, 0xd121, 0x0000 }, + { 0x9a01, 0xd126, 0x3000 }, + { 0x9a01, 0xd124, 0x2000 }, + { 0x1a01, 0xd123, 0x0000 }, + { 0x1a01, 0xd125, 0x0000 }, + { 0x9a01, 0xd12b, 0x2000 }, + { 0x1a01, 0xd12a, 0x0000 }, + { 0x1a01, 0xd12c, 0x0000 }, + { 0x9a01, 0xd13d, 0x5000 }, + { 0x9a01, 0xd135, 0x4000 }, + { 0x9a01, 0xd131, 0x3000 }, + { 0x9a01, 0xd12f, 0x2000 }, + { 0x1a01, 0xd12e, 0x0000 }, + { 0x1a01, 0xd130, 0x0000 }, + { 0x9a01, 0xd133, 0x2000 }, + { 0x1a01, 0xd132, 0x0000 }, + { 0x1a01, 0xd134, 0x0000 }, + { 0x9a01, 0xd139, 0x3000 }, + { 0x9a01, 0xd137, 0x2000 }, + { 0x1a01, 0xd136, 0x0000 }, + { 0x1a01, 0xd138, 0x0000 }, + { 0x9a01, 0xd13b, 0x2000 }, + { 0x1a01, 0xd13a, 0x0000 }, + { 0x1a01, 0xd13c, 0x0000 }, + { 0x9a01, 0xd145, 0x4000 }, + { 0x9a01, 0xd141, 0x3000 }, + { 0x9a01, 0xd13f, 0x2000 }, + { 0x1a01, 0xd13e, 0x0000 }, + { 0x1a01, 0xd140, 0x0000 }, + { 0x9a01, 0xd143, 0x2000 }, + { 0x1a01, 0xd142, 0x0000 }, + { 0x1a01, 0xd144, 0x0000 }, + { 0x9a01, 0xd149, 0x3000 }, + { 0x9a01, 0xd147, 0x2000 }, + { 0x1a01, 0xd146, 0x0000 }, + { 0x1a01, 0xd148, 0x0000 }, + { 0x9a01, 0xd14b, 0x2000 }, + { 0x1a01, 0xd14a, 0x0000 }, + { 0x1a01, 0xd14c, 0x0000 }, + { 0x8a01, 0xd16d, 0x6000 }, + { 0x9a01, 0xd15d, 0x5000 }, + { 0x9a01, 0xd155, 0x4000 }, + { 0x9a01, 0xd151, 0x3000 }, + { 0x9a01, 0xd14f, 0x2000 }, + { 0x1a01, 0xd14e, 0x0000 }, + { 0x1a01, 0xd150, 0x0000 }, + { 0x9a01, 0xd153, 0x2000 }, + { 0x1a01, 0xd152, 0x0000 }, + { 0x1a01, 0xd154, 0x0000 }, + { 0x9a01, 0xd159, 0x3000 }, + { 0x9a01, 0xd157, 0x2000 }, + { 0x1a01, 0xd156, 0x0000 }, + { 0x1a01, 0xd158, 0x0000 }, + { 0x9a01, 0xd15b, 0x2000 }, + { 0x1a01, 0xd15a, 0x0000 }, + { 0x1a01, 0xd15c, 0x0000 }, + { 0x8a01, 0xd165, 0x4000 }, + { 0x9a01, 0xd161, 0x3000 }, + { 0x9a01, 0xd15f, 0x2000 }, + { 0x1a01, 0xd15e, 0x0000 }, + { 0x1a01, 0xd160, 0x0000 }, + { 0x9a01, 0xd163, 0x2000 }, + { 0x1a01, 0xd162, 0x0000 }, + { 0x1a01, 0xd164, 0x0000 }, + { 0x8c01, 0xd169, 0x3000 }, + { 0x8c01, 0xd167, 0x2000 }, + { 0x0a01, 0xd166, 0x0000 }, + { 0x0c01, 0xd168, 0x0000 }, + { 0x9a01, 0xd16b, 0x2000 }, + { 0x1a01, 0xd16a, 0x0000 }, + { 0x1a01, 0xd16c, 0x0000 }, + { 0x8c01, 0xd17d, 0x5000 }, + { 0x8101, 0xd175, 0x4000 }, + { 0x8a01, 0xd171, 0x3000 }, + { 0x8a01, 0xd16f, 0x2000 }, + { 0x0a01, 0xd16e, 0x0000 }, + { 0x0a01, 0xd170, 0x0000 }, + { 0x8101, 0xd173, 0x2000 }, + { 0x0a01, 0xd172, 0x0000 }, + { 0x0101, 0xd174, 0x0000 }, + { 0x8101, 0xd179, 0x3000 }, + { 0x8101, 0xd177, 0x2000 }, + { 0x0101, 0xd176, 0x0000 }, + { 0x0101, 0xd178, 0x0000 }, + { 0x8c01, 0xd17b, 0x2000 }, + { 0x0101, 0xd17a, 0x0000 }, + { 0x0c01, 0xd17c, 0x0000 }, + { 0x8c01, 0xd185, 0x4000 }, + { 0x8c01, 0xd181, 0x3000 }, + { 0x8c01, 0xd17f, 0x2000 }, + { 0x0c01, 0xd17e, 0x0000 }, + { 0x0c01, 0xd180, 0x0000 }, + { 0x9a01, 0xd183, 0x2000 }, + { 0x0c01, 0xd182, 0x0000 }, + { 0x1a01, 0xd184, 0x0000 }, + { 0x8c01, 0xd189, 0x3000 }, + { 0x8c01, 0xd187, 0x2000 }, + { 0x0c01, 0xd186, 0x0000 }, + { 0x0c01, 0xd188, 0x0000 }, + { 0x8c01, 0xd18b, 0x2000 }, + { 0x0c01, 0xd18a, 0x0000 }, + { 0x1a01, 0xd18c, 0x0000 }, + { 0x9a01, 0xd32f, 0x8000 }, + { 0x9a01, 0xd1cd, 0x7000 }, + { 0x8c01, 0xd1ad, 0x6000 }, + { 0x9a01, 0xd19d, 0x5000 }, + { 0x9a01, 0xd195, 0x4000 }, + { 0x9a01, 0xd191, 0x3000 }, + { 0x9a01, 0xd18f, 0x2000 }, + { 0x1a01, 0xd18e, 0x0000 }, + { 0x1a01, 0xd190, 0x0000 }, + { 0x9a01, 0xd193, 0x2000 }, + { 0x1a01, 0xd192, 0x0000 }, + { 0x1a01, 0xd194, 0x0000 }, + { 0x9a01, 0xd199, 0x3000 }, + { 0x9a01, 0xd197, 0x2000 }, + { 0x1a01, 0xd196, 0x0000 }, + { 0x1a01, 0xd198, 0x0000 }, + { 0x9a01, 0xd19b, 0x2000 }, + { 0x1a01, 0xd19a, 0x0000 }, + { 0x1a01, 0xd19c, 0x0000 }, + { 0x9a01, 0xd1a5, 0x4000 }, + { 0x9a01, 0xd1a1, 0x3000 }, + { 0x9a01, 0xd19f, 0x2000 }, + { 0x1a01, 0xd19e, 0x0000 }, + { 0x1a01, 0xd1a0, 0x0000 }, + { 0x9a01, 0xd1a3, 0x2000 }, + { 0x1a01, 0xd1a2, 0x0000 }, + { 0x1a01, 0xd1a4, 0x0000 }, + { 0x9a01, 0xd1a9, 0x3000 }, + { 0x9a01, 0xd1a7, 0x2000 }, + { 0x1a01, 0xd1a6, 0x0000 }, + { 0x1a01, 0xd1a8, 0x0000 }, + { 0x8c01, 0xd1ab, 0x2000 }, + { 0x0c01, 0xd1aa, 0x0000 }, + { 0x0c01, 0xd1ac, 0x0000 }, + { 0x9a01, 0xd1bd, 0x5000 }, + { 0x9a01, 0xd1b5, 0x4000 }, + { 0x9a01, 0xd1b1, 0x3000 }, + { 0x9a01, 0xd1af, 0x2000 }, + { 0x1a01, 0xd1ae, 0x0000 }, + { 0x1a01, 0xd1b0, 0x0000 }, + { 0x9a01, 0xd1b3, 0x2000 }, + { 0x1a01, 0xd1b2, 0x0000 }, + { 0x1a01, 0xd1b4, 0x0000 }, + { 0x9a01, 0xd1b9, 0x3000 }, + { 0x9a01, 0xd1b7, 0x2000 }, + { 0x1a01, 0xd1b6, 0x0000 }, + { 0x1a01, 0xd1b8, 0x0000 }, + { 0x9a01, 0xd1bb, 0x2000 }, + { 0x1a01, 0xd1ba, 0x0000 }, + { 0x1a01, 0xd1bc, 0x0000 }, + { 0x9a01, 0xd1c5, 0x4000 }, + { 0x9a01, 0xd1c1, 0x3000 }, + { 0x9a01, 0xd1bf, 0x2000 }, + { 0x1a01, 0xd1be, 0x0000 }, + { 0x1a01, 0xd1c0, 0x0000 }, + { 0x9a01, 0xd1c3, 0x2000 }, + { 0x1a01, 0xd1c2, 0x0000 }, + { 0x1a01, 0xd1c4, 0x0000 }, + { 0x9a01, 0xd1c9, 0x3000 }, + { 0x9a01, 0xd1c7, 0x2000 }, + { 0x1a01, 0xd1c6, 0x0000 }, + { 0x1a01, 0xd1c8, 0x0000 }, + { 0x9a01, 0xd1cb, 0x2000 }, + { 0x1a01, 0xd1ca, 0x0000 }, + { 0x1a01, 0xd1cc, 0x0000 }, + { 0x9a01, 0xd30f, 0x6000 }, + { 0x9a01, 0xd1dd, 0x5000 }, + { 0x9a01, 0xd1d5, 0x4000 }, + { 0x9a01, 0xd1d1, 0x3000 }, + { 0x9a01, 0xd1cf, 0x2000 }, + { 0x1a01, 0xd1ce, 0x0000 }, + { 0x1a01, 0xd1d0, 0x0000 }, + { 0x9a01, 0xd1d3, 0x2000 }, + { 0x1a01, 0xd1d2, 0x0000 }, + { 0x1a01, 0xd1d4, 0x0000 }, + { 0x9a01, 0xd1d9, 0x3000 }, + { 0x9a01, 0xd1d7, 0x2000 }, + { 0x1a01, 0xd1d6, 0x0000 }, + { 0x1a01, 0xd1d8, 0x0000 }, + { 0x9a01, 0xd1db, 0x2000 }, + { 0x1a01, 0xd1da, 0x0000 }, + { 0x1a01, 0xd1dc, 0x0000 }, + { 0x9a01, 0xd307, 0x4000 }, + { 0x9a01, 0xd303, 0x3000 }, + { 0x9a01, 0xd301, 0x2000 }, + { 0x1a01, 0xd300, 0x0000 }, + { 0x1a01, 0xd302, 0x0000 }, + { 0x9a01, 0xd305, 0x2000 }, + { 0x1a01, 0xd304, 0x0000 }, + { 0x1a01, 0xd306, 0x0000 }, + { 0x9a01, 0xd30b, 0x3000 }, + { 0x9a01, 0xd309, 0x2000 }, + { 0x1a01, 0xd308, 0x0000 }, + { 0x1a01, 0xd30a, 0x0000 }, + { 0x9a01, 0xd30d, 0x2000 }, + { 0x1a01, 0xd30c, 0x0000 }, + { 0x1a01, 0xd30e, 0x0000 }, + { 0x9a01, 0xd31f, 0x5000 }, + { 0x9a01, 0xd317, 0x4000 }, + { 0x9a01, 0xd313, 0x3000 }, + { 0x9a01, 0xd311, 0x2000 }, + { 0x1a01, 0xd310, 0x0000 }, + { 0x1a01, 0xd312, 0x0000 }, + { 0x9a01, 0xd315, 0x2000 }, + { 0x1a01, 0xd314, 0x0000 }, + { 0x1a01, 0xd316, 0x0000 }, + { 0x9a01, 0xd31b, 0x3000 }, + { 0x9a01, 0xd319, 0x2000 }, + { 0x1a01, 0xd318, 0x0000 }, + { 0x1a01, 0xd31a, 0x0000 }, + { 0x9a01, 0xd31d, 0x2000 }, + { 0x1a01, 0xd31c, 0x0000 }, + { 0x1a01, 0xd31e, 0x0000 }, + { 0x9a01, 0xd327, 0x4000 }, + { 0x9a01, 0xd323, 0x3000 }, + { 0x9a01, 0xd321, 0x2000 }, + { 0x1a01, 0xd320, 0x0000 }, + { 0x1a01, 0xd322, 0x0000 }, + { 0x9a01, 0xd325, 0x2000 }, + { 0x1a01, 0xd324, 0x0000 }, + { 0x1a01, 0xd326, 0x0000 }, + { 0x9a01, 0xd32b, 0x3000 }, + { 0x9a01, 0xd329, 0x2000 }, + { 0x1a01, 0xd328, 0x0000 }, + { 0x1a01, 0xd32a, 0x0000 }, + { 0x9a01, 0xd32d, 0x2000 }, + { 0x1a01, 0xd32c, 0x0000 }, + { 0x1a01, 0xd32e, 0x0000 }, + { 0x8901, 0xd418, 0x7000 }, + { 0x9a01, 0xd34f, 0x6000 }, + { 0x9a01, 0xd33f, 0x5000 }, + { 0x9a01, 0xd337, 0x4000 }, + { 0x9a01, 0xd333, 0x3000 }, + { 0x9a01, 0xd331, 0x2000 }, + { 0x1a01, 0xd330, 0x0000 }, + { 0x1a01, 0xd332, 0x0000 }, + { 0x9a01, 0xd335, 0x2000 }, + { 0x1a01, 0xd334, 0x0000 }, + { 0x1a01, 0xd336, 0x0000 }, + { 0x9a01, 0xd33b, 0x3000 }, + { 0x9a01, 0xd339, 0x2000 }, + { 0x1a01, 0xd338, 0x0000 }, + { 0x1a01, 0xd33a, 0x0000 }, + { 0x9a01, 0xd33d, 0x2000 }, + { 0x1a01, 0xd33c, 0x0000 }, + { 0x1a01, 0xd33e, 0x0000 }, + { 0x9a01, 0xd347, 0x4000 }, + { 0x9a01, 0xd343, 0x3000 }, + { 0x9a01, 0xd341, 0x2000 }, + { 0x1a01, 0xd340, 0x0000 }, + { 0x1a01, 0xd342, 0x0000 }, + { 0x9a01, 0xd345, 0x2000 }, + { 0x1a01, 0xd344, 0x0000 }, + { 0x1a01, 0xd346, 0x0000 }, + { 0x9a01, 0xd34b, 0x3000 }, + { 0x9a01, 0xd349, 0x2000 }, + { 0x1a01, 0xd348, 0x0000 }, + { 0x1a01, 0xd34a, 0x0000 }, + { 0x9a01, 0xd34d, 0x2000 }, + { 0x1a01, 0xd34c, 0x0000 }, + { 0x1a01, 0xd34e, 0x0000 }, + { 0x8901, 0xd408, 0x5000 }, + { 0x8901, 0xd400, 0x4000 }, + { 0x9a01, 0xd353, 0x3000 }, + { 0x9a01, 0xd351, 0x2000 }, + { 0x1a01, 0xd350, 0x0000 }, + { 0x1a01, 0xd352, 0x0000 }, + { 0x9a01, 0xd355, 0x2000 }, + { 0x1a01, 0xd354, 0x0000 }, + { 0x1a01, 0xd356, 0x0000 }, + { 0x8901, 0xd404, 0x3000 }, + { 0x8901, 0xd402, 0x2000 }, + { 0x0901, 0xd401, 0x0000 }, + { 0x0901, 0xd403, 0x0000 }, + { 0x8901, 0xd406, 0x2000 }, + { 0x0901, 0xd405, 0x0000 }, + { 0x0901, 0xd407, 0x0000 }, + { 0x8901, 0xd410, 0x4000 }, + { 0x8901, 0xd40c, 0x3000 }, + { 0x8901, 0xd40a, 0x2000 }, + { 0x0901, 0xd409, 0x0000 }, + { 0x0901, 0xd40b, 0x0000 }, + { 0x8901, 0xd40e, 0x2000 }, + { 0x0901, 0xd40d, 0x0000 }, + { 0x0901, 0xd40f, 0x0000 }, + { 0x8901, 0xd414, 0x3000 }, + { 0x8901, 0xd412, 0x2000 }, + { 0x0901, 0xd411, 0x0000 }, + { 0x0901, 0xd413, 0x0000 }, + { 0x8901, 0xd416, 0x2000 }, + { 0x0901, 0xd415, 0x0000 }, + { 0x0901, 0xd417, 0x0000 }, + { 0x8901, 0xd438, 0x6000 }, + { 0x8501, 0xd428, 0x5000 }, + { 0x8501, 0xd420, 0x4000 }, + { 0x8501, 0xd41c, 0x3000 }, + { 0x8501, 0xd41a, 0x2000 }, + { 0x0901, 0xd419, 0x0000 }, + { 0x0501, 0xd41b, 0x0000 }, + { 0x8501, 0xd41e, 0x2000 }, + { 0x0501, 0xd41d, 0x0000 }, + { 0x0501, 0xd41f, 0x0000 }, + { 0x8501, 0xd424, 0x3000 }, + { 0x8501, 0xd422, 0x2000 }, + { 0x0501, 0xd421, 0x0000 }, + { 0x0501, 0xd423, 0x0000 }, + { 0x8501, 0xd426, 0x2000 }, + { 0x0501, 0xd425, 0x0000 }, + { 0x0501, 0xd427, 0x0000 }, + { 0x8501, 0xd430, 0x4000 }, + { 0x8501, 0xd42c, 0x3000 }, + { 0x8501, 0xd42a, 0x2000 }, + { 0x0501, 0xd429, 0x0000 }, + { 0x0501, 0xd42b, 0x0000 }, + { 0x8501, 0xd42e, 0x2000 }, + { 0x0501, 0xd42d, 0x0000 }, + { 0x0501, 0xd42f, 0x0000 }, + { 0x8901, 0xd434, 0x3000 }, + { 0x8501, 0xd432, 0x2000 }, + { 0x0501, 0xd431, 0x0000 }, + { 0x0501, 0xd433, 0x0000 }, + { 0x8901, 0xd436, 0x2000 }, + { 0x0901, 0xd435, 0x0000 }, + { 0x0901, 0xd437, 0x0000 }, + { 0x8901, 0xd448, 0x5000 }, + { 0x8901, 0xd440, 0x4000 }, + { 0x8901, 0xd43c, 0x3000 }, + { 0x8901, 0xd43a, 0x2000 }, + { 0x0901, 0xd439, 0x0000 }, + { 0x0901, 0xd43b, 0x0000 }, + { 0x8901, 0xd43e, 0x2000 }, + { 0x0901, 0xd43d, 0x0000 }, + { 0x0901, 0xd43f, 0x0000 }, + { 0x8901, 0xd444, 0x3000 }, + { 0x8901, 0xd442, 0x2000 }, + { 0x0901, 0xd441, 0x0000 }, + { 0x0901, 0xd443, 0x0000 }, + { 0x8901, 0xd446, 0x2000 }, + { 0x0901, 0xd445, 0x0000 }, + { 0x0901, 0xd447, 0x0000 }, + { 0x8501, 0xd450, 0x4000 }, + { 0x8901, 0xd44c, 0x3000 }, + { 0x8901, 0xd44a, 0x2000 }, + { 0x0901, 0xd449, 0x0000 }, + { 0x0901, 0xd44b, 0x0000 }, + { 0x8501, 0xd44e, 0x2000 }, + { 0x0901, 0xd44d, 0x0000 }, + { 0x0501, 0xd44f, 0x0000 }, + { 0x8501, 0xd454, 0x3000 }, + { 0x8501, 0xd452, 0x2000 }, + { 0x0501, 0xd451, 0x0000 }, + { 0x0501, 0xd453, 0x0000 }, + { 0x8501, 0xd457, 0x2000 }, + { 0x0501, 0xd456, 0x0000 }, + { 0x0501, 0xd458, 0x0000 }, + { 0x8702, 0xf876, 0xb000 }, + { 0x8901, 0xd670, 0xa000 }, + { 0x8901, 0xd570, 0x9000 }, + { 0x8901, 0xd4e4, 0x8000 }, + { 0x8501, 0xd499, 0x7000 }, + { 0x8901, 0xd479, 0x6000 }, + { 0x8901, 0xd469, 0x5000 }, + { 0x8501, 0xd461, 0x4000 }, + { 0x8501, 0xd45d, 0x3000 }, + { 0x8501, 0xd45b, 0x2000 }, + { 0x0501, 0xd45a, 0x0000 }, + { 0x0501, 0xd45c, 0x0000 }, + { 0x8501, 0xd45f, 0x2000 }, + { 0x0501, 0xd45e, 0x0000 }, + { 0x0501, 0xd460, 0x0000 }, + { 0x8501, 0xd465, 0x3000 }, + { 0x8501, 0xd463, 0x2000 }, + { 0x0501, 0xd462, 0x0000 }, + { 0x0501, 0xd464, 0x0000 }, + { 0x8501, 0xd467, 0x2000 }, + { 0x0501, 0xd466, 0x0000 }, + { 0x0901, 0xd468, 0x0000 }, + { 0x8901, 0xd471, 0x4000 }, + { 0x8901, 0xd46d, 0x3000 }, + { 0x8901, 0xd46b, 0x2000 }, + { 0x0901, 0xd46a, 0x0000 }, + { 0x0901, 0xd46c, 0x0000 }, + { 0x8901, 0xd46f, 0x2000 }, + { 0x0901, 0xd46e, 0x0000 }, + { 0x0901, 0xd470, 0x0000 }, + { 0x8901, 0xd475, 0x3000 }, + { 0x8901, 0xd473, 0x2000 }, + { 0x0901, 0xd472, 0x0000 }, + { 0x0901, 0xd474, 0x0000 }, + { 0x8901, 0xd477, 0x2000 }, + { 0x0901, 0xd476, 0x0000 }, + { 0x0901, 0xd478, 0x0000 }, + { 0x8501, 0xd489, 0x5000 }, + { 0x8901, 0xd481, 0x4000 }, + { 0x8901, 0xd47d, 0x3000 }, + { 0x8901, 0xd47b, 0x2000 }, + { 0x0901, 0xd47a, 0x0000 }, + { 0x0901, 0xd47c, 0x0000 }, + { 0x8901, 0xd47f, 0x2000 }, + { 0x0901, 0xd47e, 0x0000 }, + { 0x0901, 0xd480, 0x0000 }, + { 0x8501, 0xd485, 0x3000 }, + { 0x8501, 0xd483, 0x2000 }, + { 0x0501, 0xd482, 0x0000 }, + { 0x0501, 0xd484, 0x0000 }, + { 0x8501, 0xd487, 0x2000 }, + { 0x0501, 0xd486, 0x0000 }, + { 0x0501, 0xd488, 0x0000 }, + { 0x8501, 0xd491, 0x4000 }, + { 0x8501, 0xd48d, 0x3000 }, + { 0x8501, 0xd48b, 0x2000 }, + { 0x0501, 0xd48a, 0x0000 }, + { 0x0501, 0xd48c, 0x0000 }, + { 0x8501, 0xd48f, 0x2000 }, + { 0x0501, 0xd48e, 0x0000 }, + { 0x0501, 0xd490, 0x0000 }, + { 0x8501, 0xd495, 0x3000 }, + { 0x8501, 0xd493, 0x2000 }, + { 0x0501, 0xd492, 0x0000 }, + { 0x0501, 0xd494, 0x0000 }, + { 0x8501, 0xd497, 0x2000 }, + { 0x0501, 0xd496, 0x0000 }, + { 0x0501, 0xd498, 0x0000 }, + { 0x8501, 0xd4c3, 0x6000 }, + { 0x8901, 0xd4b1, 0x5000 }, + { 0x8901, 0xd4a6, 0x4000 }, + { 0x8901, 0xd49e, 0x3000 }, + { 0x8501, 0xd49b, 0x2000 }, + { 0x0501, 0xd49a, 0x0000 }, + { 0x0901, 0xd49c, 0x0000 }, + { 0x8901, 0xd4a2, 0x2000 }, + { 0x0901, 0xd49f, 0x0000 }, + { 0x0901, 0xd4a5, 0x0000 }, + { 0x8901, 0xd4ac, 0x3000 }, + { 0x8901, 0xd4aa, 0x2000 }, + { 0x0901, 0xd4a9, 0x0000 }, + { 0x0901, 0xd4ab, 0x0000 }, + { 0x8901, 0xd4af, 0x2000 }, + { 0x0901, 0xd4ae, 0x0000 }, + { 0x0901, 0xd4b0, 0x0000 }, + { 0x8501, 0xd4b9, 0x4000 }, + { 0x8901, 0xd4b5, 0x3000 }, + { 0x8901, 0xd4b3, 0x2000 }, + { 0x0901, 0xd4b2, 0x0000 }, + { 0x0901, 0xd4b4, 0x0000 }, + { 0x8501, 0xd4b7, 0x2000 }, + { 0x0501, 0xd4b6, 0x0000 }, + { 0x0501, 0xd4b8, 0x0000 }, + { 0x8501, 0xd4bf, 0x3000 }, + { 0x8501, 0xd4bd, 0x2000 }, + { 0x0501, 0xd4bb, 0x0000 }, + { 0x0501, 0xd4be, 0x0000 }, + { 0x8501, 0xd4c1, 0x2000 }, + { 0x0501, 0xd4c0, 0x0000 }, + { 0x0501, 0xd4c2, 0x0000 }, + { 0x8901, 0xd4d4, 0x5000 }, + { 0x8501, 0xd4cc, 0x4000 }, + { 0x8501, 0xd4c8, 0x3000 }, + { 0x8501, 0xd4c6, 0x2000 }, + { 0x0501, 0xd4c5, 0x0000 }, + { 0x0501, 0xd4c7, 0x0000 }, + { 0x8501, 0xd4ca, 0x2000 }, + { 0x0501, 0xd4c9, 0x0000 }, + { 0x0501, 0xd4cb, 0x0000 }, + { 0x8901, 0xd4d0, 0x3000 }, + { 0x8501, 0xd4ce, 0x2000 }, + { 0x0501, 0xd4cd, 0x0000 }, + { 0x0501, 0xd4cf, 0x0000 }, + { 0x8901, 0xd4d2, 0x2000 }, + { 0x0901, 0xd4d1, 0x0000 }, + { 0x0901, 0xd4d3, 0x0000 }, + { 0x8901, 0xd4dc, 0x4000 }, + { 0x8901, 0xd4d8, 0x3000 }, + { 0x8901, 0xd4d6, 0x2000 }, + { 0x0901, 0xd4d5, 0x0000 }, + { 0x0901, 0xd4d7, 0x0000 }, + { 0x8901, 0xd4da, 0x2000 }, + { 0x0901, 0xd4d9, 0x0000 }, + { 0x0901, 0xd4db, 0x0000 }, + { 0x8901, 0xd4e0, 0x3000 }, + { 0x8901, 0xd4de, 0x2000 }, + { 0x0901, 0xd4dd, 0x0000 }, + { 0x0901, 0xd4df, 0x0000 }, + { 0x8901, 0xd4e2, 0x2000 }, + { 0x0901, 0xd4e1, 0x0000 }, + { 0x0901, 0xd4e3, 0x0000 }, + { 0x8501, 0xd529, 0x7000 }, + { 0x8901, 0xd504, 0x6000 }, + { 0x8501, 0xd4f4, 0x5000 }, + { 0x8501, 0xd4ec, 0x4000 }, + { 0x8901, 0xd4e8, 0x3000 }, + { 0x8901, 0xd4e6, 0x2000 }, + { 0x0901, 0xd4e5, 0x0000 }, + { 0x0901, 0xd4e7, 0x0000 }, + { 0x8501, 0xd4ea, 0x2000 }, + { 0x0901, 0xd4e9, 0x0000 }, + { 0x0501, 0xd4eb, 0x0000 }, + { 0x8501, 0xd4f0, 0x3000 }, + { 0x8501, 0xd4ee, 0x2000 }, + { 0x0501, 0xd4ed, 0x0000 }, + { 0x0501, 0xd4ef, 0x0000 }, + { 0x8501, 0xd4f2, 0x2000 }, + { 0x0501, 0xd4f1, 0x0000 }, + { 0x0501, 0xd4f3, 0x0000 }, + { 0x8501, 0xd4fc, 0x4000 }, + { 0x8501, 0xd4f8, 0x3000 }, + { 0x8501, 0xd4f6, 0x2000 }, + { 0x0501, 0xd4f5, 0x0000 }, + { 0x0501, 0xd4f7, 0x0000 }, + { 0x8501, 0xd4fa, 0x2000 }, + { 0x0501, 0xd4f9, 0x0000 }, + { 0x0501, 0xd4fb, 0x0000 }, + { 0x8501, 0xd500, 0x3000 }, + { 0x8501, 0xd4fe, 0x2000 }, + { 0x0501, 0xd4fd, 0x0000 }, + { 0x0501, 0xd4ff, 0x0000 }, + { 0x8501, 0xd502, 0x2000 }, + { 0x0501, 0xd501, 0x0000 }, + { 0x0501, 0xd503, 0x0000 }, + { 0x8901, 0xd518, 0x5000 }, + { 0x8901, 0xd50f, 0x4000 }, + { 0x8901, 0xd509, 0x3000 }, + { 0x8901, 0xd507, 0x2000 }, + { 0x0901, 0xd505, 0x0000 }, + { 0x0901, 0xd508, 0x0000 }, + { 0x8901, 0xd50d, 0x2000 }, + { 0x0901, 0xd50a, 0x0000 }, + { 0x0901, 0xd50e, 0x0000 }, + { 0x8901, 0xd513, 0x3000 }, + { 0x8901, 0xd511, 0x2000 }, + { 0x0901, 0xd510, 0x0000 }, + { 0x0901, 0xd512, 0x0000 }, + { 0x8901, 0xd516, 0x2000 }, + { 0x0901, 0xd514, 0x0000 }, + { 0x0901, 0xd517, 0x0000 }, + { 0x8501, 0xd521, 0x4000 }, + { 0x8901, 0xd51c, 0x3000 }, + { 0x8901, 0xd51a, 0x2000 }, + { 0x0901, 0xd519, 0x0000 }, + { 0x0901, 0xd51b, 0x0000 }, + { 0x8501, 0xd51f, 0x2000 }, + { 0x0501, 0xd51e, 0x0000 }, + { 0x0501, 0xd520, 0x0000 }, + { 0x8501, 0xd525, 0x3000 }, + { 0x8501, 0xd523, 0x2000 }, + { 0x0501, 0xd522, 0x0000 }, + { 0x0501, 0xd524, 0x0000 }, + { 0x8501, 0xd527, 0x2000 }, + { 0x0501, 0xd526, 0x0000 }, + { 0x0501, 0xd528, 0x0000 }, + { 0x8901, 0xd54f, 0x6000 }, + { 0x8901, 0xd539, 0x5000 }, + { 0x8501, 0xd531, 0x4000 }, + { 0x8501, 0xd52d, 0x3000 }, + { 0x8501, 0xd52b, 0x2000 }, + { 0x0501, 0xd52a, 0x0000 }, + { 0x0501, 0xd52c, 0x0000 }, + { 0x8501, 0xd52f, 0x2000 }, + { 0x0501, 0xd52e, 0x0000 }, + { 0x0501, 0xd530, 0x0000 }, + { 0x8501, 0xd535, 0x3000 }, + { 0x8501, 0xd533, 0x2000 }, + { 0x0501, 0xd532, 0x0000 }, + { 0x0501, 0xd534, 0x0000 }, + { 0x8501, 0xd537, 0x2000 }, + { 0x0501, 0xd536, 0x0000 }, + { 0x0901, 0xd538, 0x0000 }, + { 0x8901, 0xd543, 0x4000 }, + { 0x8901, 0xd53e, 0x3000 }, + { 0x8901, 0xd53c, 0x2000 }, + { 0x0901, 0xd53b, 0x0000 }, + { 0x0901, 0xd53d, 0x0000 }, + { 0x8901, 0xd541, 0x2000 }, + { 0x0901, 0xd540, 0x0000 }, + { 0x0901, 0xd542, 0x0000 }, + { 0x8901, 0xd54b, 0x3000 }, + { 0x8901, 0xd546, 0x2000 }, + { 0x0901, 0xd544, 0x0000 }, + { 0x0901, 0xd54a, 0x0000 }, + { 0x8901, 0xd54d, 0x2000 }, + { 0x0901, 0xd54c, 0x0000 }, + { 0x0901, 0xd54e, 0x0000 }, + { 0x8501, 0xd560, 0x5000 }, + { 0x8501, 0xd558, 0x4000 }, + { 0x8501, 0xd554, 0x3000 }, + { 0x8501, 0xd552, 0x2000 }, + { 0x0901, 0xd550, 0x0000 }, + { 0x0501, 0xd553, 0x0000 }, + { 0x8501, 0xd556, 0x2000 }, + { 0x0501, 0xd555, 0x0000 }, + { 0x0501, 0xd557, 0x0000 }, + { 0x8501, 0xd55c, 0x3000 }, + { 0x8501, 0xd55a, 0x2000 }, + { 0x0501, 0xd559, 0x0000 }, + { 0x0501, 0xd55b, 0x0000 }, + { 0x8501, 0xd55e, 0x2000 }, + { 0x0501, 0xd55d, 0x0000 }, + { 0x0501, 0xd55f, 0x0000 }, + { 0x8501, 0xd568, 0x4000 }, + { 0x8501, 0xd564, 0x3000 }, + { 0x8501, 0xd562, 0x2000 }, + { 0x0501, 0xd561, 0x0000 }, + { 0x0501, 0xd563, 0x0000 }, + { 0x8501, 0xd566, 0x2000 }, + { 0x0501, 0xd565, 0x0000 }, + { 0x0501, 0xd567, 0x0000 }, + { 0x8901, 0xd56c, 0x3000 }, + { 0x8501, 0xd56a, 0x2000 }, + { 0x0501, 0xd569, 0x0000 }, + { 0x0501, 0xd56b, 0x0000 }, + { 0x8901, 0xd56e, 0x2000 }, + { 0x0901, 0xd56d, 0x0000 }, + { 0x0901, 0xd56f, 0x0000 }, + { 0x8501, 0xd5f0, 0x8000 }, + { 0x8901, 0xd5b0, 0x7000 }, + { 0x8501, 0xd590, 0x6000 }, + { 0x8901, 0xd580, 0x5000 }, + { 0x8901, 0xd578, 0x4000 }, + { 0x8901, 0xd574, 0x3000 }, + { 0x8901, 0xd572, 0x2000 }, + { 0x0901, 0xd571, 0x0000 }, + { 0x0901, 0xd573, 0x0000 }, + { 0x8901, 0xd576, 0x2000 }, + { 0x0901, 0xd575, 0x0000 }, + { 0x0901, 0xd577, 0x0000 }, + { 0x8901, 0xd57c, 0x3000 }, + { 0x8901, 0xd57a, 0x2000 }, + { 0x0901, 0xd579, 0x0000 }, + { 0x0901, 0xd57b, 0x0000 }, + { 0x8901, 0xd57e, 0x2000 }, + { 0x0901, 0xd57d, 0x0000 }, + { 0x0901, 0xd57f, 0x0000 }, + { 0x8501, 0xd588, 0x4000 }, + { 0x8901, 0xd584, 0x3000 }, + { 0x8901, 0xd582, 0x2000 }, + { 0x0901, 0xd581, 0x0000 }, + { 0x0901, 0xd583, 0x0000 }, + { 0x8501, 0xd586, 0x2000 }, + { 0x0901, 0xd585, 0x0000 }, + { 0x0501, 0xd587, 0x0000 }, + { 0x8501, 0xd58c, 0x3000 }, + { 0x8501, 0xd58a, 0x2000 }, + { 0x0501, 0xd589, 0x0000 }, + { 0x0501, 0xd58b, 0x0000 }, + { 0x8501, 0xd58e, 0x2000 }, + { 0x0501, 0xd58d, 0x0000 }, + { 0x0501, 0xd58f, 0x0000 }, + { 0x8901, 0xd5a0, 0x5000 }, + { 0x8501, 0xd598, 0x4000 }, + { 0x8501, 0xd594, 0x3000 }, + { 0x8501, 0xd592, 0x2000 }, + { 0x0501, 0xd591, 0x0000 }, + { 0x0501, 0xd593, 0x0000 }, + { 0x8501, 0xd596, 0x2000 }, + { 0x0501, 0xd595, 0x0000 }, + { 0x0501, 0xd597, 0x0000 }, + { 0x8501, 0xd59c, 0x3000 }, + { 0x8501, 0xd59a, 0x2000 }, + { 0x0501, 0xd599, 0x0000 }, + { 0x0501, 0xd59b, 0x0000 }, + { 0x8501, 0xd59e, 0x2000 }, + { 0x0501, 0xd59d, 0x0000 }, + { 0x0501, 0xd59f, 0x0000 }, + { 0x8901, 0xd5a8, 0x4000 }, + { 0x8901, 0xd5a4, 0x3000 }, + { 0x8901, 0xd5a2, 0x2000 }, + { 0x0901, 0xd5a1, 0x0000 }, + { 0x0901, 0xd5a3, 0x0000 }, + { 0x8901, 0xd5a6, 0x2000 }, + { 0x0901, 0xd5a5, 0x0000 }, + { 0x0901, 0xd5a7, 0x0000 }, + { 0x8901, 0xd5ac, 0x3000 }, + { 0x8901, 0xd5aa, 0x2000 }, + { 0x0901, 0xd5a9, 0x0000 }, + { 0x0901, 0xd5ab, 0x0000 }, + { 0x8901, 0xd5ae, 0x2000 }, + { 0x0901, 0xd5ad, 0x0000 }, + { 0x0901, 0xd5af, 0x0000 }, + { 0x8501, 0xd5d0, 0x6000 }, + { 0x8501, 0xd5c0, 0x5000 }, + { 0x8901, 0xd5b8, 0x4000 }, + { 0x8901, 0xd5b4, 0x3000 }, + { 0x8901, 0xd5b2, 0x2000 }, + { 0x0901, 0xd5b1, 0x0000 }, + { 0x0901, 0xd5b3, 0x0000 }, + { 0x8901, 0xd5b6, 0x2000 }, + { 0x0901, 0xd5b5, 0x0000 }, + { 0x0901, 0xd5b7, 0x0000 }, + { 0x8501, 0xd5bc, 0x3000 }, + { 0x8501, 0xd5ba, 0x2000 }, + { 0x0901, 0xd5b9, 0x0000 }, + { 0x0501, 0xd5bb, 0x0000 }, + { 0x8501, 0xd5be, 0x2000 }, + { 0x0501, 0xd5bd, 0x0000 }, + { 0x0501, 0xd5bf, 0x0000 }, + { 0x8501, 0xd5c8, 0x4000 }, + { 0x8501, 0xd5c4, 0x3000 }, + { 0x8501, 0xd5c2, 0x2000 }, + { 0x0501, 0xd5c1, 0x0000 }, + { 0x0501, 0xd5c3, 0x0000 }, + { 0x8501, 0xd5c6, 0x2000 }, + { 0x0501, 0xd5c5, 0x0000 }, + { 0x0501, 0xd5c7, 0x0000 }, + { 0x8501, 0xd5cc, 0x3000 }, + { 0x8501, 0xd5ca, 0x2000 }, + { 0x0501, 0xd5c9, 0x0000 }, + { 0x0501, 0xd5cb, 0x0000 }, + { 0x8501, 0xd5ce, 0x2000 }, + { 0x0501, 0xd5cd, 0x0000 }, + { 0x0501, 0xd5cf, 0x0000 }, + { 0x8901, 0xd5e0, 0x5000 }, + { 0x8901, 0xd5d8, 0x4000 }, + { 0x8901, 0xd5d4, 0x3000 }, + { 0x8501, 0xd5d2, 0x2000 }, + { 0x0501, 0xd5d1, 0x0000 }, + { 0x0501, 0xd5d3, 0x0000 }, + { 0x8901, 0xd5d6, 0x2000 }, + { 0x0901, 0xd5d5, 0x0000 }, + { 0x0901, 0xd5d7, 0x0000 }, + { 0x8901, 0xd5dc, 0x3000 }, + { 0x8901, 0xd5da, 0x2000 }, + { 0x0901, 0xd5d9, 0x0000 }, + { 0x0901, 0xd5db, 0x0000 }, + { 0x8901, 0xd5de, 0x2000 }, + { 0x0901, 0xd5dd, 0x0000 }, + { 0x0901, 0xd5df, 0x0000 }, + { 0x8901, 0xd5e8, 0x4000 }, + { 0x8901, 0xd5e4, 0x3000 }, + { 0x8901, 0xd5e2, 0x2000 }, + { 0x0901, 0xd5e1, 0x0000 }, + { 0x0901, 0xd5e3, 0x0000 }, + { 0x8901, 0xd5e6, 0x2000 }, + { 0x0901, 0xd5e5, 0x0000 }, + { 0x0901, 0xd5e7, 0x0000 }, + { 0x8901, 0xd5ec, 0x3000 }, + { 0x8901, 0xd5ea, 0x2000 }, + { 0x0901, 0xd5e9, 0x0000 }, + { 0x0901, 0xd5eb, 0x0000 }, + { 0x8501, 0xd5ee, 0x2000 }, + { 0x0901, 0xd5ed, 0x0000 }, + { 0x0501, 0xd5ef, 0x0000 }, + { 0x8501, 0xd630, 0x7000 }, + { 0x8901, 0xd610, 0x6000 }, + { 0x8501, 0xd600, 0x5000 }, + { 0x8501, 0xd5f8, 0x4000 }, + { 0x8501, 0xd5f4, 0x3000 }, + { 0x8501, 0xd5f2, 0x2000 }, + { 0x0501, 0xd5f1, 0x0000 }, + { 0x0501, 0xd5f3, 0x0000 }, + { 0x8501, 0xd5f6, 0x2000 }, + { 0x0501, 0xd5f5, 0x0000 }, + { 0x0501, 0xd5f7, 0x0000 }, + { 0x8501, 0xd5fc, 0x3000 }, + { 0x8501, 0xd5fa, 0x2000 }, + { 0x0501, 0xd5f9, 0x0000 }, + { 0x0501, 0xd5fb, 0x0000 }, + { 0x8501, 0xd5fe, 0x2000 }, + { 0x0501, 0xd5fd, 0x0000 }, + { 0x0501, 0xd5ff, 0x0000 }, + { 0x8901, 0xd608, 0x4000 }, + { 0x8501, 0xd604, 0x3000 }, + { 0x8501, 0xd602, 0x2000 }, + { 0x0501, 0xd601, 0x0000 }, + { 0x0501, 0xd603, 0x0000 }, + { 0x8501, 0xd606, 0x2000 }, + { 0x0501, 0xd605, 0x0000 }, + { 0x0501, 0xd607, 0x0000 }, + { 0x8901, 0xd60c, 0x3000 }, + { 0x8901, 0xd60a, 0x2000 }, + { 0x0901, 0xd609, 0x0000 }, + { 0x0901, 0xd60b, 0x0000 }, + { 0x8901, 0xd60e, 0x2000 }, + { 0x0901, 0xd60d, 0x0000 }, + { 0x0901, 0xd60f, 0x0000 }, + { 0x8901, 0xd620, 0x5000 }, + { 0x8901, 0xd618, 0x4000 }, + { 0x8901, 0xd614, 0x3000 }, + { 0x8901, 0xd612, 0x2000 }, + { 0x0901, 0xd611, 0x0000 }, + { 0x0901, 0xd613, 0x0000 }, + { 0x8901, 0xd616, 0x2000 }, + { 0x0901, 0xd615, 0x0000 }, + { 0x0901, 0xd617, 0x0000 }, + { 0x8901, 0xd61c, 0x3000 }, + { 0x8901, 0xd61a, 0x2000 }, + { 0x0901, 0xd619, 0x0000 }, + { 0x0901, 0xd61b, 0x0000 }, + { 0x8901, 0xd61e, 0x2000 }, + { 0x0901, 0xd61d, 0x0000 }, + { 0x0901, 0xd61f, 0x0000 }, + { 0x8501, 0xd628, 0x4000 }, + { 0x8501, 0xd624, 0x3000 }, + { 0x8501, 0xd622, 0x2000 }, + { 0x0901, 0xd621, 0x0000 }, + { 0x0501, 0xd623, 0x0000 }, + { 0x8501, 0xd626, 0x2000 }, + { 0x0501, 0xd625, 0x0000 }, + { 0x0501, 0xd627, 0x0000 }, + { 0x8501, 0xd62c, 0x3000 }, + { 0x8501, 0xd62a, 0x2000 }, + { 0x0501, 0xd629, 0x0000 }, + { 0x0501, 0xd62b, 0x0000 }, + { 0x8501, 0xd62e, 0x2000 }, + { 0x0501, 0xd62d, 0x0000 }, + { 0x0501, 0xd62f, 0x0000 }, + { 0x8901, 0xd650, 0x6000 }, + { 0x8901, 0xd640, 0x5000 }, + { 0x8501, 0xd638, 0x4000 }, + { 0x8501, 0xd634, 0x3000 }, + { 0x8501, 0xd632, 0x2000 }, + { 0x0501, 0xd631, 0x0000 }, + { 0x0501, 0xd633, 0x0000 }, + { 0x8501, 0xd636, 0x2000 }, + { 0x0501, 0xd635, 0x0000 }, + { 0x0501, 0xd637, 0x0000 }, + { 0x8901, 0xd63c, 0x3000 }, + { 0x8501, 0xd63a, 0x2000 }, + { 0x0501, 0xd639, 0x0000 }, + { 0x0501, 0xd63b, 0x0000 }, + { 0x8901, 0xd63e, 0x2000 }, + { 0x0901, 0xd63d, 0x0000 }, + { 0x0901, 0xd63f, 0x0000 }, + { 0x8901, 0xd648, 0x4000 }, + { 0x8901, 0xd644, 0x3000 }, + { 0x8901, 0xd642, 0x2000 }, + { 0x0901, 0xd641, 0x0000 }, + { 0x0901, 0xd643, 0x0000 }, + { 0x8901, 0xd646, 0x2000 }, + { 0x0901, 0xd645, 0x0000 }, + { 0x0901, 0xd647, 0x0000 }, + { 0x8901, 0xd64c, 0x3000 }, + { 0x8901, 0xd64a, 0x2000 }, + { 0x0901, 0xd649, 0x0000 }, + { 0x0901, 0xd64b, 0x0000 }, + { 0x8901, 0xd64e, 0x2000 }, + { 0x0901, 0xd64d, 0x0000 }, + { 0x0901, 0xd64f, 0x0000 }, + { 0x8501, 0xd660, 0x5000 }, + { 0x8501, 0xd658, 0x4000 }, + { 0x8901, 0xd654, 0x3000 }, + { 0x8901, 0xd652, 0x2000 }, + { 0x0901, 0xd651, 0x0000 }, + { 0x0901, 0xd653, 0x0000 }, + { 0x8501, 0xd656, 0x2000 }, + { 0x0901, 0xd655, 0x0000 }, + { 0x0501, 0xd657, 0x0000 }, + { 0x8501, 0xd65c, 0x3000 }, + { 0x8501, 0xd65a, 0x2000 }, + { 0x0501, 0xd659, 0x0000 }, + { 0x0501, 0xd65b, 0x0000 }, + { 0x8501, 0xd65e, 0x2000 }, + { 0x0501, 0xd65d, 0x0000 }, + { 0x0501, 0xd65f, 0x0000 }, + { 0x8501, 0xd668, 0x4000 }, + { 0x8501, 0xd664, 0x3000 }, + { 0x8501, 0xd662, 0x2000 }, + { 0x0501, 0xd661, 0x0000 }, + { 0x0501, 0xd663, 0x0000 }, + { 0x8501, 0xd666, 0x2000 }, + { 0x0501, 0xd665, 0x0000 }, + { 0x0501, 0xd667, 0x0000 }, + { 0x8501, 0xd66c, 0x3000 }, + { 0x8501, 0xd66a, 0x2000 }, + { 0x0501, 0xd669, 0x0000 }, + { 0x0501, 0xd66b, 0x0000 }, + { 0x8501, 0xd66e, 0x2000 }, + { 0x0501, 0xd66d, 0x0000 }, + { 0x0501, 0xd66f, 0x0000 }, + { 0x8501, 0xd774, 0x9000 }, + { 0x8901, 0xd6f4, 0x8000 }, + { 0x8901, 0xd6b4, 0x7000 }, + { 0x8501, 0xd690, 0x6000 }, + { 0x8901, 0xd680, 0x5000 }, + { 0x8901, 0xd678, 0x4000 }, + { 0x8901, 0xd674, 0x3000 }, + { 0x8901, 0xd672, 0x2000 }, + { 0x0901, 0xd671, 0x0000 }, + { 0x0901, 0xd673, 0x0000 }, + { 0x8901, 0xd676, 0x2000 }, + { 0x0901, 0xd675, 0x0000 }, + { 0x0901, 0xd677, 0x0000 }, + { 0x8901, 0xd67c, 0x3000 }, + { 0x8901, 0xd67a, 0x2000 }, + { 0x0901, 0xd679, 0x0000 }, + { 0x0901, 0xd67b, 0x0000 }, + { 0x8901, 0xd67e, 0x2000 }, + { 0x0901, 0xd67d, 0x0000 }, + { 0x0901, 0xd67f, 0x0000 }, + { 0x8901, 0xd688, 0x4000 }, + { 0x8901, 0xd684, 0x3000 }, + { 0x8901, 0xd682, 0x2000 }, + { 0x0901, 0xd681, 0x0000 }, + { 0x0901, 0xd683, 0x0000 }, + { 0x8901, 0xd686, 0x2000 }, + { 0x0901, 0xd685, 0x0000 }, + { 0x0901, 0xd687, 0x0000 }, + { 0x8501, 0xd68c, 0x3000 }, + { 0x8501, 0xd68a, 0x2000 }, + { 0x0901, 0xd689, 0x0000 }, + { 0x0501, 0xd68b, 0x0000 }, + { 0x8501, 0xd68e, 0x2000 }, + { 0x0501, 0xd68d, 0x0000 }, + { 0x0501, 0xd68f, 0x0000 }, + { 0x8501, 0xd6a0, 0x5000 }, + { 0x8501, 0xd698, 0x4000 }, + { 0x8501, 0xd694, 0x3000 }, + { 0x8501, 0xd692, 0x2000 }, + { 0x0501, 0xd691, 0x0000 }, + { 0x0501, 0xd693, 0x0000 }, + { 0x8501, 0xd696, 0x2000 }, + { 0x0501, 0xd695, 0x0000 }, + { 0x0501, 0xd697, 0x0000 }, + { 0x8501, 0xd69c, 0x3000 }, + { 0x8501, 0xd69a, 0x2000 }, + { 0x0501, 0xd699, 0x0000 }, + { 0x0501, 0xd69b, 0x0000 }, + { 0x8501, 0xd69e, 0x2000 }, + { 0x0501, 0xd69d, 0x0000 }, + { 0x0501, 0xd69f, 0x0000 }, + { 0x8901, 0xd6ac, 0x4000 }, + { 0x8901, 0xd6a8, 0x3000 }, + { 0x8501, 0xd6a2, 0x2000 }, + { 0x0501, 0xd6a1, 0x0000 }, + { 0x0501, 0xd6a3, 0x0000 }, + { 0x8901, 0xd6aa, 0x2000 }, + { 0x0901, 0xd6a9, 0x0000 }, + { 0x0901, 0xd6ab, 0x0000 }, + { 0x8901, 0xd6b0, 0x3000 }, + { 0x8901, 0xd6ae, 0x2000 }, + { 0x0901, 0xd6ad, 0x0000 }, + { 0x0901, 0xd6af, 0x0000 }, + { 0x8901, 0xd6b2, 0x2000 }, + { 0x0901, 0xd6b1, 0x0000 }, + { 0x0901, 0xd6b3, 0x0000 }, + { 0x8501, 0xd6d4, 0x6000 }, + { 0x8501, 0xd6c4, 0x5000 }, + { 0x8901, 0xd6bc, 0x4000 }, + { 0x8901, 0xd6b8, 0x3000 }, + { 0x8901, 0xd6b6, 0x2000 }, + { 0x0901, 0xd6b5, 0x0000 }, + { 0x0901, 0xd6b7, 0x0000 }, + { 0x8901, 0xd6ba, 0x2000 }, + { 0x0901, 0xd6b9, 0x0000 }, + { 0x0901, 0xd6bb, 0x0000 }, + { 0x8901, 0xd6c0, 0x3000 }, + { 0x8901, 0xd6be, 0x2000 }, + { 0x0901, 0xd6bd, 0x0000 }, + { 0x0901, 0xd6bf, 0x0000 }, + { 0x8501, 0xd6c2, 0x2000 }, + { 0x1901, 0xd6c1, 0x0000 }, + { 0x0501, 0xd6c3, 0x0000 }, + { 0x8501, 0xd6cc, 0x4000 }, + { 0x8501, 0xd6c8, 0x3000 }, + { 0x8501, 0xd6c6, 0x2000 }, + { 0x0501, 0xd6c5, 0x0000 }, + { 0x0501, 0xd6c7, 0x0000 }, + { 0x8501, 0xd6ca, 0x2000 }, + { 0x0501, 0xd6c9, 0x0000 }, + { 0x0501, 0xd6cb, 0x0000 }, + { 0x8501, 0xd6d0, 0x3000 }, + { 0x8501, 0xd6ce, 0x2000 }, + { 0x0501, 0xd6cd, 0x0000 }, + { 0x0501, 0xd6cf, 0x0000 }, + { 0x8501, 0xd6d2, 0x2000 }, + { 0x0501, 0xd6d1, 0x0000 }, + { 0x0501, 0xd6d3, 0x0000 }, + { 0x8901, 0xd6e4, 0x5000 }, + { 0x8501, 0xd6dc, 0x4000 }, + { 0x8501, 0xd6d8, 0x3000 }, + { 0x8501, 0xd6d6, 0x2000 }, + { 0x0501, 0xd6d5, 0x0000 }, + { 0x0501, 0xd6d7, 0x0000 }, + { 0x8501, 0xd6da, 0x2000 }, + { 0x0501, 0xd6d9, 0x0000 }, + { 0x1901, 0xd6db, 0x0000 }, + { 0x8501, 0xd6e0, 0x3000 }, + { 0x8501, 0xd6de, 0x2000 }, + { 0x0501, 0xd6dd, 0x0000 }, + { 0x0501, 0xd6df, 0x0000 }, + { 0x8901, 0xd6e2, 0x2000 }, + { 0x0501, 0xd6e1, 0x0000 }, + { 0x0901, 0xd6e3, 0x0000 }, + { 0x8901, 0xd6ec, 0x4000 }, + { 0x8901, 0xd6e8, 0x3000 }, + { 0x8901, 0xd6e6, 0x2000 }, + { 0x0901, 0xd6e5, 0x0000 }, + { 0x0901, 0xd6e7, 0x0000 }, + { 0x8901, 0xd6ea, 0x2000 }, + { 0x0901, 0xd6e9, 0x0000 }, + { 0x0901, 0xd6eb, 0x0000 }, + { 0x8901, 0xd6f0, 0x3000 }, + { 0x8901, 0xd6ee, 0x2000 }, + { 0x0901, 0xd6ed, 0x0000 }, + { 0x0901, 0xd6ef, 0x0000 }, + { 0x8901, 0xd6f2, 0x2000 }, + { 0x0901, 0xd6f1, 0x0000 }, + { 0x0901, 0xd6f3, 0x0000 }, + { 0x8901, 0xd734, 0x7000 }, + { 0x8501, 0xd714, 0x6000 }, + { 0x8501, 0xd704, 0x5000 }, + { 0x8501, 0xd6fc, 0x4000 }, + { 0x8901, 0xd6f8, 0x3000 }, + { 0x8901, 0xd6f6, 0x2000 }, + { 0x0901, 0xd6f5, 0x0000 }, + { 0x0901, 0xd6f7, 0x0000 }, + { 0x8901, 0xd6fa, 0x2000 }, + { 0x0901, 0xd6f9, 0x0000 }, + { 0x1901, 0xd6fb, 0x0000 }, + { 0x8501, 0xd700, 0x3000 }, + { 0x8501, 0xd6fe, 0x2000 }, + { 0x0501, 0xd6fd, 0x0000 }, + { 0x0501, 0xd6ff, 0x0000 }, + { 0x8501, 0xd702, 0x2000 }, + { 0x0501, 0xd701, 0x0000 }, + { 0x0501, 0xd703, 0x0000 }, + { 0x8501, 0xd70c, 0x4000 }, + { 0x8501, 0xd708, 0x3000 }, + { 0x8501, 0xd706, 0x2000 }, + { 0x0501, 0xd705, 0x0000 }, + { 0x0501, 0xd707, 0x0000 }, + { 0x8501, 0xd70a, 0x2000 }, + { 0x0501, 0xd709, 0x0000 }, + { 0x0501, 0xd70b, 0x0000 }, + { 0x8501, 0xd710, 0x3000 }, + { 0x8501, 0xd70e, 0x2000 }, + { 0x0501, 0xd70d, 0x0000 }, + { 0x0501, 0xd70f, 0x0000 }, + { 0x8501, 0xd712, 0x2000 }, + { 0x0501, 0xd711, 0x0000 }, + { 0x0501, 0xd713, 0x0000 }, + { 0x8901, 0xd724, 0x5000 }, + { 0x8901, 0xd71c, 0x4000 }, + { 0x8501, 0xd718, 0x3000 }, + { 0x8501, 0xd716, 0x2000 }, + { 0x1901, 0xd715, 0x0000 }, + { 0x0501, 0xd717, 0x0000 }, + { 0x8501, 0xd71a, 0x2000 }, + { 0x0501, 0xd719, 0x0000 }, + { 0x0501, 0xd71b, 0x0000 }, + { 0x8901, 0xd720, 0x3000 }, + { 0x8901, 0xd71e, 0x2000 }, + { 0x0901, 0xd71d, 0x0000 }, + { 0x0901, 0xd71f, 0x0000 }, + { 0x8901, 0xd722, 0x2000 }, + { 0x0901, 0xd721, 0x0000 }, + { 0x0901, 0xd723, 0x0000 }, + { 0x8901, 0xd72c, 0x4000 }, + { 0x8901, 0xd728, 0x3000 }, + { 0x8901, 0xd726, 0x2000 }, + { 0x0901, 0xd725, 0x0000 }, + { 0x0901, 0xd727, 0x0000 }, + { 0x8901, 0xd72a, 0x2000 }, + { 0x0901, 0xd729, 0x0000 }, + { 0x0901, 0xd72b, 0x0000 }, + { 0x8901, 0xd730, 0x3000 }, + { 0x8901, 0xd72e, 0x2000 }, + { 0x0901, 0xd72d, 0x0000 }, + { 0x0901, 0xd72f, 0x0000 }, + { 0x8901, 0xd732, 0x2000 }, + { 0x0901, 0xd731, 0x0000 }, + { 0x0901, 0xd733, 0x0000 }, + { 0x8501, 0xd754, 0x6000 }, + { 0x8501, 0xd744, 0x5000 }, + { 0x8501, 0xd73c, 0x4000 }, + { 0x8501, 0xd738, 0x3000 }, + { 0x8501, 0xd736, 0x2000 }, + { 0x1901, 0xd735, 0x0000 }, + { 0x0501, 0xd737, 0x0000 }, + { 0x8501, 0xd73a, 0x2000 }, + { 0x0501, 0xd739, 0x0000 }, + { 0x0501, 0xd73b, 0x0000 }, + { 0x8501, 0xd740, 0x3000 }, + { 0x8501, 0xd73e, 0x2000 }, + { 0x0501, 0xd73d, 0x0000 }, + { 0x0501, 0xd73f, 0x0000 }, + { 0x8501, 0xd742, 0x2000 }, + { 0x0501, 0xd741, 0x0000 }, + { 0x0501, 0xd743, 0x0000 }, + { 0x8501, 0xd74c, 0x4000 }, + { 0x8501, 0xd748, 0x3000 }, + { 0x8501, 0xd746, 0x2000 }, + { 0x0501, 0xd745, 0x0000 }, + { 0x0501, 0xd747, 0x0000 }, + { 0x8501, 0xd74a, 0x2000 }, + { 0x0501, 0xd749, 0x0000 }, + { 0x0501, 0xd74b, 0x0000 }, + { 0x8501, 0xd750, 0x3000 }, + { 0x8501, 0xd74e, 0x2000 }, + { 0x0501, 0xd74d, 0x0000 }, + { 0x1901, 0xd74f, 0x0000 }, + { 0x8501, 0xd752, 0x2000 }, + { 0x0501, 0xd751, 0x0000 }, + { 0x0501, 0xd753, 0x0000 }, + { 0x8901, 0xd764, 0x5000 }, + { 0x8901, 0xd75c, 0x4000 }, + { 0x8901, 0xd758, 0x3000 }, + { 0x8901, 0xd756, 0x2000 }, + { 0x0501, 0xd755, 0x0000 }, + { 0x0901, 0xd757, 0x0000 }, + { 0x8901, 0xd75a, 0x2000 }, + { 0x0901, 0xd759, 0x0000 }, + { 0x0901, 0xd75b, 0x0000 }, + { 0x8901, 0xd760, 0x3000 }, + { 0x8901, 0xd75e, 0x2000 }, + { 0x0901, 0xd75d, 0x0000 }, + { 0x0901, 0xd75f, 0x0000 }, + { 0x8901, 0xd762, 0x2000 }, + { 0x0901, 0xd761, 0x0000 }, + { 0x0901, 0xd763, 0x0000 }, + { 0x8901, 0xd76c, 0x4000 }, + { 0x8901, 0xd768, 0x3000 }, + { 0x8901, 0xd766, 0x2000 }, + { 0x0901, 0xd765, 0x0000 }, + { 0x0901, 0xd767, 0x0000 }, + { 0x8901, 0xd76a, 0x2000 }, + { 0x0901, 0xd769, 0x0000 }, + { 0x0901, 0xd76b, 0x0000 }, + { 0x8501, 0xd770, 0x3000 }, + { 0x8901, 0xd76e, 0x2000 }, + { 0x0901, 0xd76d, 0x0000 }, + { 0x1901, 0xd76f, 0x0000 }, + { 0x8501, 0xd772, 0x2000 }, + { 0x0501, 0xd771, 0x0000 }, + { 0x0501, 0xd773, 0x0000 }, + { 0x8d01, 0xd7f8, 0x8000 }, + { 0x8501, 0xd7b4, 0x7000 }, + { 0x8901, 0xd794, 0x6000 }, + { 0x8501, 0xd784, 0x5000 }, + { 0x8501, 0xd77c, 0x4000 }, + { 0x8501, 0xd778, 0x3000 }, + { 0x8501, 0xd776, 0x2000 }, + { 0x0501, 0xd775, 0x0000 }, + { 0x0501, 0xd777, 0x0000 }, + { 0x8501, 0xd77a, 0x2000 }, + { 0x0501, 0xd779, 0x0000 }, + { 0x0501, 0xd77b, 0x0000 }, + { 0x8501, 0xd780, 0x3000 }, + { 0x8501, 0xd77e, 0x2000 }, + { 0x0501, 0xd77d, 0x0000 }, + { 0x0501, 0xd77f, 0x0000 }, + { 0x8501, 0xd782, 0x2000 }, + { 0x0501, 0xd781, 0x0000 }, + { 0x0501, 0xd783, 0x0000 }, + { 0x8501, 0xd78c, 0x4000 }, + { 0x8501, 0xd788, 0x3000 }, + { 0x8501, 0xd786, 0x2000 }, + { 0x0501, 0xd785, 0x0000 }, + { 0x0501, 0xd787, 0x0000 }, + { 0x8501, 0xd78a, 0x2000 }, + { 0x1901, 0xd789, 0x0000 }, + { 0x0501, 0xd78b, 0x0000 }, + { 0x8901, 0xd790, 0x3000 }, + { 0x8501, 0xd78e, 0x2000 }, + { 0x0501, 0xd78d, 0x0000 }, + { 0x0501, 0xd78f, 0x0000 }, + { 0x8901, 0xd792, 0x2000 }, + { 0x0901, 0xd791, 0x0000 }, + { 0x0901, 0xd793, 0x0000 }, + { 0x8901, 0xd7a4, 0x5000 }, + { 0x8901, 0xd79c, 0x4000 }, + { 0x8901, 0xd798, 0x3000 }, + { 0x8901, 0xd796, 0x2000 }, + { 0x0901, 0xd795, 0x0000 }, + { 0x0901, 0xd797, 0x0000 }, + { 0x8901, 0xd79a, 0x2000 }, + { 0x0901, 0xd799, 0x0000 }, + { 0x0901, 0xd79b, 0x0000 }, + { 0x8901, 0xd7a0, 0x3000 }, + { 0x8901, 0xd79e, 0x2000 }, + { 0x0901, 0xd79d, 0x0000 }, + { 0x0901, 0xd79f, 0x0000 }, + { 0x8901, 0xd7a2, 0x2000 }, + { 0x0901, 0xd7a1, 0x0000 }, + { 0x0901, 0xd7a3, 0x0000 }, + { 0x8501, 0xd7ac, 0x4000 }, + { 0x8901, 0xd7a8, 0x3000 }, + { 0x8901, 0xd7a6, 0x2000 }, + { 0x0901, 0xd7a5, 0x0000 }, + { 0x0901, 0xd7a7, 0x0000 }, + { 0x8501, 0xd7aa, 0x2000 }, + { 0x1901, 0xd7a9, 0x0000 }, + { 0x0501, 0xd7ab, 0x0000 }, + { 0x8501, 0xd7b0, 0x3000 }, + { 0x8501, 0xd7ae, 0x2000 }, + { 0x0501, 0xd7ad, 0x0000 }, + { 0x0501, 0xd7af, 0x0000 }, + { 0x8501, 0xd7b2, 0x2000 }, + { 0x0501, 0xd7b1, 0x0000 }, + { 0x0501, 0xd7b3, 0x0000 }, + { 0x8d01, 0xd7d8, 0x6000 }, + { 0x8501, 0xd7c4, 0x5000 }, + { 0x8501, 0xd7bc, 0x4000 }, + { 0x8501, 0xd7b8, 0x3000 }, + { 0x8501, 0xd7b6, 0x2000 }, + { 0x0501, 0xd7b5, 0x0000 }, + { 0x0501, 0xd7b7, 0x0000 }, + { 0x8501, 0xd7ba, 0x2000 }, + { 0x0501, 0xd7b9, 0x0000 }, + { 0x0501, 0xd7bb, 0x0000 }, + { 0x8501, 0xd7c0, 0x3000 }, + { 0x8501, 0xd7be, 0x2000 }, + { 0x0501, 0xd7bd, 0x0000 }, + { 0x0501, 0xd7bf, 0x0000 }, + { 0x8501, 0xd7c2, 0x2000 }, + { 0x0501, 0xd7c1, 0x0000 }, + { 0x1901, 0xd7c3, 0x0000 }, + { 0x8d01, 0xd7d0, 0x4000 }, + { 0x8501, 0xd7c8, 0x3000 }, + { 0x8501, 0xd7c6, 0x2000 }, + { 0x0501, 0xd7c5, 0x0000 }, + { 0x0501, 0xd7c7, 0x0000 }, + { 0x8d01, 0xd7ce, 0x2000 }, + { 0x0501, 0xd7c9, 0x0000 }, + { 0x0d01, 0xd7cf, 0x0000 }, + { 0x8d01, 0xd7d4, 0x3000 }, + { 0x8d01, 0xd7d2, 0x2000 }, + { 0x0d01, 0xd7d1, 0x0000 }, + { 0x0d01, 0xd7d3, 0x0000 }, + { 0x8d01, 0xd7d6, 0x2000 }, + { 0x0d01, 0xd7d5, 0x0000 }, + { 0x0d01, 0xd7d7, 0x0000 }, + { 0x8d01, 0xd7e8, 0x5000 }, + { 0x8d01, 0xd7e0, 0x4000 }, + { 0x8d01, 0xd7dc, 0x3000 }, + { 0x8d01, 0xd7da, 0x2000 }, + { 0x0d01, 0xd7d9, 0x0000 }, + { 0x0d01, 0xd7db, 0x0000 }, + { 0x8d01, 0xd7de, 0x2000 }, + { 0x0d01, 0xd7dd, 0x0000 }, + { 0x0d01, 0xd7df, 0x0000 }, + { 0x8d01, 0xd7e4, 0x3000 }, + { 0x8d01, 0xd7e2, 0x2000 }, + { 0x0d01, 0xd7e1, 0x0000 }, + { 0x0d01, 0xd7e3, 0x0000 }, + { 0x8d01, 0xd7e6, 0x2000 }, + { 0x0d01, 0xd7e5, 0x0000 }, + { 0x0d01, 0xd7e7, 0x0000 }, + { 0x8d01, 0xd7f0, 0x4000 }, + { 0x8d01, 0xd7ec, 0x3000 }, + { 0x8d01, 0xd7ea, 0x2000 }, + { 0x0d01, 0xd7e9, 0x0000 }, + { 0x0d01, 0xd7eb, 0x0000 }, + { 0x8d01, 0xd7ee, 0x2000 }, + { 0x0d01, 0xd7ed, 0x0000 }, + { 0x0d01, 0xd7ef, 0x0000 }, + { 0x8d01, 0xd7f4, 0x3000 }, + { 0x8d01, 0xd7f2, 0x2000 }, + { 0x0d01, 0xd7f1, 0x0000 }, + { 0x0d01, 0xd7f3, 0x0000 }, + { 0x8d01, 0xd7f6, 0x2000 }, + { 0x0d01, 0xd7f5, 0x0000 }, + { 0x0d01, 0xd7f7, 0x0000 }, + { 0x8702, 0xf836, 0x7000 }, + { 0x8702, 0xf816, 0x6000 }, + { 0x8702, 0xf806, 0x5000 }, + { 0x8702, 0x0000, 0x4000 }, + { 0x8d01, 0xd7fc, 0x3000 }, + { 0x8d01, 0xd7fa, 0x2000 }, + { 0x0d01, 0xd7f9, 0x0000 }, + { 0x0d01, 0xd7fb, 0x0000 }, + { 0x8d01, 0xd7fe, 0x2000 }, + { 0x0d01, 0xd7fd, 0x0000 }, + { 0x0d01, 0xd7ff, 0x0000 }, + { 0x8702, 0xf802, 0x3000 }, + { 0x8702, 0xf800, 0x2000 }, + { 0x0702, 0xa6d6, 0x0000 }, + { 0x0702, 0xf801, 0x0000 }, + { 0x8702, 0xf804, 0x2000 }, + { 0x0702, 0xf803, 0x0000 }, + { 0x0702, 0xf805, 0x0000 }, + { 0x8702, 0xf80e, 0x4000 }, + { 0x8702, 0xf80a, 0x3000 }, + { 0x8702, 0xf808, 0x2000 }, + { 0x0702, 0xf807, 0x0000 }, + { 0x0702, 0xf809, 0x0000 }, + { 0x8702, 0xf80c, 0x2000 }, + { 0x0702, 0xf80b, 0x0000 }, + { 0x0702, 0xf80d, 0x0000 }, + { 0x8702, 0xf812, 0x3000 }, + { 0x8702, 0xf810, 0x2000 }, + { 0x0702, 0xf80f, 0x0000 }, + { 0x0702, 0xf811, 0x0000 }, + { 0x8702, 0xf814, 0x2000 }, + { 0x0702, 0xf813, 0x0000 }, + { 0x0702, 0xf815, 0x0000 }, + { 0x8702, 0xf826, 0x5000 }, + { 0x8702, 0xf81e, 0x4000 }, + { 0x8702, 0xf81a, 0x3000 }, + { 0x8702, 0xf818, 0x2000 }, + { 0x0702, 0xf817, 0x0000 }, + { 0x0702, 0xf819, 0x0000 }, + { 0x8702, 0xf81c, 0x2000 }, + { 0x0702, 0xf81b, 0x0000 }, + { 0x0702, 0xf81d, 0x0000 }, + { 0x8702, 0xf822, 0x3000 }, + { 0x8702, 0xf820, 0x2000 }, + { 0x0702, 0xf81f, 0x0000 }, + { 0x0702, 0xf821, 0x0000 }, + { 0x8702, 0xf824, 0x2000 }, + { 0x0702, 0xf823, 0x0000 }, + { 0x0702, 0xf825, 0x0000 }, + { 0x8702, 0xf82e, 0x4000 }, + { 0x8702, 0xf82a, 0x3000 }, + { 0x8702, 0xf828, 0x2000 }, + { 0x0702, 0xf827, 0x0000 }, + { 0x0702, 0xf829, 0x0000 }, + { 0x8702, 0xf82c, 0x2000 }, + { 0x0702, 0xf82b, 0x0000 }, + { 0x0702, 0xf82d, 0x0000 }, + { 0x8702, 0xf832, 0x3000 }, + { 0x8702, 0xf830, 0x2000 }, + { 0x0702, 0xf82f, 0x0000 }, + { 0x0702, 0xf831, 0x0000 }, + { 0x8702, 0xf834, 0x2000 }, + { 0x0702, 0xf833, 0x0000 }, + { 0x0702, 0xf835, 0x0000 }, + { 0x8702, 0xf856, 0x6000 }, + { 0x8702, 0xf846, 0x5000 }, + { 0x8702, 0xf83e, 0x4000 }, + { 0x8702, 0xf83a, 0x3000 }, + { 0x8702, 0xf838, 0x2000 }, + { 0x0702, 0xf837, 0x0000 }, + { 0x0702, 0xf839, 0x0000 }, + { 0x8702, 0xf83c, 0x2000 }, + { 0x0702, 0xf83b, 0x0000 }, + { 0x0702, 0xf83d, 0x0000 }, + { 0x8702, 0xf842, 0x3000 }, + { 0x8702, 0xf840, 0x2000 }, + { 0x0702, 0xf83f, 0x0000 }, + { 0x0702, 0xf841, 0x0000 }, + { 0x8702, 0xf844, 0x2000 }, + { 0x0702, 0xf843, 0x0000 }, + { 0x0702, 0xf845, 0x0000 }, + { 0x8702, 0xf84e, 0x4000 }, + { 0x8702, 0xf84a, 0x3000 }, + { 0x8702, 0xf848, 0x2000 }, + { 0x0702, 0xf847, 0x0000 }, + { 0x0702, 0xf849, 0x0000 }, + { 0x8702, 0xf84c, 0x2000 }, + { 0x0702, 0xf84b, 0x0000 }, + { 0x0702, 0xf84d, 0x0000 }, + { 0x8702, 0xf852, 0x3000 }, + { 0x8702, 0xf850, 0x2000 }, + { 0x0702, 0xf84f, 0x0000 }, + { 0x0702, 0xf851, 0x0000 }, + { 0x8702, 0xf854, 0x2000 }, + { 0x0702, 0xf853, 0x0000 }, + { 0x0702, 0xf855, 0x0000 }, + { 0x8702, 0xf866, 0x5000 }, + { 0x8702, 0xf85e, 0x4000 }, + { 0x8702, 0xf85a, 0x3000 }, + { 0x8702, 0xf858, 0x2000 }, + { 0x0702, 0xf857, 0x0000 }, + { 0x0702, 0xf859, 0x0000 }, + { 0x8702, 0xf85c, 0x2000 }, + { 0x0702, 0xf85b, 0x0000 }, + { 0x0702, 0xf85d, 0x0000 }, + { 0x8702, 0xf862, 0x3000 }, + { 0x8702, 0xf860, 0x2000 }, + { 0x0702, 0xf85f, 0x0000 }, + { 0x0702, 0xf861, 0x0000 }, + { 0x8702, 0xf864, 0x2000 }, + { 0x0702, 0xf863, 0x0000 }, + { 0x0702, 0xf865, 0x0000 }, + { 0x8702, 0xf86e, 0x4000 }, + { 0x8702, 0xf86a, 0x3000 }, + { 0x8702, 0xf868, 0x2000 }, + { 0x0702, 0xf867, 0x0000 }, + { 0x0702, 0xf869, 0x0000 }, + { 0x8702, 0xf86c, 0x2000 }, + { 0x0702, 0xf86b, 0x0000 }, + { 0x0702, 0xf86d, 0x0000 }, + { 0x8702, 0xf872, 0x3000 }, + { 0x8702, 0xf870, 0x2000 }, + { 0x0702, 0xf86f, 0x0000 }, + { 0x0702, 0xf871, 0x0000 }, + { 0x8702, 0xf874, 0x2000 }, + { 0x0702, 0xf873, 0x0000 }, + { 0x0702, 0xf875, 0x0000 }, + { 0x8702, 0xf976, 0x9000 }, + { 0x8702, 0xf8f6, 0x8000 }, + { 0x8702, 0xf8b6, 0x7000 }, + { 0x8702, 0xf896, 0x6000 }, + { 0x8702, 0xf886, 0x5000 }, + { 0x8702, 0xf87e, 0x4000 }, + { 0x8702, 0xf87a, 0x3000 }, + { 0x8702, 0xf878, 0x2000 }, + { 0x0702, 0xf877, 0x0000 }, + { 0x0702, 0xf879, 0x0000 }, + { 0x8702, 0xf87c, 0x2000 }, + { 0x0702, 0xf87b, 0x0000 }, + { 0x0702, 0xf87d, 0x0000 }, + { 0x8702, 0xf882, 0x3000 }, + { 0x8702, 0xf880, 0x2000 }, + { 0x0702, 0xf87f, 0x0000 }, + { 0x0702, 0xf881, 0x0000 }, + { 0x8702, 0xf884, 0x2000 }, + { 0x0702, 0xf883, 0x0000 }, + { 0x0702, 0xf885, 0x0000 }, + { 0x8702, 0xf88e, 0x4000 }, + { 0x8702, 0xf88a, 0x3000 }, + { 0x8702, 0xf888, 0x2000 }, + { 0x0702, 0xf887, 0x0000 }, + { 0x0702, 0xf889, 0x0000 }, + { 0x8702, 0xf88c, 0x2000 }, + { 0x0702, 0xf88b, 0x0000 }, + { 0x0702, 0xf88d, 0x0000 }, + { 0x8702, 0xf892, 0x3000 }, + { 0x8702, 0xf890, 0x2000 }, + { 0x0702, 0xf88f, 0x0000 }, + { 0x0702, 0xf891, 0x0000 }, + { 0x8702, 0xf894, 0x2000 }, + { 0x0702, 0xf893, 0x0000 }, + { 0x0702, 0xf895, 0x0000 }, + { 0x8702, 0xf8a6, 0x5000 }, + { 0x8702, 0xf89e, 0x4000 }, + { 0x8702, 0xf89a, 0x3000 }, + { 0x8702, 0xf898, 0x2000 }, + { 0x0702, 0xf897, 0x0000 }, + { 0x0702, 0xf899, 0x0000 }, + { 0x8702, 0xf89c, 0x2000 }, + { 0x0702, 0xf89b, 0x0000 }, + { 0x0702, 0xf89d, 0x0000 }, + { 0x8702, 0xf8a2, 0x3000 }, + { 0x8702, 0xf8a0, 0x2000 }, + { 0x0702, 0xf89f, 0x0000 }, + { 0x0702, 0xf8a1, 0x0000 }, + { 0x8702, 0xf8a4, 0x2000 }, + { 0x0702, 0xf8a3, 0x0000 }, + { 0x0702, 0xf8a5, 0x0000 }, + { 0x8702, 0xf8ae, 0x4000 }, + { 0x8702, 0xf8aa, 0x3000 }, + { 0x8702, 0xf8a8, 0x2000 }, + { 0x0702, 0xf8a7, 0x0000 }, + { 0x0702, 0xf8a9, 0x0000 }, + { 0x8702, 0xf8ac, 0x2000 }, + { 0x0702, 0xf8ab, 0x0000 }, + { 0x0702, 0xf8ad, 0x0000 }, + { 0x8702, 0xf8b2, 0x3000 }, + { 0x8702, 0xf8b0, 0x2000 }, + { 0x0702, 0xf8af, 0x0000 }, + { 0x0702, 0xf8b1, 0x0000 }, + { 0x8702, 0xf8b4, 0x2000 }, + { 0x0702, 0xf8b3, 0x0000 }, + { 0x0702, 0xf8b5, 0x0000 }, + { 0x8702, 0xf8d6, 0x6000 }, + { 0x8702, 0xf8c6, 0x5000 }, + { 0x8702, 0xf8be, 0x4000 }, + { 0x8702, 0xf8ba, 0x3000 }, + { 0x8702, 0xf8b8, 0x2000 }, + { 0x0702, 0xf8b7, 0x0000 }, + { 0x0702, 0xf8b9, 0x0000 }, + { 0x8702, 0xf8bc, 0x2000 }, + { 0x0702, 0xf8bb, 0x0000 }, + { 0x0702, 0xf8bd, 0x0000 }, + { 0x8702, 0xf8c2, 0x3000 }, + { 0x8702, 0xf8c0, 0x2000 }, + { 0x0702, 0xf8bf, 0x0000 }, + { 0x0702, 0xf8c1, 0x0000 }, + { 0x8702, 0xf8c4, 0x2000 }, + { 0x0702, 0xf8c3, 0x0000 }, + { 0x0702, 0xf8c5, 0x0000 }, + { 0x8702, 0xf8ce, 0x4000 }, + { 0x8702, 0xf8ca, 0x3000 }, + { 0x8702, 0xf8c8, 0x2000 }, + { 0x0702, 0xf8c7, 0x0000 }, + { 0x0702, 0xf8c9, 0x0000 }, + { 0x8702, 0xf8cc, 0x2000 }, + { 0x0702, 0xf8cb, 0x0000 }, + { 0x0702, 0xf8cd, 0x0000 }, + { 0x8702, 0xf8d2, 0x3000 }, + { 0x8702, 0xf8d0, 0x2000 }, + { 0x0702, 0xf8cf, 0x0000 }, + { 0x0702, 0xf8d1, 0x0000 }, + { 0x8702, 0xf8d4, 0x2000 }, + { 0x0702, 0xf8d3, 0x0000 }, + { 0x0702, 0xf8d5, 0x0000 }, + { 0x8702, 0xf8e6, 0x5000 }, + { 0x8702, 0xf8de, 0x4000 }, + { 0x8702, 0xf8da, 0x3000 }, + { 0x8702, 0xf8d8, 0x2000 }, + { 0x0702, 0xf8d7, 0x0000 }, + { 0x0702, 0xf8d9, 0x0000 }, + { 0x8702, 0xf8dc, 0x2000 }, + { 0x0702, 0xf8db, 0x0000 }, + { 0x0702, 0xf8dd, 0x0000 }, + { 0x8702, 0xf8e2, 0x3000 }, + { 0x8702, 0xf8e0, 0x2000 }, + { 0x0702, 0xf8df, 0x0000 }, + { 0x0702, 0xf8e1, 0x0000 }, + { 0x8702, 0xf8e4, 0x2000 }, + { 0x0702, 0xf8e3, 0x0000 }, + { 0x0702, 0xf8e5, 0x0000 }, + { 0x8702, 0xf8ee, 0x4000 }, + { 0x8702, 0xf8ea, 0x3000 }, + { 0x8702, 0xf8e8, 0x2000 }, + { 0x0702, 0xf8e7, 0x0000 }, + { 0x0702, 0xf8e9, 0x0000 }, + { 0x8702, 0xf8ec, 0x2000 }, + { 0x0702, 0xf8eb, 0x0000 }, + { 0x0702, 0xf8ed, 0x0000 }, + { 0x8702, 0xf8f2, 0x3000 }, + { 0x8702, 0xf8f0, 0x2000 }, + { 0x0702, 0xf8ef, 0x0000 }, + { 0x0702, 0xf8f1, 0x0000 }, + { 0x8702, 0xf8f4, 0x2000 }, + { 0x0702, 0xf8f3, 0x0000 }, + { 0x0702, 0xf8f5, 0x0000 }, + { 0x8702, 0xf936, 0x7000 }, + { 0x8702, 0xf916, 0x6000 }, + { 0x8702, 0xf906, 0x5000 }, + { 0x8702, 0xf8fe, 0x4000 }, + { 0x8702, 0xf8fa, 0x3000 }, + { 0x8702, 0xf8f8, 0x2000 }, + { 0x0702, 0xf8f7, 0x0000 }, + { 0x0702, 0xf8f9, 0x0000 }, + { 0x8702, 0xf8fc, 0x2000 }, + { 0x0702, 0xf8fb, 0x0000 }, + { 0x0702, 0xf8fd, 0x0000 }, + { 0x8702, 0xf902, 0x3000 }, + { 0x8702, 0xf900, 0x2000 }, + { 0x0702, 0xf8ff, 0x0000 }, + { 0x0702, 0xf901, 0x0000 }, + { 0x8702, 0xf904, 0x2000 }, + { 0x0702, 0xf903, 0x0000 }, + { 0x0702, 0xf905, 0x0000 }, + { 0x8702, 0xf90e, 0x4000 }, + { 0x8702, 0xf90a, 0x3000 }, + { 0x8702, 0xf908, 0x2000 }, + { 0x0702, 0xf907, 0x0000 }, + { 0x0702, 0xf909, 0x0000 }, + { 0x8702, 0xf90c, 0x2000 }, + { 0x0702, 0xf90b, 0x0000 }, + { 0x0702, 0xf90d, 0x0000 }, + { 0x8702, 0xf912, 0x3000 }, + { 0x8702, 0xf910, 0x2000 }, + { 0x0702, 0xf90f, 0x0000 }, + { 0x0702, 0xf911, 0x0000 }, + { 0x8702, 0xf914, 0x2000 }, + { 0x0702, 0xf913, 0x0000 }, + { 0x0702, 0xf915, 0x0000 }, + { 0x8702, 0xf926, 0x5000 }, + { 0x8702, 0xf91e, 0x4000 }, + { 0x8702, 0xf91a, 0x3000 }, + { 0x8702, 0xf918, 0x2000 }, + { 0x0702, 0xf917, 0x0000 }, + { 0x0702, 0xf919, 0x0000 }, + { 0x8702, 0xf91c, 0x2000 }, + { 0x0702, 0xf91b, 0x0000 }, + { 0x0702, 0xf91d, 0x0000 }, + { 0x8702, 0xf922, 0x3000 }, + { 0x8702, 0xf920, 0x2000 }, + { 0x0702, 0xf91f, 0x0000 }, + { 0x0702, 0xf921, 0x0000 }, + { 0x8702, 0xf924, 0x2000 }, + { 0x0702, 0xf923, 0x0000 }, + { 0x0702, 0xf925, 0x0000 }, + { 0x8702, 0xf92e, 0x4000 }, + { 0x8702, 0xf92a, 0x3000 }, + { 0x8702, 0xf928, 0x2000 }, + { 0x0702, 0xf927, 0x0000 }, + { 0x0702, 0xf929, 0x0000 }, + { 0x8702, 0xf92c, 0x2000 }, + { 0x0702, 0xf92b, 0x0000 }, + { 0x0702, 0xf92d, 0x0000 }, + { 0x8702, 0xf932, 0x3000 }, + { 0x8702, 0xf930, 0x2000 }, + { 0x0702, 0xf92f, 0x0000 }, + { 0x0702, 0xf931, 0x0000 }, + { 0x8702, 0xf934, 0x2000 }, + { 0x0702, 0xf933, 0x0000 }, + { 0x0702, 0xf935, 0x0000 }, + { 0x8702, 0xf956, 0x6000 }, + { 0x8702, 0xf946, 0x5000 }, + { 0x8702, 0xf93e, 0x4000 }, + { 0x8702, 0xf93a, 0x3000 }, + { 0x8702, 0xf938, 0x2000 }, + { 0x0702, 0xf937, 0x0000 }, + { 0x0702, 0xf939, 0x0000 }, + { 0x8702, 0xf93c, 0x2000 }, + { 0x0702, 0xf93b, 0x0000 }, + { 0x0702, 0xf93d, 0x0000 }, + { 0x8702, 0xf942, 0x3000 }, + { 0x8702, 0xf940, 0x2000 }, + { 0x0702, 0xf93f, 0x0000 }, + { 0x0702, 0xf941, 0x0000 }, + { 0x8702, 0xf944, 0x2000 }, + { 0x0702, 0xf943, 0x0000 }, + { 0x0702, 0xf945, 0x0000 }, + { 0x8702, 0xf94e, 0x4000 }, + { 0x8702, 0xf94a, 0x3000 }, + { 0x8702, 0xf948, 0x2000 }, + { 0x0702, 0xf947, 0x0000 }, + { 0x0702, 0xf949, 0x0000 }, + { 0x8702, 0xf94c, 0x2000 }, + { 0x0702, 0xf94b, 0x0000 }, + { 0x0702, 0xf94d, 0x0000 }, + { 0x8702, 0xf952, 0x3000 }, + { 0x8702, 0xf950, 0x2000 }, + { 0x0702, 0xf94f, 0x0000 }, + { 0x0702, 0xf951, 0x0000 }, + { 0x8702, 0xf954, 0x2000 }, + { 0x0702, 0xf953, 0x0000 }, + { 0x0702, 0xf955, 0x0000 }, + { 0x8702, 0xf966, 0x5000 }, + { 0x8702, 0xf95e, 0x4000 }, + { 0x8702, 0xf95a, 0x3000 }, + { 0x8702, 0xf958, 0x2000 }, + { 0x0702, 0xf957, 0x0000 }, + { 0x0702, 0xf959, 0x0000 }, + { 0x8702, 0xf95c, 0x2000 }, + { 0x0702, 0xf95b, 0x0000 }, + { 0x0702, 0xf95d, 0x0000 }, + { 0x8702, 0xf962, 0x3000 }, + { 0x8702, 0xf960, 0x2000 }, + { 0x0702, 0xf95f, 0x0000 }, + { 0x0702, 0xf961, 0x0000 }, + { 0x8702, 0xf964, 0x2000 }, + { 0x0702, 0xf963, 0x0000 }, + { 0x0702, 0xf965, 0x0000 }, + { 0x8702, 0xf96e, 0x4000 }, + { 0x8702, 0xf96a, 0x3000 }, + { 0x8702, 0xf968, 0x2000 }, + { 0x0702, 0xf967, 0x0000 }, + { 0x0702, 0xf969, 0x0000 }, + { 0x8702, 0xf96c, 0x2000 }, + { 0x0702, 0xf96b, 0x0000 }, + { 0x0702, 0xf96d, 0x0000 }, + { 0x8702, 0xf972, 0x3000 }, + { 0x8702, 0xf970, 0x2000 }, + { 0x0702, 0xf96f, 0x0000 }, + { 0x0702, 0xf971, 0x0000 }, + { 0x8702, 0xf974, 0x2000 }, + { 0x0702, 0xf973, 0x0000 }, + { 0x0702, 0xf975, 0x0000 }, + { 0x810e, 0x0077, 0x9000 }, + { 0x8702, 0xf9f6, 0x8000 }, + { 0x8702, 0xf9b6, 0x7000 }, + { 0x8702, 0xf996, 0x6000 }, + { 0x8702, 0xf986, 0x5000 }, + { 0x8702, 0xf97e, 0x4000 }, + { 0x8702, 0xf97a, 0x3000 }, + { 0x8702, 0xf978, 0x2000 }, + { 0x0702, 0xf977, 0x0000 }, + { 0x0702, 0xf979, 0x0000 }, + { 0x8702, 0xf97c, 0x2000 }, + { 0x0702, 0xf97b, 0x0000 }, + { 0x0702, 0xf97d, 0x0000 }, + { 0x8702, 0xf982, 0x3000 }, + { 0x8702, 0xf980, 0x2000 }, + { 0x0702, 0xf97f, 0x0000 }, + { 0x0702, 0xf981, 0x0000 }, + { 0x8702, 0xf984, 0x2000 }, + { 0x0702, 0xf983, 0x0000 }, + { 0x0702, 0xf985, 0x0000 }, + { 0x8702, 0xf98e, 0x4000 }, + { 0x8702, 0xf98a, 0x3000 }, + { 0x8702, 0xf988, 0x2000 }, + { 0x0702, 0xf987, 0x0000 }, + { 0x0702, 0xf989, 0x0000 }, + { 0x8702, 0xf98c, 0x2000 }, + { 0x0702, 0xf98b, 0x0000 }, + { 0x0702, 0xf98d, 0x0000 }, + { 0x8702, 0xf992, 0x3000 }, + { 0x8702, 0xf990, 0x2000 }, + { 0x0702, 0xf98f, 0x0000 }, + { 0x0702, 0xf991, 0x0000 }, + { 0x8702, 0xf994, 0x2000 }, + { 0x0702, 0xf993, 0x0000 }, + { 0x0702, 0xf995, 0x0000 }, + { 0x8702, 0xf9a6, 0x5000 }, + { 0x8702, 0xf99e, 0x4000 }, + { 0x8702, 0xf99a, 0x3000 }, + { 0x8702, 0xf998, 0x2000 }, + { 0x0702, 0xf997, 0x0000 }, + { 0x0702, 0xf999, 0x0000 }, + { 0x8702, 0xf99c, 0x2000 }, + { 0x0702, 0xf99b, 0x0000 }, + { 0x0702, 0xf99d, 0x0000 }, + { 0x8702, 0xf9a2, 0x3000 }, + { 0x8702, 0xf9a0, 0x2000 }, + { 0x0702, 0xf99f, 0x0000 }, + { 0x0702, 0xf9a1, 0x0000 }, + { 0x8702, 0xf9a4, 0x2000 }, + { 0x0702, 0xf9a3, 0x0000 }, + { 0x0702, 0xf9a5, 0x0000 }, + { 0x8702, 0xf9ae, 0x4000 }, + { 0x8702, 0xf9aa, 0x3000 }, + { 0x8702, 0xf9a8, 0x2000 }, + { 0x0702, 0xf9a7, 0x0000 }, + { 0x0702, 0xf9a9, 0x0000 }, + { 0x8702, 0xf9ac, 0x2000 }, + { 0x0702, 0xf9ab, 0x0000 }, + { 0x0702, 0xf9ad, 0x0000 }, + { 0x8702, 0xf9b2, 0x3000 }, + { 0x8702, 0xf9b0, 0x2000 }, + { 0x0702, 0xf9af, 0x0000 }, + { 0x0702, 0xf9b1, 0x0000 }, + { 0x8702, 0xf9b4, 0x2000 }, + { 0x0702, 0xf9b3, 0x0000 }, + { 0x0702, 0xf9b5, 0x0000 }, + { 0x8702, 0xf9d6, 0x6000 }, + { 0x8702, 0xf9c6, 0x5000 }, + { 0x8702, 0xf9be, 0x4000 }, + { 0x8702, 0xf9ba, 0x3000 }, + { 0x8702, 0xf9b8, 0x2000 }, + { 0x0702, 0xf9b7, 0x0000 }, + { 0x0702, 0xf9b9, 0x0000 }, + { 0x8702, 0xf9bc, 0x2000 }, + { 0x0702, 0xf9bb, 0x0000 }, + { 0x0702, 0xf9bd, 0x0000 }, + { 0x8702, 0xf9c2, 0x3000 }, + { 0x8702, 0xf9c0, 0x2000 }, + { 0x0702, 0xf9bf, 0x0000 }, + { 0x0702, 0xf9c1, 0x0000 }, + { 0x8702, 0xf9c4, 0x2000 }, + { 0x0702, 0xf9c3, 0x0000 }, + { 0x0702, 0xf9c5, 0x0000 }, + { 0x8702, 0xf9ce, 0x4000 }, + { 0x8702, 0xf9ca, 0x3000 }, + { 0x8702, 0xf9c8, 0x2000 }, + { 0x0702, 0xf9c7, 0x0000 }, + { 0x0702, 0xf9c9, 0x0000 }, + { 0x8702, 0xf9cc, 0x2000 }, + { 0x0702, 0xf9cb, 0x0000 }, + { 0x0702, 0xf9cd, 0x0000 }, + { 0x8702, 0xf9d2, 0x3000 }, + { 0x8702, 0xf9d0, 0x2000 }, + { 0x0702, 0xf9cf, 0x0000 }, + { 0x0702, 0xf9d1, 0x0000 }, + { 0x8702, 0xf9d4, 0x2000 }, + { 0x0702, 0xf9d3, 0x0000 }, + { 0x0702, 0xf9d5, 0x0000 }, + { 0x8702, 0xf9e6, 0x5000 }, + { 0x8702, 0xf9de, 0x4000 }, + { 0x8702, 0xf9da, 0x3000 }, + { 0x8702, 0xf9d8, 0x2000 }, + { 0x0702, 0xf9d7, 0x0000 }, + { 0x0702, 0xf9d9, 0x0000 }, + { 0x8702, 0xf9dc, 0x2000 }, + { 0x0702, 0xf9db, 0x0000 }, + { 0x0702, 0xf9dd, 0x0000 }, + { 0x8702, 0xf9e2, 0x3000 }, + { 0x8702, 0xf9e0, 0x2000 }, + { 0x0702, 0xf9df, 0x0000 }, + { 0x0702, 0xf9e1, 0x0000 }, + { 0x8702, 0xf9e4, 0x2000 }, + { 0x0702, 0xf9e3, 0x0000 }, + { 0x0702, 0xf9e5, 0x0000 }, + { 0x8702, 0xf9ee, 0x4000 }, + { 0x8702, 0xf9ea, 0x3000 }, + { 0x8702, 0xf9e8, 0x2000 }, + { 0x0702, 0xf9e7, 0x0000 }, + { 0x0702, 0xf9e9, 0x0000 }, + { 0x8702, 0xf9ec, 0x2000 }, + { 0x0702, 0xf9eb, 0x0000 }, + { 0x0702, 0xf9ed, 0x0000 }, + { 0x8702, 0xf9f2, 0x3000 }, + { 0x8702, 0xf9f0, 0x2000 }, + { 0x0702, 0xf9ef, 0x0000 }, + { 0x0702, 0xf9f1, 0x0000 }, + { 0x8702, 0xf9f4, 0x2000 }, + { 0x0702, 0xf9f3, 0x0000 }, + { 0x0702, 0xf9f5, 0x0000 }, + { 0x810e, 0x0037, 0x7000 }, + { 0x8702, 0xfa16, 0x6000 }, + { 0x8702, 0xfa06, 0x5000 }, + { 0x8702, 0xf9fe, 0x4000 }, + { 0x8702, 0xf9fa, 0x3000 }, + { 0x8702, 0xf9f8, 0x2000 }, + { 0x0702, 0xf9f7, 0x0000 }, + { 0x0702, 0xf9f9, 0x0000 }, + { 0x8702, 0xf9fc, 0x2000 }, + { 0x0702, 0xf9fb, 0x0000 }, + { 0x0702, 0xf9fd, 0x0000 }, + { 0x8702, 0xfa02, 0x3000 }, + { 0x8702, 0xfa00, 0x2000 }, + { 0x0702, 0xf9ff, 0x0000 }, + { 0x0702, 0xfa01, 0x0000 }, + { 0x8702, 0xfa04, 0x2000 }, + { 0x0702, 0xfa03, 0x0000 }, + { 0x0702, 0xfa05, 0x0000 }, + { 0x8702, 0xfa0e, 0x4000 }, + { 0x8702, 0xfa0a, 0x3000 }, + { 0x8702, 0xfa08, 0x2000 }, + { 0x0702, 0xfa07, 0x0000 }, + { 0x0702, 0xfa09, 0x0000 }, + { 0x8702, 0xfa0c, 0x2000 }, + { 0x0702, 0xfa0b, 0x0000 }, + { 0x0702, 0xfa0d, 0x0000 }, + { 0x8702, 0xfa12, 0x3000 }, + { 0x8702, 0xfa10, 0x2000 }, + { 0x0702, 0xfa0f, 0x0000 }, + { 0x0702, 0xfa11, 0x0000 }, + { 0x8702, 0xfa14, 0x2000 }, + { 0x0702, 0xfa13, 0x0000 }, + { 0x0702, 0xfa15, 0x0000 }, + { 0x810e, 0x0027, 0x5000 }, + { 0x810e, 0x0001, 0x4000 }, + { 0x8702, 0xfa1a, 0x3000 }, + { 0x8702, 0xfa18, 0x2000 }, + { 0x0702, 0xfa17, 0x0000 }, + { 0x0702, 0xfa19, 0x0000 }, + { 0x8702, 0xfa1c, 0x2000 }, + { 0x0702, 0xfa1b, 0x0000 }, + { 0x0702, 0xfa1d, 0x0000 }, + { 0x810e, 0x0023, 0x3000 }, + { 0x810e, 0x0021, 0x2000 }, + { 0x010e, 0x0020, 0x0000 }, + { 0x010e, 0x0022, 0x0000 }, + { 0x810e, 0x0025, 0x2000 }, + { 0x010e, 0x0024, 0x0000 }, + { 0x010e, 0x0026, 0x0000 }, + { 0x810e, 0x002f, 0x4000 }, + { 0x810e, 0x002b, 0x3000 }, + { 0x810e, 0x0029, 0x2000 }, + { 0x010e, 0x0028, 0x0000 }, + { 0x010e, 0x002a, 0x0000 }, + { 0x810e, 0x002d, 0x2000 }, + { 0x010e, 0x002c, 0x0000 }, + { 0x010e, 0x002e, 0x0000 }, + { 0x810e, 0x0033, 0x3000 }, + { 0x810e, 0x0031, 0x2000 }, + { 0x010e, 0x0030, 0x0000 }, + { 0x010e, 0x0032, 0x0000 }, + { 0x810e, 0x0035, 0x2000 }, + { 0x010e, 0x0034, 0x0000 }, + { 0x010e, 0x0036, 0x0000 }, + { 0x810e, 0x0057, 0x6000 }, + { 0x810e, 0x0047, 0x5000 }, + { 0x810e, 0x003f, 0x4000 }, + { 0x810e, 0x003b, 0x3000 }, + { 0x810e, 0x0039, 0x2000 }, + { 0x010e, 0x0038, 0x0000 }, + { 0x010e, 0x003a, 0x0000 }, + { 0x810e, 0x003d, 0x2000 }, + { 0x010e, 0x003c, 0x0000 }, + { 0x010e, 0x003e, 0x0000 }, + { 0x810e, 0x0043, 0x3000 }, + { 0x810e, 0x0041, 0x2000 }, + { 0x010e, 0x0040, 0x0000 }, + { 0x010e, 0x0042, 0x0000 }, + { 0x810e, 0x0045, 0x2000 }, + { 0x010e, 0x0044, 0x0000 }, + { 0x010e, 0x0046, 0x0000 }, + { 0x810e, 0x004f, 0x4000 }, + { 0x810e, 0x004b, 0x3000 }, + { 0x810e, 0x0049, 0x2000 }, + { 0x010e, 0x0048, 0x0000 }, + { 0x010e, 0x004a, 0x0000 }, + { 0x810e, 0x004d, 0x2000 }, + { 0x010e, 0x004c, 0x0000 }, + { 0x010e, 0x004e, 0x0000 }, + { 0x810e, 0x0053, 0x3000 }, + { 0x810e, 0x0051, 0x2000 }, + { 0x010e, 0x0050, 0x0000 }, + { 0x010e, 0x0052, 0x0000 }, + { 0x810e, 0x0055, 0x2000 }, + { 0x010e, 0x0054, 0x0000 }, + { 0x010e, 0x0056, 0x0000 }, + { 0x810e, 0x0067, 0x5000 }, + { 0x810e, 0x005f, 0x4000 }, + { 0x810e, 0x005b, 0x3000 }, + { 0x810e, 0x0059, 0x2000 }, + { 0x010e, 0x0058, 0x0000 }, + { 0x010e, 0x005a, 0x0000 }, + { 0x810e, 0x005d, 0x2000 }, + { 0x010e, 0x005c, 0x0000 }, + { 0x010e, 0x005e, 0x0000 }, + { 0x810e, 0x0063, 0x3000 }, + { 0x810e, 0x0061, 0x2000 }, + { 0x010e, 0x0060, 0x0000 }, + { 0x010e, 0x0062, 0x0000 }, + { 0x810e, 0x0065, 0x2000 }, + { 0x010e, 0x0064, 0x0000 }, + { 0x010e, 0x0066, 0x0000 }, + { 0x810e, 0x006f, 0x4000 }, + { 0x810e, 0x006b, 0x3000 }, + { 0x810e, 0x0069, 0x2000 }, + { 0x010e, 0x0068, 0x0000 }, + { 0x010e, 0x006a, 0x0000 }, + { 0x810e, 0x006d, 0x2000 }, + { 0x010e, 0x006c, 0x0000 }, + { 0x010e, 0x006e, 0x0000 }, + { 0x810e, 0x0073, 0x3000 }, + { 0x810e, 0x0071, 0x2000 }, + { 0x010e, 0x0070, 0x0000 }, + { 0x010e, 0x0072, 0x0000 }, + { 0x810e, 0x0075, 0x2000 }, + { 0x010e, 0x0074, 0x0000 }, + { 0x010e, 0x0076, 0x0000 }, + { 0x8c0e, 0x0177, 0x8000 }, + { 0x8c0e, 0x0137, 0x7000 }, + { 0x8c0e, 0x0117, 0x6000 }, + { 0x8c0e, 0x0107, 0x5000 }, + { 0x810e, 0x007f, 0x4000 }, + { 0x810e, 0x007b, 0x3000 }, + { 0x810e, 0x0079, 0x2000 }, + { 0x010e, 0x0078, 0x0000 }, + { 0x010e, 0x007a, 0x0000 }, + { 0x810e, 0x007d, 0x2000 }, + { 0x010e, 0x007c, 0x0000 }, + { 0x010e, 0x007e, 0x0000 }, + { 0x8c0e, 0x0103, 0x3000 }, + { 0x8c0e, 0x0101, 0x2000 }, + { 0x0c0e, 0x0100, 0x0000 }, + { 0x0c0e, 0x0102, 0x0000 }, + { 0x8c0e, 0x0105, 0x2000 }, + { 0x0c0e, 0x0104, 0x0000 }, + { 0x0c0e, 0x0106, 0x0000 }, + { 0x8c0e, 0x010f, 0x4000 }, + { 0x8c0e, 0x010b, 0x3000 }, + { 0x8c0e, 0x0109, 0x2000 }, + { 0x0c0e, 0x0108, 0x0000 }, + { 0x0c0e, 0x010a, 0x0000 }, + { 0x8c0e, 0x010d, 0x2000 }, + { 0x0c0e, 0x010c, 0x0000 }, + { 0x0c0e, 0x010e, 0x0000 }, + { 0x8c0e, 0x0113, 0x3000 }, + { 0x8c0e, 0x0111, 0x2000 }, + { 0x0c0e, 0x0110, 0x0000 }, + { 0x0c0e, 0x0112, 0x0000 }, + { 0x8c0e, 0x0115, 0x2000 }, + { 0x0c0e, 0x0114, 0x0000 }, + { 0x0c0e, 0x0116, 0x0000 }, + { 0x8c0e, 0x0127, 0x5000 }, + { 0x8c0e, 0x011f, 0x4000 }, + { 0x8c0e, 0x011b, 0x3000 }, + { 0x8c0e, 0x0119, 0x2000 }, + { 0x0c0e, 0x0118, 0x0000 }, + { 0x0c0e, 0x011a, 0x0000 }, + { 0x8c0e, 0x011d, 0x2000 }, + { 0x0c0e, 0x011c, 0x0000 }, + { 0x0c0e, 0x011e, 0x0000 }, + { 0x8c0e, 0x0123, 0x3000 }, + { 0x8c0e, 0x0121, 0x2000 }, + { 0x0c0e, 0x0120, 0x0000 }, + { 0x0c0e, 0x0122, 0x0000 }, + { 0x8c0e, 0x0125, 0x2000 }, + { 0x0c0e, 0x0124, 0x0000 }, + { 0x0c0e, 0x0126, 0x0000 }, + { 0x8c0e, 0x012f, 0x4000 }, + { 0x8c0e, 0x012b, 0x3000 }, + { 0x8c0e, 0x0129, 0x2000 }, + { 0x0c0e, 0x0128, 0x0000 }, + { 0x0c0e, 0x012a, 0x0000 }, + { 0x8c0e, 0x012d, 0x2000 }, + { 0x0c0e, 0x012c, 0x0000 }, + { 0x0c0e, 0x012e, 0x0000 }, + { 0x8c0e, 0x0133, 0x3000 }, + { 0x8c0e, 0x0131, 0x2000 }, + { 0x0c0e, 0x0130, 0x0000 }, + { 0x0c0e, 0x0132, 0x0000 }, + { 0x8c0e, 0x0135, 0x2000 }, + { 0x0c0e, 0x0134, 0x0000 }, + { 0x0c0e, 0x0136, 0x0000 }, + { 0x8c0e, 0x0157, 0x6000 }, + { 0x8c0e, 0x0147, 0x5000 }, + { 0x8c0e, 0x013f, 0x4000 }, + { 0x8c0e, 0x013b, 0x3000 }, + { 0x8c0e, 0x0139, 0x2000 }, + { 0x0c0e, 0x0138, 0x0000 }, + { 0x0c0e, 0x013a, 0x0000 }, + { 0x8c0e, 0x013d, 0x2000 }, + { 0x0c0e, 0x013c, 0x0000 }, + { 0x0c0e, 0x013e, 0x0000 }, + { 0x8c0e, 0x0143, 0x3000 }, + { 0x8c0e, 0x0141, 0x2000 }, + { 0x0c0e, 0x0140, 0x0000 }, + { 0x0c0e, 0x0142, 0x0000 }, + { 0x8c0e, 0x0145, 0x2000 }, + { 0x0c0e, 0x0144, 0x0000 }, + { 0x0c0e, 0x0146, 0x0000 }, + { 0x8c0e, 0x014f, 0x4000 }, + { 0x8c0e, 0x014b, 0x3000 }, + { 0x8c0e, 0x0149, 0x2000 }, + { 0x0c0e, 0x0148, 0x0000 }, + { 0x0c0e, 0x014a, 0x0000 }, + { 0x8c0e, 0x014d, 0x2000 }, + { 0x0c0e, 0x014c, 0x0000 }, + { 0x0c0e, 0x014e, 0x0000 }, + { 0x8c0e, 0x0153, 0x3000 }, + { 0x8c0e, 0x0151, 0x2000 }, + { 0x0c0e, 0x0150, 0x0000 }, + { 0x0c0e, 0x0152, 0x0000 }, + { 0x8c0e, 0x0155, 0x2000 }, + { 0x0c0e, 0x0154, 0x0000 }, + { 0x0c0e, 0x0156, 0x0000 }, + { 0x8c0e, 0x0167, 0x5000 }, + { 0x8c0e, 0x015f, 0x4000 }, + { 0x8c0e, 0x015b, 0x3000 }, + { 0x8c0e, 0x0159, 0x2000 }, + { 0x0c0e, 0x0158, 0x0000 }, + { 0x0c0e, 0x015a, 0x0000 }, + { 0x8c0e, 0x015d, 0x2000 }, + { 0x0c0e, 0x015c, 0x0000 }, + { 0x0c0e, 0x015e, 0x0000 }, + { 0x8c0e, 0x0163, 0x3000 }, + { 0x8c0e, 0x0161, 0x2000 }, + { 0x0c0e, 0x0160, 0x0000 }, + { 0x0c0e, 0x0162, 0x0000 }, + { 0x8c0e, 0x0165, 0x2000 }, + { 0x0c0e, 0x0164, 0x0000 }, + { 0x0c0e, 0x0166, 0x0000 }, + { 0x8c0e, 0x016f, 0x4000 }, + { 0x8c0e, 0x016b, 0x3000 }, + { 0x8c0e, 0x0169, 0x2000 }, + { 0x0c0e, 0x0168, 0x0000 }, + { 0x0c0e, 0x016a, 0x0000 }, + { 0x8c0e, 0x016d, 0x2000 }, + { 0x0c0e, 0x016c, 0x0000 }, + { 0x0c0e, 0x016e, 0x0000 }, + { 0x8c0e, 0x0173, 0x3000 }, + { 0x8c0e, 0x0171, 0x2000 }, + { 0x0c0e, 0x0170, 0x0000 }, + { 0x0c0e, 0x0172, 0x0000 }, + { 0x8c0e, 0x0175, 0x2000 }, + { 0x0c0e, 0x0174, 0x0000 }, + { 0x0c0e, 0x0176, 0x0000 }, + { 0x8c0e, 0x01b7, 0x7000 }, + { 0x8c0e, 0x0197, 0x6000 }, + { 0x8c0e, 0x0187, 0x5000 }, + { 0x8c0e, 0x017f, 0x4000 }, + { 0x8c0e, 0x017b, 0x3000 }, + { 0x8c0e, 0x0179, 0x2000 }, + { 0x0c0e, 0x0178, 0x0000 }, + { 0x0c0e, 0x017a, 0x0000 }, + { 0x8c0e, 0x017d, 0x2000 }, + { 0x0c0e, 0x017c, 0x0000 }, + { 0x0c0e, 0x017e, 0x0000 }, + { 0x8c0e, 0x0183, 0x3000 }, + { 0x8c0e, 0x0181, 0x2000 }, + { 0x0c0e, 0x0180, 0x0000 }, + { 0x0c0e, 0x0182, 0x0000 }, + { 0x8c0e, 0x0185, 0x2000 }, + { 0x0c0e, 0x0184, 0x0000 }, + { 0x0c0e, 0x0186, 0x0000 }, + { 0x8c0e, 0x018f, 0x4000 }, + { 0x8c0e, 0x018b, 0x3000 }, + { 0x8c0e, 0x0189, 0x2000 }, + { 0x0c0e, 0x0188, 0x0000 }, + { 0x0c0e, 0x018a, 0x0000 }, + { 0x8c0e, 0x018d, 0x2000 }, + { 0x0c0e, 0x018c, 0x0000 }, + { 0x0c0e, 0x018e, 0x0000 }, + { 0x8c0e, 0x0193, 0x3000 }, + { 0x8c0e, 0x0191, 0x2000 }, + { 0x0c0e, 0x0190, 0x0000 }, + { 0x0c0e, 0x0192, 0x0000 }, + { 0x8c0e, 0x0195, 0x2000 }, + { 0x0c0e, 0x0194, 0x0000 }, + { 0x0c0e, 0x0196, 0x0000 }, + { 0x8c0e, 0x01a7, 0x5000 }, + { 0x8c0e, 0x019f, 0x4000 }, + { 0x8c0e, 0x019b, 0x3000 }, + { 0x8c0e, 0x0199, 0x2000 }, + { 0x0c0e, 0x0198, 0x0000 }, + { 0x0c0e, 0x019a, 0x0000 }, + { 0x8c0e, 0x019d, 0x2000 }, + { 0x0c0e, 0x019c, 0x0000 }, + { 0x0c0e, 0x019e, 0x0000 }, + { 0x8c0e, 0x01a3, 0x3000 }, + { 0x8c0e, 0x01a1, 0x2000 }, + { 0x0c0e, 0x01a0, 0x0000 }, + { 0x0c0e, 0x01a2, 0x0000 }, + { 0x8c0e, 0x01a5, 0x2000 }, + { 0x0c0e, 0x01a4, 0x0000 }, + { 0x0c0e, 0x01a6, 0x0000 }, + { 0x8c0e, 0x01af, 0x4000 }, + { 0x8c0e, 0x01ab, 0x3000 }, + { 0x8c0e, 0x01a9, 0x2000 }, + { 0x0c0e, 0x01a8, 0x0000 }, + { 0x0c0e, 0x01aa, 0x0000 }, + { 0x8c0e, 0x01ad, 0x2000 }, + { 0x0c0e, 0x01ac, 0x0000 }, + { 0x0c0e, 0x01ae, 0x0000 }, + { 0x8c0e, 0x01b3, 0x3000 }, + { 0x8c0e, 0x01b1, 0x2000 }, + { 0x0c0e, 0x01b0, 0x0000 }, + { 0x0c0e, 0x01b2, 0x0000 }, + { 0x8c0e, 0x01b5, 0x2000 }, + { 0x0c0e, 0x01b4, 0x0000 }, + { 0x0c0e, 0x01b6, 0x0000 }, + { 0x8c0e, 0x01d7, 0x6000 }, + { 0x8c0e, 0x01c7, 0x5000 }, + { 0x8c0e, 0x01bf, 0x4000 }, + { 0x8c0e, 0x01bb, 0x3000 }, + { 0x8c0e, 0x01b9, 0x2000 }, + { 0x0c0e, 0x01b8, 0x0000 }, + { 0x0c0e, 0x01ba, 0x0000 }, + { 0x8c0e, 0x01bd, 0x2000 }, + { 0x0c0e, 0x01bc, 0x0000 }, + { 0x0c0e, 0x01be, 0x0000 }, + { 0x8c0e, 0x01c3, 0x3000 }, + { 0x8c0e, 0x01c1, 0x2000 }, + { 0x0c0e, 0x01c0, 0x0000 }, + { 0x0c0e, 0x01c2, 0x0000 }, + { 0x8c0e, 0x01c5, 0x2000 }, + { 0x0c0e, 0x01c4, 0x0000 }, + { 0x0c0e, 0x01c6, 0x0000 }, + { 0x8c0e, 0x01cf, 0x4000 }, + { 0x8c0e, 0x01cb, 0x3000 }, + { 0x8c0e, 0x01c9, 0x2000 }, + { 0x0c0e, 0x01c8, 0x0000 }, + { 0x0c0e, 0x01ca, 0x0000 }, + { 0x8c0e, 0x01cd, 0x2000 }, + { 0x0c0e, 0x01cc, 0x0000 }, + { 0x0c0e, 0x01ce, 0x0000 }, + { 0x8c0e, 0x01d3, 0x3000 }, + { 0x8c0e, 0x01d1, 0x2000 }, + { 0x0c0e, 0x01d0, 0x0000 }, + { 0x0c0e, 0x01d2, 0x0000 }, + { 0x8c0e, 0x01d5, 0x2000 }, + { 0x0c0e, 0x01d4, 0x0000 }, + { 0x0c0e, 0x01d6, 0x0000 }, + { 0x8c0e, 0x01e7, 0x5000 }, + { 0x8c0e, 0x01df, 0x4000 }, + { 0x8c0e, 0x01db, 0x3000 }, + { 0x8c0e, 0x01d9, 0x2000 }, + { 0x0c0e, 0x01d8, 0x0000 }, + { 0x0c0e, 0x01da, 0x0000 }, + { 0x8c0e, 0x01dd, 0x2000 }, + { 0x0c0e, 0x01dc, 0x0000 }, + { 0x0c0e, 0x01de, 0x0000 }, + { 0x8c0e, 0x01e3, 0x3000 }, + { 0x8c0e, 0x01e1, 0x2000 }, + { 0x0c0e, 0x01e0, 0x0000 }, + { 0x0c0e, 0x01e2, 0x0000 }, + { 0x8c0e, 0x01e5, 0x2000 }, + { 0x0c0e, 0x01e4, 0x0000 }, + { 0x0c0e, 0x01e6, 0x0000 }, + { 0x8c0e, 0x01ef, 0x4000 }, + { 0x8c0e, 0x01eb, 0x3000 }, + { 0x8c0e, 0x01e9, 0x2000 }, + { 0x0c0e, 0x01e8, 0x0000 }, + { 0x0c0e, 0x01ea, 0x0000 }, + { 0x8c0e, 0x01ed, 0x2000 }, + { 0x0c0e, 0x01ec, 0x0000 }, + { 0x0c0e, 0x01ee, 0x0000 }, + { 0x830f, 0xfffd, 0x2000 }, + { 0x030f, 0x0000, 0x0000 }, + { 0x0310, 0x0000, 0x1000 }, + { 0x0310, 0xfffd, 0x0000 }, +}; diff -Nurp tin-1.7.6/pcre/ucptypetable.c tin-1.7.7/pcre/ucptypetable.c --- tin-1.7.6/pcre/ucptypetable.c 1970-01-01 01:00:00.000000000 +0100 +++ tin-1.7.7/pcre/ucptypetable.c 2004-11-15 18:44:38.000000000 +0100 @@ -0,0 +1,93 @@ +/************************************************* +* Perl-Compatible Regular Expressions * +*************************************************/ + +/* +This is a library of functions to support regular expressions whose syntax +and semantics are as close as possible to those of the Perl 5 language. See +the file Tech.Notes for some information on the internals. + +Written by: Philip Hazel + + Copyright (c) 1997-2004 University of Cambridge + +----------------------------------------------------------------------------- +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of Cambridge nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +----------------------------------------------------------------------------- +*/ + +/* This module contains a table for translating Unicode property names into +code values for the ucp_findchar function. It is in a separate module so that +it can be included both in the main pcre library, and into pcretest (for +printing out internals). */ + +typedef struct { + const char *name; + int value; +} ucp_type_table; + +static ucp_type_table utt[] = { + { "C", 128 + ucp_C }, + { "Cc", ucp_Cc }, + { "Cf", ucp_Cf }, + { "Cn", ucp_Cn }, + { "Co", ucp_Co }, + { "Cs", ucp_Cs }, + { "L", 128 + ucp_L }, + { "Ll", ucp_Ll }, + { "Lm", ucp_Lm }, + { "Lo", ucp_Lo }, + { "Lt", ucp_Lt }, + { "Lu", ucp_Lu }, + { "M", 128 + ucp_M }, + { "Mc", ucp_Mc }, + { "Me", ucp_Me }, + { "Mn", ucp_Mn }, + { "N", 128 + ucp_N }, + { "Nd", ucp_Nd }, + { "Nl", ucp_Nl }, + { "No", ucp_No }, + { "P", 128 + ucp_P }, + { "Pc", ucp_Pc }, + { "Pd", ucp_Pd }, + { "Pe", ucp_Pe }, + { "Pf", ucp_Pf }, + { "Pi", ucp_Pi }, + { "Po", ucp_Po }, + { "Ps", ucp_Ps }, + { "S", 128 + ucp_S }, + { "Sc", ucp_Sc }, + { "Sk", ucp_Sk }, + { "Sm", ucp_Sm }, + { "So", ucp_So }, + { "Z", 128 + ucp_Z }, + { "Zl", ucp_Zl }, + { "Zp", ucp_Zp }, + { "Zs", ucp_Zs } +}; + +/* End of ucptypetable.c */ diff -Nurp tin-1.7.6/pcre/version.sh tin-1.7.7/pcre/version.sh --- tin-1.7.6/pcre/version.sh 2004-08-20 10:30:54.000000000 +0200 +++ tin-1.7.7/pcre/version.sh 2004-11-15 18:44:39.000000000 +0100 @@ -6,7 +6,7 @@ # digits for minor numbers less than 10. There are unlikely to be # that many releases anyway. -PCRE_MAJOR=4 -PCRE_MINOR=5 -PCRE_DATE=01-December-2003 +PCRE_MAJOR=5 +PCRE_MINOR=0 +PCRE_DATE=13-Sep-2004 PCRE_VERSION=${PCRE_MAJOR}.${PCRE_MINOR} Binary files tin-1.7.6/po/de.gmo and tin-1.7.7/po/de.gmo differ diff -Nurp tin-1.7.6/po/de.po tin-1.7.7/po/de.po --- tin-1.7.6/po/de.po 2004-09-06 10:42:12.000000000 +0200 +++ tin-1.7.7/po/de.po 2004-12-15 16:48:24.000000000 +0100 @@ -5,8 +5,8 @@ # Christian Garbs , 2003 # msgid "" -msgstr "Project-Id-Version: tin 1.7.6\n" - "POT-Creation-Date: 2004-09-06 10:40+0200\n" +msgstr "Project-Id-Version: tin 1.7.7\n" + "POT-Creation-Date: 2004-12-15 16:47+0100\n" "PO-Revision-Date: 2003-03-13 04:15+0200\n" "Last-Translator: Sven Hartge , Kai Bojens " "\n" @@ -282,7 +282,7 @@ msgstr "# in *binaries* Nachbearbeitung, msgid "# and set Followup-To: poster\n" msgstr "# und Antwort per EMail (Followup-To: poster) anfordern\n" -#: src/cook.c:814 +#: src/cook.c:494 msgid "(unknown)" msgstr "(unbekannt)" @@ -641,7 +641,7 @@ msgstr "Erzeuge die Datei 'active' für g msgid "Creating newsrc file...\n" msgstr "Erzeuge newsrc Datei...\n" -#: src/lang.c:127 src/lang.c:1121 +#: src/lang.c:127 src/lang.c:1140 msgid "Default" msgstr "Voreinstellung" @@ -1493,392 +1493,400 @@ msgid "save marked articles automaticall msgstr "speichert markierte Artikel automatisch ohne Nachfrage" #: src/lang.c:337 +msgid "scroll the screen one line down" +msgstr "Bildschirm eine Zeile nach oben schieben" + +#: src/lang.c:338 +msgid "scroll the screen one line up" +msgstr "Bildschirm eine Zeile nach unten schieben" + +#: src/lang.c:339 msgid "search for articles by author backwards" msgstr "sucht rückwärts nach Artikeln von Autor" -#: src/lang.c:338 +#: src/lang.c:340 msgid "search for articles by author forwards" msgstr "sucht vorwärts nach Artikeln von Autor" -#: src/lang.c:339 +#: src/lang.c:341 msgid "search all articles for a given string (this may take some time)" msgstr "sucht in allen Artikel nach vorgegebener Zeichenkette (kann dauern)" # TODO: formating -#: src/lang.c:340 +#: src/lang.c:342 msgid " \t (searches are case-insensitive and wrap around to all articles)" msgstr " \t (Suchen beachten Gross/Kleinschreibung nicht und laufen über den\n" " letzten Artikel hinaus zum ersten Artikel der Gruppe und von dort\n" " aus weiter.)" -#: src/lang.c:341 +#: src/lang.c:343 msgid "search for articles by Subject line backwards" msgstr "durchsucht Artikel rückwärts nach Subject Zeile" -#: src/lang.c:342 +#: src/lang.c:344 msgid "search for articles by Subject line forwards" msgstr "durchsucht Artikel vorwärts nach Subject Zeile" -#: src/lang.c:343 +#: src/lang.c:345 msgid "repeat last search" msgstr "letzte Suche wiederholen" -#: src/lang.c:344 +#: src/lang.c:346 msgid "tag current article for reposting/mailing/piping/printing/saving" msgstr "markiere Artikel für nochmaliges posten/pipen/drucken/abspeichern" -#: src/lang.c:345 +#: src/lang.c:347 msgid "toggle info message in last line (subject/description)" msgstr "Anzeige von Subject/Beschreibung in d. letzten Zeile (de)aktivieren" -#: src/lang.c:346 +#: src/lang.c:348 msgid "toggle inverse video" msgstr "(de)aktiviert inverse Darstellung" -#: src/lang.c:347 +#: src/lang.c:349 msgid "toggle mini help menu display" msgstr "schaltet das Minihilfemenü ein/aus" -#: src/lang.c:348 +#: src/lang.c:350 msgid "cycle the display of authors email address, real name, both or neither" msgstr "Zeigt des Autors EMail Adresse, Realname, beides oder keins an" -#: src/lang.c:349 +#: src/lang.c:351 msgid "show version information" msgstr "zeige Versionsinformationen" -#: src/lang.c:350 +#: src/lang.c:352 msgid "mark all articles as read and return to group selection menu" msgstr "markiert alle Artikel als gelesen und kehrt zum Gruppenmenü zurück" -#: src/lang.c:351 +#: src/lang.c:353 msgid "mark all articles as read and enter next group with unread articles" msgstr "markiere Artikel gelesen; öffne nä. Gruppe mit ungelesenen Artikeln" -#: src/lang.c:352 +#: src/lang.c:354 msgid "choose first thread in list" msgstr "Wähle ersten Thread in der Liste" -#: src/lang.c:353 +#: src/lang.c:355 msgid "choose last thread in list" msgstr "Wähle letzten Thread in der Liste" -#: src/lang.c:354 +#: src/lang.c:356 msgid "list articles within current thread (bring up Thread sub-menu)" msgstr "listet Artikel im aktuellen Thread (öffnet das Thread Untermenü)" -#: src/lang.c:355 +#: src/lang.c:357 msgid "mark article as unread" msgstr "markiert Artikel als ungelesen" -#: src/lang.c:356 +#: src/lang.c:358 msgid "mark current thread or tagged threads as read" msgstr "markiert den aktuellen Thread oder markierte Artikel als gelesen" -#: src/lang.c:357 +#: src/lang.c:359 msgid "mark thread as unread" msgstr "markiert den aktuellen Thread als ungelesen" -#: src/lang.c:358 +#: src/lang.c:360 msgid "toggle display of all/selected articles" msgstr "wechselt zwischen der Anzeige aller/markierter (hot) Artikel" -#: src/lang.c:359 +#: src/lang.c:361 msgid "display next group" msgstr "zeige nächste Gruppe" -#: src/lang.c:360 +#: src/lang.c:362 msgid "display previous group" msgstr "zeige vorhergehende Gruppe" -#: src/lang.c:361 +#: src/lang.c:363 msgid "toggle all selections (all articles)" msgstr "Markierung 'hot'/wichtig für alle Artikel umschalten" -#: src/lang.c:362 +#: src/lang.c:364 msgid "select group (make \"hot\")" msgstr "Markierung 'hot'/wichtig für Gruppe setzen" -#: src/lang.c:363 +#: src/lang.c:365 msgid "select thread" msgstr "Markierung 'hot'/wichtig für Thread setzen" # TODO: formating -#: src/lang.c:364 +#: src/lang.c:366 msgid "select threads if at least one unread article is selected" msgstr "Markierung 'hot'/wichtig für alle Threads setzen, die schon einen\n" " ungelesenen Artikel mit Markierung 'hot'/wichtig enthalten." # TODO: formating -#: src/lang.c:365 +#: src/lang.c:367 msgid "select threads that match user specified pattern" msgstr "Markierung 'hot'/wichtig für alle Threads setzen, die einem\n" " gewählten Muster entsprechen" -#: src/lang.c:366 +#: src/lang.c:368 msgid "tag all parts of current multipart-message in order" msgstr "markiert alle Teile der multipart-Nachrichten in der Reihenfolge" -#: src/lang.c:367 +#: src/lang.c:369 msgid "0 - 9\t choose thread by number" msgstr "0 - 9\t wählt Thread anhand der Nummer" -#: src/lang.c:368 +#: src/lang.c:370 msgid "toggle limit number of articles to get, and reload" msgstr "Anzahl der zu holenden oder wieder zu ladenden Artikel ändern" -#: src/lang.c:369 +#: src/lang.c:371 msgid "toggle display of all/unread articles" msgstr "wechselt zwischen der Anzeige aller/ungelesener Artikel" -#: src/lang.c:370 +#: src/lang.c:372 msgid "toggle selection of thread" msgstr "Markierung 'hot'/wichtig für Thread setzen/entfernen" -#: src/lang.c:371 +#: src/lang.c:373 msgid "cycle through threading options available" msgstr "wechsle durch die verschiedenen Threading-Optionen" -#: src/lang.c:372 +#: src/lang.c:374 msgid "undo all selections (all articles)" msgstr "Markierung 'hot'/wichtig für alle Artikel entfernen" -#: src/lang.c:373 +#: src/lang.c:375 msgid "untag all tagged threads" msgstr "hebt die Markierung der markierten Artikel auf" -#: src/lang.c:374 +#: src/lang.c:376 msgid "mark all articles in group as read" msgstr "markiert alle Artikel der Gruppe als gelesen" -#: src/lang.c:375 +#: src/lang.c:377 msgid "mark all articles in group as read and move to next unread group" msgstr "markiert Gruppe als gelesen, springt zur nächsten mit ungel. Artikeln" -#: src/lang.c:376 +#: src/lang.c:378 msgid "choose first group in list" msgstr "Wähle erste Gruppe in der Liste" -#: src/lang.c:377 +#: src/lang.c:379 msgid "choose group by name" msgstr "Gruppe anhand des Namens auswählen" -#: src/lang.c:378 +#: src/lang.c:380 msgid "0 - 9\t choose group by number" msgstr "0 - 9\t wählt die Gruppe anhand der Nummer" -#: src/lang.c:379 +#: src/lang.c:381 msgid "choose range of groups to be affected by next command" msgstr "Bereich der Gruppen, die vom nächsten Kommando betroffen sind" -#: src/lang.c:380 +#: src/lang.c:382 msgid "choose last group in list" msgstr "Wähle letzte Gruppe in der Liste" -#: src/lang.c:381 +#: src/lang.c:383 msgid "mark all articles in chosen group unread" msgstr "markiert alle Artikel in der gewählten Gruppe als ungelesen" -#: src/lang.c:382 +#: src/lang.c:384 msgid "move chosen group within list" msgstr "bewegt die gewählte Gruppe innerhalb der Liste" -#: src/lang.c:383 +#: src/lang.c:385 msgid "choose next group with unread news" msgstr "wählt die nächste Gruppe mit ungelesenen Artikeln" -#: src/lang.c:384 src/lang.c:1168 +#: src/lang.c:386 src/lang.c:1187 msgid "quit" msgstr "Beenden" -#: src/lang.c:385 +#: src/lang.c:387 msgid "quit without saving configuration changes" msgstr "beenden ohne die Konfigurationsänderungen zu sichern" -#: src/lang.c:386 +#: src/lang.c:388 msgid "read chosen group" msgstr "liest ausgewählte Gruppe" -#: src/lang.c:387 +#: src/lang.c:389 msgid "reset .newsrc (all available articles in groups marked unread)" msgstr "setzt die .newsrc zurück (alle Artikel als gelesen markiert)" -#: src/lang.c:388 +#: src/lang.c:390 msgid "search backwards for a group name" msgstr "sucht rückwärts nach einem Gruppennamen" -#: src/lang.c:389 +#: src/lang.c:391 msgid " \t (all searches are case-insensitive and wrap around)" msgstr " \t (alle Suchen sind case-insensitive und beginnen am Ende von vorn)" -#: src/lang.c:390 +#: src/lang.c:392 msgid "search forwards for a group name" msgstr "suche vorwärts nach einer Gruppe" -#: src/lang.c:391 +#: src/lang.c:393 msgid "subscribe to chosen group" msgstr "abonniert ausgewählte Gruppe" -#: src/lang.c:392 +#: src/lang.c:394 msgid "subscribe to groups that match pattern" msgstr "abonniere Gruppen, die auf das Muster passen" -#: src/lang.c:393 +#: src/lang.c:395 msgid "reread active file to check for any new news" msgstr "lies die Datei 'active' neu ein, um nach neuen Artikeln zu suchen" -#: src/lang.c:394 +#: src/lang.c:396 msgid "toggle display of group name only or group name plus description" msgstr "Anzeige der Kurzbeschreibung der Gruppe (de)aktivieren." -#: src/lang.c:395 +#: src/lang.c:397 msgid "toggle display to show all/unread subscribed groups" msgstr "wechselt die Anzeige zwischen allen/ungelesenen abonnierten Gruppen" -#: src/lang.c:396 +#: src/lang.c:398 msgid "unsubscribe from chosen group" msgstr "bestellt ausgewählte Gruppe ab" -#: src/lang.c:397 +#: src/lang.c:399 msgid "unsubscribe from groups that match pattern" msgstr "bestelle Gruppen ab, die auf das Muster passen" -#: src/lang.c:398 +#: src/lang.c:400 msgid "sort the list of groups" msgstr "Liste der Gruppen sortieren" -#: src/lang.c:399 +#: src/lang.c:401 msgid "toggle display to show all/subscribed groups" msgstr "schaltet um zwischen der Anzeige aller/abonnierten Gruppen" -#: src/lang.c:400 +#: src/lang.c:402 msgid "0 - 9\t choose article by number" msgstr "0 - 9\t Wähle Artikel anhand der Nummer" -#: src/lang.c:401 +#: src/lang.c:403 msgid "mark thread as read and return to group index page" msgstr "markiert den Thread als gelesen und kehrt zum Gruppenindex zurück" -#: src/lang.c:402 +#: src/lang.c:404 msgid "mark thread as read and enter next unread thread or group" msgstr "markiert Thread als gelesen; nächster ungelesener Thread/Gruppe" -#: src/lang.c:403 +#: src/lang.c:405 msgid "choose first article in list" msgstr "wähle ersten Artikel in der Liste" -#: src/lang.c:404 +#: src/lang.c:406 msgid "choose last article in list" msgstr "wähle letzten Artikel in der Liste" -#: src/lang.c:405 +#: src/lang.c:407 msgid "mark article or tagged articles as read and move cursor to next unread article" msgstr "markiert Artikel als gelesen geht zum nächsten ungelesenen Artikel" -#: src/lang.c:406 +#: src/lang.c:408 msgid "read chosen article" msgstr "zeige gewählten Artikel" -#: src/lang.c:407 +#: src/lang.c:409 msgid "Display properties\n" "------------------" msgstr "Darstellungsoptionen\n" "--------------------" -#: src/lang.c:408 +#: src/lang.c:410 msgid "Miscellaneous\n" "-------------" msgstr "Verschiedenes\n" "-------------" -#: src/lang.c:409 +#: src/lang.c:411 msgid "Moving around\n" "-------------" msgstr "Position ändern\n" "---------------" -#: src/lang.c:410 +#: src/lang.c:412 msgid "Group/thread/article operations\n" "-------------------------------" msgstr "Gruppe/Thread/Artikel Kommandos\n" "-------------------------------" -#: src/lang.c:412 +#: src/lang.c:414 msgid "Group Level Commands" msgstr "Gruppenlevel Befehle" -#: src/lang.c:413 +#: src/lang.c:415 msgid "Kill filter added" msgstr "Killfilter hinzugefügt" -#: src/lang.c:414 +#: src/lang.c:416 msgid "Auto-selection filter added" msgstr "Automatischer Auswahlfilter hinzugefügt" -#: src/lang.c:415 +#: src/lang.c:417 msgid "All parts tagged" msgstr "Alle Teile markiert" -#: src/lang.c:416 +#: src/lang.c:418 msgid "Storing article for later posting" msgstr "Speichert Artikel, um ihn später zu posten" -#: src/lang.c:417 +#: src/lang.c:419 msgid "Please enter a valid character" msgstr "Bitte ein gültiges Zeichen eingeben" -#: src/lang.c:418 +#: src/lang.c:420 #, c-format msgid "Missing part #%d" msgstr "Teil Nummer %d fehlt." -#: src/lang.c:419 +#: src/lang.c:421 msgid "*** No postponed articles ***" msgstr "*** Keine zurückgelegten Artikel ***" -#: src/lang.c:420 +#: src/lang.c:422 msgid "Not a multi-part message" msgstr "Kein mehrteiliger Artikel" -#: src/lang.c:421 +#: src/lang.c:423 msgid "You are not subscribed to this group" msgstr "Sie haben diese Gruppe nicht abonniert" -#: src/lang.c:422 +#: src/lang.c:424 msgid "No previous expression" msgstr "Kein vorhergehender Ausdruck" -#: src/lang.c:423 +#: src/lang.c:425 msgid "Operation disabled in no-overwrite mode" msgstr "Ausführung nicht möglich im nicht-überschreiben Modus" #. TODO: replace hardcoded key-name in txt_info_postponed -#: src/lang.c:425 +#: src/lang.c:427 #, c-format msgid "%d postponed %s, reuse with ^O...\n" msgstr "%d zurückgelegte %s, hervorholen mit ^O...\n" -#: src/lang.c:426 +#: src/lang.c:428 msgid "X-Conversion-Note: multipart/alternative contents have been removed.\n" " To get the whole article, turn alternative handling OFF in the Option Menu\n" msgstr "X-Conversion-Note: multipart/alternative Inhalt wurde entfernt.\n" " Um das zu ändern, setzen Sie in der tinrc das alternative_handling auf OFF\n" -#: src/lang.c:428 +#: src/lang.c:430 #, c-format msgid "Save filename for %s/%s is a mailbox. Attachment not saved" msgstr "Dateiname für %s/%s ist eine Mailbox. Anhang nicht gespeichert" -#: src/lang.c:429 +#: src/lang.c:431 msgid "TeX2Iso encoded article" msgstr "TeX2Iso kodierter Artikel" -#: src/lang.c:430 +#: src/lang.c:432 msgid "incomplete " msgstr "unvollständige " #. TODO: replace hardcoded key-names -#: src/lang.c:432 +#: src/lang.c:434 #, c-format msgid "\n" "Welcome to %s, a full screen threaded Netnews reader. It can read news " @@ -1936,129 +1944,129 @@ msgstr "\n" "Bitte senden Sie Fehlerberichte und Kommentare mittels des 'R' Kommandos an\n" "%s.\n" -#: src/lang.c:448 +#: src/lang.c:450 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." msgstr "Ungültige From: %s Zeile. Lesen sie INSTALL nochmal." -#: src/lang.c:449 +#: src/lang.c:451 #, c-format msgid "Invalid Sender:-header %s" msgstr "Ungültiger Sender:-Header %s" -#: src/lang.c:450 +#: src/lang.c:452 msgid "Inverse video disabled" msgstr "Inverse Bilddarstellung abgestellt" -#: src/lang.c:451 +#: src/lang.c:453 msgid "Inverse video enabled" msgstr "Inverse Bilddarstellung eingeschaltet" -#: src/lang.c:453 +#: src/lang.c:455 #, c-format msgid "Missing definition for %s\n" msgstr "Fehlende Definition für %s\n" -#: src/lang.c:454 +#: src/lang.c:456 #, c-format msgid "Invalid key definition '%s'\n" msgstr "Ungültige Tastenbelegung '%s'\n" -#: src/lang.c:455 +#: src/lang.c:457 #, c-format msgid "Invalid keyname '%s'\n" msgstr "Ungültiger Tastenname '%s'\n" -#: src/lang.c:456 +#: src/lang.c:458 #, c-format msgid "Key '%s' is defined for both %s%s and %s%s\n" msgstr "Taste '%s' ist für %s%s und %s%s definiert\n" -#: src/lang.c:457 +#: src/lang.c:459 #, c-format msgid "Kill From: [%s] (y/n): " msgstr "Filter From: [%s] (j/n): " -#: src/lang.c:458 +#: src/lang.c:460 msgid "Kill Lines: (num): " msgstr "Filter Z.: (num): " -#: src/lang.c:459 +#: src/lang.c:461 msgid "Kill Article Menu" msgstr "Filter Menü (Kill, Bewertung/Score verringern)" -#: src/lang.c:460 +#: src/lang.c:462 #, c-format msgid "Kill Msg-Id: [%s] (f/l/o/n): " msgstr "Filter Msg-Id: [%s] (v/l/n/n): " -#: src/lang.c:461 +#: src/lang.c:463 msgid "Kill pattern scope : " msgstr "Filter nach Muster : " -#: src/lang.c:462 +#: src/lang.c:464 #, c-format msgid "Kill Subject: [%s] (y/n): " msgstr "Filter Subject:[%s] (j/n): " -#: src/lang.c:463 +#: src/lang.c:465 msgid "Kill text pattern : " msgstr "Filter Textmuster : " -#: src/lang.c:464 +#: src/lang.c:466 msgid "Kill time in days : " msgstr "Filterzeit in Tagen : " -#: src/lang.c:466 +#: src/lang.c:468 msgid "Last" msgstr "Letzte" -#: src/lang.c:467 +#: src/lang.c:469 msgid "-- Last response --" msgstr "-- Letzte Antwort --" -#: src/lang.c:468 +#: src/lang.c:470 #, c-format msgid "Lines %s " msgstr "Zeilen %s " -#: src/lang.c:470 +#: src/lang.c:472 msgid "Message-ID: line " msgstr "Message-ID: Zeile " -#: src/lang.c:472 +#: src/lang.c:474 msgid "mailbox " msgstr "Mailbox " -#: src/lang.c:473 +#: src/lang.c:475 #, c-format msgid "Mail article(s) to [%.*s]> " msgstr "Mailt Artikel an [%.*s]> " -#: src/lang.c:474 +#: src/lang.c:476 #, c-format msgid "Mailing log to %s\n" msgstr "Maile Log-Datei an %s\n" -#: src/lang.c:475 +#: src/lang.c:477 msgid "Mail bug report..." msgstr "Maile einen Fehlerbericht..." -#: src/lang.c:476 +#: src/lang.c:478 #, c-format msgid "Mail BUG REPORT to %s?" msgstr "Fehlerbericht an %s senden?" -#: src/lang.c:477 +#: src/lang.c:479 msgid "Mailed" msgstr "Gemailt" -#: src/lang.c:478 +#: src/lang.c:480 #, c-format msgid "Mailing to %s..." msgstr "Senden der Mail an %s..." -#: src/lang.c:479 +#: src/lang.c:481 msgid "# [Mail/Save] active file. Format is like news active file:\n" "# groupname max.artnum min.artnum /dir\n" "# The 4th field is the basedir (ie. ~/Mail or ~/News)\n" @@ -2068,283 +2076,283 @@ msgstr "# [Mail/Speicher] active-Datei. "# Das 4. Feld ist das Basisverzeichnis (z.B. ~/Mail oder ~/News)\n" "#\n" -#: src/lang.c:482 +#: src/lang.c:484 #, c-format msgid "%s marked as unread" msgstr "%s als ungelesen markiert" -#: src/lang.c:483 +#: src/lang.c:485 #, c-format msgid "Marked %d of %d tagged %s as read" msgstr "%d von %d %s als gelesen markiert" -#: src/lang.c:484 +#: src/lang.c:486 #, c-format msgid "Mark all articles as read%s?" msgstr "Alle Artikel als gelesen markieren%s?" -#: src/lang.c:485 +#: src/lang.c:487 #, c-format msgid "Mark %s=tagged articles, %s=current article, %s=quit: " msgstr "%s=markierte oder %s=aktuellen Artikel auf gelesen setzen. %s=Abbrechen: " -#: src/lang.c:486 +#: src/lang.c:488 #, c-format msgid "Mark group %s as read?" msgstr "Die Gruppe %s als gelesen markieren?" -#: src/lang.c:487 +#: src/lang.c:489 #, c-format msgid "Mark thread as read%s?" msgstr "Den Thread als gelesen markieren%s?" -#: src/lang.c:488 +#: src/lang.c:490 #, c-format msgid "Mark %s=tagged articles/threads, %s=current thread, %s=quit: " msgstr "%s=markierte oder %s=aktuellen Artikel/Thread auf gelesen setzen. " "%s=Abbrechen: " -#: src/lang.c:489 +#: src/lang.c:491 #, c-format msgid "Matching %s groups..." msgstr "Übereinstimmende %s Gruppen..." -#: src/lang.c:490 src/lang.c:494 +#: src/lang.c:492 src/lang.c:496 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "=Wähle n; %s=n. ungel.; %s=Suche; %s=Filter" -#: src/lang.c:491 +#: src/lang.c:493 #, c-format msgid "%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; %s=list " "thread" msgstr "%s=Autorsuche; %s=Catchup; %s=n. unten; %s=n. oben; %s=gelesen; %s=Thread anz." -#: src/lang.c:492 +#: src/lang.c:494 #, c-format msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" msgstr "%s=n. oben; %s=n. unten; %s=BildAuf; %s=BildAb; %s=Anfang; %s=letzte Zeile" -#: src/lang.c:493 +#: src/lang.c:495 #, c-format msgid "%s=search forwards; %s=search backwards; %s=quit" msgstr "%s=Suche vorwärts; %s=Suche rückwärts; %s=Beenden" -#: src/lang.c:495 +#: src/lang.c:497 #, c-format msgid "%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read" msgstr "%s=Autorsuche; %s=Su. Inhalt; %s=Catchup; %s=Antw in NG; %s=gelesen" -#: src/lang.c:496 +#: src/lang.c:498 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" msgstr "=Wähle n; %s=n. ungel.; %s,%s=Suche; %s=Catchup" -#: src/lang.c:497 +#: src/lang.c:499 #, c-format msgid "%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" msgstr "%s=n. unten; %s=n. oben; %s=Hilfe; %s=verschieben; %s=Ende; %s=Alle/Nur ungel." -#: src/lang.c:498 +#: src/lang.c:500 #, c-format msgid "%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/out" msgstr "%s=Abo; %s=Abo n. Muster; %s=Abbestellen; %s=Abbest. n. Muster; %s=Alle/Nur " "abon." -#: src/lang.c:499 +#: src/lang.c:501 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" msgstr "=Wähle n; %s=n. ungel.; %s=Catchup; %s=Infozeile" -#: src/lang.c:500 +#: src/lang.c:502 #, c-format msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" msgstr "%s=Hilfe; %s=n. unten; %s=n. oben; %s=Ende; %s=tag; %s=ungelesen" -#: src/lang.c:501 +#: src/lang.c:503 msgid "--More--" msgstr "--Mehr--" -#: src/lang.c:502 +#: src/lang.c:504 #, c-format msgid "Moving %s..." msgstr "Verschiebe %s..." -#: src/lang.c:504 +#: src/lang.c:506 msgid ", name: " msgstr ", Name: " -#: src/lang.c:505 +#: src/lang.c:507 #, c-format msgid "Goto newsgroup [%s]> " msgstr "Gehe zu Gruppe [%s]> " -#: src/lang.c:506 +#: src/lang.c:508 msgid "newsgroups" msgstr "Gruppen" -#: src/lang.c:507 +#: src/lang.c:509 #, c-format msgid "Position %s in group list (1,2,..,$) [%d]> " msgstr "Position %s in der Gruppenliste (1,2,..,$) [%d]> " -#: src/lang.c:508 +#: src/lang.c:510 msgid "newsgroup" msgstr "Gruppe" -#: src/lang.c:509 +#: src/lang.c:511 msgid "Try and save newsrc file again?" msgstr "Erneut versuchen, die newsrc-Datei zu schreiben?" -#: src/lang.c:510 +#: src/lang.c:512 msgid "Warning: No newsgroups were written to your newsrc file. Save aborted." msgstr "Warnung: Keine Newsgruppen in die newsrc geschrieben. Speicherabbruch" -#: src/lang.c:511 +#: src/lang.c:513 msgid "newsrc file saved successfully.\n" msgstr "newsrc-Datei erfolgreich geschrieben.\n" -#: src/lang.c:512 +#: src/lang.c:514 msgid "-- Next response --" msgstr "-- Nächste Antwort --" -#: src/lang.c:513 +#: src/lang.c:515 #, c-format msgid "NNTP authorization password not found for %s" msgstr "NNTP Anmeldepasswort für %s nicht gefunden" -#: src/lang.c:514 +#: src/lang.c:516 msgid "No " msgstr "Nein" -#: src/lang.c:515 +#: src/lang.c:517 msgid "*** No articles ***" msgstr "*** Keine Artikel ***" -#: src/lang.c:516 +#: src/lang.c:518 msgid "No articles have been posted" msgstr "Es wurden keine Artikel gepostet" -#: src/lang.c:517 +#: src/lang.c:519 msgid "*** No description ***" msgstr "*** Keine Kurzbeschreibung ***" -#: src/lang.c:518 +#: src/lang.c:520 msgid "No filename" msgstr "Kein Dateiname" -#: src/lang.c:519 +#: src/lang.c:521 msgid "No group" msgstr "Keine Gruppe" -#: src/lang.c:520 +#: src/lang.c:522 msgid "*** No groups ***" msgstr "*** Keine Newsgruppen ***" -#: src/lang.c:521 +#: src/lang.c:523 msgid "No more groups to read" msgstr "Keine Gruppen zum Lesen übrig" -#: src/lang.c:522 +#: src/lang.c:524 msgid "No last message" msgstr "Keine letzte Nachricht" -#: src/lang.c:523 +#: src/lang.c:525 msgid "No mail address" msgstr "Keine EMail-Adresse" -#: src/lang.c:524 +#: src/lang.c:526 msgid "No articles marked for saving" msgstr "Keine Artikel zum Speichern markiert" -#: src/lang.c:525 +#: src/lang.c:527 msgid "No match" msgstr "Kein Treffer" -#: src/lang.c:526 +#: src/lang.c:528 msgid "No more groups" msgstr "Keine Gruppen mehr" -#: src/lang.c:527 +#: src/lang.c:529 msgid "No newsgroups" msgstr "Keine Newsgruppen" -#: src/lang.c:528 +#: src/lang.c:530 msgid "No next unread article" msgstr "Kein nächster ungelesener Artikel" -#: src/lang.c:529 +#: src/lang.c:531 msgid "No previous group" msgstr "Keine vorherige Gruppe" -#: src/lang.c:530 +#: src/lang.c:532 msgid "No previous unread article" msgstr "Kein vorheriger ungelesener Artikel" -#: src/lang.c:531 +#: src/lang.c:533 msgid "No responses" msgstr "Keine Antworten" -#: src/lang.c:532 +#: src/lang.c:534 msgid "No responses to list in current thread" msgstr "Keine Antworten vorhanden im aktuellen Thread" -#: src/lang.c:533 +#: src/lang.c:535 msgid "No search string" msgstr "Kein Suchmuster" -#: src/lang.c:534 +#: src/lang.c:536 msgid "No subject" msgstr "Kein Subject" -#: src/lang.c:535 +#: src/lang.c:538 #, c-format msgid "%s: Terminal must have clear to end-of-line (ce)\n" msgstr "%s: Terminal muss Löschen bis zum Ende der Zeile (ce) unterstützen\n" -#: src/lang.c:536 +#: src/lang.c:539 #, c-format msgid "%s: Terminal must have clear to end-of-screen (cd)\n" msgstr "%s: Terminal muss Löschen bis zum Ende des Schirmes unterstützen (cd)\n" -#: src/lang.c:537 +#: src/lang.c:540 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" msgstr "%s: Terminal muss Schirmlöschen (cl) unterstützen\n" -#: src/lang.c:538 +#: src/lang.c:541 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" msgstr "%s: Terminal muss Cursor-Bewegungen unterstützen (cm)\n" -#: src/lang.c:539 +#: src/lang.c:542 #, c-format msgid "%s: TERM variable must be set to use screen capabilities\n" msgstr "%s: TERM-Variable muss gesetzt sein, um das Terminal richtig anzusteuern\n" -#: src/lang.c:540 +#: src/lang.c:544 #, c-format msgid "No viewer found for %s/%s\n" msgstr "Kein Programm für %s/%s gefunden\n" -#: src/lang.c:541 +#: src/lang.c:545 msgid "Newsgroup does not exist on this server" msgstr "Newsgruppe existiert nicht auf diesem Server" -#: src/lang.c:542 +#: src/lang.c:546 #, c-format msgid "Group %s not found in active file" msgstr "Gruppe %s nicht in der Active-Datei gefunden" -#: src/lang.c:543 +#: src/lang.c:547 msgid "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "c=erzeuge, a=alternativer Name, d=voreingestellte .newsrc, q=beende tin: " -#: src/lang.c:544 +#: src/lang.c:548 msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "a=alternativer Name, d=voreingestellte .newsrc, q=beende tin: " -#: src/lang.c:545 +#: src/lang.c:549 #, c-format msgid "# NNTP-server -> newsrc translation table and NNTP-server\n" "# shortname list for %s %s\n" @@ -2371,40 +2379,40 @@ msgstr "# NNTP-Server -> newsrc Übersetz "# news.ka.nu /tmp/nrc-nu kanu nu\n" "#\n" -#: src/lang.c:552 +#: src/lang.c:556 msgid "Only" msgstr "Nur" -#: src/lang.c:553 +#: src/lang.c:557 #, c-format msgid "Option not enabled. Recompile with %s." msgstr "Option nicht vorhanden. Neukompilieren mit %s." -#: src/lang.c:554 +#: src/lang.c:558 msgid "Options Menu" msgstr "Optionsmenü" -#: src/lang.c:557 +#: src/lang.c:561 #, c-format msgid "Error in regex: %s at pos. %d '%s'" msgstr "Fehler im regulären Ausdruck: %s an Pos. %d '%s'" -#: src/lang.c:558 +#: src/lang.c:562 #, c-format msgid "Error in regex: pcre internal error %d" msgstr "Fehler im regulären Ausdruck: Interner Fehler %d des pcre" -#: src/lang.c:559 +#: src/lang.c:563 #, c-format msgid "Error in regex: study - pcre internal error %s" msgstr "Fehler im regulären Ausdruck: pcre interner Fehler %s" -#: src/lang.c:560 +#: src/lang.c:564 msgid "Post a followup..." msgstr "Schreibe eine Antwort..." #. TODO: replace hardcoded key-name in txt_post_error_ask_postpone -#: src/lang.c:562 +#: src/lang.c:566 msgid "An error has occurred while posting the article. If you think that this\n" "error is temporary or otherwise correctable, you can postpone the article\n" "and pick it up again with ^O later.\n" @@ -2412,274 +2420,274 @@ msgstr "Ein Fehler trat beim Posten des "ein temporäres Problem ist, das später nicht mehr vorhanden ist, können Sie\n" "den Artikel zurückstellen und später mit ^O wieder hervorholen.\n" -#: src/lang.c:565 +#: src/lang.c:569 msgid "Posted articles history" msgstr "Übersicht der geposteten Artikel" -#: src/lang.c:566 +#: src/lang.c:570 #, c-format msgid "Post to newsgroup(s) [%s]> " msgstr "In Newsgruppe(n) [%s] posten> " -#: src/lang.c:567 +#: src/lang.c:571 msgid "-- post processing started --" msgstr "-- Nachbearbeitung gestartet --" -#: src/lang.c:568 +#: src/lang.c:572 msgid "-- post processing completed --" msgstr "-- Nachbearbeitung beendet --" -#: src/lang.c:569 +#: src/lang.c:573 #, c-format msgid "Post subject [%s]> " msgstr "Wähle Subject [%s]> " -#: src/lang.c:570 +#: src/lang.c:574 msgid "# Summary of mailed/posted messages viewable by 'W' command from within tin.\n" msgstr "# Zusammenfassung der gemailten/geposteten Artikel mit 'W' in tin.\n" -#: src/lang.c:571 +#: src/lang.c:575 msgid "Posting article..." msgstr "Poste Artikel..." -#: src/lang.c:572 +#: src/lang.c:576 msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " msgstr "Zurückgelegten Artikel [%%s]posten? (%s/%s/%s/%s/%s): " -#: src/lang.c:573 +#: src/lang.c:577 #, c-format msgid "Hot %s" msgstr "Wichtig/Hot %s" -#: src/lang.c:574 +#: src/lang.c:578 #, c-format msgid "Tagged %s" msgstr "%s markiert" -#: src/lang.c:575 +#: src/lang.c:579 #, c-format msgid "Untagged %s" msgstr "%s Markierung entfernt" -#: src/lang.c:576 +#: src/lang.c:580 msgid "Processing mail messages marked for deletion." msgstr "Bearbeite zum Löschen markierte EMails" -#: src/lang.c:577 +#: src/lang.c:581 msgid "Processing saved articles marked for deletion." msgstr "Bearbeite zum Löschen markierte gespeicherte Artikel." -#: src/lang.c:578 +#: src/lang.c:582 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "Followup-To akzeptieren? %s=posten, %s=ignorieren, %s=Ende: " -#: src/lang.c:579 +#: src/lang.c:583 msgid "Article unchanged, abort mailing?" msgstr "Mail unverändert, Absenden abbrechen?" -#: src/lang.c:580 +#: src/lang.c:584 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "Wollen Sie die zurückgestellten Artikel sehen (%d)?" -#: src/lang.c:582 +#: src/lang.c:586 msgid "Add quick kill filter?" msgstr "Artikel schnell (laut Voreinstellungen) killen?" -#: src/lang.c:583 +#: src/lang.c:587 msgid "Add quick selection filter?" msgstr "Filterregel (hochscoren) (laut Voreinstellungen) hinzufügen?" -#: src/lang.c:584 +#: src/lang.c:588 msgid "Do you really want to quit?" msgstr "Möchten Sie das Programm wirklich beenden?" -#: src/lang.c:585 +#: src/lang.c:589 msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "%s=cancel-Nachricht editieren, %s=Ende, %s=löschen [%%s]: " -#: src/lang.c:586 +#: src/lang.c:590 msgid "You have tagged articles in this group - quit anyway?" msgstr "Es befinden sich markierte Artikel in der Gruppe, trotzdem beenden?" -#: src/lang.c:587 +#: src/lang.c:591 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=Ende, %s=bearbeiten, %s=zurücklegen: " -#: src/lang.c:588 +#: src/lang.c:592 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=Abbrechen %s=Editieren %s=Kill-Filter speichern: " -#: src/lang.c:589 +#: src/lang.c:593 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr " %s=Abbrechen %s=Editieren %s=Filter (hot) speichern: " -#: src/lang.c:590 +#: src/lang.c:594 msgid "Do you really want to quit without saving your configuration?" msgstr "Wirklich ohne Speichern der Konfiguration beenden?" -#: src/lang.c:593 +#: src/lang.c:597 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "Ungültige Bereichsangabe - Gültig wäre '0-9.$' z.B. 1-$" -#: src/lang.c:594 +#: src/lang.c:598 msgid "Do you want to abort this operation?" msgstr "Wollen Sie diese Operation abbrechen?" -#: src/lang.c:595 +#: src/lang.c:599 msgid "Do you want to exit tin immediately?" msgstr "Wollen Sie tin augenblicklich verlassen?" -#: src/lang.c:596 +#: src/lang.c:600 msgid "Read response> " msgstr "Lese Antwort> " -#: src/lang.c:597 +#: src/lang.c:601 msgid "Reading ('q' to quit)..." msgstr "Lesen ('q' zum Beenden)..." -#: src/lang.c:598 +#: src/lang.c:602 #, c-format msgid "Reading %sarticles..." msgstr "Lese %sArtikel..." -#: src/lang.c:599 +#: src/lang.c:603 #, c-format msgid "Reading %sattributes file...\n" msgstr "Lese %sAttribute-Datei...\n" -#: src/lang.c:600 +#: src/lang.c:604 #, c-format msgid "Reading %sconfig file...\n" msgstr "Lese %sKonfigurations-Datei...\n" -#: src/lang.c:601 +#: src/lang.c:605 msgid "Reading filter file...\n" msgstr "Lese Filter-Datei...\n" -#: src/lang.c:602 +#: src/lang.c:606 #, c-format msgid "Reading %s groups..." msgstr "Lese %s Gruppen..." -#: src/lang.c:603 +#: src/lang.c:607 msgid "Reading input history file...\n" msgstr "Lese Eingabe-History...\n" -#: src/lang.c:604 +#: src/lang.c:608 msgid "Reading keymap file...\n" msgstr "Lese Tastaturbelegungen...\n" -#: src/lang.c:605 +#: src/lang.c:609 msgid "Reading groups from active file... " msgstr "Lese Gruppen aus dem Active... " -#: src/lang.c:606 +#: src/lang.c:610 msgid "Reading groups from newsrc file... " msgstr "Lese Gruppen aus der newsrc-Datei... " -#: src/lang.c:607 +#: src/lang.c:611 msgid "Reading newsgroups file... " msgstr "Lese Newsgroups-Datei... " -#: src/lang.c:608 +#: src/lang.c:612 msgid "Reading newsrc file..." msgstr "Lese newsrc-Datei..." -#: src/lang.c:610 +#: src/lang.c:614 #, c-format msgid "(%d:%02d remaining)" msgstr "(noch %d:%02d benötigt)" -#: src/lang.c:612 +#: src/lang.c:616 #, c-format msgid "Bogus group %s removed." msgstr "Nicht vorhandene Gruppe %s entfernt." -#: src/lang.c:613 +#: src/lang.c:617 #, c-format msgid "Error: rename %s to %s" msgstr "Fehler: Benenne %s in %s" -#: src/lang.c:614 +#: src/lang.c:618 msgid "Reply to author..." msgstr "Mailantwort an Autor..." -#: src/lang.c:615 +#: src/lang.c:619 msgid "Repost" msgstr "Reposte" -#: src/lang.c:616 +#: src/lang.c:620 msgid "Reposting article..." msgstr "Wiederholtes posten des Artikels..." -#: src/lang.c:617 +#: src/lang.c:621 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "Wiederholtes posten de(s|r) Artikel(s) in [%s]> " -#: src/lang.c:618 +#: src/lang.c:622 msgid "Reset newsrc?" msgstr "newsrc zurücksetzen?" -#: src/lang.c:619 +#: src/lang.c:623 msgid "Responses have been directed to the following newsgroups" msgstr "Antworten werden in folgende Gruppen gepostet" -#: src/lang.c:620 +#: src/lang.c:624 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " msgstr "Antwort per Mail wurde angefordert. %s=Mail, %s=post, %s=beenden: " -#: src/lang.c:621 +#: src/lang.c:625 #, c-format msgid "RespNo %4d of %4d" msgstr "Antw. %4d von %4d" -#: src/lang.c:622 +#: src/lang.c:626 msgid "Press to continue..." msgstr "Drücken sie um fortzufahren..." -#: src/lang.c:624 +#: src/lang.c:628 #, c-format msgid "Select From [%s] (y/n): " msgstr "Wähle From [%s] (j/n): " -#: src/lang.c:625 +#: src/lang.c:629 msgid "Select Lines: (num): " msgstr "Wähle Zeilen: (num): " -#: src/lang.c:626 +#: src/lang.c:630 msgid "Auto-select Article Menu" msgstr "Filter Menü (Bewertung/Score erhöhen)" -#: src/lang.c:627 +#: src/lang.c:631 #, c-format msgid "Select Msg-Id [%s] (f/l/o/n): " msgstr "Wähle Msg-Id [%s] (v/l/n/n): " -#: src/lang.c:628 +#: src/lang.c:632 msgid "Select pattern scope: " msgstr "Wähle Muster : " -#: src/lang.c:629 +#: src/lang.c:633 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "Wähle Subject [%s] (j/n): " -#: src/lang.c:630 +#: src/lang.c:634 msgid "Select text pattern : " msgstr "Wähle Textmuster : " -#: src/lang.c:631 +#: src/lang.c:635 msgid "Select time in days : " msgstr "Wähle Zeit in Tagen : " -#: src/lang.c:632 +#: src/lang.c:636 #, c-format msgid "# %s server configuration file\n" "# This file was automatically saved by %s %s %s (\"%s\")\n" @@ -2699,218 +2707,222 @@ msgstr "# %s Server Konfigurationsdatei\ "############################################################################\n" "\n" -#: src/lang.c:638 +#: src/lang.c:642 msgid "Showing unread groups only" msgstr "Zeige nur Gruppen mit ungelesenen Artikeln" -#: src/lang.c:639 +#: src/lang.c:643 msgid "Subject: line (ignore case) " msgstr "Subject: Z. (Groß-Kl. ign.) " -#: src/lang.c:640 +#: src/lang.c:644 msgid "Subject: line (case sensitive)" msgstr "Subject: Z. (Groß-Kl. beachten) " -#: src/lang.c:641 +#: src/lang.c:645 msgid "Save" msgstr "Speichern" -#: src/lang.c:642 +#: src/lang.c:646 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "'%s' (%s/%s) speichern?" -#: src/lang.c:643 +#: src/lang.c:647 msgid "Save configuration before continuing?" msgstr "Zuerst Konfiguration speichern und danach fortfahren?" -#: src/lang.c:644 +#: src/lang.c:648 msgid "Save filename> " msgstr "Name der zu speichernden Datei> " -#: src/lang.c:645 +#: src/lang.c:649 msgid "Saved" msgstr "Gespeichert" -#: src/lang.c:646 +#: src/lang.c:650 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "%4d ungelesene (%4d 'hot') %s in %s\n" -#: src/lang.c:647 +#: src/lang.c:651 #, c-format msgid "Saved %s...\n" msgstr "%s gespeichert...\n" -#: src/lang.c:648 +#: src/lang.c:652 msgid "Nothing was saved" msgstr "Nichts gespeichert" -#: src/lang.c:649 +#: src/lang.c:653 #, c-format msgid "\n" "%s %d %s from %d %s\n" msgstr "\n" "%s %d %s aus %d %s\n" -#: src/lang.c:650 +#: src/lang.c:654 #, c-format msgid "-- %s saved to %s%s --" msgstr "-- %s nach %s%s gespeichert --" -#: src/lang.c:651 +#: src/lang.c:655 #, c-format msgid "-- %s saved to %s - %s --" msgstr "-- %s gespeichert als %s - %s --" -#: src/lang.c:652 +#: src/lang.c:656 msgid "Saving..." msgstr "Speichere..." -#: src/lang.c:653 +#: src/lang.c:657 #, c-format msgid "%s: Screen initialization failed" msgstr "%s: Initialisierung des Bildschirms fehlgeschlagen" -#: src/lang.c:654 +#: src/lang.c:659 #, c-format msgid "%s: screen is too small\n" msgstr "%s: Anzeige ist zu klein\n" -#: src/lang.c:655 +#: src/lang.c:661 #, c-format msgid "screen is too small, %s is exiting\n" msgstr "Anzeige zu klein, %s beendet sich\n" -#: src/lang.c:656 +#: src/lang.c:662 #, c-format msgid "Search backwards [%s]> " msgstr "Suche rückwärts [%s]> " -#: src/lang.c:657 +#: src/lang.c:663 #, c-format msgid "Search body [%s]> " msgstr "Durchsuche Artikelinhalt [%s]> " -#: src/lang.c:658 +#: src/lang.c:664 #, c-format msgid "Search forwards [%s]> " msgstr "Suche vorwärts [%s]> " -#: src/lang.c:659 +#: src/lang.c:665 msgid "Searching..." msgstr "Suche..." -#: src/lang.c:660 +#: src/lang.c:666 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "Suche Artikel %d von %d ('q' zum abbrechen)..." -#: src/lang.c:661 +#: src/lang.c:667 msgid "Select article> " msgstr "Wähle Artikel> " -#: src/lang.c:662 +#: src/lang.c:668 msgid "Select option number before text or use arrow keys and . 'q' to quit." msgstr "Wähle Optionsnummer, oder benutze die Cursor Tasten und . 'q' zum beenden." -#: src/lang.c:663 +#: src/lang.c:669 msgid "Select group> " msgstr "Wähle Gruppe> " -#: src/lang.c:664 +#: src/lang.c:670 #, c-format msgid "Enter selection pattern [%s]> " msgstr "Nenne das Auswahlmuster [%s]> " -#: src/lang.c:665 +#: src/lang.c:671 msgid "Select thread > " msgstr "Wähle thread > " -#: src/lang.c:666 +#: src/lang.c:672 #, c-format msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" msgstr "%s %s %s (\"%s\") [%s]: schicken sie einen DETAILIERTEN Fehlerbericht an %s\n" -#: src/lang.c:667 +#: src/lang.c:673 msgid "servers active-file" msgstr "Die 'active' Datei des Servers" -#: src/lang.c:668 +#: src/lang.c:674 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "Kann die Newsgruppe nicht öffnen. Sie muss erst abonniert werden..." -#: src/lang.c:669 +#: src/lang.c:675 msgid "" msgstr "" -#: src/lang.c:670 +#: src/lang.c:676 #, c-format msgid "Starting: (%s)" msgstr "Starte: (%s)" -#: src/lang.c:671 +#: src/lang.c:677 #, c-format msgid "List Thread (%d of %d)" msgstr "Zeige Thread (%d von %d)" -#: src/lang.c:672 +#: src/lang.c:678 #, c-format msgid "Thread (%.*s)" msgstr "Thread (%.*s)" -#: src/lang.c:673 +#: src/lang.c:679 msgid "Enter wildcard subscribe pattern> " msgstr "Wildcardmuster für zu abonnierende Gruppen> " -#: src/lang.c:674 +#: src/lang.c:680 #, c-format msgid "subscribed to %d groups" msgstr "%d Gruppen sind abonniert" -#: src/lang.c:675 +#: src/lang.c:681 #, c-format msgid "Subscribed to %s" msgstr "%s wurde abonniert" -#: src/lang.c:676 +#: src/lang.c:682 msgid "Subscribing... " msgstr "Abonniere... " -#: src/lang.c:677 +#: src/lang.c:683 msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " msgstr "Artikel erneut posten oder überschreiben [%%s]? (%s/%s/%s): " -#: src/lang.c:678 +#: src/lang.c:684 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "Supersede (überschreibe) Artikel in den Gruppen [%s]> " -#: src/lang.c:679 +#: src/lang.c:685 msgid "Superseding article ..." msgstr "Überschreibe Artikel ..." -#: src/lang.c:680 +#: src/lang.c:686 #, c-format msgid "\n" "Stopped. Type 'fg' to restart %s\n" msgstr "\n" "Angehalten. Geben sie 'fg' ein um %s wieder zu starten\n" -#: src/lang.c:682 +#: src/lang.c:688 #, c-format msgid "%d days" msgstr "%d Tage" -#: src/lang.c:683 +#: src/lang.c:689 msgid "" msgstr "" -#: src/lang.c:684 +#: src/lang.c:690 +msgid "TeX " +msgstr "TeX " + +#: src/lang.c:691 msgid "# Default action/prompt strings\n" msgstr "# Voreingestellte Aktion/zeige Zeichenkette\n" -#: src/lang.c:685 +#: src/lang.c:692 msgid "# Defaults for quick (1 key) kill & auto-selection filters\n" "# header=NUM 0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n" "# 5=Message-ID: & last References: entry only\n" @@ -2926,261 +2938,261 @@ msgstr "# Voreinstellung für schnellen ( "# case=ON/OFF ON=Filter case sensitive OFF=ignoriere case\n" "# expire=ON/OFF ON=Verfallen nach default_filter_days OFF=verfällt nie\n" -#: src/lang.c:698 +#: src/lang.c:705 msgid "# If ON use print current subject or newsgroup description in the last line\n" msgstr "# Falls ON anzeige des Subject oder des Gruppennamens in der letzten Zeile.\n" -#: src/lang.c:699 +#: src/lang.c:706 msgid "# Host & time info used for detecting new groups (don't touch)\n" msgstr "# Host & Zeit Info benutzen um neue Gruppen zu finden (nicht ändern)\n" -#: src/lang.c:700 +#: src/lang.c:707 msgid "There is no news\n" msgstr "Es gibt keine neuen Artikel\n" -#: src/lang.c:701 +#: src/lang.c:708 msgid "Thread" msgstr "Thread" -#: src/lang.c:702 +#: src/lang.c:709 msgid "Thread Level Commands" msgstr "Thread Level Kommandos" -#: src/lang.c:703 +#: src/lang.c:710 msgid "Thread deselected" msgstr "Thread nicht mehr ausgewählt" -#: src/lang.c:704 +#: src/lang.c:711 msgid "Thread selected" msgstr "Thread ausgewählt" -#: src/lang.c:705 +#: src/lang.c:712 msgid "threads" msgstr "Threads" -#: src/lang.c:706 +#: src/lang.c:713 msgid "Thread range" msgstr "Thread-Bereich" -#: src/lang.c:707 +#: src/lang.c:714 msgid "thread" msgstr "Thread" -#: src/lang.c:708 +#: src/lang.c:715 #, c-format msgid "Thread %4s of %4s" msgstr "Thread %4s v. %4s" -#: src/lang.c:709 +#: src/lang.c:716 msgid "Threading articles..." msgstr "Sortiere Artikel..." -#: src/lang.c:710 +#: src/lang.c:717 #, c-format msgid "Toggled word highlighting %s" msgstr "Wort-Hervorhebung: %s" -#: src/lang.c:711 +#: src/lang.c:718 msgid "Toggled rot13 encoding" msgstr "ROT13-Kodierung (de)aktiviert" -#: src/lang.c:712 +#: src/lang.c:719 #, c-format msgid "Toggled german TeX encoding %s" msgstr "Deutsche TeX-Dekodierung: %s" -#: src/lang.c:713 +#: src/lang.c:720 #, c-format msgid "Toggled tab-width to %d" msgstr "Tabulatorweite zu %d gewechselt" -#: src/lang.c:714 +#: src/lang.c:721 #, c-format msgid "%d Trying to dotlock %s" msgstr "%d Versuche %s zu dotlocken" -#: src/lang.c:715 +#: src/lang.c:722 #, c-format msgid "%d Trying to lock %s" msgstr "%d Versuche %s zu locken" -#: src/lang.c:716 +#: src/lang.c:723 msgid " h=help\n" msgstr " h=Hilfe\n" -#: src/lang.c:718 +#: src/lang.c:725 msgid "Unlimited" msgstr "Unbegrenzt" -#: src/lang.c:719 +#: src/lang.c:726 msgid "Enter wildcard unsubscribe pattern> " msgstr "Wildcardmuster für abzubestellende Gruppen> " -#: src/lang.c:720 +#: src/lang.c:727 #, c-format msgid "Error decoding %s : %s" msgstr "Fehler beim Dekodieren von %s : %s" -#: src/lang.c:721 +#: src/lang.c:728 msgid "No end." msgstr "Kein Ende." -#: src/lang.c:722 +#: src/lang.c:729 #, c-format msgid "%s successfully decoded." msgstr "%s erfolgreich dekodiert" -#: src/lang.c:723 +#: src/lang.c:730 #, c-format msgid "%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" "\n" msgstr "%*s[-- %s/%s, %suukodierte Datei, %d Zeilen, Name: %s --]\n" "\n" -#: src/lang.c:724 +#: src/lang.c:731 msgid "unread " msgstr "ungelesen " -#: src/lang.c:725 +#: src/lang.c:732 #, c-format msgid "unsubscribed from %d groups" msgstr "%d Gruppen abbestellt" -#: src/lang.c:726 +#: src/lang.c:733 #, c-format msgid "Unsubscribed from %s" msgstr "%s wurde abbestellt" -#: src/lang.c:727 +#: src/lang.c:734 msgid "Unsubscribing... " msgstr "Abbestellen... " -#: src/lang.c:728 +#: src/lang.c:735 msgid "Unthreading articles..." msgstr "Aktuelle Sortierung der Artikel aufheben..." -#: src/lang.c:729 +#: src/lang.c:736 msgid "Updated" msgstr "Aktualisiert" -#: src/lang.c:730 +#: src/lang.c:737 msgid "Updating" msgstr "Aktualisiere" -#: src/lang.c:731 +#: src/lang.c:738 #, c-format msgid "Opening %s\n" msgstr "Öffne %s\n" -#: src/lang.c:732 +#: src/lang.c:739 msgid "No more URL's in this article" msgstr "Keine weiteren URLs im Artikel" -#: src/lang.c:733 +#: src/lang.c:740 msgid "Use MIME display program for this message?" msgstr "MIME-Anzeigeprogramm für diese Nachricht benutzen?" -#: src/lang.c:734 +#: src/lang.c:741 msgid " -c mark all news as read in subscribed newsgroups (batch mode)" msgstr " -c Markiere Artikel gelesen in den abonnierten Gruppen (Batch-Modus)" -#: src/lang.c:735 +#: src/lang.c:742 msgid " -Z return status indicating if any unread news (batch mode)" msgstr " -Z Rückgabewert zeigt, ob ungelesene Artikel vorliegen (Batch-Modus)" -#: src/lang.c:736 +#: src/lang.c:743 msgid " -q don't check for new newsgroups" msgstr " -q Überprüfe nicht auf neue Newsgruppen" -#: src/lang.c:737 +#: src/lang.c:744 msgid " -X don't save any files on quit" msgstr " -X Speicher keine Dateien beim Beenden" -#: src/lang.c:738 +#: src/lang.c:745 msgid " -d don't show newsgroup descriptions" msgstr " -d Zeige keine Newsgruppenbeschreibungen" -#: src/lang.c:739 +#: src/lang.c:746 msgid " -G limit get only limit articles/group" msgstr " -G limit Hole nur 'limit' Artikel pro Newsgruppe" -#: src/lang.c:740 +#: src/lang.c:747 #, c-format msgid " -H help information about %s" msgstr " -H Hilfe und Informationen über %s" -#: src/lang.c:741 +#: src/lang.c:748 msgid " -h this help message" msgstr " -h Diese Hilfeseite" -#: src/lang.c:742 +#: src/lang.c:749 #, c-format msgid " -I dir news index file directory [default=%s]" msgstr " -I Verz. Verzeichnis für Artikel-Index-Datei [Standard=%s]" -#: src/lang.c:743 +#: src/lang.c:750 msgid " -u update index files (batch mode)" msgstr " -u Erneuere Index-Dateien (Batch-Modus)" -#: src/lang.c:744 +#: src/lang.c:751 #, c-format msgid " -m dir mailbox directory [default=%s]" msgstr " -m Verz. Mailbox-Verzeichnis [Standard=%s]" -#: src/lang.c:745 +#: src/lang.c:752 #, c-format msgid "\n" "Mail bug reports/comments to %s" msgstr "\n" "Schicken Sie Fehlerberichte/Kommentare an %s" -#: src/lang.c:746 +#: src/lang.c:753 msgid " -N mail new news to your posts (batch mode)" msgstr " -N Maile neue Artikel an sich selbst (Batch-Modus)" -#: src/lang.c:747 +#: src/lang.c:754 msgid " -M user mail new news to specified user (batch mode)" msgstr " -M user Maile neue News-Artikel an 'user' (Batch-Modus)" -#: src/lang.c:748 +#: src/lang.c:755 #, c-format msgid " -f file subscribed to newsgroups file [default=%s]" msgstr " -f Datei 'Datei' als .newsrc-Datei nutzen [Standard=%s]" -#: src/lang.c:749 +#: src/lang.c:756 msgid " -x no posting mode" msgstr " -x Posten nicht erlaubt Modus" -#: src/lang.c:750 +#: src/lang.c:757 msgid " -w post an article and exit" msgstr " -w Postet einen Artikel und beendet tin" -#: src/lang.c:751 +#: src/lang.c:758 msgid " -o post all postponed articles and exit" msgstr " -o Postet alle zurückgelegten Artikel und beendet tin" -#: src/lang.c:752 +#: src/lang.c:759 msgid " -r read news remotely from default NNTP server" msgstr " -r Lese Artikel vom Standard-NNTP-Server" -#: src/lang.c:753 +#: src/lang.c:760 msgid " -R read news saved by -S option" msgstr " -R Lese Artikel, die durch -S gespeichert wurden" -#: src/lang.c:754 +#: src/lang.c:761 #, c-format msgid " -s dir save news directory [default=%s]" msgstr " -s Verz. Verzeichnis zum News-Speichern [Standard=%s]" -#: src/lang.c:755 +#: src/lang.c:762 msgid " -S save new news for later reading (batch mode)" msgstr " -S Speichere Artikel für das spätere Lesen (Batch-Modus)" -#: src/lang.c:756 +#: src/lang.c:763 msgid " -z start if any unread news" msgstr " -z Starte, wenn ungelesene Artikel vorliegen" -#: src/lang.c:757 +#: src/lang.c:764 #, c-format msgid "A Usenet reader.\n" "\n" @@ -3189,37 +3201,37 @@ msgstr "Ein Usenet-Client.\n" "\n" "Syntax: %s [Optionen] [Newsgruppe[,...]]" -#: src/lang.c:758 +#: src/lang.c:765 msgid " -v verbose output for batch mode options" msgstr " -v Ausführliche Ausgabe für Batch-Modus-Optionen" -#: src/lang.c:759 +#: src/lang.c:766 msgid " -V print version & date information" msgstr " -V Gebe Versions- und Datumsinformationen aus" -#: src/lang.c:760 +#: src/lang.c:767 #, c-format msgid "%s only useful without batch mode operations\n" msgstr "%s ist nur sinnvoll ohne Batchmodeoperationen\n" -#: src/lang.c:761 +#: src/lang.c:768 #, c-format msgid "%s only useful for batch mode operations\n" msgstr "%s ist nur sinnvoll für Batchmodeoperationen\n" -#: src/lang.c:763 +#: src/lang.c:770 #, c-format msgid "\n" "%s%d out of range (0 - %d). Reset to 0" msgstr "\n" "%s%d ist außerhalb der Grenzen (0 - %d). Zurücksetzen auf 0" -#: src/lang.c:764 +#: src/lang.c:771 #, c-format msgid "View '%s' (%s/%s)?" msgstr "'%s' (%s/%s) anzeigen?" -#: src/lang.c:766 +#: src/lang.c:773 #, c-format msgid "\n" "Warning: posting exceeds %d columns. Line %d is the first long one:\n" @@ -3228,26 +3240,26 @@ msgstr "\n" "Warnung: Artikel überschreitet %d Spalten. Zeile %d ist die erste lange:\n" "%-100s\n" -#: src/lang.c:767 +#: src/lang.c:774 msgid "\n" "Warning: article unchanged after editing\n" msgstr "\n" "Warnung: Artikel wurde im Editor nicht verändert\n" -#: src/lang.c:768 +#: src/lang.c:775 msgid "\n" "Warning: \"Subject:\" contains only whitespaces.\n" msgstr "\n" "Warnung: \"Subject:\" enthält nur Leerzeichen.\n" -#: src/lang.c:769 +#: src/lang.c:776 msgid "\n" "Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:\".\n" msgstr "\n" "Warnung: \"Subject:\" beginnt mit \"Re: \", aber es gibt keine " "\"References:\".\n" -#: src/lang.c:771 +#: src/lang.c:778 msgid "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" " with \"Re: \" and does not contain \"(was:\".\n" @@ -3255,7 +3267,7 @@ msgstr "\n" "Warnung: Artikel hat \"References:\" aber \"Subject:\" beginnt nicht\n" " mit \"Re: \" and enthält auch kein \"(was:\".\n" -#: src/lang.c:774 +#: src/lang.c:781 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly written by you. This will " @@ -3275,7 +3287,7 @@ msgstr "Sorgfältig lesen!\n" "Das ist der Artikel, den sie canceln (löschen) wollen:\n" "\n" -#: src/lang.c:778 +#: src/lang.c:785 msgid "\n" "Warning: You are using a non-plain transfer encoding (such as base64 or\n" " quoted-printable) and an external inews program to submit your\n" @@ -3287,7 +3299,7 @@ msgstr "\n" " Artikel zu übertragen. Falls durch diesen inews eine Signatur\n" " angehängt wird, so kann diese nicht korrekt kodiert werden.\n" -#: src/lang.c:783 +#: src/lang.c:790 #, c-format msgid "\n" "\n" @@ -3300,7 +3312,7 @@ msgstr "\n" "Einige Einstellungen in Ihrem %s-File haben sich geändert!\n" "Lesen sie \"WHATSNEW\", usw....\n" -#: src/lang.c:785 +#: src/lang.c:792 #, c-format msgid "\n" "\n" @@ -3312,7 +3324,7 @@ msgstr "\n" "Evtl. werden Einstellungen in Ihrem %s-File nicht erkannt\n" "oder ändern sich!\n" -#: src/lang.c:788 +#: src/lang.c:795 #, c-format msgid "Warning: tin wrote fewer groups to your\n" "\t%s\n" @@ -3325,19 +3337,19 @@ msgstr "Warnung: tin hat weniger Gruppen "währenddessen abbestellt haben, ist ein Fehler aufgetreten und Sie sollten\n" "ihre %s wiederherstellen, bevor Sie tin nochmal starten!\n" -#: src/lang.c:792 +#: src/lang.c:799 #, c-format msgid "\n" "Warning: Found %d '-- \\n' lines, this may confuse some people.\n" msgstr "\n" "Warnung: Es gibt %d '-- \\n' Zeilen. Das könnte einige Leute verwirren.\n" -#: src/lang.c:793 +#: src/lang.c:800 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "Warnung: Nur %d von %d Artikeln gespeichert" -#: src/lang.c:794 +#: src/lang.c:801 #, c-format msgid "\n" "Warning: Your signature is longer than %d lines. Since signatures usually " @@ -3351,48 +3363,48 @@ msgstr "\n" " nützlichen Informationen enthalten, sollten sie so kurz wie möglich\n" " gehalten werden.\n" -#: src/lang.c:798 +#: src/lang.c:805 #, c-format msgid "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " msgstr "Warnung: E-Mailadr. evtl. verfälscht (Spamfalle). %s=weiter, %s=Abbruch? " -#: src/lang.c:799 +#: src/lang.c:806 msgid "\n" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" msgstr "\n" "Warnung: Signaturen sollten mit '-- \\n' und nicht mit '--\\n' beginnen.\n" -#: src/lang.c:800 +#: src/lang.c:807 msgid "Writing attributes file..." msgstr "Schreibe Datei mit den Eigenschaften der Newsgruppen..." -#: src/lang.c:802 +#: src/lang.c:809 #, c-format msgid "%d Responses" msgstr "%d Antworten" -#: src/lang.c:804 +#: src/lang.c:811 #, c-format msgid "Added %d %s" msgstr "%d %s hinzugefügt" -#: src/lang.c:805 +#: src/lang.c:812 msgid "No unsubscribed groups to show" msgstr "Keine nicht abonnierte Gruppen gefunden" -#: src/lang.c:806 +#: src/lang.c:813 msgid "Showing subscribed to groups only" msgstr "Zeige nur abonnierte Gruppen" -#: src/lang.c:807 +#: src/lang.c:814 msgid "Yes " msgstr "Ja " -#: src/lang.c:808 +#: src/lang.c:815 msgid " You have mail\n" msgstr " Sie haben Mail\n" -#: src/lang.c:813 +#: src/lang.c:820 #, c-format msgid "\n" "Warning: Posting is in %s and contains characters which are not\n" @@ -3411,16 +3423,16 @@ msgstr "\n" " entfernen oder MM_NETWORK_CHARSET im M)neu auf einen\n" " passenderen Wert setzen.\n" -#: src/lang.c:824 +#: src/lang.c:831 #, c-format msgid "Redefined key %s '%s' -> '%s'\n" msgstr "Neubelegung %s '%s' -> '%s'\n" -#: src/lang.c:825 +#: src/lang.c:832 msgid " -D debug mode 1=NNTP 2=ALL" msgstr " -D Debug-Modus 1=NNTP 2=ALLES" -#: src/lang.c:829 +#: src/lang.c:836 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly not written by you. This " @@ -3446,375 +3458,400 @@ msgstr "Sorgfältig lesen!\n" "Dies ist der Artikel, den Sie canceln (löschen) wollen:\n" "\n" -#: src/lang.c:838 +#: src/lang.c:845 msgid "toggle color" msgstr "Farben ein/aus" -#: src/lang.c:839 -msgid "# For color-adjust use the following numbers\n" - "# 0-black 1-red 2-green 3-brown\n" - "# 4-blue 5-pink 6-cyan 7-white\n" +#: src/lang.c:846 +msgid "# Changing colors of several screen parts\n" + "# Possible values are:\n" + "# -1 = default (white for foreground and black for background)\n" + "# 0 = black\n" + "# 1 = red\n" + "# 2 = green\n" + "# 3 = brown\n" + "# 4 = blue\n" + "# 5 = pink\n" + "# 6 = cyan\n" + "# 7 = white\n" "# These are *only* for foreground:\n" - "# 8-gray 9-lightred 10-lightgreen 11-yellow\n" - "# 12-lightblue 13-lightpink 14-lightcyan 15-lightwhite\n" - "# A '-1' is interpreted as default (foreground normally is white, and\n" - "# background black)\n" - "\n" -msgstr "# Für die Farbanpassung benutzen Sie folgende Nummern\n" - "# 0-schwarz 1-rot 2-grün 3-braun\n" - "# 4-blau 5-rosa 6-cyan 7-weiß\n" + "# 8 = gray\n" + "# 9 = light red\n" + "# 10 = light green\n" + "# 11 = yellow\n" + "# 12 = light blue\n" + "# 13 = light pink\n" + "# 14 = light cyan\n" + "# 15 = light white\n" + "\n" +msgstr "# Farbeinstellungen\n" + "# Mögliche Werte sind:\n" + "# -1 = Voreinstellung (weißer Vordergrund, schwarzer Hintergrund)\n" + "# 0 = schwarz\n" + "# 1 = rot\n" + "# 2 = grün\n" + "# 3 = braun\n" + "# 4 = blau\n" + "# 5 = rosa\n" + "# 6 = cyan\n" + "# 7 = weiß\n" "# Diese sind *nur* für den Vordergrund:\n" - "# 8-grau 9-hellrot 10-hellgrün 11-gelb\n" - "# 12-hellblau 13-hellrosa 14-hellcyan 15-hellweiß\n" - "# Eine '-1' wird als Voreinstellung interpretiert (der Vordergrund ist\n" - "# normalerweise weiß und der Hintergrund schwarz)\n" + "# 8 = grau\n" + "# 9 = hellrot\n" + "# 10 = hellgrün\n" + "# 11 = gelb\n" + "# 12 = hellblau\n" + "# 13 = hellrosa\n" + "# 14 = hellcyan\n" + "# 15 = hellweiß\n" + "\n" -#: src/lang.c:847 +#: src/lang.c:866 msgid " -a toggle color flag" msgstr " -a Farbe ein- oder ausschalten" -#: src/lang.c:851 +#: src/lang.c:870 msgid "\n" "Error: Followup-To set to more than one newsgroup!\n" msgstr "\n" "Fehler: Followup-To auf mehr als eine Newsgruppe gesetzt!\n" -#: src/lang.c:852 +#: src/lang.c:871 #, c-format msgid "\n" "Error: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "\n" "Fehler: Crossposting in %d Newsgruppen und kein Followup-To gesetzt!\n" -#: src/lang.c:853 +#: src/lang.c:872 #, c-format msgid "\n" "Error: \"%s\" is not a valid newsgroup!\n" msgstr "\n" "Fehler: \"%s\" ist keine gültige Newsgruppe!\n" -#: src/lang.c:855 +#: src/lang.c:874 msgid "\n" "Warning: Followup-To set to more than one newsgroup!\n" msgstr "\n" "Warnung: Followup-To in mehr als eine Newsgruppe gesetzt!\n" -#: src/lang.c:856 +#: src/lang.c:875 #, c-format msgid "\n" "Warning: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "\n" "Warnung: Crossposting in %d Newsgruppen und kein Followup-To gesetzt!\n" -#: src/lang.c:857 +#: src/lang.c:876 #, c-format msgid "\n" "Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n" msgstr "\n" "Warnung: \"%s\" ist nicht in Ihrer newsrc, sie könnte ungültig sein!\n" -#: src/lang.c:858 +#: src/lang.c:877 #, c-format msgid "\n" "Warning: \"%s\" is not a valid newsgroup at this site!\n" msgstr "\n" "Warnung: \"%s\" ist keine gültige Newsgruppe auf diesem Server!\n" -#: src/lang.c:862 +#: src/lang.c:881 #, c-format msgid "%d files successfully written from %d articles. %d %s occurred." msgstr "%d Dateien aus %d Artikeln erfolgreich geschrieben. %d %s traten auf" -#: src/lang.c:863 +#: src/lang.c:882 msgid "Missing parts." msgstr "Teile fehlen." -#: src/lang.c:864 +#: src/lang.c:883 msgid "No beginning." msgstr "Kein Anfang." -#: src/lang.c:865 +#: src/lang.c:884 msgid "No data." msgstr "Keine Daten." -#: src/lang.c:866 +#: src/lang.c:885 msgid "Unknown error." msgstr "Unbekannter Fehler." -#: src/lang.c:868 +#: src/lang.c:887 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "\tPrüfsumme für %s (%ld %s)" -#: src/lang.c:872 +#: src/lang.c:891 msgid "Reading mail active file... " msgstr "Lese EMail-Active-Datei... " -#: src/lang.c:873 +#: src/lang.c:892 msgid "Reading mailgroups file... " msgstr "Lese Mailgruppen-Datei... " -#: src/lang.c:877 +#: src/lang.c:896 msgid "perform PGP operations on article" msgstr "wendet PGP auf den Artikel an" -#: src/lang.c:878 +#: src/lang.c:897 msgid "Add key(s) to public keyring?" msgstr "Schlüssel dem Öffentlichen Schlüsselring hinzufügen?" -#: src/lang.c:879 +#: src/lang.c:898 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "%s=verschlüsseln, %s=signieren, %s=beides, %s=Ende: " -#: src/lang.c:880 +#: src/lang.c:899 #, c-format msgid "%s=sign, %s=sign & include public key, %s=quit: " msgstr "%s=signiere, %s=signiere & füge öffentl. Schlüssel hinzu, %s=Ende: " -#: src/lang.c:881 +#: src/lang.c:900 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "PGP Wurde nicht konfiguriert (kann %s nicht öffnen)" -#: src/lang.c:882 +#: src/lang.c:901 msgid "Article not signed and no public keys found" msgstr "Artikel ist nicht signiert; keine öffentlichen Schlüssel gefunden" -#: src/lang.c:884 +#: src/lang.c:903 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "%s=Ende, %s=bearbeiten, %s=ispell, %s=pgp, %s=Menu, %s=posten, " "%s=zurücklegen: " -#: src/lang.c:885 +#: src/lang.c:904 msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " msgstr "%s=Ende, %s=bearbeiten, %s=ispell, %s=pgp, %s=verschicken [%%s]: " -#: src/lang.c:886 +#: src/lang.c:905 msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=Ende, %s=bearbeiten, %s=ispell, %s=pgp, %s=Menu, %s=posten, %s=zurücklegen " "[%%s]: " -#: src/lang.c:888 +#: src/lang.c:907 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "%s=Ende, %s=bearbeiten, %s=pgp, %s=Menu, %s=posten, %s=zurücklegen: " -#: src/lang.c:889 +#: src/lang.c:908 msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "%s=Ende, %s=bearbeiten, %s=pgp, %s=verschicken [%%s]: " -#: src/lang.c:890 +#: src/lang.c:909 msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=Ende, %s=bearbeiten, %s=pgp, %s=Menu, %s=posten, %s=zurücklegen [%%s]: " -#: src/lang.c:894 +#: src/lang.c:913 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " msgstr "%s=Ende, %s=bearbeiten, %s=ispell, %s=Menü, %s=posten, %s=zurücklegen: " -#: src/lang.c:895 +#: src/lang.c:914 msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "%s=Ende, %s=bearbeiten, %s=ispell, %s=verschicken [%%s]: " -#: src/lang.c:896 +#: src/lang.c:915 msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=Ende, %s=bearbeiten, %s=ispell, %s=Menü, %s=post, %s=Zurückl. [%%s]: " -#: src/lang.c:898 +#: src/lang.c:917 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "%s=Ende, %s=bearbeiten, %s=Menu, %s=posten, %s=zurücklegen: " -#: src/lang.c:899 +#: src/lang.c:918 msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "%s=Ende, %s=bearbeiten, %s=verschicken [%%s]: " -#: src/lang.c:900 +#: src/lang.c:919 msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=Ende, %s=bearbeiten, %s=Menü, %s=posten, %s=zurücklegen [%%s]: " -#: src/lang.c:909 +#: src/lang.c:928 msgid "Try cache_overview_files to speed up things.\n" msgstr "Setze cache_overview_files um das lesen zu beschleubigen.\n" -#: src/lang.c:910 +#: src/lang.c:929 msgid "Tin will use local index files instead.\n" msgstr "Tin wird lokale index files benutzen.\n" -#: src/lang.c:911 +#: src/lang.c:930 msgid "Cannot find NNTP server name" msgstr "Kann den Namen des NNTP Servers nicht finden" -#: src/lang.c:912 +#: src/lang.c:931 #, c-format msgid "Connecting to %s:%d..." msgstr "Verbinde mit %s:%d..." -#: src/lang.c:913 +#: src/lang.c:932 msgid "Disconnecting from server...\n" msgstr "Trenne Verbindung zum Server...\n" -#: src/lang.c:914 +#: src/lang.c:933 #, c-format msgid "Wrong newsgroup name in response of GROUP command, %s for %s" msgstr "Falsche Newsgruppe in Antwort auf GROUP-Befehl, %s statt %s" -#: src/lang.c:915 +#: src/lang.c:934 #, c-format msgid "Failed to connect to NNTP server %s. Exiting..." msgstr "Konnte nicht zum NNTP Server %s verbinden. Beende..." -#: src/lang.c:916 +#: src/lang.c:935 msgid "205 Closing connection" msgstr "205 Schließe Verbindung" -#: src/lang.c:917 +#: src/lang.c:936 msgid "Your server does not support the NNTP XOVER or OVER command.\n" msgstr "Ihr Server unterstützt kein NNTP XOVER oder OVER Kommando.\n" -#: src/lang.c:918 +#: src/lang.c:937 msgid "Connection to news server has timed out. Reconnect?" msgstr "Die Verbindung zum Newsserver wurde unterbrochen. Wieder verbinden?" -#: src/lang.c:919 +#: src/lang.c:938 #, c-format msgid "Put the server name in the file %s,\n" "or set the environment variable NNTPSERVER" msgstr "Schreiben Sie den Servernamen in die Datei %s,\n" "oder setzen Sie die Umgebungsvariable NNTPSERVER" -#: src/lang.c:920 +#: src/lang.c:939 msgid " -A force authentication on connect" msgstr " -A Erzwinge Anmeldung bei Verbindung" -#: src/lang.c:921 +#: src/lang.c:940 #, c-format msgid " -g serv read news from NNTP server serv [default=%s]" msgstr " -g serv Lese Artikel vom NNTP-Server 'serv' [Standard=%s]" -#: src/lang.c:922 +#: src/lang.c:941 #, c-format msgid " -p port use port as NNTP port [default=%d]" msgstr " -p port Benutze 'port' als NNTP-Port [Standard=%d]" -#: src/lang.c:923 +#: src/lang.c:942 msgid " -Q quick start. Same as -nqd" msgstr " -Q Schnellstart. Das Selbe wie -nqd" -#: src/lang.c:924 +#: src/lang.c:943 msgid " -l use only LIST instead of GROUP (-n) command" msgstr " -l Benutze nur das LIST anstelle vom GROUP-Kommando (-n)" -#: src/lang.c:925 +#: src/lang.c:944 msgid " -n only read subscribed .newsrc groups from NNTP server" msgstr " -n Lese nur Gruppen aus der .newsrc-Datei vom NNTP-Server" -#: src/lang.c:927 +#: src/lang.c:946 #, c-format msgid "%s/tcp: Unknown service.\n" msgstr "%s/tcp: Unbekannter Service.\n" -#: src/lang.c:930 +#: src/lang.c:949 msgid "\n" "socket or connect problem\n" msgstr "\n" "Socket oder Verbindungsproblem\n" -#: src/lang.c:932 +#: src/lang.c:951 #, c-format msgid "\n" "Connection to %s: " msgstr "\n" "Verbindung mit %s: " -#: src/lang.c:933 +#: src/lang.c:952 msgid "Giving up...\n" msgstr "Gebe auf...\n" -#: src/lang.c:936 +#: src/lang.c:955 msgid "Your server does not have Xref: in its XOVER information.\n" "Tin will try to use XHDR XREF instead (slows down things a bit).\n" msgstr "Ihr Server hat kein Xref: in seiner XOVER-Information.\n" "Tin versucht XHDR XREF zu benutzen (verlangsamt den Prozess etwas).\n" -#: src/lang.c:939 +#: src/lang.c:958 msgid "Your server does not have Xref: in its XOVER information.\n" msgstr "Ihr Server hat kein Xref: in seiner XOVER-Information.\n" -#: src/lang.c:942 +#: src/lang.c:961 #, c-format msgid "Can't open %s. Try %s -r to read news via NNTP.\n" msgstr "Kann %s nicht öffnen. Probieren Sie %s -r um via NNTP zu lesen.\n" -#: src/lang.c:945 +#: src/lang.c:964 msgid " -Q quick start. Same as -qd" msgstr " -Q Schnellstart. Das Selbe wie -qd" -#: src/lang.c:946 +#: src/lang.c:965 msgid " -l read only active file instead of scanning spool (-n) command" msgstr " -l Nur active File lesen ohne den Spool zu durchsuchen (-n) Kommando" -#: src/lang.c:947 +#: src/lang.c:966 msgid " -n only read subscribed .newsrc groups from spool" msgstr " -n Lese nur Gruppen aus der .newsrc-Datei aus dem lokalen Spool" -#: src/lang.c:948 +#: src/lang.c:967 msgid "Your server does not have Xref: in its NOV-files.\n" msgstr "Ihr Server hat kein Xref: in seinern NOV-Dateien.\n" -#: src/lang.c:952 +#: src/lang.c:971 msgid "Posting using external inews failed. Use built in inews instead?" msgstr "Fehler beim Posten mit externem inews, verwende eingebautes?" -#: src/lang.c:953 +#: src/lang.c:972 msgid "It worked! Should I always use my built in inews from now on?" msgstr "Das hat funktioniert. In Zukunft immer eingebautes inews verwenden?" -#: src/lang.c:961 +#: src/lang.c:980 #, c-format msgid "%d %s printed" msgstr "%d %s gedruckt" -#: src/lang.c:962 +#: src/lang.c:981 msgid "output article/thread/hot/pattern/tagged articles to printer" msgstr "druckt Artikel/Thread/hervorgehobene/Muster/markierten" -#: src/lang.c:963 +#: src/lang.c:982 msgid "Print" msgstr "drucken" -#: src/lang.c:964 +#: src/lang.c:983 msgid "Printing..." msgstr "Drucke..." -#: src/lang.c:968 +#: src/lang.c:987 msgid "pipe article/thread/hot/pattern/tagged articles into command" msgstr "pipet Artikel/thread hervorgehoben/muster/markierten Artikel" -#: src/lang.c:969 +#: src/lang.c:988 msgid "No command" msgstr "Kein Kommando" -#: src/lang.c:970 +#: src/lang.c:989 msgid "Pipe" msgstr "Pipe" -#: src/lang.c:971 +#: src/lang.c:990 #, c-format msgid "Pipe to command [%.*s]> " msgstr "Pipen in Kommando [%.*s]> " -#: src/lang.c:972 +#: src/lang.c:991 msgid "Piping..." msgstr "Pipen..." -#: src/lang.c:974 +#: src/lang.c:993 msgid "Piping not enabled." msgstr "Pipen nicht aktiviert." -#: src/lang.c:978 +#: src/lang.c:997 #, c-format msgid "\n" "Error: The \"%s:\" line has spaces in it that MUST be removed.\n" @@ -3827,7 +3864,7 @@ msgstr "\n" " vom Inhalt trennt. Benutzen sie ein ',' um mehrere Newsgruppen\n" " anzugeben\n" -#: src/lang.c:983 +#: src/lang.c:1002 #, c-format msgid "\n" "Error: The \"%s:\" line is continued in the next line. Since\n" @@ -3838,7 +3875,7 @@ msgstr "\n" " Da diese Zeile keinen leeren Raum enthalten darf, ist dies nicht\n" " erlaubt. Bitte schreiben Sie alle Newsgruppen in eine Zeile\n" -#: src/lang.c:988 +#: src/lang.c:1007 #, c-format msgid "\n" "Warning: The \"%s:\" line is continued in the next line.\n" @@ -3849,7 +3886,7 @@ msgstr "\n" " Da diese Zeile keinen leeren Raum enthalten darf, ist dies nicht\n" " erlaubt. Bitte schreiben Sie alle Newsgruppen in eine Zeile.\n" -#: src/lang.c:992 +#: src/lang.c:1011 #, c-format msgid "\n" "Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n" @@ -3857,7 +3894,7 @@ msgstr "\n" "Warnung: Die \"%s:\" Zeile enthält Leerzeichen die entfernt\n" " werden sollten.\n" -#: src/lang.c:997 +#: src/lang.c:1016 msgid "\n" " If your article contains quoted text please take some time to pare it " "down\n" @@ -3888,893 +3925,969 @@ msgstr "\n" " Artikel nicht sorgfältig formatieren, ist es sehr wahrscheinlich, dass er\n" " von vielen gar nicht gelesen wird.\n" -#: src/lang.c:1010 +#: src/lang.c:1029 msgid "shell escape" msgstr "Ausgang zur Shell" -#: src/lang.c:1011 +#: src/lang.c:1030 #, c-format msgid "Shell Command (%s)" msgstr "Shellkommando (%s)" -#: src/lang.c:1012 +#: src/lang.c:1031 #, c-format msgid "Enter shell command [%s]> " msgstr "Geben Sie ein Shellkommando ein [%s]> " -#: src/lang.c:1016 +#: src/lang.c:1035 #, c-format msgid "%s: Can't get entry for TERM\n" msgstr "%s: Kann den Wert für TERM nicht finden\n" -#: src/lang.c:1020 +#: src/lang.c:1039 #, c-format msgid "Group %.*s ('q' to quit)..." msgstr "Gruppe %.*s ('q' zum beenden...)" -#: src/lang.c:1022 +#: src/lang.c:1041 #, c-format msgid "Group %.*s..." msgstr "Gruppe %.*s..." -#: src/lang.c:1026 +#: src/lang.c:1045 msgid "Server unavailable\n" msgstr "Server nicht erreichbar\n" -#: src/lang.c:1032 +#: src/lang.c:1051 #, c-format msgid "%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; " "%s=post" msgstr "%s=Pipe; %s=Mail; %s=Drucken; %s=Ende; %s=Alle/Nur ungel.; %s=Speich.; " "%s=tag; %s=Posten" -#: src/lang.c:1033 +#: src/lang.c:1052 #, c-format msgid "%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "%s=Pipe; %s=Mail; %s=Drucken; %s=Ende; %s=Antw. Mail; %s=Speich.; %s=tag; " "%s=Posten" -#: src/lang.c:1035 +#: src/lang.c:1054 #, c-format msgid "%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "%s=Mail; %s=Drucken; %s=Ende; %s=Alle/Nur ungel.; %s=Speich.; %s=tag; " "%s=Posten" -#: src/lang.c:1036 +#: src/lang.c:1055 #, c-format msgid "%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "%s=Mail; %s=Drucken; %s=Ende; %s=Antw. Mail; %s=Speich.; %s=tag; %s=Posten" -#: src/lang.c:1040 +#: src/lang.c:1059 #, c-format msgid "%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "%s=Pipe; %s=Mail; %s=Ende; %s=Alle/Nur ungel.; %s=Speich.; %s=tag; %s=Posten" -#: src/lang.c:1041 +#: src/lang.c:1060 #, c-format msgid "%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "%s=Pipe; %s=Mail; %s=Ende; %s=Antw. Mail; %s=Speich.; %s=tag; %s=Posten" -#: src/lang.c:1043 +#: src/lang.c:1062 #, c-format msgid "%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "%s=Mail; %s=Ende; %s=Alle/Nur ungel.; %s=Speich.; %s=tag; %s=Posten" -#: src/lang.c:1044 +#: src/lang.c:1063 #, c-format msgid "%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "%s=Mail; %s=Ende; %s=Antw. Mail; %s=Speich.; %s=tag; %s=Posten" -#: src/lang.c:1050 +#: src/lang.c:1069 msgid "Terminal does not support color" msgstr "Terminal unterstützt keine Farben" -#: src/lang.c:1055 +#: src/lang.c:1074 #, c-format msgid "Trying %s" msgstr "Versuche %s" -#: src/lang.c:1069 src/lang.c:1094 src/lang.c:1110 src/lang.c:1289 src/refs.c:296 +#: src/lang.c:1088 src/lang.c:1113 src/lang.c:1129 src/lang.c:1308 src/refs.c:296 msgid "None" msgstr "Nichts" -#: src/lang.c:1070 +#: src/lang.c:1089 msgid "Subject" msgstr "Subject" -#: src/lang.c:1071 +#: src/lang.c:1090 msgid "References" msgstr "References" -#: src/lang.c:1072 +#: src/lang.c:1091 msgid "Both Subject and References" msgstr "Beides: Subject und References" -#: src/lang.c:1073 +#: src/lang.c:1092 msgid "Multipart Subject" msgstr "Mehrteilige Artikel (Subject)" -#: src/lang.c:1085 src/lang.c:1196 +#: src/lang.c:1104 src/lang.c:1215 msgid "No" msgstr "Nein" -#: src/lang.c:1086 src/lang.c:1198 +#: src/lang.c:1105 src/lang.c:1217 msgid "Yes" msgstr "Ja" -#: src/lang.c:1087 +#: src/lang.c:1106 msgid "Hide All" msgstr "Alle ausblenden" -#: src/lang.c:1095 +#: src/lang.c:1114 msgid "Address" msgstr "Adresse" -#: src/lang.c:1096 +#: src/lang.c:1115 msgid "Full Name" msgstr "Voller Name" -#: src/lang.c:1097 +#: src/lang.c:1116 msgid "Address and Name" msgstr "Adresse und Name" -#: src/lang.c:1104 +#: src/lang.c:1123 msgid "Max" msgstr "Höchster" -#: src/lang.c:1105 +#: src/lang.c:1124 msgid "Sum" msgstr "Summe" -#: src/lang.c:1106 +#: src/lang.c:1125 msgid "Average" msgstr "Durchschnitt" -#: src/lang.c:1111 +#: src/lang.c:1130 msgid "Lines" msgstr "Zeilen" -#: src/lang.c:1112 +#: src/lang.c:1131 msgid "Score" msgstr "Bewertung" -#: src/lang.c:1113 +#: src/lang.c:1132 msgid "Lines & Score" msgstr "Zeilen und Bewertung" -#: src/lang.c:1122 +#: src/lang.c:1141 msgid "Black" msgstr "Schwarz" -#: src/lang.c:1123 +#: src/lang.c:1142 msgid "Red" msgstr "Rot" -#: src/lang.c:1124 +#: src/lang.c:1143 msgid "Green" msgstr "Grün" -#: src/lang.c:1125 +#: src/lang.c:1144 msgid "Brown" msgstr "Braun" -#: src/lang.c:1126 +#: src/lang.c:1145 msgid "Blue" msgstr "Blau" -#: src/lang.c:1127 +#: src/lang.c:1146 msgid "Pink" msgstr "Rosa" -#: src/lang.c:1128 +#: src/lang.c:1147 msgid "Cyan" msgstr "Cyan" -#: src/lang.c:1129 +#: src/lang.c:1148 msgid "White" msgstr "Weiß" -#: src/lang.c:1130 +#: src/lang.c:1149 msgid "Gray" msgstr "Grau" -#: src/lang.c:1131 +#: src/lang.c:1150 msgid "Light Red" msgstr "Helles Rot" -#: src/lang.c:1132 +#: src/lang.c:1151 msgid "Light Green" msgstr "Helles Grün" -#: src/lang.c:1133 +#: src/lang.c:1152 msgid "Yellow" msgstr "Gelb" -#: src/lang.c:1134 +#: src/lang.c:1153 msgid "Light Blue" msgstr "Helles Blau" -#: src/lang.c:1135 +#: src/lang.c:1154 msgid "Light Pink" msgstr "Helles Rosa" -#: src/lang.c:1136 +#: src/lang.c:1155 msgid "Light Cyan" msgstr "Helles Cyan" -#: src/lang.c:1137 +#: src/lang.c:1156 msgid "Light White" msgstr "Helles Weiß" -#: src/lang.c:1145 src/lang.c:1202 src/lang.c:1216 +#: src/lang.c:1164 src/lang.c:1221 src/lang.c:1235 msgid "Nothing" msgstr "Nichts" -#: src/lang.c:1146 +#: src/lang.c:1165 msgid "Mark" msgstr "Markierung" -#: src/lang.c:1147 +#: src/lang.c:1166 msgid "Space" msgstr "Leerzeichen" -#: src/lang.c:1154 +#: src/lang.c:1173 msgid "Normal" msgstr "Normal" -#: src/lang.c:1155 +#: src/lang.c:1174 msgid "Best highlighting" msgstr "Beste Hervorhebung" -#: src/lang.c:1156 +#: src/lang.c:1175 msgid "Underline" msgstr "Unterstreichen" -#: src/lang.c:1157 +#: src/lang.c:1176 msgid "Reverse video" msgstr "Invers" -#: src/lang.c:1158 +#: src/lang.c:1177 msgid "Blinking" msgstr "Blinkend" -#: src/lang.c:1159 +#: src/lang.c:1178 msgid "Half bright" msgstr "Halbe Helligkeit" -#: src/lang.c:1160 +#: src/lang.c:1179 msgid "Bold" msgstr "Fett" -#: src/lang.c:1165 +#: src/lang.c:1184 msgid "none" msgstr "Nichts" -#: src/lang.c:1166 +#: src/lang.c:1185 msgid "commands" msgstr "Kommandos" -#: src/lang.c:1167 +#: src/lang.c:1186 msgid "select" msgstr "X-Befehl" -#: src/lang.c:1169 +#: src/lang.c:1188 msgid "commands & quit" msgstr "Kommandos & Ende" -#: src/lang.c:1170 +#: src/lang.c:1189 msgid "commands & select" msgstr "Kommandos & X-Befehl" -#: src/lang.c:1171 +#: src/lang.c:1190 msgid "quit & select" msgstr "Ende & X-Befehl" -#: src/lang.c:1172 +#: src/lang.c:1191 msgid "commands & quit & select" msgstr "Kmndos & Ende & X-Befehl" -#: src/lang.c:1197 +#: src/lang.c:1216 msgid "Shell archive" msgstr "Shellarchiv" -#: src/lang.c:1203 +#: src/lang.c:1222 msgid "Subject: (descending)" msgstr "Subject: (Absteigend)" -#: src/lang.c:1204 +#: src/lang.c:1223 msgid "Subject: (ascending)" msgstr "Subject: (Aufsteigend)" -#: src/lang.c:1205 +#: src/lang.c:1224 msgid "From: (descending)" msgstr "From: (Absteigend)" -#: src/lang.c:1206 +#: src/lang.c:1225 msgid "From: (ascending)" msgstr "From: (Aufsteigend)" -#: src/lang.c:1207 +#: src/lang.c:1226 msgid "Date: (descending)" msgstr "Date: (Absteigend)" -#: src/lang.c:1208 +#: src/lang.c:1227 msgid "Date: (ascending)" msgstr "Date: (Aufsteigend)" -#: src/lang.c:1209 src/lang.c:1217 +#: src/lang.c:1228 src/lang.c:1236 msgid "Score (descending)" msgstr "Bewertung (Absteigend)" -#: src/lang.c:1210 src/lang.c:1218 +#: src/lang.c:1229 src/lang.c:1237 msgid "Score (ascending)" msgstr "Bewertung (Aufsteigend)" -#: src/lang.c:1211 +#: src/lang.c:1230 msgid "Lines: (descending)" msgstr "Lines: (Absteigend)" -#: src/lang.c:1212 +#: src/lang.c:1231 msgid "Lines: (ascending)" msgstr "Lines: (Aufsteigend)" -#: src/lang.c:1223 +#: src/lang.c:1242 msgid "Always Keep" msgstr "Immer behalten" -#: src/lang.c:1224 +#: src/lang.c:1243 msgid "Always Remove" msgstr "Immer entfernen" -#: src/lang.c:1225 +#: src/lang.c:1244 msgid "Mark with D on selection screen" msgstr "Mit D in der Anzeige markiert" -#: src/lang.c:1230 +#: src/lang.c:1249 msgid "Kill only unread arts" msgstr "Killt nur ungelesene Artikel" -#: src/lang.c:1231 +#: src/lang.c:1250 msgid "Kill all arts & show with K" msgstr "Killt alle Artikel, markiert mit K" #. TODO: s/K/art_marked_killed/ -#: src/lang.c:1232 +#: src/lang.c:1251 msgid "Kill all arts and never show" msgstr "Killt alle Artikel, zeigt sie nie" -#: src/lang.c:1237 +#: src/lang.c:1256 msgid "Nothing special" msgstr "Nichts besonderes" -#: src/lang.c:1238 +#: src/lang.c:1257 msgid "Compress quotes" msgstr "Zitatzeichen zusammenfassen" -#: src/lang.c:1239 +#: src/lang.c:1258 msgid "Quote signatures" msgstr "Signaturen zitieren" -#: src/lang.c:1240 +#: src/lang.c:1259 msgid "Compress quotes, quote sigs" msgstr "Zitatz. kürzen, Signat. zitieren" -#: src/lang.c:1241 +#: src/lang.c:1260 msgid "Quote empty lines" msgstr "Leerzeilen zitieren" -#: src/lang.c:1242 +#: src/lang.c:1261 msgid "Compress quotes, quote empty lines" msgstr "Zitatz. kürzen, Leerzeilen zit." -#: src/lang.c:1243 +#: src/lang.c:1262 msgid "Quote sigs & empty lines" msgstr "Signat. und Leerzeilen zitieren" -#: src/lang.c:1244 +#: src/lang.c:1263 msgid "Comp. q., quote sigs & empty lines" msgstr "Zitatz. kürzen, Sign & Leerz. zit." -#: src/lang.c:1282 +#: src/lang.c:1301 msgid "no" msgstr "nein" -#: src/lang.c:1283 +#: src/lang.c:1302 msgid "with headers" msgstr "mit Header" -#: src/lang.c:1284 +#: src/lang.c:1303 msgid "without headers" msgstr "ohne Header" # TRANSLATION MISSING -#: src/lang.c:1291 src/lang.c:1297 +#: src/lang.c:1310 src/lang.c:1316 msgid "NFKC" msgstr "" # TRANSLATION MISSING -#: src/lang.c:1292 +#: src/lang.c:1311 msgid "NFKD" msgstr "" # TRANSLATION MISSING -#: src/lang.c:1293 +#: src/lang.c:1312 msgid "NFC" msgstr "" # TRANSLATION MISSING -#: src/lang.c:1294 +#: src/lang.c:1313 msgid "NFD" msgstr "" -#: src/lang.c:1305 +#: src/lang.c:1324 msgid "Display Options" msgstr "Darstellungseinstellungen" -#: src/lang.c:1311 +#: src/lang.c:1330 msgid "Color Options" msgstr "Farbeinstellungen" -#: src/lang.c:1317 +#: src/lang.c:1336 msgid "Article-Limiting Options" msgstr "Artikel-Begrenzungseinstellungen" -#: src/lang.c:1323 +#: src/lang.c:1342 msgid "Posting/Mailing Options" msgstr "Versandeinstellungen für Mail und News" -#: src/lang.c:1329 +#: src/lang.c:1348 msgid "Saving/Printing Options" msgstr "Speicher- und Druckereinstellungen" -#: src/lang.c:1335 +#: src/lang.c:1354 msgid "Expert Options" msgstr "Experteneinstellungen" -#: src/lang.c:1341 +#: src/lang.c:1360 msgid "Filtering Options" msgstr "Filtereinstellungen" -#: src/lang.c:1346 src/lang.c:1372 src/lang.c:1378 src/lang.c:1385 src/lang.c:1417 -#: src/lang.c:1423 src/lang.c:1431 src/lang.c:1451 src/lang.c:1526 src/lang.c:1688 -#: src/lang.c:1694 src/lang.c:1700 src/lang.c:1706 src/lang.c:1718 src/lang.c:1725 -#: src/lang.c:1776 src/lang.c:1785 src/lang.c:1791 src/lang.c:1797 src/lang.c:1803 -#: src/lang.c:1809 src/lang.c:1815 src/lang.c:1821 src/lang.c:1827 src/lang.c:1833 -#: src/lang.c:1839 src/lang.c:1845 src/lang.c:1851 src/lang.c:1857 src/lang.c:1863 -#: src/lang.c:1869 src/lang.c:1875 src/lang.c:1881 src/lang.c:1887 src/lang.c:1893 -#: src/lang.c:1899 src/lang.c:1905 src/lang.c:1912 src/lang.c:1918 src/lang.c:1924 -#: src/lang.c:1931 src/lang.c:1942 src/lang.c:1948 src/lang.c:1954 src/lang.c:1960 -#: src/lang.c:1966 src/lang.c:1972 src/lang.c:1986 src/lang.c:1998 src/lang.c:2032 -#: src/lang.c:2084 src/lang.c:2091 src/lang.c:2097 src/lang.c:2122 src/lang.c:2139 -#: src/lang.c:2192 src/lang.c:2225 src/lang.c:2245 src/lang.c:2280 src/lang.c:2289 -#: src/lang.c:2314 src/lang.c:2326 src/lang.c:2345 src/lang.c:2353 +#: src/lang.c:1365 src/lang.c:1396 src/lang.c:1402 src/lang.c:1414 src/lang.c:1464 +#: src/lang.c:1470 src/lang.c:1480 src/lang.c:1500 src/lang.c:1575 src/lang.c:1745 +#: src/lang.c:1751 src/lang.c:1757 src/lang.c:1763 src/lang.c:1775 src/lang.c:1782 +#: src/lang.c:1836 src/lang.c:1845 src/lang.c:1851 src/lang.c:1858 src/lang.c:1865 +#: src/lang.c:1872 src/lang.c:1879 src/lang.c:1886 src/lang.c:1893 src/lang.c:1900 +#: src/lang.c:1907 src/lang.c:1914 src/lang.c:1921 src/lang.c:1928 src/lang.c:1935 +#: src/lang.c:1942 src/lang.c:1949 src/lang.c:1956 src/lang.c:1963 src/lang.c:1970 +#: src/lang.c:1977 src/lang.c:1984 src/lang.c:1991 src/lang.c:1998 src/lang.c:2005 +#: src/lang.c:2013 src/lang.c:2029 src/lang.c:2036 src/lang.c:2043 src/lang.c:2050 +#: src/lang.c:2056 src/lang.c:2062 src/lang.c:2079 src/lang.c:2091 src/lang.c:2125 +#: src/lang.c:2178 src/lang.c:2185 src/lang.c:2191 src/lang.c:2216 src/lang.c:2233 +#: src/lang.c:2286 src/lang.c:2322 src/lang.c:2342 src/lang.c:2377 src/lang.c:2387 +#: src/lang.c:2412 src/lang.c:2428 src/lang.c:2447 src/lang.c:2460 msgid " toggles, sets, cancels." msgstr " schaltet um, setzt, bricht ab." -#: src/lang.c:1347 +#: src/lang.c:1366 msgid "Show mini menu & posting etiquette" msgstr "Zeigt Minimenü & Posting etiquette" -#: src/lang.c:1348 +#: src/lang.c:1367 msgid "# If ON show a mini menu of useful commands at each level\n" "# and posting etiquette after composing an article\n" msgstr "# Falls ON wird ein kleines Menü mit nützlichen Kommandos in jedem Level\n" "# angezeigt. Nach dem Erstellen eines Artikels wird die etiquette angezeigt\n" -#: src/lang.c:1353 +#: src/lang.c:1372 msgid "Show short description for each newsgroup. toggles & sets." msgstr "Zeige Kurzbeschreibung für Gruppe. wechselt & setzt." -#: src/lang.c:1354 +#: src/lang.c:1373 msgid "Show description of each newsgroup" msgstr "Zeige Beschreibung der Newsgruppen" -#: src/lang.c:1355 +#: src/lang.c:1374 msgid "# If ON show group description text after newsgroup name at\n" "# group selection level\n" msgstr "# Falls ON wird die Newsgruppenbeschreibung im Gruppenauswahlmenü\n" "# nach dem Namen angezeigt\n" -#: src/lang.c:1360 +#: src/lang.c:1379 msgid "Show Subject & From (author) fields in group menu. toggles & " "sets." msgstr "Zeigt Subject & From (Autor) Felder im Gruppenmenü. wechselt & " "setzt." -#: src/lang.c:1361 +#: src/lang.c:1380 msgid "In group menu, show author by" msgstr "Im Gruppenmenü, zeige Autor an nach" -#: src/lang.c:1362 -msgid "# Part of from field to display 0) none 1) address 2) full name 3) both\n" -msgstr "# Anzeige des 'From:' Felds 0) nichts 1) Adresse 2) Voller Name 3) beides\n" +#: src/lang.c:1381 +msgid "# Part of from field to display\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = none\n" + "# 1 = address\n" + "# * 2 = full name\n" + "# 3 = both\n" +msgstr "# Anzeige des 'From:' Felds\n" + "# Mögliche Werte sind (die Voreinstellung ist mit * gekennzeichnet):\n" + "# 0 = nichts\n" + "# 1 = Adresse\n" + "# * 2 = Voller Name\n" + "# 3 = beides (Adresse und Name)\n" -#: src/lang.c:1366 +#: src/lang.c:1390 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "Zeige -> oder Hervorhebung für Auswahl. wechselt & setzt." -#: src/lang.c:1367 +#: src/lang.c:1391 msgid "Draw -> instead of highlighted bar" msgstr "Zeige -> anstatt einer Markierung" -#: src/lang.c:1368 +#: src/lang.c:1392 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "# Falls ON benutze -> andernfalls benutze eine Markierung zur Auswahl\n" -#: src/lang.c:1373 +#: src/lang.c:1397 msgid "Use inverse video for page headers" msgstr "Inverse Darstellung für die Header" -#: src/lang.c:1374 +#: src/lang.c:1398 msgid "# If ON use inverse video for page headers at different levels\n" msgstr "# Falls ON nutze inverse Darstellung für Header bei verschiedenen Ebenen\n" -#: src/lang.c:1379 +#: src/lang.c:1403 msgid "Thread articles by" msgstr "Threade Artikel anhand" -#: src/lang.c:1380 -msgid "# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n" - "# 4=(Multipart Subject).\n" -msgstr "# Zeige Artikel nach 0=(nichts) 1=(Subject) 2=(References) 3=(beides)\n" - "# 4=(Mehrteilige Artikel).\n" +#: src/lang.c:1404 +msgid "# Thread articles by ...\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = nothing\n" + "# 1 = Subject\n" + "# 2 = References\n" + "# * 3 = Both (Subject and References)\n" + "# 4 = Multipart Subject\n" +msgstr "# Gruppiere Artikel nach\n" + "# Mögliche Werte sind (die Voreinstellung ist mit * gekennzeichnet):\n" + "# 0 = nichts\n" + "# 1 = Subject\n" + "# 2 = References\n" + "# * 3 = beides (Subject und References)\n" + "# 4 = Mehrteilige Artikel\n" -#: src/lang.c:1386 +#: src/lang.c:1415 msgid "Score of a thread" msgstr "Bewertung eines Threads" -#: src/lang.c:1387 -msgid "# Thread score 0=(Max) 1=(Sum) 2=(Average)\n" -msgstr "# Bewertung des Threads 0=(Höchster) 1=(Summe) 2=(Durchschnitt)\n" +#: src/lang.c:1416 +msgid "# Thread score\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = max\n" + "# 1 = sum\n" + "# 2 = average\n" +msgstr "# Bewertung des Threads\n" + "# Mögliche Werte sind (die Voreinstellung ist mit * gekennzeichnet):\n" + "# * 0 = Höchster\n" + "# 1 = Summe\n" + "# 2 = Durchschnitt\n" -#: src/lang.c:1391 +#: src/lang.c:1424 msgid "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "Sortiere Artikel nach Subject, From, Datum oder Bewertung." -#: src/lang.c:1392 +#: src/lang.c:1425 msgid "Sort articles by" msgstr "Sortiere Artikel nach" -#: src/lang.c:1393 -msgid "# Sort articles by 0=(nothing) 1=(Subject descend) 2=(Subject ascend)\n" - "# 3=(From descend) 4=(From ascend) 5=(Date descend) 6=(Date ascend)\n" - "# 7=(Score descend) 8=(Score ascend) 9=(Lines descend) 10=(Lines ascend).\n" -msgstr "# Sort. Art. nach 0=(nichts) 1=(Subject absteigend) 2=(Subject aufsteigend)\n" - "# 3=(From abst.) 4=(From aufst.) 5=(Datum abst.) 6=(Datum aufst.)\n" - "# 7=(Bewertung abst.) 8=(Bewertung aufst.) 9=(Lines abst.) 10=(Lines " - "aufst.).\n" +#: src/lang.c:1426 +msgid "# Sort articles by ...\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = nothing\n" + "# 1 = Subject descending\n" + "# 2 = Subject ascending\n" + "# 3 = From descending\n" + "# 4 = From ascending\n" + "# 5 = Date descending\n" + "# * 6 = Date ascending\n" + "# 7 = Score descending\n" + "# 8 = Score ascending\n" + "# 9 = Lines descending\n" + "# 10 = Lines ascending\n" +msgstr "# Sortiere Artikel nach\n" + "# Mögliche Werte sind (die Voreinstellung ist mit * gekennzeichnet):\n" + "# 0 = nichts\n" + "# 1 = Subject absteigend\n" + "# 2 = Subject aufsteigend\n" + "# 3 = From absteigend\n" + "# 4 = From aufsteigend\n" + "# 5 = Datum absteigend\n" + "# * 6 = Datum aufsteigend\n" + "# 7 = Bewertung absteigend\n" + "# 8 = Bewertung aufsteigend\n" + "# 9 = Lines absteigend\n" + "# 10 = Lines aufsteigend\n" -#: src/lang.c:1399 +#: src/lang.c:1442 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "Threads nach Bewertung (Score) oder nichts ordnen. wechselt & " "setzt" -#: src/lang.c:1400 +#: src/lang.c:1443 msgid "Sort threads by" msgstr "Sortiere Threads nach" -#: src/lang.c:1401 -msgid "# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n" -msgstr "# Ordne Threads nach 0=(nichts) 1=(Bewertung abst.) 2=(Bewertung aufst.)\n" +#: src/lang.c:1444 +msgid "# Sort thread by ...\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = nothing\n" + "# * 1 = Score descending\n" + "# 2 = Score ascending\n" +msgstr "# Ordne Threads nach\n" + "# Mögliche Werte sind (die Voreinstellung ist mit * gekennzeichnet):\n" + "# 0 = nichts \n" + "# * 1 = Bewertung absteigend\n" + "# 2 = Bewertung aufsteigend\n" -#: src/lang.c:1405 +#: src/lang.c:1452 msgid "Put cursor at first/last unread art in groups. toggles & sets." msgstr "Setze Cursor an ersten/letzten ungel. Artikel. wechselt & setzt." -#: src/lang.c:1406 +#: src/lang.c:1453 msgid "Goto first unread article in group" msgstr "Setze Cursor auf ersten ungel. Art." -#: src/lang.c:1407 +#: src/lang.c:1454 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "# Falls ON setze Cursor auf ersten ungelesenen Art., sonst auf letzten\n" -#: src/lang.c:1411 +#: src/lang.c:1458 msgid "Show all articles or only unread articles. toggles & sets." msgstr "Zeige alle oder nur ungelesene Artikel. wechselt & setzt." -#: src/lang.c:1412 +#: src/lang.c:1459 msgid "Show only unread articles" msgstr "Zeige nur ungelesene Artikel" -#: src/lang.c:1413 +#: src/lang.c:1460 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "# Falls ON zeige nur neue/ungelesene Artikel, sonst alle.\n" -#: src/lang.c:1418 +#: src/lang.c:1465 msgid "Show only groups with unread arts" msgstr "Zeige nur Gruppen mit ungel. Art." -#: src/lang.c:1419 +#: src/lang.c:1466 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "# Falls ON zeige nur abonnierte Gruppen mit ungelesen Artikeln.\n" -#: src/lang.c:1424 +#: src/lang.c:1471 msgid "Filter which articles" msgstr "Filter (kill) anwenden auf" -#: src/lang.c:1425 -msgid "# 0=(Only kill unread articles)\n" - "# 1=(Kill all articles and show in threads marked with K)\n" - "# 2=(Kill all articles and never show them).\n" -msgstr "# 0=(Filtert nur ungelesene Artikel)\n" - "# 1=(Filtert alle Artikel und markiert sie mit K)\n" - "# 2=(Filtert alle Artikel und zeigt sie niemals an).\n" +#: src/lang.c:1472 +msgid "# Filter which articles\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = only kill unread articles\n" + "# 1 = kill all articles and show in threads marked with K\n" + "# 2 = kill all articles and never show them\n" +msgstr "# Filter (kill) anwenden auf\n" + "# Mögliche Werte sind (die Voreinstellung ist mit * gekennzeichnet):\n" + "# * 0 = Filtert nur ungelesene Artikel\n" + "# 1 = Filtert alle Artikel und markiert sie mit K\n" + "# 2 = Filtert alle Artikel und zeigt gekillte niemals an\n" -#: src/lang.c:1432 +#: src/lang.c:1481 msgid "Tab goes to next unread article" msgstr "Tab zeigt nächsten ungelesenen Art." -#: src/lang.c:1433 +#: src/lang.c:1482 msgid "# If ON the TAB command will go to next unread article at article viewer " "level\n" msgstr "# Falls ON wechselt TAB sofort zum nächsten ungelesenen Artikel\n" -#: src/lang.c:1437 +#: src/lang.c:1486 msgid "Scrolling with past the end of an art. jumps to the next unread one." msgstr "Weiterscrollen mit Leertaste am Artikelende wechselt zum nächsten ungel. " "Artikel" -#: src/lang.c:1438 +#: src/lang.c:1487 msgid "Space goes to next unread article" msgstr "Leertaste zeigt nächsten unge. Art." -#: src/lang.c:1439 +#: src/lang.c:1488 msgid "# If ON the SPACE command will go to next unread article at article viewer\n" "# level when the end of the article is reached (rn-style pager)\n" msgstr "# Falls ON wechselt die Leertaste zum nächsten ungelesenen Artikel, wenn\n" "# das Ende des Artikels erreicht wird (rn-Stil)\n" -#: src/lang.c:1444 +#: src/lang.c:1493 msgid "Scrolling with / past the end of an art. jumps to the unread one." msgstr "Weiterscrollen mit BildAb am Artikelende wechselt zum nächsten ungel. Artikel" -#: src/lang.c:1445 +#: src/lang.c:1494 msgid "PgDn goes to next unread article" msgstr "PgDn zeigt nächst. ungelesenen Art." -#: src/lang.c:1446 +#: src/lang.c:1495 msgid "# If ON the PGDN or DOWN command will go to next unread article when\n" "# pressed at end of message\n" msgstr "# Falls ON wechselt Bildrunter oder Cursorrunter zum nächsten ungelesenen\n" "# Artikel, wenn das Artikelende erreicht wurde\n" -#: src/lang.c:1452 +#: src/lang.c:1501 msgid "List thread using right arrow key" msgstr "Zeige Thread mit rechter Pfeilt. an" -#: src/lang.c:1453 +#: src/lang.c:1502 msgid "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "# Falls ON: Thread beim Betreten mit der rechten Cursortaste automatisch\n" "# anzeigen?\n" -#: src/lang.c:1457 +#: src/lang.c:1506 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "Definiere Zeichen für gelöschte Artikel. setzt, bricht ab." -#: src/lang.c:1458 +#: src/lang.c:1507 msgid "Character to show deleted articles" msgstr "Zeichen für gelöschte Artikel" -#: src/lang.c:1459 +#: src/lang.c:1508 msgid "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" msgstr "# Zeichen für einen Artikel, der gelöscht wurde (Voreinstellung 'D')\n" "# _ wird in ' ' umgewandelt\n" -#: src/lang.c:1464 +#: src/lang.c:1513 msgid "Enter character to indicate articles in a range. sets, cancels." msgstr "Definiere Zeichen, das Artikel im Bereich anzeigt. setzt, bricht ab." -#: src/lang.c:1465 +#: src/lang.c:1514 msgid "Character to show inrange articles" msgstr "Zeichen für Artikel im Bereich" -#: src/lang.c:1466 +#: src/lang.c:1515 msgid "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" msgstr "# Zeichen für Artikel die im Bereich sind (Voreinstellung '#')\n" "# _ wird in ' ' umgewandelt\n" -#: src/lang.c:1471 +#: src/lang.c:1520 msgid "Enter character to indicate that article will return. sets, " "cancels." msgstr "Definiere Zeichen für wiederkehrende Art. setzt. bricht ab." -#: src/lang.c:1472 +#: src/lang.c:1521 msgid "Character to show returning arts" msgstr "Zeichen für wiederkehrende Artikel" -#: src/lang.c:1473 +#: src/lang.c:1522 msgid "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" msgstr "# Zeichen, dass ein Artikel wiederkommen wird (Voreinstellung '-')\n" "# _ wird in ' ' umgewandelt\n" -#: src/lang.c:1478 +#: src/lang.c:1527 msgid "Enter character to indicate selected articles. sets, cancels." msgstr "Zeichen für Artikel mit Markierung wichtig/'hot' setzt, bricht ab." -#: src/lang.c:1479 +#: src/lang.c:1528 msgid "Character to show selected articles" msgstr "Zeichen für wichtige Artikel" -#: src/lang.c:1480 +#: src/lang.c:1529 msgid "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" msgstr "# Zeichen für Artikel mit Markierung wichtig/'hot' (Voreinstellung '*')\n" "# _ wird in ' ' umgewandelt\n" -#: src/lang.c:1485 +#: src/lang.c:1534 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "Definiere Zeichen für aktuelle Artikel. setzt, bricht ab." -#: src/lang.c:1486 +#: src/lang.c:1535 msgid "Character to show recent articles" msgstr "Zeichen für aktuelle Artikel" -#: src/lang.c:1487 +#: src/lang.c:1536 msgid "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" msgstr "# Zeichen für einen aktuellen Artikel (Voreinstellung ist 'o')\n" "# _ wird in ' ' umgewandelt\n" -#: src/lang.c:1492 +#: src/lang.c:1541 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "Zeichen für ungelesene Artikel. setzt, bricht ab." -#: src/lang.c:1493 +#: src/lang.c:1542 msgid "Character to show unread articles" msgstr "Zeichen für ungelesene Artikel" -#: src/lang.c:1494 +#: src/lang.c:1543 msgid "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" msgstr "# Zeichen für ungelesene Artikel (Voreinstellung '+')\n" "# _ wird in ' ' umgewandelt\n" -#: src/lang.c:1499 +#: src/lang.c:1548 msgid "Enter character to indicate read articles. sets, cancels." msgstr "Zeichen für gelesene Artikel. setzt, bricht ab." -#: src/lang.c:1500 +#: src/lang.c:1549 msgid "Character to show read articles" msgstr "Zeichen für gelesene Artikel" -#: src/lang.c:1501 +#: src/lang.c:1550 msgid "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" msgstr "# Zeichen für gelesene Artikel (Voreinstellung ' ')\n" "# _ wird in ' ' umgewandelt\n" -#: src/lang.c:1506 +#: src/lang.c:1555 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "Zeichen für gekillte Artikel. setzt, bricht ab." -#: src/lang.c:1507 +#: src/lang.c:1556 msgid "Character to show killed articles" msgstr "Zeichen für gekillte Artikel" -#: src/lang.c:1508 +#: src/lang.c:1557 msgid "# Character used to show that an art was killed (default 'K')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" msgstr "# Zeichen für gekillte Artikel (Voreinstellung 'K')\n" "# _ wird in ' ' umgewandelt, kill_level muss passend gesetzt sein.\n" -#: src/lang.c:1513 +#: src/lang.c:1562 msgid "Enter character to indicate read selected articles. sets, cancels." msgstr "Zeichen für gelesene wichtige/'hot' Artikel. setzt, bricht ab." -#: src/lang.c:1514 +#: src/lang.c:1563 msgid "Character to show readselected arts" msgstr "Zeichen für gelesene wichtige Art." -#: src/lang.c:1515 +#: src/lang.c:1564 msgid "# Character used to show that an art was selected before read (default ':')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" msgstr "# Zeichen für bereits gelesene Artikel mit Markierung wichtig/'hot'\n" "# (Voreinstellung ':')\n" "# _ wird in ' ' umgewandelt, kill_level muss passend gesetzt sein.\n" -#: src/lang.c:1520 +#: src/lang.c:1569 msgid "Enter maximum length of newsgroup names displayed. sets." msgstr "Maximale Länge des angezeigten Newsgruppennamens. setzt." -#: src/lang.c:1521 +#: src/lang.c:1570 msgid "Max. length of group names shown" msgstr "Max. Länge angezeigter Gruppennamen" -#: src/lang.c:1522 +#: src/lang.c:1571 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "# Maximale Länge der angezeigten Newsgruppennamen\n" -#: src/lang.c:1527 +#: src/lang.c:1576 msgid "Show lines/score in listings" msgstr "Zeige Zeilenz./Bewert. in Übersicht" -#: src/lang.c:1528 +#: src/lang.c:1577 msgid "# What informations should be displayed in article/thread listing\n" - "# 0 = nothing, 1 = lines, 2 = score, 3 = lines & score\n" -msgstr "# Welche weiteren Informationen sollen in der Artikel/Thread\n" - "# Übersicht angezeigt werden:\n" - "# 0 = keine, 1 = Zeilenzahl, 2 = Bewertung, 3 = Zeilenzahl & Bewertung\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = nothing\n" + "# * 1 = lines\n" + "# 2 = score\n" + "# 3 = lines & score\n" +msgstr "# Welche weiteren Informationen sollen in der Artikel/Thread Übersicht\n" + "# angezeigt werden.\n" + "# Mögliche Werte sind (die Voreinstellung ist mit * gekennzeichnet):\n" + "# 0 = keine\n" + "# 1 = Zeilenzahl\n" + "# 2 = Bewertung\n" + "# 3 = Zeilenzahl & Bewertung\n" -#: src/lang.c:1533 +#: src/lang.c:1586 msgid "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" msgstr "0 = seitenweise, -1 = zeige zusätzlich letzte Zeile der vorigen Seite, -2 = " "halbe Seite" -#: src/lang.c:1534 +#: src/lang.c:1587 msgid "Number of lines to scroll in pager" msgstr "Blättere Artikel um ... Zeilen" -#: src/lang.c:1535 +#: src/lang.c:1588 msgid "# Number of lines that cursor-up/down will scroll in article pager\n" - "# eg, 1+ = line-by-line, 0 = page-by-page (traditional behavior),\n" - "# -1 = the top/bottom line is carried over onto the next page,\n" - "# -2 = half-page scrolling\n" + "# Possible values are (the default is marked with *):\n" + "# -2 = half-page scrolling\n" + "# -1 = the top/bottom line is carried over onto the next page\n" + "# 0 = page-by-page (traditional behavior)\n" + "# * 1 = line-by-line\n" + "# 2 or greater = scroll by 2 or more lines (only in the pager)\n" msgstr "# Anzahl der Zeilen, die Cursor-Auf/Ab bei der Artikelanzeige\n" - "# weiterblättert. z.B.: 1+ = zeilenweise, 0 = seitenweise,\n" - "# -1 = seitenweise, zeigt zusätzlich letzte Zeile der vorigen Seite\n" - "# -2 = um eine halbe Seite\n" + "# weiterblättert.\n" + "# Mögliche Werte sind (die Voreinstellung ist mit * gekennzeichnet):\n" + "# -2 = um eine halbe Seite\n" + "# -1 = seitenweise, zeigt zusätzlich letzte Zeile der vorigen Seite\n" + "# 0 = seitenweise\n" + "# * 1 = zeilenweise\n" + "# 2 oder mehr = um 2 oder mehr Zeilen\n" -#: src/lang.c:1542 +#: src/lang.c:1598 msgid "Display signatures. toggles & sets." msgstr "Zeige Signaturen an. wechselt & setzt." -#: src/lang.c:1543 +#: src/lang.c:1599 msgid "Display signatures" msgstr "Zeige Signaturen an" -#: src/lang.c:1544 +#: src/lang.c:1600 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "# Falls OFF zeige keine Signaturen an\n" -#: src/lang.c:1548 +#: src/lang.c:1604 msgid "Display uuencoded data as tagged attachments. toggles & sets." msgstr "Uu-kodierte Teile als Attachment anzeigen. wechselt & setzt." -#: src/lang.c:1549 +#: src/lang.c:1605 msgid "Display uue data as an attachment" msgstr "Zeige uue-Teile als Attachment" -#: src/lang.c:1550 +#: src/lang.c:1606 msgid "# Handling of uuencoded data in the pager\n" - "# 0 = display raw uuencoded data\n" - "# 1 = uuencoded data will be condensed to a single tag line showing\n" - "# size and filename, similar to how MIME attachments are displayed\n" - "# 2 = as for 1, but any line that looks like uuencoded data will be folded\n" - "# into a tag line.\n" -msgstr "# Behandlung von uuencodeten Daten bei der Artikelanzeige:\n" - "# 0 = Anzeige der Rohdaten\n" - "# 1 = Einzeilige Zusammenfassung für vollständige Daten,\n" - "# ähnlich der von MIME Anhängen\n" - "# 2 = Einzeilige Zusammenfassung auch für unvollständige Daten\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = no, display raw uuencoded data\n" + "# 1 = yes, uuencoded data will be condensed to a single tag line showing\n" + "# size and filename, similar to how MIME attachments are displayed\n" + "# 2 = hide all, as for 1, but any line that looks like uuencoded data will\n" + "# be folded into a tag line.\n" +msgstr "# Behandlung von uuencodeten Daten bei der Artikelanzeige.\n" + "# Mögliche Werte sind (die Voreinstellung ist mit * gekennzeichnet):\n" + "# * 0 = Anzeige der Rohdaten\n" + "# 1 = Einzeilige Zusammenfassung für vollständige Daten\n" + "# ähnlich der von MIME Anhängen\n" + "# 2 = Einzeilige Zusammenfassung auch für unvollständige Daten\n" -#: src/lang.c:1559 +#: src/lang.c:1616 msgid "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "TeX german.sty Umlautkodierung auswerten. wechselt & setzt." -#: src/lang.c:1560 +#: src/lang.c:1617 msgid "Display \"a as Umlaut-a" msgstr "Wandle TeX-Umlaute automatisch um" -#: src/lang.c:1561 +#: src/lang.c:1618 msgid "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" msgstr "# Wenn ON dekodiere laut german.sty (TeX) kodierte Umlaute und stelle\n" "# \"a als ä, usw. dar\n" -#: src/lang.c:1566 src/lang.c:1576 +#: src/lang.c:1623 src/lang.c:1633 msgid "Space separated list of header fields" msgstr "Durch Leerzeichen getrennte Liste der Header-Felder" -#: src/lang.c:1567 +#: src/lang.c:1624 msgid "Display these header fields (or *)" msgstr "Zeige diese Header-Felder (oder *)" -#: src/lang.c:1568 +#: src/lang.c:1625 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" @@ -4788,11 +4901,11 @@ msgstr "# Welche Header wollen Sie sehen "# Leerzeichen getrennte Werte angeben. Wenn Sie hier nichts definieren\n" "# wird diese Option deaktiviert.\n" -#: src/lang.c:1577 +#: src/lang.c:1634 msgid "Do not display these header fields" msgstr "Zeige folgende Header nicht an" -#: src/lang.c:1578 +#: src/lang.c:1635 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 " @@ -4809,27 +4922,27 @@ msgstr "# Genau das gleiche wie 'news_he "# news_headers_to_not_display=X-Alan X-Pape\n" "# Wenn Sie hier nichts angeben, wird diese Option deaktiviert.\n" -#: src/lang.c:1588 +#: src/lang.c:1645 msgid "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "Automatische Bearbeitung von Art. mit multipart/alternative-Teilen aktivieren?" -#: src/lang.c:1589 +#: src/lang.c:1646 msgid "Skip multipart/alternative parts" msgstr "Übersp. multipart/alternative-Teile" -#: src/lang.c:1590 +#: src/lang.c:1647 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "# Falls ON entsorge multipart/alternative Teile des Artikels automatisch\n" -#: src/lang.c:1595 +#: src/lang.c:1652 msgid "A regex used to decide which lines to show in col_quote." msgstr "Regulärer Ausdruck für Zeilen, die mit col_quote dargestellt werden." -#: src/lang.c:1596 +#: src/lang.c:1653 msgid "Regex used to show quoted lines" msgstr "Regulärer Ausd. für zit. Zeilen" -#: src/lang.c:1597 +#: src/lang.c:1654 msgid "# A regular expression that tin will use to decide which lines are\n" "# quoted when viewing articles. Quoted lines are shown in col_quote.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4838,15 +4951,15 @@ msgstr "# Ein regulärer Ausdruck, den ti "# Farbe angezeigt, die in col_quote definiert sind.\n" "# Wenn Sie hier nichts angeben, werden die Voreinstellungen benutzt.\n" -#: src/lang.c:1603 +#: src/lang.c:1660 msgid "A regex used to decide which lines to show in col_quote2." msgstr "Regulärer Ausdruck für Zeilen, die mit col_quote2 dargestellt werden" -#: src/lang.c:1604 +#: src/lang.c:1661 msgid "Regex used to show twice quoted l." msgstr "Reg. Ausd. für zweifach zitierte Z." -#: src/lang.c:1605 +#: src/lang.c:1662 msgid "# A regular expression that tin will use to decide which lines are\n" "# quoted twice. Twice quoted lines are shown in col_quote2.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4855,15 +4968,15 @@ msgstr "# Ein regulärer Ausdruck, den ti "# Farbe dargestellt, die in col_quote2 definiert ist.\n" "# Wenn Sie hier nichts eingeben, werden die Voreinstellungen benutzt.\n" -#: src/lang.c:1611 +#: src/lang.c:1668 msgid "A regex used to decide which lines to show in col_quote3." msgstr "Regulärer Ausdruck für Zeilen, die mit col_quote3 dargestellt werden." -#: src/lang.c:1612 +#: src/lang.c:1669 msgid "Regex used to show >= 3 times q.l." msgstr "Reg. Ausd. für >=3-fach zitierte Z." -#: src/lang.c:1613 +#: src/lang.c:1670 msgid "# A regular expression that tin will use to decide which lines are\n" "# quoted >=3 times. >=3 times quoted lines are shown in col_quote3.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4872,15 +4985,15 @@ msgstr "# Ein regulärer Ausdruck, der en "# dargestellt, die in col_quote3 definiert sind.\n" "# Wenn Sie hier nichts eingeben, werden die Voreinstellungen benutzt.\n" -#: src/lang.c:1620 +#: src/lang.c:1677 msgid "A regex used to decide which words to show in col_markslashes." msgstr "Regulärer Ausdruck für Zeilen, die mit col_markslashes dargestellt werden." -#: src/lang.c:1621 +#: src/lang.c:1678 msgid "Regex used to highlight /slashes/" msgstr "Reg. für /Schrägst./ Hervorhebungen" -#: src/lang.c:1622 +#: src/lang.c:1679 msgid "# A regular expression that tin will use to decide which words\n" "# bounded by '/' are to be shown in col_markslashes.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4888,15 +5001,15 @@ msgstr "# Ein regulärer Ausdruck, der en "# zwischen '/' in col_markslashes angezeigt werden.\n" "# Wenn Sie hier nichts eingeben, werden die Voreinstellungen benutzt.\n" -#: src/lang.c:1628 +#: src/lang.c:1685 msgid "A regex used to decide which words to show in col_markstars." msgstr "Regulärer Ausdruck für Zeilen, die mit col_markstars dargestellt werden." -#: src/lang.c:1629 +#: src/lang.c:1686 msgid "Regex used to highlight *stars*" msgstr "Regu. A. für *Stern* Hervorhebungen" -#: src/lang.c:1630 +#: src/lang.c:1687 msgid "# A regular expression that tin will use to decide which words\n" "# bounded by '*' are to be shown in col_markstars.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4904,15 +5017,15 @@ msgstr "# Ein regulärer Ausdruck, der en "# zwischen '*' in col_markstars angezeigt werden.\n" "# Wenn Sie hier nichts eingeben, werden die Voreinstellungen benutzt.\n" -#: src/lang.c:1636 +#: src/lang.c:1693 msgid "A regex used to decide which words to show in col_markstroke." msgstr "Regulärer Ausdruck für Zeilen, die mit col_markstroke dargestellt werden." -#: src/lang.c:1637 +#: src/lang.c:1694 msgid "Regex used to highlight -strokes-" msgstr "Reg. für -Durchstr.- Hervorhebungen" -#: src/lang.c:1638 +#: src/lang.c:1695 msgid "# A regular expression that tin will use to decide which words\n" "# bounded by '-' are to be shown in col_markstroke.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4920,15 +5033,15 @@ msgstr "# Ein regulärer Ausdruck, der en "# zwischen '-' in col_markstroke angezeigt werden.\n" "# Wenn Sie hier nichts eingeben, werden die Voreinstellungen benutzt.\n" -#: src/lang.c:1644 +#: src/lang.c:1701 msgid "A regex used to decide which words to show in col_markdash." msgstr "Regulärer Ausdruck für Zeilen, die mit col_markdash dargestellt werden." -#: src/lang.c:1645 +#: src/lang.c:1702 msgid "Regex used to highlight _underline_" msgstr "Reg. für _Unterstr._ Hervorhebungen" -#: src/lang.c:1646 +#: src/lang.c:1703 msgid "# A regular expression that tin will use to decide which words\n" "# bounded by '_' are to be shown in col_markdash.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4936,44 +5049,44 @@ msgstr "# Ein regulärer Ausdruck, der en "# zwischen '_' in col_markdash angezeigt werden.\n" "# Wenn Sie hier nichts eingeben, werden die Voreinstellungen benutzt.\n" -#: src/lang.c:1652 +#: src/lang.c:1709 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "Reg. Ausd., um Teile im Subjectanfang zu entfernen. '|' trennt die Ausd.." -#: src/lang.c:1653 +#: src/lang.c:1710 msgid "Regex with Subject prefixes" msgstr "Reg. Ausd. für den Subjectanfang" -#: src/lang.c:1654 +#: src/lang.c:1711 msgid "# A regular expression that tin will use to find Subject prefixes\n" "# which will be removed before showing the header.\n" msgstr "# Ein regulärer Ausdruck, mit dem tin Worte im Anfang des Subjects findet,\n" "# die dann entfernt werden.\n" -#: src/lang.c:1659 +#: src/lang.c:1716 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "Reg. Ausd., um Teile am Subjectanfang zu entfernen. '|' trennt die Ausd.." -#: src/lang.c:1660 +#: src/lang.c:1717 msgid "Regex with Subject suffixes" msgstr "Reg. Ausd. für das Subjectende" -#: src/lang.c:1661 +#: src/lang.c:1718 msgid "# A regular expression that tin will use to find Subject suffixes\n" "# which will be removed when replying or posting followup.\n" msgstr "# Ein regulärer Ausdruck, der beim Antworten zum Abschneiden von\n" "# unerwünschten Teilen am Ende des Subjects verwendet wird.\n" -#: src/lang.c:1666 +#: src/lang.c:1723 msgid "Enter name and options for external MIME viewer, --internal for built-in " "viewer" msgstr "Name und Optionen für ext. MIME-Viewer, --internal für eingebaute Version" -#: src/lang.c:1667 +#: src/lang.c:1724 msgid "MIME binary content viewer" msgstr "MIME-Viewer" -#: src/lang.c:1668 +#: src/lang.c:1725 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" @@ -4982,51 +5095,51 @@ msgstr "# Falls --internal wird der eing "# nicht Text teilen benutzt. Andernfalls das angegebene Programm\n" "# (z.B. metamail). Keine Angabe schaltet die automatische Anzeige aus.\n" -#: src/lang.c:1675 +#: src/lang.c:1732 msgid "Confirm before starting non-text viewing program" msgstr "Start des MIME-Viewers bestätigen" -#: src/lang.c:1676 +#: src/lang.c:1733 msgid "Ask before using MIME viewer" msgstr "Start des MIME-Viewers bestätigen" -#: src/lang.c:1677 +#: src/lang.c:1734 msgid "# If ON tin will ask before using metamail to display MIME messages\n" "# this only happens if metamail_prog is set to something\n" msgstr "# Falls ON fragt tin nach, bevor metamail zum Anzeigen von MIME Artikeln\n" "# benutzt wird. Das passiert nur, wenn auch metamail_prog gesetzt ist.\n" -#: src/lang.c:1682 +#: src/lang.c:1739 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "Beim Beenden anbieten, alle betretenen Gruppen als gelesen zu markieren?" -#: src/lang.c:1683 +#: src/lang.c:1740 msgid "Catchup read groups when quitting" msgstr "Aufholen der Gruppen beim Beenden" -#: src/lang.c:1684 +#: src/lang.c:1741 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "# Falls ON: Beim Beenden von tin anbieten, alle betretenen Gruppen\n" "# als gelesen zu markieren\n" -#: src/lang.c:1689 +#: src/lang.c:1746 msgid "Catchup group using left key" msgstr "Catchup der Gruppe mit l. Cursor" -#: src/lang.c:1690 +#: src/lang.c:1747 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "# Falls ON: Aufholen (als gelesen markieren) der Gruppe/des Threads\n" "# beim Verlassen mit der linken Cursortaste\n" -#: src/lang.c:1695 +#: src/lang.c:1752 msgid "Catchup thread by using left key" msgstr "Catchup mit der linken Cursort." -#: src/lang.c:1701 +#: src/lang.c:1758 msgid "Which actions require confirmation" msgstr "Bestätigung erforderlich für" -#: src/lang.c:1702 +#: src/lang.c:1759 msgid "# What should we ask confirmation for.\n" msgstr "# Welche Operationen müssen explizit bestätigt werden.\n" "# Kommandos, die im Manual mit [after confirmation] markiert sind,\n" @@ -5034,436 +5147,534 @@ msgstr "# Welche Operationen müssen expl "# gelesen (siehe 'X' Befehl im Manual).\n" # TRANSLATION MISSING -#: src/lang.c:1707 +#: src/lang.c:1764 msgid "'Mark article read' ignores tags" msgstr "" -#: src/lang.c:1708 +#: src/lang.c:1765 msgid "# If ON the 'Mark article read' function marks only the current article.\n" msgstr "# Falls ON wird mit der Fuktion 'Artikel als gelesen markieren' nur\n" "# der jeweilige Artikel markiert.\n" -#: src/lang.c:1712 +#: src/lang.c:1769 msgid "Program to run to open URL's, sets, cancels." msgstr "Öffne URLs mit ... setzt, bricht ab." -#: src/lang.c:1713 +#: src/lang.c:1770 msgid "Program that opens URL's" msgstr "Öffne URLs mit ..." -#: src/lang.c:1714 +#: src/lang.c:1771 msgid "# The program used to open URL's. The actual URL will be appended\n" msgstr "# Programm zum Öffnen von URLs, die jeweilige URL wird hinten angehängt.\n" -#: src/lang.c:1719 +#: src/lang.c:1776 msgid "Use mouse in xterm" msgstr "Maus in xterm nutzen" -#: src/lang.c:1720 +#: src/lang.c:1777 msgid "# If ON enable mouse key support on xterm terminals\n" msgstr "# Falls ON wird die Maustastenunterstützung für xterm aktiviert\n" -#: src/lang.c:1726 +#: src/lang.c:1783 msgid "Use scroll keys on keypad" msgstr "Scrollt. vom Nummernblock nutzen" -#: src/lang.c:1727 +#: src/lang.c:1784 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "# Falls ON werden die Scrolltasten genutzt (Terminalabhängig)\n" -#: src/lang.c:1732 +#: src/lang.c:1789 msgid "Enter maximum number of article to get. sets." msgstr "Maximale Anzahl der zu holenden Artikel eingeben. setzt." -#: src/lang.c:1733 +#: src/lang.c:1790 msgid "Number of articles to get" msgstr "Anzahl der zu holenden Artikel" -#: src/lang.c:1734 +#: src/lang.c:1791 msgid "# Number of articles to get (0=no limit), if negative sets maximum number\n" "# of already read articles to be read before first unread one\n" msgstr "# Anzahl der zu holenden Artikel (0=unbegrenzt), falls ein negativer Wert\n" "# angegeben wird, holt tin alle ungelesenen plus die letzten n gelesenen\n" "# Artikel\n" -#: src/lang.c:1739 +#: src/lang.c:1796 msgid "Enter number of days article is considered recent. sets." msgstr "Anzahl der Tage, die ein Artikel als neu eingestuft wird. setzt." -#: src/lang.c:1740 +#: src/lang.c:1797 msgid "Article recentness time limit" msgstr "Artikel Neuheitszeit-Limit" -#: src/lang.c:1741 +#: src/lang.c:1798 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "# Anzahl der Tage, die ein Artikel als neu eingestuft wird, (0=Aus)\n" -#: src/lang.c:1745 +#: src/lang.c:1802 msgid "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "WILDMAT für normale Wildcards, REGEX für die Nutzung von regulären Ausdrücken." -#: src/lang.c:1746 +#: src/lang.c:1803 msgid "Wildcard matching" msgstr "Wildcardprüfung" -#: src/lang.c:1747 -msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" -msgstr "# Wildcardprüfung 0=(wildmat) 1=(Regulärer Ausdruck)\n" +#: src/lang.c:1804 +msgid "# Wildcard matching\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = wildmat\n" + "# 1 = regex\n" +msgstr "# Wildcardprüfung\n" + "# Mögliche Werte sind (die Voreinstellung ist mit * gekennzeichnet):\n" + "# * 0 = wildmat\n" + "# 1 = Regulärer Ausdruck\n" -#: src/lang.c:1751 +#: src/lang.c:1811 msgid "Enter minimal score before an article is marked killed. sets." msgstr "Artikel mit weniger Bewertung (Score) werden als `gekillt' markiert. " "setzt." -#: src/lang.c:1752 +#: src/lang.c:1812 msgid "Score limit (kill)" msgstr "Bewertungsgrenze (kill)" -#: src/lang.c:1753 +#: src/lang.c:1813 msgid "# Score limit before an article is marked killed\n" msgstr "# Jeder Artikel mit einer niedrigeren Bewertung (Score) wird als\n" "# gekillt markiert\n" -#: src/lang.c:1757 +#: src/lang.c:1817 msgid "Enter default score to kill articles. sets." msgstr "Bewertung für gekillte Artikel. setzt." -#: src/lang.c:1758 +#: src/lang.c:1818 msgid "Default score to kill articles" msgstr "Bewertung für gekillte Artikel" -#: src/lang.c:1759 +#: src/lang.c:1819 msgid "# Default score to kill articles\n" msgstr "# Bewertung für gekillte Artikel\n" -#: src/lang.c:1763 +#: src/lang.c:1823 msgid "Enter minimal score before an article is marked hot. sets." msgstr "Artikel mit einer höheren Bewertung (Score) werd. als wichtig/hot markiert." -#: src/lang.c:1764 +#: src/lang.c:1824 msgid "Score limit (select)" msgstr "Bewertungsgrenze (select)" -#: src/lang.c:1765 +#: src/lang.c:1825 msgid "# Score limit before an article is marked hot\n" msgstr "# Artikel mit einer höheren Bewertung (Score) werden als\n" "# wichtig (hot) markiert\n" -#: src/lang.c:1769 +#: src/lang.c:1829 msgid "Enter default score to select articles. sets." msgstr "Bewertung für wichtige Artikel (hot). setzt." -#: src/lang.c:1770 +#: src/lang.c:1830 msgid "Default score to select articles" msgstr "Bewertung für wichtige Artikel" -#: src/lang.c:1771 +#: src/lang.c:1831 msgid "# Default score to select articles\n" msgstr "# Bewertung für wichtige Artikel (hot)\n" -#: src/lang.c:1777 +#: src/lang.c:1837 msgid "Use slrnface to show ''X-Face:''s" msgstr "''X-Face:''s mit slrnface Anzeigen" -#: src/lang.c:1778 +#: src/lang.c:1838 msgid "# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n" "# Only useful when running in an xterm.\n" msgstr "# Falls ON benutze slrnface(1) um ''X-Face:'' anzuzeigen.\n" "# Funktioniert nur wenn tin in einem xterm läuft.\n" -#: src/lang.c:1786 +#: src/lang.c:1846 msgid "Use ANSI color" msgstr "Benutze ANSI-Farben" -#: src/lang.c:1787 +#: src/lang.c:1847 msgid "# If ON using ANSI-color\n" msgstr "# Falls ON benutze ANSI-Farben\n" -#: src/lang.c:1792 +#: src/lang.c:1852 msgid "Standard foreground color" msgstr "Standard Vordergrundfarbe" -#: src/lang.c:1793 +#: src/lang.c:1853 msgid "# Standard foreground color\n" + "# Default: -1 (default color)\n" msgstr "# Standard Vordergrundfarbe\n" + "# Voreinstellung: -1 (Standard Farbe)\n" -#: src/lang.c:1798 +#: src/lang.c:1859 msgid "Standard background color" msgstr "Standard Hintergrundfarbe" -#: src/lang.c:1799 -msgid "# Standard-Background-Color\n" +#: src/lang.c:1860 +msgid "# Standard background color\n" + "# Default: -1 (default color)\n" msgstr "# Standard Hintergrundfarbe\n" + "# Voreinstellung: -1 (Standard Farbe)\n" -#: src/lang.c:1804 +#: src/lang.c:1866 msgid "Color for inverse text (background)" msgstr "Farbe des inversen Text (Hinterg.)" -#: src/lang.c:1805 +#: src/lang.c:1867 msgid "# Color of background for inverse text\n" + "# Default: 4 (blue)\n" msgstr "# Farbe des Hintergrunds für inversen Text\n" + "# Voreinstellung: 4 (blau)\n" -#: src/lang.c:1810 +#: src/lang.c:1873 msgid "Color for inverse text (foreground)" msgstr "Farbe des inversen Text (Vordergr.)" -#: src/lang.c:1811 +#: src/lang.c:1874 msgid "# Color of foreground for inverse text\n" + "# Default: 7 (white)\n" msgstr "# Farbe des Vordergrunds für inversen Text\n" + "# Voreinstellung: 7 (weiß)\n" -#: src/lang.c:1816 +#: src/lang.c:1880 msgid "Color of text lines" msgstr "Farbe der Textzeilen" -#: src/lang.c:1817 -msgid "# Color of text-lines\n" +#: src/lang.c:1881 +msgid "# Color of text lines\n" + "# Default: -1 (default color)\n" msgstr "# Farbe der Textzeilen\n" + "# Voreinstellung: -1 (Standard Farbe)\n" -#: src/lang.c:1822 +#: src/lang.c:1887 msgid "Color of mini help menu" msgstr "Farbe des Minihilfemenü" -#: src/lang.c:1823 +#: src/lang.c:1888 msgid "# Color of mini help menu\n" + "# Default: 3 (brown)\n" msgstr "# Farbe des Minihilfemenü\n" + "# Voreinstellung: 3 (braun)\n" -#: src/lang.c:1828 +#: src/lang.c:1894 msgid "Color of help text" msgstr "Farbe des Hilfstext" -#: src/lang.c:1829 +#: src/lang.c:1895 msgid "# Color of help pages\n" + "# Default: -1 (default color)\n" msgstr "# Farbe der Hilfsseiten\n" + "# Voreinstellung: -1 (Standard Farbe)\n" -#: src/lang.c:1834 +#: src/lang.c:1901 msgid "Color of status messages" msgstr "Farbe der Statusmeldungen" -#: src/lang.c:1835 +#: src/lang.c:1902 msgid "# Color of messages in last line\n" + "# Default: 6 (cyan)\n" msgstr "# Farbe der letzten Zeile im Artikel\n" + "# Voreinstellung: 6 (cyan)\n" -#: src/lang.c:1840 +#: src/lang.c:1908 msgid "Color of quoted lines" msgstr "Farbe der zitierten Zeilen" -#: src/lang.c:1841 +#: src/lang.c:1909 msgid "# Color of quote-lines\n" + "# Default: 2 (green)\n" msgstr "# Farbe der zitierten Zeilen\n" + "# Voreinstellung: 2 (grün)\n" -#: src/lang.c:1846 +#: src/lang.c:1915 msgid "Color of twice quoted line" msgstr "Farbe von zweifach zitierten Zeilen" -#: src/lang.c:1847 +#: src/lang.c:1916 msgid "# Color of twice quoted lines\n" + "# Default: 3 (brown)\n" msgstr "# Farbe von zweifach zitierten Zeilen\n" + "# Voreinstellung: 3 (braun)\n" -#: src/lang.c:1852 +#: src/lang.c:1922 msgid "Color of =>3 times quoted line" msgstr "Farbe von =>3-fach zitierten Zeilen" -#: src/lang.c:1853 +#: src/lang.c:1923 msgid "# Color of >=3 times quoted lines\n" + "# Default: 4 (blue)\n" msgstr "# Farbe von =>3-fach zitierten Zeilen\n" + "# Voreinstellung: 4 (blau)\n" -#: src/lang.c:1858 +#: src/lang.c:1929 msgid "Color of article header lines" msgstr "Farbe der Artikelheaderzeilen" -#: src/lang.c:1859 +#: src/lang.c:1930 msgid "# Color of header-lines\n" + "# Default: 2 (green)\n" msgstr "# Farbe der Artikelheaderzeilen\n" + "# Voreinstellung: 2 (grün)\n" -#: src/lang.c:1864 +#: src/lang.c:1936 msgid "Color of actual news header fields" msgstr "Farbe des angezeigten Headers" -#: src/lang.c:1865 +#: src/lang.c:1937 msgid "# Color of actual news header fields\n" + "# Default: 9 (light red)\n" msgstr "# Farbe des angezeigten Headers\n" + "# Voreinstellung: 9 (hellrot)\n" -#: src/lang.c:1870 +#: src/lang.c:1943 msgid "Color of article subject lines" msgstr "Farbe der Subjectzeile" -#: src/lang.c:1871 +#: src/lang.c:1944 msgid "# Color of article subject\n" + "# Default: 6 (cyan)\n" msgstr "# Farbe der Subjectzeile\n" + "# Voreinstellung: 6 (cyan)\n" -#: src/lang.c:1876 +#: src/lang.c:1950 msgid "Color of response counter" msgstr "Farbe des Antwortzählers" -#: src/lang.c:1877 +#: src/lang.c:1951 msgid "# Color of response counter\n" + "# Default: 2 (green)\n" msgstr "# Farbe des Antwortzählers\n" + "# Voreinstellung: 2 (grün)\n" -#: src/lang.c:1882 +#: src/lang.c:1957 msgid "Color of sender (From:)" msgstr "Farbe des Autors (From:)" -#: src/lang.c:1883 +#: src/lang.c:1958 msgid "# Color of sender (From:)\n" + "# Default: 2 (green)\n" msgstr "# Farbe des Autors (From:)\n" + "# Voreinstellung: 2 (grün)\n" -#: src/lang.c:1888 +#: src/lang.c:1964 msgid "Color of help/mail sign" msgstr "Farbe des Hilfe/Mail-Zeichen" -#: src/lang.c:1889 +#: src/lang.c:1965 msgid "# Color of Help/Mail-Sign\n" + "# Default: 4 (blue)\n" msgstr "# Farbe des Hilfe/Mail-Zeichen\n" + "# Voreinstellung: 4 (blau)\n" -#: src/lang.c:1894 +#: src/lang.c:1971 msgid "Color of signatures" msgstr "Farbe von Signaturen" -#: src/lang.c:1895 +#: src/lang.c:1972 msgid "# Color of signature\n" + "# Default: 4 (blue)\n" msgstr "# Farbe von Signaturen\n" + "# Voreinstellung: 4 (blau)\n" -#: src/lang.c:1900 +#: src/lang.c:1978 msgid "Color of highlighted URLs" msgstr "Farbe der hervorgehobenen URLs" -#: src/lang.c:1901 +#: src/lang.c:1979 msgid "# Color of highlighted URLs\n" + "# Default: -1 (default color)\n" msgstr "# Farbe der hervorgehobenen URLs\n" + "# Voreinstellung: -1 (Standard Farbe)\n" -#: src/lang.c:1906 +#: src/lang.c:1985 msgid "Color of highlighting with *stars*" msgstr "Farbe der Hervorhebung *Sterne*" -#: src/lang.c:1907 -msgid "# Color of word highlighting. There are four possibilities\n" - "# in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n" -msgstr "# Farbe der Hervorhebungen. Es gibt vier Möglichkeiten in Artikeln:\n" - "# *Sterne*, _Unterstriche_, /Schrägstriche/ und -Durchstreichen-.\n" +#: src/lang.c:1986 +msgid "# Color of word highlighting with *stars*\n" + "# Default: 11 (yellow)\n" +msgstr "# Farbe der Hervorhebung durch *Sterne*\n" + "# Voreinstellung: 11 (gelb)\n" -#: src/lang.c:1913 +#: src/lang.c:1992 msgid "Color of highlighting with _dash_" msgstr "Farbe der Hervorhebung _Striche_" -#: src/lang.c:1919 +#: src/lang.c:1993 +msgid "# Color of word highlighting with _dash_\n" + "# Default: 13 (light pink)\n" +msgstr "# Farbe der Hervorhebung durch _Striche_\n" + "# Voreinstellung: 13 (hellrosa)\n" + +#: src/lang.c:1999 msgid "Color of highlighting with /slash/" msgstr "Farbe der Hervorhebung /Schrägstr./" -#: src/lang.c:1925 +#: src/lang.c:2000 +msgid "# Color of word highlighting with /slash/\n" + "# Default: 14 (light cyan)\n" +msgstr "# Farbe der Hervorhebung durch /Schrägstriche/\n" + "# Voreinstellung: 11 (hellcyan)\n" + +#: src/lang.c:2006 msgid "Color of highlighting with -stroke-" msgstr "Farbe der Hervorhebung -Durchstr.-" -#: src/lang.c:1932 +#: src/lang.c:2007 +msgid "# Color of word highlighting with -stroke-\n" + "# Default: 12 (light blue)\n" +msgstr "# Farbe der Hervorhebung duch -Durchstreichen-\n" + "# Voreinstellung: 12 (hellblau)\n" + +#: src/lang.c:2014 msgid "Attr. of highlighting with *stars*" msgstr "Hervorhebungsattribute *Sterne*" -#: src/lang.c:1933 -msgid "# Attribute of word highlighting on mono terminals.\n" - "# There are four possibilities in articles:\n" - "# *stars*, /slashes/, _underdashes_ and -strokes-.\n" - "# The possible values are:\n" - "# 0 - Normal, 1 - Underline, 2 - Best highlighting,\n" - "# 3 - Reverse video, 4 - Blinking, 5 - Half bright, 6 - Bold\n" +#: src/lang.c:2015 +msgid "# Attributes of word highlighting on mono terminals\n" + "# Possible values are:\n" + "# 0 = Normal\n" + "# 1 = Underline\n" + "# 2 = Best highlighting\n" + "# 3 = Reverse video\n" + "# 4 = Blinking\n" + "# 5 = Half bright\n" + "# 6 = Bold\n" + "\n" + "# Attribute of word highlighting with *stars*\n" + "# Default: 6 (bold)\n" msgstr "# Attribute der Hervorhebung von Wörtern auf monochromen Terminals.\n" - "# Es gibt vier Möglichkeiten in Artikeln:\n" - "# *Sterne*, /Schrägstriche/, _Unterstriche_ und -Durchstreichungen-.\n" - "# Die möglichen Werte sind:\n" - "# 0 - normal, 1 - unterstrichen, 2 - beste Hervorhebung,\n" - "# 3 - invers, 4 - blinkend, 5 - halbe Helligkeit, 6 - fett\n" + "# Mögliche Werte sind:\n" + "# 0 = normal\n" + "# 1 = unterstrichen\n" + "# 2 = beste Hervorhebung\n" + "# 3 = invers\n" + "# 4 = blinkend\n" + "# 5 = halbe Helligkeit\n" + "# 6 = fett\n" + "\n" + "# Hervorhebungsattribut für *Sterne*\n" + "# Voreinstellung: 6 (fett)\n" -#: src/lang.c:1943 +#: src/lang.c:2030 msgid "Attr. of highlighting with _dash_" msgstr "Hervorhebungsattr. _Unterstriche_" -#: src/lang.c:1949 +#: src/lang.c:2031 +msgid "# Attribute of word highlighting with _dash_\n" + "# Default: 2 (best highlighting)\n" +msgstr "# Hervorhebungsattribut für _Unterstriche_\n" + "# Voreinstellung: 2 (beste Hervorhebung)\n" + +#: src/lang.c:2037 msgid "Attr. of highlighting with /slash/" msgstr "Hervorhebungsattr. /Schrägstriche/" -#: src/lang.c:1955 +#: src/lang.c:2038 +msgid "# Attribute of word highlighting with /slash/\n" + "# Default: 5 (half bright)\n" +msgstr "# Hervorhebungsattribut für /Schrägstriche/\n" + "# Voreinstellung: 5 (halbe Helligkeit)\n" + +#: src/lang.c:2044 msgid "Attr. of highlighting with -stroke-" msgstr "Hervorhebungsattr. -Durchstreich.-" -#: src/lang.c:1961 +#: src/lang.c:2045 +msgid "# Attribute of word highlighting with -stroke-\n" + "# Default: 3 (reverse video)\n" +msgstr "# Hervorhebungsattribut für -Durchstreichen-\n" + "# Voreinstellung: 3 (Invers)\n" + +#: src/lang.c:2051 msgid "URL highlighting in message body" msgstr "URL-Hervorhebung im Artikel" -#: src/lang.c:1962 +#: src/lang.c:2052 msgid "# Enable URL highlighting?\n" msgstr "# URL-Hervorhebung aktivieren?\n" -#: src/lang.c:1967 +#: src/lang.c:2057 msgid "Word highlighting in message body" msgstr "Wort-Hervorhebung im Artikel" -#: src/lang.c:1968 +#: src/lang.c:2058 msgid "# Enable word highlighting?\n" msgstr "# Wort-Hervorhebung aktivieren?\n" -#: src/lang.c:1973 +#: src/lang.c:2063 msgid "What to display instead of mark" msgstr "Anstelle der Markierung anzeigen" -#: src/lang.c:1974 +#: src/lang.c:2064 msgid "# Should the leading and ending stars and dashes also be displayed,\n" "# even when they are highlighting marks?\n" - "# 0 - no 1 - yes, display mark 2 - print a space instead\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = no\n" + "# 1 = yes, display mark\n" + "# * 2 = print a space instead\n" msgstr "# Sollen die führenden und abschließenden Sterne und Striche dargestellt\n" "# werden, auch wenn sie Hervorhebungsmarkierungen sind?\n" - "# 0 - nein 1 - ja, anzeigen 2 - Leerzeichen anstelle darstellen\n" + "# Mögliche Werte sind (die Voreinstellung ist mit * gekennzeichnet):\n" + "# 0 = nein\n" + "# 1 = ja, anzeigen\n" + "# * 2 = Leerzeichen anstelle darstellen\n" -#: src/lang.c:1980 +#: src/lang.c:2073 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "Nach wie vielen Zeichen soll im Pager umbrochen werden? setzt." -#: src/lang.c:1981 +#: src/lang.c:2074 msgid "Page line wrap column" msgstr "Zeilen umbrechen nach" -#: src/lang.c:1982 +#: src/lang.c:2075 msgid "# Wrap article lines at column\n" msgstr "# In der Artikelanzeige Zeilen umbrechen bei Spalte\n" -#: src/lang.c:1987 +#: src/lang.c:2080 msgid "Wrap around threads on next unread" msgstr "Nä.ungel.-kein Abbr. am Listenende?" -#: src/lang.c:1988 +#: src/lang.c:2081 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "# Diverse Funktionen in tin wechseln zum \"nächsten\" ungelesenen\n" "# Artikel. Diese Einstellung kontrolliert, ob tin am Ende der\n" "# Artikel/Threadliste abbricht (OFF) oder zum Beginn derselben springt und\n" "# von dort aus den nächsten ungelesenen Artikel sucht. (ON)\n" -#: src/lang.c:1992 +#: src/lang.c:2085 msgid "Enter default mail address (and fullname). sets." msgstr "Standard Mail-Adresse (und Name) eingeben. setzt." -#: src/lang.c:1993 +#: src/lang.c:2086 msgid "Mail address (and fullname)" msgstr "Mailadresse (und Name)" -#: src/lang.c:1994 +#: src/lang.c:2087 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "# EMail-Adresse und vollständiger Name des Benutzers, wenn sie nicht\n" "# benutzername@host (Vollständiger Name) lautet\n" -#: src/lang.c:1999 +#: src/lang.c:2092 msgid "Show empty Followup-To in editor" msgstr "Leeres Fup'2 im Editor anzeigen" -#: src/lang.c:2000 +#: src/lang.c:2093 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "# Wenn ON, zeige leeren Followup-To:-Header im Editor\n" -#: src/lang.c:2004 +#: src/lang.c:2097 msgid "Enter path/! command/--none to create your default signature. sets." msgstr "Setze Pfad/! Kommando/--none um ihre Signatur festzulegen. setzt." -#: src/lang.c:2005 +#: src/lang.c:2098 msgid "Create signature from path/command" msgstr "Erzeuge Signatur aus Pfad/Kommando" -#: src/lang.c:2006 +#: src/lang.c:2099 msgid "# Signature path (random sigs)/file to be used when posting/replying\n" "# default_sigfile=file appends file as signature\n" "# default_sigfile=!command executes external command to generate a " @@ -5474,78 +5685,80 @@ msgstr "# Pfad der Sig (Zufällige Sigs)/ "# default_sigfile=!Kommando führt Kommando aus um Sig zu erzeugen\n" "# default_sigfile=--none hängt keine Signatur an\n" -#: src/lang.c:2013 +#: src/lang.c:2106 msgid "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "Trenne Sig mit \"-- \" in eigener Zeile ab. wechselt & setzt." -#: src/lang.c:2014 +#: src/lang.c:2107 msgid "Prepend signature with \"-- \"" msgstr "Trenne Sig mit \"-- \" ab" -#: src/lang.c:2015 +#: src/lang.c:2108 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "# Falls ON trenne Signatur mit '\\n-- \\n' ab\n" -#: src/lang.c:2019 +#: src/lang.c:2112 msgid "Add signature when reposting articles. toggles & sets." msgstr "Sig. beim Reposten eines Artikels hinzufügen? wechselt & setzt." -#: src/lang.c:2020 +#: src/lang.c:2113 msgid "Add signature when reposting" msgstr "Signatur beim Reposten anhängen" -#: src/lang.c:2021 +#: src/lang.c:2114 msgid "# If ON add signature to reposted articles\n" msgstr "# Falls ON wird die Signatur auch an repostete Artikel angehängt.\n" -#: src/lang.c:2025 +#: src/lang.c:2118 msgid "Enter quotation marks, %s or %S for author's initials." msgstr "Zitatzeichen eingeben, %s oder %S für die Initialen des Verfassers." -#: src/lang.c:2026 +#: src/lang.c:2119 msgid "Characters used as quote-marks" msgstr "Zitatzeichen" -#: src/lang.c:2027 +#: src/lang.c:2120 msgid "# Characters used in quoting to followups and replies.\n" "# '_' is replaced by ' ', %%s, %%S are replaced by author's initials.\n" msgstr "# Zeichen für Zitate in Antworten.\n" "# '_' wird durch ' ' ersetzt. %%s, %%S wird ersetzt durch Autoreninitialen.\n" -#: src/lang.c:2033 +#: src/lang.c:2126 msgid "Quoting behavior" msgstr "Zitierverhalten" -#: src/lang.c:2034 +#: src/lang.c:2127 msgid "# How quoting should be handled when following up or replying.\n" - "# 0 = Nothing special\n" - "# 1 = Compress quotes\n" - "# 2 = Quote signatures\n" - "# 3 = Compress quotes, quote signatures\n" - "# 4 = Quote empty lines\n" - "# 5 = Compress quotes, quote empty lines\n" - "# 6 = Quote signatures, quote empty lines\n" - "# 7 = Compress quotes, quote signatures, quote empty lines\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = Nothing special\n" + "# 1 = Compress quotes\n" + "# 2 = Quote signatures\n" + "# 3 = Compress quotes, quote signatures\n" + "# 4 = Quote empty lines\n" + "# * 5 = Compress quotes, quote empty lines\n" + "# 6 = Quote signatures, quote empty lines\n" + "# 7 = Compress quotes, quote signatures, quote empty lines\n" msgstr "# Spezielle Optionen beim Zitieren\n" - "# 0 = nichts besonderes\n" - "# 1 = Zitatzeichen zusammenziehen: '>>> ' statt '> > > '\n" - "# 2 = Signaturen zitieren\n" - "# 3 = Zitatzeichen zusammenziehen & Signaturen zitieren\n" - "# 4 = Leerzeilen zitieren\n" - "# 5 = Zitatzeichen zusammenziehen & Leerzeilen zitieren\n" - "# 6 = Signaturen zitieren & Leerzeilen zitieren\n" - "# 7 = Zitatzeichen zusammenziehen & Signaturen zitieren & Leerzeilen " + "# Mögliche Werte sind (die Voreinstellung ist mit * gekennzeichnet):\n" + "# 0 = nichts besonderes\n" + "# 1 = Zitatzeichen zusammenziehen: '>>> ' statt '> > > '\n" + "# 2 = Signaturen zitieren\n" + "# 3 = Zitatzeichen zusammenziehen & Signaturen zitieren\n" + "# 4 = Leerzeilen zitieren\n" + "# * 5 = Zitatzeichen zusammenziehen & Leerzeilen zitieren\n" + "# 6 = Signaturen zitieren & Leerzeilen zitieren\n" + "# 7 = Zitatzeichen zusammenziehen & Signaturen zitieren & Leerzeilen " "zitieren\n" -#: src/lang.c:2046 src/lang.c:2054 src/lang.c:2060 +#: src/lang.c:2140 src/lang.c:2148 src/lang.c:2154 msgid "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "%A Adr %D Datum %F Adr+Name %G Gruppenname %M Message-ID %N Name %C Vorname" -#: src/lang.c:2047 +#: src/lang.c:2141 msgid "Quote line when following up" msgstr "Einleitungszeile beim Antworten" -#: src/lang.c:2048 +#: src/lang.c:2142 msgid "# Format of quote line when mailing/posting/following-up an article\n" "# %%A Address %%D Date %%F Addr+Name %%G Groupname %%M Message-ID\n" "# %%N Full Name %%C First Name %%I Initials\n" @@ -5553,35 +5766,35 @@ msgstr "# Format der Einleitungszeile be "# %%A Adresse %%D Datum %%F Adr+Name %%G Gruppenname %%M Message-ID\n" "# %%N Voller Name %%C Vorname %%I Initialen\n" -#: src/lang.c:2055 +#: src/lang.c:2149 msgid "Quote line when cross-posting" msgstr "Einleitungszeile beim Crossposten" -#: src/lang.c:2061 +#: src/lang.c:2155 msgid "Quote line when mailing" msgstr "Einleitungszeile bei Mailantwort" -#: src/lang.c:2066 +#: src/lang.c:2160 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "Falls ON, füge User-Agent:-Header ein. wechselt & setzt." -#: src/lang.c:2067 +#: src/lang.c:2161 msgid "Insert 'User-Agent:'-header" msgstr "Füge 'User-Agent:'-header ein" -#: src/lang.c:2068 +#: src/lang.c:2162 msgid "# If ON include advertising User-Agent: header\n" msgstr "# Falls ON füge 'User-Agent: header' ein\n" -#: src/lang.c:2073 +#: src/lang.c:2167 msgid "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "Zeichensatz für MIME (z.B. US-ASCII, ISO-8859-1, EUC-KR), setzt." -#: src/lang.c:2074 +#: src/lang.c:2168 msgid "MM_CHARSET" msgstr "MM_CHARSET" -#: src/lang.c:2075 +#: src/lang.c:2169 msgid "# Charset supported locally which is also used for MIME header and\n" "# Content-Type header.\n" "# If not set, the value of the environment variable MM_CHARSET is used.\n" @@ -5598,27 +5811,27 @@ msgstr "# Der lokale Zeichensatz, der au "# definiert, werden andere Zeichensätze als mm_charset nicht dargestellt\n" "# und die jeweiligen Zeichen durch ein '?' ersetzt.\n" -#: src/lang.c:2085 +#: src/lang.c:2179 msgid "MM_NETWORK_CHARSET" msgstr "MM_NETWORK_CHARSET" -#: src/lang.c:2086 +#: src/lang.c:2180 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "# Zeichensatz für den MIME (Content-Type) Header der Artikel.\n" -#: src/lang.c:2092 +#: src/lang.c:2186 msgid "Mailbox format" msgstr "Mailbox-Format" -#: src/lang.c:2093 +#: src/lang.c:2187 msgid "# Format of the mailbox.\n" msgstr "# Format der Mailbox.\n" -#: src/lang.c:2098 +#: src/lang.c:2192 msgid "MIME encoding in news messages" msgstr "MIME-Kodierung in Newsartikeln" -#: src/lang.c:2099 +#: src/lang.c:2193 msgid "# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n" "# for mails and posts, if necessary. QP is efficient for most European\n" "# character sets (ISO-8859-X) with small fraction of non-US-ASCII chars,\n" @@ -5632,15 +5845,15 @@ msgstr "# MIME-Kodierung (8bit, base64, "# die meisten 8Bit Zeichensätze aus Ostasien, Griechenland und Russland\n" "# ist, da dort gehäuft 8Bit Zeichen vorkommen.\n" -#: src/lang.c:2107 src/lang.c:2128 +#: src/lang.c:2201 src/lang.c:2222 msgid "Don't change unless you know what you are doing. cancels." msgstr "Nur ändern, wenn Sie genau wissen, was Sie machen. bricht ab" -#: src/lang.c:2108 +#: src/lang.c:2202 msgid "Use 8bit characters in news headers" msgstr "Benutze 8bit-Zeichen im Newsheader" -#: src/lang.c:2109 +#: src/lang.c:2203 msgid "# If ON, 8bit characters in news headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" "# 8bit chars in header are encoded regardless of the value of this\n" @@ -5652,27 +5865,27 @@ msgstr "# Wenn ON werden 8-Bit-Zeichen ( "# kodiert, wenn post_mime_encoding nicht auch auf 8bit eingestellt\n" "# ist.\n" -#: src/lang.c:2116 +#: src/lang.c:2210 msgid "Auto-view post-processed files toggles, sets, cancels." msgstr "Nachbearbeitete Artikel autom. anz. wechselt, setzt, Ende" -#: src/lang.c:2117 +#: src/lang.c:2211 msgid "View post-processed files" msgstr "Nachbearbeitete Artikel anzeigen" -#: src/lang.c:2118 +#: src/lang.c:2212 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "# Wenn ON werden nachbearbeitete Artikel automatisch angezeigt.\n" -#: src/lang.c:2123 +#: src/lang.c:2217 msgid "MIME encoding in mail messages" msgstr "MIME-Kodierung für E-Mails" -#: src/lang.c:2129 +#: src/lang.c:2223 msgid "Use 8bit characters in mail headers" msgstr "Benutze 8bit Zeichen im Mail Header" -#: src/lang.c:2130 +#: src/lang.c:2224 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 " @@ -5689,24 +5902,24 @@ msgstr "# Wenn ON werden 8-Bit-Zeichen ( "# E-Mailheadern verbieten, daher sollte diese Einstellung NICHT auf ON\n" "# geändert werden, wenn es keine zwingende Gründe dafür gibt.\n" -#: src/lang.c:2140 +#: src/lang.c:2234 msgid "Strip blanks from ends of lines" msgstr "Leerzeichen am Zeilenende entfernen" -#: src/lang.c:2141 +#: src/lang.c:2235 msgid "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" msgstr "# Falls ON lösche Leerzeichen am Zeilenende; verbessert die Geschwindigkeit\n" -#: src/lang.c:2146 +#: src/lang.c:2240 msgid "If ON, use transliteration. toggles & sets." msgstr "Wenn ON verwende Umschreibungen. wechselt & setzt." -#: src/lang.c:2147 +#: src/lang.c:2241 msgid "Transliteration" msgstr "Verwende Umschreibungen" -#: src/lang.c:2148 +#: src/lang.c:2242 msgid "# If ON, use //TRANSLIT extension. This means that when a character cannot\n" "# be represented in the in the target character set, it can be approximated\n" "# through one or several similarly looking characters.\n" @@ -5716,242 +5929,248 @@ msgstr "# Wenn ON verwende //TRANSLIT Er "# Terminal als EUR umschrieben, ohne //TRANSLIT würde tin ein\n" "# Fragezeichen verwenden.\n" -#: src/lang.c:2155 +#: src/lang.c:2249 msgid "Send you a carbon copy automatically. toggles & sets." msgstr "Sendet ihnen automatisch eine Kopie. wechselt & setzt." -#: src/lang.c:2156 +#: src/lang.c:2250 msgid "Send you a cc automatically" msgstr "Sendet Ihnen ein Cc automatisch" -#: src/lang.c:2157 +#: src/lang.c:2251 msgid "# If ON automatically put your name in the Cc: field when mailing an article\n" msgstr "# Falls ON wird Ihr Name in das Cc: Feld beim Mailen des Artikels eingesetzt\n" -#: src/lang.c:2161 +#: src/lang.c:2255 msgid "Send you a blind carbon copy automatically. toggles & sets." msgstr "Sendet ihnen automatisch eine blinde Kopie. wechselt & setzt." -#: src/lang.c:2162 +#: src/lang.c:2256 msgid "Send you a blind cc automatically" msgstr "Sendet Ihnen eine blinde cc autom." -#: src/lang.c:2163 +#: src/lang.c:2257 msgid "# If ON automatically put your name in the Bcc: field when mailing an " "article\n" msgstr "# Falls ON wird Ihr Name in das Bcc: Feld beim Mailen des Artikels " "eingesetzt\n" -#: src/lang.c:2167 +#: src/lang.c:2261 msgid "Enter address elements about which you want to be warned. sets." msgstr "Geben Sie den Adressenteil an, vor dem Sie gewarnt werden. setzt." -#: src/lang.c:2168 +#: src/lang.c:2262 msgid "Spamtrap warning address parts" msgstr "Spamfallenwarnung in Adresse" -#: src/lang.c:2169 +#: src/lang.c:2263 msgid "# A comma-delimited list of address-parts you want to be warned\n" "# about when trying to reply by email.\n" msgstr "# Eine Komma-separierte Liste von Adressteilen, vor denen gewarnt wird, wenn\n" "# Sie via Mail antworten wollen.\n" -#: src/lang.c:2174 +#: src/lang.c:2268 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "Gültigkeit eines Filtereintrags in Tagen. setzt." -#: src/lang.c:2175 +#: src/lang.c:2269 msgid "No. of days a filter entry is valid" msgstr "Tage, die ein Filter gültig ist" -#: src/lang.c:2176 +#: src/lang.c:2270 msgid "# Number of days a short term filter will be active\n" msgstr "# Anzahl der Tage die ein temporaerer Filter aktiv ist\n" -#: src/lang.c:2180 +#: src/lang.c:2274 msgid "Add posted articles to filter. toggles & sets." msgstr "Gepostete Artikel zum Filter hinzufügen. wechselt & setzt." -#: src/lang.c:2181 +#: src/lang.c:2275 msgid "Add posted articles to filter" msgstr "Füge gepostete Artikel zum Filter" -#: src/lang.c:2182 +#: src/lang.c:2276 msgid "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" msgstr "# Falls ON füge gepostete Article die einen neunen Thread einleiten\n" "# zum Filter hinzu um evtl. Antworten hervorzuheben\n" -#: src/lang.c:2186 +#: src/lang.c:2280 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "Verzeichnis, in dem Artikel/Threads im mailbox-Format gespeichert werden" -#: src/lang.c:2187 +#: src/lang.c:2281 msgid "Mail directory" msgstr "Mail Verzeichnis" -#: src/lang.c:2188 +#: src/lang.c:2282 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "# (-m) Verzeichnis für im mailbox-Format gespeicherte Artikel/Threads\n" -#: src/lang.c:2193 +#: src/lang.c:2287 msgid "Save articles in batch mode (-S)" msgstr "Speicher Artikel im Batchmode (-S)" -#: src/lang.c:2194 +#: src/lang.c:2288 msgid "# If ON articles/threads will be saved in batch mode when save -S\n" "# or mail (-M/-N) is specified on the command line\n" msgstr "# Falls ON werden Artikel/Threads im Batchmode gespeichert wenn save -S,\n" "# oder gemailt, wenn -M bzw. -N in der Kommandozeile angegeben wurde\n" -#: src/lang.c:2199 +#: src/lang.c:2293 msgid "The directory where you want articles/threads saved." msgstr "Das Verzeichnis, in dem Artikel/Threads gespeichert werden sollen." -#: src/lang.c:2200 +#: src/lang.c:2294 msgid "Directory to save arts/threads in" msgstr "Verz. um Art/Threads zu speichern" -#: src/lang.c:2201 +#: src/lang.c:2295 msgid "# Directory where articles/threads are saved\n" msgstr "# Verzeichnis in dem Artikel/Threads gespeichert werden\n" -#: src/lang.c:2205 +#: src/lang.c:2299 msgid "Auto save article/thread by Archive-name: header. toggles & sets." msgstr "Autom. sp. von Art/Thread anhand Archive-name:-Header. wechselt & " " setzt." -#: src/lang.c:2206 +#: src/lang.c:2300 msgid "Use Archive-name: header for save" msgstr "Nutze Archive-name: zum Speichern" -#: src/lang.c:2207 +#: src/lang.c:2301 msgid "# If ON articles/threads with Archive-name: in mail header will\n" "# be automatically saved with the Archive-name & part/patch no.\n" msgstr "# Falls ON werden Artikel mit gesetztem Archive-name:-Header unter\n" "# diesem abgespeichert\n" -#: src/lang.c:2212 +#: src/lang.c:2306 msgid "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "Gesp. Art. gelesen markieren. wechselt, setzt, bricht ab." -#: src/lang.c:2213 +#: src/lang.c:2307 msgid "Mark saved articles/threads as read" msgstr "Mark. gesp. Artikel/Threads gelesen" -#: src/lang.c:2214 +#: src/lang.c:2308 msgid "# If ON mark articles that are saved as read\n" msgstr "# Falls ON werden gespeicherte Artikel als gelesen markiert\n" -#: src/lang.c:2218 +#: src/lang.c:2312 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "Bearbeite (z.B. unshar) gesp. Art/Threads. wechselt & setzt." -#: src/lang.c:2219 +#: src/lang.c:2313 msgid "Post process saved articles" msgstr "Nachbearbeiten gespeichert. Artikel" -#: src/lang.c:2220 +#: src/lang.c:2314 msgid "# Perform post processing (saving binary attachments) from saved articles.\n" - "# 0=(no) 1=(yes) 2=(extract shell archives (shar) only)\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = no\n" + "# 1 = extract shell archives (shar) only\n" + "# 2 = yes\n" msgstr "# Nachbearbeiten gespeicherter Artikel\n" - "# 0=(nein) 1=(ja) 2=(nur Shell Archive (shar) auspacken)\n" + "# Mögliche Werte sind (die Voreinstellung ist mit * gekennzeichnet):\n" + "# * 0 = nein\n" + "# 1 = ja\n" + "# 2 = nur Shell Archive (shar) auspacken\n" -#: src/lang.c:2226 +#: src/lang.c:2323 msgid "Process only unread articles" msgstr "Bearbeite nur ungelesene Artikel" -#: src/lang.c:2227 +#: src/lang.c:2324 msgid "# If ON only save/print/pipe/mail unread articles (tagged articles excepted)\n" msgstr "# Falls ON speichere/drucke/pipe/maile nur ungelesene Artikel\n" "# (markierte Artikel ausgenommen)\n" -#: src/lang.c:2232 +#: src/lang.c:2329 msgid "Print all or just part of header. toggles & sets." msgstr "Drucke alles oder nur Teile des Headers wechselt & setzt." -#: src/lang.c:2233 +#: src/lang.c:2330 msgid "Print all headers when printing" msgstr "Alle Header beim Drucken ausgeben" -#: src/lang.c:2234 +#: src/lang.c:2331 msgid "# If ON print all of article header otherwise just the important lines\n" msgstr "# Falls ON drucke alle Header des Artikels aus. Ansonsten nur die " "wichtigsten\n" -#: src/lang.c:2238 +#: src/lang.c:2335 msgid "The printer program with options that is to be used to print articles/threads." msgstr "Das Druckprogramm, das zum drucken von Artikeln/Threads benutzt wird." -#: src/lang.c:2239 +#: src/lang.c:2336 msgid "Printer program with options" msgstr "Druckprogramm mit Optionen" -#: src/lang.c:2240 +#: src/lang.c:2337 msgid "# Print program with parameters used to print articles/threads\n" msgstr "# Druckprogramm mit Optionen zum drucken der Artikel/Threads\n" -#: src/lang.c:2246 +#: src/lang.c:2343 msgid "Force redraw after certain commands" msgstr "Anzeigeauffrischung nach Kommandos" -#: src/lang.c:2247 +#: src/lang.c:2344 msgid "# If ON a screen redraw will always be done after certain external commands\n" msgstr "# Falls ON wird die Anzeige nach einigen externen Kommandos aufgefrischt\n" -#: src/lang.c:2251 +#: src/lang.c:2348 msgid "Start editor with line offset. toggles, sets, cancels." msgstr "Starte Editor mit Einrückung. wechselt, setzt, bricht ab." -#: src/lang.c:2252 +#: src/lang.c:2349 msgid "Start editor with line offset" msgstr "Starte Editor mit Einrückung" -#: src/lang.c:2253 +#: src/lang.c:2350 msgid "# If ON editor will be started with cursor offset into the file\n" "# otherwise the cursor will be positioned at the first line\n" msgstr "# Falls ON wird der Cursor im Editor an die definierte Position gesetzt.\n" "# Anderenfalls wird der Cursor in die erste Zeile gesetzt\n" -#: src/lang.c:2258 +#: src/lang.c:2355 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "%E für Editor, %F für Dateiname, %N für Zeilennummer, setzt." -#: src/lang.c:2259 +#: src/lang.c:2356 msgid "Invocation of your editor" msgstr "Aufruf ihres Editors" -#: src/lang.c:2260 +#: src/lang.c:2357 msgid "# Format of editor line including parameters\n" "# %%E Editor %%F Filename %%N Linenumber\n" msgstr "# Format der Editorzeile mit den Parametern für den Aufruf\n" "# %%E Editor %%F Dateiname %%N Zeilennummer\n" -#: src/lang.c:2265 +#: src/lang.c:2362 msgid "Enter name and options for external-inews, --internal for internal inews" msgstr "Name und Optionen für ext. inews, --internal für eingebaute Version" -#: src/lang.c:2266 +#: src/lang.c:2363 msgid "External inews" msgstr "Externes inews-Programm" -#: src/lang.c:2267 +#: src/lang.c:2364 msgid "# If --internal use the built in mini inews for posting via NNTP\n" "# otherwise use an external inews program\n" msgstr "# Falls --internal wird das eingebaute mini inews zum posten via NNTP\n" "# benutzt, sonst wird das hier angegebene Programm mit den angebenen\n" "# Optionen verwendet. z.B. 'inews -h'\n" -#: src/lang.c:2271 +#: src/lang.c:2368 msgid "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "%M für den Mailer, %S für Subject, %T für to, %F für Dateinamen, setzt." -#: src/lang.c:2272 +#: src/lang.c:2369 msgid "Invocation of your mail command" msgstr "Aufruf ihres Mailkommandos" -#: src/lang.c:2273 +#: src/lang.c:2370 msgid "# Format of mailer line including parameters\n" "# %%M Mailer %%S Subject %%T To %%F Filename\n" "# ie. to use elm as your mailer: elm -s \"%%S\" \"%%T\" < %%F\n" @@ -5961,149 +6180,167 @@ msgstr "# Format der Mailkommandozeile m "# Ein Beispiel für elm : elm -s \"%%S\" \"%%T\" < %%F\n" "# Ein Beispiel für elm interaktiv: elm -i %%F -s \"%%S\" \"%%T\"\n" -#: src/lang.c:2281 +#: src/lang.c:2378 msgid "Use interactive mail reader" msgstr "Benutze interaktives Mailprogramm" -#: src/lang.c:2282 -msgid "# Interactive mailreader:\n" - "# 0 = no interactive mailreader\n" - "# 1 = use interactive mailreader with headers in file\n" - "# 2 = use interactive mailreader without headers in file\n" -msgstr "# Interaktives Mailprogramm:\n" - "# 0 = kein interaktives Mailprogramm\n" - "# 1 = interaktives Mailprogramm, Mailheader werden in der Datei mit " +#: src/lang.c:2379 +msgid "# Interactive mailreader\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = no interactive mailreader\n" + "# 1 = use interactive mailreader with headers in file\n" + "# 2 = use interactive mailreader without headers in file\n" +msgstr "# Interaktives Mailprogramm.\n" + "# Mögliche Werte sind (die Voreinstellung ist mit * gekennzeichnet):\n" + "# * 0 = kein interaktives Mailprogramm\n" + "# 1 = interaktives Mailprogramm, Mailheader werden in der Datei mit " "übergeben\n" - "# 2 = interaktives Mailprogramm, Mailheader werden als Argumente übergeben\n" + "# 2 = interaktives Mailprogramm, Mailheader werden als Argumente übergeben\n" -#: src/lang.c:2290 +#: src/lang.c:2388 msgid "Remove ~/.article after posting" msgstr "Entferne ~/.article nach dem posten" -#: src/lang.c:2291 +#: src/lang.c:2389 msgid "# If ON remove ~/.article after posting.\n" msgstr "# Falls ON entferne ~/.article nach dem posten.\n" -#: src/lang.c:2295 +#: src/lang.c:2393 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "Dateiname für Kopie geposteter Artikel. setzt, kein Name=keine Kopie." -#: src/lang.c:2296 +#: src/lang.c:2394 msgid "Filename for posted articles" msgstr "Gepostete Artikel speichern in" -#: src/lang.c:2297 +#: src/lang.c:2395 msgid "# Filename where to keep all postings (default posted)\n" "# If no filename is set then postings will not be saved\n" msgstr "# Dateiname für die Kopie aller Postings (Voreinstellung posted)\n" "# Ist kein Name angegeben wird keine Kopie gespeichert\n" -#: src/lang.c:2302 +#: src/lang.c:2400 msgid "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "Behalte alle Fehlschläge in ~/dead.articles. wechselt & setzt." -#: src/lang.c:2303 +#: src/lang.c:2401 msgid "Keep failed arts in ~/dead.articles" msgstr "Halte Fehlschl. in ~/dead.articles" -#: src/lang.c:2304 +#: src/lang.c:2402 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "# Falls ON werden Fehlgeschlagene Artikel in ~/dead.articles verwahrt\n" -#: src/lang.c:2308 +#: src/lang.c:2406 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "Wollen Sie nicht-abonnierte Gruppen aus der .newsrc entfernen?" -#: src/lang.c:2309 +#: src/lang.c:2407 msgid "No unsubscribed groups in newsrc" msgstr "Nur abonnierte Gruppen in newsrc" -#: src/lang.c:2310 +#: src/lang.c:2408 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "# Falls ON entferne nicht-abonnierte Gruppen aus der newsrc\n" -#: src/lang.c:2315 +#: src/lang.c:2413 msgid "Remove bogus groups from newsrc" msgstr "Lösche nicht vorhande G. aus newsrc" -#: src/lang.c:2316 +#: src/lang.c:2414 msgid "# What to do with bogus groups in newsrc file\n" - "# 0=(Keep) 1=(Remove) 2=(Highlight with D on selection screen).\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = keep\n" + "# 1 = remove\n" + "# 2 = highlight with D on selection screen\n" msgstr "# Was soll mit nicht mehr vorhanden Gruppen in der newsrc-Datei passieren?\n" - "# 0=(Behalten) 1=(entfernen) 2=(Mit D in der Auswahl markieren).\n" + "# Mögliche Werte sind (die Voreinstellung ist mit * gekennzeichnet):\n" + "# * 0 = Behalten\n" + "# 1 = entfernen\n" + "# 2 = Mit D in der Auswahl markieren.\n" -#: src/lang.c:2320 +#: src/lang.c:2422 msgid "Enter number of seconds until active file will be reread. sets." msgstr "Sekunden, nach denen die active-Datei wieder gelesen wird. setzt." -#: src/lang.c:2321 +#: src/lang.c:2423 msgid "Interval in secs to reread active" msgstr "Active alle ... Sekunden neu lesen" -#: src/lang.c:2322 +#: src/lang.c:2424 msgid "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "# Zeitintervall in Sekunden zwischen dem Wiedereinlesen des active (0=nie)\n" -#: src/lang.c:2327 +#: src/lang.c:2429 msgid "Reconnect to server automatically" msgstr "Autom. Wiederverbindung zum Server" -#: src/lang.c:2328 +#: src/lang.c:2430 msgid "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "# Falls ON wird eine unterbrochene Verbindung zum NNTP Server\n" "# automatisch reaktiviert\n" -#: src/lang.c:2332 +#: src/lang.c:2434 msgid "Create local copies of NNTP overview files. toggles & sets." msgstr "Erzeuge lokale Kopien der NNTP Overview Dateien. wechselt & " "setzt." -#: src/lang.c:2333 +#: src/lang.c:2435 msgid "Cache NNTP overview files locally" msgstr "Speichere NNTP Overview Daten lokal" -#: src/lang.c:2334 +#: src/lang.c:2436 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "# Falls ON, erzeuge lokale Kopien der NNTP Overview Dateien.\n" -#: src/lang.c:2338 +#: src/lang.c:2440 msgid "Enter format string. sets, cancels." msgstr "Format-Zeichenkette eingeben. setzt, bricht ab." -#: src/lang.c:2339 +#: src/lang.c:2441 msgid "Format string for display of dates" msgstr "Datums Format-Zeichenkette" -#: src/lang.c:2340 +#: src/lang.c:2442 msgid "# Format string for date representation\n" msgstr "# Zeichenkette die die Datumsanzeige beschreibt.\n" -#: src/lang.c:2346 +#: src/lang.c:2448 msgid "Unicode normalization form" msgstr "Unicode Normalisierungsart" -#: src/lang.c:2347 +#: src/lang.c:2449 msgid "# Unicode normalization form\n" - "# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = None\n" + "# * 1 = NFKC\n" + "# 2 = NFKD\n" + "# 3 = NFC\n" + "# 4 = NFD\n" msgstr "# Unicode Normalisierungsart\n" - "# 0 = keine, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" + "# Mögliche Werte sind (die Voreinstellung ist mit * gekennzeichnet):\n" + "# 0 = keine\n" + "# * 1 = NFKC\n" + "# 2 = NFKD\n" + "# 3 = NFC\n" + "# 4 = NFD\n" # TRANSLATION MISSING -#: src/lang.c:2354 +#: src/lang.c:2461 msgid "Render BiDi" msgstr "" # TRANSLATION MISSING -#: src/lang.c:2355 +#: src/lang.c:2462 msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "" -#: src/misc.c:3711 +#: src/misc.c:3713 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "Version: %s %s Ausgabe %s (\"%s\") %s %s\n" -#: src/misc.c:3714 +#: src/misc.c:3716 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Version: %s %s Ausgabe %s (\"%s\")\n" @@ -6138,7 +6375,7 @@ msgstr "Sende letztes Kommando (%s) neu\ msgid "couldn't expand %s\n" msgstr "Kann %s nicht expandieren\n" -#: src/post.c:1962 +#: src/post.c:1970 #, c-format msgid "Posting: %.*s ..." msgstr "Poste: %.*s ..." @@ -6184,15 +6421,15 @@ msgstr "Dieser Artikel wurde im 'multipa msgid "bytes" msgstr "Bytes" -#: src/select.c:352 +#: src/select.c:375 msgid "unread" msgstr "ungelesen" -#: src/select.c:352 +#: src/select.c:375 msgid "all" msgstr "Alle" -#: src/select.c:530 src/select.c:532 +#: src/select.c:547 src/select.c:549 msgid " R" msgstr " R" Binary files tin-1.7.6/po/en_GB.gmo and tin-1.7.7/po/en_GB.gmo differ diff -Nurp tin-1.7.6/po/en_GB.po tin-1.7.7/po/en_GB.po --- tin-1.7.6/po/en_GB.po 2004-09-06 10:40:44.000000000 +0200 +++ tin-1.7.7/po/en_GB.po 2004-12-15 16:48:25.000000000 +0100 @@ -2,8 +2,8 @@ # Robert Brady , 2000-2002 # msgid "" -msgstr "Project-Id-Version: tin 1.7.5\n" - "POT-Creation-Date: 2004-09-06 10:40+0200\n" +msgstr "Project-Id-Version: tin 1.7.7\n" + "POT-Creation-Date: 2004-12-15 16:47+0100\n" "PO-Revision-Date: 2002-11-15 20:10+0000\n" "Last-Translator: Robert Brady \n" "Language-Team: \n" @@ -225,7 +225,7 @@ msgstr "" msgid "# and set Followup-To: poster\n" msgstr "" -#: src/cook.c:814 +#: src/cook.c:494 msgid "(unknown)" msgstr "" @@ -579,7 +579,7 @@ msgstr "" msgid "Creating newsrc file...\n" msgstr "" -#: src/lang.c:127 src/lang.c:1121 +#: src/lang.c:127 src/lang.c:1140 msgid "Default" msgstr "" @@ -1363,380 +1363,388 @@ msgid "save marked articles automaticall msgstr "" #: src/lang.c:337 -msgid "search for articles by author backwards" +msgid "scroll the screen one line down" msgstr "" #: src/lang.c:338 -msgid "search for articles by author forwards" +msgid "scroll the screen one line up" msgstr "" #: src/lang.c:339 -msgid "search all articles for a given string (this may take some time)" +msgid "search for articles by author backwards" msgstr "" #: src/lang.c:340 -msgid " \t (searches are case-insensitive and wrap around to all articles)" +msgid "search for articles by author forwards" msgstr "" #: src/lang.c:341 -msgid "search for articles by Subject line backwards" +msgid "search all articles for a given string (this may take some time)" msgstr "" #: src/lang.c:342 -msgid "search for articles by Subject line forwards" +msgid " \t (searches are case-insensitive and wrap around to all articles)" msgstr "" #: src/lang.c:343 -msgid "repeat last search" +msgid "search for articles by Subject line backwards" msgstr "" #: src/lang.c:344 -msgid "tag current article for reposting/mailing/piping/printing/saving" +msgid "search for articles by Subject line forwards" msgstr "" #: src/lang.c:345 -msgid "toggle info message in last line (subject/description)" +msgid "repeat last search" msgstr "" #: src/lang.c:346 -msgid "toggle inverse video" +msgid "tag current article for reposting/mailing/piping/printing/saving" msgstr "" #: src/lang.c:347 -msgid "toggle mini help menu display" +msgid "toggle info message in last line (subject/description)" msgstr "" #: src/lang.c:348 -msgid "cycle the display of authors email address, real name, both or neither" +msgid "toggle inverse video" msgstr "" #: src/lang.c:349 -msgid "show version information" +msgid "toggle mini help menu display" msgstr "" #: src/lang.c:350 -msgid "mark all articles as read and return to group selection menu" +msgid "cycle the display of authors email address, real name, both or neither" msgstr "" #: src/lang.c:351 -msgid "mark all articles as read and enter next group with unread articles" +msgid "show version information" msgstr "" #: src/lang.c:352 -msgid "choose first thread in list" +msgid "mark all articles as read and return to group selection menu" msgstr "" #: src/lang.c:353 -msgid "choose last thread in list" +msgid "mark all articles as read and enter next group with unread articles" msgstr "" #: src/lang.c:354 -msgid "list articles within current thread (bring up Thread sub-menu)" +msgid "choose first thread in list" msgstr "" #: src/lang.c:355 -msgid "mark article as unread" +msgid "choose last thread in list" msgstr "" #: src/lang.c:356 -msgid "mark current thread or tagged threads as read" +msgid "list articles within current thread (bring up Thread sub-menu)" msgstr "" #: src/lang.c:357 -msgid "mark thread as unread" +msgid "mark article as unread" msgstr "" #: src/lang.c:358 -msgid "toggle display of all/selected articles" +msgid "mark current thread or tagged threads as read" msgstr "" #: src/lang.c:359 -msgid "display next group" +msgid "mark thread as unread" msgstr "" #: src/lang.c:360 -msgid "display previous group" +msgid "toggle display of all/selected articles" msgstr "" #: src/lang.c:361 -msgid "toggle all selections (all articles)" +msgid "display next group" msgstr "" #: src/lang.c:362 -msgid "select group (make \"hot\")" +msgid "display previous group" msgstr "" #: src/lang.c:363 -msgid "select thread" +msgid "toggle all selections (all articles)" msgstr "" #: src/lang.c:364 -msgid "select threads if at least one unread article is selected" +msgid "select group (make \"hot\")" msgstr "" #: src/lang.c:365 -msgid "select threads that match user specified pattern" +msgid "select thread" msgstr "" #: src/lang.c:366 -msgid "tag all parts of current multipart-message in order" +msgid "select threads if at least one unread article is selected" msgstr "" #: src/lang.c:367 -msgid "0 - 9\t choose thread by number" +msgid "select threads that match user specified pattern" msgstr "" #: src/lang.c:368 -msgid "toggle limit number of articles to get, and reload" +msgid "tag all parts of current multipart-message in order" msgstr "" #: src/lang.c:369 -msgid "toggle display of all/unread articles" +msgid "0 - 9\t choose thread by number" msgstr "" #: src/lang.c:370 -msgid "toggle selection of thread" +msgid "toggle limit number of articles to get, and reload" msgstr "" #: src/lang.c:371 -msgid "cycle through threading options available" +msgid "toggle display of all/unread articles" msgstr "" #: src/lang.c:372 -msgid "undo all selections (all articles)" +msgid "toggle selection of thread" msgstr "" #: src/lang.c:373 -msgid "untag all tagged threads" +msgid "cycle through threading options available" msgstr "" #: src/lang.c:374 -msgid "mark all articles in group as read" +msgid "undo all selections (all articles)" msgstr "" #: src/lang.c:375 -msgid "mark all articles in group as read and move to next unread group" +msgid "untag all tagged threads" msgstr "" #: src/lang.c:376 -msgid "choose first group in list" +msgid "mark all articles in group as read" msgstr "" #: src/lang.c:377 -msgid "choose group by name" +msgid "mark all articles in group as read and move to next unread group" msgstr "" #: src/lang.c:378 -msgid "0 - 9\t choose group by number" +msgid "choose first group in list" msgstr "" #: src/lang.c:379 -msgid "choose range of groups to be affected by next command" +msgid "choose group by name" msgstr "" #: src/lang.c:380 -msgid "choose last group in list" +msgid "0 - 9\t choose group by number" msgstr "" #: src/lang.c:381 -msgid "mark all articles in chosen group unread" +msgid "choose range of groups to be affected by next command" msgstr "" #: src/lang.c:382 -msgid "move chosen group within list" +msgid "choose last group in list" msgstr "" #: src/lang.c:383 +msgid "mark all articles in chosen group unread" +msgstr "" + +#: src/lang.c:384 +msgid "move chosen group within list" +msgstr "" + +#: src/lang.c:385 msgid "choose next group with unread news" msgstr "" -#: src/lang.c:384 src/lang.c:1168 +#: src/lang.c:386 src/lang.c:1187 msgid "quit" msgstr "" -#: src/lang.c:385 +#: src/lang.c:387 msgid "quit without saving configuration changes" msgstr "" -#: src/lang.c:386 +#: src/lang.c:388 msgid "read chosen group" msgstr "" -#: src/lang.c:387 +#: src/lang.c:389 msgid "reset .newsrc (all available articles in groups marked unread)" msgstr "" -#: src/lang.c:388 +#: src/lang.c:390 msgid "search backwards for a group name" msgstr "" -#: src/lang.c:389 +#: src/lang.c:391 msgid " \t (all searches are case-insensitive and wrap around)" msgstr "" -#: src/lang.c:390 +#: src/lang.c:392 msgid "search forwards for a group name" msgstr "" -#: src/lang.c:391 +#: src/lang.c:393 msgid "subscribe to chosen group" msgstr "" -#: src/lang.c:392 +#: src/lang.c:394 msgid "subscribe to groups that match pattern" msgstr "" -#: src/lang.c:393 +#: src/lang.c:395 msgid "reread active file to check for any new news" msgstr "" -#: src/lang.c:394 +#: src/lang.c:396 msgid "toggle display of group name only or group name plus description" msgstr "" -#: src/lang.c:395 +#: src/lang.c:397 msgid "toggle display to show all/unread subscribed groups" msgstr "" -#: src/lang.c:396 +#: src/lang.c:398 msgid "unsubscribe from chosen group" msgstr "" -#: src/lang.c:397 +#: src/lang.c:399 msgid "unsubscribe from groups that match pattern" msgstr "" -#: src/lang.c:398 +#: src/lang.c:400 msgid "sort the list of groups" msgstr "" -#: src/lang.c:399 +#: src/lang.c:401 msgid "toggle display to show all/subscribed groups" msgstr "" -#: src/lang.c:400 +#: src/lang.c:402 msgid "0 - 9\t choose article by number" msgstr "" -#: src/lang.c:401 +#: src/lang.c:403 msgid "mark thread as read and return to group index page" msgstr "" -#: src/lang.c:402 +#: src/lang.c:404 msgid "mark thread as read and enter next unread thread or group" msgstr "" -#: src/lang.c:403 +#: src/lang.c:405 msgid "choose first article in list" msgstr "" -#: src/lang.c:404 +#: src/lang.c:406 msgid "choose last article in list" msgstr "" -#: src/lang.c:405 +#: src/lang.c:407 msgid "mark article or tagged articles as read and move cursor to next unread article" msgstr "" -#: src/lang.c:406 +#: src/lang.c:408 msgid "read chosen article" msgstr "" -#: src/lang.c:407 +#: src/lang.c:409 msgid "Display properties\n" "------------------" msgstr "" -#: src/lang.c:408 +#: src/lang.c:410 msgid "Miscellaneous\n" "-------------" msgstr "" -#: src/lang.c:409 +#: src/lang.c:411 msgid "Moving around\n" "-------------" msgstr "" -#: src/lang.c:410 +#: src/lang.c:412 msgid "Group/thread/article operations\n" "-------------------------------" msgstr "" -#: src/lang.c:412 +#: src/lang.c:414 msgid "Group Level Commands" msgstr "" -#: src/lang.c:413 +#: src/lang.c:415 msgid "Kill filter added" msgstr "" -#: src/lang.c:414 +#: src/lang.c:416 msgid "Auto-selection filter added" msgstr "" -#: src/lang.c:415 +#: src/lang.c:417 msgid "All parts tagged" msgstr "" -#: src/lang.c:416 +#: src/lang.c:418 msgid "Storing article for later posting" msgstr "" -#: src/lang.c:417 +#: src/lang.c:419 msgid "Please enter a valid character" msgstr "" -#: src/lang.c:418 +#: src/lang.c:420 #, c-format msgid "Missing part #%d" msgstr "" -#: src/lang.c:419 +#: src/lang.c:421 msgid "*** No postponed articles ***" msgstr "" -#: src/lang.c:420 +#: src/lang.c:422 msgid "Not a multi-part message" msgstr "" -#: src/lang.c:421 +#: src/lang.c:423 msgid "You are not subscribed to this group" msgstr "" -#: src/lang.c:422 +#: src/lang.c:424 msgid "No previous expression" msgstr "" -#: src/lang.c:423 +#: src/lang.c:425 msgid "Operation disabled in no-overwrite mode" msgstr "" #. TODO: replace hardcoded key-name in txt_info_postponed -#: src/lang.c:425 +#: src/lang.c:427 #, c-format msgid "%d postponed %s, reuse with ^O...\n" msgstr "" -#: src/lang.c:426 +#: src/lang.c:428 msgid "X-Conversion-Note: multipart/alternative contents have been removed.\n" " To get the whole article, turn alternative handling OFF in the Option Menu\n" msgstr "" -#: src/lang.c:428 +#: src/lang.c:430 #, c-format msgid "Save filename for %s/%s is a mailbox. Attachment not saved" msgstr "" -#: src/lang.c:429 +#: src/lang.c:431 msgid "TeX2Iso encoded article" msgstr "" -#: src/lang.c:430 +#: src/lang.c:432 msgid "incomplete " msgstr "" #. TODO: replace hardcoded key-names -#: src/lang.c:432 +#: src/lang.c:434 #, c-format msgid "\n" "Welcome to %s, a full screen threaded Netnews reader. It can read news " @@ -1772,410 +1780,410 @@ msgid "\n" "Please send bug-reports/comments to %s with the 'R' command.\n" msgstr "" -#: src/lang.c:448 +#: src/lang.c:450 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." msgstr "" -#: src/lang.c:449 +#: src/lang.c:451 #, c-format msgid "Invalid Sender:-header %s" msgstr "" -#: src/lang.c:450 +#: src/lang.c:452 msgid "Inverse video disabled" msgstr "" -#: src/lang.c:451 +#: src/lang.c:453 msgid "Inverse video enabled" msgstr "" -#: src/lang.c:453 +#: src/lang.c:455 #, c-format msgid "Missing definition for %s\n" msgstr "" -#: src/lang.c:454 +#: src/lang.c:456 #, c-format msgid "Invalid key definition '%s'\n" msgstr "" -#: src/lang.c:455 +#: src/lang.c:457 #, c-format msgid "Invalid keyname '%s'\n" msgstr "" -#: src/lang.c:456 +#: src/lang.c:458 #, c-format msgid "Key '%s' is defined for both %s%s and %s%s\n" msgstr "" -#: src/lang.c:457 +#: src/lang.c:459 #, c-format msgid "Kill From: [%s] (y/n): " msgstr "" -#: src/lang.c:458 +#: src/lang.c:460 msgid "Kill Lines: (num): " msgstr "" -#: src/lang.c:459 +#: src/lang.c:461 msgid "Kill Article Menu" msgstr "" -#: src/lang.c:460 +#: src/lang.c:462 #, c-format msgid "Kill Msg-Id: [%s] (f/l/o/n): " msgstr "" -#: src/lang.c:461 +#: src/lang.c:463 msgid "Kill pattern scope : " msgstr "" -#: src/lang.c:462 +#: src/lang.c:464 #, c-format msgid "Kill Subject: [%s] (y/n): " msgstr "" -#: src/lang.c:463 +#: src/lang.c:465 msgid "Kill text pattern : " msgstr "" -#: src/lang.c:464 +#: src/lang.c:466 msgid "Kill time in days : " msgstr "" -#: src/lang.c:466 +#: src/lang.c:468 msgid "Last" msgstr "" -#: src/lang.c:467 +#: src/lang.c:469 msgid "-- Last response --" msgstr "" -#: src/lang.c:468 +#: src/lang.c:470 #, c-format msgid "Lines %s " msgstr "" -#: src/lang.c:470 +#: src/lang.c:472 msgid "Message-ID: line " msgstr "" -#: src/lang.c:472 +#: src/lang.c:474 msgid "mailbox " msgstr "" -#: src/lang.c:473 +#: src/lang.c:475 #, c-format msgid "Mail article(s) to [%.*s]> " msgstr "" -#: src/lang.c:474 +#: src/lang.c:476 #, c-format msgid "Mailing log to %s\n" msgstr "" -#: src/lang.c:475 +#: src/lang.c:477 msgid "Mail bug report..." msgstr "" -#: src/lang.c:476 +#: src/lang.c:478 #, c-format msgid "Mail BUG REPORT to %s?" msgstr "" -#: src/lang.c:477 +#: src/lang.c:479 msgid "Mailed" msgstr "" -#: src/lang.c:478 +#: src/lang.c:480 #, c-format msgid "Mailing to %s..." msgstr "" -#: src/lang.c:479 +#: src/lang.c:481 msgid "# [Mail/Save] active file. Format is like news active file:\n" "# groupname max.artnum min.artnum /dir\n" "# The 4th field is the basedir (ie. ~/Mail or ~/News)\n" "#\n" msgstr "" -#: src/lang.c:482 +#: src/lang.c:484 #, c-format msgid "%s marked as unread" msgstr "" -#: src/lang.c:483 +#: src/lang.c:485 #, c-format msgid "Marked %d of %d tagged %s as read" msgstr "" -#: src/lang.c:484 +#: src/lang.c:486 #, c-format msgid "Mark all articles as read%s?" msgstr "" -#: src/lang.c:485 +#: src/lang.c:487 #, c-format msgid "Mark %s=tagged articles, %s=current article, %s=quit: " msgstr "" -#: src/lang.c:486 +#: src/lang.c:488 #, c-format msgid "Mark group %s as read?" msgstr "" -#: src/lang.c:487 +#: src/lang.c:489 #, c-format msgid "Mark thread as read%s?" msgstr "" -#: src/lang.c:488 +#: src/lang.c:490 #, c-format msgid "Mark %s=tagged articles/threads, %s=current thread, %s=quit: " msgstr "" -#: src/lang.c:489 +#: src/lang.c:491 #, c-format msgid "Matching %s groups..." msgstr "" -#: src/lang.c:490 src/lang.c:494 +#: src/lang.c:492 src/lang.c:496 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "" -#: src/lang.c:491 +#: src/lang.c:493 #, c-format msgid "%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; %s=list " "thread" msgstr "" -#: src/lang.c:492 +#: src/lang.c:494 #, c-format msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" msgstr "" -#: src/lang.c:493 +#: src/lang.c:495 #, c-format msgid "%s=search forwards; %s=search backwards; %s=quit" msgstr "" -#: src/lang.c:495 +#: src/lang.c:497 #, c-format msgid "%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read" msgstr "" -#: src/lang.c:496 +#: src/lang.c:498 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" msgstr "" -#: src/lang.c:497 +#: src/lang.c:499 #, c-format msgid "%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" msgstr "" -#: src/lang.c:498 +#: src/lang.c:500 #, c-format msgid "%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/out" msgstr "" -#: src/lang.c:499 +#: src/lang.c:501 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" msgstr "" -#: src/lang.c:500 +#: src/lang.c:502 #, c-format msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" msgstr "" -#: src/lang.c:501 +#: src/lang.c:503 msgid "--More--" msgstr "" -#: src/lang.c:502 +#: src/lang.c:504 #, c-format msgid "Moving %s..." msgstr "" -#: src/lang.c:504 +#: src/lang.c:506 msgid ", name: " msgstr "" -#: src/lang.c:505 +#: src/lang.c:507 #, c-format msgid "Goto newsgroup [%s]> " msgstr "" -#: src/lang.c:506 +#: src/lang.c:508 msgid "newsgroups" msgstr "" -#: src/lang.c:507 +#: src/lang.c:509 #, c-format msgid "Position %s in group list (1,2,..,$) [%d]> " msgstr "" -#: src/lang.c:508 +#: src/lang.c:510 msgid "newsgroup" msgstr "" -#: src/lang.c:509 +#: src/lang.c:511 msgid "Try and save newsrc file again?" msgstr "" -#: src/lang.c:510 +#: src/lang.c:512 msgid "Warning: No newsgroups were written to your newsrc file. Save aborted." msgstr "" -#: src/lang.c:511 +#: src/lang.c:513 msgid "newsrc file saved successfully.\n" msgstr "" -#: src/lang.c:512 +#: src/lang.c:514 msgid "-- Next response --" msgstr "" -#: src/lang.c:513 +#: src/lang.c:515 #, c-format msgid "NNTP authorization password not found for %s" msgstr "NNTP authorisation password not found for %s" -#: src/lang.c:514 +#: src/lang.c:516 msgid "No " msgstr "" -#: src/lang.c:515 +#: src/lang.c:517 msgid "*** No articles ***" msgstr "" -#: src/lang.c:516 +#: src/lang.c:518 msgid "No articles have been posted" msgstr "" -#: src/lang.c:517 +#: src/lang.c:519 msgid "*** No description ***" msgstr "" -#: src/lang.c:518 +#: src/lang.c:520 msgid "No filename" msgstr "" -#: src/lang.c:519 +#: src/lang.c:521 msgid "No group" msgstr "" -#: src/lang.c:520 +#: src/lang.c:522 msgid "*** No groups ***" msgstr "" -#: src/lang.c:521 +#: src/lang.c:523 msgid "No more groups to read" msgstr "" -#: src/lang.c:522 +#: src/lang.c:524 msgid "No last message" msgstr "" -#: src/lang.c:523 +#: src/lang.c:525 msgid "No mail address" msgstr "" -#: src/lang.c:524 +#: src/lang.c:526 msgid "No articles marked for saving" msgstr "" -#: src/lang.c:525 +#: src/lang.c:527 msgid "No match" msgstr "" -#: src/lang.c:526 +#: src/lang.c:528 msgid "No more groups" msgstr "" -#: src/lang.c:527 +#: src/lang.c:529 msgid "No newsgroups" msgstr "" -#: src/lang.c:528 +#: src/lang.c:530 msgid "No next unread article" msgstr "" -#: src/lang.c:529 +#: src/lang.c:531 msgid "No previous group" msgstr "" -#: src/lang.c:530 +#: src/lang.c:532 msgid "No previous unread article" msgstr "" -#: src/lang.c:531 +#: src/lang.c:533 msgid "No responses" msgstr "" -#: src/lang.c:532 +#: src/lang.c:534 msgid "No responses to list in current thread" msgstr "" -#: src/lang.c:533 +#: src/lang.c:535 msgid "No search string" msgstr "" -#: src/lang.c:534 +#: src/lang.c:536 msgid "No subject" msgstr "" -#: src/lang.c:535 +#: src/lang.c:538 #, c-format msgid "%s: Terminal must have clear to end-of-line (ce)\n" msgstr "" -#: src/lang.c:536 +#: src/lang.c:539 #, c-format msgid "%s: Terminal must have clear to end-of-screen (cd)\n" msgstr "" -#: src/lang.c:537 +#: src/lang.c:540 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" msgstr "" -#: src/lang.c:538 +#: src/lang.c:541 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" msgstr "" -#: src/lang.c:539 +#: src/lang.c:542 #, c-format msgid "%s: TERM variable must be set to use screen capabilities\n" msgstr "" -#: src/lang.c:540 +#: src/lang.c:544 #, c-format msgid "No viewer found for %s/%s\n" msgstr "" -#: src/lang.c:541 +#: src/lang.c:545 msgid "Newsgroup does not exist on this server" msgstr "" -#: src/lang.c:542 +#: src/lang.c:546 #, c-format msgid "Group %s not found in active file" msgstr "" -#: src/lang.c:543 +#: src/lang.c:547 msgid "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "" -#: src/lang.c:544 +#: src/lang.c:548 msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "" -#: src/lang.c:545 +#: src/lang.c:549 #, c-format msgid "# NNTP-server -> newsrc translation table and NNTP-server\n" "# shortname list for %s %s\n" @@ -2191,313 +2199,313 @@ msgid "# NNTP-server -> newsrc translati "#\n" msgstr "" -#: src/lang.c:552 +#: src/lang.c:556 msgid "Only" msgstr "" -#: src/lang.c:553 +#: src/lang.c:557 #, c-format msgid "Option not enabled. Recompile with %s." msgstr "" -#: src/lang.c:554 +#: src/lang.c:558 msgid "Options Menu" msgstr "" -#: src/lang.c:557 +#: src/lang.c:561 #, c-format msgid "Error in regex: %s at pos. %d '%s'" msgstr "" -#: src/lang.c:558 +#: src/lang.c:562 #, c-format msgid "Error in regex: pcre internal error %d" msgstr "" -#: src/lang.c:559 +#: src/lang.c:563 #, c-format msgid "Error in regex: study - pcre internal error %s" msgstr "" -#: src/lang.c:560 +#: src/lang.c:564 msgid "Post a followup..." msgstr "" #. TODO: replace hardcoded key-name in txt_post_error_ask_postpone -#: src/lang.c:562 +#: src/lang.c:566 msgid "An error has occurred while posting the article. If you think that this\n" "error is temporary or otherwise correctable, you can postpone the article\n" "and pick it up again with ^O later.\n" msgstr "" -#: src/lang.c:565 +#: src/lang.c:569 msgid "Posted articles history" msgstr "" -#: src/lang.c:566 +#: src/lang.c:570 #, c-format msgid "Post to newsgroup(s) [%s]> " msgstr "" -#: src/lang.c:567 +#: src/lang.c:571 msgid "-- post processing started --" msgstr "" -#: src/lang.c:568 +#: src/lang.c:572 msgid "-- post processing completed --" msgstr "" -#: src/lang.c:569 +#: src/lang.c:573 #, c-format msgid "Post subject [%s]> " msgstr "" -#: src/lang.c:570 +#: src/lang.c:574 msgid "# Summary of mailed/posted messages viewable by 'W' command from within tin.\n" msgstr "" -#: src/lang.c:571 +#: src/lang.c:575 msgid "Posting article..." msgstr "" -#: src/lang.c:572 +#: src/lang.c:576 msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " msgstr "" -#: src/lang.c:573 +#: src/lang.c:577 #, c-format msgid "Hot %s" msgstr "" -#: src/lang.c:574 +#: src/lang.c:578 #, c-format msgid "Tagged %s" msgstr "" -#: src/lang.c:575 +#: src/lang.c:579 #, c-format msgid "Untagged %s" msgstr "" -#: src/lang.c:576 +#: src/lang.c:580 msgid "Processing mail messages marked for deletion." msgstr "" -#: src/lang.c:577 +#: src/lang.c:581 msgid "Processing saved articles marked for deletion." msgstr "" -#: src/lang.c:578 +#: src/lang.c:582 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "" -#: src/lang.c:579 +#: src/lang.c:583 msgid "Article unchanged, abort mailing?" msgstr "" -#: src/lang.c:580 +#: src/lang.c:584 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "" -#: src/lang.c:582 +#: src/lang.c:586 msgid "Add quick kill filter?" msgstr "" -#: src/lang.c:583 +#: src/lang.c:587 msgid "Add quick selection filter?" msgstr "" -#: src/lang.c:584 +#: src/lang.c:588 msgid "Do you really want to quit?" msgstr "" -#: src/lang.c:585 +#: src/lang.c:589 msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "" -#: src/lang.c:586 +#: src/lang.c:590 msgid "You have tagged articles in this group - quit anyway?" msgstr "" -#: src/lang.c:587 +#: src/lang.c:591 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "" -#: src/lang.c:588 +#: src/lang.c:592 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "" -#: src/lang.c:589 +#: src/lang.c:593 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "" -#: src/lang.c:590 +#: src/lang.c:594 msgid "Do you really want to quit without saving your configuration?" msgstr "" -#: src/lang.c:593 +#: src/lang.c:597 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "" -#: src/lang.c:594 +#: src/lang.c:598 msgid "Do you want to abort this operation?" msgstr "" -#: src/lang.c:595 +#: src/lang.c:599 msgid "Do you want to exit tin immediately?" msgstr "" -#: src/lang.c:596 +#: src/lang.c:600 msgid "Read response> " msgstr "" -#: src/lang.c:597 +#: src/lang.c:601 msgid "Reading ('q' to quit)..." msgstr "" -#: src/lang.c:598 +#: src/lang.c:602 #, c-format msgid "Reading %sarticles..." msgstr "" -#: src/lang.c:599 +#: src/lang.c:603 #, c-format msgid "Reading %sattributes file...\n" msgstr "" -#: src/lang.c:600 +#: src/lang.c:604 #, c-format msgid "Reading %sconfig file...\n" msgstr "" -#: src/lang.c:601 +#: src/lang.c:605 msgid "Reading filter file...\n" msgstr "" -#: src/lang.c:602 +#: src/lang.c:606 #, c-format msgid "Reading %s groups..." msgstr "" -#: src/lang.c:603 +#: src/lang.c:607 msgid "Reading input history file...\n" msgstr "" -#: src/lang.c:604 +#: src/lang.c:608 msgid "Reading keymap file...\n" msgstr "" -#: src/lang.c:605 +#: src/lang.c:609 msgid "Reading groups from active file... " msgstr "" -#: src/lang.c:606 +#: src/lang.c:610 msgid "Reading groups from newsrc file... " msgstr "" -#: src/lang.c:607 +#: src/lang.c:611 msgid "Reading newsgroups file... " msgstr "" -#: src/lang.c:608 +#: src/lang.c:612 msgid "Reading newsrc file..." msgstr "" -#: src/lang.c:610 +#: src/lang.c:614 #, c-format msgid "(%d:%02d remaining)" msgstr "" -#: src/lang.c:612 +#: src/lang.c:616 #, c-format msgid "Bogus group %s removed." msgstr "" -#: src/lang.c:613 +#: src/lang.c:617 #, c-format msgid "Error: rename %s to %s" msgstr "" -#: src/lang.c:614 +#: src/lang.c:618 msgid "Reply to author..." msgstr "" -#: src/lang.c:615 +#: src/lang.c:619 msgid "Repost" msgstr "" -#: src/lang.c:616 +#: src/lang.c:620 msgid "Reposting article..." msgstr "" -#: src/lang.c:617 +#: src/lang.c:621 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "" -#: src/lang.c:618 +#: src/lang.c:622 msgid "Reset newsrc?" msgstr "" -#: src/lang.c:619 +#: src/lang.c:623 msgid "Responses have been directed to the following newsgroups" msgstr "" -#: src/lang.c:620 +#: src/lang.c:624 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " msgstr "" -#: src/lang.c:621 +#: src/lang.c:625 #, c-format msgid "RespNo %4d of %4d" msgstr "" -#: src/lang.c:622 +#: src/lang.c:626 msgid "Press to continue..." msgstr "" -#: src/lang.c:624 +#: src/lang.c:628 #, c-format msgid "Select From [%s] (y/n): " msgstr "" -#: src/lang.c:625 +#: src/lang.c:629 msgid "Select Lines: (num): " msgstr "" -#: src/lang.c:626 +#: src/lang.c:630 msgid "Auto-select Article Menu" msgstr "" -#: src/lang.c:627 +#: src/lang.c:631 #, c-format msgid "Select Msg-Id [%s] (f/l/o/n): " msgstr "" -#: src/lang.c:628 +#: src/lang.c:632 msgid "Select pattern scope: " msgstr "" -#: src/lang.c:629 +#: src/lang.c:633 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "" -#: src/lang.c:630 +#: src/lang.c:634 msgid "Select text pattern : " msgstr "" -#: src/lang.c:631 +#: src/lang.c:635 msgid "Select time in days : " msgstr "" -#: src/lang.c:632 +#: src/lang.c:636 #, c-format msgid "# %s server configuration file\n" "# This file was automatically saved by %s %s %s (\"%s\")\n" @@ -2509,216 +2517,220 @@ msgid "# %s server configuration file\n" "\n" msgstr "" -#: src/lang.c:638 +#: src/lang.c:642 msgid "Showing unread groups only" msgstr "" -#: src/lang.c:639 +#: src/lang.c:643 msgid "Subject: line (ignore case) " msgstr "" -#: src/lang.c:640 +#: src/lang.c:644 msgid "Subject: line (case sensitive)" msgstr "" -#: src/lang.c:641 +#: src/lang.c:645 msgid "Save" msgstr "" -#: src/lang.c:642 +#: src/lang.c:646 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "" -#: src/lang.c:643 +#: src/lang.c:647 msgid "Save configuration before continuing?" msgstr "" -#: src/lang.c:644 +#: src/lang.c:648 msgid "Save filename> " msgstr "" -#: src/lang.c:645 +#: src/lang.c:649 msgid "Saved" msgstr "" -#: src/lang.c:646 +#: src/lang.c:650 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "" -#: src/lang.c:647 +#: src/lang.c:651 #, c-format msgid "Saved %s...\n" msgstr "" -#: src/lang.c:648 +#: src/lang.c:652 msgid "Nothing was saved" msgstr "" -#: src/lang.c:649 +#: src/lang.c:653 #, c-format msgid "\n" "%s %d %s from %d %s\n" msgstr "" -#: src/lang.c:650 +#: src/lang.c:654 #, c-format msgid "-- %s saved to %s%s --" msgstr "" -#: src/lang.c:651 +#: src/lang.c:655 #, c-format msgid "-- %s saved to %s - %s --" msgstr "" -#: src/lang.c:652 +#: src/lang.c:656 msgid "Saving..." msgstr "" -#: src/lang.c:653 +#: src/lang.c:657 #, c-format msgid "%s: Screen initialization failed" msgstr "%s: Screen initialisation failed" -#: src/lang.c:654 +#: src/lang.c:659 #, c-format msgid "%s: screen is too small\n" msgstr "" -#: src/lang.c:655 +#: src/lang.c:661 #, c-format msgid "screen is too small, %s is exiting\n" msgstr "" -#: src/lang.c:656 +#: src/lang.c:662 #, c-format msgid "Search backwards [%s]> " msgstr "" -#: src/lang.c:657 +#: src/lang.c:663 #, c-format msgid "Search body [%s]> " msgstr "" -#: src/lang.c:658 +#: src/lang.c:664 #, c-format msgid "Search forwards [%s]> " msgstr "" -#: src/lang.c:659 +#: src/lang.c:665 msgid "Searching..." msgstr "" -#: src/lang.c:660 +#: src/lang.c:666 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "" -#: src/lang.c:661 +#: src/lang.c:667 msgid "Select article> " msgstr "" -#: src/lang.c:662 +#: src/lang.c:668 msgid "Select option number before text or use arrow keys and . 'q' to quit." msgstr "" -#: src/lang.c:663 +#: src/lang.c:669 msgid "Select group> " msgstr "" -#: src/lang.c:664 +#: src/lang.c:670 #, c-format msgid "Enter selection pattern [%s]> " msgstr "" -#: src/lang.c:665 +#: src/lang.c:671 msgid "Select thread > " msgstr "" -#: src/lang.c:666 +#: src/lang.c:672 #, c-format msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" msgstr "" -#: src/lang.c:667 +#: src/lang.c:673 msgid "servers active-file" msgstr "" -#: src/lang.c:668 +#: src/lang.c:674 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "" -#: src/lang.c:669 +#: src/lang.c:675 msgid "" msgstr "" -#: src/lang.c:670 +#: src/lang.c:676 #, c-format msgid "Starting: (%s)" msgstr "" -#: src/lang.c:671 +#: src/lang.c:677 #, c-format msgid "List Thread (%d of %d)" msgstr "" -#: src/lang.c:672 +#: src/lang.c:678 #, c-format msgid "Thread (%.*s)" msgstr "" -#: src/lang.c:673 +#: src/lang.c:679 msgid "Enter wildcard subscribe pattern> " msgstr "" -#: src/lang.c:674 +#: src/lang.c:680 #, c-format msgid "subscribed to %d groups" msgstr "" -#: src/lang.c:675 +#: src/lang.c:681 #, c-format msgid "Subscribed to %s" msgstr "" -#: src/lang.c:676 +#: src/lang.c:682 msgid "Subscribing... " msgstr "" -#: src/lang.c:677 +#: src/lang.c:683 msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " msgstr "" -#: src/lang.c:678 +#: src/lang.c:684 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "" -#: src/lang.c:679 +#: src/lang.c:685 msgid "Superseding article ..." msgstr "" -#: src/lang.c:680 +#: src/lang.c:686 #, c-format msgid "\n" "Stopped. Type 'fg' to restart %s\n" msgstr "" -#: src/lang.c:682 +#: src/lang.c:688 #, c-format msgid "%d days" msgstr "" -#: src/lang.c:683 +#: src/lang.c:689 msgid "" msgstr "" -#: src/lang.c:684 +#: src/lang.c:690 +msgid "TeX " +msgstr "" + +#: src/lang.c:691 msgid "# Default action/prompt strings\n" msgstr "" -#: src/lang.c:685 +#: src/lang.c:692 msgid "# Defaults for quick (1 key) kill & auto-selection filters\n" "# header=NUM 0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n" "# 5=Message-ID: & last References: entry only\n" @@ -2728,323 +2740,323 @@ msgid "# Defaults for quick (1 key) kill "# expire=ON/OFF ON=limit to default_filter_days OFF=don't ever expire\n" msgstr "" -#: src/lang.c:698 +#: src/lang.c:705 msgid "# If ON use print current subject or newsgroup description in the last line\n" msgstr "" -#: src/lang.c:699 +#: src/lang.c:706 msgid "# Host & time info used for detecting new groups (don't touch)\n" msgstr "" -#: src/lang.c:700 +#: src/lang.c:707 msgid "There is no news\n" msgstr "" -#: src/lang.c:701 +#: src/lang.c:708 msgid "Thread" msgstr "" -#: src/lang.c:702 +#: src/lang.c:709 msgid "Thread Level Commands" msgstr "" -#: src/lang.c:703 +#: src/lang.c:710 msgid "Thread deselected" msgstr "" -#: src/lang.c:704 +#: src/lang.c:711 msgid "Thread selected" msgstr "" -#: src/lang.c:705 +#: src/lang.c:712 msgid "threads" msgstr "" -#: src/lang.c:706 +#: src/lang.c:713 msgid "Thread range" msgstr "" -#: src/lang.c:707 +#: src/lang.c:714 msgid "thread" msgstr "" -#: src/lang.c:708 +#: src/lang.c:715 #, c-format msgid "Thread %4s of %4s" msgstr "" -#: src/lang.c:709 +#: src/lang.c:716 msgid "Threading articles..." msgstr "" -#: src/lang.c:710 +#: src/lang.c:717 #, c-format msgid "Toggled word highlighting %s" msgstr "" -#: src/lang.c:711 +#: src/lang.c:718 msgid "Toggled rot13 encoding" msgstr "" -#: src/lang.c:712 +#: src/lang.c:719 #, c-format msgid "Toggled german TeX encoding %s" msgstr "" -#: src/lang.c:713 +#: src/lang.c:720 #, c-format msgid "Toggled tab-width to %d" msgstr "" -#: src/lang.c:714 +#: src/lang.c:721 #, c-format msgid "%d Trying to dotlock %s" msgstr "" -#: src/lang.c:715 +#: src/lang.c:722 #, c-format msgid "%d Trying to lock %s" msgstr "" -#: src/lang.c:716 +#: src/lang.c:723 msgid " h=help\n" msgstr "" -#: src/lang.c:718 +#: src/lang.c:725 msgid "Unlimited" msgstr "" -#: src/lang.c:719 +#: src/lang.c:726 msgid "Enter wildcard unsubscribe pattern> " msgstr "" -#: src/lang.c:720 +#: src/lang.c:727 #, c-format msgid "Error decoding %s : %s" msgstr "" -#: src/lang.c:721 +#: src/lang.c:728 msgid "No end." msgstr "" -#: src/lang.c:722 +#: src/lang.c:729 #, c-format msgid "%s successfully decoded." msgstr "" -#: src/lang.c:723 +#: src/lang.c:730 #, c-format msgid "%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" "\n" msgstr "" -#: src/lang.c:724 +#: src/lang.c:731 msgid "unread " msgstr "" -#: src/lang.c:725 +#: src/lang.c:732 #, c-format msgid "unsubscribed from %d groups" msgstr "" -#: src/lang.c:726 +#: src/lang.c:733 #, c-format msgid "Unsubscribed from %s" msgstr "" -#: src/lang.c:727 +#: src/lang.c:734 msgid "Unsubscribing... " msgstr "" -#: src/lang.c:728 +#: src/lang.c:735 msgid "Unthreading articles..." msgstr "" -#: src/lang.c:729 +#: src/lang.c:736 msgid "Updated" msgstr "" -#: src/lang.c:730 +#: src/lang.c:737 msgid "Updating" msgstr "" -#: src/lang.c:731 +#: src/lang.c:738 #, c-format msgid "Opening %s\n" msgstr "" -#: src/lang.c:732 +#: src/lang.c:739 msgid "No more URL's in this article" msgstr "" -#: src/lang.c:733 +#: src/lang.c:740 msgid "Use MIME display program for this message?" msgstr "" -#: src/lang.c:734 +#: src/lang.c:741 msgid " -c mark all news as read in subscribed newsgroups (batch mode)" msgstr "" -#: src/lang.c:735 +#: src/lang.c:742 msgid " -Z return status indicating if any unread news (batch mode)" msgstr "" -#: src/lang.c:736 +#: src/lang.c:743 msgid " -q don't check for new newsgroups" msgstr "" -#: src/lang.c:737 +#: src/lang.c:744 msgid " -X don't save any files on quit" msgstr "" -#: src/lang.c:738 +#: src/lang.c:745 msgid " -d don't show newsgroup descriptions" msgstr "" -#: src/lang.c:739 +#: src/lang.c:746 msgid " -G limit get only limit articles/group" msgstr "" -#: src/lang.c:740 +#: src/lang.c:747 #, c-format msgid " -H help information about %s" msgstr "" -#: src/lang.c:741 +#: src/lang.c:748 msgid " -h this help message" msgstr "" -#: src/lang.c:742 +#: src/lang.c:749 #, c-format msgid " -I dir news index file directory [default=%s]" msgstr "" -#: src/lang.c:743 +#: src/lang.c:750 msgid " -u update index files (batch mode)" msgstr "" -#: src/lang.c:744 +#: src/lang.c:751 #, c-format msgid " -m dir mailbox directory [default=%s]" msgstr "" -#: src/lang.c:745 +#: src/lang.c:752 #, c-format msgid "\n" "Mail bug reports/comments to %s" msgstr "" -#: src/lang.c:746 +#: src/lang.c:753 msgid " -N mail new news to your posts (batch mode)" msgstr "" -#: src/lang.c:747 +#: src/lang.c:754 msgid " -M user mail new news to specified user (batch mode)" msgstr "" -#: src/lang.c:748 +#: src/lang.c:755 #, c-format msgid " -f file subscribed to newsgroups file [default=%s]" msgstr "" -#: src/lang.c:749 +#: src/lang.c:756 msgid " -x no posting mode" msgstr "" -#: src/lang.c:750 +#: src/lang.c:757 msgid " -w post an article and exit" msgstr "" -#: src/lang.c:751 +#: src/lang.c:758 msgid " -o post all postponed articles and exit" msgstr "" -#: src/lang.c:752 +#: src/lang.c:759 msgid " -r read news remotely from default NNTP server" msgstr "" -#: src/lang.c:753 +#: src/lang.c:760 msgid " -R read news saved by -S option" msgstr "" -#: src/lang.c:754 +#: src/lang.c:761 #, c-format msgid " -s dir save news directory [default=%s]" msgstr "" -#: src/lang.c:755 +#: src/lang.c:762 msgid " -S save new news for later reading (batch mode)" msgstr "" -#: src/lang.c:756 +#: src/lang.c:763 msgid " -z start if any unread news" msgstr "" -#: src/lang.c:757 +#: src/lang.c:764 #, c-format msgid "A Usenet reader.\n" "\n" "Usage: %s [options] [newsgroup[,...]]" msgstr "" -#: src/lang.c:758 +#: src/lang.c:765 msgid " -v verbose output for batch mode options" msgstr "" -#: src/lang.c:759 +#: src/lang.c:766 msgid " -V print version & date information" msgstr "" -#: src/lang.c:760 +#: src/lang.c:767 #, c-format msgid "%s only useful without batch mode operations\n" msgstr "" -#: src/lang.c:761 +#: src/lang.c:768 #, c-format msgid "%s only useful for batch mode operations\n" msgstr "" -#: src/lang.c:763 +#: src/lang.c:770 #, c-format msgid "\n" "%s%d out of range (0 - %d). Reset to 0" msgstr "" -#: src/lang.c:764 +#: src/lang.c:771 #, c-format msgid "View '%s' (%s/%s)?" msgstr "" -#: src/lang.c:766 +#: src/lang.c:773 #, c-format msgid "\n" "Warning: posting exceeds %d columns. Line %d is the first long one:\n" "%-100s\n" msgstr "" -#: src/lang.c:767 +#: src/lang.c:774 msgid "\n" "Warning: article unchanged after editing\n" msgstr "" -#: src/lang.c:768 +#: src/lang.c:775 msgid "\n" "Warning: \"Subject:\" contains only whitespaces.\n" msgstr "" -#: src/lang.c:769 +#: src/lang.c:776 msgid "\n" "Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:\".\n" msgstr "" -#: src/lang.c:771 +#: src/lang.c:778 msgid "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" " with \"Re: \" and does not contain \"(was:\".\n" msgstr "" -#: src/lang.c:774 +#: src/lang.c:781 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly written by you. This will " @@ -3057,7 +3069,7 @@ msgid "Read carefully!\n" "\n" msgstr "" -#: src/lang.c:778 +#: src/lang.c:785 msgid "\n" "Warning: You are using a non-plain transfer encoding (such as base64 or\n" " quoted-printable) and an external inews program to submit your\n" @@ -3065,7 +3077,7 @@ msgid "\n" " not be encoded properly.\n" msgstr "" -#: src/lang.c:783 +#: src/lang.c:790 #, c-format msgid "\n" "\n" @@ -3074,7 +3086,7 @@ msgid "\n" "Read WHATSNEW, etc...\n" msgstr "" -#: src/lang.c:785 +#: src/lang.c:792 #, c-format msgid "\n" "\n" @@ -3082,7 +3094,7 @@ msgid "\n" "Some values in your %s file may be ignored, others might have changed!\n" msgstr "" -#: src/lang.c:788 +#: src/lang.c:795 #, c-format msgid "Warning: tin wrote fewer groups to your\n" "\t%s\n" @@ -3091,18 +3103,18 @@ msgid "Warning: tin wrote fewer groups t "before you start tin once again!\n" msgstr "" -#: src/lang.c:792 +#: src/lang.c:799 #, c-format msgid "\n" "Warning: Found %d '-- \\n' lines, this may confuse some people.\n" msgstr "" -#: src/lang.c:793 +#: src/lang.c:800 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "" -#: src/lang.c:794 +#: src/lang.c:801 #, c-format msgid "\n" "Warning: Your signature is longer than %d lines. Since signatures usually " @@ -3112,47 +3124,47 @@ msgid "\n" " possible.\n" msgstr "" -#: src/lang.c:798 +#: src/lang.c:805 #, c-format msgid "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " msgstr "" -#: src/lang.c:799 +#: src/lang.c:806 msgid "\n" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" msgstr "" -#: src/lang.c:800 +#: src/lang.c:807 msgid "Writing attributes file..." msgstr "" -#: src/lang.c:802 +#: src/lang.c:809 #, c-format msgid "%d Responses" msgstr "" -#: src/lang.c:804 +#: src/lang.c:811 #, c-format msgid "Added %d %s" msgstr "" -#: src/lang.c:805 +#: src/lang.c:812 msgid "No unsubscribed groups to show" msgstr "" -#: src/lang.c:806 +#: src/lang.c:813 msgid "Showing subscribed to groups only" msgstr "" -#: src/lang.c:807 +#: src/lang.c:814 msgid "Yes " msgstr "" -#: src/lang.c:808 +#: src/lang.c:815 msgid " You have mail\n" msgstr "" -#: src/lang.c:813 +#: src/lang.c:820 #, c-format msgid "\n" "Warning: Posting is in %s and contains characters which are not\n" @@ -3164,16 +3176,16 @@ msgid "\n" " M)enu option.\n" msgstr "" -#: src/lang.c:824 +#: src/lang.c:831 #, c-format msgid "Redefined key %s '%s' -> '%s'\n" msgstr "" -#: src/lang.c:825 +#: src/lang.c:832 msgid " -D debug mode 1=NNTP 2=ALL" msgstr "" -#: src/lang.c:829 +#: src/lang.c:836 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly not written by you. This " @@ -3189,363 +3201,367 @@ msgid "Read carefully!\n" "\n" msgstr "" -#: src/lang.c:838 +#: src/lang.c:845 msgid "toggle color" msgstr "toggle colour" -#: src/lang.c:839 -msgid "# For color-adjust use the following numbers\n" - "# 0-black 1-red 2-green 3-brown\n" - "# 4-blue 5-pink 6-cyan 7-white\n" - "# These are *only* for foreground:\n" - "# 8-gray 9-lightred 10-lightgreen 11-yellow\n" - "# 12-lightblue 13-lightpink 14-lightcyan 15-lightwhite\n" - "# A '-1' is interpreted as default (foreground normally is white, and\n" - "# background black)\n" - "\n" -msgstr "# For colour-adjust use the following numbers\n" - "# 0-black 1-red 2-green 3-brown\n" - "# 4-blue 5-pink 6-cyan 7-white\n" +#: src/lang.c:846 +msgid "# Changing colors of several screen parts\n" + "# Possible values are:\n" + "# -1 = default (white for foreground and black for background)\n" + "# 0 = black\n" + "# 1 = red\n" + "# 2 = green\n" + "# 3 = brown\n" + "# 4 = blue\n" + "# 5 = pink\n" + "# 6 = cyan\n" + "# 7 = white\n" "# These are *only* for foreground:\n" - "# 8-grey 9-lightred 10-lightgreen 11-yellow\n" - "# 12-lightblue 13-lightpink 14-lightcyan 15-lightwhite\n" - "# A '-1' is interpreted as default (foreground normally is white, and\n" - "# background black)\n" + "# 8 = gray\n" + "# 9 = light red\n" + "# 10 = light green\n" + "# 11 = yellow\n" + "# 12 = light blue\n" + "# 13 = light pink\n" + "# 14 = light cyan\n" + "# 15 = light white\n" "\n" +msgstr "" -#: src/lang.c:847 +#: src/lang.c:866 msgid " -a toggle color flag" msgstr " -a toggle colour flag" -#: src/lang.c:851 +#: src/lang.c:870 msgid "\n" "Error: Followup-To set to more than one newsgroup!\n" msgstr "" -#: src/lang.c:852 +#: src/lang.c:871 #, c-format msgid "\n" "Error: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "" -#: src/lang.c:853 +#: src/lang.c:872 #, c-format msgid "\n" "Error: \"%s\" is not a valid newsgroup!\n" msgstr "" -#: src/lang.c:855 +#: src/lang.c:874 msgid "\n" "Warning: Followup-To set to more than one newsgroup!\n" msgstr "" -#: src/lang.c:856 +#: src/lang.c:875 #, c-format msgid "\n" "Warning: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "" -#: src/lang.c:857 +#: src/lang.c:876 #, c-format msgid "\n" "Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n" msgstr "" -#: src/lang.c:858 +#: src/lang.c:877 #, c-format msgid "\n" "Warning: \"%s\" is not a valid newsgroup at this site!\n" msgstr "" -#: src/lang.c:862 +#: src/lang.c:881 #, c-format msgid "%d files successfully written from %d articles. %d %s occurred." msgstr "" -#: src/lang.c:863 +#: src/lang.c:882 msgid "Missing parts." msgstr "" -#: src/lang.c:864 +#: src/lang.c:883 msgid "No beginning." msgstr "" -#: src/lang.c:865 +#: src/lang.c:884 msgid "No data." msgstr "" -#: src/lang.c:866 +#: src/lang.c:885 msgid "Unknown error." msgstr "" -#: src/lang.c:868 +#: src/lang.c:887 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "" -#: src/lang.c:872 +#: src/lang.c:891 msgid "Reading mail active file... " msgstr "" -#: src/lang.c:873 +#: src/lang.c:892 msgid "Reading mailgroups file... " msgstr "" -#: src/lang.c:877 +#: src/lang.c:896 msgid "perform PGP operations on article" msgstr "" -#: src/lang.c:878 +#: src/lang.c:897 msgid "Add key(s) to public keyring?" msgstr "" -#: src/lang.c:879 +#: src/lang.c:898 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "" -#: src/lang.c:880 +#: src/lang.c:899 #, c-format msgid "%s=sign, %s=sign & include public key, %s=quit: " msgstr "" -#: src/lang.c:881 +#: src/lang.c:900 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "" -#: src/lang.c:882 +#: src/lang.c:901 msgid "Article not signed and no public keys found" msgstr "" -#: src/lang.c:884 +#: src/lang.c:903 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:885 +#: src/lang.c:904 msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " msgstr "" -#: src/lang.c:886 +#: src/lang.c:905 msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:888 +#: src/lang.c:907 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:889 +#: src/lang.c:908 msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "" -#: src/lang.c:890 +#: src/lang.c:909 msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:894 +#: src/lang.c:913 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:895 +#: src/lang.c:914 msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "" -#: src/lang.c:896 +#: src/lang.c:915 msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:898 +#: src/lang.c:917 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:899 +#: src/lang.c:918 msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "" -#: src/lang.c:900 +#: src/lang.c:919 msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:909 +#: src/lang.c:928 msgid "Try cache_overview_files to speed up things.\n" msgstr "" -#: src/lang.c:910 +#: src/lang.c:929 msgid "Tin will use local index files instead.\n" msgstr "" -#: src/lang.c:911 +#: src/lang.c:930 msgid "Cannot find NNTP server name" msgstr "" -#: src/lang.c:912 +#: src/lang.c:931 #, c-format msgid "Connecting to %s:%d..." msgstr "" -#: src/lang.c:913 +#: src/lang.c:932 msgid "Disconnecting from server...\n" msgstr "" -#: src/lang.c:914 +#: src/lang.c:933 #, c-format msgid "Wrong newsgroup name in response of GROUP command, %s for %s" msgstr "" -#: src/lang.c:915 +#: src/lang.c:934 #, c-format msgid "Failed to connect to NNTP server %s. Exiting..." msgstr "" -#: src/lang.c:916 +#: src/lang.c:935 msgid "205 Closing connection" msgstr "" -#: src/lang.c:917 +#: src/lang.c:936 msgid "Your server does not support the NNTP XOVER or OVER command.\n" msgstr "" -#: src/lang.c:918 +#: src/lang.c:937 msgid "Connection to news server has timed out. Reconnect?" msgstr "" -#: src/lang.c:919 +#: src/lang.c:938 #, c-format msgid "Put the server name in the file %s,\n" "or set the environment variable NNTPSERVER" msgstr "" -#: src/lang.c:920 +#: src/lang.c:939 msgid " -A force authentication on connect" msgstr "" -#: src/lang.c:921 +#: src/lang.c:940 #, c-format msgid " -g serv read news from NNTP server serv [default=%s]" msgstr "" -#: src/lang.c:922 +#: src/lang.c:941 #, c-format msgid " -p port use port as NNTP port [default=%d]" msgstr "" -#: src/lang.c:923 +#: src/lang.c:942 msgid " -Q quick start. Same as -nqd" msgstr "" -#: src/lang.c:924 +#: src/lang.c:943 msgid " -l use only LIST instead of GROUP (-n) command" msgstr "" -#: src/lang.c:925 +#: src/lang.c:944 msgid " -n only read subscribed .newsrc groups from NNTP server" msgstr "" -#: src/lang.c:927 +#: src/lang.c:946 #, c-format msgid "%s/tcp: Unknown service.\n" msgstr "" -#: src/lang.c:930 +#: src/lang.c:949 msgid "\n" "socket or connect problem\n" msgstr "" -#: src/lang.c:932 +#: src/lang.c:951 #, c-format msgid "\n" "Connection to %s: " msgstr "" -#: src/lang.c:933 +#: src/lang.c:952 msgid "Giving up...\n" msgstr "" -#: src/lang.c:936 +#: src/lang.c:955 msgid "Your server does not have Xref: in its XOVER information.\n" "Tin will try to use XHDR XREF instead (slows down things a bit).\n" msgstr "" -#: src/lang.c:939 +#: src/lang.c:958 msgid "Your server does not have Xref: in its XOVER information.\n" msgstr "" -#: src/lang.c:942 +#: src/lang.c:961 #, c-format msgid "Can't open %s. Try %s -r to read news via NNTP.\n" msgstr "" -#: src/lang.c:945 +#: src/lang.c:964 msgid " -Q quick start. Same as -qd" msgstr "" -#: src/lang.c:946 +#: src/lang.c:965 msgid " -l read only active file instead of scanning spool (-n) command" msgstr "" -#: src/lang.c:947 +#: src/lang.c:966 msgid " -n only read subscribed .newsrc groups from spool" msgstr "" -#: src/lang.c:948 +#: src/lang.c:967 msgid "Your server does not have Xref: in its NOV-files.\n" msgstr "" -#: src/lang.c:952 +#: src/lang.c:971 msgid "Posting using external inews failed. Use built in inews instead?" msgstr "" -#: src/lang.c:953 +#: src/lang.c:972 msgid "It worked! Should I always use my built in inews from now on?" msgstr "" -#: src/lang.c:961 +#: src/lang.c:980 #, c-format msgid "%d %s printed" msgstr "" -#: src/lang.c:962 +#: src/lang.c:981 msgid "output article/thread/hot/pattern/tagged articles to printer" msgstr "" -#: src/lang.c:963 +#: src/lang.c:982 msgid "Print" msgstr "" -#: src/lang.c:964 +#: src/lang.c:983 msgid "Printing..." msgstr "" -#: src/lang.c:968 +#: src/lang.c:987 msgid "pipe article/thread/hot/pattern/tagged articles into command" msgstr "" -#: src/lang.c:969 +#: src/lang.c:988 msgid "No command" msgstr "" -#: src/lang.c:970 +#: src/lang.c:989 msgid "Pipe" msgstr "" -#: src/lang.c:971 +#: src/lang.c:990 #, c-format msgid "Pipe to command [%.*s]> " msgstr "" -#: src/lang.c:972 +#: src/lang.c:991 msgid "Piping..." msgstr "" -#: src/lang.c:974 +#: src/lang.c:993 msgid "Piping not enabled." msgstr "" -#: src/lang.c:978 +#: src/lang.c:997 #, c-format msgid "\n" "Error: The \"%s:\" line has spaces in it that MUST be removed.\n" @@ -3554,7 +3570,7 @@ msgid "\n" " newsgroup names.\n" msgstr "" -#: src/lang.c:983 +#: src/lang.c:1002 #, c-format msgid "\n" "Error: The \"%s:\" line is continued in the next line. Since\n" @@ -3562,7 +3578,7 @@ msgid "\n" " Please write all newsgroups into a single line.\n" msgstr "" -#: src/lang.c:988 +#: src/lang.c:1007 #, c-format msgid "\n" "Warning: The \"%s:\" line is continued in the next line.\n" @@ -3570,13 +3586,13 @@ msgid "\n" " To avoid trouble please write all newsgroups into a single line.\n" msgstr "" -#: src/lang.c:992 +#: src/lang.c:1011 #, c-format msgid "\n" "Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n" msgstr "" -#: src/lang.c:997 +#: src/lang.c:1016 msgid "\n" " If your article contains quoted text please take some time to pare it " "down\n" @@ -3597,854 +3613,895 @@ msgid "\n" " likely to ignore it completely. It's a crowded net out there.\n" msgstr "" -#: src/lang.c:1010 +#: src/lang.c:1029 msgid "shell escape" msgstr "" -#: src/lang.c:1011 +#: src/lang.c:1030 #, c-format msgid "Shell Command (%s)" msgstr "" -#: src/lang.c:1012 +#: src/lang.c:1031 #, c-format msgid "Enter shell command [%s]> " msgstr "" -#: src/lang.c:1016 +#: src/lang.c:1035 #, c-format msgid "%s: Can't get entry for TERM\n" msgstr "" -#: src/lang.c:1020 +#: src/lang.c:1039 #, c-format msgid "Group %.*s ('q' to quit)..." msgstr "" -#: src/lang.c:1022 +#: src/lang.c:1041 #, c-format msgid "Group %.*s..." msgstr "" -#: src/lang.c:1026 +#: src/lang.c:1045 msgid "Server unavailable\n" msgstr "" -#: src/lang.c:1032 +#: src/lang.c:1051 #, c-format msgid "%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; " "%s=post" msgstr "" -#: src/lang.c:1033 +#: src/lang.c:1052 #, c-format msgid "%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1035 +#: src/lang.c:1054 #, c-format msgid "%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1036 +#: src/lang.c:1055 #, c-format msgid "%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1040 +#: src/lang.c:1059 #, c-format msgid "%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1041 +#: src/lang.c:1060 #, c-format msgid "%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1043 +#: src/lang.c:1062 #, c-format msgid "%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1044 +#: src/lang.c:1063 #, c-format msgid "%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1050 +#: src/lang.c:1069 msgid "Terminal does not support color" msgstr "Terminal does not support colour" -#: src/lang.c:1055 +#: src/lang.c:1074 #, c-format msgid "Trying %s" msgstr "" -#: src/lang.c:1069 src/lang.c:1094 src/lang.c:1110 src/lang.c:1289 src/refs.c:296 +#: src/lang.c:1088 src/lang.c:1113 src/lang.c:1129 src/lang.c:1308 src/refs.c:296 msgid "None" msgstr "" -#: src/lang.c:1070 +#: src/lang.c:1089 msgid "Subject" msgstr "" -#: src/lang.c:1071 +#: src/lang.c:1090 msgid "References" msgstr "" -#: src/lang.c:1072 +#: src/lang.c:1091 msgid "Both Subject and References" msgstr "" -#: src/lang.c:1073 +#: src/lang.c:1092 msgid "Multipart Subject" msgstr "" -#: src/lang.c:1085 src/lang.c:1196 +#: src/lang.c:1104 src/lang.c:1215 msgid "No" msgstr "" -#: src/lang.c:1086 src/lang.c:1198 +#: src/lang.c:1105 src/lang.c:1217 msgid "Yes" msgstr "" -#: src/lang.c:1087 +#: src/lang.c:1106 msgid "Hide All" msgstr "" -#: src/lang.c:1095 +#: src/lang.c:1114 msgid "Address" msgstr "" -#: src/lang.c:1096 +#: src/lang.c:1115 msgid "Full Name" msgstr "" -#: src/lang.c:1097 +#: src/lang.c:1116 msgid "Address and Name" msgstr "" -#: src/lang.c:1104 +#: src/lang.c:1123 msgid "Max" msgstr "" -#: src/lang.c:1105 +#: src/lang.c:1124 msgid "Sum" msgstr "" -#: src/lang.c:1106 +#: src/lang.c:1125 msgid "Average" msgstr "" -#: src/lang.c:1111 +#: src/lang.c:1130 msgid "Lines" msgstr "" -#: src/lang.c:1112 +#: src/lang.c:1131 msgid "Score" msgstr "" -#: src/lang.c:1113 +#: src/lang.c:1132 msgid "Lines & Score" msgstr "" -#: src/lang.c:1122 +#: src/lang.c:1141 msgid "Black" msgstr "" -#: src/lang.c:1123 +#: src/lang.c:1142 msgid "Red" msgstr "" -#: src/lang.c:1124 +#: src/lang.c:1143 msgid "Green" msgstr "" -#: src/lang.c:1125 +#: src/lang.c:1144 msgid "Brown" msgstr "" -#: src/lang.c:1126 +#: src/lang.c:1145 msgid "Blue" msgstr "" -#: src/lang.c:1127 +#: src/lang.c:1146 msgid "Pink" msgstr "" -#: src/lang.c:1128 +#: src/lang.c:1147 msgid "Cyan" msgstr "" -#: src/lang.c:1129 +#: src/lang.c:1148 msgid "White" msgstr "" -#: src/lang.c:1130 +#: src/lang.c:1149 msgid "Gray" msgstr "Grey" -#: src/lang.c:1131 +#: src/lang.c:1150 msgid "Light Red" msgstr "" -#: src/lang.c:1132 +#: src/lang.c:1151 msgid "Light Green" msgstr "" -#: src/lang.c:1133 +#: src/lang.c:1152 msgid "Yellow" msgstr "" -#: src/lang.c:1134 +#: src/lang.c:1153 msgid "Light Blue" msgstr "" -#: src/lang.c:1135 +#: src/lang.c:1154 msgid "Light Pink" msgstr "" -#: src/lang.c:1136 +#: src/lang.c:1155 msgid "Light Cyan" msgstr "" -#: src/lang.c:1137 +#: src/lang.c:1156 msgid "Light White" msgstr "" -#: src/lang.c:1145 src/lang.c:1202 src/lang.c:1216 +#: src/lang.c:1164 src/lang.c:1221 src/lang.c:1235 msgid "Nothing" msgstr "" -#: src/lang.c:1146 +#: src/lang.c:1165 msgid "Mark" msgstr "" -#: src/lang.c:1147 +#: src/lang.c:1166 msgid "Space" msgstr "" -#: src/lang.c:1154 +#: src/lang.c:1173 msgid "Normal" msgstr "" -#: src/lang.c:1155 +#: src/lang.c:1174 msgid "Best highlighting" msgstr "" -#: src/lang.c:1156 +#: src/lang.c:1175 msgid "Underline" msgstr "" -#: src/lang.c:1157 +#: src/lang.c:1176 msgid "Reverse video" msgstr "" -#: src/lang.c:1158 +#: src/lang.c:1177 msgid "Blinking" msgstr "" -#: src/lang.c:1159 +#: src/lang.c:1178 msgid "Half bright" msgstr "" -#: src/lang.c:1160 +#: src/lang.c:1179 msgid "Bold" msgstr "" -#: src/lang.c:1165 +#: src/lang.c:1184 msgid "none" msgstr "" -#: src/lang.c:1166 +#: src/lang.c:1185 msgid "commands" msgstr "" -#: src/lang.c:1167 +#: src/lang.c:1186 msgid "select" msgstr "" -#: src/lang.c:1169 +#: src/lang.c:1188 msgid "commands & quit" msgstr "" -#: src/lang.c:1170 +#: src/lang.c:1189 msgid "commands & select" msgstr "" -#: src/lang.c:1171 +#: src/lang.c:1190 msgid "quit & select" msgstr "" -#: src/lang.c:1172 +#: src/lang.c:1191 msgid "commands & quit & select" msgstr "" -#: src/lang.c:1197 +#: src/lang.c:1216 msgid "Shell archive" msgstr "" -#: src/lang.c:1203 +#: src/lang.c:1222 msgid "Subject: (descending)" msgstr "" -#: src/lang.c:1204 +#: src/lang.c:1223 msgid "Subject: (ascending)" msgstr "" -#: src/lang.c:1205 +#: src/lang.c:1224 msgid "From: (descending)" msgstr "" -#: src/lang.c:1206 +#: src/lang.c:1225 msgid "From: (ascending)" msgstr "" -#: src/lang.c:1207 +#: src/lang.c:1226 msgid "Date: (descending)" msgstr "" -#: src/lang.c:1208 +#: src/lang.c:1227 msgid "Date: (ascending)" msgstr "" -#: src/lang.c:1209 src/lang.c:1217 +#: src/lang.c:1228 src/lang.c:1236 msgid "Score (descending)" msgstr "" -#: src/lang.c:1210 src/lang.c:1218 +#: src/lang.c:1229 src/lang.c:1237 msgid "Score (ascending)" msgstr "" -#: src/lang.c:1211 +#: src/lang.c:1230 msgid "Lines: (descending)" msgstr "" -#: src/lang.c:1212 +#: src/lang.c:1231 msgid "Lines: (ascending)" msgstr "" -#: src/lang.c:1223 +#: src/lang.c:1242 msgid "Always Keep" msgstr "" -#: src/lang.c:1224 +#: src/lang.c:1243 msgid "Always Remove" msgstr "" -#: src/lang.c:1225 +#: src/lang.c:1244 msgid "Mark with D on selection screen" msgstr "" -#: src/lang.c:1230 +#: src/lang.c:1249 msgid "Kill only unread arts" msgstr "" -#: src/lang.c:1231 +#: src/lang.c:1250 msgid "Kill all arts & show with K" msgstr "" #. TODO: s/K/art_marked_killed/ -#: src/lang.c:1232 +#: src/lang.c:1251 msgid "Kill all arts and never show" msgstr "" -#: src/lang.c:1237 +#: src/lang.c:1256 msgid "Nothing special" msgstr "" -#: src/lang.c:1238 +#: src/lang.c:1257 msgid "Compress quotes" msgstr "" -#: src/lang.c:1239 +#: src/lang.c:1258 msgid "Quote signatures" msgstr "" -#: src/lang.c:1240 +#: src/lang.c:1259 msgid "Compress quotes, quote sigs" msgstr "" -#: src/lang.c:1241 +#: src/lang.c:1260 msgid "Quote empty lines" msgstr "" -#: src/lang.c:1242 +#: src/lang.c:1261 msgid "Compress quotes, quote empty lines" msgstr "" -#: src/lang.c:1243 +#: src/lang.c:1262 msgid "Quote sigs & empty lines" msgstr "" -#: src/lang.c:1244 +#: src/lang.c:1263 msgid "Comp. q., quote sigs & empty lines" msgstr "" -#: src/lang.c:1282 +#: src/lang.c:1301 msgid "no" msgstr "" -#: src/lang.c:1283 +#: src/lang.c:1302 msgid "with headers" msgstr "" -#: src/lang.c:1284 +#: src/lang.c:1303 msgid "without headers" msgstr "" -#: src/lang.c:1291 src/lang.c:1297 +#: src/lang.c:1310 src/lang.c:1316 msgid "NFKC" msgstr "" -#: src/lang.c:1292 +#: src/lang.c:1311 msgid "NFKD" msgstr "" -#: src/lang.c:1293 +#: src/lang.c:1312 msgid "NFC" msgstr "" -#: src/lang.c:1294 +#: src/lang.c:1313 msgid "NFD" msgstr "" -#: src/lang.c:1305 +#: src/lang.c:1324 msgid "Display Options" msgstr "" -#: src/lang.c:1311 +#: src/lang.c:1330 msgid "Color Options" msgstr "Colour Options" -#: src/lang.c:1317 +#: src/lang.c:1336 msgid "Article-Limiting Options" msgstr "" -#: src/lang.c:1323 +#: src/lang.c:1342 msgid "Posting/Mailing Options" msgstr "" -#: src/lang.c:1329 +#: src/lang.c:1348 msgid "Saving/Printing Options" msgstr "" -#: src/lang.c:1335 +#: src/lang.c:1354 msgid "Expert Options" msgstr "" -#: src/lang.c:1341 +#: src/lang.c:1360 msgid "Filtering Options" msgstr "" -#: src/lang.c:1346 src/lang.c:1372 src/lang.c:1378 src/lang.c:1385 src/lang.c:1417 -#: src/lang.c:1423 src/lang.c:1431 src/lang.c:1451 src/lang.c:1526 src/lang.c:1688 -#: src/lang.c:1694 src/lang.c:1700 src/lang.c:1706 src/lang.c:1718 src/lang.c:1725 -#: src/lang.c:1776 src/lang.c:1785 src/lang.c:1791 src/lang.c:1797 src/lang.c:1803 -#: src/lang.c:1809 src/lang.c:1815 src/lang.c:1821 src/lang.c:1827 src/lang.c:1833 -#: src/lang.c:1839 src/lang.c:1845 src/lang.c:1851 src/lang.c:1857 src/lang.c:1863 -#: src/lang.c:1869 src/lang.c:1875 src/lang.c:1881 src/lang.c:1887 src/lang.c:1893 -#: src/lang.c:1899 src/lang.c:1905 src/lang.c:1912 src/lang.c:1918 src/lang.c:1924 -#: src/lang.c:1931 src/lang.c:1942 src/lang.c:1948 src/lang.c:1954 src/lang.c:1960 -#: src/lang.c:1966 src/lang.c:1972 src/lang.c:1986 src/lang.c:1998 src/lang.c:2032 -#: src/lang.c:2084 src/lang.c:2091 src/lang.c:2097 src/lang.c:2122 src/lang.c:2139 -#: src/lang.c:2192 src/lang.c:2225 src/lang.c:2245 src/lang.c:2280 src/lang.c:2289 -#: src/lang.c:2314 src/lang.c:2326 src/lang.c:2345 src/lang.c:2353 +#: src/lang.c:1365 src/lang.c:1396 src/lang.c:1402 src/lang.c:1414 src/lang.c:1464 +#: src/lang.c:1470 src/lang.c:1480 src/lang.c:1500 src/lang.c:1575 src/lang.c:1745 +#: src/lang.c:1751 src/lang.c:1757 src/lang.c:1763 src/lang.c:1775 src/lang.c:1782 +#: src/lang.c:1836 src/lang.c:1845 src/lang.c:1851 src/lang.c:1858 src/lang.c:1865 +#: src/lang.c:1872 src/lang.c:1879 src/lang.c:1886 src/lang.c:1893 src/lang.c:1900 +#: src/lang.c:1907 src/lang.c:1914 src/lang.c:1921 src/lang.c:1928 src/lang.c:1935 +#: src/lang.c:1942 src/lang.c:1949 src/lang.c:1956 src/lang.c:1963 src/lang.c:1970 +#: src/lang.c:1977 src/lang.c:1984 src/lang.c:1991 src/lang.c:1998 src/lang.c:2005 +#: src/lang.c:2013 src/lang.c:2029 src/lang.c:2036 src/lang.c:2043 src/lang.c:2050 +#: src/lang.c:2056 src/lang.c:2062 src/lang.c:2079 src/lang.c:2091 src/lang.c:2125 +#: src/lang.c:2178 src/lang.c:2185 src/lang.c:2191 src/lang.c:2216 src/lang.c:2233 +#: src/lang.c:2286 src/lang.c:2322 src/lang.c:2342 src/lang.c:2377 src/lang.c:2387 +#: src/lang.c:2412 src/lang.c:2428 src/lang.c:2447 src/lang.c:2460 msgid " toggles, sets, cancels." msgstr "" -#: src/lang.c:1347 +#: src/lang.c:1366 msgid "Show mini menu & posting etiquette" msgstr "" -#: src/lang.c:1348 +#: src/lang.c:1367 msgid "# If ON show a mini menu of useful commands at each level\n" "# and posting etiquette after composing an article\n" msgstr "" -#: src/lang.c:1353 +#: src/lang.c:1372 msgid "Show short description for each newsgroup. toggles & sets." msgstr "" -#: src/lang.c:1354 +#: src/lang.c:1373 msgid "Show description of each newsgroup" msgstr "" -#: src/lang.c:1355 +#: src/lang.c:1374 msgid "# If ON show group description text after newsgroup name at\n" "# group selection level\n" msgstr "" -#: src/lang.c:1360 +#: src/lang.c:1379 msgid "Show Subject & From (author) fields in group menu. toggles & " "sets." msgstr "" -#: src/lang.c:1361 +#: src/lang.c:1380 msgid "In group menu, show author by" msgstr "" -#: src/lang.c:1362 -msgid "# Part of from field to display 0) none 1) address 2) full name 3) both\n" +#: src/lang.c:1381 +msgid "# Part of from field to display\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = none\n" + "# 1 = address\n" + "# * 2 = full name\n" + "# 3 = both\n" msgstr "" -#: src/lang.c:1366 +#: src/lang.c:1390 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "" -#: src/lang.c:1367 +#: src/lang.c:1391 msgid "Draw -> instead of highlighted bar" msgstr "" -#: src/lang.c:1368 +#: src/lang.c:1392 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "" -#: src/lang.c:1373 +#: src/lang.c:1397 msgid "Use inverse video for page headers" msgstr "" -#: src/lang.c:1374 +#: src/lang.c:1398 msgid "# If ON use inverse video for page headers at different levels\n" msgstr "" -#: src/lang.c:1379 +#: src/lang.c:1403 msgid "Thread articles by" msgstr "" -#: src/lang.c:1380 -msgid "# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n" - "# 4=(Multipart Subject).\n" +#: src/lang.c:1404 +msgid "# Thread articles by ...\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = nothing\n" + "# 1 = Subject\n" + "# 2 = References\n" + "# * 3 = Both (Subject and References)\n" + "# 4 = Multipart Subject\n" msgstr "" -#: src/lang.c:1386 +#: src/lang.c:1415 msgid "Score of a thread" msgstr "" -#: src/lang.c:1387 -msgid "# Thread score 0=(Max) 1=(Sum) 2=(Average)\n" +#: src/lang.c:1416 +msgid "# Thread score\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = max\n" + "# 1 = sum\n" + "# 2 = average\n" msgstr "" -#: src/lang.c:1391 +#: src/lang.c:1424 msgid "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "" -#: src/lang.c:1392 +#: src/lang.c:1425 msgid "Sort articles by" msgstr "" -#: src/lang.c:1393 -msgid "# Sort articles by 0=(nothing) 1=(Subject descend) 2=(Subject ascend)\n" - "# 3=(From descend) 4=(From ascend) 5=(Date descend) 6=(Date ascend)\n" - "# 7=(Score descend) 8=(Score ascend) 9=(Lines descend) 10=(Lines ascend).\n" +#: src/lang.c:1426 +msgid "# Sort articles by ...\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = nothing\n" + "# 1 = Subject descending\n" + "# 2 = Subject ascending\n" + "# 3 = From descending\n" + "# 4 = From ascending\n" + "# 5 = Date descending\n" + "# * 6 = Date ascending\n" + "# 7 = Score descending\n" + "# 8 = Score ascending\n" + "# 9 = Lines descending\n" + "# 10 = Lines ascending\n" msgstr "" -#: src/lang.c:1399 +#: src/lang.c:1442 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "" -#: src/lang.c:1400 +#: src/lang.c:1443 msgid "Sort threads by" msgstr "" -#: src/lang.c:1401 -msgid "# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n" +#: src/lang.c:1444 +msgid "# Sort thread by ...\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = nothing\n" + "# * 1 = Score descending\n" + "# 2 = Score ascending\n" msgstr "" -#: src/lang.c:1405 +#: src/lang.c:1452 msgid "Put cursor at first/last unread art in groups. toggles & sets." msgstr "" -#: src/lang.c:1406 +#: src/lang.c:1453 msgid "Goto first unread article in group" msgstr "" -#: src/lang.c:1407 +#: src/lang.c:1454 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "" -#: src/lang.c:1411 +#: src/lang.c:1458 msgid "Show all articles or only unread articles. toggles & sets." msgstr "" -#: src/lang.c:1412 +#: src/lang.c:1459 msgid "Show only unread articles" msgstr "" -#: src/lang.c:1413 +#: src/lang.c:1460 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "" -#: src/lang.c:1418 +#: src/lang.c:1465 msgid "Show only groups with unread arts" msgstr "" -#: src/lang.c:1419 +#: src/lang.c:1466 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "" -#: src/lang.c:1424 +#: src/lang.c:1471 msgid "Filter which articles" msgstr "" -#: src/lang.c:1425 -msgid "# 0=(Only kill unread articles)\n" - "# 1=(Kill all articles and show in threads marked with K)\n" - "# 2=(Kill all articles and never show them).\n" +#: src/lang.c:1472 +msgid "# Filter which articles\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = only kill unread articles\n" + "# 1 = kill all articles and show in threads marked with K\n" + "# 2 = kill all articles and never show them\n" msgstr "" -#: src/lang.c:1432 +#: src/lang.c:1481 msgid "Tab goes to next unread article" msgstr "" -#: src/lang.c:1433 +#: src/lang.c:1482 msgid "# If ON the TAB command will go to next unread article at article viewer " "level\n" msgstr "" -#: src/lang.c:1437 +#: src/lang.c:1486 msgid "Scrolling with past the end of an art. jumps to the next unread one." msgstr "" -#: src/lang.c:1438 +#: src/lang.c:1487 msgid "Space goes to next unread article" msgstr "" -#: src/lang.c:1439 +#: src/lang.c:1488 msgid "# If ON the SPACE command will go to next unread article at article viewer\n" "# level when the end of the article is reached (rn-style pager)\n" msgstr "" -#: src/lang.c:1444 +#: src/lang.c:1493 msgid "Scrolling with / past the end of an art. jumps to the unread one." msgstr "" -#: src/lang.c:1445 +#: src/lang.c:1494 msgid "PgDn goes to next unread article" msgstr "" -#: src/lang.c:1446 +#: src/lang.c:1495 msgid "# If ON the PGDN or DOWN command will go to next unread article when\n" "# pressed at end of message\n" msgstr "" -#: src/lang.c:1452 +#: src/lang.c:1501 msgid "List thread using right arrow key" msgstr "" -#: src/lang.c:1453 +#: src/lang.c:1502 msgid "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "" -#: src/lang.c:1457 +#: src/lang.c:1506 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "" -#: src/lang.c:1458 +#: src/lang.c:1507 msgid "Character to show deleted articles" msgstr "" -#: src/lang.c:1459 +#: src/lang.c:1508 msgid "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1464 +#: src/lang.c:1513 msgid "Enter character to indicate articles in a range. sets, cancels." msgstr "" -#: src/lang.c:1465 +#: src/lang.c:1514 msgid "Character to show inrange articles" msgstr "" -#: src/lang.c:1466 +#: src/lang.c:1515 msgid "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1471 +#: src/lang.c:1520 msgid "Enter character to indicate that article will return. sets, " "cancels." msgstr "" -#: src/lang.c:1472 +#: src/lang.c:1521 msgid "Character to show returning arts" msgstr "" -#: src/lang.c:1473 +#: src/lang.c:1522 msgid "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1478 +#: src/lang.c:1527 msgid "Enter character to indicate selected articles. sets, cancels." msgstr "" -#: src/lang.c:1479 +#: src/lang.c:1528 msgid "Character to show selected articles" msgstr "" -#: src/lang.c:1480 +#: src/lang.c:1529 msgid "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1485 +#: src/lang.c:1534 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "" -#: src/lang.c:1486 +#: src/lang.c:1535 msgid "Character to show recent articles" msgstr "" -#: src/lang.c:1487 +#: src/lang.c:1536 msgid "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1492 +#: src/lang.c:1541 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "" -#: src/lang.c:1493 +#: src/lang.c:1542 msgid "Character to show unread articles" msgstr "" -#: src/lang.c:1494 +#: src/lang.c:1543 msgid "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1499 +#: src/lang.c:1548 msgid "Enter character to indicate read articles. sets, cancels." msgstr "" -#: src/lang.c:1500 +#: src/lang.c:1549 msgid "Character to show read articles" msgstr "" -#: src/lang.c:1501 +#: src/lang.c:1550 msgid "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1506 +#: src/lang.c:1555 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "" -#: src/lang.c:1507 +#: src/lang.c:1556 msgid "Character to show killed articles" msgstr "" -#: src/lang.c:1508 +#: src/lang.c:1557 msgid "# Character used to show that an art was killed (default 'K')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" msgstr "" -#: src/lang.c:1513 +#: src/lang.c:1562 msgid "Enter character to indicate read selected articles. sets, cancels." msgstr "" -#: src/lang.c:1514 +#: src/lang.c:1563 msgid "Character to show readselected arts" msgstr "" -#: src/lang.c:1515 +#: src/lang.c:1564 msgid "# Character used to show that an art was selected before read (default ':')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" msgstr "" -#: src/lang.c:1520 +#: src/lang.c:1569 msgid "Enter maximum length of newsgroup names displayed. sets." msgstr "" -#: src/lang.c:1521 +#: src/lang.c:1570 msgid "Max. length of group names shown" msgstr "" -#: src/lang.c:1522 +#: src/lang.c:1571 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "" -#: src/lang.c:1527 +#: src/lang.c:1576 msgid "Show lines/score in listings" msgstr "" -#: src/lang.c:1528 +#: src/lang.c:1577 msgid "# What informations should be displayed in article/thread listing\n" - "# 0 = nothing, 1 = lines, 2 = score, 3 = lines & score\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = nothing\n" + "# * 1 = lines\n" + "# 2 = score\n" + "# 3 = lines & score\n" msgstr "" -#: src/lang.c:1533 +#: src/lang.c:1586 msgid "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" msgstr "" -#: src/lang.c:1534 +#: src/lang.c:1587 msgid "Number of lines to scroll in pager" msgstr "" -#: src/lang.c:1535 +#: src/lang.c:1588 msgid "# Number of lines that cursor-up/down will scroll in article pager\n" - "# eg, 1+ = line-by-line, 0 = page-by-page (traditional behavior),\n" - "# -1 = the top/bottom line is carried over onto the next page,\n" - "# -2 = half-page scrolling\n" + "# Possible values are (the default is marked with *):\n" + "# -2 = half-page scrolling\n" + "# -1 = the top/bottom line is carried over onto the next page\n" + "# 0 = page-by-page (traditional behavior)\n" + "# * 1 = line-by-line\n" + "# 2 or greater = scroll by 2 or more lines (only in the pager)\n" msgstr "# Number of lines that cursor-up/down will scroll in article pager\n" - "# eg, 1+ = line-by-line, 0 = page-by-page (traditional behaviour),\n" - "# -1 = the top/bottom line is carried over onto the next page,\n" - "# -2 = half-page scrolling\n" + "# Possible values are (the default is marked with *):\n" + "# -2 = half-page scrolling\n" + "# -1 = the top/bottom line is carried over onto the next page\n" + "# 0 = page-by-page (traditional behaviour)\n" + "# * 1 = line-by-line\n" + "# 2 or greater = scroll by 2 or more lines (only in the pager)\n" -#: src/lang.c:1542 +#: src/lang.c:1598 msgid "Display signatures. toggles & sets." msgstr "" -#: src/lang.c:1543 +#: src/lang.c:1599 msgid "Display signatures" msgstr "" -#: src/lang.c:1544 +#: src/lang.c:1600 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "" -#: src/lang.c:1548 +#: src/lang.c:1604 msgid "Display uuencoded data as tagged attachments. toggles & sets." msgstr "" -#: src/lang.c:1549 +#: src/lang.c:1605 msgid "Display uue data as an attachment" msgstr "" -#: src/lang.c:1550 +#: src/lang.c:1606 msgid "# Handling of uuencoded data in the pager\n" - "# 0 = display raw uuencoded data\n" - "# 1 = uuencoded data will be condensed to a single tag line showing\n" - "# size and filename, similar to how MIME attachments are displayed\n" - "# 2 = as for 1, but any line that looks like uuencoded data will be folded\n" - "# into a tag line.\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = no, display raw uuencoded data\n" + "# 1 = yes, uuencoded data will be condensed to a single tag line showing\n" + "# size and filename, similar to how MIME attachments are displayed\n" + "# 2 = hide all, as for 1, but any line that looks like uuencoded data will\n" + "# be folded into a tag line.\n" msgstr "" -#: src/lang.c:1559 +#: src/lang.c:1616 msgid "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "" -#: src/lang.c:1560 +#: src/lang.c:1617 msgid "Display \"a as Umlaut-a" msgstr "" -#: src/lang.c:1561 +#: src/lang.c:1618 msgid "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" msgstr "" -#: src/lang.c:1566 src/lang.c:1576 +#: src/lang.c:1623 src/lang.c:1633 msgid "Space separated list of header fields" msgstr "" -#: src/lang.c:1567 +#: src/lang.c:1624 msgid "Display these header fields (or *)" msgstr "" -#: src/lang.c:1568 +#: src/lang.c:1625 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" @@ -4453,11 +4510,11 @@ msgid "# Which news headers you wish to "# spaces. Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1577 +#: src/lang.c:1634 msgid "Do not display these header fields" msgstr "" -#: src/lang.c:1578 +#: src/lang.c:1635 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 " @@ -4468,615 +4525,698 @@ msgid "# Same as 'news_headers_to_displa "# Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1588 +#: src/lang.c:1645 msgid "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "" -#: src/lang.c:1589 +#: src/lang.c:1646 msgid "Skip multipart/alternative parts" msgstr "" -#: src/lang.c:1590 +#: src/lang.c:1647 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "" -#: src/lang.c:1595 +#: src/lang.c:1652 msgid "A regex used to decide which lines to show in col_quote." msgstr "" -#: src/lang.c:1596 +#: src/lang.c:1653 msgid "Regex used to show quoted lines" msgstr "" -#: src/lang.c:1597 +#: src/lang.c:1654 msgid "# A regular expression that tin will use to decide which lines are\n" "# quoted when viewing articles. Quoted lines are shown in col_quote.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1603 +#: src/lang.c:1660 msgid "A regex used to decide which lines to show in col_quote2." msgstr "" -#: src/lang.c:1604 +#: src/lang.c:1661 msgid "Regex used to show twice quoted l." msgstr "" -#: src/lang.c:1605 +#: src/lang.c:1662 msgid "# A regular expression that tin will use to decide which lines are\n" "# quoted twice. Twice quoted lines are shown in col_quote2.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1611 +#: src/lang.c:1668 msgid "A regex used to decide which lines to show in col_quote3." msgstr "" -#: src/lang.c:1612 +#: src/lang.c:1669 msgid "Regex used to show >= 3 times q.l." msgstr "" -#: src/lang.c:1613 +#: src/lang.c:1670 msgid "# A regular expression that tin will use to decide which lines are\n" "# quoted >=3 times. >=3 times quoted lines are shown in col_quote3.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1620 +#: src/lang.c:1677 msgid "A regex used to decide which words to show in col_markslashes." msgstr "" -#: src/lang.c:1621 +#: src/lang.c:1678 msgid "Regex used to highlight /slashes/" msgstr "" -#: src/lang.c:1622 +#: src/lang.c:1679 msgid "# A regular expression that tin will use to decide which words\n" "# bounded by '/' are to be shown in col_markslashes.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1628 +#: src/lang.c:1685 msgid "A regex used to decide which words to show in col_markstars." msgstr "" -#: src/lang.c:1629 +#: src/lang.c:1686 msgid "Regex used to highlight *stars*" msgstr "" -#: src/lang.c:1630 +#: src/lang.c:1687 msgid "# A regular expression that tin will use to decide which words\n" "# bounded by '*' are to be shown in col_markstars.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1636 +#: src/lang.c:1693 msgid "A regex used to decide which words to show in col_markstroke." msgstr "" -#: src/lang.c:1637 +#: src/lang.c:1694 msgid "Regex used to highlight -strokes-" msgstr "" -#: src/lang.c:1638 +#: src/lang.c:1695 msgid "# A regular expression that tin will use to decide which words\n" "# bounded by '-' are to be shown in col_markstroke.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1644 +#: src/lang.c:1701 msgid "A regex used to decide which words to show in col_markdash." msgstr "" -#: src/lang.c:1645 +#: src/lang.c:1702 msgid "Regex used to highlight _underline_" msgstr "" -#: src/lang.c:1646 +#: src/lang.c:1703 msgid "# A regular expression that tin will use to decide which words\n" "# bounded by '_' are to be shown in col_markdash.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1652 +#: src/lang.c:1709 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:1653 +#: src/lang.c:1710 msgid "Regex with Subject prefixes" msgstr "" -#: src/lang.c:1654 +#: src/lang.c:1711 msgid "# A regular expression that tin will use to find Subject prefixes\n" "# which will be removed before showing the header.\n" msgstr "" -#: src/lang.c:1659 +#: src/lang.c:1716 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:1660 +#: src/lang.c:1717 msgid "Regex with Subject suffixes" msgstr "" -#: src/lang.c:1661 +#: src/lang.c:1718 msgid "# A regular expression that tin will use to find Subject suffixes\n" "# which will be removed when replying or posting followup.\n" msgstr "" -#: src/lang.c:1666 +#: src/lang.c:1723 msgid "Enter name and options for external MIME viewer, --internal for built-in " "viewer" msgstr "" -#: src/lang.c:1667 +#: src/lang.c:1724 msgid "MIME binary content viewer" msgstr "" -#: src/lang.c:1668 +#: src/lang.c:1725 msgid "# If --internal automatically use the built in MIME viewer for non-text\n" "# parts of articles.\n" "# Otherwise specify an external viewer program (eg, metamail) or leave blank\n" "# for no automatic viewing\n" msgstr "" -#: src/lang.c:1675 +#: src/lang.c:1732 msgid "Confirm before starting non-text viewing program" msgstr "" -#: src/lang.c:1676 +#: src/lang.c:1733 msgid "Ask before using MIME viewer" msgstr "" -#: src/lang.c:1677 +#: src/lang.c:1734 msgid "# If ON tin will ask before using metamail to display MIME messages\n" "# this only happens if metamail_prog is set to something\n" msgstr "" -#: src/lang.c:1682 +#: src/lang.c:1739 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "" -#: src/lang.c:1683 +#: src/lang.c:1740 msgid "Catchup read groups when quitting" msgstr "" -#: src/lang.c:1684 +#: src/lang.c:1741 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "" -#: src/lang.c:1689 +#: src/lang.c:1746 msgid "Catchup group using left key" msgstr "" -#: src/lang.c:1690 +#: src/lang.c:1747 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "" -#: src/lang.c:1695 +#: src/lang.c:1752 msgid "Catchup thread by using left key" msgstr "" -#: src/lang.c:1701 +#: src/lang.c:1758 msgid "Which actions require confirmation" msgstr "" -#: src/lang.c:1702 +#: src/lang.c:1759 msgid "# What should we ask confirmation for.\n" msgstr "" -#: src/lang.c:1707 +#: src/lang.c:1764 msgid "'Mark article read' ignores tags" msgstr "" -#: src/lang.c:1708 +#: src/lang.c:1765 msgid "# If ON the 'Mark article read' function marks only the current article.\n" msgstr "" -#: src/lang.c:1712 +#: src/lang.c:1769 msgid "Program to run to open URL's, sets, cancels." msgstr "" -#: src/lang.c:1713 +#: src/lang.c:1770 msgid "Program that opens URL's" msgstr "" -#: src/lang.c:1714 +#: src/lang.c:1771 msgid "# The program used to open URL's. The actual URL will be appended\n" msgstr "" -#: src/lang.c:1719 +#: src/lang.c:1776 msgid "Use mouse in xterm" msgstr "" -#: src/lang.c:1720 +#: src/lang.c:1777 msgid "# If ON enable mouse key support on xterm terminals\n" msgstr "" -#: src/lang.c:1726 +#: src/lang.c:1783 msgid "Use scroll keys on keypad" msgstr "" -#: src/lang.c:1727 +#: src/lang.c:1784 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "" -#: src/lang.c:1732 +#: src/lang.c:1789 msgid "Enter maximum number of article to get. sets." msgstr "" -#: src/lang.c:1733 +#: src/lang.c:1790 msgid "Number of articles to get" msgstr "" -#: src/lang.c:1734 +#: src/lang.c:1791 msgid "# Number of articles to get (0=no limit), if negative sets maximum number\n" "# of already read articles to be read before first unread one\n" msgstr "" -#: src/lang.c:1739 +#: src/lang.c:1796 msgid "Enter number of days article is considered recent. sets." msgstr "" -#: src/lang.c:1740 +#: src/lang.c:1797 msgid "Article recentness time limit" msgstr "" -#: src/lang.c:1741 +#: src/lang.c:1798 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "" -#: src/lang.c:1745 +#: src/lang.c:1802 msgid "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "" -#: src/lang.c:1746 +#: src/lang.c:1803 msgid "Wildcard matching" msgstr "" -#: src/lang.c:1747 -msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" +#: src/lang.c:1804 +msgid "# Wildcard matching\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = wildmat\n" + "# 1 = regex\n" msgstr "" -#: src/lang.c:1751 +#: src/lang.c:1811 msgid "Enter minimal score before an article is marked killed. sets." msgstr "" -#: src/lang.c:1752 +#: src/lang.c:1812 msgid "Score limit (kill)" msgstr "" -#: src/lang.c:1753 +#: src/lang.c:1813 msgid "# Score limit before an article is marked killed\n" msgstr "" -#: src/lang.c:1757 +#: src/lang.c:1817 msgid "Enter default score to kill articles. sets." msgstr "" -#: src/lang.c:1758 +#: src/lang.c:1818 msgid "Default score to kill articles" msgstr "" -#: src/lang.c:1759 +#: src/lang.c:1819 msgid "# Default score to kill articles\n" msgstr "" -#: src/lang.c:1763 +#: src/lang.c:1823 msgid "Enter minimal score before an article is marked hot. sets." msgstr "" -#: src/lang.c:1764 +#: src/lang.c:1824 msgid "Score limit (select)" msgstr "" -#: src/lang.c:1765 +#: src/lang.c:1825 msgid "# Score limit before an article is marked hot\n" msgstr "" -#: src/lang.c:1769 +#: src/lang.c:1829 msgid "Enter default score to select articles. sets." msgstr "" -#: src/lang.c:1770 +#: src/lang.c:1830 msgid "Default score to select articles" msgstr "" -#: src/lang.c:1771 +#: src/lang.c:1831 msgid "# Default score to select articles\n" msgstr "" -#: src/lang.c:1777 +#: src/lang.c:1837 msgid "Use slrnface to show ''X-Face:''s" msgstr "" -#: src/lang.c:1778 +#: src/lang.c:1838 msgid "# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n" "# Only useful when running in an xterm.\n" msgstr "" -#: src/lang.c:1786 +#: src/lang.c:1846 msgid "Use ANSI color" msgstr "Use ANSI colour" -#: src/lang.c:1787 +#: src/lang.c:1847 msgid "# If ON using ANSI-color\n" msgstr "# If ON using ANSI-colour\n" -#: src/lang.c:1792 +#: src/lang.c:1852 msgid "Standard foreground color" msgstr "Standard foreground colour" -#: src/lang.c:1793 +#: src/lang.c:1853 msgid "# Standard foreground color\n" + "# Default: -1 (default color)\n" msgstr "# Standard foreground colour\n" + "# Default: -1 (default colour)\n" -#: src/lang.c:1798 +#: src/lang.c:1859 msgid "Standard background color" msgstr "Standard background colour" -#: src/lang.c:1799 -msgid "# Standard-Background-Color\n" -msgstr "# Standard-Background-Colour\n" +#: src/lang.c:1860 +msgid "# Standard background color\n" + "# Default: -1 (default color)\n" +msgstr "# Standard background colour\n" + "# Default: -1 (default colour)\n" -#: src/lang.c:1804 +#: src/lang.c:1866 msgid "Color for inverse text (background)" msgstr "Colour for inverse text (bg)" -#: src/lang.c:1805 +#: src/lang.c:1867 msgid "# Color of background for inverse text\n" + "# Default: 4 (blue)\n" msgstr "# Colour of background for inverse text\n" + "# Default: 4 (blue)\n" -#: src/lang.c:1810 +#: src/lang.c:1873 msgid "Color for inverse text (foreground)" msgstr "Colour for inverse text (fg)" -#: src/lang.c:1811 +#: src/lang.c:1874 msgid "# Color of foreground for inverse text\n" + "# Default: 7 (white)\n" msgstr "# Colour of foreground for inverse text\n" + "# Default: 7 (white)\n" -#: src/lang.c:1816 +#: src/lang.c:1880 msgid "Color of text lines" msgstr "Colour of text lines" -#: src/lang.c:1817 -msgid "# Color of text-lines\n" -msgstr "# Colour of text-lines\n" +#: src/lang.c:1881 +msgid "# Color of text lines\n" + "# Default: -1 (default color)\n" +msgstr "# Colour of text lines\n" + "# Default: -1 (default colour\n" -#: src/lang.c:1822 +#: src/lang.c:1887 msgid "Color of mini help menu" msgstr "Colour of mini help menu" -#: src/lang.c:1823 +#: src/lang.c:1888 msgid "# Color of mini help menu\n" + "# Default: 3 (brown)\n" msgstr "# Colour of mini help menu\n" + "# Default: 3 (brown)\n" -#: src/lang.c:1828 +#: src/lang.c:1894 msgid "Color of help text" msgstr "Colour of help text" -#: src/lang.c:1829 +#: src/lang.c:1895 msgid "# Color of help pages\n" + "# Default: -1 (default color)\n" msgstr "# Colour of help pages\n" + "# Default: -1 (default colour)\n" -#: src/lang.c:1834 +#: src/lang.c:1901 msgid "Color of status messages" msgstr "Colour of status messages" -#: src/lang.c:1835 +#: src/lang.c:1902 msgid "# Color of messages in last line\n" + "# Default: 6 (cyan)\n" msgstr "# Colour of messages in last line\n" + "# Default: 6 (cyan)\n" -#: src/lang.c:1840 +#: src/lang.c:1908 msgid "Color of quoted lines" msgstr "Colour of quoted lines" -#: src/lang.c:1841 +#: src/lang.c:1909 msgid "# Color of quote-lines\n" + "# Default: 2 (green)\n" msgstr "# Colour of quote-lines\n" + "# Default: 2 (green)\n" -#: src/lang.c:1846 +#: src/lang.c:1915 msgid "Color of twice quoted line" msgstr "Colour of twice quoted line" -#: src/lang.c:1847 +#: src/lang.c:1916 msgid "# Color of twice quoted lines\n" + "# Default: 3 (brown)\n" msgstr "# Colour of twice quoted lines\n" + "# Default: 3 (brown)\n" -#: src/lang.c:1852 +#: src/lang.c:1922 msgid "Color of =>3 times quoted line" msgstr "Colour of =>3 times quoted line" -#: src/lang.c:1853 +#: src/lang.c:1923 msgid "# Color of >=3 times quoted lines\n" + "# Default: 4 (blue)\n" msgstr "# Colour of >=3 times quoted lines\n" + "# Default: 4 (blue)\n" -#: src/lang.c:1858 +#: src/lang.c:1929 msgid "Color of article header lines" msgstr "Colour of article header lines" -#: src/lang.c:1859 +#: src/lang.c:1930 msgid "# Color of header-lines\n" + "# Default: 2 (green)\n" msgstr "# Colour of header-lines\n" + "# Default: 2 (green)\n" -#: src/lang.c:1864 +#: src/lang.c:1936 msgid "Color of actual news header fields" msgstr "Colour of actual news header fields" -#: src/lang.c:1865 +#: src/lang.c:1937 msgid "# Color of actual news header fields\n" + "# Default: 9 (light red)\n" msgstr "# Colour of actual news header fields\n" + "# Default: 9 (light red)\n" -#: src/lang.c:1870 +#: src/lang.c:1943 msgid "Color of article subject lines" msgstr "Colour of article subject lines" -#: src/lang.c:1871 +#: src/lang.c:1944 msgid "# Color of article subject\n" + "# Default: 6 (cyan)\n" msgstr "# Colour of article subject\n" + "# Default: 6 (cyan)\n" -#: src/lang.c:1876 +#: src/lang.c:1950 msgid "Color of response counter" msgstr "Colour of response counter" -#: src/lang.c:1877 +#: src/lang.c:1951 msgid "# Color of response counter\n" + "# Default: 2 (green)\n" msgstr "# Colour of response counter\n" + "# Default: 2 (green)\n" -#: src/lang.c:1882 +#: src/lang.c:1957 msgid "Color of sender (From:)" msgstr "Colour of sender (From:)" -#: src/lang.c:1883 +#: src/lang.c:1958 msgid "# Color of sender (From:)\n" + "# Default: 2 (green)\n" msgstr "# Colour of sender (From:)\n" + "# Default: 2 (green)\n" -#: src/lang.c:1888 +#: src/lang.c:1964 msgid "Color of help/mail sign" msgstr "Colour of help/mail sign" -#: src/lang.c:1889 +#: src/lang.c:1965 msgid "# Color of Help/Mail-Sign\n" + "# Default: 4 (blue)\n" msgstr "# Colour of Help/Mail-Sign\n" + "# Default: 4 (blue)\n" -#: src/lang.c:1894 +#: src/lang.c:1971 msgid "Color of signatures" msgstr "Colour of signatures" -#: src/lang.c:1895 +#: src/lang.c:1972 msgid "# Color of signature\n" + "# Default: 4 (blue)\n" msgstr "# Colour of signature\n" + "# Default: 4 (blue)\n" -#: src/lang.c:1900 +#: src/lang.c:1978 msgid "Color of highlighted URLs" msgstr "Colour of highlighted URLs" -#: src/lang.c:1901 +#: src/lang.c:1979 msgid "# Color of highlighted URLs\n" + "# Default: -1 (default color)\n" msgstr "# Colour of highlighted URLs\n" + "# Default: -1 (default colour)\n" -#: src/lang.c:1906 +#: src/lang.c:1985 msgid "Color of highlighting with *stars*" msgstr "Colour of highlighting with *stars*" -#: src/lang.c:1907 -msgid "# Color of word highlighting. There are four possibilities\n" - "# in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n" -msgstr "# Colour of word highlighting. There are four possibilities\n" - "# in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n" +#: src/lang.c:1986 +msgid "# Color of word highlighting with *stars*\n" + "# Default: 11 (yellow)\n" +msgstr "# Colour of word highlighting with *stars*\n" + "# Default: 11 (yellow)\n" -#: src/lang.c:1913 +#: src/lang.c:1992 msgid "Color of highlighting with _dash_" msgstr "Colour of highlighting with _dash_" -#: src/lang.c:1919 +#: src/lang.c:1993 +msgid "# Color of word highlighting with _dash_\n" + "# Default: 13 (light pink)\n" +msgstr "# Colour of word highlighting with _dash_\n" + "# Default: 13 (light pink)\n" + +#: src/lang.c:1999 msgid "Color of highlighting with /slash/" msgstr "Colour of highlighting with /slash/" -#: src/lang.c:1925 +#: src/lang.c:2000 +msgid "# Color of word highlighting with /slash/\n" + "# Default: 14 (light cyan)\n" +msgstr "# Colour of word highlighting with /slash/\n" + "# Default: 14 (light cyan)\n" + +#: src/lang.c:2006 msgid "Color of highlighting with -stroke-" msgstr "Colour of highlighting w. -stroke-" -#: src/lang.c:1932 +#: src/lang.c:2007 +msgid "# Color of word highlighting with -stroke-\n" + "# Default: 12 (light blue)\n" +msgstr "# Colour of word highlighting with -stroke-\n" + "# Default: 12 (light blue)\n" + +#: src/lang.c:2014 msgid "Attr. of highlighting with *stars*" msgstr "" -#: src/lang.c:1933 -msgid "# Attribute of word highlighting on mono terminals.\n" - "# There are four possibilities in articles:\n" - "# *stars*, /slashes/, _underdashes_ and -strokes-.\n" - "# The possible values are:\n" - "# 0 - Normal, 1 - Underline, 2 - Best highlighting,\n" - "# 3 - Reverse video, 4 - Blinking, 5 - Half bright, 6 - Bold\n" +#: src/lang.c:2015 +msgid "# Attributes of word highlighting on mono terminals\n" + "# Possible values are:\n" + "# 0 = Normal\n" + "# 1 = Underline\n" + "# 2 = Best highlighting\n" + "# 3 = Reverse video\n" + "# 4 = Blinking\n" + "# 5 = Half bright\n" + "# 6 = Bold\n" + "\n" + "# Attribute of word highlighting with *stars*\n" + "# Default: 6 (bold)\n" msgstr "" -#: src/lang.c:1943 +#: src/lang.c:2030 msgid "Attr. of highlighting with _dash_" msgstr "" -#: src/lang.c:1949 +#: src/lang.c:2031 +msgid "# Attribute of word highlighting with _dash_\n" + "# Default: 2 (best highlighting)\n" +msgstr "" + +#: src/lang.c:2037 msgid "Attr. of highlighting with /slash/" msgstr "" -#: src/lang.c:1955 +#: src/lang.c:2038 +msgid "# Attribute of word highlighting with /slash/\n" + "# Default: 5 (half bright)\n" +msgstr "" + +#: src/lang.c:2044 msgid "Attr. of highlighting with -stroke-" msgstr "" -#: src/lang.c:1961 +#: src/lang.c:2045 +msgid "# Attribute of word highlighting with -stroke-\n" + "# Default: 3 (reverse video)\n" +msgstr "" + +#: src/lang.c:2051 msgid "URL highlighting in message body" msgstr "" -#: src/lang.c:1962 +#: src/lang.c:2052 msgid "# Enable URL highlighting?\n" msgstr "" -#: src/lang.c:1967 +#: src/lang.c:2057 msgid "Word highlighting in message body" msgstr "" -#: src/lang.c:1968 +#: src/lang.c:2058 msgid "# Enable word highlighting?\n" msgstr "" -#: src/lang.c:1973 +#: src/lang.c:2063 msgid "What to display instead of mark" msgstr "" -#: src/lang.c:1974 +#: src/lang.c:2064 msgid "# Should the leading and ending stars and dashes also be displayed,\n" "# even when they are highlighting marks?\n" - "# 0 - no 1 - yes, display mark 2 - print a space instead\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = no\n" + "# 1 = yes, display mark\n" + "# * 2 = print a space instead\n" msgstr "" -#: src/lang.c:1980 +#: src/lang.c:2073 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "" -#: src/lang.c:1981 +#: src/lang.c:2074 msgid "Page line wrap column" msgstr "" -#: src/lang.c:1982 +#: src/lang.c:2075 msgid "# Wrap article lines at column\n" msgstr "" -#: src/lang.c:1987 +#: src/lang.c:2080 msgid "Wrap around threads on next unread" msgstr "" -#: src/lang.c:1988 +#: src/lang.c:2081 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "" -#: src/lang.c:1992 +#: src/lang.c:2085 msgid "Enter default mail address (and fullname). sets." msgstr "" -#: src/lang.c:1993 +#: src/lang.c:2086 msgid "Mail address (and fullname)" msgstr "" -#: src/lang.c:1994 +#: src/lang.c:2087 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "" -#: src/lang.c:1999 +#: src/lang.c:2092 msgid "Show empty Followup-To in editor" msgstr "" -#: src/lang.c:2000 +#: src/lang.c:2093 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "" -#: src/lang.c:2004 +#: src/lang.c:2097 msgid "Enter path/! command/--none to create your default signature. sets." msgstr "" -#: src/lang.c:2005 +#: src/lang.c:2098 msgid "Create signature from path/command" msgstr "" -#: src/lang.c:2006 +#: src/lang.c:2099 msgid "# Signature path (random sigs)/file to be used when posting/replying\n" "# default_sigfile=file appends file as signature\n" "# default_sigfile=!command executes external command to generate a " @@ -5084,102 +5224,103 @@ msgid "# Signature path (random sigs)/fi "# default_sigfile=--none don't append a signature\n" msgstr "" -#: src/lang.c:2013 +#: src/lang.c:2106 msgid "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "" -#: src/lang.c:2014 +#: src/lang.c:2107 msgid "Prepend signature with \"-- \"" msgstr "" -#: src/lang.c:2015 +#: src/lang.c:2108 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "" -#: src/lang.c:2019 +#: src/lang.c:2112 msgid "Add signature when reposting articles. toggles & sets." msgstr "" -#: src/lang.c:2020 +#: src/lang.c:2113 msgid "Add signature when reposting" msgstr "" -#: src/lang.c:2021 +#: src/lang.c:2114 msgid "# If ON add signature to reposted articles\n" msgstr "" -#: src/lang.c:2025 +#: src/lang.c:2118 msgid "Enter quotation marks, %s or %S for author's initials." msgstr "" -#: src/lang.c:2026 +#: src/lang.c:2119 msgid "Characters used as quote-marks" msgstr "" -#: src/lang.c:2027 +#: src/lang.c:2120 msgid "# Characters used in quoting to followups and replies.\n" "# '_' is replaced by ' ', %%s, %%S are replaced by author's initials.\n" msgstr "" -#: src/lang.c:2033 +#: src/lang.c:2126 msgid "Quoting behavior" msgstr "Quoting behaviour" -#: src/lang.c:2034 +#: src/lang.c:2127 msgid "# How quoting should be handled when following up or replying.\n" - "# 0 = Nothing special\n" - "# 1 = Compress quotes\n" - "# 2 = Quote signatures\n" - "# 3 = Compress quotes, quote signatures\n" - "# 4 = Quote empty lines\n" - "# 5 = Compress quotes, quote empty lines\n" - "# 6 = Quote signatures, quote empty lines\n" - "# 7 = Compress quotes, quote signatures, quote empty lines\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = Nothing special\n" + "# 1 = Compress quotes\n" + "# 2 = Quote signatures\n" + "# 3 = Compress quotes, quote signatures\n" + "# 4 = Quote empty lines\n" + "# * 5 = Compress quotes, quote empty lines\n" + "# 6 = Quote signatures, quote empty lines\n" + "# 7 = Compress quotes, quote signatures, quote empty lines\n" msgstr "" -#: src/lang.c:2046 src/lang.c:2054 src/lang.c:2060 +#: src/lang.c:2140 src/lang.c:2148 src/lang.c:2154 msgid "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "" -#: src/lang.c:2047 +#: src/lang.c:2141 msgid "Quote line when following up" msgstr "" -#: src/lang.c:2048 +#: src/lang.c:2142 msgid "# Format of quote line when mailing/posting/following-up an article\n" "# %%A Address %%D Date %%F Addr+Name %%G Groupname %%M Message-ID\n" "# %%N Full Name %%C First Name %%I Initials\n" msgstr "" -#: src/lang.c:2055 +#: src/lang.c:2149 msgid "Quote line when cross-posting" msgstr "" -#: src/lang.c:2061 +#: src/lang.c:2155 msgid "Quote line when mailing" msgstr "" -#: src/lang.c:2066 +#: src/lang.c:2160 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "" -#: src/lang.c:2067 +#: src/lang.c:2161 msgid "Insert 'User-Agent:'-header" msgstr "" -#: src/lang.c:2068 +#: src/lang.c:2162 msgid "# If ON include advertising User-Agent: header\n" msgstr "" -#: src/lang.c:2073 +#: src/lang.c:2167 msgid "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" -#: src/lang.c:2074 +#: src/lang.c:2168 msgid "MM_CHARSET" msgstr "" -#: src/lang.c:2075 +#: src/lang.c:2169 msgid "# Charset supported locally which is also used for MIME header and\n" "# Content-Type header.\n" "# If not set, the value of the environment variable MM_CHARSET is used.\n" @@ -5188,27 +5329,27 @@ msgid "# Charset supported locally which "# mm_charset is considered not displayable and represented as '?'.\n" msgstr "" -#: src/lang.c:2085 +#: src/lang.c:2179 msgid "MM_NETWORK_CHARSET" msgstr "" -#: src/lang.c:2086 +#: src/lang.c:2180 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "" -#: src/lang.c:2092 +#: src/lang.c:2186 msgid "Mailbox format" msgstr "" -#: src/lang.c:2093 +#: src/lang.c:2187 msgid "# Format of the mailbox.\n" msgstr "" -#: src/lang.c:2098 +#: src/lang.c:2192 msgid "MIME encoding in news messages" msgstr "" -#: src/lang.c:2099 +#: src/lang.c:2193 msgid "# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n" "# for mails and posts, if necessary. QP is efficient for most European\n" "# character sets (ISO-8859-X) with small fraction of non-US-ASCII chars,\n" @@ -5216,42 +5357,42 @@ msgid "# MIME encoding (8bit, base64, qu "# Russian charsets with a lot of 8bit characters.\n" msgstr "" -#: src/lang.c:2107 src/lang.c:2128 +#: src/lang.c:2201 src/lang.c:2222 msgid "Don't change unless you know what you are doing. cancels." msgstr "" -#: src/lang.c:2108 +#: src/lang.c:2202 msgid "Use 8bit characters in news headers" msgstr "" -#: src/lang.c:2109 +#: src/lang.c:2203 msgid "# If ON, 8bit characters in news headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" "# 8bit chars in header are encoded regardless of the value of this\n" "# parameter unless post_mime_encoding is 8bit as well.\n" msgstr "" -#: src/lang.c:2116 +#: src/lang.c:2210 msgid "Auto-view post-processed files toggles, sets, cancels." msgstr "" -#: src/lang.c:2117 +#: src/lang.c:2211 msgid "View post-processed files" msgstr "" -#: src/lang.c:2118 +#: src/lang.c:2212 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "" -#: src/lang.c:2123 +#: src/lang.c:2217 msgid "MIME encoding in mail messages" msgstr "" -#: src/lang.c:2129 +#: src/lang.c:2223 msgid "Use 8bit characters in mail headers" msgstr "" -#: src/lang.c:2130 +#: src/lang.c:2224 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 " @@ -5261,391 +5402,408 @@ msgid "# If ON, 8bit characters in mail "# turn it ON unless you have some compelling reason.\n" msgstr "" -#: src/lang.c:2140 +#: src/lang.c:2234 msgid "Strip blanks from ends of lines" msgstr "" -#: src/lang.c:2141 +#: src/lang.c:2235 msgid "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" msgstr "" -#: src/lang.c:2146 +#: src/lang.c:2240 msgid "If ON, use transliteration. toggles & sets." msgstr "" -#: src/lang.c:2147 +#: src/lang.c:2241 msgid "Transliteration" msgstr "" -#: src/lang.c:2148 +#: src/lang.c:2242 msgid "# If ON, use //TRANSLIT extension. This means that when a character cannot\n" "# be represented in the in the target character set, it can be approximated\n" "# through one or several similarly looking characters.\n" msgstr "" -#: src/lang.c:2155 +#: src/lang.c:2249 msgid "Send you a carbon copy automatically. toggles & sets." msgstr "" -#: src/lang.c:2156 +#: src/lang.c:2250 msgid "Send you a cc automatically" msgstr "" -#: src/lang.c:2157 +#: src/lang.c:2251 msgid "# If ON automatically put your name in the Cc: field when mailing an article\n" msgstr "" -#: src/lang.c:2161 +#: src/lang.c:2255 msgid "Send you a blind carbon copy automatically. toggles & sets." msgstr "" -#: src/lang.c:2162 +#: src/lang.c:2256 msgid "Send you a blind cc automatically" msgstr "" -#: src/lang.c:2163 +#: src/lang.c:2257 msgid "# If ON automatically put your name in the Bcc: field when mailing an " "article\n" msgstr "" -#: src/lang.c:2167 +#: src/lang.c:2261 msgid "Enter address elements about which you want to be warned. sets." msgstr "" -#: src/lang.c:2168 +#: src/lang.c:2262 msgid "Spamtrap warning address parts" msgstr "" -#: src/lang.c:2169 +#: src/lang.c:2263 msgid "# A comma-delimited list of address-parts you want to be warned\n" "# about when trying to reply by email.\n" msgstr "" -#: src/lang.c:2174 +#: src/lang.c:2268 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "" -#: src/lang.c:2175 +#: src/lang.c:2269 msgid "No. of days a filter entry is valid" msgstr "" -#: src/lang.c:2176 +#: src/lang.c:2270 msgid "# Number of days a short term filter will be active\n" msgstr "" -#: src/lang.c:2180 +#: src/lang.c:2274 msgid "Add posted articles to filter. toggles & sets." msgstr "" -#: src/lang.c:2181 +#: src/lang.c:2275 msgid "Add posted articles to filter" msgstr "" -#: src/lang.c:2182 +#: src/lang.c:2276 msgid "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" msgstr "" -#: src/lang.c:2186 +#: src/lang.c:2280 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "" -#: src/lang.c:2187 +#: src/lang.c:2281 msgid "Mail directory" msgstr "" -#: src/lang.c:2188 +#: src/lang.c:2282 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "" -#: src/lang.c:2193 +#: src/lang.c:2287 msgid "Save articles in batch mode (-S)" msgstr "" -#: src/lang.c:2194 +#: src/lang.c:2288 msgid "# If ON articles/threads will be saved in batch mode when save -S\n" "# or mail (-M/-N) is specified on the command line\n" msgstr "" -#: src/lang.c:2199 +#: src/lang.c:2293 msgid "The directory where you want articles/threads saved." msgstr "" -#: src/lang.c:2200 +#: src/lang.c:2294 msgid "Directory to save arts/threads in" msgstr "" -#: src/lang.c:2201 +#: src/lang.c:2295 msgid "# Directory where articles/threads are saved\n" msgstr "" -#: src/lang.c:2205 +#: src/lang.c:2299 msgid "Auto save article/thread by Archive-name: header. toggles & sets." msgstr "" -#: src/lang.c:2206 +#: src/lang.c:2300 msgid "Use Archive-name: header for save" msgstr "" -#: src/lang.c:2207 +#: src/lang.c:2301 msgid "# If ON articles/threads with Archive-name: in mail header will\n" "# be automatically saved with the Archive-name & part/patch no.\n" msgstr "" -#: src/lang.c:2212 +#: src/lang.c:2306 msgid "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "" -#: src/lang.c:2213 +#: src/lang.c:2307 msgid "Mark saved articles/threads as read" msgstr "" -#: src/lang.c:2214 +#: src/lang.c:2308 msgid "# If ON mark articles that are saved as read\n" msgstr "" -#: src/lang.c:2218 +#: src/lang.c:2312 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "" -#: src/lang.c:2219 +#: src/lang.c:2313 msgid "Post process saved articles" msgstr "" -#: src/lang.c:2220 +#: src/lang.c:2314 msgid "# Perform post processing (saving binary attachments) from saved articles.\n" - "# 0=(no) 1=(yes) 2=(extract shell archives (shar) only)\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = no\n" + "# 1 = extract shell archives (shar) only\n" + "# 2 = yes\n" msgstr "" -#: src/lang.c:2226 +#: src/lang.c:2323 msgid "Process only unread articles" msgstr "" -#: src/lang.c:2227 +#: src/lang.c:2324 msgid "# If ON only save/print/pipe/mail unread articles (tagged articles excepted)\n" msgstr "" -#: src/lang.c:2232 +#: src/lang.c:2329 msgid "Print all or just part of header. toggles & sets." msgstr "" -#: src/lang.c:2233 +#: src/lang.c:2330 msgid "Print all headers when printing" msgstr "" -#: src/lang.c:2234 +#: src/lang.c:2331 msgid "# If ON print all of article header otherwise just the important lines\n" msgstr "" -#: src/lang.c:2238 +#: src/lang.c:2335 msgid "The printer program with options that is to be used to print articles/threads." msgstr "" -#: src/lang.c:2239 +#: src/lang.c:2336 msgid "Printer program with options" msgstr "" -#: src/lang.c:2240 +#: src/lang.c:2337 msgid "# Print program with parameters used to print articles/threads\n" msgstr "" -#: src/lang.c:2246 +#: src/lang.c:2343 msgid "Force redraw after certain commands" msgstr "" -#: src/lang.c:2247 +#: src/lang.c:2344 msgid "# If ON a screen redraw will always be done after certain external commands\n" msgstr "" -#: src/lang.c:2251 +#: src/lang.c:2348 msgid "Start editor with line offset. toggles, sets, cancels." msgstr "" -#: src/lang.c:2252 +#: src/lang.c:2349 msgid "Start editor with line offset" msgstr "" -#: src/lang.c:2253 +#: src/lang.c:2350 msgid "# If ON editor will be started with cursor offset into the file\n" "# otherwise the cursor will be positioned at the first line\n" msgstr "" -#: src/lang.c:2258 +#: src/lang.c:2355 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "" -#: src/lang.c:2259 +#: src/lang.c:2356 msgid "Invocation of your editor" msgstr "" -#: src/lang.c:2260 +#: src/lang.c:2357 msgid "# Format of editor line including parameters\n" "# %%E Editor %%F Filename %%N Linenumber\n" msgstr "" -#: src/lang.c:2265 +#: src/lang.c:2362 msgid "Enter name and options for external-inews, --internal for internal inews" msgstr "" -#: src/lang.c:2266 +#: src/lang.c:2363 msgid "External inews" msgstr "" -#: src/lang.c:2267 +#: src/lang.c:2364 msgid "# If --internal use the built in mini inews for posting via NNTP\n" "# otherwise use an external inews program\n" msgstr "" -#: src/lang.c:2271 +#: src/lang.c:2368 msgid "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" -#: src/lang.c:2272 +#: src/lang.c:2369 msgid "Invocation of your mail command" msgstr "" -#: src/lang.c:2273 +#: src/lang.c:2370 msgid "# Format of mailer line including parameters\n" "# %%M Mailer %%S Subject %%T To %%F Filename\n" "# ie. to use elm as your mailer: elm -s \"%%S\" \"%%T\" < %%F\n" "# ie. elm interactive : elm -i %%F -s \"%%S\" \"%%T\"\n" msgstr "" -#: src/lang.c:2281 +#: src/lang.c:2378 msgid "Use interactive mail reader" msgstr "" -#: src/lang.c:2282 -msgid "# Interactive mailreader:\n" - "# 0 = no interactive mailreader\n" - "# 1 = use interactive mailreader with headers in file\n" - "# 2 = use interactive mailreader without headers in file\n" +#: src/lang.c:2379 +msgid "# Interactive mailreader\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = no interactive mailreader\n" + "# 1 = use interactive mailreader with headers in file\n" + "# 2 = use interactive mailreader without headers in file\n" msgstr "" -#: src/lang.c:2290 +#: src/lang.c:2388 msgid "Remove ~/.article after posting" msgstr "" -#: src/lang.c:2291 +#: src/lang.c:2389 msgid "# If ON remove ~/.article after posting.\n" msgstr "" -#: src/lang.c:2295 +#: src/lang.c:2393 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "" -#: src/lang.c:2296 +#: src/lang.c:2394 msgid "Filename for posted articles" msgstr "" -#: src/lang.c:2297 +#: src/lang.c:2395 msgid "# Filename where to keep all postings (default posted)\n" "# If no filename is set then postings will not be saved\n" msgstr "" -#: src/lang.c:2302 +#: src/lang.c:2400 msgid "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "" -#: src/lang.c:2303 +#: src/lang.c:2401 msgid "Keep failed arts in ~/dead.articles" msgstr "" -#: src/lang.c:2304 +#: src/lang.c:2402 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "" -#: src/lang.c:2308 +#: src/lang.c:2406 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "" -#: src/lang.c:2309 +#: src/lang.c:2407 msgid "No unsubscribed groups in newsrc" msgstr "" -#: src/lang.c:2310 +#: src/lang.c:2408 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "" -#: src/lang.c:2315 +#: src/lang.c:2413 msgid "Remove bogus groups from newsrc" msgstr "" -#: src/lang.c:2316 +#: src/lang.c:2414 msgid "# What to do with bogus groups in newsrc file\n" - "# 0=(Keep) 1=(Remove) 2=(Highlight with D on selection screen).\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = keep\n" + "# 1 = remove\n" + "# 2 = highlight with D on selection screen\n" msgstr "" -#: src/lang.c:2320 +#: src/lang.c:2422 msgid "Enter number of seconds until active file will be reread. sets." msgstr "" -#: src/lang.c:2321 +#: src/lang.c:2423 msgid "Interval in secs to reread active" msgstr "" -#: src/lang.c:2322 +#: src/lang.c:2424 msgid "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "" -#: src/lang.c:2327 +#: src/lang.c:2429 msgid "Reconnect to server automatically" msgstr "" -#: src/lang.c:2328 +#: src/lang.c:2430 msgid "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "" -#: src/lang.c:2332 +#: src/lang.c:2434 msgid "Create local copies of NNTP overview files. toggles & sets." msgstr "" -#: src/lang.c:2333 +#: src/lang.c:2435 msgid "Cache NNTP overview files locally" msgstr "" -#: src/lang.c:2334 +#: src/lang.c:2436 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "" -#: src/lang.c:2338 +#: src/lang.c:2440 msgid "Enter format string. sets, cancels." msgstr "" -#: src/lang.c:2339 +#: src/lang.c:2441 msgid "Format string for display of dates" msgstr "" -#: src/lang.c:2340 +#: src/lang.c:2442 msgid "# Format string for date representation\n" msgstr "" -#: src/lang.c:2346 +#: src/lang.c:2448 msgid "Unicode normalization form" msgstr "Unicode normalisation form" -#: src/lang.c:2347 +#: src/lang.c:2449 msgid "# Unicode normalization form\n" - "# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = None\n" + "# * 1 = NFKC\n" + "# 2 = NFKD\n" + "# 3 = NFC\n" + "# 4 = NFD\n" msgstr "# Unicode normalisation form\n" - "# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = None\n" + "# * 1 = NFKC\n" + "# 2 = NFKD\n" + "# 3 = NFC\n" + "# 4 = NFD\n" -#: src/lang.c:2354 +#: src/lang.c:2461 msgid "Render BiDi" msgstr "" -#: src/lang.c:2355 +#: src/lang.c:2462 msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "" -#: src/misc.c:3711 +#: src/misc.c:3713 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "" -#: src/misc.c:3714 +#: src/misc.c:3716 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "" @@ -5679,7 +5837,7 @@ msgstr "" msgid "couldn't expand %s\n" msgstr "" -#: src/post.c:1962 +#: src/post.c:1970 #, c-format msgid "Posting: %.*s ..." msgstr "" @@ -5722,15 +5880,15 @@ msgstr "" msgid "bytes" msgstr "" -#: src/select.c:352 +#: src/select.c:375 msgid "unread" msgstr "" -#: src/select.c:352 +#: src/select.c:375 msgid "all" msgstr "" -#: src/select.c:530 src/select.c:532 +#: src/select.c:547 src/select.c:549 msgid " R" msgstr "" Binary files tin-1.7.6/po/et.gmo and tin-1.7.7/po/et.gmo differ diff -Nurp tin-1.7.6/po/et.po tin-1.7.7/po/et.po --- tin-1.7.6/po/et.po 2004-09-06 10:41:33.000000000 +0200 +++ tin-1.7.7/po/et.po 2004-12-15 16:48:27.000000000 +0100 @@ -4,7 +4,7 @@ # msgid "" msgstr "Project-Id-Version: tin 1.7.2\n" - "POT-Creation-Date: 2004-09-06 10:40+0200\n" + "POT-Creation-Date: 2004-12-15 16:47+0100\n" "PO-Revision-Date: 2003-01-07 18:45+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -232,7 +232,7 @@ msgstr "# *binaarfailidel* sea täielik j msgid "# and set Followup-To: poster\n" msgstr "# ja sea Followup-To: postitaja\n" -#: src/cook.c:814 +#: src/cook.c:494 msgid "(unknown)" msgstr "(tundmatu)" @@ -591,7 +591,7 @@ msgstr "Loon salvestatud gruppidele acti msgid "Creating newsrc file...\n" msgstr "Loon newsrc faili...\n" -#: src/lang.c:127 src/lang.c:1121 +#: src/lang.c:127 src/lang.c:1140 msgid "Default" msgstr "Vaikimisi" @@ -1439,386 +1439,396 @@ msgstr "salvesta artikkel/teema/kuum/mus msgid "save marked articles automatically without user prompts" msgstr "salvesta märgitud artiklid automaatselt, kasutajalt küsimata" +# TRANSLATION MISSING #: src/lang.c:337 +msgid "scroll the screen one line down" +msgstr "" + +# TRANSLATION MISSING +#: src/lang.c:338 +msgid "scroll the screen one line up" +msgstr "" + +#: src/lang.c:339 msgid "search for articles by author backwards" msgstr "otsi artikleid autori järgi tagaspidi" -#: src/lang.c:338 +#: src/lang.c:340 msgid "search for articles by author forwards" msgstr "otsi artikleid autori järgi edaspidi" -#: src/lang.c:339 +#: src/lang.c:341 msgid "search all articles for a given string (this may take some time)" msgstr "otsi antud teksti artiklitest (see võib võtta aega)" -#: src/lang.c:340 +#: src/lang.c:342 msgid " \t (searches are case-insensitive and wrap around to all articles)" msgstr " \t (otsing on tõstutundetu ja käib üle kõikide artiklite)" -#: src/lang.c:341 +#: src/lang.c:343 msgid "search for articles by Subject line backwards" msgstr "otsi artiklit teema järgi tagaspidi" -#: src/lang.c:342 +#: src/lang.c:344 msgid "search for articles by Subject line forwards" msgstr "otsi artiklit teema järgi edaspidi" -#: src/lang.c:343 +#: src/lang.c:345 msgid "repeat last search" msgstr "korda eelmist otsingut" -#: src/lang.c:344 +#: src/lang.c:346 msgid "tag current article for reposting/mailing/piping/printing/saving" msgstr "märgi jooksev artikkel, et postitada/saata/trükkida/salvestada/torusse" -#: src/lang.c:345 +#: src/lang.c:347 msgid "toggle info message in last line (subject/description)" msgstr "lülita viimase rea infoteadet (teema/kirjeldus)" -#: src/lang.c:346 +#: src/lang.c:348 msgid "toggle inverse video" msgstr "lülita pööratud video" -#: src/lang.c:347 +#: src/lang.c:349 msgid "toggle mini help menu display" msgstr "abiinfo lülita ekraanil miniabi menüüd" -#: src/lang.c:348 +#: src/lang.c:350 msgid "cycle the display of authors email address, real name, both or neither" msgstr "vali näitamiseks autori aadress, pärisnimi, mõlemad või mitte midagi" -#: src/lang.c:349 +#: src/lang.c:351 msgid "show version information" msgstr "esita info versioonist" -#: src/lang.c:350 +#: src/lang.c:352 msgid "mark all articles as read and return to group selection menu" msgstr "märgi artiklid loetuks ja välju gruppide valiku menüüsse" -#: src/lang.c:351 +#: src/lang.c:353 msgid "mark all articles as read and enter next group with unread articles" msgstr "märgi artiklid loetuks, sisene järgmisse lugemata artiklitega gruppi" -#: src/lang.c:352 +#: src/lang.c:354 msgid "choose first thread in list" msgstr "vali loendist esimene teema" -#: src/lang.c:353 +#: src/lang.c:355 msgid "choose last thread in list" msgstr "vali loendist viimane teema" -#: src/lang.c:354 +#: src/lang.c:356 msgid "list articles within current thread (bring up Thread sub-menu)" msgstr "artiklite loend jooksvas teemas (esita teema alam-menüü)" -#: src/lang.c:355 +#: src/lang.c:357 msgid "mark article as unread" msgstr "märgi artikkel loetuks" -#: src/lang.c:356 +#: src/lang.c:358 msgid "mark current thread or tagged threads as read" msgstr "märgi jooksev teema või märgitud teemad loetuks" -#: src/lang.c:357 +#: src/lang.c:359 msgid "mark thread as unread" msgstr "märgi teema loetuks" -#: src/lang.c:358 +#: src/lang.c:360 msgid "toggle display of all/selected articles" msgstr "lülita ekraanile kõik/valitud artiklid" -#: src/lang.c:359 +#: src/lang.c:361 msgid "display next group" msgstr "näita järgmist gruppi" -#: src/lang.c:360 +#: src/lang.c:362 msgid "display previous group" msgstr "näita eelmist gruppi" -#: src/lang.c:361 +#: src/lang.c:363 msgid "toggle all selections (all articles)" msgstr "lülita kõiki valikuid (kõiki artikleid)" -#: src/lang.c:362 +#: src/lang.c:364 msgid "select group (make \"hot\")" msgstr "vali grupp (muuda \"kuumaks\")" -#: src/lang.c:363 +#: src/lang.c:365 msgid "select thread" msgstr "vali teema" -#: src/lang.c:364 +#: src/lang.c:366 msgid "select threads if at least one unread article is selected" msgstr "vali teemad, kui on valitud vähemalt üks lugemata artikkel" -#: src/lang.c:365 +#: src/lang.c:367 msgid "select threads that match user specified pattern" msgstr "vali kasutaja määratud mustrile vastavad teemad" -#: src/lang.c:366 +#: src/lang.c:368 msgid "tag all parts of current multipart-message in order" msgstr "märgi jooksva mitmeosalise teate kõik osad" -#: src/lang.c:367 +#: src/lang.c:369 msgid "0 - 9\t choose thread by number" msgstr "0 - 9\t vali numbri järgi teema" -#: src/lang.c:368 +#: src/lang.c:370 msgid "toggle limit number of articles to get, and reload" msgstr "sea laetavate artiklite piirang ja lae uuesti" -#: src/lang.c:369 +#: src/lang.c:371 msgid "toggle display of all/unread articles" msgstr "lülita ekraanil kõik/lugemata artiklid" -#: src/lang.c:370 +#: src/lang.c:372 msgid "toggle selection of thread" msgstr "lülita teema valikut" -#: src/lang.c:371 +#: src/lang.c:373 msgid "cycle through threading options available" msgstr "erinevad teemade käsitlemise võtmed" -#: src/lang.c:372 +#: src/lang.c:374 msgid "undo all selections (all articles)" msgstr "ennista kõik valikud (kõik artiklid)" -#: src/lang.c:373 +#: src/lang.c:375 msgid "untag all tagged threads" msgstr "eemalda märgistus kõikidelt märgitud teemadelt" -#: src/lang.c:374 +#: src/lang.c:376 msgid "mark all articles in group as read" msgstr "märgi valitud grupis kõik artiklid loetuks" -#: src/lang.c:375 +#: src/lang.c:377 msgid "mark all articles in group as read and move to next unread group" msgstr "märgi grupis kõik artiklid loetuks ja liigu järgmisele lugemata grupile" -#: src/lang.c:376 +#: src/lang.c:378 msgid "choose first group in list" msgstr "vali loetelust esimene grupp" -#: src/lang.c:377 +#: src/lang.c:379 msgid "choose group by name" msgstr "vali grupp nime järgi" -#: src/lang.c:378 +#: src/lang.c:380 msgid "0 - 9\t choose group by number" msgstr "0 - 9\t vali grupp numbri järgi" -#: src/lang.c:379 +#: src/lang.c:381 msgid "choose range of groups to be affected by next command" msgstr "järgmise käsuga töödeldavate gruppide vahemik" -#: src/lang.c:380 +#: src/lang.c:382 msgid "choose last group in list" msgstr "vali loetelust viimane grupp" -#: src/lang.c:381 +#: src/lang.c:383 msgid "mark all articles in chosen group unread" msgstr "märgi valitud grupis kõik artiklid mitte-loetuks" -#: src/lang.c:382 +#: src/lang.c:384 msgid "move chosen group within list" msgstr "liiguta valitud gruppi loendis" -#: src/lang.c:383 +#: src/lang.c:385 msgid "choose next group with unread news" msgstr "vali järgmine lugemata artiklitega grupp" -#: src/lang.c:384 src/lang.c:1168 +#: src/lang.c:386 src/lang.c:1187 msgid "quit" msgstr "välju" -#: src/lang.c:385 +#: src/lang.c:387 msgid "quit without saving configuration changes" msgstr "välju muudetud seadeid salvestamata" -#: src/lang.c:386 +#: src/lang.c:388 msgid "read chosen group" msgstr "loe valitud gruppi" -#: src/lang.c:387 +#: src/lang.c:389 msgid "reset .newsrc (all available articles in groups marked unread)" msgstr ".newsrc faili algväärtustamine (kõik artiklid mitte-loetuks)" -#: src/lang.c:388 +#: src/lang.c:390 msgid "search backwards for a group name" msgstr "otsi grupi nime tagaspidi" -#: src/lang.c:389 +#: src/lang.c:391 msgid " \t (all searches are case-insensitive and wrap around)" msgstr " \t (kõik otsingud on tõstutundetud ja vajadusel alustavad algusest)" -#: src/lang.c:390 +#: src/lang.c:392 msgid "search forwards for a group name" msgstr "otsi grupi nime edaspidi" -#: src/lang.c:391 +#: src/lang.c:393 msgid "subscribe to chosen group" msgstr "telli valitud grupp" -#: src/lang.c:392 +#: src/lang.c:394 msgid "subscribe to groups that match pattern" msgstr "telli mustrile vastavaid gruppe" -#: src/lang.c:393 +#: src/lang.c:395 msgid "reread active file to check for any new news" msgstr "kontrolli aktiivsete gruppide faili - kas on uusi artikleid" -#: src/lang.c:394 +#: src/lang.c:396 msgid "toggle display of group name only or group name plus description" msgstr "vali ekraanil ainult grupi nimi või grupi nimi ja kirjeldus" -#: src/lang.c:395 +#: src/lang.c:397 msgid "toggle display to show all/unread subscribed groups" msgstr "vali ekraanile kõik/lugemata tellitud grupid" -#: src/lang.c:396 +#: src/lang.c:398 msgid "unsubscribe from chosen group" msgstr "loobu valitud grupist" -#: src/lang.c:397 +#: src/lang.c:399 msgid "unsubscribe from groups that match pattern" msgstr "loobu mustrile vastavatest gruppidest" -#: src/lang.c:398 +#: src/lang.c:400 msgid "sort the list of groups" msgstr "järjesta gruppide loend" -#: src/lang.c:399 +#: src/lang.c:401 msgid "toggle display to show all/subscribed groups" msgstr "näita ekraanil kõiki/tellitud gruppe" -#: src/lang.c:400 +#: src/lang.c:402 msgid "0 - 9\t choose article by number" msgstr "0 - 9\t vali numbri järgi artikkel" -#: src/lang.c:401 +#: src/lang.c:403 msgid "mark thread as read and return to group index page" msgstr "märgi teema loetuks ja välju gruppide indeksi lehele" -#: src/lang.c:402 +#: src/lang.c:404 msgid "mark thread as read and enter next unread thread or group" msgstr "märgi teema loetuks ja sisene järgmisse teemasse või gruppi" -#: src/lang.c:403 +#: src/lang.c:405 msgid "choose first article in list" msgstr "vali loendis esimene artikkel" -#: src/lang.c:404 +#: src/lang.c:406 msgid "choose last article in list" msgstr "vali loendis viimane artikkel" -#: src/lang.c:405 +#: src/lang.c:407 msgid "mark article or tagged articles as read and move cursor to next unread article" msgstr "märgi artikkel või märgitud artiklid loetuks, liigu järgm. lugemata artiklile" -#: src/lang.c:406 +#: src/lang.c:408 msgid "read chosen article" msgstr "loe valitud artiklit" -#: src/lang.c:407 +#: src/lang.c:409 msgid "Display properties\n" "------------------" msgstr "Ekraani omadused\n" "----------------" -#: src/lang.c:408 +#: src/lang.c:410 msgid "Miscellaneous\n" "-------------" msgstr "Muud\n" "----" -#: src/lang.c:409 +#: src/lang.c:411 msgid "Moving around\n" "-------------" msgstr "Liikumine\n" "---------" -#: src/lang.c:410 +#: src/lang.c:412 msgid "Group/thread/article operations\n" "-------------------------------" msgstr "Grupi/teema/artikli operatsioonid\n" "---------------------------------" -#: src/lang.c:412 +#: src/lang.c:414 msgid "Group Level Commands" msgstr "Grupitaseme käsud" -#: src/lang.c:413 +#: src/lang.c:415 msgid "Kill filter added" msgstr "Surmamise filter lisatud" -#: src/lang.c:414 +#: src/lang.c:416 msgid "Auto-selection filter added" msgstr "Automaatse valiku filter lisatud" -#: src/lang.c:415 +#: src/lang.c:417 msgid "All parts tagged" msgstr "Kõik osad on märgitud" -#: src/lang.c:416 +#: src/lang.c:418 msgid "Storing article for later posting" msgstr "Salvestan artikli hiljem postitamiseks" -#: src/lang.c:417 +#: src/lang.c:419 msgid "Please enter a valid character" msgstr "Palun sisestage lubatud sümbol" -#: src/lang.c:418 +#: src/lang.c:420 #, c-format msgid "Missing part #%d" msgstr "Puudub osa nr: %d" -#: src/lang.c:419 +#: src/lang.c:421 msgid "*** No postponed articles ***" msgstr "*** Postitusootel artikleid pole ***" -#: src/lang.c:420 +#: src/lang.c:422 msgid "Not a multi-part message" msgstr "Ei ole mitmeosaline teade" -#: src/lang.c:421 +#: src/lang.c:423 msgid "You are not subscribed to this group" msgstr "Te pole seda gruppi tellinud" -#: src/lang.c:422 +#: src/lang.c:424 msgid "No previous expression" msgstr "Eelmist avaldist pole" -#: src/lang.c:423 +#: src/lang.c:425 msgid "Operation disabled in no-overwrite mode" msgstr "Operatsioon on ülekirjutamist keelavas moodis keelatud" #. TODO: replace hardcoded key-name in txt_info_postponed -#: src/lang.c:425 +#: src/lang.c:427 #, c-format msgid "%d postponed %s, reuse with ^O...\n" msgstr "%d ootel %s, kasutamiseks ^O...\n" -#: src/lang.c:426 +#: src/lang.c:428 msgid "X-Conversion-Note: multipart/alternative contents have been removed.\n" " To get the whole article, turn alternative handling OFF in the Option Menu\n" msgstr "X-Conversion-Note: multipart/alternative sisu on eemaldatud.\n" " Et näha tervet artiklit, lülitage alternatiivide käsitlemine välja\n" -#: src/lang.c:428 +#: src/lang.c:430 #, c-format msgid "Save filename for %s/%s is a mailbox. Attachment not saved" msgstr "Fail %s/%s salvestamiseks on postkast. Lisa ei salvestatud" -#: src/lang.c:429 +#: src/lang.c:431 msgid "TeX2Iso encoded article" msgstr "TeX2Iso kodeeritud artikkel" -#: src/lang.c:430 +#: src/lang.c:432 msgid "incomplete " msgstr "mittetäielik " #. TODO: replace hardcoded key-names -#: src/lang.c:432 +#: src/lang.c:434 #, c-format msgid "\n" "Welcome to %s, a full screen threaded Netnews reader. It can read news " @@ -1876,129 +1886,129 @@ msgstr "\n" "Lisainfot leiate manualist, README, INSTALL, TODO ja FTP failidest.\n" "Palun saatke vearaportid/kommentaarid 'R' käsuga aadressil %s.\n" -#: src/lang.c:448 +#: src/lang.c:450 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." msgstr "Vigane From: %s rida. Lugege uuesti faili INSTALL." -#: src/lang.c:449 +#: src/lang.c:451 #, c-format msgid "Invalid Sender:-header %s" msgstr "Vigane Sender:-päis %s" -#: src/lang.c:450 +#: src/lang.c:452 msgid "Inverse video disabled" msgstr "Pööratud video keelatud" -#: src/lang.c:451 +#: src/lang.c:453 msgid "Inverse video enabled" msgstr "Pööratud video lubatud" -#: src/lang.c:453 +#: src/lang.c:455 #, c-format msgid "Missing definition for %s\n" msgstr "%s definitsioon puudub\n" -#: src/lang.c:454 +#: src/lang.c:456 #, c-format msgid "Invalid key definition '%s'\n" msgstr "Vigane klahvi definitsioon '%s'\n" -#: src/lang.c:455 +#: src/lang.c:457 #, c-format msgid "Invalid keyname '%s'\n" msgstr "Vigane klahvi nimi '%s'\n" -#: src/lang.c:456 +#: src/lang.c:458 #, c-format msgid "Key '%s' is defined for both %s%s and %s%s\n" msgstr "Klahv '%s' on defineeritud nii %s%s, kui ka %s%s jaoks\n" -#: src/lang.c:457 +#: src/lang.c:459 #, c-format msgid "Kill From: [%s] (y/n): " msgstr "Surmake From: [%s] (j/e): " -#: src/lang.c:458 +#: src/lang.c:460 msgid "Kill Lines: (num): " msgstr "Surmake read: (num) : " -#: src/lang.c:459 +#: src/lang.c:461 msgid "Kill Article Menu" msgstr "Artuklite surmamise menüü" -#: src/lang.c:460 +#: src/lang.c:462 #, c-format msgid "Kill Msg-Id: [%s] (f/l/o/n): " msgstr "Surmake Msg-Id:[%s] (f/l/o/n): " -#: src/lang.c:461 +#: src/lang.c:463 msgid "Kill pattern scope : " msgstr "Surmamise mustri ulatus: " -#: src/lang.c:462 +#: src/lang.c:464 #, c-format msgid "Kill Subject: [%s] (y/n): " msgstr "Surmake teema: [%s] (j/e): " -#: src/lang.c:463 +#: src/lang.c:465 msgid "Kill text pattern : " msgstr "Surmake tekst mustriga : " -#: src/lang.c:464 +#: src/lang.c:466 msgid "Kill time in days : " msgstr "Surmamise aeg päevades : " -#: src/lang.c:466 +#: src/lang.c:468 msgid "Last" msgstr "Viimane" -#: src/lang.c:467 +#: src/lang.c:469 msgid "-- Last response --" msgstr "-- Viimane vastus --" -#: src/lang.c:468 +#: src/lang.c:470 #, c-format msgid "Lines %s " msgstr "Rida: %s " -#: src/lang.c:470 +#: src/lang.c:472 msgid "Message-ID: line " msgstr "Message-ID: rida " -#: src/lang.c:472 +#: src/lang.c:474 msgid "mailbox " msgstr "postkasti " -#: src/lang.c:473 +#: src/lang.c:475 #, c-format msgid "Mail article(s) to [%.*s]> " msgstr "Saada artiklid aadressil [%.*s]> " -#: src/lang.c:474 +#: src/lang.c:476 #, c-format msgid "Mailing log to %s\n" msgstr "Saadan logi aadressil %s\n" -#: src/lang.c:475 +#: src/lang.c:477 msgid "Mail bug report..." msgstr "Saada vearaport..." -#: src/lang.c:476 +#: src/lang.c:478 #, c-format msgid "Mail BUG REPORT to %s?" msgstr "Saadan VEARAPORTI aadressil %s?" -#: src/lang.c:477 +#: src/lang.c:479 msgid "Mailed" msgstr "Saadetud" -#: src/lang.c:478 +#: src/lang.c:480 #, c-format msgid "Mailing to %s..." msgstr "Saadan aadressil %s..." -#: src/lang.c:479 +#: src/lang.c:481 msgid "# [Mail/Save] active file. Format is like news active file:\n" "# groupname max.artnum min.artnum /dir\n" "# The 4th field is the basedir (ie. ~/Mail or ~/News)\n" @@ -2008,283 +2018,283 @@ msgstr "# [Saada/Salvesta] fail \"active "# Neljas väli on baaskataloog (näiteks ~/Mail või ~/News)\n" "#\n" -#: src/lang.c:482 +#: src/lang.c:484 #, c-format msgid "%s marked as unread" msgstr "%s märgitud loetuks" -#: src/lang.c:483 +#: src/lang.c:485 #, c-format msgid "Marked %d of %d tagged %s as read" msgstr "Märkisin %d (%d) märgitud %s loetuks" -#: src/lang.c:484 +#: src/lang.c:486 #, c-format msgid "Mark all articles as read%s?" msgstr "Märgin kõik artiklid loetuks%s?" -#: src/lang.c:485 +#: src/lang.c:487 #, c-format msgid "Mark %s=tagged articles, %s=current article, %s=quit: " msgstr "Märgi %s=märgitud artiklid, %s=jooksev artikkel, %s=välju: " -#: src/lang.c:486 +#: src/lang.c:488 #, c-format msgid "Mark group %s as read?" msgstr "Märgin grupi %s loetuks?" -#: src/lang.c:487 +#: src/lang.c:489 #, c-format msgid "Mark thread as read%s?" msgstr "Märgin teema loetuks%s?" -#: src/lang.c:488 +#: src/lang.c:490 #, c-format msgid "Mark %s=tagged articles/threads, %s=current thread, %s=quit: " msgstr "Märgi %s=märgitud artiklid/teemad, %s=jooksev teema, %s=välju: " -#: src/lang.c:489 +#: src/lang.c:491 #, c-format msgid "Matching %s groups..." msgstr "Otsin %s gruppe..." -#: src/lang.c:490 src/lang.c:494 +#: src/lang.c:492 src/lang.c:496 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "=n jooksvaks grupiks; %s=järgmine lugemata; %s=otsi; %s=surma/vali;" -#: src/lang.c:491 +#: src/lang.c:493 #, c-format msgid "%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; %s=list " "thread" msgstr "%s=autori otsing; %s=loetud; %s=rida alla; %s=rida üles; %s=märgi loetuks; " "%s=teema" -#: src/lang.c:492 +#: src/lang.c:494 #, c-format msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" msgstr "%s=rida üles; %s=rida alla; %s=lk. üles; %s=lk. alla; %s=üles; %s=alla" -#: src/lang.c:493 +#: src/lang.c:495 #, c-format msgid "%s=search forwards; %s=search backwards; %s=quit" msgstr "%s=otsi edaspidi; %s=otsi tagaspidi; %s=välju" -#: src/lang.c:495 +#: src/lang.c:497 #, c-format msgid "%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read" msgstr "%s=autori otsing; %s=otsi sisu; %s=loetud; %s=vasta; %s=märgi loetuks" -#: src/lang.c:496 +#: src/lang.c:498 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" msgstr "=n jooksvaks grupiks; %s=järgmine lugemata; %s,%s=otsi; %s=loetud" -#: src/lang.c:497 +#: src/lang.c:499 #, c-format msgid "%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" msgstr "%s=rida alla; %s=rida üles; %s=appi; %s=tõsta; %s=välju; %s=kõik/lugemata" -#: src/lang.c:498 +#: src/lang.c:500 #, c-format msgid "%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/out" msgstr "%s=telli; %s=telli muster; %s=loobu; %s=loobu muster; %s=kõik/tellitud" -#: src/lang.c:499 +#: src/lang.c:501 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" msgstr "=jooksev n; %s=järgmine lugemata; %s=loetud; %s=ekraani lülit" -#: src/lang.c:500 +#: src/lang.c:502 #, c-format msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" msgstr "%s=appi; %s=rida alla; %s=rida üles; %s=välju; %s=märgi; %s=lugemata" -#: src/lang.c:501 +#: src/lang.c:503 msgid "--More--" msgstr "--Veel--" -#: src/lang.c:502 +#: src/lang.c:504 #, c-format msgid "Moving %s..." msgstr "Tõstan %s..." -#: src/lang.c:504 +#: src/lang.c:506 msgid ", name: " msgstr ", nimi: " -#: src/lang.c:505 +#: src/lang.c:507 #, c-format msgid "Goto newsgroup [%s]> " msgstr "Mine gruppi [%s]> " -#: src/lang.c:506 +#: src/lang.c:508 msgid "newsgroups" msgstr "gruppidesse" -#: src/lang.c:507 +#: src/lang.c:509 #, c-format msgid "Position %s in group list (1,2,..,$) [%d]> " msgstr "Positsioon %s gruppide nimistus (1,2,..,$) [%d]> " -#: src/lang.c:508 +#: src/lang.c:510 msgid "newsgroup" msgstr "gruppi" -#: src/lang.c:509 +#: src/lang.c:511 msgid "Try and save newsrc file again?" msgstr "Proovin newsrc faili uuesti salvestada?" -#: src/lang.c:510 +#: src/lang.c:512 msgid "Warning: No newsgroups were written to your newsrc file. Save aborted." msgstr "Hoiatus: Teie newsrc faili ei salvestatud ühtegi gruppi. Katkestasin " "salvestamise." -#: src/lang.c:511 +#: src/lang.c:513 msgid "newsrc file saved successfully.\n" msgstr "newsrc fail on edukalt salvestatud.\n" -#: src/lang.c:512 +#: src/lang.c:514 msgid "-- Next response --" msgstr "- Järgmine vastus -" -#: src/lang.c:513 +#: src/lang.c:515 #, c-format msgid "NNTP authorization password not found for %s" msgstr "Serverile %s vastavat NNTP autoriseerimise parooli pole" -#: src/lang.c:514 +#: src/lang.c:516 msgid "No " msgstr "Ei " -#: src/lang.c:515 +#: src/lang.c:517 msgid "*** No articles ***" msgstr "*** Artikleid pole ***" -#: src/lang.c:516 +#: src/lang.c:518 msgid "No articles have been posted" msgstr "Postitatud artikleid pole" -#: src/lang.c:517 +#: src/lang.c:519 msgid "*** No description ***" msgstr "*** Kirjeldus puudub ***" -#: src/lang.c:518 +#: src/lang.c:520 msgid "No filename" msgstr "Failil pole nime" -#: src/lang.c:519 +#: src/lang.c:521 msgid "No group" msgstr "Gruppi pole" -#: src/lang.c:520 +#: src/lang.c:522 msgid "*** No groups ***" msgstr "*** Gruppe pole ***" -#: src/lang.c:521 +#: src/lang.c:523 msgid "No more groups to read" msgstr "Lugemiseks rohkem gruppe pole" -#: src/lang.c:522 +#: src/lang.c:524 msgid "No last message" msgstr "Viimast teadet pole" -#: src/lang.c:523 +#: src/lang.c:525 msgid "No mail address" msgstr "E-posti aadressi pole" -#: src/lang.c:524 +#: src/lang.c:526 msgid "No articles marked for saving" msgstr "Salvestamiseks märgitud artikleid pole" -#: src/lang.c:525 +#: src/lang.c:527 msgid "No match" msgstr "Ei leia" -#: src/lang.c:526 +#: src/lang.c:528 msgid "No more groups" msgstr "Rohkem gruppe pole" -#: src/lang.c:527 +#: src/lang.c:529 msgid "No newsgroups" msgstr "Gruppe pole" -#: src/lang.c:528 +#: src/lang.c:530 msgid "No next unread article" msgstr "Järgmist lugemata artiklit pole" -#: src/lang.c:529 +#: src/lang.c:531 msgid "No previous group" msgstr "Eelmist gruppi pole" -#: src/lang.c:530 +#: src/lang.c:532 msgid "No previous unread article" msgstr "Eelmist lugemata artiklit pole" -#: src/lang.c:531 +#: src/lang.c:533 msgid "No responses" msgstr "Vastuseid pole" -#: src/lang.c:532 +#: src/lang.c:534 msgid "No responses to list in current thread" msgstr "Jooksvas teemas pole vastuseid" -#: src/lang.c:533 +#: src/lang.c:535 msgid "No search string" msgstr "Otsingusõne puudub" -#: src/lang.c:534 +#: src/lang.c:536 msgid "No subject" msgstr "Teema puudub" -#: src/lang.c:535 +#: src/lang.c:538 #, c-format msgid "%s: Terminal must have clear to end-of-line (ce)\n" msgstr "%s: Terminalil peab olema puhasta realõpuni (ce) omadus\n" -#: src/lang.c:536 +#: src/lang.c:539 #, c-format msgid "%s: Terminal must have clear to end-of-screen (cd)\n" msgstr "%s: Terminalil peab olema puhasta ekraanilõpuni (cd) omadus\n" -#: src/lang.c:537 +#: src/lang.c:540 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" msgstr "%s: Terminalil peab olema ekraanipuhastamise (cl) omadus\n" -#: src/lang.c:538 +#: src/lang.c:541 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" msgstr "%s: Terminal peab toetama kursori liigutamist (cm)\n" -#: src/lang.c:539 +#: src/lang.c:542 #, c-format msgid "%s: TERM variable must be set to use screen capabilities\n" msgstr "%s: ekraani omaduste kasutamiseks peab olema seatud keskkonnamuutuja TERM\n" -#: src/lang.c:540 +#: src/lang.c:544 #, c-format msgid "No viewer found for %s/%s\n" msgstr "%s/%s jaoks puudub vaatur\n" -#: src/lang.c:541 +#: src/lang.c:545 msgid "Newsgroup does not exist on this server" msgstr "Gruppi pole sellel serveril" -#: src/lang.c:542 +#: src/lang.c:546 #, c-format msgid "Group %s not found in active file" msgstr "Gruppi %s pole aktiivsete gruppide failis" -#: src/lang.c:543 +#: src/lang.c:547 msgid "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "c=loo fail, a)lternatiivne nimi, d=vaikimisi .newsrc, q=välju: " -#: src/lang.c:544 +#: src/lang.c:548 msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "a)lternatiivne nimi, d=vaikimisi .newsrc, q=välju: " -#: src/lang.c:545 +#: src/lang.c:549 #, c-format msgid "# NNTP-server -> newsrc translation table and NNTP-server\n" "# shortname list for %s %s\n" @@ -2311,40 +2321,40 @@ msgstr "# NNTP-server -> newsrc teisendu "# news.ka.nu /tmp/nrc-nu kanu nu\n" "#\n" -#: src/lang.c:552 +#: src/lang.c:556 msgid "Only" msgstr "Ainult" -#: src/lang.c:553 +#: src/lang.c:557 #, c-format msgid "Option not enabled. Recompile with %s." msgstr "Võti pole lubatud. Kasutage kompileerimisel %s." -#: src/lang.c:554 +#: src/lang.c:558 msgid "Options Menu" msgstr "Omaduste menüü" -#: src/lang.c:557 +#: src/lang.c:561 #, c-format msgid "Error in regex: %s at pos. %d '%s'" msgstr "Viga regulaaravaldises: %s positsioonil %d '%s'" -#: src/lang.c:558 +#: src/lang.c:562 #, c-format msgid "Error in regex: pcre internal error %d" msgstr "Viga regulaaravaldises: pcre sisemine viga %d" -#: src/lang.c:559 +#: src/lang.c:563 #, c-format msgid "Error in regex: study - pcre internal error %s" msgstr "Viga regulaaravaldises: uurimiseks - pcre sisemine viga %s" -#: src/lang.c:560 +#: src/lang.c:564 msgid "Post a followup..." msgstr "Postita vastus..." #. TODO: replace hardcoded key-name in txt_post_error_ask_postpone -#: src/lang.c:562 +#: src/lang.c:566 msgid "An error has occurred while posting the article. If you think that this\n" "error is temporary or otherwise correctable, you can postpone the article\n" "and pick it up again with ^O later.\n" @@ -2352,275 +2362,275 @@ msgstr "Artikli postitamisel tekkis viga "või muul viisil kõrvaldatav, võite artikli salvestada hiljem postitamiseks\n" "ja ^O käsuga hiljem postitada.\n" -#: src/lang.c:565 +#: src/lang.c:569 msgid "Posted articles history" msgstr "Postitatud artiklite ajalugu" -#: src/lang.c:566 +#: src/lang.c:570 #, c-format msgid "Post to newsgroup(s) [%s]> " msgstr "Postita gruppidesse [%s]> " -#: src/lang.c:567 +#: src/lang.c:571 msgid "-- post processing started --" msgstr "-- lõpptöötlus alustas --" -#: src/lang.c:568 +#: src/lang.c:572 msgid "-- post processing completed --" msgstr "-- lõpptöötlus lõpetas --" -#: src/lang.c:569 +#: src/lang.c:573 #, c-format msgid "Post subject [%s]> " msgstr "Postituse teema [%s]> " -#: src/lang.c:570 +#: src/lang.c:574 msgid "# Summary of mailed/posted messages viewable by 'W' command from within tin.\n" msgstr "# Kokkuvõtte saadetud/postitatud teadetest saate tinis 'W' käsuga.\n" -#: src/lang.c:571 +#: src/lang.c:575 msgid "Posting article..." msgstr "Postitan artiklit..." -#: src/lang.c:572 +#: src/lang.c:576 msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " msgstr "Postitan ootel artiklid [%%s]? (%s/%s/%s/%s/%s): " -#: src/lang.c:573 +#: src/lang.c:577 #, c-format msgid "Hot %s" msgstr "Kuum %s" -#: src/lang.c:574 +#: src/lang.c:578 #, c-format msgid "Tagged %s" msgstr "Märgitud %s" -#: src/lang.c:575 +#: src/lang.c:579 #, c-format msgid "Untagged %s" msgstr "Märkimata %s" -#: src/lang.c:576 +#: src/lang.c:580 msgid "Processing mail messages marked for deletion." msgstr "Töötlen kirju, mis on kustutamiseks märgitud." -#: src/lang.c:577 +#: src/lang.c:581 msgid "Processing saved articles marked for deletion." msgstr "Töötlen salvestatud ja kustutamiseks märgitud artikleid." -#: src/lang.c:578 +#: src/lang.c:582 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "Aktsepteerin Followup-To? %s=postita, %s=ignoreeri, %s=välju: " -#: src/lang.c:579 +#: src/lang.c:583 msgid "Article unchanged, abort mailing?" msgstr "Artiklit ei ole muudetud, katkestan saatmise?" -#: src/lang.c:580 +#: src/lang.c:584 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "Kas soovite näha postitamisootel artikleid (%d)?" -#: src/lang.c:582 +#: src/lang.c:586 msgid "Add quick kill filter?" msgstr "Lisan kiirsurmamise filtri?" -#: src/lang.c:583 +#: src/lang.c:587 msgid "Add quick selection filter?" msgstr "Lisan kiirvaliku filtri?" -#: src/lang.c:584 +#: src/lang.c:588 msgid "Do you really want to quit?" msgstr "Kas te tõesti soovite väljuda?" -#: src/lang.c:585 +#: src/lang.c:589 msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "%s=toimeta katkestamisteadet, %s=välju, %s=kustuta (katkesta) [%%s]: " -#: src/lang.c:586 +#: src/lang.c:590 msgid "You have tagged articles in this group - quit anyway?" msgstr "Teil on siin grupis märgitud artikleid - väljun siiski?" -#: src/lang.c:587 +#: src/lang.c:591 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=välju, %s=toimeta, %s=ootele: " -#: src/lang.c:588 +#: src/lang.c:592 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=välju %s=toimeta %s=salvesta surmamise kirjeldus: " -#: src/lang.c:589 +#: src/lang.c:593 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "%s=välju %s=toimeta %s=salvesta valiku kirjeldus: " -#: src/lang.c:590 +#: src/lang.c:594 msgid "Do you really want to quit without saving your configuration?" msgstr "Kas te tõesti soovite seadeid salvestamata väljuda?" -#: src/lang.c:593 +#: src/lang.c:597 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "Vigane vahemik - lubatud on '0-9.$' näiteks 1-$" -#: src/lang.c:594 +#: src/lang.c:598 msgid "Do you want to abort this operation?" msgstr "Kas soovite seda operatsiooni katkestada?" -#: src/lang.c:595 +#: src/lang.c:599 msgid "Do you want to exit tin immediately?" msgstr "Kas soovite viivitamata tinist väljuda?" -#: src/lang.c:596 +#: src/lang.c:600 msgid "Read response> " msgstr "Loen vastust> " -#: src/lang.c:597 +#: src/lang.c:601 msgid "Reading ('q' to quit)..." msgstr "Loen ('q' katkestamiseks)..." -#: src/lang.c:598 +#: src/lang.c:602 #, c-format msgid "Reading %sarticles..." msgstr "Loen %sartikleid..." -#: src/lang.c:599 +#: src/lang.c:603 #, c-format msgid "Reading %sattributes file...\n" msgstr "Loen %satribuutide faili...\n" -#: src/lang.c:600 +#: src/lang.c:604 #, c-format msgid "Reading %sconfig file...\n" msgstr "Loen %sseadete faili...\n" -#: src/lang.c:601 +#: src/lang.c:605 msgid "Reading filter file...\n" msgstr "Loen filtrite faili...\n" -#: src/lang.c:602 +#: src/lang.c:606 #, c-format msgid "Reading %s groups..." msgstr "Loen %s gruppe..." -#: src/lang.c:603 +#: src/lang.c:607 msgid "Reading input history file...\n" msgstr "Loen sisendi ajalugu...\n" -#: src/lang.c:604 +#: src/lang.c:608 msgid "Reading keymap file...\n" msgstr "Loen klahvitabeli faili...\n" -#: src/lang.c:605 +#: src/lang.c:609 msgid "Reading groups from active file... " msgstr "Loen aktiivseid gruppe... " -#: src/lang.c:606 +#: src/lang.c:610 msgid "Reading groups from newsrc file... " msgstr "Loen gruppe newsrc failist... " -#: src/lang.c:607 +#: src/lang.c:611 msgid "Reading newsgroups file... " msgstr "Loen gruppide kirjeldusi... " -#: src/lang.c:608 +#: src/lang.c:612 msgid "Reading newsrc file..." msgstr "Loen newsrc faili..." # TRANSLATION MISSING -#: src/lang.c:610 +#: src/lang.c:614 #, c-format msgid "(%d:%02d remaining)" msgstr "" -#: src/lang.c:612 +#: src/lang.c:616 #, c-format msgid "Bogus group %s removed." msgstr "Vigane grupp %s on eemaldatud." -#: src/lang.c:613 +#: src/lang.c:617 #, c-format msgid "Error: rename %s to %s" msgstr "Viga: %s uus nimi %s" -#: src/lang.c:614 +#: src/lang.c:618 msgid "Reply to author..." msgstr "Vastan autorile..." -#: src/lang.c:615 +#: src/lang.c:619 msgid "Repost" msgstr "Uuesti postitus" -#: src/lang.c:616 +#: src/lang.c:620 msgid "Reposting article..." msgstr "Postitan artikli uuesti..." -#: src/lang.c:617 +#: src/lang.c:621 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "Postitan artikli(d) gruppi(desse) [%s]> " -#: src/lang.c:618 +#: src/lang.c:622 msgid "Reset newsrc?" msgstr "Algväärtustan newsrc?" -#: src/lang.c:619 +#: src/lang.c:623 msgid "Responses have been directed to the following newsgroups" msgstr "Vastused edastatakse järgnevatesse gruppidesse" -#: src/lang.c:620 +#: src/lang.c:624 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " msgstr "Vastused edastatakse postitajale. %s=kirjuta, %s=postita, %s=välju: " -#: src/lang.c:621 +#: src/lang.c:625 #, c-format msgid "RespNo %4d of %4d" msgstr "Vastus %4d : %4d" -#: src/lang.c:622 +#: src/lang.c:626 msgid "Press to continue..." msgstr "Jätkamiseks vajutage ..." -#: src/lang.c:624 +#: src/lang.c:628 #, c-format msgid "Select From [%s] (y/n): " msgstr "Valige From [%s] (j/e): " -#: src/lang.c:625 +#: src/lang.c:629 msgid "Select Lines: (num): " msgstr "Valige read: (num): " -#: src/lang.c:626 +#: src/lang.c:630 msgid "Auto-select Article Menu" msgstr "Automaatselt valitavate artiklite menüü" -#: src/lang.c:627 +#: src/lang.c:631 #, c-format msgid "Select Msg-Id [%s] (f/l/o/n): " msgstr "Valige Msg-Id [%s] (f/l/o/n): " -#: src/lang.c:628 +#: src/lang.c:632 msgid "Select pattern scope: " msgstr "Valige mustri ulatus: " -#: src/lang.c:629 +#: src/lang.c:633 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "Valige teema [%s] (j/e): " -#: src/lang.c:630 +#: src/lang.c:634 msgid "Select text pattern : " msgstr "Valige tekstimuster : " -#: src/lang.c:631 +#: src/lang.c:635 msgid "Select time in days : " msgstr "Valige aeg päevades : " -#: src/lang.c:632 +#: src/lang.c:636 #, c-format msgid "# %s server configuration file\n" "# This file was automatically saved by %s %s %s (\"%s\")\n" @@ -2639,218 +2649,223 @@ msgstr "# %s serveri seadete fail\n" "############################################################################\n" "\n" -#: src/lang.c:638 +#: src/lang.c:642 msgid "Showing unread groups only" msgstr "Näitan ainult lugemata gruppe" -#: src/lang.c:639 +#: src/lang.c:643 msgid "Subject: line (ignore case) " msgstr "Subject: rida (tõstutundetu)" -#: src/lang.c:640 +#: src/lang.c:644 msgid "Subject: line (case sensitive)" msgstr "Subject: rida (tõstutundlik)" -#: src/lang.c:641 +#: src/lang.c:645 msgid "Save" msgstr "Salvesta" -#: src/lang.c:642 +#: src/lang.c:646 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "Salvestan '%s' (%s/%s)?" -#: src/lang.c:643 +#: src/lang.c:647 msgid "Save configuration before continuing?" msgstr "Salvestan seaded enne jätkamist?" -#: src/lang.c:644 +#: src/lang.c:648 msgid "Save filename> " msgstr "Fail salvestamiseks> " -#: src/lang.c:645 +#: src/lang.c:649 msgid "Saved" msgstr "Salvestatud" -#: src/lang.c:646 +#: src/lang.c:650 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "%4d lugemata (%4d kuuma) %s grupis %s\n" -#: src/lang.c:647 +#: src/lang.c:651 #, c-format msgid "Saved %s...\n" msgstr "Salvestatud %s...\n" -#: src/lang.c:648 +#: src/lang.c:652 msgid "Nothing was saved" msgstr "Midagi ei salvestatud" -#: src/lang.c:649 +#: src/lang.c:653 #, c-format msgid "\n" "%s %d %s from %d %s\n" msgstr "\n" "%s %d %s %d grupist%s\n" -#: src/lang.c:650 +#: src/lang.c:654 #, c-format msgid "-- %s saved to %s%s --" msgstr "-- %s salvestati %s%s --" -#: src/lang.c:651 +#: src/lang.c:655 #, c-format msgid "-- %s saved to %s - %s --" msgstr "-- %s salvestati %s - %s --" -#: src/lang.c:652 +#: src/lang.c:656 msgid "Saving..." msgstr "Salvestan..." -#: src/lang.c:653 +#: src/lang.c:657 #, c-format msgid "%s: Screen initialization failed" msgstr "%s: Ekraani initsialiseerimine ebaõnnestus" -#: src/lang.c:654 +#: src/lang.c:659 #, c-format msgid "%s: screen is too small\n" msgstr "%s: ekraan on liiga väike\n" -#: src/lang.c:655 +#: src/lang.c:661 #, c-format msgid "screen is too small, %s is exiting\n" msgstr "ekraan on liiga väike, %s lõpetab töö\n" -#: src/lang.c:656 +#: src/lang.c:662 #, c-format msgid "Search backwards [%s]> " msgstr "Otsin tagurpidi [%s]> " -#: src/lang.c:657 +#: src/lang.c:663 #, c-format msgid "Search body [%s]> " msgstr "Otsi kehast [%s]> " -#: src/lang.c:658 +#: src/lang.c:664 #, c-format msgid "Search forwards [%s]> " msgstr "Otsi edaspidi [%s]> " -#: src/lang.c:659 +#: src/lang.c:665 msgid "Searching..." msgstr "Otsin..." -#: src/lang.c:660 +#: src/lang.c:666 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "Otsin artiklit %d/%d ('q' katkestamiseks)..." -#: src/lang.c:661 +#: src/lang.c:667 msgid "Select article> " msgstr "Valige artikkel> " -#: src/lang.c:662 +#: src/lang.c:668 msgid "Select option number before text or use arrow keys and . 'q' to quit." msgstr "Valige teksti eest omaduse number või kasutage nooli ja . 'q' väljumiseks." -#: src/lang.c:663 +#: src/lang.c:669 msgid "Select group> " msgstr "Valige grupp> " -#: src/lang.c:664 +#: src/lang.c:670 #, c-format msgid "Enter selection pattern [%s]> " msgstr "Sisestage valiku muster [%s]> " -#: src/lang.c:665 +#: src/lang.c:671 msgid "Select thread > " msgstr "Valige teema > " -#: src/lang.c:666 +#: src/lang.c:672 #, c-format msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" msgstr "%s %s %s (\"%s\") [%s]: saatke palun DETAILNE vea raport aadressil %s\n" -#: src/lang.c:667 +#: src/lang.c:673 msgid "servers active-file" msgstr "serveri aktiivsete gruppide fail" -#: src/lang.c:668 +#: src/lang.c:674 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "Uutesse gruppidesse ei saa siseneda. Tellige kõigepealt..." -#: src/lang.c:669 +#: src/lang.c:675 msgid "" msgstr "" -#: src/lang.c:670 +#: src/lang.c:676 #, c-format msgid "Starting: (%s)" msgstr "Stardin: (%s)" -#: src/lang.c:671 +#: src/lang.c:677 #, c-format msgid "List Thread (%d of %d)" msgstr "Teemad (%d/%d)" -#: src/lang.c:672 +#: src/lang.c:678 #, c-format msgid "Thread (%.*s)" msgstr "Teema (%.*s)" -#: src/lang.c:673 +#: src/lang.c:679 msgid "Enter wildcard subscribe pattern> " msgstr "Sisestage tellimise muster> " -#: src/lang.c:674 +#: src/lang.c:680 #, c-format msgid "subscribed to %d groups" msgstr "%d gruppi on tellitud" -#: src/lang.c:675 +#: src/lang.c:681 #, c-format msgid "Subscribed to %s" msgstr "%s on tellitud" -#: src/lang.c:676 +#: src/lang.c:682 msgid "Subscribing... " msgstr "Tellin... " -#: src/lang.c:677 +#: src/lang.c:683 msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " msgstr "Postitan uuesti või asendan artikli(d) [%%s]? (%s/%s/%s): " -#: src/lang.c:678 +#: src/lang.c:684 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "Asendan artikli(d) gruppides [%s]> " -#: src/lang.c:679 +#: src/lang.c:685 msgid "Superseding article ..." msgstr "Asendan artikli ..." -#: src/lang.c:680 +#: src/lang.c:686 #, c-format msgid "\n" "Stopped. Type 'fg' to restart %s\n" msgstr "\n" "Peatatud. %s uuesti käivitamiseks kirjutage palun 'fg'\n" -#: src/lang.c:682 +#: src/lang.c:688 #, c-format msgid "%d days" msgstr "%d päeva" -#: src/lang.c:683 +#: src/lang.c:689 msgid "" msgstr "" -#: src/lang.c:684 +# TRANSLATION MISSING +#: src/lang.c:690 +msgid "TeX " +msgstr "" + +#: src/lang.c:691 msgid "# Default action/prompt strings\n" msgstr "# Vaikimisi aktsioonide/viipade sõned\n" -#: src/lang.c:685 +#: src/lang.c:692 msgid "# Defaults for quick (1 key) kill & auto-selection filters\n" "# header=NUM 0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n" "# 5=Message-ID: & last References: entry only\n" @@ -2867,261 +2882,261 @@ msgstr "# Vaikeväärtused kiire (1 võtme) "# case=ON/OFF ON=filter on tõstutundlik OFF=tõstutundetu\n" "# expire=ON/OFF ON=kehtivusaeg default_filter_days OFF=ei aegu\n" -#: src/lang.c:698 +#: src/lang.c:705 msgid "# If ON use print current subject or newsgroup description in the last line\n" msgstr "# Kui on ON, trüki teema või grupikirjeldus viimasele reale\n" -#: src/lang.c:699 +#: src/lang.c:706 msgid "# Host & time info used for detecting new groups (don't touch)\n" msgstr "# Masin & aeg - kasutatakse uute gruppide leidmiseks (mitte muuta)\n" -#: src/lang.c:700 +#: src/lang.c:707 msgid "There is no news\n" msgstr "Uudiseid pole\n" -#: src/lang.c:701 +#: src/lang.c:708 msgid "Thread" msgstr "Teema" -#: src/lang.c:702 +#: src/lang.c:709 msgid "Thread Level Commands" msgstr "Teemataseme käsud" -#: src/lang.c:703 +#: src/lang.c:710 msgid "Thread deselected" msgstr "Teema pole valitud" -#: src/lang.c:704 +#: src/lang.c:711 msgid "Thread selected" msgstr "Teema on valitud" -#: src/lang.c:705 +#: src/lang.c:712 msgid "threads" msgstr "teemad" -#: src/lang.c:706 +#: src/lang.c:713 msgid "Thread range" msgstr "Teemade vahemik" -#: src/lang.c:707 +#: src/lang.c:714 msgid "thread" msgstr "teema" -#: src/lang.c:708 +#: src/lang.c:715 #, c-format msgid "Thread %4s of %4s" msgstr "Teema %4s : %4s" -#: src/lang.c:709 +#: src/lang.c:716 msgid "Threading articles..." msgstr "Järjestan artiklid teemade kaupa..." -#: src/lang.c:710 +#: src/lang.c:717 #, c-format msgid "Toggled word highlighting %s" msgstr "Sõnade esiletõstmine lülitatud %s" -#: src/lang.c:711 +#: src/lang.c:718 msgid "Toggled rot13 encoding" msgstr "Lülitatud rot13 kodeerimine" -#: src/lang.c:712 +#: src/lang.c:719 #, c-format msgid "Toggled german TeX encoding %s" msgstr "Lülitatud saksa TeX kodeering %s" -#: src/lang.c:713 +#: src/lang.c:720 #, c-format msgid "Toggled tab-width to %d" msgstr "Lülitatud tab-width väärtus %d" -#: src/lang.c:714 +#: src/lang.c:721 #, c-format msgid "%d Trying to dotlock %s" msgstr "%d Üritan punkt-lukustada %s" -#: src/lang.c:715 +#: src/lang.c:722 #, c-format msgid "%d Trying to lock %s" msgstr "%d Üritan lukustada %s" -#: src/lang.c:716 +#: src/lang.c:723 msgid " h=help\n" msgstr " h=appi\n" -#: src/lang.c:718 +#: src/lang.c:725 msgid "Unlimited" msgstr "Piiramata" -#: src/lang.c:719 +#: src/lang.c:726 msgid "Enter wildcard unsubscribe pattern> " msgstr "Sisestage loobumise muster> " -#: src/lang.c:720 +#: src/lang.c:727 #, c-format msgid "Error decoding %s : %s" msgstr "Viga %s dekodeerimisel: %s" -#: src/lang.c:721 +#: src/lang.c:728 msgid "No end." msgstr "Lõpp puudub." -#: src/lang.c:722 +#: src/lang.c:729 #, c-format msgid "%s successfully decoded." msgstr "%s on edukalt dekodeeritud." -#: src/lang.c:723 +#: src/lang.c:730 #, c-format msgid "%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" "\n" msgstr "%*s[-- %s/%s, %suuenkodeeritud fail, %d rida, nimi: %s --]\n" "\n" -#: src/lang.c:724 +#: src/lang.c:731 msgid "unread " msgstr "lugemata " -#: src/lang.c:725 +#: src/lang.c:732 #, c-format msgid "unsubscribed from %d groups" msgstr "loobunud %d grupist" -#: src/lang.c:726 +#: src/lang.c:733 #, c-format msgid "Unsubscribed from %s" msgstr "Loobunud grupist %s" -#: src/lang.c:727 +#: src/lang.c:734 msgid "Unsubscribing... " msgstr "Loobun gruppidest... " -#: src/lang.c:728 +#: src/lang.c:735 msgid "Unthreading articles..." msgstr "Tükeldan teemad..." -#: src/lang.c:729 +#: src/lang.c:736 msgid "Updated" msgstr "Uuendatud" -#: src/lang.c:730 +#: src/lang.c:737 msgid "Updating" msgstr "Uuendan" -#: src/lang.c:731 +#: src/lang.c:738 #, c-format msgid "Opening %s\n" msgstr "Proovin %s\n" -#: src/lang.c:732 +#: src/lang.c:739 msgid "No more URL's in this article" msgstr "Selles artiklis pole rohkem URL'e" -#: src/lang.c:733 +#: src/lang.c:740 msgid "Use MIME display program for this message?" msgstr "Kasutan selle teate lugemiseks MIME näitamise programmi?" -#: src/lang.c:734 +#: src/lang.c:741 msgid " -c mark all news as read in subscribed newsgroups (batch mode)" msgstr " -c märgi tellitud gruppides kõik artiklid loetuks (pakettmood)" -#: src/lang.c:735 +#: src/lang.c:742 msgid " -Z return status indicating if any unread news (batch mode)" msgstr " -Z tagasta väärtus, mis näitab, kas on lugemata artikleid (pakettmood)" -#: src/lang.c:736 +#: src/lang.c:743 msgid " -q don't check for new newsgroups" msgstr " -q ära otsi uusi gruppe" -#: src/lang.c:737 +#: src/lang.c:744 msgid " -X don't save any files on quit" msgstr " -X töö lõpetamisel ära salvesta ühtegi faili" -#: src/lang.c:738 +#: src/lang.c:745 msgid " -d don't show newsgroup descriptions" msgstr " -d ära näita gruppide kirjeldusi" -#: src/lang.c:739 +#: src/lang.c:746 msgid " -G limit get only limit articles/group" msgstr " -G num loe aunult num artiklit/gruppi" -#: src/lang.c:740 +#: src/lang.c:747 #, c-format msgid " -H help information about %s" msgstr " -H %s kasutamise abiinfo" -#: src/lang.c:741 +#: src/lang.c:748 msgid " -h this help message" msgstr " -h see abitekst" -#: src/lang.c:742 +#: src/lang.c:749 #, c-format msgid " -I dir news index file directory [default=%s]" msgstr " -I kat uudiste indeksfaili kataloog [vaikimisi=%s]" -#: src/lang.c:743 +#: src/lang.c:750 msgid " -u update index files (batch mode)" msgstr " -u värskenda indeksfaile (pakettmood)" -#: src/lang.c:744 +#: src/lang.c:751 #, c-format msgid " -m dir mailbox directory [default=%s]" msgstr " -m kat kirjakaustade kataloog [vaikimisi=%s]" -#: src/lang.c:745 +#: src/lang.c:752 #, c-format msgid "\n" "Mail bug reports/comments to %s" msgstr "\n" "Saatke palun vea raport/kommentaarid aadressil %s" -#: src/lang.c:746 +#: src/lang.c:753 msgid " -N mail new news to your posts (batch mode)" msgstr " -N saada uued vastused teie postitustele (pakettmood)" -#: src/lang.c:747 +#: src/lang.c:754 msgid " -M user mail new news to specified user (batch mode)" msgstr " -M kasut saada uued artiklid näidatud kasutajale (pakettmood)" -#: src/lang.c:748 +#: src/lang.c:755 #, c-format msgid " -f file subscribed to newsgroups file [default=%s]" msgstr " -f fail tellitud gruppide fail [vaikimisi=%s]" -#: src/lang.c:749 +#: src/lang.c:756 msgid " -x no posting mode" msgstr " -x postitamiseta mood" -#: src/lang.c:750 +#: src/lang.c:757 msgid " -w post an article and exit" msgstr " -w postita artikkel ja lõpeta töö" -#: src/lang.c:751 +#: src/lang.c:758 msgid " -o post all postponed articles and exit" msgstr " -o postita kõik postitamisootel artiklid ja lõpeta töö" -#: src/lang.c:752 +#: src/lang.c:759 msgid " -r read news remotely from default NNTP server" msgstr " -r loe artikleid kasutades vaikimisi NNTP serverit" -#: src/lang.c:753 +#: src/lang.c:760 msgid " -R read news saved by -S option" msgstr " -R loe artikleid, mis on salvestatud -S võtmega" -#: src/lang.c:754 +#: src/lang.c:761 #, c-format msgid " -s dir save news directory [default=%s]" msgstr " -s kat artiklite salvestamise kataloog [vaikimisi=%s]" -#: src/lang.c:755 +#: src/lang.c:762 msgid " -S save new news for later reading (batch mode)" msgstr " -S salvesta uued artiklid hilisemaks lugemiseks (pakettmood)" -#: src/lang.c:756 +#: src/lang.c:763 msgid " -z start if any unread news" msgstr " -z alusta tööd, kui on lugemata uudiseid" -#: src/lang.c:757 +#: src/lang.c:764 #, c-format msgid "A Usenet reader.\n" "\n" @@ -3130,37 +3145,37 @@ msgstr "Usenet klient.\n" "\n" "Kasuta: %s [võtmed] [grupp[,...]]" -#: src/lang.c:758 +#: src/lang.c:765 msgid " -v verbose output for batch mode options" msgstr " -v esita pakettmoodi käskudega detailsemat informatsiooni" -#: src/lang.c:759 +#: src/lang.c:766 msgid " -V print version & date information" msgstr " -V esita versiooni ja kuupäeva informatsioon" -#: src/lang.c:760 +#: src/lang.c:767 #, c-format msgid "%s only useful without batch mode operations\n" msgstr "%s on kasutatav ainult pakettmoodi käskudeta\n" -#: src/lang.c:761 +#: src/lang.c:768 #, c-format msgid "%s only useful for batch mode operations\n" msgstr "%s on kasutatav ainult pakettmoodi käskudega\n" -#: src/lang.c:763 +#: src/lang.c:770 #, c-format msgid "\n" "%s%d out of range (0 - %d). Reset to 0" msgstr "\n" "%s%d piiridest väljas (0 - %d). Sean 0" -#: src/lang.c:764 +#: src/lang.c:771 #, c-format msgid "View '%s' (%s/%s)?" msgstr "Vaatan '%s' (%s/%s)?" -#: src/lang.c:766 +#: src/lang.c:773 #, c-format msgid "\n" "Warning: posting exceeds %d columns. Line %d is the first long one:\n" @@ -3169,26 +3184,26 @@ msgstr "\n" "Hoiatus: postitus ületab %d veergu. Esimene pikk rida on rida %d:\n" "%-100s\n" -#: src/lang.c:767 +#: src/lang.c:774 msgid "\n" "Warning: article unchanged after editing\n" msgstr "\n" "Hoiatus: artiklit ei ole toimetamise käigus muudetud\n" -#: src/lang.c:768 +#: src/lang.c:775 msgid "\n" "Warning: \"Subject:\" contains only whitespaces.\n" msgstr "\n" "Hoiatus: \"Subject:\" real on ainult tühikud.\n" -#: src/lang.c:769 +#: src/lang.c:776 msgid "\n" "Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:\".\n" msgstr "\n" "Hoiatus: \"Subject:\" algab fraasiga \"Re: \", aga \"References:\" välju " "pole.\n" -#: src/lang.c:771 +#: src/lang.c:778 msgid "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" " with \"Re: \" and does not contain \"(was:\".\n" @@ -3196,7 +3211,7 @@ msgstr "\n" "Hoiatus: Artiklis on \"References:\" päis, aga \"Subject:\" ei alga fraasiga\n" " \"Re: \" ega sisalda \"(was:\".\n" -#: src/lang.c:774 +#: src/lang.c:781 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly written by you. This will " @@ -3216,7 +3231,7 @@ msgstr "Lugege hoolikalt!\n" "Siin on artikkel, mida te hakkate kustutama:\n" "\n" -#: src/lang.c:778 +#: src/lang.c:785 msgid "\n" "Warning: You are using a non-plain transfer encoding (such as base64 or\n" " quoted-printable) and an external inews program to submit your\n" @@ -3228,7 +3243,7 @@ msgstr "\n" " lisab artiklile signatuuri, siis on võimalik, et seda ei kodeerita\n" " korrektselt.\n" -#: src/lang.c:783 +#: src/lang.c:790 #, c-format msgid "\n" "\n" @@ -3241,7 +3256,7 @@ msgstr "\n" "Väärtused failis %s on muutunud!\n" "Palun lugege faile WHATSNEW, jne...\n" -#: src/lang.c:785 +#: src/lang.c:792 #, c-format msgid "\n" "\n" @@ -3253,7 +3268,7 @@ msgstr "\n" "kasutatu!\n" "Mõningaid väärtusi failis %s võidakse ignoreerida, mõningaid võidakse muuta!\n" -#: src/lang.c:788 +#: src/lang.c:795 #, c-format msgid "Warning: tin wrote fewer groups to your\n" "\t%s\n" @@ -3266,7 +3281,7 @@ msgstr "Hoiatus: tin kirjutas vähem grup "grupist%s, tähendab see viga ja te peaksite varundama oma %s\n" "enne, kui te tini uuesti käivitate!\n" -#: src/lang.c:792 +#: src/lang.c:799 #, c-format msgid "\n" "Warning: Found %d '-- \\n' lines, this may confuse some people.\n" @@ -3274,12 +3289,12 @@ msgstr "\n" "Hoiatus: Leidsin %d '-- \\n' rida, mis võib tekitada osades inimestes " "segadust.\n" -#: src/lang.c:793 +#: src/lang.c:800 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "Hoiatus: Salvestati ainult %d artiklit %d artiklist" -#: src/lang.c:794 +#: src/lang.c:801 #, c-format msgid "\n" "Warning: Your signature is longer than %d lines. Since signatures usually " @@ -3294,48 +3309,48 @@ msgstr "\n" "võimalikult\n" " lühikesed.\n" -#: src/lang.c:798 +#: src/lang.c:805 #, c-format msgid "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " msgstr "Hoiatus: see aadress võib sisaldada rämpsposti lõksu. %s=jätkan, %s=katkestan?" -#: src/lang.c:799 +#: src/lang.c:806 msgid "\n" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" msgstr "\n" "Hoiatus: Signatuuride alguses peaks olema '-- \\n', mitte '--\\n'.\n" -#: src/lang.c:800 +#: src/lang.c:807 msgid "Writing attributes file..." msgstr "Kirjutan atribuutide faili..." -#: src/lang.c:802 +#: src/lang.c:809 #, c-format msgid "%d Responses" msgstr "%d Vastust" -#: src/lang.c:804 +#: src/lang.c:811 #, c-format msgid "Added %d %s" msgstr "Lisatud %d %s" -#: src/lang.c:805 +#: src/lang.c:812 msgid "No unsubscribed groups to show" msgstr "Tellimata gruppe pole" -#: src/lang.c:806 +#: src/lang.c:813 msgid "Showing subscribed to groups only" msgstr "Näitan ainult tellitud gruppe" -#: src/lang.c:807 +#: src/lang.c:814 msgid "Yes " msgstr "Jah " -#: src/lang.c:808 +#: src/lang.c:815 msgid " You have mail\n" msgstr " Teil on kiri\n" -#: src/lang.c:813 +#: src/lang.c:820 #, c-format msgid "\n" "Warning: Posting is in %s and contains characters which are not\n" @@ -3354,16 +3369,16 @@ msgstr "\n" " MM_NETWORK_CHARSET. Viimast saate teostada kasutades valikut " "M)enüü.\n" -#: src/lang.c:824 +#: src/lang.c:831 #, c-format msgid "Redefined key %s '%s' -> '%s'\n" msgstr "Klahvi %s uus definitsioon '%s' -> '%s'\n" -#: src/lang.c:825 +#: src/lang.c:832 msgid " -D debug mode 1=NNTP 2=ALL" msgstr " -D silumismood 1=NNTP 2=KÕIK" -#: src/lang.c:829 +#: src/lang.c:836 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly not written by you. This " @@ -3387,68 +3402,73 @@ msgstr "Lugege hoolikalt!\n" "Siin on artikkel, mida te asute kustutama:\n" "\n" -#: src/lang.c:838 +#: src/lang.c:845 msgid "toggle color" msgstr "lülita värve" -#: src/lang.c:839 -msgid "# For color-adjust use the following numbers\n" - "# 0-black 1-red 2-green 3-brown\n" - "# 4-blue 5-pink 6-cyan 7-white\n" +# TRANSLATION MISSING +#: src/lang.c:846 +msgid "# Changing colors of several screen parts\n" + "# Possible values are:\n" + "# -1 = default (white for foreground and black for background)\n" + "# 0 = black\n" + "# 1 = red\n" + "# 2 = green\n" + "# 3 = brown\n" + "# 4 = blue\n" + "# 5 = pink\n" + "# 6 = cyan\n" + "# 7 = white\n" "# These are *only* for foreground:\n" - "# 8-gray 9-lightred 10-lightgreen 11-yellow\n" - "# 12-lightblue 13-lightpink 14-lightcyan 15-lightwhite\n" - "# A '-1' is interpreted as default (foreground normally is white, and\n" - "# background black)\n" - "\n" -msgstr "# Värvide seadmiseks kasutage järgnevaid koode\n" - "# 0-must 1-punane 2-roheline 3-pruun\n" - "# 4-sinine 5-roosa 6-lilla 7-valge\n" - "# Need on *ainult* esiplaani tarvis:\n" - "# 8-hall 9-helepunane 10-heleroheline 11-kollane\n" - "# 12-helesinine 13-heleroosa 14-helelilla 15-helevalge\n" - "# '-1' interpreteeritakse vaikeväärtusena (esiplaan on tavaliselt valge,\n" - "# taust must)\n" + "# 8 = gray\n" + "# 9 = light red\n" + "# 10 = light green\n" + "# 11 = yellow\n" + "# 12 = light blue\n" + "# 13 = light pink\n" + "# 14 = light cyan\n" + "# 15 = light white\n" "\n" +msgstr "" -#: src/lang.c:847 +#: src/lang.c:866 msgid " -a toggle color flag" msgstr " -a lülita värvide kasutamist" -#: src/lang.c:851 +#: src/lang.c:870 msgid "\n" "Error: Followup-To set to more than one newsgroup!\n" msgstr "\n" "Viga: Followup-To real on rohkem kui üks grupp!\n" -#: src/lang.c:852 +#: src/lang.c:871 #, c-format msgid "\n" "Error: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "\n" "Viga: ristpostitus %d gruppi ja Followup-To rida puudub!\n" -#: src/lang.c:853 +#: src/lang.c:872 #, c-format msgid "\n" "Error: \"%s\" is not a valid newsgroup!\n" msgstr "\n" "Viga: \"%s\" ei ole lubatud grupp!\n" -#: src/lang.c:855 +#: src/lang.c:874 msgid "\n" "Warning: Followup-To set to more than one newsgroup!\n" msgstr "\n" "Hoiatus: Followup-To on seatud rohkem, kui ühele grupile!\n" -#: src/lang.c:856 +#: src/lang.c:875 #, c-format msgid "\n" "Warning: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "\n" "Hoiatus: ristpostitus %d uudisegruppi ja Followup-To rida puudub!\n" -#: src/lang.c:857 +#: src/lang.c:876 #, c-format msgid "\n" "Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n" @@ -3456,308 +3476,308 @@ msgstr "\n" "Hoiatus: \"%s\" puudub teie newsrc failist, see võib olla selles serveris " "vigane!\n" -#: src/lang.c:858 +#: src/lang.c:877 #, c-format msgid "\n" "Warning: \"%s\" is not a valid newsgroup at this site!\n" msgstr "\n" "Hoiatus: \"%s\" ei ole selles serveris kehtiv grupp!\n" -#: src/lang.c:862 +#: src/lang.c:881 #, c-format msgid "%d files successfully written from %d articles. %d %s occurred." msgstr "Edukalt kirjutatud %d faili %d artiklist. Esines %d viga%s." -#: src/lang.c:863 +#: src/lang.c:882 msgid "Missing parts." msgstr "Osad puuduvad." -#: src/lang.c:864 +#: src/lang.c:883 msgid "No beginning." msgstr "Algus puudub." -#: src/lang.c:865 +#: src/lang.c:884 msgid "No data." msgstr "Andmeid pole." -#: src/lang.c:866 +#: src/lang.c:885 msgid "Unknown error." msgstr "Tundmatu viga." -#: src/lang.c:868 +#: src/lang.c:887 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "\t%s kontrollsumma (%ld %s)" -#: src/lang.c:872 +#: src/lang.c:891 msgid "Reading mail active file... " msgstr "Loen aktiivsete kirjade kausta... " -#: src/lang.c:873 +#: src/lang.c:892 msgid "Reading mailgroups file... " msgstr "Loen kirjagruppide faili... " -#: src/lang.c:877 +#: src/lang.c:896 msgid "perform PGP operations on article" msgstr "kasuta artiklil PGP operatsioone" -#: src/lang.c:878 +#: src/lang.c:897 msgid "Add key(s) to public keyring?" msgstr "Lisan võtmed avalike võtmete hoidlasse?" -#: src/lang.c:879 +#: src/lang.c:898 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "%s=krüpti, %s=allkirjasta, %s=mõlemad, %s=välju: " -#: src/lang.c:880 +#: src/lang.c:899 #, c-format msgid "%s=sign, %s=sign & include public key, %s=quit: " msgstr "%s=allkirjasta, %s=allkirjasta & lisa avalik võti, %s=välju: " -#: src/lang.c:881 +#: src/lang.c:900 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "PGP pole seadistatud (ei saa avada %s)" -#: src/lang.c:882 +#: src/lang.c:901 msgid "Article not signed and no public keys found" msgstr "Artikkel pole allkirjastatud ja avalikke võtmeid pole" -#: src/lang.c:884 +#: src/lang.c:903 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "%s=välju, %s=toimeta, %s=ispell, %s=pgp, %s=menüü, %s=postita, %s=ootele: " -#: src/lang.c:885 +#: src/lang.c:904 msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " msgstr "%s=välju, %s=toimeta, %s=ispell, %s=pgp, %s=saada [%%s]: " -#: src/lang.c:886 +#: src/lang.c:905 msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=välju, %s=toimeta, %s=ispell, %s=pgp, %s=menüü, %s=postita, %s=ootele " "[%%s]: " -#: src/lang.c:888 +#: src/lang.c:907 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "%s=välju, %s=toimeta, %s=pgp, %s=menüü, %s=postita, %s=ootele: " -#: src/lang.c:889 +#: src/lang.c:908 msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "%s=välju, %s=toimeta, %s=pgp, %s=saada [%%s]: " -#: src/lang.c:890 +#: src/lang.c:909 msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=välju, %s=toimeta, %s=pgp, %s=menüü, %s=postita, %s=ootele [%%s]: " -#: src/lang.c:894 +#: src/lang.c:913 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " msgstr "%s=välju, %s=toimeta, %s=ispell, %s=menüü, %s=postita, %s=ootele: " -#: src/lang.c:895 +#: src/lang.c:914 msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "%s=välju, %s=toimeta, %s=ispell, %s=saada [%%s]: " -#: src/lang.c:896 +#: src/lang.c:915 msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=välju, %s=toimeta, %s=ispell, %s=menüü, %s=postita, %s=ootele [%%s]: " -#: src/lang.c:898 +#: src/lang.c:917 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "%s=välju, %s=toimeta, %s=menüü, %s=postita, %s=ootele: " -#: src/lang.c:899 +#: src/lang.c:918 msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "%s=välju, %s=toimeta, %s=saada [%%s]: " -#: src/lang.c:900 +#: src/lang.c:919 msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=välju, %s=toimeta, %s=menüü, %s=postita, %s=ootele [%%s]: " -#: src/lang.c:909 +#: src/lang.c:928 msgid "Try cache_overview_files to speed up things.\n" msgstr "Proovige asjade kiirendamiseks cache_overview_files.\n" -#: src/lang.c:910 +#: src/lang.c:929 msgid "Tin will use local index files instead.\n" msgstr "Tin kasutab hoopis kohalikke indeksfaile.\n" -#: src/lang.c:911 +#: src/lang.c:930 msgid "Cannot find NNTP server name" msgstr "Ei leia NNTP serveri nime" -#: src/lang.c:912 +#: src/lang.c:931 #, c-format msgid "Connecting to %s:%d..." msgstr "Loon ühendust serveriga %s:%d..." -#: src/lang.c:913 +#: src/lang.c:932 msgid "Disconnecting from server...\n" msgstr "Lõpetan ühenduse...\n" -#: src/lang.c:914 +#: src/lang.c:933 #, c-format msgid "Wrong newsgroup name in response of GROUP command, %s for %s" msgstr "Vigane vastus GROUP käsule, %s grupile %s" -#: src/lang.c:915 +#: src/lang.c:934 #, c-format msgid "Failed to connect to NNTP server %s. Exiting..." msgstr "NNTP serveriga %s ühenduse loomine ebaõnnestus. Lõpetan..." -#: src/lang.c:916 +#: src/lang.c:935 msgid "205 Closing connection" msgstr "205 Sulen ühendust" -#: src/lang.c:917 +#: src/lang.c:936 msgid "Your server does not support the NNTP XOVER or OVER command.\n" msgstr "Teie server ei toeta NNTP XOVER või OVER käsku.\n" -#: src/lang.c:918 +#: src/lang.c:937 msgid "Connection to news server has timed out. Reconnect?" msgstr "Ühendus uudisegruppide serveriga aegus. ühendun uuesti?" -#: src/lang.c:919 +#: src/lang.c:938 #, c-format msgid "Put the server name in the file %s,\n" "or set the environment variable NNTPSERVER" msgstr "Kirjutage serveri nimi faili %s,\n" "või seadke keskonnamuutuja NNTPSERVER" -#: src/lang.c:920 +#: src/lang.c:939 msgid " -A force authentication on connect" msgstr " -A sunni ühenduse loomisel autentima" -#: src/lang.c:921 +#: src/lang.c:940 #, c-format msgid " -g serv read news from NNTP server serv [default=%s]" msgstr " -g serv loe uudiseid NNTP serverist serv [vaikimisi=%s]" -#: src/lang.c:922 +#: src/lang.c:941 #, c-format msgid " -p port use port as NNTP port [default=%d]" msgstr " -p port kasuta NNTP porti [vaikimisi=%d]" -#: src/lang.c:923 +#: src/lang.c:942 msgid " -Q quick start. Same as -nqd" msgstr " -Q kiirstart. Sama kui -nqd" -#: src/lang.c:924 +#: src/lang.c:943 msgid " -l use only LIST instead of GROUP (-n) command" msgstr " -l kasuta LIST käsku GROUP (-n) käsu asemel" -#: src/lang.c:925 +#: src/lang.c:944 msgid " -n only read subscribed .newsrc groups from NNTP server" msgstr " -n loe NNTP serverist ainult tellitud .newsrc grupid" -#: src/lang.c:927 +#: src/lang.c:946 #, c-format msgid "%s/tcp: Unknown service.\n" msgstr "%s/tcp: Tundmatu teenus.\n" -#: src/lang.c:930 +#: src/lang.c:949 msgid "\n" "socket or connect problem\n" msgstr "\n" "Probleem pistikuga või ühendusega\n" -#: src/lang.c:932 +#: src/lang.c:951 #, c-format msgid "\n" "Connection to %s: " msgstr "\n" "Loon ühendust serveriga %s: " -#: src/lang.c:933 +#: src/lang.c:952 msgid "Giving up...\n" msgstr "Annan alla...\n" -#: src/lang.c:936 +#: src/lang.c:955 msgid "Your server does not have Xref: in its XOVER information.\n" "Tin will try to use XHDR XREF instead (slows down things a bit).\n" msgstr "Teie server ei paku Xref: päiserida XOVER informatsioonis.\n" "Tin üritab kasutada XHDR XREF selle asemel (võib olla mõnevõrra " "aeganõudvam).\n" -#: src/lang.c:939 +#: src/lang.c:958 msgid "Your server does not have Xref: in its XOVER information.\n" msgstr "Teie server ei paku Xref: päiserida XOVER informatsioonis.\n" -#: src/lang.c:942 +#: src/lang.c:961 #, c-format msgid "Can't open %s. Try %s -r to read news via NNTP.\n" msgstr "%s ei saa avada. Proovige %s -r, et lugeda uudiseid üle NNTP.\n" -#: src/lang.c:945 +#: src/lang.c:964 msgid " -Q quick start. Same as -qd" msgstr " -Q kiirstart. Sama kui -qd" -#: src/lang.c:946 +#: src/lang.c:965 msgid " -l read only active file instead of scanning spool (-n) command" msgstr " -l loe pooli skaneerimise (-n) asemel ainult faili active" -#: src/lang.c:947 +#: src/lang.c:966 msgid " -n only read subscribed .newsrc groups from spool" msgstr " -n loe poolist ainult tellitud .newsrc gruppe" -#: src/lang.c:948 +#: src/lang.c:967 msgid "Your server does not have Xref: in its NOV-files.\n" msgstr "Teie server ei paku Xref: päiserida NOV failides.\n" -#: src/lang.c:952 +#: src/lang.c:971 msgid "Posting using external inews failed. Use built in inews instead?" msgstr "Välise inews programmiga postitamine ebaõnnestus. Proovin sisemist inewsi?" -#: src/lang.c:953 +#: src/lang.c:972 msgid "It worked! Should I always use my built in inews from now on?" msgstr "See töötas! Kas kasutan nüüd alati sisemist inews programmi?" -#: src/lang.c:961 +#: src/lang.c:980 #, c-format msgid "%d %s printed" msgstr "%d %s trükitud" -#: src/lang.c:962 +#: src/lang.c:981 msgid "output article/thread/hot/pattern/tagged articles to printer" msgstr "saada artikkel/teema/kuum/muster/märgitud trükkalile" -#: src/lang.c:963 +#: src/lang.c:982 msgid "Print" msgstr "Trüki" -#: src/lang.c:964 +#: src/lang.c:983 msgid "Printing..." msgstr "Trükin..." -#: src/lang.c:968 +#: src/lang.c:987 msgid "pipe article/thread/hot/pattern/tagged articles into command" msgstr "saada artikkel/teema/kuum/muster/märgitud toruga käsule" -#: src/lang.c:969 +#: src/lang.c:988 msgid "No command" msgstr "Käsku pole" -#: src/lang.c:970 +#: src/lang.c:989 msgid "Pipe" msgstr "Toru" -#: src/lang.c:971 +#: src/lang.c:990 #, c-format msgid "Pipe to command [%.*s]> " msgstr "Toru käsku [%.*s]> " -#: src/lang.c:972 +#: src/lang.c:991 msgid "Piping..." msgstr "Saadan torusse..." -#: src/lang.c:974 +#: src/lang.c:993 msgid "Piping not enabled." msgstr "Toru kasutamine pole lubatud." -#: src/lang.c:978 +#: src/lang.c:997 #, c-format msgid "\n" "Error: The \"%s:\" line has spaces in it that MUST be removed.\n" @@ -3769,7 +3789,7 @@ msgstr "\n" " tühik on see, mis eraldab koolonit (:) teistest komponentidest\n" " real. Gruppide eraldamiseks kasutage palun koma (,).\n" -#: src/lang.c:983 +#: src/lang.c:1002 #, c-format msgid "\n" "Error: The \"%s:\" line is continued in the next line. Since\n" @@ -3780,7 +3800,7 @@ msgstr "\n" " tühikuid, siis ei ole see lubatud. Palun kirjutage kõik grupid\n" " ühele reale.\n" -#: src/lang.c:988 +#: src/lang.c:1007 #, c-format msgid "\n" "Warning: The \"%s:\" line is continued in the next line.\n" @@ -3791,14 +3811,14 @@ msgstr "\n" " See on uus omadus ja kõik serverid ei pruugi seda toetada.\n" " Probleemide vältimiseks, kirjutage palun kõik grupid ühele reale.\n" -#: src/lang.c:992 +#: src/lang.c:1011 #, c-format msgid "\n" "Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n" msgstr "\n" "Hoiatus: Rida \"%s:\" sisaldab tühikuid, mis TULEKS eemaldada.\n" -#: src/lang.c:997 +#: src/lang.c:1016 msgid "\n" " If your article contains quoted text please take some time to pare it " "down\n" @@ -3828,862 +3848,914 @@ msgstr "\n" " tega, siis ilmselt enamus lugejaid ignoreerib teid täiesti. Tänapäeval on\n" " võrgus palju rahvast ja infot!\n" -#: src/lang.c:1010 +#: src/lang.c:1029 msgid "shell escape" msgstr "paojada käsureale" -#: src/lang.c:1011 +#: src/lang.c:1030 #, c-format msgid "Shell Command (%s)" msgstr "Käsurea käsk (%s)" -#: src/lang.c:1012 +#: src/lang.c:1031 #, c-format msgid "Enter shell command [%s]> " msgstr "Sisestage käsurea käsk [%s]> " -#: src/lang.c:1016 +#: src/lang.c:1035 #, c-format msgid "%s: Can't get entry for TERM\n" msgstr "%s: Ei saa TERM kirjet\n" -#: src/lang.c:1020 +#: src/lang.c:1039 #, c-format msgid "Group %.*s ('q' to quit)..." msgstr "Grupp %.*s ('q' lõpetamiseks)... " -#: src/lang.c:1022 +#: src/lang.c:1041 #, c-format msgid "Group %.*s..." msgstr "Grupp %.*s... " -#: src/lang.c:1026 +#: src/lang.c:1045 msgid "Server unavailable\n" msgstr "Server ei vasta\n" -#: src/lang.c:1032 +#: src/lang.c:1051 #, c-format msgid "%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; " "%s=post" msgstr "%s=toru; %s=kiri; %s=trüki; %s=välju; %s=kõik/lugem; %s=salv; %s=märgi; " "%s=postita" -#: src/lang.c:1033 +#: src/lang.c:1052 #, c-format msgid "%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "%s=toru; %s=kiri; %s=trüki; %s=välju; %s=kirjuta; %s=salv; %s=märgi; " "%s=postita" -#: src/lang.c:1035 +#: src/lang.c:1054 #, c-format msgid "%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "%s=kiri; %s=trüki; %s=välju; %s=kõik/lugem; %s=salvesta; %s=märgi; %s=postita" -#: src/lang.c:1036 +#: src/lang.c:1055 #, c-format msgid "%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "%s=kiri; %s=trüki; %s=välju; %s=kirjuta; %s=salvesta; %s=märgi; %s=postita" -#: src/lang.c:1040 +#: src/lang.c:1059 #, c-format msgid "%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "%s=toru; %s=kiri; %s=välju; %s=kõik/lugemata; %s=salv; %s=märgi; %s=postita" -#: src/lang.c:1041 +#: src/lang.c:1060 #, c-format msgid "%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "%s=toru; %s=kiri; %s=välju; %s=kirjuta; %s=salvesta; %s=märgi; %s=postita" -#: src/lang.c:1043 +#: src/lang.c:1062 #, c-format msgid "%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "%s=kiri; %s=välju; %s=kõik/lugemata; %s=salvesta; %s=märgi; %s=postita" -#: src/lang.c:1044 +#: src/lang.c:1063 #, c-format msgid "%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "%s=kiri; %s=välju; %s=vasta kirjaga; %s=salvesta; %s=märgi; %s=postita" -#: src/lang.c:1050 +#: src/lang.c:1069 msgid "Terminal does not support color" msgstr "Terminal ei toeta värve" -#: src/lang.c:1055 +#: src/lang.c:1074 #, c-format msgid "Trying %s" msgstr "Proovin %s" -#: src/lang.c:1069 src/lang.c:1094 src/lang.c:1110 src/lang.c:1289 src/refs.c:296 +#: src/lang.c:1088 src/lang.c:1113 src/lang.c:1129 src/lang.c:1308 src/refs.c:296 msgid "None" msgstr "Pole" -#: src/lang.c:1070 +#: src/lang.c:1089 msgid "Subject" msgstr "Teema" -#: src/lang.c:1071 +#: src/lang.c:1090 msgid "References" msgstr "Viited" -#: src/lang.c:1072 +#: src/lang.c:1091 msgid "Both Subject and References" msgstr "Nii teema kui viited" -#: src/lang.c:1073 +#: src/lang.c:1092 msgid "Multipart Subject" msgstr "Mitmeosaliste teema" -#: src/lang.c:1085 src/lang.c:1196 +#: src/lang.c:1104 src/lang.c:1215 msgid "No" msgstr "Ei" -#: src/lang.c:1086 src/lang.c:1198 +#: src/lang.c:1105 src/lang.c:1217 msgid "Yes" msgstr "Jah" -#: src/lang.c:1087 +#: src/lang.c:1106 msgid "Hide All" msgstr "Peida kõik" -#: src/lang.c:1095 +#: src/lang.c:1114 msgid "Address" msgstr "Aadress" -#: src/lang.c:1096 +#: src/lang.c:1115 msgid "Full Name" msgstr "Täisnimi" -#: src/lang.c:1097 +#: src/lang.c:1116 msgid "Address and Name" msgstr "Aadress ja nimi" -#: src/lang.c:1104 +#: src/lang.c:1123 msgid "Max" msgstr "Maksimum" -#: src/lang.c:1105 +#: src/lang.c:1124 msgid "Sum" msgstr "Summa" -#: src/lang.c:1106 +#: src/lang.c:1125 msgid "Average" msgstr "Keskmine" -#: src/lang.c:1111 +#: src/lang.c:1130 msgid "Lines" msgstr "Read" -#: src/lang.c:1112 +#: src/lang.c:1131 msgid "Score" msgstr "Kaal" -#: src/lang.c:1113 +#: src/lang.c:1132 msgid "Lines & Score" msgstr "Read & kaal" -#: src/lang.c:1122 +#: src/lang.c:1141 msgid "Black" msgstr "Must" -#: src/lang.c:1123 +#: src/lang.c:1142 msgid "Red" msgstr "Punane" -#: src/lang.c:1124 +#: src/lang.c:1143 msgid "Green" msgstr "Roheline" -#: src/lang.c:1125 +#: src/lang.c:1144 msgid "Brown" msgstr "Pruun" -#: src/lang.c:1126 +#: src/lang.c:1145 msgid "Blue" msgstr "Sinine" -#: src/lang.c:1127 +#: src/lang.c:1146 msgid "Pink" msgstr "Roosa" -#: src/lang.c:1128 +#: src/lang.c:1147 msgid "Cyan" msgstr "Lilla" -#: src/lang.c:1129 +#: src/lang.c:1148 msgid "White" msgstr "valge" -#: src/lang.c:1130 +#: src/lang.c:1149 msgid "Gray" msgstr "Hall" -#: src/lang.c:1131 +#: src/lang.c:1150 msgid "Light Red" msgstr "Helepunane" -#: src/lang.c:1132 +#: src/lang.c:1151 msgid "Light Green" msgstr "Heleroheline" -#: src/lang.c:1133 +#: src/lang.c:1152 msgid "Yellow" msgstr "Kollane" -#: src/lang.c:1134 +#: src/lang.c:1153 msgid "Light Blue" msgstr "Helesinine" -#: src/lang.c:1135 +#: src/lang.c:1154 msgid "Light Pink" msgstr "Heleroosa" -#: src/lang.c:1136 +#: src/lang.c:1155 msgid "Light Cyan" msgstr "Helelilla" -#: src/lang.c:1137 +#: src/lang.c:1156 msgid "Light White" msgstr "Helevalge" -#: src/lang.c:1145 src/lang.c:1202 src/lang.c:1216 +#: src/lang.c:1164 src/lang.c:1221 src/lang.c:1235 msgid "Nothing" msgstr "Ei kasuta" -#: src/lang.c:1146 +#: src/lang.c:1165 msgid "Mark" msgstr "Märk" -#: src/lang.c:1147 +#: src/lang.c:1166 msgid "Space" msgstr "Tühik" -#: src/lang.c:1154 +#: src/lang.c:1173 msgid "Normal" msgstr "Tavaline" -#: src/lang.c:1155 +#: src/lang.c:1174 msgid "Best highlighting" msgstr "Parim esiletõstmine" -#: src/lang.c:1156 +#: src/lang.c:1175 msgid "Underline" msgstr "Allajoonitud" -#: src/lang.c:1157 +#: src/lang.c:1176 msgid "Reverse video" msgstr "Pööratud video" -#: src/lang.c:1158 +#: src/lang.c:1177 msgid "Blinking" msgstr "Plinkiv" -#: src/lang.c:1159 +#: src/lang.c:1178 msgid "Half bright" msgstr "Poolhele" -#: src/lang.c:1160 +#: src/lang.c:1179 msgid "Bold" msgstr "Paks" -#: src/lang.c:1165 +#: src/lang.c:1184 msgid "none" msgstr "pole" -#: src/lang.c:1166 +#: src/lang.c:1185 msgid "commands" msgstr "käsud" -#: src/lang.c:1167 +#: src/lang.c:1186 msgid "select" msgstr "valik" -#: src/lang.c:1169 +#: src/lang.c:1188 msgid "commands & quit" msgstr "käsud & välju" -#: src/lang.c:1170 +#: src/lang.c:1189 msgid "commands & select" msgstr "käsud & valik" -#: src/lang.c:1171 +#: src/lang.c:1190 msgid "quit & select" msgstr "välju & valik" -#: src/lang.c:1172 +#: src/lang.c:1191 msgid "commands & quit & select" msgstr "käsud & välju & valik" -#: src/lang.c:1197 +#: src/lang.c:1216 msgid "Shell archive" msgstr "Shelli arhiiv" -#: src/lang.c:1203 +#: src/lang.c:1222 msgid "Subject: (descending)" msgstr "Subject: (kahanevalt)" -#: src/lang.c:1204 +#: src/lang.c:1223 msgid "Subject: (ascending)" msgstr "Subject: (kasvavalt)" -#: src/lang.c:1205 +#: src/lang.c:1224 msgid "From: (descending)" msgstr "From: (kahanevalt)" -#: src/lang.c:1206 +#: src/lang.c:1225 msgid "From: (ascending)" msgstr "From: (kasvavalt)" -#: src/lang.c:1207 +#: src/lang.c:1226 msgid "Date: (descending)" msgstr "Date: (kahanevalt)" -#: src/lang.c:1208 +#: src/lang.c:1227 msgid "Date: (ascending)" msgstr "Date: (kasvavalt)" -#: src/lang.c:1209 src/lang.c:1217 +#: src/lang.c:1228 src/lang.c:1236 msgid "Score (descending)" msgstr "Kaal (kahanevalt)" -#: src/lang.c:1210 src/lang.c:1218 +#: src/lang.c:1229 src/lang.c:1237 msgid "Score (ascending)" msgstr "Kaal (kasvavalt)" -#: src/lang.c:1211 +#: src/lang.c:1230 msgid "Lines: (descending)" msgstr "Lines: (kahanevalt)" -#: src/lang.c:1212 +#: src/lang.c:1231 msgid "Lines: (ascending)" msgstr "Lines: (kasvavalt)" -#: src/lang.c:1223 +#: src/lang.c:1242 msgid "Always Keep" msgstr "Hoia alati" -#: src/lang.c:1224 +#: src/lang.c:1243 msgid "Always Remove" msgstr "Eemalda alati" -#: src/lang.c:1225 +#: src/lang.c:1244 msgid "Mark with D on selection screen" msgstr "Märgi valikuekraanil tähega D" -#: src/lang.c:1230 +#: src/lang.c:1249 msgid "Kill only unread arts" msgstr "Surma ainult lugemata artiklid" -#: src/lang.c:1231 +#: src/lang.c:1250 msgid "Kill all arts & show with K" msgstr "Surma kõik artiklid & näita K tähega" #. TODO: s/K/art_marked_killed/ -#: src/lang.c:1232 +#: src/lang.c:1251 msgid "Kill all arts and never show" msgstr "Surma kõik artiklid ja ära näita" -#: src/lang.c:1237 +#: src/lang.c:1256 msgid "Nothing special" msgstr "Ei midagi erilist" -#: src/lang.c:1238 +#: src/lang.c:1257 msgid "Compress quotes" msgstr "Tihenda tsitaadid" -#: src/lang.c:1239 +#: src/lang.c:1258 msgid "Quote signatures" msgstr "Tsiteeri allkirju" -#: src/lang.c:1240 +#: src/lang.c:1259 msgid "Compress quotes, quote sigs" msgstr "Tihenda tsitaadid, tsiteeri allkirju" -#: src/lang.c:1241 +#: src/lang.c:1260 msgid "Quote empty lines" msgstr "Tsiteeri tühje ridu" -#: src/lang.c:1242 +#: src/lang.c:1261 msgid "Compress quotes, quote empty lines" msgstr "Tihenda tsitaadid, tsiteeri tühje ridu" -#: src/lang.c:1243 +#: src/lang.c:1262 msgid "Quote sigs & empty lines" msgstr "Tsiteeri allkirju ja tühje ridu" -#: src/lang.c:1244 +#: src/lang.c:1263 msgid "Comp. q., quote sigs & empty lines" msgstr "Tihenda tsitaate, tsiteeri allkirju ja tühje ridu" -#: src/lang.c:1282 +#: src/lang.c:1301 msgid "no" msgstr "ei" -#: src/lang.c:1283 +#: src/lang.c:1302 msgid "with headers" msgstr "päistega" -#: src/lang.c:1284 +#: src/lang.c:1303 msgid "without headers" msgstr "päisteta" # TRANSLATION MISSING -#: src/lang.c:1291 src/lang.c:1297 +#: src/lang.c:1310 src/lang.c:1316 msgid "NFKC" msgstr "" # TRANSLATION MISSING -#: src/lang.c:1292 +#: src/lang.c:1311 msgid "NFKD" msgstr "" # TRANSLATION MISSING -#: src/lang.c:1293 +#: src/lang.c:1312 msgid "NFC" msgstr "" # TRANSLATION MISSING -#: src/lang.c:1294 +#: src/lang.c:1313 msgid "NFD" msgstr "" -#: src/lang.c:1305 +#: src/lang.c:1324 msgid "Display Options" msgstr "Ekraani seaded" -#: src/lang.c:1311 +#: src/lang.c:1330 msgid "Color Options" msgstr "Värvide seaded" -#: src/lang.c:1317 +#: src/lang.c:1336 msgid "Article-Limiting Options" msgstr "Artikli piirangute seaded" -#: src/lang.c:1323 +#: src/lang.c:1342 msgid "Posting/Mailing Options" msgstr "Postitamise/saatmise seaded" -#: src/lang.c:1329 +#: src/lang.c:1348 msgid "Saving/Printing Options" msgstr "Salvestamise/trükkimise seaded" -#: src/lang.c:1335 +#: src/lang.c:1354 msgid "Expert Options" msgstr "Ekspertseaded" -#: src/lang.c:1341 +#: src/lang.c:1360 msgid "Filtering Options" msgstr "Filtreerimise seaded" -#: src/lang.c:1346 src/lang.c:1372 src/lang.c:1378 src/lang.c:1385 src/lang.c:1417 -#: src/lang.c:1423 src/lang.c:1431 src/lang.c:1451 src/lang.c:1526 src/lang.c:1688 -#: src/lang.c:1694 src/lang.c:1700 src/lang.c:1706 src/lang.c:1718 src/lang.c:1725 -#: src/lang.c:1776 src/lang.c:1785 src/lang.c:1791 src/lang.c:1797 src/lang.c:1803 -#: src/lang.c:1809 src/lang.c:1815 src/lang.c:1821 src/lang.c:1827 src/lang.c:1833 -#: src/lang.c:1839 src/lang.c:1845 src/lang.c:1851 src/lang.c:1857 src/lang.c:1863 -#: src/lang.c:1869 src/lang.c:1875 src/lang.c:1881 src/lang.c:1887 src/lang.c:1893 -#: src/lang.c:1899 src/lang.c:1905 src/lang.c:1912 src/lang.c:1918 src/lang.c:1924 -#: src/lang.c:1931 src/lang.c:1942 src/lang.c:1948 src/lang.c:1954 src/lang.c:1960 -#: src/lang.c:1966 src/lang.c:1972 src/lang.c:1986 src/lang.c:1998 src/lang.c:2032 -#: src/lang.c:2084 src/lang.c:2091 src/lang.c:2097 src/lang.c:2122 src/lang.c:2139 -#: src/lang.c:2192 src/lang.c:2225 src/lang.c:2245 src/lang.c:2280 src/lang.c:2289 -#: src/lang.c:2314 src/lang.c:2326 src/lang.c:2345 src/lang.c:2353 +#: src/lang.c:1365 src/lang.c:1396 src/lang.c:1402 src/lang.c:1414 src/lang.c:1464 +#: src/lang.c:1470 src/lang.c:1480 src/lang.c:1500 src/lang.c:1575 src/lang.c:1745 +#: src/lang.c:1751 src/lang.c:1757 src/lang.c:1763 src/lang.c:1775 src/lang.c:1782 +#: src/lang.c:1836 src/lang.c:1845 src/lang.c:1851 src/lang.c:1858 src/lang.c:1865 +#: src/lang.c:1872 src/lang.c:1879 src/lang.c:1886 src/lang.c:1893 src/lang.c:1900 +#: src/lang.c:1907 src/lang.c:1914 src/lang.c:1921 src/lang.c:1928 src/lang.c:1935 +#: src/lang.c:1942 src/lang.c:1949 src/lang.c:1956 src/lang.c:1963 src/lang.c:1970 +#: src/lang.c:1977 src/lang.c:1984 src/lang.c:1991 src/lang.c:1998 src/lang.c:2005 +#: src/lang.c:2013 src/lang.c:2029 src/lang.c:2036 src/lang.c:2043 src/lang.c:2050 +#: src/lang.c:2056 src/lang.c:2062 src/lang.c:2079 src/lang.c:2091 src/lang.c:2125 +#: src/lang.c:2178 src/lang.c:2185 src/lang.c:2191 src/lang.c:2216 src/lang.c:2233 +#: src/lang.c:2286 src/lang.c:2322 src/lang.c:2342 src/lang.c:2377 src/lang.c:2387 +#: src/lang.c:2412 src/lang.c:2428 src/lang.c:2447 src/lang.c:2460 msgid " toggles, sets, cancels." msgstr " lülitab, seab, katkestab." -#: src/lang.c:1347 +#: src/lang.c:1366 msgid "Show mini menu & posting etiquette" msgstr "Näita minimenüüd & post. etiketti" -#: src/lang.c:1348 +#: src/lang.c:1367 msgid "# If ON show a mini menu of useful commands at each level\n" "# and posting etiquette after composing an article\n" msgstr "# Kui väärtus on ON, näita enimkasutatavate käskude minimenüüd\n" "# ja peale artikli kirjutamist postitamise etiketti.\n" -#: src/lang.c:1353 +#: src/lang.c:1372 msgid "Show short description for each newsgroup. toggles & sets." msgstr "Näita gruppide lühikirjeldusi. lülitab ja seab." -#: src/lang.c:1354 +#: src/lang.c:1373 msgid "Show description of each newsgroup" msgstr "Näita iga grupi lühikirjeldust" -#: src/lang.c:1355 +#: src/lang.c:1374 msgid "# If ON show group description text after newsgroup name at\n" "# group selection level\n" msgstr "# Kui väärtus on ON, näita gruppide tasemel iga grupi nime\n" "# järel grupi lühikirjeldust\n" -#: src/lang.c:1360 +#: src/lang.c:1379 msgid "Show Subject & From (author) fields in group menu. toggles & " "sets." msgstr "Näita grupimenüüs teema ja From (autor) välju. lülitab ja seab." -#: src/lang.c:1361 +#: src/lang.c:1380 msgid "In group menu, show author by" msgstr "Näita grupimenüüs autorit" -#: src/lang.c:1362 -msgid "# Part of from field to display 0) none 1) address 2) full name 3) both\n" +# TRANSLATION OUTDATED +#: src/lang.c:1381 +#, fuzzy +msgid "# Part of from field to display\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = none\n" + "# 1 = address\n" + "# * 2 = full name\n" + "# 3 = both\n" msgstr "# Millist saatja nime osa näidata 0) mitte midagi 1) aadress 2) täisnimi\n" "# 3) mõlemad\n" -#: src/lang.c:1366 +#: src/lang.c:1390 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "Märgi valik -> või heleda ribaga. lülitab, seab." -#: src/lang.c:1367 +#: src/lang.c:1391 msgid "Draw -> instead of highlighted bar" msgstr "Joonista -> heleda riba asemel" -#: src/lang.c:1368 +#: src/lang.c:1392 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "# Kui väärtus on on, kasuta valiku märkimiseks ->, muidu riba\n" -#: src/lang.c:1373 +#: src/lang.c:1397 msgid "Use inverse video for page headers" msgstr "Kasuta päistel pööratud videot" -#: src/lang.c:1374 +#: src/lang.c:1398 msgid "# If ON use inverse video for page headers at different levels\n" msgstr "# Kui väärtus on ON, kasuta erinevatel tasemetel päiste näitamisel\n" "# pööratud videot\n" -#: src/lang.c:1379 +#: src/lang.c:1403 msgid "Thread articles by" msgstr "Artiklite teemadesse jagamine" -#: src/lang.c:1380 -msgid "# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n" - "# 4=(Multipart Subject).\n" -msgstr "# Jaga artiklid teemadesse 0=(ei jaga) 1=(teema järgi) 2=(viite järgi)\n" - "# 3=(mõlema järgi) 4=(Mitmeosaliste teema).\n" +# TRANSLATION MISSING +#: src/lang.c:1404 +msgid "# Thread articles by ...\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = nothing\n" + "# 1 = Subject\n" + "# 2 = References\n" + "# * 3 = Both (Subject and References)\n" + "# 4 = Multipart Subject\n" +msgstr "" -#: src/lang.c:1386 +#: src/lang.c:1415 msgid "Score of a thread" msgstr "Teema kaal" -#: src/lang.c:1387 -msgid "# Thread score 0=(Max) 1=(Sum) 2=(Average)\n" -msgstr "# Teema kaal 0=(Maksimum) 1=(Summa) 2=(Keskmine)\n" +# TRANSLATION MISSING +#: src/lang.c:1416 +msgid "# Thread score\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = max\n" + "# 1 = sum\n" + "# 2 = average\n" +msgstr "" -#: src/lang.c:1391 +#: src/lang.c:1424 msgid "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "Järjesta artiklid Subject, From, Date, kaalu järgi. lülitab, " "seab." -#: src/lang.c:1392 +#: src/lang.c:1425 msgid "Sort articles by" msgstr "Artiklite järjestus" -#: src/lang.c:1393 -msgid "# Sort articles by 0=(nothing) 1=(Subject descend) 2=(Subject ascend)\n" - "# 3=(From descend) 4=(From ascend) 5=(Date descend) 6=(Date ascend)\n" - "# 7=(Score descend) 8=(Score ascend) 9=(Lines descend) 10=(Lines ascend).\n" +# TRANSLATION OUTDATED +#: src/lang.c:1426 +#, fuzzy +msgid "# Sort articles by ...\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = nothing\n" + "# 1 = Subject descending\n" + "# 2 = Subject ascending\n" + "# 3 = From descending\n" + "# 4 = From ascending\n" + "# 5 = Date descending\n" + "# * 6 = Date ascending\n" + "# 7 = Score descending\n" + "# 8 = Score ascending\n" + "# 9 = Lines descending\n" + "# 10 = Lines ascending\n" msgstr "# Artiklite järjestamine 0=(ei järjesta) 1=(Teema kahanev) 2=(Teema kasvav)\n" "# 3=(Saatja kahanev) 4=(Saatja kasvava) 5=(Kuup. kahanev) 6=(Kuup. kasvav)\n" "# 7=(Kaal kahanev) 8=(Kaal kasvav) 9=(Ridu kahanev) 10=(Ridu kasvav).\n" -#: src/lang.c:1399 +#: src/lang.c:1442 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "Järjesta teemad mitte millegi või kaalu järgi. lülitab, seab." -#: src/lang.c:1400 +#: src/lang.c:1443 msgid "Sort threads by" msgstr "Teemade järjestus" -#: src/lang.c:1401 -msgid "# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n" -msgstr "# Järjesta teema 0=(ei järjesta) 1=skoor kahanevalt, 2=skoor kasvavalt\n" +# TRANSLATION MISSING +#: src/lang.c:1444 +msgid "# Sort thread by ...\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = nothing\n" + "# * 1 = Score descending\n" + "# 2 = Score ascending\n" +msgstr "" -#: src/lang.c:1405 +#: src/lang.c:1452 msgid "Put cursor at first/last unread art in groups. toggles & sets." msgstr "Vii kursor grupis esimesele/viimasele lugemata artiklile. lülitab, " " seab." -#: src/lang.c:1406 +#: src/lang.c:1453 msgid "Goto first unread article in group" msgstr "Mine grupis esimesele lugemata art." -#: src/lang.c:1407 +#: src/lang.c:1454 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "# Kui väärtus on ON, vii kursor grupi esimesele lugemata artiklile,\n" "# muidu viimasele\n" -#: src/lang.c:1411 +#: src/lang.c:1458 msgid "Show all articles or only unread articles. toggles & sets." msgstr "Näita kõiki või ainult lugemata artikleid. lülitab, seab." -#: src/lang.c:1412 +#: src/lang.c:1459 msgid "Show only unread articles" msgstr "Näita ainult lugemata artikleid" -#: src/lang.c:1413 +#: src/lang.c:1460 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "# Kui väärtus on ON, näita ainult lugemata artikleid, muidu näita kõiki.\n" -#: src/lang.c:1418 +#: src/lang.c:1465 msgid "Show only groups with unread arts" msgstr "Ainult lugemata artiklitega grupid" -#: src/lang.c:1419 +#: src/lang.c:1466 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "# Näita ainult neid tellitud gruppe, kus on lugemata artikleid.\n" -#: src/lang.c:1424 +#: src/lang.c:1471 msgid "Filter which articles" msgstr "Filtreeri artikleid" -#: src/lang.c:1425 -msgid "# 0=(Only kill unread articles)\n" - "# 1=(Kill all articles and show in threads marked with K)\n" - "# 2=(Kill all articles and never show them).\n" +# TRANSLATION OUTDATED +#: src/lang.c:1472 +#, fuzzy +msgid "# Filter which articles\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = only kill unread articles\n" + "# 1 = kill all articles and show in threads marked with K\n" + "# 2 = kill all articles and never show them\n" msgstr "# 0=(Surma ainult lugemata artiklid)\n" "# 1=(Surma kõik artiklid ja näita teemades märgiga K)\n" "# 2=(Surma kõik artiklid ja ära näita neid).\n" -#: src/lang.c:1432 +#: src/lang.c:1481 msgid "Tab goes to next unread article" msgstr "Tab viib järgmisele lugemata art." -#: src/lang.c:1433 +#: src/lang.c:1482 msgid "# If ON the TAB command will go to next unread article at article viewer " "level\n" msgstr "# Kui väärtus on ON, viib Tab käsk järgmisele lugemata artiklile\n" -#: src/lang.c:1437 +#: src/lang.c:1486 msgid "Scrolling with past the end of an art. jumps to the next unread one." msgstr "Tühikuga artikli lõpust edasi kerimine hüppab järgmisele lugemata artiklile." -#: src/lang.c:1438 +#: src/lang.c:1487 msgid "Space goes to next unread article" msgstr "Tühik viib järgmisele lugemata art." -#: src/lang.c:1439 +#: src/lang.c:1488 msgid "# If ON the SPACE command will go to next unread article at article viewer\n" "# level when the end of the article is reached (rn-style pager)\n" msgstr "# Kui väärtus on ON, viib artikli lõpus tühiku vajutamine\n" "# järgmisele lugemata artiklile (rn stiil)\n" -#: src/lang.c:1444 +#: src/lang.c:1493 msgid "Scrolling with / past the end of an art. jumps to the unread one." msgstr "/noolega art. lõpust edasi kerimine hüppab järgmisele lugemata art." -#: src/lang.c:1445 +#: src/lang.c:1494 msgid "PgDn goes to next unread article" msgstr "PgDn viib järgmisele lugemata art." -#: src/lang.c:1446 +#: src/lang.c:1495 msgid "# If ON the PGDN or DOWN command will go to next unread article when\n" "# pressed at end of message\n" msgstr "# Kui väärtus on ON, viib artikli lõpus PGDN või nool alla vajutamine\n" "# järgmisele artiklile\n" -#: src/lang.c:1452 +#: src/lang.c:1501 msgid "List thread using right arrow key" msgstr "Nool paremale näitab teema loendit" -#: src/lang.c:1453 +#: src/lang.c:1502 msgid "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "# Kui väärtus on ON, näita nool paremale klahvi vajutamisel teema artikleid.\n" -#: src/lang.c:1457 +#: src/lang.c:1506 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "Sisestage sümbol kustutatud artiklite märkimiseks. seab, katkestab." -#: src/lang.c:1458 +#: src/lang.c:1507 msgid "Character to show deleted articles" msgstr "Kustutatud artiklite marker" -#: src/lang.c:1459 +#: src/lang.c:1508 msgid "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" msgstr "# Sümbol, mis tähistab kustutatud artiklit (vaikimisi 'D')\n" "# _ asendatakse tühikuga ' '\n" -#: src/lang.c:1464 +#: src/lang.c:1513 msgid "Enter character to indicate articles in a range. sets, cancels." msgstr "Sisestage sümbol, mis märgib vahemikku kuuluvaid artikleid. seab, " "katkestab." -#: src/lang.c:1465 +#: src/lang.c:1514 msgid "Character to show inrange articles" msgstr "Artiklite vahemiku marker" -#: src/lang.c:1466 +#: src/lang.c:1515 msgid "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" msgstr "# Sümbol, mis märgib vahemikku kuuluvaid artikleid (vaikimisi '#')\n" "# _ asendatakse tühikuga ' '\n" -#: src/lang.c:1471 +#: src/lang.c:1520 msgid "Enter character to indicate that article will return. sets, " "cancels." msgstr "Sisestage tagasituleva artikli marker. seab, katkestab." -#: src/lang.c:1472 +#: src/lang.c:1521 msgid "Character to show returning arts" msgstr "Tagasi tulnud artiklite marker" -#: src/lang.c:1473 +#: src/lang.c:1522 msgid "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" msgstr "# Sümbol, mis näitab, et artikkel tuleb tagasi (vaikimisi '-')\n" "# _ asendatakse tühikuga ' '\n" -#: src/lang.c:1478 +#: src/lang.c:1527 msgid "Enter character to indicate selected articles. sets, cancels." msgstr "Sisestage valitud artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1479 +#: src/lang.c:1528 msgid "Character to show selected articles" msgstr "Valitud artiklite marker" -#: src/lang.c:1480 +#: src/lang.c:1529 msgid "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" msgstr "# Sümbol, mis näitab, et artikkel on automaatselt valitud (vaikimisi '*')\n" "# _ asendatakse tühikuga ' '\n" -#: src/lang.c:1485 +#: src/lang.c:1534 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "Sisestage värskeid artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1486 +#: src/lang.c:1535 msgid "Character to show recent articles" msgstr "Värskete artiklite marker" -#: src/lang.c:1487 +#: src/lang.c:1536 msgid "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" msgstr "# Sümbol, mis näitab, et artikkel on värske (vaikimisi 'o')\n" "# _ asendatakse tühikuga ' '\n" -#: src/lang.c:1492 +#: src/lang.c:1541 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "Sisestage lugemata artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1493 +#: src/lang.c:1542 msgid "Character to show unread articles" msgstr "Lugemata artiklite marker" -#: src/lang.c:1494 +#: src/lang.c:1543 msgid "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" msgstr "# Sümbol, mis näitab, et artikkel on lugemata (vaikimisi '+')\n" "# _ asendatakse tühikuga ' '\n" -#: src/lang.c:1499 +#: src/lang.c:1548 msgid "Enter character to indicate read articles. sets, cancels." msgstr "Sisestage loetud artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1500 +#: src/lang.c:1549 msgid "Character to show read articles" msgstr "Loetud artiklite marker" -#: src/lang.c:1501 +#: src/lang.c:1550 msgid "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" msgstr "# Sümbol, mis näitab, et artikkel on loetud (vaikimisi ' ')\n" "# _ asendatakse tühikuga ' '\n" -#: src/lang.c:1506 +#: src/lang.c:1555 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "Sisestage surmatud artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1507 +#: src/lang.c:1556 msgid "Character to show killed articles" msgstr "Surmatud artiklite marker" -#: src/lang.c:1508 +#: src/lang.c:1557 msgid "# Character used to show that an art was killed (default 'K')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" msgstr "# Sümbol, mis näitab, et artikkel on surmatud (vaikimisi 'K')\n" "# _ asendatakse tühikuga ' '\n" -#: src/lang.c:1513 +#: src/lang.c:1562 msgid "Enter character to indicate read selected articles. sets, cancels." msgstr "Sisestage valitud artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1514 +#: src/lang.c:1563 msgid "Character to show readselected arts" msgstr "Lugemiseks valitud artiklite marker" -#: src/lang.c:1515 +#: src/lang.c:1564 msgid "# Character used to show that an art was selected before read (default ':')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" msgstr "# Sümbol, mis näitab, et artikkel on enne lugemist valitud (vaikimisi ':')\n" "# Surmamise tase peab samuti olema määratud, _ asendatakse tühikuga ' '\n" -#: src/lang.c:1520 +#: src/lang.c:1569 msgid "Enter maximum length of newsgroup names displayed. sets." msgstr "Sisestage maksimaalne näidatav grupi nime pikkus. seab." -#: src/lang.c:1521 +#: src/lang.c:1570 msgid "Max. length of group names shown" msgstr "Maksimaalne grupinime pikkus" -#: src/lang.c:1522 +#: src/lang.c:1571 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "# Maksimaalne grupi nime pikkus, mida näidatakse ekraanil\n" -#: src/lang.c:1527 +#: src/lang.c:1576 msgid "Show lines/score in listings" msgstr "Näita loendis artikli kaalu/ridu" -#: src/lang.c:1528 +# TRANSLATION OUTDATED +#: src/lang.c:1577 +#, fuzzy msgid "# What informations should be displayed in article/thread listing\n" - "# 0 = nothing, 1 = lines, 2 = score, 3 = lines & score\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = nothing\n" + "# * 1 = lines\n" + "# 2 = score\n" + "# 3 = lines & score\n" msgstr "# Millist informatsiooni tuleks näidata artikli/teema loendis\n" "# 0 = midagi, 1 = ridu, 2 = kaalu, 3 = ridu ja kaalu\n" -#: src/lang.c:1533 +#: src/lang.c:1586 msgid "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" msgstr "0 = kerida kogu leht, -1 = näita eelmist rida järgmise lehe esimese reana, -2 " "= pool lehte" -#: src/lang.c:1534 +#: src/lang.c:1587 msgid "Number of lines to scroll in pager" msgstr "Lehitsejas keritavate ridade arv" -#: src/lang.c:1535 +# TRANSLATION OUTDATED +#: src/lang.c:1588 +#, fuzzy msgid "# Number of lines that cursor-up/down will scroll in article pager\n" - "# eg, 1+ = line-by-line, 0 = page-by-page (traditional behavior),\n" - "# -1 = the top/bottom line is carried over onto the next page,\n" - "# -2 = half-page scrolling\n" + "# Possible values are (the default is marked with *):\n" + "# -2 = half-page scrolling\n" + "# -1 = the top/bottom line is carried over onto the next page\n" + "# 0 = page-by-page (traditional behavior)\n" + "# * 1 = line-by-line\n" + "# 2 or greater = scroll by 2 or more lines (only in the pager)\n" msgstr "# Ridade arv, mida lehitseja kerib üles/alla\n" "# nt, 1+ = rida haaval, 0 = leht haaval (tavaline käitumine),\n" "# -1 = ülemine või alumine rida jäetakse järgmisele lehele\n" "# -2 = poole lehe kaupa kerimine\n" -#: src/lang.c:1542 +#: src/lang.c:1598 msgid "Display signatures. toggles & sets." msgstr "Näita signatuure, lülitab, seab." -#: src/lang.c:1543 +#: src/lang.c:1599 msgid "Display signatures" msgstr "Näita signatuure" -#: src/lang.c:1544 +#: src/lang.c:1600 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "# Kui väärtus on OFF, ei näita koos artiklitega signatuure\n" -#: src/lang.c:1548 +#: src/lang.c:1604 msgid "Display uuencoded data as tagged attachments. toggles & sets." msgstr "Näita uuenkodeeritud andmeid märgitud lisadena. lülitab ja seab." -#: src/lang.c:1549 +#: src/lang.c:1605 msgid "Display uue data as an attachment" msgstr "Näita uuenk. andmeid lisadena" -#: src/lang.c:1550 +# TRANSLATION OUTDATED +#: src/lang.c:1606 +#, fuzzy msgid "# Handling of uuencoded data in the pager\n" - "# 0 = display raw uuencoded data\n" - "# 1 = uuencoded data will be condensed to a single tag line showing\n" - "# size and filename, similar to how MIME attachments are displayed\n" - "# 2 = as for 1, but any line that looks like uuencoded data will be folded\n" - "# into a tag line.\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = no, display raw uuencoded data\n" + "# 1 = yes, uuencoded data will be condensed to a single tag line showing\n" + "# size and filename, similar to how MIME attachments are displayed\n" + "# 2 = hide all, as for 1, but any line that looks like uuencoded data will\n" + "# be folded into a tag line.\n" msgstr "# uuenkodeeritud andmete käsitlemine lehitsejas\n" "# 0 = näita puhast uuenkodeeritud andmeid\n" "# 1 = uuenkodeeritud andmed koondatakse üheks märgitud reaks, mis näitab\n" @@ -4692,30 +4764,30 @@ msgstr "# uuenkodeeritud andmete käsitle "# märgituna.\n" # -#: src/lang.c:1559 +#: src/lang.c:1616 msgid "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "Dekodeeri saksa TeX esituses tähed ISO koodideks. lülitab, seab." # -#: src/lang.c:1560 +#: src/lang.c:1617 msgid "Display \"a as Umlaut-a" msgstr "Näita \"a kui Umlaut-a" -#: src/lang.c:1561 +#: src/lang.c:1618 msgid "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" msgstr "# Kui väärtus on ON, teisenda saksa TeX esituses tähed ISO\n" "# koodideks ja näita \"a nagu Umlaut-a, jne.\n" -#: src/lang.c:1566 src/lang.c:1576 +#: src/lang.c:1623 src/lang.c:1633 msgid "Space separated list of header fields" msgstr "Tühikuga eraldatud päised" -#: src/lang.c:1567 +#: src/lang.c:1624 msgid "Display these header fields (or *)" msgstr "Näita neid päiseid (või *)" -#: src/lang.c:1568 +#: src/lang.c:1625 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" @@ -4730,11 +4802,11 @@ msgstr "# Milliseid artikli päiseid te s "tühikut.\n" "# Kui te väärtust ei määra, lülitatakse see omadus välja.\n" -#: src/lang.c:1577 +#: src/lang.c:1634 msgid "Do not display these header fields" msgstr "Ära näita neid päiseridu" -#: src/lang.c:1578 +#: src/lang.c:1635 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 " @@ -4752,28 +4824,28 @@ msgstr "# Sama kui 'news_headers_to_disp "#\n" "# Kui te väärtust ei määra, lülitatakse see omadus välja.\n" -#: src/lang.c:1588 +#: src/lang.c:1645 msgid "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "Kas te soovite multipart/alternative artiklite automaatset käsitlemist?" -#: src/lang.c:1589 +#: src/lang.c:1646 msgid "Skip multipart/alternative parts" msgstr "Jäta multipart/alternative osad" -#: src/lang.c:1590 +#: src/lang.c:1647 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "# Kui väärtus on ON, loobu automaatselt multipart/alternative teadete " "lisadest\n" -#: src/lang.c:1595 +#: src/lang.c:1652 msgid "A regex used to decide which lines to show in col_quote." msgstr "Regulaaravaldis otsustamaks, milliseid ridu tsitaatides näidata." -#: src/lang.c:1596 +#: src/lang.c:1653 msgid "Regex used to show quoted lines" msgstr "Tsiteeritud ridade näitamise regex" -#: src/lang.c:1597 +#: src/lang.c:1654 msgid "# A regular expression that tin will use to decide which lines are\n" "# quoted when viewing articles. Quoted lines are shown in col_quote.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4781,15 +4853,15 @@ msgstr "# Regulaaravaldis, mida tin kasu "# milliseid read on tsiteeritud. Tsiteeritud ridu näidatakse col_quote.\n" "# Kui te jätate selle tühjaks, kasutab tin sisseehitatud väärtust.\n" -#: src/lang.c:1603 +#: src/lang.c:1660 msgid "A regex used to decide which lines to show in col_quote2." msgstr "Regulaaravaldis otsustamaks, milliseid ridu näidata col_quote2." -#: src/lang.c:1604 +#: src/lang.c:1661 msgid "Regex used to show twice quoted l." msgstr "Topelt tsiteeritud ridu näitav reg" -#: src/lang.c:1605 +#: src/lang.c:1662 msgid "# A regular expression that tin will use to decide which lines are\n" "# quoted twice. Twice quoted lines are shown in col_quote2.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4798,15 +4870,15 @@ msgstr "# Regulaaravaldis, mida tin kasu "# näidatakse col_quote2.\n" "# Kui te jätate selle tühjaks, kasutab tin sisseehitatud väärtust.\n" -#: src/lang.c:1611 +#: src/lang.c:1668 msgid "A regex used to decide which lines to show in col_quote3." msgstr "Regulaaravaldis otsustamaks, milliseid ridu näidata col_quote3." -#: src/lang.c:1612 +#: src/lang.c:1669 msgid "Regex used to show >= 3 times q.l." msgstr ">= 3 tsiteeritud ridu näitav reg" -#: src/lang.c:1613 +#: src/lang.c:1670 msgid "# A regular expression that tin will use to decide which lines are\n" "# quoted >=3 times. >=3 times quoted lines are shown in col_quote3.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4815,15 +4887,15 @@ msgstr "# Regulaaravaldis, mida tin kasu "# näidatakse col_quote3.\n" "# Kui te jätate selle tühjaks, kasutab tin sisseehitatud väärtust.\n" -#: src/lang.c:1620 +#: src/lang.c:1677 msgid "A regex used to decide which words to show in col_markslashes." msgstr "Regex et otsustada, milliseid sõnu näidata col_markslashes abil." -#: src/lang.c:1621 +#: src/lang.c:1678 msgid "Regex used to highlight /slashes/" msgstr "Regex et esile tõsta /kaldkriipse/" -#: src/lang.c:1622 +#: src/lang.c:1679 msgid "# A regular expression that tin will use to decide which words\n" "# bounded by '/' are to be shown in col_markslashes.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4831,15 +4903,15 @@ msgstr "# Regulaaravaldis mida tin kasut "# sõnu näidata col_markslashes abil. Kui jätate selle tühjaks, kasutab\n" "# tin sisse ehitatud vaikeväärtust.\n" -#: src/lang.c:1628 +#: src/lang.c:1685 msgid "A regex used to decide which words to show in col_markstars." msgstr "Regex et otsustada, milliseid sõnu näidata col_markstars abil." -#: src/lang.c:1629 +#: src/lang.c:1686 msgid "Regex used to highlight *stars*" msgstr "Regex et esile tõsta *tärne*" -#: src/lang.c:1630 +#: src/lang.c:1687 msgid "# A regular expression that tin will use to decide which words\n" "# bounded by '*' are to be shown in col_markstars.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4847,15 +4919,15 @@ msgstr "# Regulaaravaldis mida tin kasut "# sõnu näidata col_markstars abil. Kui jätate selle tühjaks, kasutab\n" "# tin sisse ehitatud vaikeväärtust.\n" -#: src/lang.c:1636 +#: src/lang.c:1693 msgid "A regex used to decide which words to show in col_markstroke." msgstr "Regex et otsustada, milliseid sõnu näidata col_markstroke abil." -#: src/lang.c:1637 +#: src/lang.c:1694 msgid "Regex used to highlight -strokes-" msgstr "Regex et esile tõsta -kriipse-" -#: src/lang.c:1638 +#: src/lang.c:1695 msgid "# A regular expression that tin will use to decide which words\n" "# bounded by '-' are to be shown in col_markstroke.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4863,15 +4935,15 @@ msgstr "# Regulaaravaldis mida tin kasut "# sõnu näidata col_markstroke abil. Kui jätate selle tühjaks, kasutab\n" "# tin sisse ehitatud vaikeväärtust.\n" -#: src/lang.c:1644 +#: src/lang.c:1701 msgid "A regex used to decide which words to show in col_markdash." msgstr "Regex et otsustada, milliseid sõnu näidata col_markdash abil." -#: src/lang.c:1645 +#: src/lang.c:1702 msgid "Regex used to highlight _underline_" msgstr "Regex et esile tõsta _alakriipse_" -#: src/lang.c:1646 +#: src/lang.c:1703 msgid "# A regular expression that tin will use to decide which words\n" "# bounded by '_' are to be shown in col_markdash.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4879,44 +4951,44 @@ msgstr "# Regulaaravaldis mida tin kasut "# sõnu näidata col_markdash abil. Kui jätate selle tühjaks, kasutab\n" "# tin sisse ehitatud vaikeväärtust.\n" -#: src/lang.c:1652 +#: src/lang.c:1709 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "Regulaaravaldis eemaldatava teema prefiksi leidmiseks. Eraldajaks on '|'." -#: src/lang.c:1653 +#: src/lang.c:1710 msgid "Regex with Subject prefixes" msgstr "Regex teema prefiksi leidmiseks" -#: src/lang.c:1654 +#: src/lang.c:1711 msgid "# A regular expression that tin will use to find Subject prefixes\n" "# which will be removed before showing the header.\n" msgstr "# Regulaaravaldis, mida tin kasutab, et leida teema prefiksit, mida\n" "# enne päise näitamist eemaldada.\n" -#: src/lang.c:1659 +#: src/lang.c:1716 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "Regulaaravaldis eemaldatava teema sufiksi leidmiseks. Eraldajaks on '|'." -#: src/lang.c:1660 +#: src/lang.c:1717 msgid "Regex with Subject suffixes" msgstr "Regex teema sufiksi leidmiseks" -#: src/lang.c:1661 +#: src/lang.c:1718 msgid "# A regular expression that tin will use to find Subject suffixes\n" "# which will be removed when replying or posting followup.\n" msgstr "# Regulaaravaldis, mida tin kasutab teema sufiksi leidmiseks,\n" "# mis eemaldatakse vastuse saatmisel või postitamisel.\n" -#: src/lang.c:1666 +#: src/lang.c:1723 msgid "Enter name and options for external MIME viewer, --internal for built-in " "viewer" msgstr "Sisestage välise MIME lehitseja nimi ja võtmed, sisemise valib --internal" -#: src/lang.c:1667 +#: src/lang.c:1724 msgid "MIME binary content viewer" msgstr "MIME kahendsisu lehitseja" -#: src/lang.c:1668 +#: src/lang.c:1725 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" @@ -4926,383 +4998,465 @@ msgstr "# --internal korral kasuta artik "# Muidu määra automaatseks vaatamiseks väline programm (nt. metamail) või\n" "# jäta tühjaks\n" -#: src/lang.c:1675 +#: src/lang.c:1732 msgid "Confirm before starting non-text viewing program" msgstr "Küsi enne mitte-tekstiliste osade vaatamist kinnitust" -#: src/lang.c:1676 +#: src/lang.c:1733 msgid "Ask before using MIME viewer" msgstr "Küsi MIME lehitseja kasutamise luba" -#: src/lang.c:1677 +#: src/lang.c:1734 msgid "# If ON tin will ask before using metamail to display MIME messages\n" "# this only happens if metamail_prog is set to something\n" msgstr "# Kui väärtus on ON, küsi metamaili kasutamise luba\n" "# see juhtub ainult siis, kui metamail_prog on väärtustatud\n" -#: src/lang.c:1682 +#: src/lang.c:1739 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "Küsi, kas märkida väljumisel grupid loetuks. lülitab ja seab." -#: src/lang.c:1683 +#: src/lang.c:1740 msgid "Catchup read groups when quitting" msgstr "Väljumisel märkida grupid loetuks" -#: src/lang.c:1684 +#: src/lang.c:1741 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "# Kui väärtus on ON, küsi kasutajalt, kas märkida loetud gruppides kõik\n" "# artiklid loetuks\n" -#: src/lang.c:1689 +#: src/lang.c:1746 msgid "Catchup group using left key" msgstr "Nool vasakule märgib grupi loetuks" -#: src/lang.c:1690 +#: src/lang.c:1747 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "# Kui väärtus on ON, märgi grupp/teema loetuks, kui sellest väljutakse\n" "# nool vasakule klahviga.\n" -#: src/lang.c:1695 +#: src/lang.c:1752 msgid "Catchup thread by using left key" msgstr "Nool vasakule märgib teema loetuks" -#: src/lang.c:1701 +#: src/lang.c:1758 msgid "Which actions require confirmation" msgstr "Tegevused mis nõuavad kinnitust" -#: src/lang.c:1702 +#: src/lang.c:1759 msgid "# What should we ask confirmation for.\n" msgstr "# Millele me peaksime küsima kinnitust.\n" -#: src/lang.c:1707 +#: src/lang.c:1764 msgid "'Mark article read' ignores tags" msgstr "'Märgi art. loetuks' eirab märke" -#: src/lang.c:1708 +#: src/lang.c:1765 msgid "# If ON the 'Mark article read' function marks only the current article.\n" msgstr "# Kui väärtus on ON märgib 'Märgi artikkel loetuks' funktsioon ainult\n" "# jooksva artikli.\n" -#: src/lang.c:1712 +#: src/lang.c:1769 msgid "Program to run to open URL's, sets, cancels." msgstr "Programm URLide avamiseks, seab, katkestab." -#: src/lang.c:1713 +#: src/lang.c:1770 msgid "Program that opens URL's" msgstr "Programm URLide avamiseks" -#: src/lang.c:1714 +#: src/lang.c:1771 msgid "# The program used to open URL's. The actual URL will be appended\n" msgstr "# Programm URLide avamiseks. URL lisatakse argumendiks\n" -#: src/lang.c:1719 +#: src/lang.c:1776 msgid "Use mouse in xterm" msgstr "Kasuta xterm aknas hiirt" -#: src/lang.c:1720 +#: src/lang.c:1777 msgid "# If ON enable mouse key support on xterm terminals\n" msgstr "# Kui väärtus on ON, luba xterm aknas hiire tugi\n" -#: src/lang.c:1726 +#: src/lang.c:1783 msgid "Use scroll keys on keypad" msgstr "Kasuta kerimisnuppe" -#: src/lang.c:1727 +#: src/lang.c:1784 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "# Kui väärtus on ON, luba kerimisnuppude kasutamist terminalidel, millel need " "on olemas\n" -#: src/lang.c:1732 +#: src/lang.c:1789 msgid "Enter maximum number of article to get. sets." msgstr "Sisestage suurim laetavate artiklite arv. seab." -#: src/lang.c:1733 +#: src/lang.c:1790 msgid "Number of articles to get" msgstr "Laetavate artiklite arv" -#: src/lang.c:1734 +#: src/lang.c:1791 msgid "# Number of articles to get (0=no limit), if negative sets maximum number\n" "# of already read articles to be read before first unread one\n" msgstr "# Laetavate artiklite arv (0=limiit puudub), negatiivne väärtus seab\n" "# maksimaalse arvu loetud artikleid, mida lugeda enne lugemata artiklit\n" -#: src/lang.c:1739 +#: src/lang.c:1796 msgid "Enter number of days article is considered recent. sets." msgstr "Sisestage artikli värskuse kestus. seab." -#: src/lang.c:1740 +#: src/lang.c:1797 msgid "Article recentness time limit" msgstr "Artikli värskuse ajapiir" -#: src/lang.c:1741 +#: src/lang.c:1798 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "# Päevad, mille jooksul loetakse artiklit värskeks, (0=OFF)\n" -#: src/lang.c:1745 +#: src/lang.c:1802 msgid "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "WILDMAT tavalistele jokkeritele, REGEX täisregulaaravaldistega otsimisele." -#: src/lang.c:1746 +#: src/lang.c:1803 msgid "Wildcard matching" msgstr "Jokkeritega otsimine" -#: src/lang.c:1747 -msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" -msgstr "# Jokkeritega otsimine 0=(wildmat) 1=(regex)\n" +# TRANSLATION MISSING +#: src/lang.c:1804 +msgid "# Wildcard matching\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = wildmat\n" + "# 1 = regex\n" +msgstr "" -#: src/lang.c:1751 +#: src/lang.c:1811 msgid "Enter minimal score before an article is marked killed. sets." msgstr "Sisestage minimaalne kaal artikli surmamiseks. seab." -#: src/lang.c:1752 +#: src/lang.c:1812 msgid "Score limit (kill)" msgstr "Kaalu alampiir (surmamine)" -#: src/lang.c:1753 +#: src/lang.c:1813 msgid "# Score limit before an article is marked killed\n" msgstr "# Kaalu alampiir, enne kui artikkel märgitakse surmatuks\n" -#: src/lang.c:1757 +#: src/lang.c:1817 msgid "Enter default score to kill articles. sets." msgstr "Sisestage vaikimisi kaal artiklite surmamiseks. seab." -#: src/lang.c:1758 +#: src/lang.c:1818 msgid "Default score to kill articles" msgstr "Artiklite surmamise vaikimisi kaal" -#: src/lang.c:1759 +#: src/lang.c:1819 msgid "# Default score to kill articles\n" msgstr "# Vaikimisi kaal artiklite surmamiseks\n" -#: src/lang.c:1763 +#: src/lang.c:1823 msgid "Enter minimal score before an article is marked hot. sets." msgstr "Sisestage minimaalne kaal, enne kui artikkel märgitakse kuumaks. seab." -#: src/lang.c:1764 +#: src/lang.c:1824 msgid "Score limit (select)" msgstr "Kaalu alampiir (valik)" -#: src/lang.c:1765 +#: src/lang.c:1825 msgid "# Score limit before an article is marked hot\n" msgstr "# Kaalu alampiir, enne kui artikkel märgitakse muumaks\n" -#: src/lang.c:1769 +#: src/lang.c:1829 msgid "Enter default score to select articles. sets." msgstr "Sisestage vaikimisi kaal artiklite valimiseks. seab." -#: src/lang.c:1770 +#: src/lang.c:1830 msgid "Default score to select articles" msgstr "Vaikimisi kaal artiklite valimiseks" -#: src/lang.c:1771 +#: src/lang.c:1831 msgid "# Default score to select articles\n" msgstr "# Vaikimisi kaal artiklite valimiseks\n" -#: src/lang.c:1777 +#: src/lang.c:1837 msgid "Use slrnface to show ''X-Face:''s" msgstr "''X-Face:'' näitamiseks slrnface" -#: src/lang.c:1778 +#: src/lang.c:1838 msgid "# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n" "# Only useful when running in an xterm.\n" msgstr "# Kui väärtus on ON, kasutan ''X-Face:'' päiste käsitlemiseks slrnface(1).\n" "# Kasulik ainult xterm aknas.\n" -#: src/lang.c:1786 +#: src/lang.c:1846 msgid "Use ANSI color" msgstr "Kasuta ANSI värve" -#: src/lang.c:1787 +#: src/lang.c:1847 msgid "# If ON using ANSI-color\n" msgstr "# Kui väärtus on ON, kasuta ANSI värve\n" -#: src/lang.c:1792 +#: src/lang.c:1852 msgid "Standard foreground color" msgstr "Standardne esiplaani värv" -#: src/lang.c:1793 +# TRANSLATION OUTDATED +#: src/lang.c:1853 +#, fuzzy msgid "# Standard foreground color\n" + "# Default: -1 (default color)\n" msgstr "# Standardne esiplaani värv\n" -#: src/lang.c:1798 +#: src/lang.c:1859 msgid "Standard background color" msgstr "Standardne tagaplaani värv" -#: src/lang.c:1799 -msgid "# Standard-Background-Color\n" -msgstr "# Standardne tagaplaani värv\n" +# TRANSLATION MISSING +#: src/lang.c:1860 +msgid "# Standard background color\n" + "# Default: -1 (default color)\n" +msgstr "" -#: src/lang.c:1804 +#: src/lang.c:1866 msgid "Color for inverse text (background)" msgstr "Pööratud teksti värv (tagaplaan)" -#: src/lang.c:1805 +# TRANSLATION OUTDATED +#: src/lang.c:1867 +#, fuzzy msgid "# Color of background for inverse text\n" + "# Default: 4 (blue)\n" msgstr "# Pööratud teksti tagaplaani värv\n" -#: src/lang.c:1810 +#: src/lang.c:1873 msgid "Color for inverse text (foreground)" msgstr "Pööratud teksti värv (esiplaan)" -#: src/lang.c:1811 +# TRANSLATION OUTDATED +#: src/lang.c:1874 +#, fuzzy msgid "# Color of foreground for inverse text\n" + "# Default: 7 (white)\n" msgstr "# Pööratud teksti esiplaani värv\n" -#: src/lang.c:1816 +#: src/lang.c:1880 msgid "Color of text lines" msgstr "Tekstiridade värv" -#: src/lang.c:1817 -msgid "# Color of text-lines\n" -msgstr "# Tekstiridade värv\n" +# TRANSLATION MISSING +#: src/lang.c:1881 +msgid "# Color of text lines\n" + "# Default: -1 (default color)\n" +msgstr "" -#: src/lang.c:1822 +#: src/lang.c:1887 msgid "Color of mini help menu" msgstr "Miniabiinfo värv" -#: src/lang.c:1823 +# TRANSLATION OUTDATED +#: src/lang.c:1888 +#, fuzzy msgid "# Color of mini help menu\n" + "# Default: 3 (brown)\n" msgstr "# Miniabiinfo värv\n" -#: src/lang.c:1828 +#: src/lang.c:1894 msgid "Color of help text" msgstr "Abiinfo värv" -#: src/lang.c:1829 +# TRANSLATION MISSING +#: src/lang.c:1895 msgid "# Color of help pages\n" -msgstr "# Abiinfo värv\n" + "# Default: -1 (default color)\n" +msgstr "" -#: src/lang.c:1834 +#: src/lang.c:1901 msgid "Color of status messages" msgstr "Olekuteadete värv" -#: src/lang.c:1835 +# TRANSLATION OUTDATED +#: src/lang.c:1902 +#, fuzzy msgid "# Color of messages in last line\n" + "# Default: 6 (cyan)\n" msgstr "# Viimasel real olevate teadete värv\n" -#: src/lang.c:1840 +#: src/lang.c:1908 msgid "Color of quoted lines" msgstr "Tsitaadi värv" -#: src/lang.c:1841 +# TRANSLATION OUTDATED +#: src/lang.c:1909 +#, fuzzy msgid "# Color of quote-lines\n" + "# Default: 2 (green)\n" msgstr "# Tsitaadi värv\n" -#: src/lang.c:1846 +#: src/lang.c:1915 msgid "Color of twice quoted line" msgstr "Topelt tsiteeritud rea värv" -#: src/lang.c:1847 +# TRANSLATION OUTDATED +#: src/lang.c:1916 +#, fuzzy msgid "# Color of twice quoted lines\n" + "# Default: 3 (brown)\n" msgstr "# Topelt tsiteeritud rea värv\n" -#: src/lang.c:1852 +#: src/lang.c:1922 msgid "Color of =>3 times quoted line" msgstr "=>3 korda tsiteeritud rea värv" -#: src/lang.c:1853 +# TRANSLATION OUTDATED +#: src/lang.c:1923 +#, fuzzy msgid "# Color of >=3 times quoted lines\n" + "# Default: 4 (blue)\n" msgstr "# =>3 korda tsiteeritud rea värv\n" -#: src/lang.c:1858 +#: src/lang.c:1929 msgid "Color of article header lines" msgstr "Artikli päiseridade värv" -#: src/lang.c:1859 +# TRANSLATION OUTDATED +#: src/lang.c:1930 +#, fuzzy msgid "# Color of header-lines\n" + "# Default: 2 (green)\n" msgstr "# Päiseridade värv\n" -#: src/lang.c:1864 +#: src/lang.c:1936 msgid "Color of actual news header fields" msgstr "Artikli tegelike päiseridade värv" -#: src/lang.c:1865 +# TRANSLATION OUTDATED +#: src/lang.c:1937 +#, fuzzy msgid "# Color of actual news header fields\n" + "# Default: 9 (light red)\n" msgstr "# Artikli tegelike päiseridade värv\n" -#: src/lang.c:1870 +#: src/lang.c:1943 msgid "Color of article subject lines" msgstr "Artikli teemarea värv" -#: src/lang.c:1871 +# TRANSLATION OUTDATED +#: src/lang.c:1944 +#, fuzzy msgid "# Color of article subject\n" + "# Default: 6 (cyan)\n" msgstr "# Artikli teema värv\n" -#: src/lang.c:1876 +#: src/lang.c:1950 msgid "Color of response counter" msgstr "Vastuste arvu loenduri värv" -#: src/lang.c:1877 +# TRANSLATION OUTDATED +#: src/lang.c:1951 +#, fuzzy msgid "# Color of response counter\n" + "# Default: 2 (green)\n" msgstr "# Vastuste arvu loenduri värv\n" -#: src/lang.c:1882 +#: src/lang.c:1957 msgid "Color of sender (From:)" msgstr "Saatja värv (From:)" -#: src/lang.c:1883 +# TRANSLATION OUTDATED +#: src/lang.c:1958 +#, fuzzy msgid "# Color of sender (From:)\n" + "# Default: 2 (green)\n" msgstr "# Saatja värv (From:)\n" -#: src/lang.c:1888 +#: src/lang.c:1964 msgid "Color of help/mail sign" msgstr "Abiinfo/kirja teate värv" -#: src/lang.c:1889 +# TRANSLATION OUTDATED +#: src/lang.c:1965 +#, fuzzy msgid "# Color of Help/Mail-Sign\n" + "# Default: 4 (blue)\n" msgstr "# Abiinfo/kirja teate värv\n" -#: src/lang.c:1894 +#: src/lang.c:1971 msgid "Color of signatures" msgstr "Signatuuri värv" -#: src/lang.c:1895 +# TRANSLATION OUTDATED +#: src/lang.c:1972 +#, fuzzy msgid "# Color of signature\n" + "# Default: 4 (blue)\n" msgstr "# Signatuuri värv\n" # TRANSLATION MISSING -#: src/lang.c:1900 +#: src/lang.c:1978 msgid "Color of highlighted URLs" msgstr "" # TRANSLATION MISSING -#: src/lang.c:1901 +#: src/lang.c:1979 msgid "# Color of highlighted URLs\n" + "# Default: -1 (default color)\n" msgstr "" -#: src/lang.c:1906 +#: src/lang.c:1985 msgid "Color of highlighting with *stars*" msgstr "*tärnidega* esiletõstmise värv" -#: src/lang.c:1907 -msgid "# Color of word highlighting. There are four possibilities\n" - "# in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n" -msgstr "# Sõnade esiletõstmise värv. Artiklites saab kasutada nelja võimalust:\n" - "# *tärnid*, /kaldkriipsud/, _alakriipsud_ ja -kriipsud-.\n" +# TRANSLATION MISSING +#: src/lang.c:1986 +msgid "# Color of word highlighting with *stars*\n" + "# Default: 11 (yellow)\n" +msgstr "" -#: src/lang.c:1913 +#: src/lang.c:1992 msgid "Color of highlighting with _dash_" msgstr "_alakriipsudega_ esiletõstmise värv" -#: src/lang.c:1919 +# TRANSLATION MISSING +#: src/lang.c:1993 +msgid "# Color of word highlighting with _dash_\n" + "# Default: 13 (light pink)\n" +msgstr "" + +#: src/lang.c:1999 msgid "Color of highlighting with /slash/" msgstr "/Kaldkriipsude/ esiletõstmise värv" -#: src/lang.c:1925 +# TRANSLATION MISSING +#: src/lang.c:2000 +msgid "# Color of word highlighting with /slash/\n" + "# Default: 14 (light cyan)\n" +msgstr "" + +#: src/lang.c:2006 msgid "Color of highlighting with -stroke-" msgstr "-Kriipsudega- esiletõstmise värv" -#: src/lang.c:1932 +# TRANSLATION MISSING +#: src/lang.c:2007 +msgid "# Color of word highlighting with -stroke-\n" + "# Default: 12 (light blue)\n" +msgstr "" + +#: src/lang.c:2014 msgid "Attr. of highlighting with *stars*" msgstr "*tärnidega* esiletõstmise atribuut" -#: src/lang.c:1933 -msgid "# Attribute of word highlighting on mono terminals.\n" - "# There are four possibilities in articles:\n" - "# *stars*, /slashes/, _underdashes_ and -strokes-.\n" - "# The possible values are:\n" - "# 0 - Normal, 1 - Underline, 2 - Best highlighting,\n" - "# 3 - Reverse video, 4 - Blinking, 5 - Half bright, 6 - Bold\n" +# TRANSLATION OUTDATED +#: src/lang.c:2015 +#, fuzzy +msgid "# Attributes of word highlighting on mono terminals\n" + "# Possible values are:\n" + "# 0 = Normal\n" + "# 1 = Underline\n" + "# 2 = Best highlighting\n" + "# 3 = Reverse video\n" + "# 4 = Blinking\n" + "# 5 = Half bright\n" + "# 6 = Bold\n" + "\n" + "# Attribute of word highlighting with *stars*\n" + "# Default: 6 (bold)\n" msgstr "# Sõnade esiletõstmise atribuut mono terminalidel.\n" "# Artiklites on neli võimalust:\n" "# *tärnid*, /kaldkriipsud/, _alakriipsud_ ja -kriipsud-.\n" @@ -5310,95 +5464,118 @@ msgstr "# Sõnade esiletõstmise atribuut "# 0 - Tavaline, 1 - Allajoonitud, 2 - Parim esiletõstmine,\n" "# 3 - Pööratud video, 4 - Plinkiv, 5 - Poolhele, 6 - Paks\n" -#: src/lang.c:1943 +#: src/lang.c:2030 msgid "Attr. of highlighting with _dash_" msgstr "_alakriipsudega_ esiletõstmise atr." -#: src/lang.c:1949 +# TRANSLATION MISSING +#: src/lang.c:2031 +msgid "# Attribute of word highlighting with _dash_\n" + "# Default: 2 (best highlighting)\n" +msgstr "" + +#: src/lang.c:2037 msgid "Attr. of highlighting with /slash/" msgstr "/Kaldkriipsude/ esiletõstmise atr." -#: src/lang.c:1955 +# TRANSLATION MISSING +#: src/lang.c:2038 +msgid "# Attribute of word highlighting with /slash/\n" + "# Default: 5 (half bright)\n" +msgstr "" + +#: src/lang.c:2044 msgid "Attr. of highlighting with -stroke-" msgstr "-Kriipsudega- esiletõstmise atr." -#: src/lang.c:1961 +# TRANSLATION MISSING +#: src/lang.c:2045 +msgid "# Attribute of word highlighting with -stroke-\n" + "# Default: 3 (reverse video)\n" +msgstr "" + +#: src/lang.c:2051 msgid "URL highlighting in message body" msgstr "Teate kehas URL esiletõstmine" -#: src/lang.c:1962 +#: src/lang.c:2052 msgid "# Enable URL highlighting?\n" msgstr "# Luba URLide esiletõstmine?\n" -#: src/lang.c:1967 +#: src/lang.c:2057 msgid "Word highlighting in message body" msgstr "Sõnade esiletõstmine teate kehas" -#: src/lang.c:1968 +#: src/lang.c:2058 msgid "# Enable word highlighting?\n" msgstr "# Lubada sõnade esiletõstmine?\n" -#: src/lang.c:1973 +#: src/lang.c:2063 msgid "What to display instead of mark" msgstr "Mida näidata märgi asemel" -#: src/lang.c:1974 +# TRANSLATION OUTDATED +#: src/lang.c:2064 +#, fuzzy msgid "# Should the leading and ending stars and dashes also be displayed,\n" "# even when they are highlighting marks?\n" - "# 0 - no 1 - yes, display mark 2 - print a space instead\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = no\n" + "# 1 = yes, display mark\n" + "# * 2 = print a space instead\n" msgstr "# Kas näidata algavaid ja lõppevaid tärne ja kriipse,\n" "# isegi, kui need on ka esiletõstmise märgid?\n" "# 0 - ei 1 - jah, näita märki 2 - trüki hoopis tühik\n" -#: src/lang.c:1980 +#: src/lang.c:2073 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "Sisestage veerg, millelt lehitseja hakkab ridu murdma. seab." -#: src/lang.c:1981 +#: src/lang.c:2074 msgid "Page line wrap column" msgstr "Rea murdmise veerg lehitsejas" -#: src/lang.c:1982 +#: src/lang.c:2075 msgid "# Wrap article lines at column\n" msgstr "# Murra artikli read antud veerus\n" -#: src/lang.c:1987 +#: src/lang.c:2080 msgid "Wrap around threads on next unread" msgstr "Liigu lugemata art-le ümber teemade" -#: src/lang.c:1988 +#: src/lang.c:2081 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "# Kui väärtus on ON, liigu lugemata artiklite otsingul ümber teemade\n" -#: src/lang.c:1992 +#: src/lang.c:2085 msgid "Enter default mail address (and fullname). sets." msgstr "Sisestage oma e-posti aadress (ja oma nimi). seab." -#: src/lang.c:1993 +#: src/lang.c:2086 msgid "Mail address (and fullname)" msgstr "E-posti aadress (ja teie nimi)" -#: src/lang.c:1994 +#: src/lang.c:2087 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "# Kasutaja e-posti aadress (ja nimi), kui ei ole kasutaja@host (nimi)\n" -#: src/lang.c:1999 +#: src/lang.c:2092 msgid "Show empty Followup-To in editor" msgstr "Näita toimetis tühja Followup-To" -#: src/lang.c:2000 +#: src/lang.c:2093 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "# Kui väärtus on ON, näita artikli toimetamisel tühja Followup-To rida\n" -#: src/lang.c:2004 +#: src/lang.c:2097 msgid "Enter path/! command/--none to create your default signature. sets." msgstr "Sisestage tee/! käsk/--none, et luua oma vaikimisi signatuur. seab." -#: src/lang.c:2005 +#: src/lang.c:2098 msgid "Create signature from path/command" msgstr "Signatuuri loomiseks tee/käsk" -#: src/lang.c:2006 +#: src/lang.c:2099 msgid "# Signature path (random sigs)/file to be used when posting/replying\n" "# default_sigfile=file appends file as signature\n" "# default_sigfile=!command executes external command to generate a " @@ -5409,58 +5586,61 @@ msgstr "# Postitamisel/vastamisel kasuta "# default_sigfile=!käsk käivitab käsu, mis genereerib signatuuri\n" "# default_sigfile=--none ära lisa signatuuri\n" -#: src/lang.c:2013 +#: src/lang.c:2106 msgid "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "Signatuurile eelnevale reale \"-- \". lülitab, seab." -#: src/lang.c:2014 +#: src/lang.c:2107 msgid "Prepend signature with \"-- \"" msgstr "Lisa signatuuri ette \"-- \"" -#: src/lang.c:2015 +#: src/lang.c:2108 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "# Kui väärtus on ON, lisa signatuuri ette '\\n-- \\n'\n" -#: src/lang.c:2019 +#: src/lang.c:2112 msgid "Add signature when reposting articles. toggles & sets." msgstr "Lisa artikli uuestipostitamisel signatuur. lülitab, seab." -#: src/lang.c:2020 +#: src/lang.c:2113 msgid "Add signature when reposting" msgstr "Lisa uuestipostitusel signatuur" -#: src/lang.c:2021 +#: src/lang.c:2114 msgid "# If ON add signature to reposted articles\n" msgstr "# Kui väärtus on ON, lisa uuestipostitatud artiklile signatuur\n" -#: src/lang.c:2025 +#: src/lang.c:2118 msgid "Enter quotation marks, %s or %S for author's initials." msgstr "Sisestage tsitaadimärgid, %s või %S annab autori initsiaalid." -#: src/lang.c:2026 +#: src/lang.c:2119 msgid "Characters used as quote-marks" msgstr "Tsiteerimise märgid" -#: src/lang.c:2027 +#: src/lang.c:2120 msgid "# Characters used in quoting to followups and replies.\n" "# '_' is replaced by ' ', %%s, %%S are replaced by author's initials.\n" msgstr "# Sümbolid, mida kasutada tsiteerimisel vastustes.\n" "# '_' asendatakse tühikuga ' ', %%s, %%S asendatakse autori initsiaalidega.\n" -#: src/lang.c:2033 +#: src/lang.c:2126 msgid "Quoting behavior" msgstr "Käitumine tsiteerimisel" -#: src/lang.c:2034 +# TRANSLATION OUTDATED +#: src/lang.c:2127 +#, fuzzy msgid "# How quoting should be handled when following up or replying.\n" - "# 0 = Nothing special\n" - "# 1 = Compress quotes\n" - "# 2 = Quote signatures\n" - "# 3 = Compress quotes, quote signatures\n" - "# 4 = Quote empty lines\n" - "# 5 = Compress quotes, quote empty lines\n" - "# 6 = Quote signatures, quote empty lines\n" - "# 7 = Compress quotes, quote signatures, quote empty lines\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = Nothing special\n" + "# 1 = Compress quotes\n" + "# 2 = Quote signatures\n" + "# 3 = Compress quotes, quote signatures\n" + "# 4 = Quote empty lines\n" + "# * 5 = Compress quotes, quote empty lines\n" + "# 6 = Quote signatures, quote empty lines\n" + "# 7 = Compress quotes, quote signatures, quote empty lines\n" msgstr "# Kuidas käsitleda vastamisel tsitaate.\n" "# 0 = Ei tee midagi erilist\n" "# 1 = Tihenda tsitaadid\n" @@ -5471,15 +5651,15 @@ msgstr "# Kuidas käsitleda vastamisel ts "# 6 = Tsiteeri allkirju, tsiteeri tühje ridu\n" "# 7 = Tihenda tsitaadid, tsiteeri allkirju, tsiteeri tühje ridu\n" -#: src/lang.c:2046 src/lang.c:2054 src/lang.c:2060 +#: src/lang.c:2140 src/lang.c:2148 src/lang.c:2154 msgid "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "%A Aadr. %D Kuup. %F Aadr.+Nimi %G Grupp %M Message-ID %N Nimi %C Eesnimi" -#: src/lang.c:2047 +#: src/lang.c:2141 msgid "Quote line when following up" msgstr "Tsiteerimise rida vastamisel" -#: src/lang.c:2048 +#: src/lang.c:2142 msgid "# Format of quote line when mailing/posting/following-up an article\n" "# %%A Address %%D Date %%F Addr+Name %%G Groupname %%M Message-ID\n" "# %%N Full Name %%C First Name %%I Initials\n" @@ -5487,35 +5667,35 @@ msgstr "# Tsiteeriva rea vorming artikli "# %%A Aadress %%D Kuup %%F Aadr+Nimi %%G Grupp %%M Message-ID\n" "# %%N Täielik nimi %%C Eesnimi %%I Initsiaalid\n" -#: src/lang.c:2055 +#: src/lang.c:2149 msgid "Quote line when cross-posting" msgstr "Tsiteerimise rida ristpostitusel" -#: src/lang.c:2061 +#: src/lang.c:2155 msgid "Quote line when mailing" msgstr "Tsiteerimise rida kirjutamisel" -#: src/lang.c:2066 +#: src/lang.c:2160 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "Kasuta User-Agent: päiserida. lülitab, seab." -#: src/lang.c:2067 +#: src/lang.c:2161 msgid "Insert 'User-Agent:'-header" msgstr "Sisestage 'User-Agent:'-päis" -#: src/lang.c:2068 +#: src/lang.c:2162 msgid "# If ON include advertising User-Agent: header\n" msgstr "# Kui väärtus on ON, lisa artikli päisesse User-Agent: rida\n" -#: src/lang.c:2073 +#: src/lang.c:2167 msgid "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "Sisestage MIME kooditabeli nimi (n. US-ASCII, ISO-8859-15, EUC-KR), seab." -#: src/lang.c:2074 +#: src/lang.c:2168 msgid "MM_CHARSET" msgstr "MM_CHARSET" -#: src/lang.c:2075 +#: src/lang.c:2169 msgid "# Charset supported locally which is also used for MIME header and\n" "# Content-Type header.\n" "# If not set, the value of the environment variable MM_CHARSET is used.\n" @@ -5531,27 +5711,27 @@ msgstr "# Lokaalselt toetatud kooditabel "# loetakse mm_charset väärtusest erinev kooditabel mitte-näidatavaks\n" "# ja näitamisel kasutatakse '?'.\n" -#: src/lang.c:2085 +#: src/lang.c:2179 msgid "MM_NETWORK_CHARSET" msgstr "MM_NETWORK_CHARSET" -#: src/lang.c:2086 +#: src/lang.c:2180 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "# Postituste MIME (Content-Type) päises kasutatav kooditabel.\n" -#: src/lang.c:2092 +#: src/lang.c:2186 msgid "Mailbox format" msgstr "Kirjade kataloog" -#: src/lang.c:2093 +#: src/lang.c:2187 msgid "# Format of the mailbox.\n" msgstr "# Kirjade kataloog.\n" -#: src/lang.c:2098 +#: src/lang.c:2192 msgid "MIME encoding in news messages" msgstr "Kasuta artiklites MIME kodeerimist" -#: src/lang.c:2099 +#: src/lang.c:2193 msgid "# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n" "# for mails and posts, if necessary. QP is efficient for most European\n" "# character sets (ISO-8859-X) with small fraction of non-US-ASCII chars,\n" @@ -5563,15 +5743,15 @@ msgstr "# Vajadusel kirjade ja artiklite "# Base64 on kasulik enamuse 8 bitistele ida-aasia, kreeka ja vene\n" "# kooditabelitele, kus kasutatakse palju 8 bitiseid sümboleid.\n" -#: src/lang.c:2107 src/lang.c:2128 +#: src/lang.c:2201 src/lang.c:2222 msgid "Don't change unless you know what you are doing. cancels." msgstr "Ärge muutke, kui te ei tea, mida teete. katkestab." -#: src/lang.c:2108 +#: src/lang.c:2202 msgid "Use 8bit characters in news headers" msgstr "Kasuta artikli päises 8bit tähti" -#: src/lang.c:2109 +#: src/lang.c:2203 msgid "# If ON, 8bit characters in news headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" "# 8bit chars in header are encoded regardless of the value of this\n" @@ -5581,28 +5761,28 @@ msgstr "# Kui väärtus on ON, 8bit sümbol "# 8bit sümbolid päistes kodeeritakse sõltumata selle parameetri väärtusest,\n" "# v.a. juhul, kui post_mime_encoding väärtus on samuti 8bit.\n" -#: src/lang.c:2116 +#: src/lang.c:2210 msgid "Auto-view post-processed files toggles, sets, cancels." msgstr "Vaata töödeldud faile automaatselt lülitab, seab, " "katkestab." -#: src/lang.c:2117 +#: src/lang.c:2211 msgid "View post-processed files" msgstr "Vaata töödeldud faile" -#: src/lang.c:2118 +#: src/lang.c:2212 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "# Kui on seatud, avatakse töödeldud fail vaatamiseks\n" -#: src/lang.c:2123 +#: src/lang.c:2217 msgid "MIME encoding in mail messages" msgstr "Kasuta kirjades MIME kodeerimist" -#: src/lang.c:2129 +#: src/lang.c:2223 msgid "Use 8bit characters in mail headers" msgstr "Kasuta kirja päises 8bit tähti" -#: src/lang.c:2130 +#: src/lang.c:2224 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 " @@ -5617,25 +5797,25 @@ msgstr "# Kui väärtus on ON, 8bit sümbol "# et RFC 2822 keelab 8bit sümbolid kirjade päistes, seega selle\n" "# parameetri väärtus ON ei ole soovitatav kasutada.\n" -#: src/lang.c:2140 +#: src/lang.c:2234 msgid "Strip blanks from ends of lines" msgstr "Eemalda tühikud realõppudest" -#: src/lang.c:2141 +#: src/lang.c:2235 msgid "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" msgstr "# Kui väärtus on ON, eemalda aeglaste terminalise töö kiirendamiseks\n" "# realõppudest tühikud.\n" -#: src/lang.c:2146 +#: src/lang.c:2240 msgid "If ON, use transliteration. toggles & sets." msgstr "Kui väärtus on ON, kasuta transliteratsiooni. lülitab, seab." -#: src/lang.c:2147 +#: src/lang.c:2241 msgid "Transliteration" msgstr "Transliteratsioon" -#: src/lang.c:2148 +#: src/lang.c:2242 msgid "# If ON, use //TRANSLIT extension. This means that when a character cannot\n" "# be represented in the in the target character set, it can be approximated\n" "# through one or several similarly looking characters.\n" @@ -5644,245 +5824,250 @@ msgstr "# Kui väärtus on ON, kasuta //TR "kasutades\n" "# üht või enamat sarnast sümbolit.\n" -#: src/lang.c:2155 +#: src/lang.c:2249 msgid "Send you a carbon copy automatically. toggles & sets." msgstr "Saada kasutajale automaatselt koopia. lülitab, seab." -#: src/lang.c:2156 +#: src/lang.c:2250 msgid "Send you a cc automatically" msgstr "Saada automaatselt koopia" -#: src/lang.c:2157 +#: src/lang.c:2251 msgid "# If ON automatically put your name in the Cc: field when mailing an article\n" msgstr "# Kui väärtus on ON, pane kasutaja nimi artikli saatmisel automaatselt\n" "# Cc: reale\n" -#: src/lang.c:2161 +#: src/lang.c:2255 msgid "Send you a blind carbon copy automatically. toggles & sets." msgstr "Saada automaatselt pimekoopia. lülitab, seab." -#: src/lang.c:2162 +#: src/lang.c:2256 msgid "Send you a blind cc automatically" msgstr "Saada automaatselt pimekoopia" -#: src/lang.c:2163 +#: src/lang.c:2257 msgid "# If ON automatically put your name in the Bcc: field when mailing an " "article\n" msgstr "# Kui väärtus on ON, pane kasutaja nimi artikli saatmisel automaatselt\n" "# Bcc: väljale\n" -#: src/lang.c:2167 +#: src/lang.c:2261 msgid "Enter address elements about which you want to be warned. sets." msgstr "Sisestage aadressi komponendid, mille eest peaks hoiatama. seab." -#: src/lang.c:2168 +#: src/lang.c:2262 msgid "Spamtrap warning address parts" msgstr "Rämpsposti hoiatus aadressi osadele" -#: src/lang.c:2169 +#: src/lang.c:2263 msgid "# A comma-delimited list of address-parts you want to be warned\n" "# about when trying to reply by email.\n" msgstr "# Komaga eraldatud aadresside komponentide loend, mille kasutamisel\n" "# tuleks kasutajat hoiatada.\n" -#: src/lang.c:2174 +#: src/lang.c:2268 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "Sisestage kirje kehtivuse aeg päevades. seab." -#: src/lang.c:2175 +#: src/lang.c:2269 msgid "No. of days a filter entry is valid" msgstr "Filtri kehtivus päevades" -#: src/lang.c:2176 +#: src/lang.c:2270 msgid "# Number of days a short term filter will be active\n" msgstr "# lühiajalise filtri kehtivus päevades\n" -#: src/lang.c:2180 +#: src/lang.c:2274 msgid "Add posted articles to filter. toggles & sets." msgstr "Lisage postitatud artikkel filtrisse. lülitab, seab." -#: src/lang.c:2181 +#: src/lang.c:2275 msgid "Add posted articles to filter" msgstr "Lisage postitatud artikkel filtrile" -#: src/lang.c:2182 +#: src/lang.c:2276 msgid "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" msgstr "# Kui väärtus on ON, lisa postitatud artiklid, mis alustavad uut teemat,\n" "# filtrile, mis märgistab vastuseid\n" -#: src/lang.c:2186 +#: src/lang.c:2280 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "Kataloog, kuhu artikleid/teemasid salvestatakse kirjaformaadis." -#: src/lang.c:2187 +#: src/lang.c:2281 msgid "Mail directory" msgstr "Kirjade kataloog" -#: src/lang.c:2188 +#: src/lang.c:2282 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "# (-m) kataloog, kuhu artikleid/teemasid salvestatakse kirjaformaadis\n" -#: src/lang.c:2193 +#: src/lang.c:2287 msgid "Save articles in batch mode (-S)" msgstr "Salvesta artiklid pakettmoodis (-S)" -#: src/lang.c:2194 +#: src/lang.c:2288 msgid "# If ON articles/threads will be saved in batch mode when save -S\n" "# or mail (-M/-N) is specified on the command line\n" msgstr "# Kui väärtus on ON, artiklid salvestatakse pakettmoodis, kui käsureal\n" "# on kasutatud võtmeid salvestamiseks -S või saatmiseks -M, -N\n" -#: src/lang.c:2199 +#: src/lang.c:2293 msgid "The directory where you want articles/threads saved." msgstr "Kataloog, kuhu te soovite artikleid salvestada." -#: src/lang.c:2200 +#: src/lang.c:2294 msgid "Directory to save arts/threads in" msgstr "Kataloog artiklite salvestamiseks" -#: src/lang.c:2201 +#: src/lang.c:2295 msgid "# Directory where articles/threads are saved\n" msgstr "# Kataloog, kuhu salvestatakse artiklid/teemad\n" -#: src/lang.c:2205 +#: src/lang.c:2299 msgid "Auto save article/thread by Archive-name: header. toggles & sets." msgstr "Salvesta artiklid Archive-name: päiserea järgi. lülitab, seab." -#: src/lang.c:2206 +#: src/lang.c:2300 msgid "Use Archive-name: header for save" msgstr "Kasuta salvestamisel Archive-name:" -#: src/lang.c:2207 +#: src/lang.c:2301 msgid "# If ON articles/threads with Archive-name: in mail header will\n" "# be automatically saved with the Archive-name & part/patch no.\n" msgstr "# Kui väärtus on ON, salvestatakse artiklid/teemad, mis omavad päiserida\n" "# Archive-name:, automaatselt selle reaga määratud nime ja osa numbriga.\n" -#: src/lang.c:2212 +#: src/lang.c:2306 msgid "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "Märgi salvestatud artiklid loetuks. lülitab, seab, " "katkestab." -#: src/lang.c:2213 +#: src/lang.c:2307 msgid "Mark saved articles/threads as read" msgstr "Märgi salvestatud artiklid loetuks" -#: src/lang.c:2214 +#: src/lang.c:2308 msgid "# If ON mark articles that are saved as read\n" msgstr "# Kui väärtus on ON, märgi salvestatud artiklid loetuks\n" -#: src/lang.c:2218 +#: src/lang.c:2312 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "Teosta salvestatud artiklitel järeltöötlemist (nt. lisade eraldamist)." -#: src/lang.c:2219 +#: src/lang.c:2313 msgid "Post process saved articles" msgstr "Salvestatud artikl. järeltöötlemine" -#: src/lang.c:2220 +# TRANSLATION OUTDATED +#: src/lang.c:2314 +#, fuzzy msgid "# Perform post processing (saving binary attachments) from saved articles.\n" - "# 0=(no) 1=(yes) 2=(extract shell archives (shar) only)\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = no\n" + "# 1 = extract shell archives (shar) only\n" + "# 2 = yes\n" msgstr "# Teosta salvestatud artiklite järeltöötlemist (lisade eraldamine).\n" "# 0=(ei) 1=(jah) 2=(eralda ainult shelli arhiivid (shar))\n" -#: src/lang.c:2226 +#: src/lang.c:2323 msgid "Process only unread articles" msgstr "Töötle ainult lugemata artikleid" -#: src/lang.c:2227 +#: src/lang.c:2324 msgid "# If ON only save/print/pipe/mail unread articles (tagged articles excepted)\n" msgstr "# Kui väärtus on ON, salvesta/trüki/torusse/saada lugemata artikleid\n" "# (eeldatakse märgitud artikleid).\n" -#: src/lang.c:2232 +#: src/lang.c:2329 msgid "Print all or just part of header. toggles & sets." msgstr "Trüki kõik või ainult osa päisest. lülitab, seab." -#: src/lang.c:2233 +#: src/lang.c:2330 msgid "Print all headers when printing" msgstr "Trükkimisel trüki kõik päised" -#: src/lang.c:2234 +#: src/lang.c:2331 msgid "# If ON print all of article header otherwise just the important lines\n" msgstr "# Kui väärtus on ON, trüki kogu artikli päis, muidu ainult tähtsamad read\n" -#: src/lang.c:2238 +#: src/lang.c:2335 msgid "The printer program with options that is to be used to print articles/threads." msgstr "Programm koos argumentidega, mida kasutatakse artiklite/teemade trükkimiseks." -#: src/lang.c:2239 +#: src/lang.c:2336 msgid "Printer program with options" msgstr "Trükikäsk koos võtmetega" -#: src/lang.c:2240 +#: src/lang.c:2337 msgid "# Print program with parameters used to print articles/threads\n" msgstr "# Programm koos argumentidega, mida kasutatakse artiklite/teemade " "trükkimiseks\n" -#: src/lang.c:2246 +#: src/lang.c:2343 msgid "Force redraw after certain commands" msgstr "Värskenda ekraani peale käske" -#: src/lang.c:2247 +#: src/lang.c:2344 msgid "# If ON a screen redraw will always be done after certain external commands\n" msgstr "# Kui väärtus on ON, värskendatakse alati peale teatud väliseid käske " "ekraani\n" -#: src/lang.c:2251 +#: src/lang.c:2348 msgid "Start editor with line offset. toggles, sets, cancels." msgstr "Käivita tekstitoimeti etteantud real. lülitab, seab, " "katkestab." -#: src/lang.c:2252 +#: src/lang.c:2349 msgid "Start editor with line offset" msgstr "Käivita tekstitoimeti reanumbril" -#: src/lang.c:2253 +#: src/lang.c:2350 msgid "# If ON editor will be started with cursor offset into the file\n" "# otherwise the cursor will be positioned at the first line\n" msgstr "# Kui väärtus on ON, käivitatakse tekstitoimeti kursori paigutamisega\n" "# vastavale reale. Vastasel korral positsioneeritakse kursor esimesele reale\n" -#: src/lang.c:2258 +#: src/lang.c:2355 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "Kasutage %E toimeti kohal, %F failinime kohal, %N reanumbrina, seab." -#: src/lang.c:2259 +#: src/lang.c:2356 msgid "Invocation of your editor" msgstr "Teie tekstitoimeti" -#: src/lang.c:2260 +#: src/lang.c:2357 msgid "# Format of editor line including parameters\n" "# %%E Editor %%F Filename %%N Linenumber\n" msgstr "# Tekstitoimeti rea formaat koos parameetritega\n" "# %%E Toimeti %%F Failinimi %%N Reanumber\n" -#: src/lang.c:2265 +#: src/lang.c:2362 msgid "Enter name and options for external-inews, --internal for internal inews" msgstr "Sisestage välise inews käsu nimi ja võtmed, sisemise valib --internal" -#: src/lang.c:2266 +#: src/lang.c:2363 msgid "External inews" msgstr "Väline inews" -#: src/lang.c:2267 +#: src/lang.c:2364 msgid "# If --internal use the built in mini inews for posting via NNTP\n" "# otherwise use an external inews program\n" msgstr "# Kui on --internal, kasuta NNTP postitustel sisseehitatud inews käsku\n" "# muidu kasuta välist inews programmi\n" -#: src/lang.c:2271 +#: src/lang.c:2368 msgid "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "Kasutage %M programmi kohal, %S teema kohal, %T saaja kohal, %F failinime " "kohal, seab." -#: src/lang.c:2272 +#: src/lang.c:2369 msgid "Invocation of your mail command" msgstr "Teie e-posti käsk" -#: src/lang.c:2273 +#: src/lang.c:2370 msgid "# Format of mailer line including parameters\n" "# %%M Mailer %%S Subject %%T To %%F Filename\n" "# ie. to use elm as your mailer: elm -s \"%%S\" \"%%T\" < %%F\n" @@ -5892,149 +6077,162 @@ msgstr "# e-posti saatja käsurea formaat "# näiteks. kasutada saatjana elm programmi: elm -s \"%%S\" \"%%T\" < %%F\n" "# näiteks. elm interaktiivses moodis : elm -i %%F -s \"%%S\" \"%%T\"\n" -#: src/lang.c:2281 +#: src/lang.c:2378 msgid "Use interactive mail reader" msgstr "Kasuta interaktiivset e-posti" -#: src/lang.c:2282 -msgid "# Interactive mailreader:\n" - "# 0 = no interactive mailreader\n" - "# 1 = use interactive mailreader with headers in file\n" - "# 2 = use interactive mailreader without headers in file\n" +# TRANSLATION OUTDATED +#: src/lang.c:2379 +#, fuzzy +msgid "# Interactive mailreader\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = no interactive mailreader\n" + "# 1 = use interactive mailreader with headers in file\n" + "# 2 = use interactive mailreader without headers in file\n" msgstr "# Interaktiivne e-posti programm:\n" "# 0 = interaktiivset e-posti programmi pole\n" "# 1 = kasuta interaktiivset e-posti programmi koos päistega failiga\n" "# 2 = kasuta interaktiivset e-posti programmi koos päisteta failiga\n" -#: src/lang.c:2290 +#: src/lang.c:2388 msgid "Remove ~/.article after posting" msgstr "Eemalda ~/.article peale postitust" -#: src/lang.c:2291 +#: src/lang.c:2389 msgid "# If ON remove ~/.article after posting.\n" msgstr "# Kui väärtus on ON, kustuta ~/.article peale postitust.\n" -#: src/lang.c:2295 +#: src/lang.c:2393 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "Failinimi postitatud artiklitele. seab. Nime puudumisel ei salvestata." -#: src/lang.c:2296 +#: src/lang.c:2394 msgid "Filename for posted articles" msgstr "Failinimi postitatud artiklitele" -#: src/lang.c:2297 +#: src/lang.c:2395 msgid "# Filename where to keep all postings (default posted)\n" "# If no filename is set then postings will not be saved\n" msgstr "# Failinimi, kus hoida kõiki postitusi (vaikimisi posted)\n" "# Kui nime pole, siis postitusi ei salvestata\n" -#: src/lang.c:2302 +#: src/lang.c:2400 msgid "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "Hoia ebaõnnestunud postitused failis ~/dead.articles. lülitab ja " "seab." -#: src/lang.c:2303 +#: src/lang.c:2401 msgid "Keep failed arts in ~/dead.articles" msgstr "Vigased artiklid ~/dead.articles" -#: src/lang.c:2304 +#: src/lang.c:2402 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "# Kui väärtus on ON, hoia ebaõnnestunud postitused failis ~/dead.articles\n" -#: src/lang.c:2308 +#: src/lang.c:2406 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "Kas te soovite eemaldada tellimata grupid .newsrc failist" -#: src/lang.c:2309 +#: src/lang.c:2407 msgid "No unsubscribed groups in newsrc" msgstr "newsrcs ainult tellitud grupid" -#: src/lang.c:2310 +#: src/lang.c:2408 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "# Kui väärtus on ON, eemalda tellimata grupid newsrc failist\n" -#: src/lang.c:2315 +#: src/lang.c:2413 msgid "Remove bogus groups from newsrc" msgstr "Eemalda olematud grupid newsrcst" -#: src/lang.c:2316 +# TRANSLATION OUTDATED +#: src/lang.c:2414 +#, fuzzy msgid "# What to do with bogus groups in newsrc file\n" - "# 0=(Keep) 1=(Remove) 2=(Highlight with D on selection screen).\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = keep\n" + "# 1 = remove\n" + "# 2 = highlight with D on selection screen\n" msgstr "# Mida teha olematute gruppidega newsrc failis\n" "# 0 =(Hoia alles) 1=(Eemalda) 2=(Märgi valikuekraanil D lipuga).\n" -#: src/lang.c:2320 +#: src/lang.c:2422 msgid "Enter number of seconds until active file will be reread. sets." msgstr "Sisestage aktiivsete faili lugemise intervall sekundites. seab." -#: src/lang.c:2321 +#: src/lang.c:2423 msgid "Interval in secs to reread active" msgstr "Aktiivsete faili lugemise intervall" -#: src/lang.c:2322 +#: src/lang.c:2424 msgid "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "# Aktiivsete faili lugemise intervall (0 = ei loe)\n" -#: src/lang.c:2327 +#: src/lang.c:2429 msgid "Reconnect to server automatically" msgstr "Taasta automaatselt NNTP ühendus" -#: src/lang.c:2328 +#: src/lang.c:2430 msgid "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "# Kui väärtus on ON, ürita NNTP serveriga ühenduse katkemisel ühendust\n" "# automaatselt taastada\n" -#: src/lang.c:2332 +#: src/lang.c:2434 msgid "Create local copies of NNTP overview files. toggles & sets." msgstr "Loo NNTP overview failidest lokaalne koopia. lülitab ja seab." -#: src/lang.c:2333 +#: src/lang.c:2435 msgid "Cache NNTP overview files locally" msgstr "Puhverda NNTP overview lokaalselt" -#: src/lang.c:2334 +#: src/lang.c:2436 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "# Kui väärtus on ON, loo NNTP overview failidest lokaalsed koopiad.\n" -#: src/lang.c:2338 +#: src/lang.c:2440 msgid "Enter format string. sets, cancels." msgstr "Sisestage vormingusõne. seab, katkestab." -#: src/lang.c:2339 +#: src/lang.c:2441 msgid "Format string for display of dates" msgstr "Kuupäevade esitamise vormingusõne" -#: src/lang.c:2340 +#: src/lang.c:2442 msgid "# Format string for date representation\n" msgstr "# Vormingusõne kuupäevade esitamiseks\n" # TRANSLATION MISSING -#: src/lang.c:2346 +#: src/lang.c:2448 msgid "Unicode normalization form" msgstr "" # TRANSLATION MISSING -#: src/lang.c:2347 +#: src/lang.c:2449 msgid "# Unicode normalization form\n" - "# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = None\n" + "# * 1 = NFKC\n" + "# 2 = NFKD\n" + "# 3 = NFC\n" + "# 4 = NFD\n" msgstr "" # TRANSLATION MISSING -#: src/lang.c:2354 +#: src/lang.c:2461 msgid "Render BiDi" msgstr "" # TRANSLATION MISSING -#: src/lang.c:2355 +#: src/lang.c:2462 msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "" -#: src/misc.c:3711 +#: src/misc.c:3713 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "Versioon: %s %s väljalase %s (\"%s\") %s %s\n" -#: src/misc.c:3714 +#: src/misc.c:3716 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Versioon: %s %s väljalase %s (\"%s\")\n" @@ -6069,7 +6267,7 @@ msgstr "Saada viimane käsk uuesti (%s)\n msgid "couldn't expand %s\n" msgstr "ei saa laiendada %s\n" -#: src/post.c:1962 +#: src/post.c:1970 #, c-format msgid "Posting: %.*s ..." msgstr "Postitan: %.*s ..." @@ -6113,15 +6311,15 @@ msgstr "" msgid "bytes" msgstr "baiti" -#: src/select.c:352 +#: src/select.c:375 msgid "unread" msgstr "lugemata" -#: src/select.c:352 +#: src/select.c:375 msgid "all" msgstr "kõik" -#: src/select.c:530 src/select.c:532 +#: src/select.c:547 src/select.c:549 msgid " R" msgstr " L" @@ -6171,3 +6369,36 @@ msgstr "Slrnface lõpetas veaga, kood %d. #, c-format msgid "Slrnface failed: %s." msgstr "Slrnface ebaõnnestus: %s." + +#~ msgid "# For color-adjust use the following numbers\n" +#~ "# 0-black 1-red 2-green 3-brown\n" +#~ "# 4-blue 5-pink 6-cyan 7-white\n" +#~ "# These are *only* for foreground:\n" +#~ "# 8-gray 9-light red 10-light green 11-yellow\n" +#~ "# 12-light blue 13-light pink 14-light cyan 15-light white\n" +#~ "# A '-1' is interpreted as default (foreground normally is white, and\n" +#~ "# background black)\n" +#~ "\n" +#~ msgstr "# Värvide seadmiseks kasutage järgnevaid koode\n" +#~ "# 0-must 1-punane 2-roheline 3-pruun\n" +#~ "# 4-sinine 5-roosa 6-lilla 7-valge\n" +#~ "# Need on *ainult* esiplaani tarvis:\n" +#~ "# 8-hall 9-helepunane 10-heleroheline 11-kollane\n" +#~ "# 12-helesinine 13-heleroosa 14-helelilla 15-helevalge\n" +#~ "# '-1' interpreteeritakse vaikeväärtusena (esiplaan on tavaliselt valge,\n" +#~ "# taust must)\n" +#~ "\n" + +#~ msgid "# Standard-Background-Color\n" +#~ msgstr "# Standardne tagaplaani värv\n" + +#~ msgid "# Color of text lines\n" +#~ msgstr "# Tekstiridade värv\n" + +#~ msgid "# Color of help pages\n" +#~ msgstr "# Abiinfo värv\n" + +#~ msgid "# Color of word highlighting. There are four possibilities\n" +#~ "# in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n" +#~ msgstr "# Sõnade esiletõstmise värv. Artiklites saab kasutada nelja võimalust:\n" +#~ "# *tärnid*, /kaldkriipsud/, _alakriipsud_ ja -kriipsud-.\n" Binary files tin-1.7.6/po/fr.gmo and tin-1.7.7/po/fr.gmo differ diff -Nurp tin-1.7.6/po/fr.po tin-1.7.7/po/fr.po --- tin-1.7.6/po/fr.po 2004-09-06 10:40:50.000000000 +0200 +++ tin-1.7.7/po/fr.po 2004-12-15 16:48:29.000000000 +0100 @@ -2,13 +2,13 @@ # Matt Anton , 2003-2004 # msgid "" -msgstr "Project-Id-Version: 1.7.4\n" - "POT-Creation-Date: 2004-09-06 10:40+0200\n" - "PO-Revision-Date: 2004-03-01 16:07+0100\n" +msgstr "Project-Id-Version: 1.7.7\n" + "POT-Creation-Date: 2004-12-15 16:47+0100\n" + "PO-Revision-Date: 2004-11-17 00:50+0100\n" "Last-Translator: Matt Anton \n" "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=ISO-8859-1\n" + "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" "Report-Msgid-Bugs-To: \n" @@ -185,7 +185,7 @@ msgstr "# tex2iso_conv=ON/OFF\n" #: src/attrib.c:681 msgid "# mime_forward=ON/OFF\n" -msgstr "" +msgstr "# mime_forward=ON/OFF\n" #: src/attrib.c:683 msgid "# mm_network_charset=supported_charset" @@ -230,7 +230,7 @@ msgstr "# dans *binaries* faire traiteme msgid "# and set Followup-To: poster\n" msgstr "# et utiliser Followup-To: poster\n" -#: src/cook.c:814 +#: src/cook.c:494 msgid "(unknown)" msgstr "(inconnu)" @@ -286,7 +286,7 @@ msgid "\n" msgstr "\n" "Votre article :\n" " \"%s\"\n" - "sera posté dans le %s suivant :\n" + "sera posté dans le(s) %s suivant(s) :\n" #: src/lang.c:54 msgid "Article not posted!" @@ -510,7 +510,7 @@ msgstr "Récupération de %s impossible" #: src/lang.c:107 #, c-format msgid "%s is a directory" -msgstr "%s est un dossier" +msgstr "%s est un répertoire" #: src/lang.c:108 msgid "Catchup" @@ -589,7 +589,7 @@ msgstr "Création du fichier active des g msgid "Creating newsrc file...\n" msgstr "Création du fichier newsrc...\n" -#: src/lang.c:127 src/lang.c:1121 +#: src/lang.c:127 src/lang.c:1140 msgid "Default" msgstr "Défaut" @@ -1069,15 +1069,15 @@ msgstr "# Format :\n" "#\t\t\tdébut de la règle, sinon ils seront déplacés\n" "#\t\t\tà la règle suivante. '#' n'est pas un mot-clé\n" "#\t\t\tvalide pour un commentaire !\n" - "# group=TERME\t\tOgligatoire. Liste de groupe (pe. fr.comp.*,!*sources*).\n" + "# group=TERME\tOgligatoire. Liste de groupe (pe. fr.comp.*,!*sources*).\n" "# case=NUM\t\tOgligatoire. Casse sensible=0 / casse insensible=1.\n" "# score=NUM|TERME\tObligatoire. Score à attribuer. Soit :\n" - "# score=NUM\t\t- Un numéro (pe. 70). Ou :\n" + "# score=NUM\t- Un numéro (pe. 70). Ou :\n" "# score=TERME\t- Un des deux mots-clé suivants : 'hot' ou 'kill'.\n" "# subj=TERME\t\tFacultatif. En-tête 'Subject:' (pe. Comment devenir un " "gourou).\n" "# from=TERME\t\tFacultatif. En-tête 'From:' (pe. *Craig Shergold*).\n" - "# msgid=TERME\t\tFacultatif. En-tête 'Message-ID:' (pe. <123@ether.net>) " + "# msgid=TERME\tFacultatif. En-tête 'Message-ID:' (pe. <123@ether.net>) " "avec\n" "#\t\t\tréférence complète.\n" "# msgid_last=TERME\tFacultatif. Comme ci-dessus mais avec juste le dernier " @@ -1091,7 +1091,7 @@ msgstr "# Format :\n" "# gnksa=[<>]?NUM\tFacultatif. Résultat du 'parse_from' du GNKSA. '<' ou " "'>'\n" "#\t\t\tsont optionnels.\n" - "# xref=CHAÎNE\t\tFacultatif. Chaîne à filtrer (pe. alt.flame*)\n" + "# xref=CHAÎNE\tFacultatif. Chaîne à filtrer (pe. alt.flame*)\n" "# time=NUM\t\tFacultatif. La valeur de time_t indique la durée de la " "règle.\n" "#\n" @@ -1192,11 +1192,9 @@ msgstr "Filtrer l'en-tête 'Message-ID'. msgid "Subject: line to add to filter file. toggles & sets." msgstr "Filtrer l'en-tête 'Subject'. change & valide." -# TRANSLATION TOO LONG #: src/lang.c:274 msgid "Enter text pattern to filter if Subject: & From: lines are not what you want." -msgstr "Terme à filtrer si vous ne voulez pas filtrer d'après les en-têtes 'Subject:' " - "& 'From:'" +msgstr "Terme à filtrer si autre que les en-têtes 'Subject:' & 'From:'" #: src/lang.c:275 msgid "Select where text pattern should be applied. toggles & sets." @@ -1206,17 +1204,13 @@ msgstr "Sur quel en-tête appliquer ce te msgid "Expiration time in days for the entered filter. toggles & sets." msgstr "Durée (en nombre de jours) du filtre. change & valide." -# TRANSLATION TOO LONG #: src/lang.c:277 msgid "Apply kill only to current group or all groups. toggles & sets." -msgstr "Appliquer le filtre au groupe actuel ou à tous. change & " - "valide." +msgstr "Filtrer groupe actuel ou tous. change & valide." -# TRANSLATION TOO LONG #: src/lang.c:278 msgid "Apply select to current group or all groups. toggles & sets." -msgstr "Appliquer la règle au groupe actuel ou à tous. change & " - "valide." +msgstr "Appliquer règle au groupe actuel ou à tous. change & valide." #: src/lang.c:279 msgid "kill an article via a menu" @@ -1232,7 +1226,7 @@ msgstr "Voir les URLs dans l'article" #: src/lang.c:282 msgid "0 - 9\t display article by number in current thread" -msgstr "0 - 9\t affiche les articles par numéro du fil actuel" +msgstr "0 - 9\t affiche les articles par numéro du fil actuel" #: src/lang.c:283 msgid "cancel (delete) or supersede (overwrite) current article" @@ -1441,7 +1435,7 @@ msgstr "quitter tin immédiatement" #: src/lang.c:334 msgid "redraw page" -msgstr "redessiner la page" +msgstr "rafraîchir la page" #: src/lang.c:335 msgid "save article/thread/hot/pattern/tagged articles to file" @@ -1452,366 +1446,375 @@ msgid "save marked articles automaticall msgstr "enregistrement auto. des articles marqués sans demander" #: src/lang.c:337 +msgid "scroll the screen one line down" +msgstr "défiler une page par une page" + +#: src/lang.c:338 +msgid "scroll the screen one line up" +msgstr "remonter une page par une page" + +#: src/lang.c:339 msgid "search for articles by author backwards" msgstr "recherche arrière d'articles par auteur" -#: src/lang.c:338 +#: src/lang.c:340 msgid "search for articles by author forwards" msgstr "recherche avant d'articles par auteur" -#: src/lang.c:339 +#: src/lang.c:341 msgid "search all articles for a given string (this may take some time)" msgstr "rechercher partout un terme précis (cela peut prendre du temps)" -#: src/lang.c:340 +#: src/lang.c:342 msgid " \t (searches are case-insensitive and wrap around to all articles)" -msgstr " \t (recherches ignorent la casse et se cantonne à tous les articles)" +msgstr " \t (recherche ignore la casse et se cantonne à tous les articles)" -#: src/lang.c:341 +#: src/lang.c:343 msgid "search for articles by Subject line backwards" msgstr "recherche arrière d'articles par Sujet" -#: src/lang.c:342 +#: src/lang.c:344 msgid "search for articles by Subject line forwards" msgstr "recherche avant d'articles par Sujet" -#: src/lang.c:343 +#: src/lang.c:345 msgid "repeat last search" msgstr "relancer la dernière recherche" -#: src/lang.c:344 +#: src/lang.c:346 msgid "tag current article for reposting/mailing/piping/printing/saving" msgstr "marquer article pour repostage/envoi/passer/imprimer/enregistrer" -#: src/lang.c:345 +#: src/lang.c:347 msgid "toggle info message in last line (subject/description)" msgstr "afficher ou non les infos dans la dernière ligne (sujet/description)" -#: src/lang.c:346 +#: src/lang.c:348 msgid "toggle inverse video" msgstr "afficher ou non la vidéo inversée" -#: src/lang.c:347 +#: src/lang.c:349 msgid "toggle mini help menu display" msgstr "afficher ou non le petit menu d'aide" -#: src/lang.c:348 +#: src/lang.c:350 msgid "cycle the display of authors email address, real name, both or neither" msgstr "afficher cycliquement l'email des auteurs, nom réel, les deux ou aucun" -#: src/lang.c:349 +#: src/lang.c:351 msgid "show version information" msgstr "afficher la version de tin" -#: src/lang.c:350 +#: src/lang.c:352 msgid "mark all articles as read and return to group selection menu" msgstr "marquer tous les articles comme lus et retourner au menu groupe" -#: src/lang.c:351 +#: src/lang.c:353 msgid "mark all articles as read and enter next group with unread articles" msgstr "tout marquer comme lu et entrer dans le prochain groupe non lu" -#: src/lang.c:352 +#: src/lang.c:354 msgid "choose first thread in list" msgstr "choisir le 1er fil de la liste" -#: src/lang.c:353 +#: src/lang.c:355 msgid "choose last thread in list" msgstr "choisir le dernier fil de la liste" -#: src/lang.c:354 +#: src/lang.c:356 msgid "list articles within current thread (bring up Thread sub-menu)" msgstr "lister les articles du fil actuel (sous-menu fil)" -#: src/lang.c:355 +#: src/lang.c:357 msgid "mark article as unread" msgstr "marquer l'article comme non lu" -#: src/lang.c:356 +#: src/lang.c:358 msgid "mark current thread or tagged threads as read" msgstr "marquer le fil actuel ou les fils marqués comme lus" -#: src/lang.c:357 +#: src/lang.c:359 msgid "mark thread as unread" msgstr "marquer le fil comme non lu" -#: src/lang.c:358 +#: src/lang.c:360 msgid "toggle display of all/selected articles" msgstr "(dés)activer la vue de tout article/articles sélectionnés" -#: src/lang.c:359 +#: src/lang.c:361 msgid "display next group" msgstr "afficher le groupe suivant" -#: src/lang.c:360 +#: src/lang.c:362 msgid "display previous group" msgstr "afficher le groupe précédent" -#: src/lang.c:361 +#: src/lang.c:363 msgid "toggle all selections (all articles)" msgstr "(dés)activer toutes les sélections (tout article)" -#: src/lang.c:362 +#: src/lang.c:364 msgid "select group (make \"hot\")" msgstr "sélection du groupe (utiliser \"hot\")" -#: src/lang.c:363 +#: src/lang.c:365 msgid "select thread" msgstr "sélectionner le fil" -#: src/lang.c:364 +#: src/lang.c:366 msgid "select threads if at least one unread article is selected" msgstr "sél. les fils si au moins un article non lu est sélectionné" -#: src/lang.c:365 +#: src/lang.c:367 msgid "select threads that match user specified pattern" msgstr "sélectionner les fils qui correspondent au critère choisi" -#: src/lang.c:366 +#: src/lang.c:368 msgid "tag all parts of current multipart-message in order" msgstr "marquer dans l'ordre toutes parties du message multiparties" -#: src/lang.c:367 +#: src/lang.c:369 msgid "0 - 9\t choose thread by number" msgstr "0 - 9\t choisir le fil par numéro" -#: src/lang.c:368 +#: src/lang.c:370 msgid "toggle limit number of articles to get, and reload" msgstr "(dés)activer le nombre limite d'article à charger et à recharger" -#: src/lang.c:369 +#: src/lang.c:371 msgid "toggle display of all/unread articles" msgstr "(dés)activer l'affichage de tout article/articles non lus" -#: src/lang.c:370 +#: src/lang.c:372 msgid "toggle selection of thread" msgstr "(dés)activer sélection du fil" -#: src/lang.c:371 +#: src/lang.c:373 msgid "cycle through threading options available" msgstr "voir toutes les options de groupage disponibles" -#: src/lang.c:372 +#: src/lang.c:374 msgid "undo all selections (all articles)" msgstr "annuler toutes sélections (tout article)" -#: src/lang.c:373 +#: src/lang.c:375 msgid "untag all tagged threads" msgstr "démarquer tout fil marqué" -#: src/lang.c:374 +#: src/lang.c:376 msgid "mark all articles in group as read" msgstr "marquer lu tous les articles du groupe" -# TRANSLATION TOO LONG (71 chars max) -#: src/lang.c:375 +#: src/lang.c:377 msgid "mark all articles in group as read and move to next unread group" -msgstr "marquer tout article dans groupe comme lu et aller au groupe non lu suivant" +msgstr "marquer lu le groupe et aller au groupe non lu suivant" -#: src/lang.c:376 +#: src/lang.c:378 msgid "choose first group in list" msgstr "choisir le 1er groupe de la liste" -#: src/lang.c:377 +#: src/lang.c:379 msgid "choose group by name" msgstr "choisir le groupe par nom" -#: src/lang.c:378 +#: src/lang.c:380 msgid "0 - 9\t choose group by number" msgstr "0 - 9\t choisir un groupe par son numéro" -#: src/lang.c:379 +#: src/lang.c:381 msgid "choose range of groups to be affected by next command" msgstr "choisir les groupes affectés par la commande suivante" -#: src/lang.c:380 +#: src/lang.c:382 msgid "choose last group in list" msgstr "choisir le dernier groupe de la liste" -#: src/lang.c:381 +#: src/lang.c:383 msgid "mark all articles in chosen group unread" msgstr "marquer non lu tout article dans le groupe choisi" -#: src/lang.c:382 +#: src/lang.c:384 msgid "move chosen group within list" msgstr "déplacer le groupe sélectionné" -#: src/lang.c:383 +#: src/lang.c:385 msgid "choose next group with unread news" msgstr "choisir le groupe suivant ayant articles non lus" -#: src/lang.c:384 src/lang.c:1168 +#: src/lang.c:386 src/lang.c:1187 msgid "quit" msgstr "quitter" -#: src/lang.c:385 +#: src/lang.c:387 msgid "quit without saving configuration changes" msgstr "quitter sans enregistrer les changements" -#: src/lang.c:386 +#: src/lang.c:388 msgid "read chosen group" msgstr "lire le groupe choisi" -#: src/lang.c:387 +#: src/lang.c:389 msgid "reset .newsrc (all available articles in groups marked unread)" msgstr "réinitialiser .newsrc (tout sera marqué non lu dans les groupes)" -#: src/lang.c:388 +#: src/lang.c:390 msgid "search backwards for a group name" msgstr "recherche arrière d'un groupe" -#: src/lang.c:389 +#: src/lang.c:391 msgid " \t (all searches are case-insensitive and wrap around)" msgstr " \t (les recherches sont sensibles à la casse)" -#: src/lang.c:390 +#: src/lang.c:392 msgid "search forwards for a group name" msgstr "recherche avant d'un groupe" -#: src/lang.c:391 +#: src/lang.c:393 msgid "subscribe to chosen group" msgstr "s'abonner au groupe sélectionné" -#: src/lang.c:392 +#: src/lang.c:394 msgid "subscribe to groups that match pattern" msgstr "abonnement aux groupes correspondant au critère" -#: src/lang.c:393 +#: src/lang.c:395 msgid "reread active file to check for any new news" msgstr "vérifier l'existence de nouveaux articles" -#: src/lang.c:394 +#: src/lang.c:396 msgid "toggle display of group name only or group name plus description" msgstr "afficher ou non le nom du groupe ou le nom + sa description" -#: src/lang.c:395 +#: src/lang.c:397 msgid "toggle display to show all/unread subscribed groups" msgstr "afficher ou non tous les groupes abonnés non lu" -#: src/lang.c:396 +#: src/lang.c:398 msgid "unsubscribe from chosen group" msgstr "se désabonner du groupe sélectionné" -#: src/lang.c:397 +#: src/lang.c:399 msgid "unsubscribe from groups that match pattern" msgstr "désabonnement aux groupes correspondant au critère" -#: src/lang.c:398 +#: src/lang.c:400 msgid "sort the list of groups" msgstr "trier la liste des groupes" -#: src/lang.c:399 +#: src/lang.c:401 msgid "toggle display to show all/subscribed groups" msgstr "afficher ou non tous les groupes abonnés" -#: src/lang.c:400 +#: src/lang.c:402 msgid "0 - 9\t choose article by number" msgstr "0 - 9\t choisir article par numéro" -#: src/lang.c:401 +#: src/lang.c:403 msgid "mark thread as read and return to group index page" msgstr "marquer le fil comme lu et revenir à la liste des groupes" -#: src/lang.c:402 +#: src/lang.c:404 msgid "mark thread as read and enter next unread thread or group" msgstr "marquer le fil comme lu et aller dans le fil ou groupe non lu suivant" -#: src/lang.c:403 +#: src/lang.c:405 msgid "choose first article in list" msgstr "choisir le 1er article dans la liste" -#: src/lang.c:404 +#: src/lang.c:406 msgid "choose last article in list" msgstr "choisir le dernier article dans la liste" -#: src/lang.c:405 +# TRANSLATION TOO LONG +#: src/lang.c:407 msgid "mark article or tagged articles as read and move cursor to next unread article" -msgstr "" +msgstr "marquer l'article ou les articles marqués comme lus et aller au prochain " + "article non lu" -#: src/lang.c:406 +#: src/lang.c:408 msgid "read chosen article" msgstr "lire l'article choisi" -#: src/lang.c:407 +#: src/lang.c:409 msgid "Display properties\n" "------------------" msgstr "Propriétés de l'affichage\n" "-------------------------" -#: src/lang.c:408 +#: src/lang.c:410 msgid "Miscellaneous\n" "-------------" msgstr "Divers\n" "------" -#: src/lang.c:409 +#: src/lang.c:411 msgid "Moving around\n" "-------------" msgstr "Navigation\n" "----------" -#: src/lang.c:410 +#: src/lang.c:412 msgid "Group/thread/article operations\n" "-------------------------------" msgstr "Opérations sur les Groupes / fils / articles\n" "--------------------------------------------" -#: src/lang.c:412 +#: src/lang.c:414 msgid "Group Level Commands" msgstr "Commandes du niveau Groupe" -#: src/lang.c:413 +#: src/lang.c:415 msgid "Kill filter added" msgstr "Filtre ajouté" -#: src/lang.c:414 +#: src/lang.c:416 msgid "Auto-selection filter added" msgstr "Filtre à auto-sélection ajouté" -#: src/lang.c:415 +#: src/lang.c:417 msgid "All parts tagged" msgstr "Toutes les parties sont marquées" -#: src/lang.c:416 +#: src/lang.c:418 msgid "Storing article for later posting" msgstr "Stockage de l'article afin de le poster plus tard" -#: src/lang.c:417 +#: src/lang.c:419 msgid "Please enter a valid character" msgstr "Entrez un caractère valide svp" -#: src/lang.c:418 +#: src/lang.c:420 #, c-format msgid "Missing part #%d" msgstr "Partie manquante #%d" -#: src/lang.c:419 +#: src/lang.c:421 msgid "*** No postponed articles ***" msgstr "*** Aucun brouillon ***" -#: src/lang.c:420 +#: src/lang.c:422 msgid "Not a multi-part message" msgstr "N'est pas un message en plusieurs parties" -#: src/lang.c:421 +#: src/lang.c:423 msgid "You are not subscribed to this group" msgstr "Vous n'êtes pas abonné à ce groupe" -#: src/lang.c:422 +#: src/lang.c:424 msgid "No previous expression" msgstr "Pas d'expression précédente" -#: src/lang.c:423 +#: src/lang.c:425 msgid "Operation disabled in no-overwrite mode" msgstr "Opération désactivée en mode lecture" #. TODO: replace hardcoded key-name in txt_info_postponed -#: src/lang.c:425 +#: src/lang.c:427 #, c-format msgid "%d postponed %s, reuse with ^O...\n" -msgstr "%d brouillon(s) %s, réutilisez-les avec ^O...\n" +msgstr "%d %s brouillon(s), réutilisez-le(s) avec ^O...\n" -#: src/lang.c:426 +#: src/lang.c:428 msgid "X-Conversion-Note: multipart/alternative contents have been removed.\n" " To get the whole article, turn alternative handling OFF in the Option Menu\n" msgstr "X-Conversion-Note : contenus multiparties/alternatifs retirés.\n" @@ -1819,21 +1822,21 @@ msgstr "X-Conversion-Note : contenus mul "dans\n" " le Menu Option.\n" -#: src/lang.c:428 +#: src/lang.c:430 #, c-format msgid "Save filename for %s/%s is a mailbox. Attachment not saved" msgstr "Enregistrer le fichier sous %s %s est une bàl. PJ non enregistrée" -#: src/lang.c:429 +#: src/lang.c:431 msgid "TeX2Iso encoded article" msgstr "Article encodé en TeX2Iso" -#: src/lang.c:430 +#: src/lang.c:432 msgid "incomplete " msgstr "incomplet " #. TODO: replace hardcoded key-names -#: src/lang.c:432 +#: src/lang.c:434 #, c-format msgid "\n" "Welcome to %s, a full screen threaded Netnews reader. It can read news " @@ -1896,129 +1899,129 @@ msgstr "\n" "Si vous constatez des bogues ou tout autre problème, envoyez s'il vous plaît " "un rapport de bogue/commentaires à %s via la touche 'R'.\n" -#: src/lang.c:448 +#: src/lang.c:450 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." msgstr "En-tête From: %s invalide. Lisez le fichier INSTALL une 2e fois." -#: src/lang.c:449 +#: src/lang.c:451 #, c-format msgid "Invalid Sender:-header %s" msgstr "En-tête Sender: %s invalide" -#: src/lang.c:450 +#: src/lang.c:452 msgid "Inverse video disabled" msgstr "Vidéo inversée désactivée" -#: src/lang.c:451 +#: src/lang.c:453 msgid "Inverse video enabled" msgstr "Vidéo inversée activée" -#: src/lang.c:453 +#: src/lang.c:455 #, c-format msgid "Missing definition for %s\n" msgstr "Définition manquante pour %s\n" -#: src/lang.c:454 +#: src/lang.c:456 #, c-format msgid "Invalid key definition '%s'\n" msgstr "Définition de clé invalide '%s'\n" -#: src/lang.c:455 +#: src/lang.c:457 #, c-format msgid "Invalid keyname '%s'\n" msgstr "Nom de clé invalide '%s'\n" -#: src/lang.c:456 +#: src/lang.c:458 #, c-format msgid "Key '%s' is defined for both %s%s and %s%s\n" msgstr "Clé '%s' est définie pour %s%s et %s%s\n" -#: src/lang.c:457 +#: src/lang.c:459 #, c-format msgid "Kill From: [%s] (y/n): " msgstr " De : [%s] (o/n) : " -#: src/lang.c:458 +#: src/lang.c:460 msgid "Kill Lines: (num): " msgstr "Nombre de lignes (num) : " -#: src/lang.c:459 +#: src/lang.c:461 msgid "Kill Article Menu" msgstr "Créer un filtre" -#: src/lang.c:460 +#: src/lang.c:462 #, c-format msgid "Kill Msg-Id: [%s] (f/l/o/n): " msgstr " MID : [%s] (t/d/a/n) : " -#: src/lang.c:461 +#: src/lang.c:463 msgid "Kill pattern scope : " msgstr "Filtre s'appliquant à : " -#: src/lang.c:462 +#: src/lang.c:464 #, c-format msgid "Kill Subject: [%s] (y/n): " msgstr "Sujet : [%s] (o/n) : " -#: src/lang.c:463 +#: src/lang.c:465 msgid "Kill text pattern : " msgstr "Texte à filtrer : " -#: src/lang.c:464 +#: src/lang.c:466 msgid "Kill time in days : " msgstr "Durée du filtre : " -#: src/lang.c:466 +#: src/lang.c:468 msgid "Last" msgstr "Dernier" -#: src/lang.c:467 +#: src/lang.c:469 msgid "-- Last response --" msgstr "-- Dernière réponse --" -#: src/lang.c:468 +#: src/lang.c:470 #, c-format msgid "Lines %s " msgstr "%s lignes " -#: src/lang.c:470 +#: src/lang.c:472 msgid "Message-ID: line " msgstr "l'en-tête 'Message-ID:'" -#: src/lang.c:472 +#: src/lang.c:474 msgid "mailbox " msgstr "bàl" -#: src/lang.c:473 +#: src/lang.c:475 #, c-format msgid "Mail article(s) to [%.*s]> " msgstr "Envoyer article(s) à [%.*s] > " -#: src/lang.c:474 +#: src/lang.c:476 #, c-format msgid "Mailing log to %s\n" msgstr "Envoi de l'historique à %s\n" -#: src/lang.c:475 +#: src/lang.c:477 msgid "Mail bug report..." msgstr "Envoi d'un rapport de bug..." -#: src/lang.c:476 +#: src/lang.c:478 #, c-format msgid "Mail BUG REPORT to %s?" msgstr "Signaler LE BUG à %s ?" -#: src/lang.c:477 +#: src/lang.c:479 msgid "Mailed" msgstr "Envoyé" -#: src/lang.c:478 +#: src/lang.c:480 #, c-format msgid "Mailing to %s..." msgstr "Envoi à %s..." -#: src/lang.c:479 +#: src/lang.c:481 msgid "# [Mail/Save] active file. Format is like news active file:\n" "# groupname max.artnum min.artnum /dir\n" "# The 4th field is the basedir (ie. ~/Mail or ~/News)\n" @@ -2029,282 +2032,282 @@ msgstr "# [Envoyer/Enregistrer] fichier "# Le 4ème champ est le répertoire racine utilisé\n" "# (p.e. ~/Mail ou ~/News)\n" -#: src/lang.c:482 +#: src/lang.c:484 #, c-format msgid "%s marked as unread" msgstr "%s marqué comme non lu" -#: src/lang.c:483 +#: src/lang.c:485 #, c-format msgid "Marked %d of %d tagged %s as read" msgstr "%d marqué(s) sur %d sélectionné(s) %s comme lu(s)" -#: src/lang.c:484 +#: src/lang.c:486 #, c-format msgid "Mark all articles as read%s?" msgstr "Marquer tous les articles comme lus%s ?" -#: src/lang.c:485 +#: src/lang.c:487 #, c-format msgid "Mark %s=tagged articles, %s=current article, %s=quit: " msgstr "Marquer %s=art. marqués, %s=article actuel, %s=quitter : " -#: src/lang.c:486 +#: src/lang.c:488 #, c-format msgid "Mark group %s as read?" msgstr "Marquer le groupe %s comme lu ?" -#: src/lang.c:487 +#: src/lang.c:489 #, c-format msgid "Mark thread as read%s?" msgstr "Marquer le fil comme lu%s ?" -#: src/lang.c:488 +#: src/lang.c:490 #, c-format msgid "Mark %s=tagged articles/threads, %s=current thread, %s=quit: " msgstr "Marquer %s=art./fils marqués, %s=fil actuel, %s=quitter : " -#: src/lang.c:489 +#: src/lang.c:491 #, c-format msgid "Matching %s groups..." msgstr "%s groupes correspondants..." -#: src/lang.c:490 src/lang.c:494 +#: src/lang.c:492 src/lang.c:496 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "=voir 'n'; %s=non lu suivant; %s=rechercher; %s=filtrer/sél." -#: src/lang.c:491 +#: src/lang.c:493 #, 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" -#: src/lang.c:492 +#: src/lang.c:494 #, c-format msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" msgstr "%s=haut; %s=bas; %s=haut de page; %s=bas de page; %s=haut; %s=bas" -#: src/lang.c:493 +#: src/lang.c:495 #, c-format msgid "%s=search forwards; %s=search backwards; %s=quit" msgstr "%s=recherche avant; %s=recherche arrière; %s=quitter" -#: src/lang.c:495 +#: src/lang.c:497 #, 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" -#: src/lang.c:496 +#: src/lang.c:498 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" msgstr "=voir 'n'; %s=non lu suivant; %s,%s=rechercher; %s=tout lu" -#: src/lang.c:497 +#: src/lang.c:499 #, c-format 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:498 +#: src/lang.c:500 #, 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" -#: src/lang.c:499 +#: src/lang.c:501 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" msgstr "=voir 'n'; %s=non lu suivant; %s=tout lu; %s=basculer l'affichage" -#: src/lang.c:500 +#: src/lang.c:502 #, c-format msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" msgstr "%s=aide; %s=bas; %s=haut; %s=quitter; %s=marquer; %s=marquer non lu" -#: src/lang.c:501 +#: src/lang.c:503 msgid "--More--" msgstr "-- Suite --" -#: src/lang.c:502 +#: src/lang.c:504 #, c-format msgid "Moving %s..." msgstr "Déplacement de %s..." -#: src/lang.c:504 +#: src/lang.c:506 msgid ", name: " msgstr ", nom : " -#: src/lang.c:505 +#: src/lang.c:507 #, c-format msgid "Goto newsgroup [%s]> " msgstr "Aller dans le groupe [%s]> " -#: src/lang.c:506 +#: src/lang.c:508 msgid "newsgroups" msgstr "groupes" -#: src/lang.c:507 +#: src/lang.c:509 #, c-format msgid "Position %s in group list (1,2,..,$) [%d]> " msgstr "Placer %s dans la liste des groupes (1,2,..,$) [%d]> " -#: src/lang.c:508 +#: src/lang.c:510 msgid "newsgroup" msgstr "groupe" -#: src/lang.c:509 +#: src/lang.c:511 msgid "Try and save newsrc file again?" msgstr "Encore essayer et enregistrer le newsrc ?" -#: src/lang.c:510 +#: src/lang.c:512 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é." -#: src/lang.c:511 +#: src/lang.c:513 msgid "newsrc file saved successfully.\n" msgstr "le newsrc a été enregistré avec succès.\n" -#: src/lang.c:512 +#: src/lang.c:514 msgid "-- Next response --" msgstr "-- Réponse suivante --" -#: src/lang.c:513 +#: src/lang.c:515 #, c-format msgid "NNTP authorization password not found for %s" msgstr "Mot de passe NNTP introuvable pour %s" -#: src/lang.c:514 +#: src/lang.c:516 msgid "No " msgstr "Non " -#: src/lang.c:515 +#: src/lang.c:517 msgid "*** No articles ***" msgstr "*** Aucun article ***" -#: src/lang.c:516 +#: src/lang.c:518 msgid "No articles have been posted" msgstr "Aucun article n'a été posté" -#: src/lang.c:517 +#: src/lang.c:519 msgid "*** No description ***" msgstr "*** Aucune description ***" -#: src/lang.c:518 +#: src/lang.c:520 msgid "No filename" msgstr "Pas de nom de fichier" -#: src/lang.c:519 +#: src/lang.c:521 msgid "No group" msgstr "Pas de groupe" -#: src/lang.c:520 +#: src/lang.c:522 msgid "*** No groups ***" msgstr "*** Aucun groupe ***" -#: src/lang.c:521 +#: src/lang.c:523 msgid "No more groups to read" msgstr "Plus de groupes à lire" -#: src/lang.c:522 +#: src/lang.c:524 msgid "No last message" msgstr "Aucun dernier message" -#: src/lang.c:523 +#: src/lang.c:525 msgid "No mail address" msgstr "Aucune adresse email" -#: src/lang.c:524 +#: src/lang.c:526 msgid "No articles marked for saving" msgstr "Aucun article marqué à enregistrer" -#: src/lang.c:525 +#: src/lang.c:527 msgid "No match" msgstr "Aucun résultat" -#: src/lang.c:526 +#: src/lang.c:528 msgid "No more groups" msgstr "Plus de groupes" -#: src/lang.c:527 +#: src/lang.c:529 msgid "No newsgroups" msgstr "Aucun groupe" -#: src/lang.c:528 +#: src/lang.c:530 msgid "No next unread article" msgstr "Aucun article non lu suivant" -#: src/lang.c:529 +#: src/lang.c:531 msgid "No previous group" msgstr "Aucun groupe précédent" -#: src/lang.c:530 +#: src/lang.c:532 msgid "No previous unread article" msgstr "Aucun article non lu précédent" -#: src/lang.c:531 +#: src/lang.c:533 msgid "No responses" msgstr "Aucune réponse" -#: src/lang.c:532 +#: src/lang.c:534 msgid "No responses to list in current thread" msgstr "Aucune réponse à afficher dans le fil actuel" -#: src/lang.c:533 +#: src/lang.c:535 msgid "No search string" msgstr "Aucun terme à rechercher" -#: src/lang.c:534 +#: src/lang.c:536 msgid "No subject" msgstr "Aucun sujet" -#: src/lang.c:535 +#: src/lang.c:538 #, c-format msgid "%s: Terminal must have clear to end-of-line (ce)\n" msgstr "%s: Terminal doit avoir la fonction clear to end-of-line (ce)\n" -#: src/lang.c:536 +#: src/lang.c:539 #, c-format msgid "%s: Terminal must have clear to end-of-screen (cd)\n" msgstr "%s: Terminal doit avoir la fonction clear to end-of-screen (cd)\n" -#: src/lang.c:537 +#: src/lang.c:540 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" msgstr "%s: Terminal doit avoir la fonction clearscreen (cl)\n" -#: src/lang.c:538 +#: src/lang.c:541 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" msgstr "%s: Terminal doit avoir la fonction cursor motion (cm)\n" -#: src/lang.c:539 +#: src/lang.c:542 #, c-format msgid "%s: TERM variable must be set to use screen capabilities\n" msgstr "%s: la variable TERM doit être utilisée pour utiliser les fonctions\n" -#: src/lang.c:540 +#: src/lang.c:544 #, c-format msgid "No viewer found for %s/%s\n" msgstr "Visualiseur introuvable pour %s/%s\n" -#: src/lang.c:541 +#: src/lang.c:545 msgid "Newsgroup does not exist on this server" msgstr "Groupe inexistant sur ce serveur" -#: src/lang.c:542 +#: src/lang.c:546 #, c-format msgid "Group %s not found in active file" msgstr "Groupe %s introuvable dans le fichier active" -#: src/lang.c:543 +#: src/lang.c:547 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 : " -#: src/lang.c:544 +#: src/lang.c:548 msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "utiliser a)utre nom, utiliser .newsrc par d)éfaut, q)uitter tin : " -#: src/lang.c:545 +#: src/lang.c:549 #, c-format msgid "# NNTP-server -> newsrc translation table and NNTP-server\n" "# shortname list for %s %s\n" @@ -2332,40 +2335,40 @@ msgstr "# Serveur NNTP -> tableau de cor "# news.ka.nu /tmp/nrc-nu kanu nu\n" "#\n" -#: src/lang.c:552 +#: src/lang.c:556 msgid "Only" msgstr "Actuel" -#: src/lang.c:553 +#: src/lang.c:557 #, c-format msgid "Option not enabled. Recompile with %s." msgstr "Option non activée. Recompilez avec %s." -#: src/lang.c:554 +#: src/lang.c:558 msgid "Options Menu" msgstr "Menu Options" -#: src/lang.c:557 +#: src/lang.c:561 #, c-format msgid "Error in regex: %s at pos. %d '%s'" msgstr "Erreur dans la regex : %s à %d '%s'" -#: src/lang.c:558 +#: src/lang.c:562 #, c-format msgid "Error in regex: pcre internal error %d" msgstr "Erreur dans la regex : erreur pcre interne %d" -#: src/lang.c:559 +#: src/lang.c:563 #, c-format msgid "Error in regex: study - pcre internal error %s" msgstr "Erreur dans la regex : study - erreur pcre interne %s" -#: src/lang.c:560 +#: src/lang.c:564 msgid "Post a followup..." msgstr "Postage du suivi..." #. TODO: replace hardcoded key-name in txt_post_error_ask_postpone -#: src/lang.c:562 +#: src/lang.c:566 msgid "An error has occurred while posting the article. If you think that this\n" "error is temporary or otherwise correctable, you can postpone the article\n" "and pick it up again with ^O later.\n" @@ -2373,275 +2376,275 @@ msgstr "Une erreur est survenue lors du "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" -#: src/lang.c:565 +#: src/lang.c:569 msgid "Posted articles history" msgstr "Historique des articles postés" -#: src/lang.c:566 +#: src/lang.c:570 #, c-format msgid "Post to newsgroup(s) [%s]> " msgstr "Poster dans groupe(s) [%s]> " -#: src/lang.c:567 +#: src/lang.c:571 msgid "-- post processing started --" msgstr "-- post-traitement lancé --" -#: src/lang.c:568 +#: src/lang.c:572 msgid "-- post processing completed --" msgstr "-- post-traitement terminé --" -#: src/lang.c:569 +#: src/lang.c:573 #, c-format msgid "Post subject [%s]> " msgstr "Poster le sujet [%s] > " -#: src/lang.c:570 +#: src/lang.c:574 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:571 +#: src/lang.c:575 msgid "Posting article..." msgstr "Postage de l'article..." -#: src/lang.c:572 +#: src/lang.c:576 msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " msgstr "Poster les brouillons [%%s] ? (%s/%s/%s/%s/%s) : " -#: src/lang.c:573 +#: src/lang.c:577 #, c-format msgid "Hot %s" msgstr "%s sélectionné" -#: src/lang.c:574 +#: src/lang.c:578 #, c-format msgid "Tagged %s" msgstr "%s marqué" -#: src/lang.c:575 +#: src/lang.c:579 #, c-format msgid "Untagged %s" msgstr "%s non marqué" -#: src/lang.c:576 +#: src/lang.c:580 msgid "Processing mail messages marked for deletion." msgstr "Traitement des emails enregistrés marqués pour effacement." -#: src/lang.c:577 +#: src/lang.c:581 msgid "Processing saved articles marked for deletion." msgstr "Traitement des articles enregistrés marqués pour effacement." -#: src/lang.c:578 +#: src/lang.c:582 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "Accepter le Suivi ? %s=poster, %s=ignorer, %s=quitter : " -#: src/lang.c:579 +#: src/lang.c:583 msgid "Article unchanged, abort mailing?" msgstr "Article inchangé, annuler l'envoi ?" -#: src/lang.c:580 +#: src/lang.c:584 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "Voulez-vous voir les brouillons (%d) ?" -#: src/lang.c:582 +#: src/lang.c:586 msgid "Add quick kill filter?" msgstr "Ajouter rapidement un filtre ?" -#: src/lang.c:583 +#: src/lang.c:587 msgid "Add quick selection filter?" msgstr "Ajouter rapidement une règle ?" -#: src/lang.c:584 +#: src/lang.c:588 msgid "Do you really want to quit?" msgstr "Voulez-vous réellement quitter ?" -#: src/lang.c:585 +#: src/lang.c:589 msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "%s=éditer message d'annulation, %s=quitter, %s=effacer (annuler) [%%s] : " -#: src/lang.c:586 +#: src/lang.c:590 msgid "You have tagged articles in this group - quit anyway?" msgstr "Vous avez des articles marqués dans ce groupe - quitter quand même ?" -#: src/lang.c:587 +#: src/lang.c:591 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=quitter, %s=éditer, %s=brouillon : " -#: src/lang.c:588 +#: src/lang.c:592 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=quitter, %s=éditer, %s=enregistrer le filtre : " -#: src/lang.c:589 +#: src/lang.c:593 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "%s=quitter %s=éditer %s=enregistrer la règle : " -#: src/lang.c:590 +#: src/lang.c:594 msgid "Do you really want to quit without saving your configuration?" msgstr "Voulez-vous réellement quitter sans enregistrer votre configuration ?" -#: src/lang.c:593 +#: src/lang.c:597 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "Champ invalide - '0-9.$' pe. 1-$ est valide" -#: src/lang.c:594 +#: src/lang.c:598 msgid "Do you want to abort this operation?" msgstr "Voulez-vous annuler cette opération ?" -#: src/lang.c:595 +#: src/lang.c:599 msgid "Do you want to exit tin immediately?" msgstr "Voulez-vous quitter tin immédiatement ?" -#: src/lang.c:596 +#: src/lang.c:600 msgid "Read response> " msgstr "Lire la réponse> " -#: src/lang.c:597 +#: src/lang.c:601 msgid "Reading ('q' to quit)..." msgstr "Lecture ('q' pour quitter)..." -#: src/lang.c:598 +#: src/lang.c:602 #, c-format msgid "Reading %sarticles..." msgstr "Lecture de %sarticles..." -#: src/lang.c:599 +#: src/lang.c:603 #, c-format msgid "Reading %sattributes file...\n" msgstr "Lecture du fichier %sattributes...\n" -#: src/lang.c:600 +#: src/lang.c:604 #, c-format msgid "Reading %sconfig file...\n" msgstr "Lecture du fichier %sconfig...\n" -#: src/lang.c:601 +#: src/lang.c:605 msgid "Reading filter file...\n" msgstr "Lecture du fichier filter...\n" -#: src/lang.c:602 +#: src/lang.c:606 #, c-format msgid "Reading %s groups..." msgstr "Lecture de %s groupes..." -#: src/lang.c:603 +#: src/lang.c:607 msgid "Reading input history file...\n" msgstr "Lecture du fichier d'historique...\n" -#: src/lang.c:604 +#: src/lang.c:608 msgid "Reading keymap file...\n" msgstr "Lecture du fichier keymap...\n" -#: src/lang.c:605 +#: src/lang.c:609 msgid "Reading groups from active file... " msgstr "Lecture des groupes depuis le fichier active... " -#: src/lang.c:606 +#: src/lang.c:610 msgid "Reading groups from newsrc file... " msgstr "Lecture des groupes depuis le fichier newsrc... " -#: src/lang.c:607 +#: src/lang.c:611 msgid "Reading newsgroups file... " msgstr "Lecture du fichier newsgroups... " -#: src/lang.c:608 +#: src/lang.c:612 msgid "Reading newsrc file..." msgstr "Lecture du fichier newsrc..." -#: src/lang.c:610 +#: src/lang.c:614 #, c-format msgid "(%d:%02d remaining)" -msgstr "" +msgstr "(%d:%02d restant)" -#: src/lang.c:612 +#: src/lang.c:616 #, c-format msgid "Bogus group %s removed." msgstr "Effacement du groupe corrompu %s." -#: src/lang.c:613 +#: src/lang.c:617 #, c-format msgid "Error: rename %s to %s" msgstr "Erreur : renommer %s à %s" -#: src/lang.c:614 +#: src/lang.c:618 msgid "Reply to author..." msgstr "Répondre à l'auteur..." -#: src/lang.c:615 +#: src/lang.c:619 msgid "Repost" msgstr "Reposter" -#: src/lang.c:616 +#: src/lang.c:620 msgid "Reposting article..." msgstr "Repostage de l'article..." -#: src/lang.c:617 +#: src/lang.c:621 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "Reposter article(s) dans groupe(s) [%s]> " -#: src/lang.c:618 +#: src/lang.c:622 msgid "Reset newsrc?" msgstr "Réinitialiser newsrc ?" -#: src/lang.c:619 +#: src/lang.c:623 msgid "Responses have been directed to the following newsgroups" msgstr "Les réponses ont été redirigées vers les groupes suivants" -#: src/lang.c:620 +#: src/lang.c:624 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " msgstr "Les réponses ont été redirigées à l'auteur. %s=mail, %s=poster, %s=quitter : " -#: src/lang.c:621 +#: src/lang.c:625 #, c-format msgid "RespNo %4d of %4d" msgstr "Réponse %4d sur %4d" -#: src/lang.c:622 +#: src/lang.c:626 msgid "Press to continue..." -msgstr "Appuyez sur pour continuer..." +msgstr "Appuyez sur pour continuer..." -#: src/lang.c:624 +#: src/lang.c:628 #, c-format msgid "Select From [%s] (y/n): " msgstr " De : [%s] (o/n) : " -#: src/lang.c:625 +#: src/lang.c:629 msgid "Select Lines: (num): " msgstr "Nombre de lignes (num) : " -#: src/lang.c:626 +#: src/lang.c:630 msgid "Auto-select Article Menu" msgstr "Créer une règle" -#: src/lang.c:627 +#: src/lang.c:631 #, c-format msgid "Select Msg-Id [%s] (f/l/o/n): " msgstr " MID : [%s] (t/d/a/n) : " -#: src/lang.c:628 +#: src/lang.c:632 msgid "Select pattern scope: " msgstr "Règle s'appliquant à : " -#: src/lang.c:629 +#: src/lang.c:633 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "Sujet : [%s] (o/n) : " -#: src/lang.c:630 +#: src/lang.c:634 msgid "Select text pattern : " msgstr "Texte ou terme : " -#: src/lang.c:631 +#: src/lang.c:635 msgid "Select time in days : " msgstr "Durée de la règle : " -#: src/lang.c:632 +#: src/lang.c:636 #, c-format msgid "# %s server configuration file\n" "# This file was automatically saved by %s %s %s (\"%s\")\n" @@ -2659,220 +2662,222 @@ msgstr "# Fichier de configuration serve "# Enfin, ne touchez pas à ce fichier si vous ne savez pas quoi y faire.\n" "############################################################################\n" -#: src/lang.c:638 +#: src/lang.c:642 msgid "Showing unread groups only" msgstr "Afficher uniquement les groupes non lus" -#: src/lang.c:639 +#: src/lang.c:643 msgid "Subject: line (ignore case) " msgstr "l'en-tête 'Subject:' (ignorer la casse)" -#: src/lang.c:640 +#: src/lang.c:644 msgid "Subject: line (case sensitive)" msgstr "l'en-tête 'Subject:' (casse sensible)" -#: src/lang.c:641 +#: src/lang.c:645 msgid "Save" msgstr "Enregistrer" -#: src/lang.c:642 +#: src/lang.c:646 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "Enregistrer '%s' (%s/%s) ?" -#: src/lang.c:643 +#: src/lang.c:647 msgid "Save configuration before continuing?" msgstr "Enregistrer la configuration avant de continuer ?" -#: src/lang.c:644 +#: src/lang.c:648 msgid "Save filename> " msgstr "Enregistrer sous le nom de fichier > " -#: src/lang.c:645 +#: src/lang.c:649 msgid "Saved" msgstr "Enregistré" -#: src/lang.c:646 +#: src/lang.c:650 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "%4d non lu (%4d sél.) %s dans %s\n" -#: src/lang.c:647 +#: src/lang.c:651 #, c-format msgid "Saved %s...\n" msgstr "Enregistrement de %s...\n" -#: src/lang.c:648 +#: src/lang.c:652 msgid "Nothing was saved" msgstr "Rien n'a été enregistré" -#: src/lang.c:649 +#: src/lang.c:653 #, c-format msgid "\n" "%s %d %s from %d %s\n" msgstr "\n" "%s %d %s de %d %s\n" -#: src/lang.c:650 +#: src/lang.c:654 #, c-format msgid "-- %s saved to %s%s --" -msgstr "-- %s enregistré dans %s%s --" +msgstr "-- %s enregistré sous %s%s --" -#: src/lang.c:651 +#: src/lang.c:655 #, c-format msgid "-- %s saved to %s - %s --" -msgstr "-- %s enregistré dans %s - %s --" +msgstr "-- %s enregistré sous %s - %s --" -#: src/lang.c:652 +#: src/lang.c:656 msgid "Saving..." msgstr "Enregistrement..." -#: src/lang.c:653 +#: src/lang.c:657 #, c-format msgid "%s: Screen initialization failed" msgstr "%s : Échec de l'initialisation de l'écran" -#: src/lang.c:654 +#: src/lang.c:659 #, c-format msgid "%s: screen is too small\n" msgstr "%s : l'écran est trop petit\n" -#: src/lang.c:655 +#: src/lang.c:661 #, c-format msgid "screen is too small, %s is exiting\n" msgstr "l'écran est trop petit, %s quitte\n" -#: src/lang.c:656 +#: src/lang.c:662 #, c-format msgid "Search backwards [%s]> " -msgstr "Recherche arrière [%s]> " +msgstr "Recherche arrière [%s] > " -#: src/lang.c:657 +#: src/lang.c:663 #, c-format msgid "Search body [%s]> " -msgstr "Rechercher dans le corps [%s]> " +msgstr "Rechercher dans le corps [%s] > " -#: src/lang.c:658 +#: src/lang.c:664 #, c-format msgid "Search forwards [%s]> " -msgstr "Recherche avant [%s]> " +msgstr "Recherche avant [%s] > " -#: src/lang.c:659 +#: src/lang.c:665 msgid "Searching..." msgstr "Recherche..." -#: src/lang.c:660 +#: src/lang.c:666 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "Recherche article %d sur %d ('q' pour annuler)..." -#: src/lang.c:661 +#: src/lang.c:667 msgid "Select article> " msgstr "Sélectionner l'article > " -# TRANSLATION TOO LONG (75 chars max) -#: src/lang.c:662 +#: src/lang.c:668 msgid "Select option number before text or use arrow keys and . 'q' to quit." -msgstr "Choisir un numéro d'option ou utiliser les flèches puis . 'q' pour " - "quitter." +msgstr "Choisir un numéro ou utiliser les flèches puis . 'q' pour quitter." -#: src/lang.c:663 +#: src/lang.c:669 msgid "Select group> " msgstr "Sélectionner le groupe > " -#: src/lang.c:664 +#: src/lang.c:670 #, c-format msgid "Enter selection pattern [%s]> " -msgstr "Entrez le critère de sélection [%s]> " +msgstr "Entrez le critère de sélection [%s] > " -#: src/lang.c:665 +#: src/lang.c:671 msgid "Select thread > " msgstr "Sélectionner le fil > " -#: src/lang.c:666 +#: src/lang.c:672 #, c-format msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" msgstr "%s %s %s (\"%s\") [%s]: envoi d'un rapport de bug DÉTAILLÉ à %s\n" -#: src/lang.c:667 +#: src/lang.c:673 msgid "servers active-file" msgstr "fichier active des serveurs" -#: src/lang.c:668 +#: src/lang.c:674 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "Déplacement dans nouveaux groupes impossible. Abonnez-vous d'abord..." -#: src/lang.c:669 +#: src/lang.c:675 msgid "" msgstr "" -#: src/lang.c:670 +#: src/lang.c:676 #, c-format msgid "Starting: (%s)" msgstr "Démarrage : (%s)" -#: src/lang.c:671 +#: src/lang.c:677 #, c-format msgid "List Thread (%d of %d)" msgstr "Visualisation du fil (%d sur %d)" -#: src/lang.c:672 +#: src/lang.c:678 #, c-format msgid "Thread (%.*s)" msgstr "Fil (%.*s)" -#: src/lang.c:673 +#: src/lang.c:679 msgid "Enter wildcard subscribe pattern> " msgstr "Entrer un caractère joker comme critère > " -#: src/lang.c:674 +#: src/lang.c:680 #, c-format msgid "subscribed to %d groups" msgstr "Abonné à %d groupes" -#: src/lang.c:675 +#: src/lang.c:681 #, c-format msgid "Subscribed to %s" msgstr "Abonné à %s" -#: src/lang.c:676 +#: src/lang.c:682 msgid "Subscribing... " msgstr "Abonnement..." -#: src/lang.c:677 +#: src/lang.c:683 msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " msgstr "Reposter ou remplacer le(s) article(s) [%%s]? (%s/%s/%s) : " -#: src/lang.c:678 +#: src/lang.c:684 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "Remplacer le(s) article(s) du(es) groupe(s) [%s] > " -#: src/lang.c:679 +#: src/lang.c:685 msgid "Superseding article ..." msgstr "Remplacement de l'article..." -#: src/lang.c:680 +#: src/lang.c:686 #, c-format msgid "\n" "Stopped. Type 'fg' to restart %s\n" msgstr "\n" "Arrêté. Tapez 'fg' pour relancer %s\n" -#: src/lang.c:682 +#: src/lang.c:688 #, c-format msgid "%d days" msgstr "%d jours" -#: src/lang.c:683 +#: src/lang.c:689 msgid "" msgstr "" -#: src/lang.c:684 +#: src/lang.c:690 +msgid "TeX " +msgstr "TeX " + +#: src/lang.c:691 msgid "# Default action/prompt strings\n" msgstr "# Termes action/prompt par défaut\n" -#: src/lang.c:685 +#: src/lang.c:692 msgid "# Defaults for quick (1 key) kill & auto-selection filters\n" "# header=NUM 0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n" "# 5=Message-ID: & last References: entry only\n" @@ -2890,266 +2895,267 @@ msgstr "# Réglages par défaut pour les f "# case=ON/OFF ON=filtre sensible à la casse OFF=filtre insensible\n" "# expire=ON/OFF ON=durée d'après default_filter_days OFF=n'expire jamais\n" -#: src/lang.c:698 +#: src/lang.c:705 msgid "# If ON use print current subject or newsgroup description in the last line\n" -msgstr "# Si ON affiche le sujet actuel ou la description du groupe dans la dernière " - "ligne\n" +msgstr "# Si ON, affiche le sujet actuel ou la description du groupe dans la " + "dernière\n" + "# ligne\n" -#: src/lang.c:699 +#: src/lang.c:706 msgid "# Host & time info used for detecting new groups (don't touch)\n" msgstr "# Info sur l'hôte & l'heure utilisées pour détecter les nouveaux groupes (ne " "pas toucher)\n" -#: src/lang.c:700 +#: src/lang.c:707 msgid "There is no news\n" msgstr "Rien de neuf\n" -#: src/lang.c:701 +#: src/lang.c:708 msgid "Thread" msgstr "Fil" -#: src/lang.c:702 +#: src/lang.c:709 msgid "Thread Level Commands" msgstr "Commandes pour fil" -#: src/lang.c:703 +#: src/lang.c:710 msgid "Thread deselected" msgstr "Fil désélectionné" -#: src/lang.c:704 +#: src/lang.c:711 msgid "Thread selected" msgstr "Fil sélectionné" -#: src/lang.c:705 +#: src/lang.c:712 msgid "threads" msgstr "fils" -#: src/lang.c:706 +#: src/lang.c:713 msgid "Thread range" msgstr "Champ du fil" -#: src/lang.c:707 +#: src/lang.c:714 msgid "thread" msgstr "fil" -#: src/lang.c:708 +#: src/lang.c:715 #, c-format msgid "Thread %4s of %4s" msgstr " Fil %4s sur %4s" -#: src/lang.c:709 +#: src/lang.c:716 msgid "Threading articles..." msgstr "Regroupement des articles..." -#: src/lang.c:710 +#: src/lang.c:717 #, c-format msgid "Toggled word highlighting %s" msgstr "(Dés)activer surbrillance %s" -#: src/lang.c:711 +#: src/lang.c:718 msgid "Toggled rot13 encoding" msgstr "(Dés)activer codage rot13" -#: src/lang.c:712 +#: src/lang.c:719 #, c-format msgid "Toggled german TeX encoding %s" msgstr "(Dés)activer codage TeX Allemand %s" -#: src/lang.c:713 +#: src/lang.c:720 #, c-format msgid "Toggled tab-width to %d" msgstr "(Dés)activer largeur de tabulation à %d" -#: src/lang.c:714 +#: src/lang.c:721 #, c-format msgid "%d Trying to dotlock %s" msgstr "%d essaye de déverrouiller %s" -#: src/lang.c:715 +#: src/lang.c:722 #, c-format msgid "%d Trying to lock %s" msgstr "%d essaye de verrouiller %s" -#: src/lang.c:716 +#: src/lang.c:723 msgid " h=help\n" msgstr " h=aide\n" -#: src/lang.c:718 +#: src/lang.c:725 msgid "Unlimited" msgstr "Illimitée" -#: src/lang.c:719 +#: src/lang.c:726 msgid "Enter wildcard unsubscribe pattern> " msgstr "Terme joker pour se désabonner > " -#: src/lang.c:720 +#: src/lang.c:727 #, c-format msgid "Error decoding %s : %s" msgstr "Erreur lors du décodage de %s : %s" -#: src/lang.c:721 +#: src/lang.c:728 msgid "No end." msgstr "Pas de fin." -#: src/lang.c:722 +#: src/lang.c:729 #, c-format msgid "%s successfully decoded." msgstr "%s décodé avec succès." -#: src/lang.c:723 +#: src/lang.c:730 #, c-format msgid "%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" "\n" msgstr "%*s[-- %s/%s, %sfichier uuencodé, %d lignes, nom : %s --]\n" "\n" -#: src/lang.c:724 +#: src/lang.c:731 msgid "unread " msgstr "non lu" -#: src/lang.c:725 +#: src/lang.c:732 #, c-format msgid "unsubscribed from %d groups" msgstr "désabonné de %d groupes" -#: src/lang.c:726 +#: src/lang.c:733 #, c-format msgid "Unsubscribed from %s" msgstr "Désabonné de %s" -#: src/lang.c:727 +#: src/lang.c:734 msgid "Unsubscribing... " msgstr "Désabonnement..." -#: src/lang.c:728 +#: src/lang.c:735 msgid "Unthreading articles..." msgstr "Dégroupement des articles..." -#: src/lang.c:729 +#: src/lang.c:736 msgid "Updated" msgstr "Mis à jour" -#: src/lang.c:730 +#: src/lang.c:737 msgid "Updating" msgstr "Rafraîchissement" -#: src/lang.c:731 +#: src/lang.c:738 #, c-format msgid "Opening %s\n" msgstr "Ouverture de %s\n" -#: src/lang.c:732 +#: src/lang.c:739 msgid "No more URL's in this article" msgstr "Plus d'URL dans cet article" -#: src/lang.c:733 +#: src/lang.c:740 msgid "Use MIME display program for this message?" msgstr "Utiliser le programme d'affichage MIME pour ce message ?" -#: src/lang.c:734 +#: src/lang.c:741 msgid " -c mark all news as read in subscribed newsgroups (batch mode)" msgstr " -c marquer tous les articles lus dans les groupes abonnés (en tâche " "de fond)" -#: src/lang.c:735 +#: src/lang.c:742 msgid " -Z return status indicating if any unread news (batch mode)" msgstr " -Z retourne un statut indiquant s'il y a nouveaux articles (en tâche " "de fond)" -#: src/lang.c:736 +#: src/lang.c:743 msgid " -q don't check for new newsgroups" msgstr " -q ne pas vérifier s'il y a des nouveaux groupes" -#: src/lang.c:737 +#: src/lang.c:744 msgid " -X don't save any files on quit" msgstr " -X ne pas enregistrer de fichiers à la fermeture" -#: src/lang.c:738 +#: src/lang.c:745 msgid " -d don't show newsgroup descriptions" msgstr " -d ne pas afficher les descriptions des groupes" -#: src/lang.c:739 +#: src/lang.c:746 msgid " -G limit get only limit articles/group" msgstr " -G nombre d'articles par groupe limite" -#: src/lang.c:740 +#: src/lang.c:747 #, c-format msgid " -H help information about %s" msgstr " -H aide à propos de %s" -#: src/lang.c:741 +#: src/lang.c:748 msgid " -h this help message" msgstr " -h ce message d'aide" -#: src/lang.c:742 +#: src/lang.c:749 #, c-format msgid " -I dir news index file directory [default=%s]" -msgstr " -I rép. dossier du fichier index [défaut=%s]" +msgstr " -I rép. répertoire du fichier index [défaut=%s]" -#: src/lang.c:743 +#: src/lang.c:750 msgid " -u update index files (batch mode)" msgstr " -u màj des fichiers index (en tâche de fond)" -#: src/lang.c:744 +#: src/lang.c:751 #, c-format msgid " -m dir mailbox directory [default=%s]" -msgstr " -m rép. dossier des bàl [défaut=%s]" +msgstr " -m rép. répertoire des bàl [défaut=%s]" -#: src/lang.c:745 +#: src/lang.c:752 #, c-format msgid "\n" "Mail bug reports/comments to %s" msgstr "\n" "Envoyez par mail vos rapports de bugs/suggestions à %s" -#: src/lang.c:746 +#: src/lang.c:753 msgid " -N mail new news to your posts (batch mode)" msgstr " -N envoyer toute réponse à vos articles (en tâche de fond)" -#: src/lang.c:747 +#: src/lang.c:754 msgid " -M user mail new news to specified user (batch mode)" msgstr " -M util. envoyer tout nouvel article à une personne (en tâche de fond)" -#: src/lang.c:748 +#: src/lang.c:755 #, c-format msgid " -f file subscribed to newsgroups file [default=%s]" msgstr " -f fich. abonné au fichier groupes [défaut=%s]" -#: src/lang.c:749 +#: src/lang.c:756 msgid " -x no posting mode" -msgstr "" +msgstr " -x mode postage OFF" -#: src/lang.c:750 +#: src/lang.c:757 msgid " -w post an article and exit" -msgstr "" +msgstr " -w poster un article puis quitter" -#: src/lang.c:751 +#: src/lang.c:758 msgid " -o post all postponed articles and exit" msgstr " -o poster tous les brouillons puis quitter" -#: src/lang.c:752 +#: src/lang.c:759 msgid " -r read news remotely from default NNTP server" msgstr " -r lire les articles depuis le serveur NNTP par défaut" -#: src/lang.c:753 +#: src/lang.c:760 msgid " -R read news saved by -S option" msgstr " -R lire les articles enregistrés via l'option -S" -#: src/lang.c:754 +#: src/lang.c:761 #, c-format msgid " -s dir save news directory [default=%s]" -msgstr " -s rép. dossier où enregistrer les articles [défaut=%s]" +msgstr " -s rép. répertoire où enregistrer les articles [défaut=%s]" -#: src/lang.c:755 +#: src/lang.c:762 msgid " -S save new news for later reading (batch mode)" msgstr " -S enregistrer tout nouvel article pour lecture différée (en tâche de " "fond)" -#: src/lang.c:756 +#: src/lang.c:763 msgid " -z start if any unread news" msgstr " -z lancer si articles non lus" -#: src/lang.c:757 +#: src/lang.c:764 #, c-format msgid "A Usenet reader.\n" "\n" @@ -3157,37 +3163,37 @@ msgid "A Usenet reader.\n" msgstr "Un lecteur UseNet.\n" "Usage : %s [options] [groupe[,...]]" -#: src/lang.c:758 +#: src/lang.c:765 msgid " -v verbose output for batch mode options" msgstr " -v sortie détaillée pour options en tâche de fond" -#: src/lang.c:759 +#: src/lang.c:766 msgid " -V print version & date information" msgstr " -V afficher infos date & version" -#: src/lang.c:760 +#: src/lang.c:767 #, c-format msgid "%s only useful without batch mode operations\n" msgstr "%s utile seulement sans opérations en tâche de fond\n" -#: src/lang.c:761 +#: src/lang.c:768 #, c-format msgid "%s only useful for batch mode operations\n" msgstr "%s utile seulement pour opérations en tâche de fond\n" -#: src/lang.c:763 +#: src/lang.c:770 #, c-format msgid "\n" "%s%d out of range (0 - %d). Reset to 0" msgstr "\n" "%s%d expiré (0 - %d). Remis à 0" -#: src/lang.c:764 +#: src/lang.c:771 #, c-format msgid "View '%s' (%s/%s)?" msgstr "Vue '%s' (%s/%s) ?" -#: src/lang.c:766 +#: src/lang.c:773 #, c-format msgid "\n" "Warning: posting exceeds %d columns. Line %d is the first long one:\n" @@ -3197,26 +3203,26 @@ msgstr "\n" ":\n" "%-100s\n" -#: src/lang.c:767 +#: src/lang.c:774 msgid "\n" "Warning: article unchanged after editing\n" msgstr "\n" "Attention : article inchangé après son édition\n" -#: src/lang.c:768 +#: src/lang.c:775 msgid "\n" "Warning: \"Subject:\" contains only whitespaces.\n" msgstr "\n" "Attention : \"Subject:\" contient que des espaces.\n" -#: src/lang.c:769 +#: src/lang.c:776 msgid "\n" "Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:\".\n" msgstr "\n" "Attention : \"Subject:\" commence par \"Re: \" mais il n'y a pas de " "\"References:\".\n" -#: src/lang.c:771 +#: src/lang.c:778 msgid "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" " with \"Re: \" and does not contain \"(was:\".\n" @@ -3224,7 +3230,7 @@ msgstr "\n" "Attention : L'article a \"References:\" mais \"Subject:\" ne commence\n" " avec \"Re: \" et ne contient pas \"(was:\".\n" -#: src/lang.c:774 +#: src/lang.c:781 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly written by you. This will " @@ -3246,7 +3252,7 @@ msgstr "Lisez ceci attentivement !\n" "Voici l'article que vous vous apprêtez à effacer :\n" "\n" -#: src/lang.c:778 +#: src/lang.c:785 msgid "\n" "Warning: You are using a non-plain transfer encoding (such as base64 or\n" " quoted-printable) and an external inews program to submit your\n" @@ -3258,7 +3264,7 @@ msgstr "\n" " votre article. Si une signature y est ajoutée par cet inews,\n" " elle ne sera pas encodée correctement.\n" -#: src/lang.c:783 +#: src/lang.c:790 #, c-format msgid "\n" "\n" @@ -3271,7 +3277,7 @@ msgstr "\n" "Certaines valeurs dans votre fichier %s ont changé !\n" "Lisez le fichier WHATSNEW, etc...\n" -#: src/lang.c:785 +#: src/lang.c:792 #, c-format msgid "\n" "\n" @@ -3280,35 +3286,35 @@ msgid "\n" msgstr "\n" "\n" "Vous repassez à tin %s depuis une version plus récente !\n" - "Certaines valeurs dans votre fichier %s peuvent être ignorés, d'autres\n" - "ont peut-être changés !\n" + "Certaines valeurs dans votre fichier %s peuvent être ignorées, d'autres\n" + "ont peut-être changées !\n" -#: src/lang.c:788 +#: src/lang.c:795 #, c-format msgid "Warning: tin wrote fewer groups to your\n" "\t%s\n" "than it read at startup. If you didn't unsubscribe from %ld %s during\n" "this session this indicates an error and you should backup your %s\n" "before you start tin once again!\n" -msgstr "Attention : tin a écrit quelque groupes dans votre\n" +msgstr "Attention : tin a modifié quelque groupes dans votre\n" "\t%s\n" "qui est lu au lancement. Si vous ne vous êtes pas désabonné de %ld %s\n" "lors de cette session, cela indique une erreur et vous devriez sauvegarder\n" "votre %s avant de relancer tin !\n" -#: src/lang.c:792 +#: src/lang.c:799 #, c-format msgid "\n" "Warning: Found %d '-- \\n' lines, this may confuse some people.\n" msgstr "\n" "Attention : %d lignes '-- \\n' trouvées, cela peut prêter à confusion.\n" -#: src/lang.c:793 +#: src/lang.c:800 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "Attention : Seul %d sur %d articles ont été enregistrés" -#: src/lang.c:794 +#: src/lang.c:801 #, c-format msgid "\n" "Warning: Your signature is longer than %d lines. Since signatures usually " @@ -3323,50 +3329,50 @@ msgstr "\n" "d'être\n" " le plus court possible.\n" -#: src/lang.c:798 +#: src/lang.c:805 #, c-format msgid "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " msgstr "Attention : cette email peut contenir un piège à spam. %s=continuer, " "%s=annuler ?" -#: src/lang.c:799 +#: src/lang.c:806 msgid "\n" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" msgstr "\n" "Attention : Les signatures doivent commencer avec '-- \\n' et non par '-- " "\\n'.\n" -#: src/lang.c:800 +#: src/lang.c:807 msgid "Writing attributes file..." msgstr "Écriture du fichier attributes..." -#: src/lang.c:802 +#: src/lang.c:809 #, c-format msgid "%d Responses" msgstr "%d Réponses" -#: src/lang.c:804 +#: src/lang.c:811 #, c-format msgid "Added %d %s" msgstr "%d %s ajouté(s)" -#: src/lang.c:805 +#: src/lang.c:812 msgid "No unsubscribed groups to show" msgstr "Aucuns groupes non abonnés à afficher" -#: src/lang.c:806 +#: src/lang.c:813 msgid "Showing subscribed to groups only" msgstr "Afficher uniquement les groupes abonnés" -#: src/lang.c:807 +#: src/lang.c:814 msgid "Yes " msgstr "Oui " -#: src/lang.c:808 +#: src/lang.c:815 msgid " You have mail\n" msgstr " Nouveau mail\n" -#: src/lang.c:813 +#: src/lang.c:820 #, c-format msgid "\n" "Warning: Posting is in %s and contains characters which are not\n" @@ -3381,20 +3387,20 @@ msgstr "\n" " sont pas dans votre MM_NETWORK_CHARSET: %s.\n" " Ces caractères seront remplacés par '?' si vous laissez cet\n" " article inchangé. Pour éviter de réduire en bouillie votre\n" - " article, soit éditez-le, soit enlever les caractères posant\n" + " article, soit éditez-le, soit enlevez les caractères posant\n" " problème, ou bien changer la valeur de MM_NETWORK_CHARSET\n" " via le M)enu.\n" -#: src/lang.c:824 +#: src/lang.c:831 #, c-format msgid "Redefined key %s '%s' -> '%s'\n" msgstr "Clé %s redéfinie '%s' -> '%s'\n" -#: src/lang.c:825 +#: src/lang.c:832 msgid " -D debug mode 1=NNTP 2=ALL" msgstr " -D mode debug 1=NNTP 2=TOUS" -#: src/lang.c:829 +#: src/lang.c:836 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly not written by you. This " @@ -3421,68 +3427,91 @@ msgstr "Lisez ceci attentivement !\n" "Voici l'article que vous vous apprêtez a effacer :\n" "\n" -#: src/lang.c:838 +#: src/lang.c:845 msgid "toggle color" msgstr "(dés)activer la couleur" -#: src/lang.c:839 -msgid "# For color-adjust use the following numbers\n" - "# 0-black 1-red 2-green 3-brown\n" - "# 4-blue 5-pink 6-cyan 7-white\n" +#: src/lang.c:846 +msgid "# Changing colors of several screen parts\n" + "# Possible values are:\n" + "# -1 = default (white for foreground and black for background)\n" + "# 0 = black\n" + "# 1 = red\n" + "# 2 = green\n" + "# 3 = brown\n" + "# 4 = blue\n" + "# 5 = pink\n" + "# 6 = cyan\n" + "# 7 = white\n" "# These are *only* for foreground:\n" - "# 8-gray 9-lightred 10-lightgreen 11-yellow\n" - "# 12-lightblue 13-lightpink 14-lightcyan 15-lightwhite\n" - "# A '-1' is interpreted as default (foreground normally is white, and\n" - "# background black)\n" + "# 8 = gray\n" + "# 9 = light red\n" + "# 10 = light green\n" + "# 11 = yellow\n" + "# 12 = light blue\n" + "# 13 = light pink\n" + "# 14 = light cyan\n" + "# 15 = light white\n" "\n" -msgstr "# Pour ajuster les couleurs utilisez les nombres suivants\n" - "# 0-noir 1-rouge 2-vert 3-marron\n" - "# 4-bleu 5-rose 6-cyan 7-blanc\n" - "# Celles-là sont *uniquement* pour l'arrière-plan :\n" - "# 8-gris 9-rouge gras 10-vert gras 11-jaune\n" - "# 12-bleu gras 13-rose gras 14-cyan gras 15-blanc gras\n" - "# '-1' est interprété comme défaut (l'avant-plan est normalement blanc,\n" - "# et l'arrière-plan noir)\n" +msgstr "# Changer la couleur de plusieurs parties de l'écran\n" + "# Les valeurs possibles sont :\n" + "# -1 = défaut (blanc pour l'avant-plan et noir pour l'arrière-plan)\n" + "# 0 = noir\n" + "# 1 = rouge\n" + "# 2 = vert\n" + "# 3 = marron\n" + "# 4 = bleu\n" + "# 5 = rose\n" + "# 6 = cyan\n" + "# 7 = blanc\n" + "# Les valeurs suivantes ne sont *que* pour l'avant-plan :\n" + "# 8 = gris\n" + "# 9 = rouge gras\n" + "# 10 = vert gras\n" + "# 11 = jaune\n" + "# 12 = bleu grasn# 13 = rose gras\n" + "# 14 = cyan gras\n" + "# 15 = blanc gras\n" "\n" -#: src/lang.c:847 +#: src/lang.c:866 msgid " -a toggle color flag" msgstr " -a change la couleur" -#: src/lang.c:851 +#: src/lang.c:870 msgid "\n" "Error: Followup-To set to more than one newsgroup!\n" msgstr "\n" "Erreur : Suivi positionné sur plus d'un groupe !\n" -#: src/lang.c:852 +#: src/lang.c:871 #, c-format msgid "\n" "Error: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "\n" "Erreur : multi-postage vers %d groupes et pas de ligne Followup-To !\n" -#: src/lang.c:853 +#: src/lang.c:872 #, c-format msgid "\n" "Error: \"%s\" is not a valid newsgroup!\n" msgstr "\n" "Erreur : \"%s\" n'est pas un groupe valide !\n" -#: src/lang.c:855 +#: src/lang.c:874 msgid "\n" "Warning: Followup-To set to more than one newsgroup!\n" msgstr "\n" "Attention : Suivi positionné sur plus d'un groupe !\n" -#: src/lang.c:856 +#: src/lang.c:875 #, c-format msgid "\n" "Warning: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "\n" "Attention : multi-postage vers %d groupes et aucun suivi !\n" -#: src/lang.c:857 +#: src/lang.c:876 #, c-format msgid "\n" "Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n" @@ -3491,307 +3520,307 @@ msgstr "\n" " pas apparaître dans ce groupe !\n" "\n" -#: src/lang.c:858 +#: src/lang.c:877 #, c-format msgid "\n" "Warning: \"%s\" is not a valid newsgroup at this site!\n" msgstr "\n" "Attention : \"%s\" n'est pas un groupe valide !\n" -#: src/lang.c:862 +#: src/lang.c:881 #, c-format msgid "%d files successfully written from %d articles. %d %s occurred." msgstr "%d fichiers des %d articles écrits avec succès. %d %s est survenu." -#: src/lang.c:863 +#: src/lang.c:882 msgid "Missing parts." msgstr "Parties manquantes" -#: src/lang.c:864 +#: src/lang.c:883 msgid "No beginning." msgstr "Pas de début." -#: src/lang.c:865 +#: src/lang.c:884 msgid "No data." msgstr "Pas de données." -#: src/lang.c:866 +#: src/lang.c:885 msgid "Unknown error." msgstr "Erreur inconnue." -#: src/lang.c:868 +#: src/lang.c:887 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "\tSomme de contrôle de %s (%ld %s)" -#: src/lang.c:872 +#: src/lang.c:891 msgid "Reading mail active file... " msgstr "Lecture du fichier active mail... " -#: src/lang.c:873 +#: src/lang.c:892 msgid "Reading mailgroups file... " msgstr "Lecture du fichier mailgroups... " -#: src/lang.c:877 +#: src/lang.c:896 msgid "perform PGP operations on article" msgstr "effectuer des opérations PGP sur l'article" -#: src/lang.c:878 +#: src/lang.c:897 msgid "Add key(s) to public keyring?" msgstr "Ajouter les clé(s) au cercle public ?" -#: src/lang.c:879 +#: src/lang.c:898 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "%s=encoder, %s=signer, %s=les deux, %s=quitter : " -#: src/lang.c:880 +#: src/lang.c:899 #, c-format msgid "%s=sign, %s=sign & include public key, %s=quit: " msgstr "%s=signer, %s=sig. & inclure clé publique, %s=quitter : " -#: src/lang.c:881 +#: src/lang.c:900 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "PGP n'a pas été configuré (ouverture de %s impossible)" -#: src/lang.c:882 +#: src/lang.c:901 msgid "Article not signed and no public keys found" msgstr "Article non signé et pas de clés publiques trouvées" -#: src/lang.c:884 +#: src/lang.c:903 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "%s=quitter, %s=éditer, %s=ispell, %s=pgp, %s=menu, %s=poster, %s=brouillon : " -#: src/lang.c:885 +#: src/lang.c:904 msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " msgstr "%s=quitter, %s=éditer, %s=ispell, %s=pgp, %s=envoyer [%%s] : " -#: src/lang.c:886 +#: src/lang.c:905 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:888 +#: src/lang.c:907 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "%s=quitter, %s=éditer, %s=pgp, %s=menu, %s=poster, %s=brouillon : " -#: src/lang.c:889 +#: src/lang.c:908 msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "%s=quitter, %s=éditer, %s=pgp, %s=envoyer [%%s] : " -#: src/lang.c:890 +#: src/lang.c:909 msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=quitter, %s=éditer, %s=pgp, %s=menu, %s=poster, %s=brouillon [%%s] : " -#: src/lang.c:894 +#: src/lang.c:913 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " msgstr "%s=quitter, %s=éditer, %s=ispell, %s=menu, %s=poster, %s=brouillon : " -#: src/lang.c:895 +#: src/lang.c:914 msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "%s=quitter, %s=éditer, %s=ispell, %s=envoyer [%%s] : " -#: src/lang.c:896 +#: src/lang.c:915 msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=quitter, %s=éditer, %s=ispell, %s=menu, %s=poster, %s=brouillon [%%s] : " -#: src/lang.c:898 +#: src/lang.c:917 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "%s=quitter, %s=éditer, %s=menu, %s=poster, %s=brouillon : " -#: src/lang.c:899 +#: src/lang.c:918 msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "%s=quitter, %s=éditer, %s=envoyer [%%s] : " -#: src/lang.c:900 +#: src/lang.c:919 msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=quitter, %s=éditer, %s=menu, %s=poster, %s=brouillon [%%s]: " -#: src/lang.c:909 +#: src/lang.c:928 msgid "Try cache_overview_files to speed up things.\n" msgstr "Activez 'cache_overview_files' pour accélérer les choses.\n" -#: src/lang.c:910 +#: src/lang.c:929 msgid "Tin will use local index files instead.\n" msgstr "Tin utilisera à la place un index local.\n" -#: src/lang.c:911 +#: src/lang.c:930 msgid "Cannot find NNTP server name" msgstr "Nom du serveur NNTP introuvable" -#: src/lang.c:912 +#: src/lang.c:931 #, c-format msgid "Connecting to %s:%d..." msgstr "Connexion à %s:%d..." -#: src/lang.c:913 +#: src/lang.c:932 msgid "Disconnecting from server...\n" msgstr "Déconnexion du serveur...\n" -#: src/lang.c:914 +#: src/lang.c:933 #, c-format msgid "Wrong newsgroup name in response of GROUP command, %s for %s" msgstr "Nom de groupe erroné dans la réponse de la cmd GROUP, %s pour %s" -#: src/lang.c:915 +#: src/lang.c:934 #, c-format msgid "Failed to connect to NNTP server %s. Exiting..." msgstr "Échec de la connexion au serveur NNTP %s. Fermeture..." -#: src/lang.c:916 +#: src/lang.c:935 msgid "205 Closing connection" -msgstr "205 Fermeture de la connexion" +msgstr "205 Fermeture de la connexion" -#: src/lang.c:917 +#: src/lang.c:936 msgid "Your server does not support the NNTP XOVER or OVER command.\n" msgstr "Votre serveur ne supporte pas la commande NNTP XOVER ou OVER.\n" -#: src/lang.c:918 +#: src/lang.c:937 msgid "Connection to news server has timed out. Reconnect?" msgstr "Connexion au serveur de nouvelles expirée. Se reconnecter ?" -#: src/lang.c:919 +#: src/lang.c:938 #, c-format msgid "Put the server name in the file %s,\n" "or set the environment variable NNTPSERVER" msgstr "Mettez le nom du serveur dans le fichier %s,\n" "ou utilisez la variable d'environnement NNTPSERVER" -#: src/lang.c:920 +#: src/lang.c:939 msgid " -A force authentication on connect" msgstr " -A force l'authentication à la connexion" -#: src/lang.c:921 +#: src/lang.c:940 #, c-format msgid " -g serv read news from NNTP server serv [default=%s]" msgstr " -g serv lire depuis le serveur NNTP serv [défaut=%s]" -#: src/lang.c:922 +#: src/lang.c:941 #, c-format msgid " -p port use port as NNTP port [default=%d]" msgstr " -p port utiliser port comme port NNTP [défaut=%d]" -#: src/lang.c:923 +#: src/lang.c:942 msgid " -Q quick start. Same as -nqd" msgstr " -Q démarrage rapide. Idem que -npd" -#: src/lang.c:924 +#: src/lang.c:943 msgid " -l use only LIST instead of GROUP (-n) command" msgstr " -l utilise seulement LIST plutôt que GROUP (-n)" -#: src/lang.c:925 +#: src/lang.c:944 msgid " -n only read subscribed .newsrc groups from NNTP server" msgstr " -n lire seulement groupes abonnés du .newsrc depuis le serveur NNTP" -#: src/lang.c:927 +#: src/lang.c:946 #, c-format msgid "%s/tcp: Unknown service.\n" msgstr "%s/tcp : Service inconnu.\n" -#: src/lang.c:930 +#: src/lang.c:949 msgid "\n" "socket or connect problem\n" msgstr "\n" "problème de socket ou de connexion\n" -#: src/lang.c:932 +#: src/lang.c:951 #, c-format msgid "\n" "Connection to %s: " msgstr "\n" "Connexion à %s : " -#: src/lang.c:933 +#: src/lang.c:952 msgid "Giving up...\n" msgstr "Abandon...\n" -#: src/lang.c:936 +#: src/lang.c:955 msgid "Your server does not have Xref: in its XOVER information.\n" "Tin will try to use XHDR XREF instead (slows down things a bit).\n" msgstr "Votre serveur n'a pas d'Xref: dans son information XOVER.\n" "Tin essayera d'utiliser XHDR XREF à la place (plus lent).\n" -#: src/lang.c:939 +#: src/lang.c:958 msgid "Your server does not have Xref: in its XOVER information.\n" msgstr "Votre serveur n'a pas d'Xref: dans son information XOVER.\n" -#: src/lang.c:942 +#: src/lang.c:961 #, c-format msgid "Can't open %s. Try %s -r to read news via NNTP.\n" msgstr "Ouverture de %s impossible. Essayez %s -r pour lire via NNTP.\n" -#: src/lang.c:945 +#: src/lang.c:964 msgid " -Q quick start. Same as -qd" msgstr " -Q démarrage rapide. Idem que -qd" -#: src/lang.c:946 +#: src/lang.c:965 msgid " -l read only active file instead of scanning spool (-n) command" msgstr " -l lire seulement le fichier active plutôt que le spool (-n)" -#: src/lang.c:947 +#: src/lang.c:966 msgid " -n only read subscribed .newsrc groups from spool" msgstr " -n lire seulement groupes abonnés du .newsrc depuis le spool" -#: src/lang.c:948 +#: src/lang.c:967 msgid "Your server does not have Xref: in its NOV-files.\n" msgstr "Votre serveur n'a pas d'Xref: dans ses fichiers NOV.\n" -#: src/lang.c:952 +#: src/lang.c:971 msgid "Posting using external inews failed. Use built in inews instead?" msgstr "Le postage avec l'inews externe à échoué. Utiliser l'inews intégré ?" -#: src/lang.c:953 +#: src/lang.c:972 msgid "It worked! Should I always use my built in inews from now on?" msgstr "Ca a marché ! Devrais-je toujours utiliser mon inews intégré à présent ?" -#: src/lang.c:961 +#: src/lang.c:980 #, c-format msgid "%d %s printed" msgstr "%d %s imprimé" -#: src/lang.c:962 +#: src/lang.c:981 msgid "output article/thread/hot/pattern/tagged articles to printer" msgstr "envoyer article/fil/sél./articles marqués à l'imprimante" -#: src/lang.c:963 +#: src/lang.c:982 msgid "Print" msgstr "Imprimer" -#: src/lang.c:964 +#: src/lang.c:983 msgid "Printing..." msgstr "Impression..." -#: src/lang.c:968 +#: src/lang.c:987 msgid "pipe article/thread/hot/pattern/tagged articles into command" msgstr "passer article/fil/sél./articles marqués à une commande" -#: src/lang.c:969 +#: src/lang.c:988 msgid "No command" msgstr "Aucune commande" -#: src/lang.c:970 +#: src/lang.c:989 msgid "Pipe" msgstr "Passer (pipe)" -#: src/lang.c:971 +#: src/lang.c:990 #, c-format msgid "Pipe to command [%.*s]> " msgstr "Passer à la commande [%.*s] > " -#: src/lang.c:972 +#: src/lang.c:991 msgid "Piping..." msgstr "Passage..." -#: src/lang.c:974 +#: src/lang.c:993 msgid "Piping not enabled." msgstr "Passage non activé." -#: src/lang.c:978 +#: src/lang.c:997 #, c-format msgid "\n" "Error: The \"%s:\" line has spaces in it that MUST be removed.\n" @@ -3804,7 +3833,7 @@ msgstr "\n" " du contenu. Utilisez une virgule (,) pour séparer de multiples\n" " noms de groupes.\n" -#: src/lang.c:983 +#: src/lang.c:1002 #, c-format msgid "\n" "Error: The \"%s:\" line is continued in the next line. Since\n" @@ -3815,7 +3844,7 @@ msgstr "\n" " Comme la ligne ne contient pas d'espace, ce n'est pas autorisé.\n" " Inscrivez svp tous les groupes sur une seule ligne.\n" -#: src/lang.c:988 +#: src/lang.c:1007 #, c-format msgid "\n" "Warning: The \"%s:\" line is continued in the next line.\n" @@ -3828,7 +3857,7 @@ msgstr "\n" " Pour éviter les problèmes, indiquez tous les groupes sur une\n" " seule ligne.\n" -#: src/lang.c:992 +#: src/lang.c:1011 #, c-format msgid "\n" "Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n" @@ -3836,7 +3865,7 @@ msgstr "\n" "Attention : La ligne \"%s:\" contient un ou des espaces qui DOIVENT\n" " être enlevés.\n" -#: src/lang.c:997 +#: src/lang.c:1016 msgid "\n" " If your article contains quoted text please take some time to pare it " "down\n" @@ -3870,905 +3899,976 @@ msgstr "\n" "simples\n" " règles, pratiquement toutes les personnes ignoreront vos articles.\n" -#: src/lang.c:1010 +#: src/lang.c:1029 msgid "shell escape" msgstr "accéder à un shell" -#: src/lang.c:1011 +#: src/lang.c:1030 #, c-format msgid "Shell Command (%s)" msgstr "Commande shell (%s)" -#: src/lang.c:1012 +#: src/lang.c:1031 #, c-format msgid "Enter shell command [%s]> " msgstr "Commande shell [%s] > " -#: src/lang.c:1016 +#: src/lang.c:1035 #, c-format msgid "%s: Can't get entry for TERM\n" msgstr "%s : Entrée pour TERM introuvable\n" -#: src/lang.c:1020 +#: src/lang.c:1039 #, c-format msgid "Group %.*s ('q' to quit)..." msgstr "Groupe %.*s ('q' pour quitter)..." -#: src/lang.c:1022 +#: src/lang.c:1041 #, c-format msgid "Group %.*s..." msgstr "Groupe %.*s..." -#: src/lang.c:1026 +#: src/lang.c:1045 msgid "Server unavailable\n" msgstr "Service indisponible\n" -# TRANSLATION TOO LONG -#: src/lang.c:1032 +#: src/lang.c:1051 #, c-format msgid "%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; " "%s=post" -msgstr "%s=pipe; %s=mail; %s=imprimer; %s=quitter; %s=voir lu/non lu; %s=enregistrer; " +msgstr "%s=pipe; %s=mail; %s=impr.; %s=quitter; %s=voir lu/non lu; %s=enreg.; " "%s=marquer; %s=poster" -# TRANSLATION TOO LONG -#: src/lang.c:1033 +#: src/lang.c:1052 #, c-format msgid "%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" -msgstr "%s=pipe; %s=mail; %s=imprimer; %s=quitter; %s=répondre; %s=enregistrer; " - "%s=marquer; %s=poster" +msgstr "%s=pipe; %s=mail; %s=impr.; %s=quitter; %s=répondre; %s=enreg.; %s=marquer; " + "%s=poster" -#: src/lang.c:1035 +#: src/lang.c:1054 #, c-format msgid "%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "%s=mail; %s=imprimer; %s=quitter; %s=voir lu/non lu; %s=enregistrer; " "%s=marquer; %s=poster" -#: src/lang.c:1036 +#: src/lang.c:1055 #, c-format msgid "%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "%s=mail; %s=imprimer; %s=quitter; %s=répondre; %s=enregistrer; %s=marquer; " "%s=poster" -#: src/lang.c:1040 +#: src/lang.c:1059 #, c-format msgid "%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "%s=pipe; %s=mail; %s=quitter; %s=voir lu/non lu; %s=enregistrer; %s=marquer; " "%s=poster" -#: src/lang.c:1041 +#: src/lang.c:1060 #, c-format msgid "%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "%s=pipe; %s=mail; %s=quitter; %s=répondre; %s=enregistrer; %s=marquer; " "%s=poster" -#: src/lang.c:1043 +#: src/lang.c:1062 #, c-format msgid "%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "%s=mail; %s=quitter; %s=voir lu/non lu; %s=enregistrer; %s=marquer; %s=poster" -#: src/lang.c:1044 +#: src/lang.c:1063 #, c-format msgid "%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "%s=mail; %s=quitter; %s=répondre; %s=enregistrer; %s=marquer; %s=poster" -#: src/lang.c:1050 +#: src/lang.c:1069 msgid "Terminal does not support color" msgstr "Le terminal ne supporte pas les couleurs" -#: src/lang.c:1055 +#: src/lang.c:1074 #, c-format msgid "Trying %s" msgstr "Essai %s" -#: src/lang.c:1069 src/lang.c:1094 src/lang.c:1110 src/lang.c:1289 src/refs.c:296 +#: src/lang.c:1088 src/lang.c:1113 src/lang.c:1129 src/lang.c:1308 src/refs.c:296 msgid "None" msgstr "Aucun" -#: src/lang.c:1070 +#: src/lang.c:1089 msgid "Subject" msgstr "Sujet" -#: src/lang.c:1071 +#: src/lang.c:1090 msgid "References" msgstr "Références" -#: src/lang.c:1072 +#: src/lang.c:1091 msgid "Both Subject and References" msgstr "Sujet & Références" -#: src/lang.c:1073 +#: src/lang.c:1092 msgid "Multipart Subject" msgstr "Sujet multiparties" -#: src/lang.c:1085 src/lang.c:1196 +#: src/lang.c:1104 src/lang.c:1215 msgid "No" msgstr "Non" -#: src/lang.c:1086 src/lang.c:1198 +#: src/lang.c:1105 src/lang.c:1217 msgid "Yes" msgstr "Oui" -#: src/lang.c:1087 +#: src/lang.c:1106 msgid "Hide All" msgstr "Tout masquer" -#: src/lang.c:1095 +#: src/lang.c:1114 msgid "Address" msgstr "Adresse" -#: src/lang.c:1096 +#: src/lang.c:1115 msgid "Full Name" msgstr "Nom complet" -#: src/lang.c:1097 +#: src/lang.c:1116 msgid "Address and Name" msgstr "Adresse et Nom" -#: src/lang.c:1104 +#: src/lang.c:1123 msgid "Max" msgstr "Max" -#: src/lang.c:1105 +#: src/lang.c:1124 msgid "Sum" msgstr "Addition" -#: src/lang.c:1106 +#: src/lang.c:1125 msgid "Average" msgstr "Moyenne" -#: src/lang.c:1111 +#: src/lang.c:1130 msgid "Lines" msgstr "Lignes" -#: src/lang.c:1112 +#: src/lang.c:1131 msgid "Score" msgstr "Score" -#: src/lang.c:1113 +#: src/lang.c:1132 msgid "Lines & Score" msgstr "Lignes & Score" -#: src/lang.c:1122 +#: src/lang.c:1141 msgid "Black" msgstr "Noir" -#: src/lang.c:1123 +#: src/lang.c:1142 msgid "Red" msgstr "Rouge" -#: src/lang.c:1124 +#: src/lang.c:1143 msgid "Green" msgstr "Vert" -#: src/lang.c:1125 +#: src/lang.c:1144 msgid "Brown" msgstr "Marron" -#: src/lang.c:1126 +#: src/lang.c:1145 msgid "Blue" msgstr "Bleu" -#: src/lang.c:1127 +#: src/lang.c:1146 msgid "Pink" msgstr "Rose" -#: src/lang.c:1128 +#: src/lang.c:1147 msgid "Cyan" msgstr "Cyan" -#: src/lang.c:1129 +#: src/lang.c:1148 msgid "White" msgstr "Blanc" -#: src/lang.c:1130 +#: src/lang.c:1149 msgid "Gray" msgstr "Gris" -#: src/lang.c:1131 +#: src/lang.c:1150 msgid "Light Red" msgstr "Rouge gras" -#: src/lang.c:1132 +#: src/lang.c:1151 msgid "Light Green" msgstr "Vert gras" -#: src/lang.c:1133 +#: src/lang.c:1152 msgid "Yellow" msgstr "Jaune" -#: src/lang.c:1134 +#: src/lang.c:1153 msgid "Light Blue" msgstr "Bleu gras" -#: src/lang.c:1135 +#: src/lang.c:1154 msgid "Light Pink" msgstr "Rose gras" -#: src/lang.c:1136 +#: src/lang.c:1155 msgid "Light Cyan" msgstr "Cyan gras" -#: src/lang.c:1137 +#: src/lang.c:1156 msgid "Light White" msgstr "Blanc gras" -#: src/lang.c:1145 src/lang.c:1202 src/lang.c:1216 +#: src/lang.c:1164 src/lang.c:1221 src/lang.c:1235 msgid "Nothing" msgstr "Rien" -#: src/lang.c:1146 +#: src/lang.c:1165 msgid "Mark" msgstr "Marque" -#: src/lang.c:1147 +#: src/lang.c:1166 msgid "Space" msgstr "Espace" -#: src/lang.c:1154 +#: src/lang.c:1173 msgid "Normal" msgstr "Normal" -#: src/lang.c:1155 +#: src/lang.c:1174 msgid "Best highlighting" msgstr "Meilleure surbrillance" -#: src/lang.c:1156 +#: src/lang.c:1175 msgid "Underline" msgstr "Souligné" -#: src/lang.c:1157 +#: src/lang.c:1176 msgid "Reverse video" msgstr "Vidéo inversée" -#: src/lang.c:1158 +#: src/lang.c:1177 msgid "Blinking" msgstr "Clignotement" -#: src/lang.c:1159 +#: src/lang.c:1178 msgid "Half bright" msgstr "Moins lumineux" -#: src/lang.c:1160 +#: src/lang.c:1179 msgid "Bold" msgstr "Gras" -#: src/lang.c:1165 +#: src/lang.c:1184 msgid "none" msgstr "aucun" -#: src/lang.c:1166 +#: src/lang.c:1185 msgid "commands" msgstr "commandes" -#: src/lang.c:1167 +#: src/lang.c:1186 msgid "select" msgstr "sélection" -#: src/lang.c:1169 +#: src/lang.c:1188 msgid "commands & quit" msgstr "commandes & quitter" -#: src/lang.c:1170 +#: src/lang.c:1189 msgid "commands & select" msgstr "commandes & sélection" -#: src/lang.c:1171 +#: src/lang.c:1190 msgid "quit & select" msgstr "quitter & sélection" -#: src/lang.c:1172 +#: src/lang.c:1191 msgid "commands & quit & select" msgstr "commandes, quitter & sélection" -#: src/lang.c:1197 +#: src/lang.c:1216 msgid "Shell archive" msgstr "Archive shell" -#: src/lang.c:1203 +#: src/lang.c:1222 msgid "Subject: (descending)" msgstr "Subject : (descendant)" -#: src/lang.c:1204 +#: src/lang.c:1223 msgid "Subject: (ascending)" msgstr "Subject : (ascendant)" -#: src/lang.c:1205 +#: src/lang.c:1224 msgid "From: (descending)" msgstr "From: (descendant)" -#: src/lang.c:1206 +#: src/lang.c:1225 msgid "From: (ascending)" msgstr "From: (ascendant)" -#: src/lang.c:1207 +#: src/lang.c:1226 msgid "Date: (descending)" msgstr "Date: (descendant)" -#: src/lang.c:1208 +#: src/lang.c:1227 msgid "Date: (ascending)" msgstr "Date: (ascendant)" -#: src/lang.c:1209 src/lang.c:1217 +#: src/lang.c:1228 src/lang.c:1236 msgid "Score (descending)" msgstr "Score (descendant)" -#: src/lang.c:1210 src/lang.c:1218 +#: src/lang.c:1229 src/lang.c:1237 msgid "Score (ascending)" msgstr "Score (ascendant)" -#: src/lang.c:1211 +#: src/lang.c:1230 msgid "Lines: (descending)" msgstr "Lines: (descendant)" -#: src/lang.c:1212 +#: src/lang.c:1231 msgid "Lines: (ascending)" msgstr "Lines: (ascendant)" -#: src/lang.c:1223 +#: src/lang.c:1242 msgid "Always Keep" msgstr "Toujours garder" -#: src/lang.c:1224 +#: src/lang.c:1243 msgid "Always Remove" msgstr "Toujours effacer" -#: src/lang.c:1225 +#: src/lang.c:1244 msgid "Mark with D on selection screen" msgstr "Marquer avec un D dans la vue sélection" -#: src/lang.c:1230 +#: src/lang.c:1249 msgid "Kill only unread arts" msgstr "Filtrer uniquement les articles non lus" -#: src/lang.c:1231 +#: src/lang.c:1250 msgid "Kill all arts & show with K" msgstr "Filtrer tous les articles & afficher avec un K" #. TODO: s/K/art_marked_killed/ -#: src/lang.c:1232 +#: src/lang.c:1251 msgid "Kill all arts and never show" msgstr "Filtrer tous les articles et ne jamais afficher" -#: src/lang.c:1237 +#: src/lang.c:1256 msgid "Nothing special" msgstr "Rien de spécial" -#: src/lang.c:1238 +#: src/lang.c:1257 msgid "Compress quotes" msgstr "Citations compressées" -#: src/lang.c:1239 +#: src/lang.c:1258 msgid "Quote signatures" msgstr "Citer les signatures" -#: src/lang.c:1240 +#: src/lang.c:1259 msgid "Compress quotes, quote sigs" msgstr "Compresser les citations, citer les signatures" -#: src/lang.c:1241 +#: src/lang.c:1260 msgid "Quote empty lines" msgstr "Citer les lignes vides" -#: src/lang.c:1242 +#: src/lang.c:1261 msgid "Compress quotes, quote empty lines" msgstr "Compresser les citations, citer les lignes vides" -#: src/lang.c:1243 +#: src/lang.c:1262 msgid "Quote sigs & empty lines" msgstr "Citer les signatures & les lignes vides" -#: src/lang.c:1244 +#: src/lang.c:1263 msgid "Comp. q., quote sigs & empty lines" -msgstr "Compr. les citations, citer les signatures & les lignes vides" +msgstr "Citations compr., signatures et lignes vides citées" -#: src/lang.c:1282 +#: src/lang.c:1301 msgid "no" msgstr "non" -#: src/lang.c:1283 +#: src/lang.c:1302 msgid "with headers" msgstr "avec les en-têtes" -#: src/lang.c:1284 +#: src/lang.c:1303 msgid "without headers" msgstr "sans les en-têtes" -#: src/lang.c:1291 src/lang.c:1297 +#: src/lang.c:1310 src/lang.c:1316 msgid "NFKC" msgstr "NFKC" -#: src/lang.c:1292 +#: src/lang.c:1311 msgid "NFKD" msgstr "NFKD" -#: src/lang.c:1293 +#: src/lang.c:1312 msgid "NFC" msgstr "NFC" -#: src/lang.c:1294 +#: src/lang.c:1313 msgid "NFD" msgstr "NFD" -#: src/lang.c:1305 +#: src/lang.c:1324 msgid "Display Options" msgstr "Options d'affichage" -#: src/lang.c:1311 +#: src/lang.c:1330 msgid "Color Options" msgstr "Options des couleurs" -#: src/lang.c:1317 +#: src/lang.c:1336 msgid "Article-Limiting Options" msgstr "Options des articles" -#: src/lang.c:1323 +#: src/lang.c:1342 msgid "Posting/Mailing Options" msgstr "Options de postage/messagerie" -#: src/lang.c:1329 +#: src/lang.c:1348 msgid "Saving/Printing Options" msgstr "Options d'enregistrement/d'impression" -#: src/lang.c:1335 +#: src/lang.c:1354 msgid "Expert Options" msgstr "Options avancées" -#: src/lang.c:1341 +#: src/lang.c:1360 msgid "Filtering Options" msgstr "Options de filtrage" -#: src/lang.c:1346 src/lang.c:1372 src/lang.c:1378 src/lang.c:1385 src/lang.c:1417 -#: src/lang.c:1423 src/lang.c:1431 src/lang.c:1451 src/lang.c:1526 src/lang.c:1688 -#: src/lang.c:1694 src/lang.c:1700 src/lang.c:1706 src/lang.c:1718 src/lang.c:1725 -#: src/lang.c:1776 src/lang.c:1785 src/lang.c:1791 src/lang.c:1797 src/lang.c:1803 -#: src/lang.c:1809 src/lang.c:1815 src/lang.c:1821 src/lang.c:1827 src/lang.c:1833 -#: src/lang.c:1839 src/lang.c:1845 src/lang.c:1851 src/lang.c:1857 src/lang.c:1863 -#: src/lang.c:1869 src/lang.c:1875 src/lang.c:1881 src/lang.c:1887 src/lang.c:1893 -#: src/lang.c:1899 src/lang.c:1905 src/lang.c:1912 src/lang.c:1918 src/lang.c:1924 -#: src/lang.c:1931 src/lang.c:1942 src/lang.c:1948 src/lang.c:1954 src/lang.c:1960 -#: src/lang.c:1966 src/lang.c:1972 src/lang.c:1986 src/lang.c:1998 src/lang.c:2032 -#: src/lang.c:2084 src/lang.c:2091 src/lang.c:2097 src/lang.c:2122 src/lang.c:2139 -#: src/lang.c:2192 src/lang.c:2225 src/lang.c:2245 src/lang.c:2280 src/lang.c:2289 -#: src/lang.c:2314 src/lang.c:2326 src/lang.c:2345 src/lang.c:2353 +#: src/lang.c:1365 src/lang.c:1396 src/lang.c:1402 src/lang.c:1414 src/lang.c:1464 +#: src/lang.c:1470 src/lang.c:1480 src/lang.c:1500 src/lang.c:1575 src/lang.c:1745 +#: src/lang.c:1751 src/lang.c:1757 src/lang.c:1763 src/lang.c:1775 src/lang.c:1782 +#: src/lang.c:1836 src/lang.c:1845 src/lang.c:1851 src/lang.c:1858 src/lang.c:1865 +#: src/lang.c:1872 src/lang.c:1879 src/lang.c:1886 src/lang.c:1893 src/lang.c:1900 +#: src/lang.c:1907 src/lang.c:1914 src/lang.c:1921 src/lang.c:1928 src/lang.c:1935 +#: src/lang.c:1942 src/lang.c:1949 src/lang.c:1956 src/lang.c:1963 src/lang.c:1970 +#: src/lang.c:1977 src/lang.c:1984 src/lang.c:1991 src/lang.c:1998 src/lang.c:2005 +#: src/lang.c:2013 src/lang.c:2029 src/lang.c:2036 src/lang.c:2043 src/lang.c:2050 +#: src/lang.c:2056 src/lang.c:2062 src/lang.c:2079 src/lang.c:2091 src/lang.c:2125 +#: src/lang.c:2178 src/lang.c:2185 src/lang.c:2191 src/lang.c:2216 src/lang.c:2233 +#: src/lang.c:2286 src/lang.c:2322 src/lang.c:2342 src/lang.c:2377 src/lang.c:2387 +#: src/lang.c:2412 src/lang.c:2428 src/lang.c:2447 src/lang.c:2460 msgid " toggles, sets, cancels." msgstr " change, valide, annule." -#: src/lang.c:1347 +#: src/lang.c:1366 msgid "Show mini menu & posting etiquette" -msgstr "Afficher menu & intitulé du postage" +msgstr "Afficher le menu & l'intitulé du postage" -#: src/lang.c:1348 +#: src/lang.c:1367 msgid "# If ON show a mini menu of useful commands at each level\n" "# and posting etiquette after composing an article\n" -msgstr "# Si ON affiche un mini menu des commandes utiles pour chaque\n" +msgstr "# Si ON, affiche un mini menu des commandes utiles pour chaque\n" "# niveaux et affiche les détails après la composition d'un article\n" -#: src/lang.c:1353 +#: src/lang.c:1372 msgid "Show short description for each newsgroup. toggles & sets." msgstr "Afficher une brève description pour chaque groupe. change & " "valide." -#: src/lang.c:1354 +#: src/lang.c:1373 msgid "Show description of each newsgroup" msgstr "Voir description de chaque groupe" -#: src/lang.c:1355 +#: src/lang.c:1374 msgid "# If ON show group description text after newsgroup name at\n" "# group selection level\n" -msgstr "# Si ON affiche une description du groupe après son nom dans\n" +msgstr "# Si ON, affiche une description du groupe après son nom dans\n" "# la vue de sélection des groupes\n" -#: src/lang.c:1360 +#: src/lang.c:1379 msgid "Show Subject & From (author) fields in group menu. toggles & " "sets." msgstr "Affiche le sujet & l'auteur dans le menu groupe. change & " "valide." -#: src/lang.c:1361 +#: src/lang.c:1380 msgid "In group menu, show author by" msgstr "Dans vue groupe, voir auteur par" -#: src/lang.c:1362 -msgid "# Part of from field to display 0) none 1) address 2) full name 3) both\n" -msgstr "# Partie du champ from à afficher 0) aucun 1) adresse 2) nom complet\n" - "# 3) les deux\n" +#: src/lang.c:1381 +msgid "# Part of from field to display\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = none\n" + "# 1 = address\n" + "# * 2 = full name\n" + "# 3 = both\n" +msgstr "# Partie du champ from à afficher\n" + "# Les valeurs possibles sont (celle par défaut est marquée par *) :\n" + "# 0 = aucune\n" + "# 1 = adresse\n" + "# * 2 = nom complet\n" + "# 3 les deux\n" -#: src/lang.c:1366 +#: src/lang.c:1390 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "Affiche -> ou une barre de sélection. change & valide." -#: src/lang.c:1367 +#: src/lang.c:1391 msgid "Draw -> instead of highlighted bar" msgstr "Afficher -> plutôt qu'une barre" -#: src/lang.c:1368 +#: src/lang.c:1392 msgid "# If ON use -> otherwise highlighted bar for selection\n" -msgstr "# Si ON utilise -> sinon barre en surbrillance pour la sélection\n" +msgstr "# Si ON, utilise -> sinon barre en surbrillance pour la sélection\n" -#: src/lang.c:1373 +#: src/lang.c:1397 msgid "Use inverse video for page headers" msgstr "Vidéo inversée pour les en-têtes" -#: src/lang.c:1374 +#: src/lang.c:1398 msgid "# If ON use inverse video for page headers at different levels\n" -msgstr "# Si ON utilise la vidéo inversée pour les en-têtes dans les différentes " - "vues\n" +msgstr "# Si ON, utilise la vidéo inversée pour les en-têtes dans les différentes\n" + "# vues\n" -#: src/lang.c:1379 +#: src/lang.c:1403 msgid "Thread articles by" msgstr "Regrouper les articles par" -#: src/lang.c:1380 -msgid "# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n" - "# 4=(Multipart Subject).\n" -msgstr "# Regrouper les articles par 0=(rien) 1=(Sujet) 2=(Références) 3=(Les deux)\n" - "# 4=(Sujet multi-parties).\n" +#: src/lang.c:1404 +msgid "# Thread articles by ...\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = nothing\n" + "# 1 = Subject\n" + "# 2 = References\n" + "# * 3 = Both (Subject and References)\n" + "# 4 = Multipart Subject\n" +msgstr "# Regrouper les articles par...\n" + "# Les valeurs possibles sont (celle par défaut est marquée par *) :\n" + "# 0 = aucun\n" + "# 1 = Sujet\n" + "# 2 = References\n" + "# * 3 = Les deux (Sujet & References)\n" + "# 4 = Sujet multipartie\n" -#: src/lang.c:1386 +#: src/lang.c:1415 msgid "Score of a thread" msgstr "Score d'un fil" -#: src/lang.c:1387 -msgid "# Thread score 0=(Max) 1=(Sum) 2=(Average)\n" -msgstr "# Score d'un fil 0=(Max) 1=(Addition) 2=(Moyenne)\n" +#: src/lang.c:1416 +msgid "# Thread score\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = max\n" + "# 1 = sum\n" + "# 2 = average\n" +msgstr "# Regrouper les scores\n" + "# Les valeurs possibles sont (celle par défaut est marquée par *) :\n" + "# * 0 = max\n" + "# 1 = somme\n" + "# 2 = moyenne\n" -#: src/lang.c:1391 +#: src/lang.c:1424 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:1392 +#: src/lang.c:1425 msgid "Sort articles by" msgstr "Trier les articles par" -#: src/lang.c:1393 -msgid "# Sort articles by 0=(nothing) 1=(Subject descend) 2=(Subject ascend)\n" - "# 3=(From descend) 4=(From ascend) 5=(Date descend) 6=(Date ascend)\n" - "# 7=(Score descend) 8=(Score ascend) 9=(Lines descend) 10=(Lines ascend).\n" -msgstr "# Trie les article par 0=(rien) 1=(Sujet descendant) 2=(Sujet ascendant)\n" - "# 3=(De descendant) 4=(De ascendant) 5=(Date descendant) 6=(Date ascendant)\n" - "# 7=(Score descendant) 8=(Score ascendant) 9=(Lignes descendant) 10=(Lignes " - "ascendant)\n" +#: src/lang.c:1426 +msgid "# Sort articles by ...\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = nothing\n" + "# 1 = Subject descending\n" + "# 2 = Subject ascending\n" + "# 3 = From descending\n" + "# 4 = From ascending\n" + "# 5 = Date descending\n" + "# * 6 = Date ascending\n" + "# 7 = Score descending\n" + "# 8 = Score ascending\n" + "# 9 = Lines descending\n" + "# 10 = Lines ascending\n" +msgstr "# Trie les article par...\n" + "# Les valeurs possibles sont (celle par défaut est marquée par *) :\n" + "# 0 = rien\n" + "# 1 = Sujet descendant\n" + "# 2 = Sujet ascendant\n" + "# 3 = De descendant\n" + "# 4 = De ascendant\n" + "# 5 = Date descendant\n" + "# * 6 = Date ascendant\n" + "# 7 = Score descendant\n" + "# 8 = Score ascendant\n" + "# 9 = Lignes descendant\n" + "# 10 = Lignes ascendant)\n" -#: src/lang.c:1399 +#: src/lang.c:1442 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "Trier les fils par Rien ou Score. change & valide." -#: src/lang.c:1400 +#: src/lang.c:1443 msgid "Sort threads by" msgstr "Trier les fils par" -#: src/lang.c:1401 -msgid "# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n" -msgstr "# Trie le fil par 0=(rien) 1=(Score descendant) 2=(Score ascendant)\n" +#: src/lang.c:1444 +msgid "# Sort thread by ...\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = nothing\n" + "# * 1 = Score descending\n" + "# 2 = Score ascending\n" +msgstr "# Trier les fils par...\n" + "# Les valeurs possibles sont (celle par défaut est marquée par *) :\n" + "# 0 = aucun\n" + "# * 1 = Score descendant\n" + "# 2 = Score ascendant\n" -#: src/lang.c:1405 +#: src/lang.c:1452 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:1406 +#: src/lang.c:1453 msgid "Goto first unread article in group" -msgstr "Aller au 1er art. non lu du groupe" +msgstr "Aller au 1er article non lu du groupe" -#: src/lang.c:1407 +#: src/lang.c:1454 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:1411 +#: src/lang.c:1458 msgid "Show all articles or only unread articles. toggles & sets." msgstr "Affiche tous les articles ou seulement ceux non lus. change & " " valide." -#: src/lang.c:1412 +#: src/lang.c:1459 msgid "Show only unread articles" msgstr "Afficher articles non lus seulement" -#: src/lang.c:1413 +#: src/lang.c:1460 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:1418 +#: src/lang.c:1465 msgid "Show only groups with unread arts" msgstr "Voir groupes avec articles non lus" -#: src/lang.c:1419 +#: src/lang.c:1466 msgid "# If ON show only subscribed to groups that contain unread articles.\n" -msgstr "# Si ON affiche seulement les groupes ayant des articles non lus.\n" +msgstr "# Si ON, affiche seulement les groupes ayant des articles non lus.\n" -#: src/lang.c:1424 +#: src/lang.c:1471 msgid "Filter which articles" msgstr "Filtrer quel article" -#: src/lang.c:1425 -msgid "# 0=(Only kill unread articles)\n" - "# 1=(Kill all articles and show in threads marked with K)\n" - "# 2=(Kill all articles and never show them).\n" -msgstr "# 0=(Filtrer uniquement les articles non lus)\n" - "# 1=(Tout filtrer et les afficher dans les fils précédés d'un K)\n" - "# 2=(Tout filtrer et ne pas les afficher)\n" +#: src/lang.c:1472 +msgid "# Filter which articles\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = only kill unread articles\n" + "# 1 = kill all articles and show in threads marked with K\n" + "# 2 = kill all articles and never show them\n" +msgstr "# Filtrer quels articles\n" + "# Les valeurs possibles sont (celle par défaut est marquée par *) :\n" + "# * 0 = filtrer uniquement les articles non lu\n" + "# 1 = filtrer tous les articles et les marquer avec un K dans les fils\n" + "# 2 = filtrer tous les articles et ne pas les afficher\n" -#: src/lang.c:1432 +#: src/lang.c:1481 msgid "Tab goes to next unread article" msgstr "Tab va au prochain article non lu" -#: src/lang.c:1433 +#: src/lang.c:1482 msgid "# If ON the TAB command will go to next unread article at article viewer " "level\n" -msgstr "# Si ON la touche TAB ira au prochain article non lu directement depuis le " - "visualiseur d'article\n" +msgstr "# Si ON, la touche TAB ira au prochain article non lu directement depuis le\n" + "# visualiseur d'article\n" -#: src/lang.c:1437 +#: src/lang.c:1486 msgid "Scrolling with past the end of an art. jumps to the next unread one." -msgstr "Naviguer avec ira au prochain non lu." +msgstr "Naviguer avec ira au prochain article non lu." -#: src/lang.c:1438 +#: src/lang.c:1487 msgid "Space goes to next unread article" -msgstr "Espace va au prochain art. non lu" +msgstr "Espace va au prochain article non lu" -#: src/lang.c:1439 +#: src/lang.c:1488 msgid "# If ON the SPACE command will go to next unread article at article viewer\n" "# level when the end of the article is reached (rn-style pager)\n" -msgstr "# Si ON ESPACE ira au prochain article non lu dans le visualiseur d'article\n" +msgstr "# Si ON, ESPACE ira au prochain article non lu dans le visualiseur d'article\n" "# lorsque la fin d'un article sera atteinte (pager style rn)\n" -#: src/lang.c:1444 +#: src/lang.c:1493 msgid "Scrolling with / past the end of an art. jumps to the unread one." -msgstr "Naviguer avec / ira au prochain non lu." +msgstr "Naviguer avec / ira au prochain article non lu." -#: src/lang.c:1445 +#: src/lang.c:1494 msgid "PgDn goes to next unread article" msgstr "PgDn va au prochain article non lu" -#: src/lang.c:1446 +#: src/lang.c:1495 msgid "# If ON the PGDN or DOWN command will go to next unread article when\n" "# pressed at end of message\n" -msgstr "# Si ON les touches PGDN ou BAS iront au prochain article non lu\n" +msgstr "# Si ON, les touches PGDN ou BAS iront au prochain article non lu\n" "# lorsque la fin d'un article sera atteinte\n" -#: src/lang.c:1452 +#: src/lang.c:1501 msgid "List thread using right arrow key" msgstr "Lister le fil via la flèche droite" -#: src/lang.c:1453 +#: src/lang.c:1502 msgid "# If ON automatically list thread when entering it using right arrow key.\n" -msgstr "# Si ON listera automatiquement le fil lors de l'utilisation de la flèche " - "droite.\n" +msgstr "# Si ON, listera automatiquement le fil lors de l'utilisation de la flèche\n" + "# droite.\n" -#: src/lang.c:1457 +#: src/lang.c:1506 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "Caractère indiquant les articles effacés. valide, annule." -#: src/lang.c:1458 +#: src/lang.c:1507 msgid "Character to show deleted articles" msgstr "Caractère pour articles effacés" -#: src/lang.c:1459 +#: src/lang.c:1508 msgid "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" msgstr "# Caractère utilisé pour indiquer qu'un article a été supprimé (défaut 'D')\n" "# _ est transformé en ' '\n" -#: src/lang.c:1464 +#: src/lang.c:1513 msgid "Enter character to indicate articles in a range. sets, cancels." msgstr "Caractère indiquant les articles inclus. valide, annule." -#: src/lang.c:1465 +#: src/lang.c:1514 msgid "Character to show inrange articles" -msgstr "Caractère pour art. non inclus" +msgstr "Caractère pour articles non inclus" -#: src/lang.c:1466 +#: src/lang.c:1515 msgid "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" msgstr "# Caractère utilisé pour indiquer qu'un article est inclus (défaut '#')\n" "# _ est transformé en ' '\n" -#: src/lang.c:1471 +#: src/lang.c:1520 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:1472 +#: src/lang.c:1521 msgid "Character to show returning arts" msgstr "Caractère pour articles retournés" -#: src/lang.c:1473 +#: src/lang.c:1522 msgid "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" msgstr "# Caractère utilisé pour indiquer qu'un article sera retourné (défaut '#')\n" "# _ est transformé en ' '\n" -#: src/lang.c:1478 +#: src/lang.c:1527 msgid "Enter character to indicate selected articles. sets, cancels." msgstr "Caractère indiquant les articles sélectionnés. valide, annule." -#: src/lang.c:1479 +#: src/lang.c:1528 msgid "Character to show selected articles" msgstr "Caractère pour articles sélect." -#: src/lang.c:1480 +#: src/lang.c:1529 msgid "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" msgstr "# Caractère utilisé pour indiquer qu'un article fut sélectionné (defaut '*')\n" "# _est transformé en ' '\n" -#: src/lang.c:1485 +#: src/lang.c:1534 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "Caractère indiquant les articles récents. valide, annule." -#: src/lang.c:1486 +#: src/lang.c:1535 msgid "Character to show recent articles" msgstr "Caractère pour articles récents" -#: src/lang.c:1487 +#: src/lang.c:1536 msgid "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" msgstr "# Caractère utilisé pour indiquer qu'un article est récent (defaut 'o')\n" "# _est transformé en ' '\n" -#: src/lang.c:1492 +#: src/lang.c:1541 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "Caractère indiquant les articles non lus. valide, annule." -#: src/lang.c:1493 +#: src/lang.c:1542 msgid "Character to show unread articles" msgstr "Caractère pour articles non lus" -#: src/lang.c:1494 +#: src/lang.c:1543 msgid "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" msgstr "# Caractère utilisé pour indiquer qu'un article est non lu (defaut '+')\n" "# _est transformé en ' '\n" -#: src/lang.c:1499 +#: src/lang.c:1548 msgid "Enter character to indicate read articles. sets, cancels." msgstr "Caractère indiquant les articles lus. valide, annule." -#: src/lang.c:1500 +#: src/lang.c:1549 msgid "Character to show read articles" msgstr "Caractère pour articles lus" -#: src/lang.c:1501 +#: src/lang.c:1550 msgid "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" msgstr "# Caractère utilisé pour indiquer qu'un article a été lu (defaut ' ')\n" "# _est transformé en ' '\n" -#: src/lang.c:1506 +#: src/lang.c:1555 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "Caractère indiquant les articles filtrés. valide, annule." -#: src/lang.c:1507 +#: src/lang.c:1556 msgid "Character to show killed articles" msgstr "Caractère pour articles filtrés" -#: src/lang.c:1508 +#: src/lang.c:1557 msgid "# Character used to show that an art was killed (default 'K')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" msgstr "# Caractère utilisé pour indiquer qu'un article a été filtré (defaut 'K')\n" "# kill_level doit être choisi en conséquence, _ est transformé en ' '\n" -#: src/lang.c:1513 +#: src/lang.c:1562 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:1514 +#: src/lang.c:1563 msgid "Character to show readselected arts" -msgstr "Caractère pour articles lus & sél." +msgstr "Caractère pour articles lus & sélectionnés" -#: src/lang.c:1515 +#: src/lang.c:1564 msgid "# Character used to show that an art was selected before read (default ':')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" msgstr "# Caractère utilisé pour indiquer qu'un article était sélectionné avec d'être " "lu (defaut ':')\n" "# kill_level doit être choisi en conséquence, _ est transformé en ' '\n" -#: src/lang.c:1520 +#: src/lang.c:1569 msgid "Enter maximum length of newsgroup names displayed. sets." msgstr "Largeur max. à afficher des noms des groupes. valide." -#: src/lang.c:1521 +#: src/lang.c:1570 msgid "Max. length of group names shown" msgstr "Largeur max. des noms des groupes" -#: src/lang.c:1522 +#: src/lang.c:1571 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "# Largeur maximum à afficher des noms des groupes.\n" -#: src/lang.c:1527 +#: src/lang.c:1576 msgid "Show lines/score in listings" msgstr "Afficher dans les différentes vues" -#: src/lang.c:1528 +#: src/lang.c:1577 msgid "# What informations should be displayed in article/thread listing\n" - "# 0 = nothing, 1 = lines, 2 = score, 3 = lines & score\n" -msgstr "# Quelles informations doivent être affichées dans les vues article/fil\n" - "# 0 = rien, 1 = lignes, 2 = score, 3 = lignes & score\n" + "# Possible values are (the default is marked with *):\n" + "# 0 = nothing\n" + "# * 1 = lines\n" + "# 2 = score\n" + "# 3 = lines & score\n" +msgstr "# Quelles informations doivent être affichées dans la vue article/fil\n" + "# Les valeurs possibles sont (celle par défaut est marquée par *) :\n" + "# 0 = rien\n" + "# * 1 = lignes\n" + "# 2 = score\n" + "# 3 = lignes & score\n" -#: src/lang.c:1533 +#: src/lang.c:1586 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:1534 +#: src/lang.c:1587 msgid "Number of lines to scroll in pager" msgstr "Vitesse de défilement dans le pager" -#: src/lang.c:1535 +#: src/lang.c:1588 msgid "# Number of lines that cursor-up/down will scroll in article pager\n" - "# eg, 1+ = line-by-line, 0 = page-by-page (traditional behavior),\n" - "# -1 = the top/bottom line is carried over onto the next page,\n" - "# -2 = half-page scrolling\n" -msgstr "# Nombre de lignes passées lors du défilement d'un article dans le pager\n" - "# pe. 1+ = ligne par ligne, 0 = page par page (comportement par défaut),\n" - "# -1 = la dernière ligne sera affichée en haut de la page suivante,\n" - "# -2 = défilement par demi-page\n" + "# Possible values are (the default is marked with *):\n" + "# -2 = half-page scrolling\n" + "# -1 = the top/bottom line is carried over onto the next page\n" + "# 0 = page-by-page (traditional behavior)\n" + "# * 1 = line-by-line\n" + "# 2 or greater = scroll by 2 or more lines (only in the pager)\n" +msgstr "# Type du défilement lors de la visualisation de l'article dans le pager\n" + "# Les valeurs possibles sont (celle par défaut est marquée par *) :\n" + "# -2 = demi-page\n" + "# -1 = la première/dernière ligne est affichée dans dans la page suivante\n" + "# 0 = page par page (comportement initial)\n" + "# * 1 = ligne par ligne\n" + "# 2 ou plus = défiler 2 lignes par 2 ou plus (seulement dans le pager)\n" -#: src/lang.c:1542 +#: src/lang.c:1598 msgid "Display signatures. toggles & sets." msgstr "Affiche les signatures. change & valide." -#: src/lang.c:1543 +#: src/lang.c:1599 msgid "Display signatures" msgstr "Afficher les signatures" -#: src/lang.c:1544 +#: src/lang.c:1600 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "# Si OFF ne pas afficher les signatures lors de la visualisation\n" "# des articles.\n" -#: src/lang.c:1548 +#: src/lang.c:1604 msgid "Display uuencoded data as tagged attachments. toggles & sets." msgstr "Afficher les archives uue comme PJ marquées. change & " "valide." -#: src/lang.c:1549 +#: src/lang.c:1605 msgid "Display uue data as an attachment" msgstr "Afficher donnée uue comme PJ" -#: src/lang.c:1550 +#: src/lang.c:1606 msgid "# Handling of uuencoded data in the pager\n" - "# 0 = display raw uuencoded data\n" - "# 1 = uuencoded data will be condensed to a single tag line showing\n" - "# size and filename, similar to how MIME attachments are displayed\n" - "# 2 = as for 1, but any line that looks like uuencoded data will be folded\n" - "# into a tag line.\n" -msgstr "# Prise en charge des données uuencodées dans le pager\n" - "# 0 = affichage brut des données uuencodées\n" - "# 1 = les données uuencodées seront condensées en une seule ligne affichant\n" - "# la taille et le nom de fichier, similaire à l'affichage des " - "pièces-jointes\n" - "# MIME\n" - "# 2 = comme pour l'option 1, mais toute ligne qui ressemblera à une donnée " - "uuencodée\n" - "# sera placée dans une ligne marquée.\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = no, display raw uuencoded data\n" + "# 1 = yes, uuencoded data will be condensed to a single tag line showing\n" + "# size and filename, similar to how MIME attachments are displayed\n" + "# 2 = hide all, as for 1, but any line that looks like uuencoded data will\n" + "# be folded into a tag line.\n" +msgstr "# Prise en charge des données uuencode dans le pager\n" + "# Les valeurs possibles sont (celle par défaut est marquée par *) :\n" + "# * 0 = aucune, affichage brut des données uuencode\n" + "# 1 = oui, les données uuencode seront condensée dans une seule ligne " + "affichant\n" + "# 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 " + "données\n" + "# uuencode sera condensée en une seule ligne.\n" -#: src/lang.c:1559 +#: src/lang.c:1616 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:1560 +#: src/lang.c:1617 msgid "Display \"a as Umlaut-a" msgstr "Afficher \"a comme Umlaut-a" -#: src/lang.c:1561 +#: src/lang.c:1618 msgid "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" msgstr "# Si ON, convertit les umlauts Allemands de type TeX en codes ISO\n" "# et affiche \"a comme Umlaut-a, etc.\n" -#: src/lang.c:1566 src/lang.c:1576 +#: src/lang.c:1623 src/lang.c:1633 msgid "Space separated list of header fields" msgstr "Liste des en-têtes, séparés par des espaces" -#: src/lang.c:1567 +#: src/lang.c:1624 msgid "Display these header fields (or *)" msgstr "Afficher ces en-têtes (ou *)" -#: src/lang.c:1568 +#: src/lang.c:1625 msgid "# Which news headers you wish to see. If you want to see _all_ the headers,\n" "# place an '*' as this value. This is the only way a wildcard can be used.\n" "# If you enter 'X-' as the value, you will see all headers beginning with\n" @@ -4784,11 +4884,11 @@ msgstr "# Quels en-têtes voulez-vous voi "# en les délimitant avec des espaces. Ne rien définir, désactive cette " "option.\n" -#: src/lang.c:1577 +#: src/lang.c:1634 msgid "Do not display these header fields" msgstr "Ne pas afficher ces en-têtes" -#: src/lang.c:1578 +#: src/lang.c:1635 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 " @@ -4808,29 +4908,29 @@ msgstr "# Comme l'option 'news_headers_t "# news_headers_to_not_display=X-Alan X-Pape\n" "# Ne rien définir, désactive cette option.\n" -#: src/lang.c:1588 +#: src/lang.c:1645 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:1589 +#: src/lang.c:1646 msgid "Skip multipart/alternative parts" msgstr "Ignorer parties multipart/alter." -#: src/lang.c:1590 +#: src/lang.c:1647 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "# Si ON, enlève automatiquement les messages multipart/alternative\n" -#: src/lang.c:1595 +#: src/lang.c:1652 msgid "A regex used to decide which lines to show in col_quote." msgstr "Une expression régulière pour déterminer quelles lignes afficher dans " "col_quote." -#: src/lang.c:1596 +#: src/lang.c:1653 msgid "Regex used to show quoted lines" msgstr "Regex pour afficher les citations" -#: src/lang.c:1597 +#: src/lang.c:1654 msgid "# A regular expression that tin will use to decide which lines are\n" "# quoted when viewing articles. Quoted lines are shown in col_quote.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4838,16 +4938,16 @@ msgstr "# Une expression régulière qui p "# Les citations sont affichées dans col_quote. Si vous laissez ce champ\n" "# vide, tin utilisera une valeur incluse par défaut.\n" -#: src/lang.c:1603 +#: src/lang.c:1660 msgid "A regex used to decide which lines to show in col_quote2." msgstr "Une expression régulière pour déterminer quelles lignes afficher dans " "col_quote2." -#: src/lang.c:1604 +#: src/lang.c:1661 msgid "Regex used to show twice quoted l." msgstr "Regex pour afficher le 2nd niveau" -#: src/lang.c:1605 +#: src/lang.c:1662 msgid "# A regular expression that tin will use to decide which lines are\n" "# quoted twice. Twice quoted lines are shown in col_quote2.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4855,16 +4955,16 @@ msgstr "# Une expression régulière qui p "# second niveau. Ces citations sont affichées dans col_quote2. Si vous\n" "# laissez ce champ vide, tin utilisera une valeur incluse par défaut.\n" -#: src/lang.c:1611 +#: src/lang.c:1668 msgid "A regex used to decide which lines to show in col_quote3." msgstr "Une expression régulière pour déterminer quelles lignes afficher dans " "col_quote3." -#: src/lang.c:1612 +#: src/lang.c:1669 msgid "Regex used to show >= 3 times q.l." msgstr "Regex pour afficher niveau >= 3" -#: src/lang.c:1613 +#: src/lang.c:1670 msgid "# A regular expression that tin will use to decide which lines are\n" "# quoted >=3 times. >=3 times quoted lines are shown in col_quote3.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4874,16 +4974,16 @@ msgstr "# Une expression régulière qui p "# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " "défaut.\n" -#: src/lang.c:1620 +#: src/lang.c:1677 msgid "A regex used to decide which words to show in col_markslashes." msgstr "Une expression régulière pour déterminer quels mots afficher dans " "col_markslashes." -#: src/lang.c:1621 +#: src/lang.c:1678 msgid "Regex used to highlight /slashes/" -msgstr "Regex pour mots entre /slash/" +msgstr "Regex pour les mots entre /slash/" -#: src/lang.c:1622 +#: src/lang.c:1679 msgid "# A regular expression that tin will use to decide which words\n" "# bounded by '/' are to be shown in col_markslashes.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4892,16 +4992,16 @@ msgstr "# Une expression régulière qui p "# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " "défaut.\n" -#: src/lang.c:1628 +#: src/lang.c:1685 msgid "A regex used to decide which words to show in col_markstars." msgstr "Une expression régulière pour déterminer quels mots afficher dans " "col_markstars." -#: src/lang.c:1629 +#: src/lang.c:1686 msgid "Regex used to highlight *stars*" -msgstr "Regex pour mots entre *astérisques*" +msgstr "Regex pour les mots entre *astérisques*" -#: src/lang.c:1630 +#: src/lang.c:1687 msgid "# A regular expression that tin will use to decide which words\n" "# bounded by '*' are to be shown in col_markstars.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4910,16 +5010,16 @@ msgstr "# Une expression régulière qui p "# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " "défaut.\n" -#: src/lang.c:1636 +#: src/lang.c:1693 msgid "A regex used to decide which words to show in col_markstroke." msgstr "Une expression régulière pour déterminer quels mots afficher dans " "col_markstroke." -#: src/lang.c:1637 +#: src/lang.c:1694 msgid "Regex used to highlight -strokes-" -msgstr "Regex pour mots entre -tirets-" +msgstr "Regex pour les mots entre -tirets-" -#: src/lang.c:1638 +#: src/lang.c:1695 msgid "# A regular expression that tin will use to decide which words\n" "# bounded by '-' are to be shown in col_markstroke.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4928,16 +5028,16 @@ msgstr "# Une expression régulière qui p "# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " "défaut.\n" -#: src/lang.c:1644 +#: src/lang.c:1701 msgid "A regex used to decide which words to show in col_markdash." msgstr "Une expression régulière pour déterminer quels mots afficher dans " "col_markdash." -#: src/lang.c:1645 +#: src/lang.c:1702 msgid "Regex used to highlight _underline_" -msgstr "Regex pour mots entre _underscore_" +msgstr "Regex pour les mots entre _underscore_" -#: src/lang.c:1646 +#: src/lang.c:1703 msgid "# A regular expression that tin will use to decide which words\n" "# bounded by '_' are to be shown in col_markdash.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4946,47 +5046,47 @@ msgstr "# Une expression régulière qui p "# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " "défaut.\n" -#: src/lang.c:1652 +#: src/lang.c:1709 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "Une expression régulière pour trouver les préfixes dans le sujet. '|' est un " "séparateur." -#: src/lang.c:1653 +#: src/lang.c:1710 msgid "Regex with Subject prefixes" -msgstr "Regex pour les préfixes dans sujet" +msgstr "Regex pour les préfixes dans le sujet" -#: src/lang.c:1654 +#: src/lang.c:1711 msgid "# A regular expression that tin will use to find Subject prefixes\n" "# which will be removed before showing the header.\n" msgstr "# Une expression régulière qui permettra à tin de trouver les préfixes\n" "# dans le sujet et qui seront effacés avant d'afficher l'en-tête.\n" -#: src/lang.c:1659 +#: src/lang.c:1716 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "Une expression régulière pour trouver les suffixes dans le sujet. '|' est un " "séparateur." -#: src/lang.c:1660 +#: src/lang.c:1717 msgid "Regex with Subject suffixes" -msgstr "Regex pour les suffixes dans sujet" +msgstr "Regex pour les suffixes dans le sujet" -#: src/lang.c:1661 +#: src/lang.c:1718 msgid "# A regular expression that tin will use to find Subject suffixes\n" "# which will be removed when replying or posting followup.\n" msgstr "# Une expression régulière qui permettra à tin de trouver les suffixes\n" "# dans le sujet et qui seront effacés avant d'afficher l'en-tête.\n" -#: src/lang.c:1666 +#: src/lang.c:1723 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:1667 +#: src/lang.c:1724 msgid "MIME binary content viewer" msgstr "Visualisateur de contenu MIME" -#: src/lang.c:1668 +#: src/lang.c:1725 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" @@ -4996,638 +5096,791 @@ msgstr "# Utilisation du visualisateur M "# Sinon, spécifiez un logiciel externe (pe. metamail) ou laissez ce champ\n" "# vide pour ne pas activer la prévisualisation automatique.\n" -#: src/lang.c:1675 +#: src/lang.c:1732 msgid "Confirm before starting non-text viewing program" msgstr "Confirmation avant le lancement d'un visualisateur externe" -#: src/lang.c:1676 +#: src/lang.c:1733 msgid "Ask before using MIME viewer" -msgstr "Demander avant d'utiliser le visua." +msgstr "Demander avant d'utiliser le visualisateur" -#: src/lang.c:1677 +#: src/lang.c:1734 msgid "# If ON tin will ask before using metamail to display MIME messages\n" "# this only happens if metamail_prog is set to something\n" -msgstr "" +msgstr "# Si ON, tin demandera avant d'utiliser metamail pour afficher les\n" + "# messages MIME\n" + "# Cela ne se produit que lorsque 'metamail_prog' contient une valeur\n" -#: src/lang.c:1682 +#: src/lang.c:1739 msgid "Ask to mark groups read when quitting. toggles & sets." -msgstr "" +msgstr "Marquer lu les groupes à la fermeture ? change & valide." -#: src/lang.c:1683 +#: src/lang.c:1740 msgid "Catchup read groups when quitting" -msgstr "" +msgstr "Marquer lu les groupes à la fermeture" -#: src/lang.c:1684 +#: src/lang.c:1741 msgid "# If ON ask user if read groups should all be marked read\n" -msgstr "" +msgstr "# Si ON, demande à l'utilisateur si les groupes consultés\n" + "# doivent être marqués lus\n" -#: src/lang.c:1689 +#: src/lang.c:1746 msgid "Catchup group using left key" -msgstr "" +msgstr "Marquer lu le groupe via la flèche gauche" -#: src/lang.c:1690 +#: src/lang.c:1747 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" -msgstr "" +msgstr "# Si ON, marque lu avec <- le groupe/fil.\n" -#: src/lang.c:1695 +#: src/lang.c:1752 msgid "Catchup thread by using left key" -msgstr "" +msgstr "Marquer lu le fil via la flèche gauche" -#: src/lang.c:1701 +#: src/lang.c:1758 msgid "Which actions require confirmation" -msgstr "" +msgstr "Quelles actions requièrent confirmation" -#: src/lang.c:1702 +#: src/lang.c:1759 msgid "# What should we ask confirmation for.\n" -msgstr "" +msgstr "# Demande de confirmation pour...\n" -#: src/lang.c:1707 +#: src/lang.c:1764 msgid "'Mark article read' ignores tags" -msgstr "" +msgstr "'Marquer lu l'article' ignore les marques" -#: src/lang.c:1708 +#: src/lang.c:1765 msgid "# If ON the 'Mark article read' function marks only the current article.\n" -msgstr "" +msgstr "# Si ON, la fonction 'Marquer lu l'article' agit uniquement sur l'article\n" + "# actuel.\n" -#: src/lang.c:1712 +#: src/lang.c:1769 msgid "Program to run to open URL's, sets, cancels." msgstr "Logiciel utilisé pour lancer les URLs, valide, annule." -#: src/lang.c:1713 +#: src/lang.c:1770 msgid "Program that opens URL's" msgstr "Logiciel lançant les URLs" -#: src/lang.c:1714 +#: src/lang.c:1771 msgid "# The program used to open URL's. The actual URL will be appended\n" -msgstr "" +msgstr "# Commande ou script ouvrant les URLs. L'URL sera ajoutée\n" -#: src/lang.c:1719 +#: src/lang.c:1776 msgid "Use mouse in xterm" -msgstr "" +msgstr "Utiliser la souris dans l'xterm" -#: src/lang.c:1720 +#: src/lang.c:1777 msgid "# If ON enable mouse key support on xterm terminals\n" -msgstr "" +msgstr "# Si ON, active le support de la souris dans xterm\n" -#: src/lang.c:1726 +#: src/lang.c:1783 msgid "Use scroll keys on keypad" -msgstr "" +msgstr "Utiliser les flèches du pavé numérique" -#: src/lang.c:1727 +#: src/lang.c:1784 msgid "# If ON enable scroll keys on terminals that support it\n" -msgstr "" +msgstr "# Si ON, active les flèches de défilement pour les terminaux\n" + "# les supportant\n" -#: src/lang.c:1732 +#: src/lang.c:1789 msgid "Enter maximum number of article to get. sets." -msgstr "" +msgstr "Nombre max d'articles à récupérer. valide." -#: src/lang.c:1733 +#: src/lang.c:1790 msgid "Number of articles to get" -msgstr "" +msgstr "Nombre d'articles à récupérer" -#: src/lang.c:1734 +# AMBIGUOUS +#: src/lang.c:1791 msgid "# Number of articles to get (0=no limit), if negative sets maximum number\n" "# of already read articles to be read before first unread one\n" -msgstr "" +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" -#: src/lang.c:1739 +#: src/lang.c:1796 msgid "Enter number of days article is considered recent. sets." -msgstr "" +msgstr "Nombre de jours un article est considéré comme récent. valide." -#: src/lang.c:1740 +#: src/lang.c:1797 msgid "Article recentness time limit" -msgstr "" +msgstr "Durée des articles considérés comme récents" -#: src/lang.c:1741 +#: src/lang.c:1798 msgid "# Number of days in which article is considered recent, (0=OFF)\n" -msgstr "" +msgstr "# Nombre de jours un article est considéré comme récent; (0=OFF)\n" -#: src/lang.c:1745 +#: src/lang.c:1802 msgid "WILDMAT for normal wildcards, REGEX for full regular expression matching." -msgstr "" +msgstr "WILDMAT pour les wildcards normaux, REGEX pour expressions régulières." -#: src/lang.c:1746 +#: src/lang.c:1803 msgid "Wildcard matching" -msgstr "" +msgstr "Concordance wildcard" -#: src/lang.c:1747 -msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" -msgstr "" +#: src/lang.c:1804 +msgid "# Wildcard matching\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = wildmat\n" + "# 1 = regex\n" +msgstr "# Concordances Wildcard\n" + "# Les valeurs possibles sont (celle par défaut est marquée par *) :\n" + "# * 0 = wildmat\n" + "# 1 = regex\n" -#: src/lang.c:1751 +#: src/lang.c:1811 msgid "Enter minimal score before an article is marked killed. sets." -msgstr "" +msgstr "Score minimal avant qu'un article soit filtré. valide." -#: src/lang.c:1752 +#: src/lang.c:1812 msgid "Score limit (kill)" -msgstr "" +msgstr "Score minimum (filtre)" -#: src/lang.c:1753 +#: src/lang.c:1813 msgid "# Score limit before an article is marked killed\n" -msgstr "" +msgstr "# Score minimal avant qu'un article soit filtré\n" -#: src/lang.c:1757 +#: src/lang.c:1817 msgid "Enter default score to kill articles. sets." -msgstr "" +msgstr "Score par défaut pour filtrer les articles. valide." -#: src/lang.c:1758 +#: src/lang.c:1818 msgid "Default score to kill articles" -msgstr "" +msgstr "Score par déf. pour filtrer les articles" -#: src/lang.c:1759 +#: src/lang.c:1819 msgid "# Default score to kill articles\n" -msgstr "" +msgstr "# Score par défaut pour filtrer les articles\n" -#: src/lang.c:1763 +#: src/lang.c:1823 msgid "Enter minimal score before an article is marked hot. sets." -msgstr "" +msgstr "Score minimal avant qu'un article soit sélectionné. valide." -#: src/lang.c:1764 +#: src/lang.c:1824 msgid "Score limit (select)" -msgstr "" +msgstr "Score minimum (sélection)" -#: src/lang.c:1765 +#: src/lang.c:1825 msgid "# Score limit before an article is marked hot\n" -msgstr "" +msgstr "# Score minimal avant qu'un article soit sélectionné\n" -#: src/lang.c:1769 +#: src/lang.c:1829 msgid "Enter default score to select articles. sets." -msgstr "" +msgstr "Score par défaut pour la sélection des articles. valide." -#: src/lang.c:1770 +#: src/lang.c:1830 msgid "Default score to select articles" -msgstr "" +msgstr "Score par défaut pour sél. les articles" -#: src/lang.c:1771 +#: src/lang.c:1831 msgid "# Default score to select articles\n" -msgstr "" +msgstr "# Score par défaut pour sélectionner les articles\n" -#: src/lang.c:1777 +#: src/lang.c:1837 msgid "Use slrnface to show ''X-Face:''s" -msgstr "" +msgstr "Utiliser slrnface pour afficher les 'X-Face:'" -#: src/lang.c:1778 +#: src/lang.c:1838 msgid "# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n" "# Only useful when running in an xterm.\n" -msgstr "" +msgstr "# Si ON, utiliser slrnface(1) pour interpréter l'en-tête 'X-Face:'\n" + "# Seulement utile lors de l'utilisation de tin dans un xterm.\n" -#: src/lang.c:1786 +#: src/lang.c:1846 msgid "Use ANSI color" -msgstr "" +msgstr "Utiliser les couleurs ANSI" -#: src/lang.c:1787 +#: src/lang.c:1847 msgid "# If ON using ANSI-color\n" -msgstr "" +msgstr "# Si ON, utiliser les couleurs ANSI\n" -#: src/lang.c:1792 +#: src/lang.c:1852 msgid "Standard foreground color" -msgstr "" +msgstr "Couleur standard de l'avant-plan" -#: src/lang.c:1793 +#: src/lang.c:1853 msgid "# Standard foreground color\n" -msgstr "" + "# Default: -1 (default color)\n" +msgstr "# Couleur standard de l'avant-plan\n" + "# Défaut : -1 (défaut couleur)\n" -#: src/lang.c:1798 +#: src/lang.c:1859 msgid "Standard background color" -msgstr "" +msgstr "Couleur standard de l'arrière-plan" -#: src/lang.c:1799 -msgid "# Standard-Background-Color\n" -msgstr "" +#: src/lang.c:1860 +msgid "# Standard background color\n" + "# Default: -1 (default color)\n" +msgstr "# Couleur standard de l'arrière-plan\n" + "# Défaut : -1 (défaut couleur)\n" -#: src/lang.c:1804 +#: src/lang.c:1866 msgid "Color for inverse text (background)" -msgstr "" +msgstr "Couleur du texte inversé (arrière-plan)" -#: src/lang.c:1805 +#: src/lang.c:1867 msgid "# Color of background for inverse text\n" -msgstr "" + "# Default: 4 (blue)\n" +msgstr "# Couleur de l'arrière-plan pour le texte inversé\n" + "# Défaut : 4 (bleu)\n" -#: src/lang.c:1810 +#: src/lang.c:1873 msgid "Color for inverse text (foreground)" -msgstr "" +msgstr "Couleur du texte inversé (avant-plan)" -#: src/lang.c:1811 +#: src/lang.c:1874 msgid "# Color of foreground for inverse text\n" -msgstr "" + "# Default: 7 (white)\n" +msgstr "# Couleur de l'avant-plan du texte inversé\n" + "# Défaut : 7 (blanc)\n" -#: src/lang.c:1816 +#: src/lang.c:1880 msgid "Color of text lines" -msgstr "" +msgstr "Couleur du texte" -#: src/lang.c:1817 -msgid "# Color of text-lines\n" -msgstr "" +#: src/lang.c:1881 +msgid "# Color of text lines\n" + "# Default: -1 (default color)\n" +msgstr "# Couleur du texte\n" + "# Défaut : -1 (défaut couleur)\n" -#: src/lang.c:1822 +#: src/lang.c:1887 msgid "Color of mini help menu" -msgstr "" +msgstr "Couleur du petit menu d'aide" -#: src/lang.c:1823 +#: src/lang.c:1888 msgid "# Color of mini help menu\n" -msgstr "" + "# Default: 3 (brown)\n" +msgstr "# Couleur du petit menu d'aide\n" + "# Défaut : 3 (marron)\n" -#: src/lang.c:1828 +#: src/lang.c:1894 msgid "Color of help text" -msgstr "" +msgstr "Couleur de l'aide" -#: src/lang.c:1829 +#: src/lang.c:1895 msgid "# Color of help pages\n" -msgstr "" + "# Default: -1 (default color)\n" +msgstr "# Couleur des pages d'aide\n" + "# Défaut : -1 (couleur par défaut)\n" -#: src/lang.c:1834 +#: src/lang.c:1901 msgid "Color of status messages" -msgstr "" +msgstr "Couleur des messages de statut" -#: src/lang.c:1835 +#: src/lang.c:1902 msgid "# Color of messages in last line\n" -msgstr "" + "# Default: 6 (cyan)\n" +msgstr "# Couleur des messages de statut\n" + "# Défaut : 6 (cyan)\n" -#: src/lang.c:1840 +#: src/lang.c:1908 msgid "Color of quoted lines" -msgstr "" +msgstr "Couleur de citation de 1er niveau" -#: src/lang.c:1841 +#: src/lang.c:1909 msgid "# Color of quote-lines\n" -msgstr "" + "# Default: 2 (green)\n" +msgstr "# Couleur de citation de premier niveau\n" + "# Défaut : 2 (vert)\n" -#: src/lang.c:1846 +#: src/lang.c:1915 msgid "Color of twice quoted line" -msgstr "" +msgstr "Couleur de citation de 2nd niveau" -#: src/lang.c:1847 +#: src/lang.c:1916 msgid "# Color of twice quoted lines\n" -msgstr "" + "# Default: 3 (brown)\n" +msgstr "# Couleur de citation de second niveau\n" + "# Défaut : 3 (marron)\n" -#: src/lang.c:1852 +#: src/lang.c:1922 msgid "Color of =>3 times quoted line" -msgstr "" +msgstr "Couleur de citation de 3e niveau ou sup." -#: src/lang.c:1853 +#: src/lang.c:1923 msgid "# Color of >=3 times quoted lines\n" -msgstr "" + "# Default: 4 (blue)\n" +msgstr "# Couleur de citation de 3e niveau ou supérieur\n" + "# Défaut : 4 (bleu)\n" -#: src/lang.c:1858 +#: src/lang.c:1929 msgid "Color of article header lines" -msgstr "" +msgstr "Couleur des en-têtes de l'article" -#: src/lang.c:1859 +#: src/lang.c:1930 msgid "# Color of header-lines\n" -msgstr "" + "# Default: 2 (green)\n" +msgstr "# Couleur des en-têtes de l'article\n" + "# Défaut : 2 (vert)\n" -#: src/lang.c:1864 +#: src/lang.c:1936 msgid "Color of actual news header fields" -msgstr "" +msgstr "Couleur des champs d'en-tête actuels" -#: src/lang.c:1865 +#: src/lang.c:1937 msgid "# Color of actual news header fields\n" -msgstr "" + "# Default: 9 (light red)\n" +msgstr "# Couleur des champs d'en-têtes actuels\n" + "# Défaut : 9 (rouge gras)\n" -#: src/lang.c:1870 +#: src/lang.c:1943 msgid "Color of article subject lines" -msgstr "" +msgstr "Couleur du sujet" -#: src/lang.c:1871 +#: src/lang.c:1944 msgid "# Color of article subject\n" -msgstr "" + "# Default: 6 (cyan)\n" +msgstr "# Couleur du sujet\n" + "# Défaut : 6 (cyan)\n" -#: src/lang.c:1876 +#: src/lang.c:1950 msgid "Color of response counter" -msgstr "" +msgstr "Couleur du compteur de réponse" -#: src/lang.c:1877 +#: src/lang.c:1951 msgid "# Color of response counter\n" -msgstr "" + "# Default: 2 (green)\n" +msgstr "# Couleur du compteur de réponse\n" + "# Défaut : 2 (vert)\n" -#: src/lang.c:1882 +#: src/lang.c:1957 msgid "Color of sender (From:)" -msgstr "" +msgstr "Couleur de l'expéditeur (From:)" -#: src/lang.c:1883 +#: src/lang.c:1958 msgid "# Color of sender (From:)\n" -msgstr "" + "# Default: 2 (green)\n" +msgstr "# Couleur de l'expéditeur (From:)\n" + "# Défaut : 2 (vert)\n" -#: src/lang.c:1888 +#: src/lang.c:1964 msgid "Color of help/mail sign" -msgstr "" +msgstr "Couleur de l'aide/signature email" -#: src/lang.c:1889 +#: src/lang.c:1965 msgid "# Color of Help/Mail-Sign\n" -msgstr "" + "# Default: 4 (blue)\n" +msgstr "# Couleur de l'aide/signature email\n" + "# Défaut : 4 (bleu)\n" -#: src/lang.c:1894 +#: src/lang.c:1971 msgid "Color of signatures" -msgstr "" +msgstr "Couleur des signatures" -#: src/lang.c:1895 +#: src/lang.c:1972 msgid "# Color of signature\n" -msgstr "" + "# Default: 4 (blue)\n" +msgstr "# Couleur des signatures\n" + "# Défaut : 4 (bleu)\n" -#: src/lang.c:1900 +#: src/lang.c:1978 msgid "Color of highlighted URLs" -msgstr "" +msgstr "Couleur des URLs en surbrillance" -#: src/lang.c:1901 +#: src/lang.c:1979 msgid "# Color of highlighted URLs\n" -msgstr "" + "# Default: -1 (default color)\n" +msgstr "# Couleur des URLs en surbrillance\n" + "# Défaut : -1 (défaut couleur)\n" -#: src/lang.c:1906 +#: src/lang.c:1985 msgid "Color of highlighting with *stars*" -msgstr "" +msgstr "Couleur des mots entre *astérisques*" -#: src/lang.c:1907 -msgid "# Color of word highlighting. There are four possibilities\n" - "# in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n" -msgstr "" +#: src/lang.c:1986 +msgid "# Color of word highlighting with *stars*\n" + "# Default: 11 (yellow)\n" +msgstr "# Couleur des mots entre *astérisques*\n" + "# Défaut : 11 (jaune)\n" -#: src/lang.c:1913 +#: src/lang.c:1992 msgid "Color of highlighting with _dash_" -msgstr "" +msgstr "Couleur des mots entre _underscore_" -#: src/lang.c:1919 +#: src/lang.c:1993 +msgid "# Color of word highlighting with _dash_\n" + "# Default: 13 (light pink)\n" +msgstr "# Couleur des mots entre _underscore_\n" + "# Défaut : 13 (rose gras)\n" + +#: src/lang.c:1999 msgid "Color of highlighting with /slash/" -msgstr "" +msgstr "Couleur des mots entre /slash/" + +#: src/lang.c:2000 +msgid "# Color of word highlighting with /slash/\n" + "# Default: 14 (light cyan)\n" +msgstr "# Couleur des mots entre /slash/\n" + "# Défaut : 14 (cyan gras)\n" -#: src/lang.c:1925 +#: src/lang.c:2006 msgid "Color of highlighting with -stroke-" -msgstr "" +msgstr "Couleur des mots entre -tirets-" -#: src/lang.c:1932 +#: src/lang.c:2007 +msgid "# Color of word highlighting with -stroke-\n" + "# Default: 12 (light blue)\n" +msgstr "# Couleur des mots entre -tirets-\n" + "# Défaut : 12 (bleu gras)\n" + +#: src/lang.c:2014 msgid "Attr. of highlighting with *stars*" -msgstr "" +msgstr "Style des mots entre *astérisques*" -#: src/lang.c:1933 -msgid "# Attribute of word highlighting on mono terminals.\n" - "# There are four possibilities in articles:\n" - "# *stars*, /slashes/, _underdashes_ and -strokes-.\n" - "# The possible values are:\n" - "# 0 - Normal, 1 - Underline, 2 - Best highlighting,\n" - "# 3 - Reverse video, 4 - Blinking, 5 - Half bright, 6 - Bold\n" -msgstr "" +#: src/lang.c:2015 +msgid "# Attributes of word highlighting on mono terminals\n" + "# Possible values are:\n" + "# 0 = Normal\n" + "# 1 = Underline\n" + "# 2 = Best highlighting\n" + "# 3 = Reverse video\n" + "# 4 = Blinking\n" + "# 5 = Half bright\n" + "# 6 = Bold\n" + "\n" + "# Attribute of word highlighting with *stars*\n" + "# Default: 6 (bold)\n" +msgstr "# Style des mots mis en évidence pour les terminaux mono\n" + "# Les valeurs possibles sont :\n" + "# 0 = Normal\n" + "# 1 = Souligné\n" + "# 2 = Mise en évidence accrue\n" + "# 3 = Vidéo inversée\n" + "# 4 = Clignotement\n" + "# 5 = Contrasté\n" + "# 6 = Gras\n" + "\n" + "# Style des mots entre *astérisques*\n" + "# Défaut : 6 (gras)\n" -#: src/lang.c:1943 +#: src/lang.c:2030 msgid "Attr. of highlighting with _dash_" -msgstr "" +msgstr "Style des mots entre _underscore_" -#: src/lang.c:1949 +#: src/lang.c:2031 +msgid "# Attribute of word highlighting with _dash_\n" + "# Default: 2 (best highlighting)\n" +msgstr "# Style des mots entre _tirets_\n" + "# Défaut : 2 (misé en évidence accrue)\n" + +#: src/lang.c:2037 msgid "Attr. of highlighting with /slash/" -msgstr "" +msgstr "Style des mots entre /slash/" + +#: src/lang.c:2038 +msgid "# Attribute of word highlighting with /slash/\n" + "# Default: 5 (half bright)\n" +msgstr "# Style des mots entre /slash/\n" + "# Défaut : 5 (contrasté)\n" -#: src/lang.c:1955 +#: src/lang.c:2044 msgid "Attr. of highlighting with -stroke-" -msgstr "" +msgstr "Style des mots entre -tirets-" -#: src/lang.c:1961 +#: src/lang.c:2045 +msgid "# Attribute of word highlighting with -stroke-\n" + "# Default: 3 (reverse video)\n" +msgstr "# Style des mots entre -tirets-\n" + "# Défaut : 3 (vidéo inversée)\n" + +#: src/lang.c:2051 msgid "URL highlighting in message body" -msgstr "" +msgstr "Mise en évidence des URLs dans les articles" -#: src/lang.c:1962 +#: src/lang.c:2052 msgid "# Enable URL highlighting?\n" -msgstr "" +msgstr "# Mettre en évidence les URLs ?\n" -#: src/lang.c:1967 +#: src/lang.c:2057 msgid "Word highlighting in message body" -msgstr "" +msgstr "Mise en évidence des mots dans les articles" -#: src/lang.c:1968 +#: src/lang.c:2058 msgid "# Enable word highlighting?\n" -msgstr "" +msgstr "# Mettre en évidence les mots ?\n" -#: src/lang.c:1973 +#: src/lang.c:2063 msgid "What to display instead of mark" -msgstr "" +msgstr "Afficher ça plutôt qu'une marque" -#: src/lang.c:1974 +#: src/lang.c:2064 msgid "# Should the leading and ending stars and dashes also be displayed,\n" "# even when they are highlighting marks?\n" - "# 0 - no 1 - yes, display mark 2 - print a space instead\n" -msgstr "" + "# Possible values are (the default is marked with *):\n" + "# 0 = no\n" + "# 1 = yes, display mark\n" + "# * 2 = print a space instead\n" +msgstr "# Est-ce que les astérisques et tirets doivent être affichés,\n" + "# même s'ils mettent en évidence des marques ?\n" + "# Les valeurs possibles sont (celle par défaut est marquée par *) :\n" + "# 0 = non\n" + "# 1 = oui, afficher la marque\n" + "# * 2 = plutôt afficher un espace\n" -#: src/lang.c:1980 +#: src/lang.c:2073 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "Largeur du pager. valide." -#: src/lang.c:1981 +#: src/lang.c:2074 msgid "Page line wrap column" msgstr "Largeur du pager" -#: src/lang.c:1982 +#: src/lang.c:2075 msgid "# Wrap article lines at column\n" -msgstr "" +msgstr "# Justifier les lignes des articles à la colonne indiquée\n" -#: src/lang.c:1987 +#: src/lang.c:2080 msgid "Wrap around threads on next unread" -msgstr "" +msgstr "Englober les fils pour le non lu suivant" -#: src/lang.c:1988 +#: src/lang.c:2081 msgid "# If ON wrap around threads on searching next unread article\n" -msgstr "" +msgstr "# Si ON, englober les fils lors de la recherche de l'article suivant non lu\n" -#: src/lang.c:1992 +#: src/lang.c:2085 msgid "Enter default mail address (and fullname). sets." -msgstr "" +msgstr "Adresse mail par défaut (et nom complet). valide." -#: src/lang.c:1993 +#: src/lang.c:2086 msgid "Mail address (and fullname)" -msgstr "" +msgstr "Adresse mail (et nom complet)" -#: src/lang.c:1994 +#: src/lang.c:2087 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" -msgstr "" +msgstr "# Adresse mail (et nom complet) si ce n'est pas utilisateur@hôte\n" + "# (nom complet)\n" -#: src/lang.c:1999 +#: src/lang.c:2092 msgid "Show empty Followup-To in editor" -msgstr "" +msgstr "Inclure en-tête Followup-To dans l'éditeur" -#: src/lang.c:2000 +#: src/lang.c:2093 msgid "# If ON show empty Followup-To header when editing an article\n" -msgstr "" +msgstr "# Si ON, inclure l'en-tête Followup-To lors de la composition\n" + "# des articles\n" -#: src/lang.c:2004 +#: src/lang.c:2097 msgid "Enter path/! command/--none to create your default signature. sets." -msgstr "" +msgstr "Chemin/! commande/--aucune pour la création de votre signature. " + "valide." -#: src/lang.c:2005 +#: src/lang.c:2098 msgid "Create signature from path/command" -msgstr "" +msgstr "Signature depuis fichier/commande" -#: src/lang.c:2006 +#: src/lang.c:2099 msgid "# Signature path (random sigs)/file to be used when posting/replying\n" "# default_sigfile=file appends file as signature\n" "# default_sigfile=!command executes external command to generate a " "signature\n" "# default_sigfile=--none don't append a signature\n" -msgstr "" +msgstr "# Fichier de signature à utiliser lors de la composition/réponse à un\n" + "# article.\n" + "# default_sigfile=fichier\tutilise le contenu du fichier comme signature\n" + "# default_sigfile=!commande\texécute une commande externe comme signature\n" -#: src/lang.c:2013 +#: src/lang.c:2106 msgid "Prepend signature with \"-- \" on own line. toggles & sets." -msgstr "" +msgstr "Précéder la signature avec \"-- \". change & valide." -#: src/lang.c:2014 +#: src/lang.c:2107 msgid "Prepend signature with \"-- \"" -msgstr "" +msgstr "Précéder la signature avec \"-- \"" -#: src/lang.c:2015 +#: src/lang.c:2108 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" -msgstr "" +msgstr "# Si ON, précéde la signature avec le délimiteur standard\n" + "# '\\n-- \\'\n" -#: src/lang.c:2019 +#: src/lang.c:2112 msgid "Add signature when reposting articles. toggles & sets." -msgstr "" +msgstr "Rajouter la signature lors du repostage. change & valide." -#: src/lang.c:2020 +#: src/lang.c:2113 msgid "Add signature when reposting" -msgstr "" +msgstr "Rajouter la signature lors du repostage" -#: src/lang.c:2021 +#: src/lang.c:2114 msgid "# If ON add signature to reposted articles\n" -msgstr "" +msgstr "# Si ON, rajoute la signature aux articles repostés\n" -#: src/lang.c:2025 +#: src/lang.c:2118 msgid "Enter quotation marks, %s or %S for author's initials." -msgstr "" +msgstr "Caractère de citation, %s ou %S pour les initiales de l'auteur." -#: src/lang.c:2026 +#: src/lang.c:2119 msgid "Characters used as quote-marks" -msgstr "" +msgstr "Caractère de citation" -#: src/lang.c:2027 +#: src/lang.c:2120 msgid "# Characters used in quoting to followups and replies.\n" "# '_' is replaced by ' ', %%s, %%S are replaced by author's initials.\n" -msgstr "" +msgstr "# Caractères utilisés pour les citations.\n" + "# '_' est remplacé par ' ', %%s, %%S sont remplacés par les intiales\n" + "# de l'auteur auquel vous répondez.\n" -#: src/lang.c:2033 +#: src/lang.c:2126 msgid "Quoting behavior" -msgstr "" +msgstr "Type de citations" -#: src/lang.c:2034 +#: src/lang.c:2127 msgid "# How quoting should be handled when following up or replying.\n" - "# 0 = Nothing special\n" - "# 1 = Compress quotes\n" - "# 2 = Quote signatures\n" - "# 3 = Compress quotes, quote signatures\n" - "# 4 = Quote empty lines\n" - "# 5 = Compress quotes, quote empty lines\n" - "# 6 = Quote signatures, quote empty lines\n" - "# 7 = Compress quotes, quote signatures, quote empty lines\n" -msgstr "" + "# Possible values are (the default is marked with *):\n" + "# 0 = Nothing special\n" + "# 1 = Compress quotes\n" + "# 2 = Quote signatures\n" + "# 3 = Compress quotes, quote signatures\n" + "# 4 = Quote empty lines\n" + "# * 5 = Compress quotes, quote empty lines\n" + "# 6 = Quote signatures, quote empty lines\n" + "# 7 = Compress quotes, quote signatures, quote empty lines\n" +msgstr "# Type de citations lors des réponses ou des suivis.\n" + "# Les valeurs possibles sont (celle par défaut est marquée par *) :\n" + "# 0 = Rien de spécial\n" + "# 1 = Citations compressées\n" + "# 2 = Citer les signatures\n" + "# 3 = Compresser les citations, citer les signatures\n" + "# 4 = Citer les lignes vides\n" + "# * 5 = Compresser les citations, citer les lignes vides\n" + "# 6 = Citer les signatures, citer les lignes vides\n" + "# 7 = Citations compr., signatures & lignes vides citées\n" -#: src/lang.c:2046 src/lang.c:2054 src/lang.c:2060 +#: src/lang.c:2140 src/lang.c:2148 src/lang.c:2154 msgid "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" -msgstr "" +msgstr "%A Adresse %D Date %F Adresse+Nom %G groupe %M Message-ID %N Nom %C Prénom" -#: src/lang.c:2047 +#: src/lang.c:2141 msgid "Quote line when following up" -msgstr "" +msgstr "Citation lors d'un suivi" -#: src/lang.c:2048 +#: src/lang.c:2142 msgid "# Format of quote line when mailing/posting/following-up an article\n" "# %%A Address %%D Date %%F Addr+Name %%G Groupname %%M Message-ID\n" "# %%N Full Name %%C First Name %%I Initials\n" -msgstr "" +msgstr "# Format de la citation lors de l'envoi/postage/suivi d'un article\n" + "# %%A Adresse\t\t%%D Date\t%%F Adresse+Nom\t%%G groupe\n" + "# %%M Message-ID\t%%N Nom complet\t%%C Prénom\t%%I Initiales\n" -#: src/lang.c:2055 +#: src/lang.c:2149 msgid "Quote line when cross-posting" -msgstr "" +msgstr "Citation lors d'un cross-post" -#: src/lang.c:2061 +#: src/lang.c:2155 msgid "Quote line when mailing" -msgstr "" +msgstr "Citation lors d'un envoi par mail" -#: src/lang.c:2066 +#: src/lang.c:2160 msgid "If ON, include User-Agent: header. toggles & sets." -msgstr "" +msgstr "Si ON, inclus l'en-tête 'User-Agent:'. change & valide." -#: src/lang.c:2067 +#: src/lang.c:2161 msgid "Insert 'User-Agent:'-header" msgstr "Insérer l'en-tête 'User-Agent'" -#: src/lang.c:2068 +#: src/lang.c:2162 msgid "# If ON include advertising User-Agent: header\n" msgstr "# Si ON inclus l'en-tête 'User-Agent:'\n" -#: src/lang.c:2073 +#: src/lang.c:2167 msgid "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." -msgstr "" +msgstr "Jeu d'encodage pour MIME (p.e. US-ASCII, ISO_8859_1, EUC_KR), valide." -#: src/lang.c:2074 +#: src/lang.c:2168 msgid "MM_CHARSET" -msgstr "" +msgstr "MM_CHARSET" -#: src/lang.c:2075 +#: src/lang.c:2169 msgid "# Charset supported locally which is also used for MIME header and\n" "# Content-Type header.\n" "# If not set, the value of the environment variable MM_CHARSET is used.\n" "# Set to US-ASCII or compile time default if neither of them is defined.\n" "# If MIME_STRICT_CHARSET is defined at compile-time, charset other than\n" "# mm_charset is considered not displayable and represented as '?'.\n" -msgstr "" +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" + "# 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" + "# Si MIME_STRICT_CHARSET est déclarée au moment de la compilation, le jeu\n" + "# d'encodage autre que mm_charset est considéré comme non disponible et\n" + "# représenté par '?'.\n" -#: src/lang.c:2085 +#: src/lang.c:2179 msgid "MM_NETWORK_CHARSET" -msgstr "" +msgstr "MM_NETWORK_CHARSET" -#: src/lang.c:2086 +#: src/lang.c:2180 msgid "# Charset used for MIME (Content-Type) header in postings.\n" -msgstr "" +msgstr "# Jeu d'encodage utilisé par l'en-tête MIME (Content-Type).\n" -#: src/lang.c:2092 +#: src/lang.c:2186 msgid "Mailbox format" -msgstr "" +msgstr "Format de la boîte à lettres" -#: src/lang.c:2093 +#: src/lang.c:2187 msgid "# Format of the mailbox.\n" -msgstr "" +msgstr "# Format de la boîte à lettres\n" -#: src/lang.c:2098 +#: src/lang.c:2192 msgid "MIME encoding in news messages" -msgstr "" +msgstr "Encodage MIME dans les messages usenet" -#: src/lang.c:2099 +#: src/lang.c:2193 msgid "# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n" "# for mails and posts, if necessary. QP is efficient for most European\n" "# character sets (ISO-8859-X) with small fraction of non-US-ASCII chars,\n" "# while Base64 is more efficient for most 8bit East Asian, Greek, and\n" "# Russian charsets with a lot of 8bit characters.\n" -msgstr "" +msgstr "# Si nécessaire, encodage MIME (8bit, base64, quoted-printable, 7bit) du\n" + "# corps du message pour les mails et les arrticles. QP est suffisant pour\n" + "# la plupart des jeux d'encodage Européens (ISO-8859-X) avec une petite\n" + "# fraction de caractères non-US-ASCII; alors que le Base64 est plus indiqué\n" + "# pour les jeux d'encodage 8bit Est Asiatique, Grec et Russe, car contenant\n" + "# un plus grand nombre de caractères 8bit.\n" -#: src/lang.c:2107 src/lang.c:2128 +#: src/lang.c:2201 src/lang.c:2222 msgid "Don't change unless you know what you are doing. cancels." -msgstr "" +msgstr "Ne pas changer sauf si vous savez ce que vous faites. annule." -#: src/lang.c:2108 +#: src/lang.c:2202 msgid "Use 8bit characters in news headers" -msgstr "" +msgstr "Caractères 8bit dans les en-têtes usenet" -#: src/lang.c:2109 +#: src/lang.c:2203 msgid "# If ON, 8bit characters in news headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" "# 8bit chars in header are encoded regardless of the value of this\n" "# parameter unless post_mime_encoding is 8bit as well.\n" -msgstr "" +msgstr "# Si ON, les caractères 8bit dans les en-têtes 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 post_mime_encoding a comme\n" + "# valeur 8bit.\n" -#: src/lang.c:2116 +#: src/lang.c:2210 msgid "Auto-view post-processed files toggles, sets, cancels." msgstr "Visualiser automatiquement les fichiers traités. change, " "valide, annule." -#: src/lang.c:2117 +#: src/lang.c:2211 msgid "View post-processed files" msgstr "Voir les fichiers traités" -#: src/lang.c:2118 +#: src/lang.c:2212 msgid "# If set, post processed files will be opened in a viewer\n" -msgstr "# Si actif, les fichiers traités seront ouverts\n" +msgstr "# Si ON, les fichiers traités seront ouverts\n" -#: src/lang.c:2123 +#: src/lang.c:2217 msgid "MIME encoding in mail messages" msgstr "Encodage MIME pour les mails" -#: src/lang.c:2129 +#: src/lang.c:2223 msgid "Use 8bit characters in mail headers" msgstr "Caractères 8bits dans en-têtes mail" -#: src/lang.c:2130 +#: src/lang.c:2224 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 " @@ -5635,28 +5888,36 @@ msgid "# If ON, 8bit characters in mail "# 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 "" +msgstr "# 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" + "# 8bit.\n" + "# Notez que la RFC 2822 interdit les caractères 8bit dans les en-têtes des\n" + "# mails donc nous vous conseillons de ne PAS activer cette option sauf si\n" + "# vous avez une bonne raison.\n" -#: src/lang.c:2140 +#: src/lang.c:2234 msgid "Strip blanks from ends of lines" msgstr "Nettoyer les fins de lignes" -#: src/lang.c:2141 +#: src/lang.c:2235 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:2146 +#: src/lang.c:2240 msgid "If ON, use transliteration. toggles & sets." msgstr "Si ON, utilise 'translit' pour iconv_open(3). change & " "valide." -#: src/lang.c:2147 +#: src/lang.c:2241 msgid "Transliteration" -msgstr "Transliteration (conversion)" +msgstr "Translitération (conversion)" -#: src/lang.c:2148 +#: src/lang.c:2242 msgid "# If ON, use //TRANSLIT extension. This means that when a character cannot\n" "# be represented in the in the target character set, it can be approximated\n" "# through one or several similarly looking characters.\n" @@ -5664,370 +5925,422 @@ msgstr "# Si ON, utilise l'extension //T "# caractère n'est pas disponible dans l'encodage choisi, il peut être\n" "# remplacé par un ou plusieurs autres caractères similaires.\n" -#: src/lang.c:2155 +#: src/lang.c:2249 msgid "Send you a carbon copy automatically. toggles & sets." -msgstr "Vous envoie automatiquement une copie. change & valide." +msgstr "Vous envoie automatiquement une copie (CC). change & valide." -#: src/lang.c:2156 +#: src/lang.c:2250 msgid "Send you a cc automatically" msgstr "Envoyer automatiquement une copie" -#: src/lang.c:2157 +#: src/lang.c:2251 msgid "# If ON automatically put your name in the Cc: field when mailing an article\n" msgstr "# Si ON, inclus automatiquement votre nom dans le champ Cc: lors d'un envoi " "par mail d'un article.\n" -#: src/lang.c:2161 +#: src/lang.c:2255 msgid "Send you a blind carbon copy automatically. toggles & sets." -msgstr "Vous envoie automatiquement une copie privée. change & " - "valide." +msgstr "Vous envoie automatiquement une copie privée (BCC). change & " + " valide." -#: src/lang.c:2162 +#: src/lang.c:2256 msgid "Send you a blind cc automatically" -msgstr "Envoyer auto. d'une copie privée" +msgstr "Envoi automatique d'une copie privée" -#: src/lang.c:2163 +#: src/lang.c:2257 msgid "# If ON automatically put your name in the Bcc: field when mailing an " "article\n" msgstr "# Si ON, inclus automatiquement votre nom dans le champ Bcc: lors d'un envoi " "par mail d'un article.\n" -#: src/lang.c:2167 +#: src/lang.c:2261 msgid "Enter address elements about which you want to be warned. sets." msgstr "Être averti de ces éléments. valide." -#: src/lang.c:2168 +#: src/lang.c:2262 msgid "Spamtrap warning address parts" msgstr "Pièges à spam dans les adresses" -#: src/lang.c:2169 +#: src/lang.c:2263 msgid "# A comma-delimited list of address-parts you want to be warned\n" "# about when trying to reply by email.\n" -msgstr "" +msgstr "# Une liste des parties dans les adresses, délimitées par des virgules,\n" + "# que vous souhaitez connaître lors d'une réponse par mail.\n" -#: src/lang.c:2174 +#: src/lang.c:2268 msgid "Enter default number of days a filter entry will be valid. sets." -msgstr "" +msgstr "Entrer la durée d'un filtre (en nombre de jours). valide." -#: src/lang.c:2175 +#: src/lang.c:2269 msgid "No. of days a filter entry is valid" -msgstr "" +msgstr "Durée de validité d'un filtre" -#: src/lang.c:2176 +#: src/lang.c:2270 msgid "# Number of days a short term filter will be active\n" -msgstr "" +msgstr "# Durée (en nombre de jours) de validité d'un filtre\n" -#: src/lang.c:2180 +#: src/lang.c:2274 msgid "Add posted articles to filter. toggles & sets." -msgstr "" +msgstr "Créer un filtre pour les articles postés. change & valide." -#: src/lang.c:2181 +#: src/lang.c:2275 msgid "Add posted articles to filter" -msgstr "" +msgstr "Créer un filtre pour les articles postés" -#: src/lang.c:2182 +#: src/lang.c:2276 msgid "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" -msgstr "" +msgstr "# Si ON, crée un filtre pour les articles débutant un nouveau fil\n" + "# afin de mettre en surbrillance les suivis.\n" -#: src/lang.c:2186 +#: src/lang.c:2280 msgid "The directory where articles/threads are to be saved in mailbox format." -msgstr "" +msgstr "Le répertoire où sont enregistrés les articles/fils au format mailbox." -#: src/lang.c:2187 +#: src/lang.c:2281 msgid "Mail directory" -msgstr "" +msgstr "Répertoire mail" -#: src/lang.c:2188 +#: src/lang.c:2282 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" -msgstr "" +msgstr "# (-m) répertoire où sont enregistrés les articles/fils au format mailbox\n" -#: src/lang.c:2193 +#: src/lang.c:2287 msgid "Save articles in batch mode (-S)" -msgstr "" +msgstr "Enregistrer articles en arrière-plan (-S)" -#: src/lang.c:2194 +#: src/lang.c:2288 msgid "# If ON articles/threads will be saved in batch mode when save -S\n" "# or mail (-M/-N) is specified on the command line\n" -msgstr "" +msgstr "# Si ON, les articles/fils seront enregistrés à l'arrière-plan lorsque\n" + "# l'option -S ou (-M/-N) pour les mails est spécifiée.\n" -#: src/lang.c:2199 +#: src/lang.c:2293 msgid "The directory where you want articles/threads saved." -msgstr "" +msgstr "Le répertoire où vous voulez enregistrer les articles/fils." -#: src/lang.c:2200 +#: src/lang.c:2294 msgid "Directory to save arts/threads in" -msgstr "" +msgstr "Répertoire où enregistrer les articles/fils" -#: src/lang.c:2201 +#: src/lang.c:2295 msgid "# Directory where articles/threads are saved\n" -msgstr "" +msgstr "# Répertoire où sont enregistrés les articles/fils\n" -#: src/lang.c:2205 +#: src/lang.c:2299 msgid "Auto save article/thread by Archive-name: header. toggles & sets." -msgstr "" +msgstr "Enregistrement auto. basé sur l'en-tête Archive-name:. change & " + " valide." -#: src/lang.c:2206 +#: src/lang.c:2300 msgid "Use Archive-name: header for save" -msgstr "" +msgstr "Honorer l'en-tête 'Archive-name:'" -#: src/lang.c:2207 +#: src/lang.c:2301 msgid "# If ON articles/threads with Archive-name: in mail header will\n" "# be automatically saved with the Archive-name & part/patch no.\n" -msgstr "" +msgstr "# Si ON, les articles/fils avec 'Archive-name:' dans l'en-tête\n" + "# du mail seront enregistrés automatiquement avec l'Archive-name\n" + "# & le numéro de la partie et ou patch.\n" -#: src/lang.c:2212 +#: src/lang.c:2306 msgid "Mark saved articles/threads as read. toggles, sets, " "cancels." -msgstr "" +msgstr "Marquer lu les articles/fils enregistrés. change, valide & " + " annule." -#: src/lang.c:2213 +#: src/lang.c:2307 msgid "Mark saved articles/threads as read" -msgstr "" +msgstr "Marquer lu les articles/fils enregistrés" -#: src/lang.c:2214 +#: src/lang.c:2308 msgid "# If ON mark articles that are saved as read\n" -msgstr "" +msgstr "# Si ON, marque lu les articles qui sont enregistrés\n" -#: src/lang.c:2218 +#: src/lang.c:2312 msgid "Do post processing (eg. extract attachments) for saved articles." -msgstr "" +msgstr "Post-traiter (p.e. extraire les pj) les articles enregistrés." -#: src/lang.c:2219 +#: src/lang.c:2313 msgid "Post process saved articles" -msgstr "" +msgstr "Post-traiter les articles enregistrés" -#: src/lang.c:2220 +#: src/lang.c:2314 msgid "# Perform post processing (saving binary attachments) from saved articles.\n" - "# 0=(no) 1=(yes) 2=(extract shell archives (shar) only)\n" -msgstr "" + "# Possible values are (the default is marked with *):\n" + "# * 0 = no\n" + "# 1 = extract shell archives (shar) only\n" + "# 2 = yes\n" +msgstr "# Post-traitement (enregistrement des pj) des articles enregistrés.\n" + "# Les valeurs possibles sont (celle par défaut est marquée par *) :\n" + "# * 0 = non\n" + "# 1 = extraire uniquement les *.shar (archives shell)\n" + "# 2 = oui\n" -#: src/lang.c:2226 +#: src/lang.c:2323 msgid "Process only unread articles" -msgstr "" +msgstr "Traiter uniquement les articles non lus" -#: src/lang.c:2227 +#: src/lang.c:2324 msgid "# If ON only save/print/pipe/mail unread articles (tagged articles excepted)\n" -msgstr "" +msgstr "# Si ON, enregistre/imprime/pipe/envoi articles non lu (excepté les articles " + "marqués)\n" -#: src/lang.c:2232 +#: src/lang.c:2329 msgid "Print all or just part of header. toggles & sets." -msgstr "" +msgstr "Afficher tout ou une partie des en-têtes. change & valide." -#: src/lang.c:2233 +#: src/lang.c:2330 msgid "Print all headers when printing" -msgstr "" +msgstr "Imprimer tous les en-têtes" -#: src/lang.c:2234 +#: src/lang.c:2331 msgid "# If ON print all of article header otherwise just the important lines\n" -msgstr "" +msgstr "# Si ON, imprimer tous les en-têtes, sinon juste les lignes importantes\n" -#: src/lang.c:2238 +#: src/lang.c:2335 msgid "The printer program with options that is to be used to print articles/threads." -msgstr "" +msgstr "Le logiciel d'impression avec options utilisées pour imprimer les " + "articles/fils." -#: src/lang.c:2239 +#: src/lang.c:2336 msgid "Printer program with options" -msgstr "" +msgstr "Logiciel d'impression avec options" -#: src/lang.c:2240 +#: src/lang.c:2337 msgid "# Print program with parameters used to print articles/threads\n" -msgstr "" +msgstr "# Logiciel d'impression avec options utilisées por imprimer les " + "articles/fils\n" -#: src/lang.c:2246 +#: src/lang.c:2343 msgid "Force redraw after certain commands" -msgstr "" +msgstr "Rafraîchir l'écran après certaines actions" -#: src/lang.c:2247 +#: src/lang.c:2344 msgid "# If ON a screen redraw will always be done after certain external commands\n" -msgstr "" +msgstr "# Si ON, un rafraîchissement de l'écran sera toujours effectué après " + "certaines commandes externes\n" -#: src/lang.c:2251 +#: src/lang.c:2348 msgid "Start editor with line offset. toggles, sets, cancels." -msgstr "" +msgstr "Lancer l'éditeur avec une ligne décalée. change, valide & " + " annule." -#: src/lang.c:2252 +#: src/lang.c:2349 msgid "Start editor with line offset" -msgstr "" +msgstr "Lancer l'éditeur avec une ligne décalée" -#: src/lang.c:2253 +#: src/lang.c:2350 msgid "# If ON editor will be started with cursor offset into the file\n" "# otherwise the cursor will be positioned at the first line\n" -msgstr "" +msgstr "# Si ON, l'éditeur sera lancé avec le curseur décalé\n" + "# sinon, le curseur sera positionné sur la première ligne\n" -#: src/lang.c:2258 +#: src/lang.c:2355 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." -msgstr "" +msgstr "%E pour l'éditeur, %F pour le fichier, %N pour la ligne, valide." -#: src/lang.c:2259 +#: src/lang.c:2356 msgid "Invocation of your editor" -msgstr "" +msgstr "Lancement de votre éditeur" -#: src/lang.c:2260 +#: src/lang.c:2357 msgid "# Format of editor line including parameters\n" "# %%E Editor %%F Filename %%N Linenumber\n" -msgstr "" +msgstr "# Format des paramètres pour l'éditeur\n" + "# %%E Éditeur %%F Fichier %%N N° de ligne\n" -#: src/lang.c:2265 +#: src/lang.c:2362 msgid "Enter name and options for external-inews, --internal for internal inews" -msgstr "" +msgstr "Nom et options pour l'inews externe, --internal pour l'inews interne" -#: src/lang.c:2266 +#: src/lang.c:2363 msgid "External inews" -msgstr "" +msgstr "Inews externe" -#: src/lang.c:2267 +#: src/lang.c:2364 msgid "# If --internal use the built in mini inews for posting via NNTP\n" "# otherwise use an external inews program\n" -msgstr "" +msgstr "# Si '--internal', utilise l'inews allégé intégré pour poster via\n" + "# NNTP sinon, utilise un logiciel inews externe\n" -#: src/lang.c:2271 +#: src/lang.c:2368 msgid "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." -msgstr "" +msgstr "%M pour le MUA, %S pour le sujet, %T pour 'to:', %F pour Fichier, " + "valide." -#: src/lang.c:2272 +#: src/lang.c:2369 msgid "Invocation of your mail command" -msgstr "" +msgstr "Lancement de votre client mail" -#: src/lang.c:2273 +#: src/lang.c:2370 msgid "# Format of mailer line including parameters\n" "# %%M Mailer %%S Subject %%T To %%F Filename\n" "# ie. to use elm as your mailer: elm -s \"%%S\" \"%%T\" < %%F\n" "# ie. elm interactive : elm -i %%F -s \"%%S\" \"%%T\"\n" -msgstr "" +msgstr "# Format des paramètres pour le MUA\n" + "# %%M MUA %%S Sujet %%T 'To:' %%F Fichier\n" + "# p.e. pour utiliser elm comme MUA : elm -s \"%%S\" \"%%T\" < %%F\n" + "# p.e. pour elm interactif : elm -i %%F -s \"%%S\" \"%%T\"\n" -#: src/lang.c:2281 +#: src/lang.c:2378 msgid "Use interactive mail reader" -msgstr "" +msgstr "Utiliser un MUA interactif" -#: src/lang.c:2282 -msgid "# Interactive mailreader:\n" - "# 0 = no interactive mailreader\n" - "# 1 = use interactive mailreader with headers in file\n" - "# 2 = use interactive mailreader without headers in file\n" -msgstr "" +#: src/lang.c:2379 +msgid "# Interactive mailreader\n" + "# Possible values are (the default is marked with *):\n" + "# * 0 = no interactive mailreader\n" + "# 1 = use interactive mailreader with headers in file\n" + "# 2 = use interactive mailreader without headers in file\n" +msgstr "# MUA interactif :\n" + "# Les valeurs possibles sont (celle par défaut est marquée par *) :\n" + "# * 0 = pas de MUA interactif\n" + "# 1 = utiliser un MUA interactif avec les en-têtes du fichier\n" + "# 2 = utiliser un MUA interactif sans les en-têtes du fichier\n" -#: src/lang.c:2290 +#: src/lang.c:2388 msgid "Remove ~/.article after posting" -msgstr "" +msgstr "Effacer ~/.article après le postage" -#: src/lang.c:2291 +#: src/lang.c:2389 msgid "# If ON remove ~/.article after posting.\n" -msgstr "" +msgstr "# Si ON, effacer ~/.article après le postage.\n" -#: src/lang.c:2295 +#: src/lang.c:2393 msgid "Filename for all posted articles, sets, no filename=do not save." -msgstr "" +msgstr "Fichier pour les articles postés, valide, pas de fichier = désactive." -#: src/lang.c:2296 +#: src/lang.c:2394 msgid "Filename for posted articles" -msgstr "" +msgstr "Fichier pour les articles postés" -#: src/lang.c:2297 +#: src/lang.c:2395 msgid "# Filename where to keep all postings (default posted)\n" "# If no filename is set then postings will not be saved\n" -msgstr "" +msgstr "# Fichier où enregistrer les articles postés ('posted' par défaut)\n" + "# Si aucun fichier n'est indiqué, les articles postés ne seront pas\n" + "# enregistrés\n" -#: src/lang.c:2302 +#: src/lang.c:2400 msgid "Keep all failed articles in ~/dead.articles. toggles & sets." -msgstr "" +msgstr "Garder les articles non postés dans ~/dead.articles. change & " + " valide." -#: src/lang.c:2303 +#: src/lang.c:2401 msgid "Keep failed arts in ~/dead.articles" -msgstr "" +msgstr "Articles non postés dans ~/dead.articles" -#: src/lang.c:2304 +#: src/lang.c:2402 msgid "# If ON keep all failed postings in ~/dead.articles\n" -msgstr "" +msgstr "# Si ON, garde tous les articles non postés dans ~/dead.articles\n" -#: src/lang.c:2308 +#: src/lang.c:2406 msgid "Do you want to strip unsubscribed groups from .newsrc" -msgstr "" +msgstr "Voulez-vous effacer dans newsrc les groupes auxquels vous vous êtes désabonnés" -#: src/lang.c:2309 +#: src/lang.c:2407 msgid "No unsubscribed groups in newsrc" -msgstr "" +msgstr "Pas de groupes désabonnés dans newsrc" -#: src/lang.c:2310 +#: src/lang.c:2408 msgid "# If ON strip unsubscribed groups from newsrc\n" -msgstr "" +msgstr "# Si ON, efface dans newsrc les groupes auxquels vous vous êtes désabonnés\n" -#: src/lang.c:2315 +#: src/lang.c:2413 msgid "Remove bogus groups from newsrc" -msgstr "" +msgstr "Effacer les groupes corrompus de newsrc" -#: src/lang.c:2316 +#: src/lang.c:2414 msgid "# What to do with bogus groups in newsrc file\n" - "# 0=(Keep) 1=(Remove) 2=(Highlight with D on selection screen).\n" -msgstr "" + "# Possible values are (the default is marked with *):\n" + "# * 0 = keep\n" + "# 1 = remove\n" + "# 2 = highlight with D on selection screen\n" +msgstr "# Que faire des groupes corrompus du fichier newsrc\n" + "# Les valeurs possibles sont (celle par défaut est marquée par *) :\n" + "# * 0 = garder\n" + "# 1 = effacer\n" + "# 2 = marquer d'un D dans l'écran de sélection\n" -#: src/lang.c:2320 +#: src/lang.c:2422 msgid "Enter number of seconds until active file will be reread. sets." -msgstr "" +msgstr "Durée avant que le fichier active ne soit relu. valide." -#: src/lang.c:2321 +#: src/lang.c:2423 msgid "Interval in secs to reread active" -msgstr "" +msgstr "Durée avant relecture du fichier active" -#: src/lang.c:2322 +#: src/lang.c:2424 msgid "# Time interval in seconds between rereading the active file (0=never)\n" -msgstr "" +msgstr "# Durée (en secondes) avant que le fichier active ne soit relu (0=jamais)\n" -#: src/lang.c:2327 +#: src/lang.c:2429 msgid "Reconnect to server automatically" msgstr "Reconnexion automatique au serveur" -#: src/lang.c:2328 +#: src/lang.c:2430 msgid "# If ON automatically reconnect to NNTP server if the connection is broken\n" -msgstr "" +msgstr "# Si ON, reconnexion automatique au serveur NNTP si la connexion est rompue\n" -#: src/lang.c:2332 +#: src/lang.c:2434 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:2333 +#: src/lang.c:2435 msgid "Cache NNTP overview files locally" msgstr "Cache local des en-têtes NNTP" -#: src/lang.c:2334 +#: src/lang.c:2436 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "# Si ON, crée une copie locale des en-têtes NNTP.\n" -#: src/lang.c:2338 +#: src/lang.c:2440 msgid "Enter format string. sets, cancels." -msgstr "" +msgstr "Formatage des dates. valide, annule." -#: src/lang.c:2339 +#: src/lang.c:2441 msgid "Format string for display of dates" -msgstr "" +msgstr "Format des dates affichées" -#: src/lang.c:2340 +#: src/lang.c:2442 msgid "# Format string for date representation\n" -msgstr "" +msgstr "# Format des dates affichées\n" -#: src/lang.c:2346 +#: src/lang.c:2448 msgid "Unicode normalization form" -msgstr "" +msgstr "Normalisation d'Unicode" -#: src/lang.c:2347 +#: src/lang.c:2449 msgid "# Unicode normalization form\n" - "# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" -msgstr "" + "# Possible values are (the default is marked with *):\n" + "# 0 = None\n" + "# * 1 = NFKC\n" + "# 2 = NFKD\n" + "# 3 = NFC\n" + "# 4 = NFD\n" +msgstr "# Normalisation d'Unicode\n" + "# Les valeurs possibles sont (celle par défaut est marquée par *) :\n" + "# 0 = Aucune\n" + "# * 1 = NFKC\n" + "# 2 = NFKD\n" + "# 3 = NFC\n" + "# 4 = NFD\n" -#: src/lang.c:2354 +#: src/lang.c:2461 msgid "Render BiDi" -msgstr "" +msgstr "Rendu BiDi" -#: src/lang.c:2355 +#: src/lang.c:2462 msgid "# If ON, bi-directional text is rendered by tin\n" -msgstr "" +msgstr "# Si ON, le texte bi-directionnel est affiché par tin\n" -#: src/misc.c:3711 +#: src/misc.c:3713 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "Version : %s %s release %s (\"%s\") %s %s\n" -#: src/misc.c:3714 +#: src/misc.c:3716 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Version : %s %s release %s (\"%s\")\n" @@ -6045,7 +6358,7 @@ msgstr "\n" #: src/nntplib.c:841 msgid "Rejoin current group\n" -msgstr "Rejoindre l'actuel groupe\n" +msgstr "Rejoindre le groupe actuel\n" #: src/nntplib.c:848 #, c-format @@ -6062,7 +6375,7 @@ msgstr "Réenvoyer la dernière commande ( msgid "couldn't expand %s\n" msgstr "impossible de décompacter %s\n" -#: src/post.c:1962 +#: src/post.c:1970 #, c-format msgid "Posting: %.*s ..." msgstr "Postage : %.*s ..." @@ -6099,21 +6412,24 @@ msgid "This message has been composed in "are reading this prefix, your mail reader probably has not yet been modified\n" "to understand the new format, and some of what follows may look strange.\n" "\n" -msgstr "" +msgstr "Ce message a été composé avec le format MIME 'multipart/mixed'. Si vous\n" + "lisez ceci, votre MUA ne peut probablement pas lire ce nouveau format, donc\n" + "ce qui suit peut paraître assez bizarre.\n" + "\n" #: src/save.c:974 msgid "bytes" msgstr "octets" -#: src/select.c:352 +#: src/select.c:375 msgid "unread" msgstr "non lu(s)" -#: src/select.c:352 +#: src/select.c:375 msgid "all" msgstr "tout" -#: src/select.c:530 src/select.c:532 +#: src/select.c:547 src/select.c:549 msgid " R" msgstr " R" @@ -6121,12 +6437,12 @@ msgstr " R" #: src/xface.c:91 #, c-format msgid "Can't run slrnface: Environment variable %s not found." -msgstr "" +msgstr "Lancement de slrnface impossible : Variable %s introuvable." #: src/xface.c:99 src/xface.c:131 #, c-format msgid "Can't run slrnface: failed to create %s" -msgstr "" +msgstr "Lancement de slrnface impossible : échec de la création de %s" #: src/xface.c:109 msgid "This directory is used to create named pipes for communication between\n" @@ -6139,7 +6455,10 @@ msgid "This directory is used to create "However, if the directory is mounted from an NFS server, you might see\n" "special files created by your NFS server while slrnface is running.\n" "Do not try to remove them.\n" -msgstr "" +msgstr "Ce répertoire est utilisé pour créer les pipes de communication entre\n" + "slrnface et ses processus pères. Il devrait être normalement vide car\n" + "le pipe est effacé juste après son ouverture entre les processus.\n" + "\n" #: src/xface.c:123 msgid "Can't run slrnface: couldn't construct fifo name." Binary files tin-1.7.6/po/messages and tin-1.7.7/po/messages differ diff -Nurp tin-1.7.6/po/tin.pot tin-1.7.7/po/tin.pot --- tin-1.7.6/po/tin.pot 2004-09-06 10:40:28.000000000 +0200 +++ tin-1.7.7/po/tin.pot 2004-12-15 16:48:21.000000000 +0100 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2004-09-06 10:40+0200\n" +"POT-Creation-Date: 2004-12-15 16:47+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -231,7 +231,7 @@ msgstr "" msgid "# and set Followup-To: poster\n" msgstr "" -#: src/cook.c:814 +#: src/cook.c:494 msgid "(unknown)" msgstr "" @@ -590,7 +590,7 @@ msgstr "" msgid "Creating newsrc file...\n" msgstr "" -#: src/lang.c:127 src/lang.c:1121 +#: src/lang.c:127 src/lang.c:1140 msgid "Default" msgstr "" @@ -1409,388 +1409,396 @@ msgid "save marked articles automaticall msgstr "" #: src/lang.c:337 -msgid "search for articles by author backwards" +msgid "scroll the screen one line down" msgstr "" #: src/lang.c:338 -msgid "search for articles by author forwards" +msgid "scroll the screen one line up" msgstr "" #: src/lang.c:339 -msgid "search all articles for a given string (this may take some time)" +msgid "search for articles by author backwards" msgstr "" #: src/lang.c:340 -msgid " \t (searches are case-insensitive and wrap around to all articles)" +msgid "search for articles by author forwards" msgstr "" #: src/lang.c:341 -msgid "search for articles by Subject line backwards" +msgid "search all articles for a given string (this may take some time)" msgstr "" #: src/lang.c:342 -msgid "search for articles by Subject line forwards" +msgid " \t (searches are case-insensitive and wrap around to all articles)" msgstr "" #: src/lang.c:343 -msgid "repeat last search" +msgid "search for articles by Subject line backwards" msgstr "" #: src/lang.c:344 -msgid "tag current article for reposting/mailing/piping/printing/saving" +msgid "search for articles by Subject line forwards" msgstr "" #: src/lang.c:345 -msgid "toggle info message in last line (subject/description)" +msgid "repeat last search" msgstr "" #: src/lang.c:346 -msgid "toggle inverse video" +msgid "tag current article for reposting/mailing/piping/printing/saving" msgstr "" #: src/lang.c:347 -msgid "toggle mini help menu display" +msgid "toggle info message in last line (subject/description)" msgstr "" #: src/lang.c:348 -msgid "cycle the display of authors email address, real name, both or neither" +msgid "toggle inverse video" msgstr "" #: src/lang.c:349 -msgid "show version information" +msgid "toggle mini help menu display" msgstr "" #: src/lang.c:350 -msgid "mark all articles as read and return to group selection menu" +msgid "cycle the display of authors email address, real name, both or neither" msgstr "" #: src/lang.c:351 -msgid "mark all articles as read and enter next group with unread articles" +msgid "show version information" msgstr "" #: src/lang.c:352 -msgid "choose first thread in list" +msgid "mark all articles as read and return to group selection menu" msgstr "" #: src/lang.c:353 -msgid "choose last thread in list" +msgid "mark all articles as read and enter next group with unread articles" msgstr "" #: src/lang.c:354 -msgid "list articles within current thread (bring up Thread sub-menu)" +msgid "choose first thread in list" msgstr "" #: src/lang.c:355 -msgid "mark article as unread" +msgid "choose last thread in list" msgstr "" #: src/lang.c:356 -msgid "mark current thread or tagged threads as read" +msgid "list articles within current thread (bring up Thread sub-menu)" msgstr "" #: src/lang.c:357 -msgid "mark thread as unread" +msgid "mark article as unread" msgstr "" #: src/lang.c:358 -msgid "toggle display of all/selected articles" +msgid "mark current thread or tagged threads as read" msgstr "" #: src/lang.c:359 -msgid "display next group" +msgid "mark thread as unread" msgstr "" #: src/lang.c:360 -msgid "display previous group" +msgid "toggle display of all/selected articles" msgstr "" #: src/lang.c:361 -msgid "toggle all selections (all articles)" +msgid "display next group" msgstr "" #: src/lang.c:362 -msgid "select group (make \"hot\")" +msgid "display previous group" msgstr "" #: src/lang.c:363 -msgid "select thread" +msgid "toggle all selections (all articles)" msgstr "" #: src/lang.c:364 -msgid "select threads if at least one unread article is selected" +msgid "select group (make \"hot\")" msgstr "" #: src/lang.c:365 -msgid "select threads that match user specified pattern" +msgid "select thread" msgstr "" #: src/lang.c:366 -msgid "tag all parts of current multipart-message in order" +msgid "select threads if at least one unread article is selected" msgstr "" #: src/lang.c:367 -msgid "0 - 9\t choose thread by number" +msgid "select threads that match user specified pattern" msgstr "" #: src/lang.c:368 -msgid "toggle limit number of articles to get, and reload" +msgid "tag all parts of current multipart-message in order" msgstr "" #: src/lang.c:369 -msgid "toggle display of all/unread articles" +msgid "0 - 9\t choose thread by number" msgstr "" #: src/lang.c:370 -msgid "toggle selection of thread" +msgid "toggle limit number of articles to get, and reload" msgstr "" #: src/lang.c:371 -msgid "cycle through threading options available" +msgid "toggle display of all/unread articles" msgstr "" #: src/lang.c:372 -msgid "undo all selections (all articles)" +msgid "toggle selection of thread" msgstr "" #: src/lang.c:373 -msgid "untag all tagged threads" +msgid "cycle through threading options available" msgstr "" #: src/lang.c:374 -msgid "mark all articles in group as read" +msgid "undo all selections (all articles)" msgstr "" #: src/lang.c:375 -msgid "mark all articles in group as read and move to next unread group" +msgid "untag all tagged threads" msgstr "" #: src/lang.c:376 -msgid "choose first group in list" +msgid "mark all articles in group as read" msgstr "" #: src/lang.c:377 -msgid "choose group by name" +msgid "mark all articles in group as read and move to next unread group" msgstr "" #: src/lang.c:378 -msgid "0 - 9\t choose group by number" +msgid "choose first group in list" msgstr "" #: src/lang.c:379 -msgid "choose range of groups to be affected by next command" +msgid "choose group by name" msgstr "" #: src/lang.c:380 -msgid "choose last group in list" +msgid "0 - 9\t choose group by number" msgstr "" #: src/lang.c:381 -msgid "mark all articles in chosen group unread" +msgid "choose range of groups to be affected by next command" msgstr "" #: src/lang.c:382 -msgid "move chosen group within list" +msgid "choose last group in list" msgstr "" #: src/lang.c:383 +msgid "mark all articles in chosen group unread" +msgstr "" + +#: src/lang.c:384 +msgid "move chosen group within list" +msgstr "" + +#: src/lang.c:385 msgid "choose next group with unread news" msgstr "" -#: src/lang.c:384 src/lang.c:1168 +#: src/lang.c:386 src/lang.c:1187 msgid "quit" msgstr "" -#: src/lang.c:385 +#: src/lang.c:387 msgid "quit without saving configuration changes" msgstr "" -#: src/lang.c:386 +#: src/lang.c:388 msgid "read chosen group" msgstr "" -#: src/lang.c:387 +#: src/lang.c:389 msgid "reset .newsrc (all available articles in groups marked unread)" msgstr "" -#: src/lang.c:388 +#: src/lang.c:390 msgid "search backwards for a group name" msgstr "" -#: src/lang.c:389 +#: src/lang.c:391 msgid " \t (all searches are case-insensitive and wrap around)" msgstr "" -#: src/lang.c:390 +#: src/lang.c:392 msgid "search forwards for a group name" msgstr "" -#: src/lang.c:391 +#: src/lang.c:393 msgid "subscribe to chosen group" msgstr "" -#: src/lang.c:392 +#: src/lang.c:394 msgid "subscribe to groups that match pattern" msgstr "" -#: src/lang.c:393 +#: src/lang.c:395 msgid "reread active file to check for any new news" msgstr "" -#: src/lang.c:394 +#: src/lang.c:396 msgid "toggle display of group name only or group name plus description" msgstr "" -#: src/lang.c:395 +#: src/lang.c:397 msgid "toggle display to show all/unread subscribed groups" msgstr "" -#: src/lang.c:396 +#: src/lang.c:398 msgid "unsubscribe from chosen group" msgstr "" -#: src/lang.c:397 +#: src/lang.c:399 msgid "unsubscribe from groups that match pattern" msgstr "" -#: src/lang.c:398 +#: src/lang.c:400 msgid "sort the list of groups" msgstr "" -#: src/lang.c:399 +#: src/lang.c:401 msgid "toggle display to show all/subscribed groups" msgstr "" -#: src/lang.c:400 +#: src/lang.c:402 msgid "0 - 9\t choose article by number" msgstr "" -#: src/lang.c:401 +#: src/lang.c:403 msgid "mark thread as read and return to group index page" msgstr "" -#: src/lang.c:402 +#: src/lang.c:404 msgid "mark thread as read and enter next unread thread or group" msgstr "" -#: src/lang.c:403 +#: src/lang.c:405 msgid "choose first article in list" msgstr "" -#: src/lang.c:404 +#: src/lang.c:406 msgid "choose last article in list" msgstr "" -#: src/lang.c:405 +#: src/lang.c:407 msgid "" "mark article or tagged articles as read and move cursor to next unread " "article" msgstr "" -#: src/lang.c:406 +#: src/lang.c:408 msgid "read chosen article" msgstr "" -#: src/lang.c:407 +#: src/lang.c:409 msgid "" "Display properties\n" "------------------" msgstr "" -#: src/lang.c:408 +#: src/lang.c:410 msgid "" "Miscellaneous\n" "-------------" msgstr "" -#: src/lang.c:409 +#: src/lang.c:411 msgid "" "Moving around\n" "-------------" msgstr "" -#: src/lang.c:410 +#: src/lang.c:412 msgid "" "Group/thread/article operations\n" "-------------------------------" msgstr "" -#: src/lang.c:412 +#: src/lang.c:414 msgid "Group Level Commands" msgstr "" -#: src/lang.c:413 +#: src/lang.c:415 msgid "Kill filter added" msgstr "" -#: src/lang.c:414 +#: src/lang.c:416 msgid "Auto-selection filter added" msgstr "" -#: src/lang.c:415 +#: src/lang.c:417 msgid "All parts tagged" msgstr "" -#: src/lang.c:416 +#: src/lang.c:418 msgid "Storing article for later posting" msgstr "" -#: src/lang.c:417 +#: src/lang.c:419 msgid "Please enter a valid character" msgstr "" -#: src/lang.c:418 +#: src/lang.c:420 #, c-format msgid "Missing part #%d" msgstr "" -#: src/lang.c:419 +#: src/lang.c:421 msgid "*** No postponed articles ***" msgstr "" -#: src/lang.c:420 +#: src/lang.c:422 msgid "Not a multi-part message" msgstr "" -#: src/lang.c:421 +#: src/lang.c:423 msgid "You are not subscribed to this group" msgstr "" -#: src/lang.c:422 +#: src/lang.c:424 msgid "No previous expression" msgstr "" -#: src/lang.c:423 +#: src/lang.c:425 msgid "Operation disabled in no-overwrite mode" msgstr "" #. TODO: replace hardcoded key-name in txt_info_postponed -#: src/lang.c:425 +#: src/lang.c:427 #, c-format msgid "%d postponed %s, reuse with ^O...\n" msgstr "" -#: src/lang.c:426 +#: src/lang.c:428 msgid "" "X-Conversion-Note: multipart/alternative contents have been removed.\n" " To get the whole article, turn alternative handling OFF in the Option " "Menu\n" msgstr "" -#: src/lang.c:428 +#: src/lang.c:430 #, c-format msgid "Save filename for %s/%s is a mailbox. Attachment not saved" msgstr "" -#: src/lang.c:429 +#: src/lang.c:431 msgid "TeX2Iso encoded article" msgstr "" -#: src/lang.c:430 +#: src/lang.c:432 msgid "incomplete " msgstr "" #. TODO: replace hardcoded key-names -#: src/lang.c:432 +#: src/lang.c:434 #, c-format msgid "" "\n" @@ -1828,129 +1836,129 @@ msgid "" "Please send bug-reports/comments to %s with the 'R' command.\n" msgstr "" -#: src/lang.c:448 +#: src/lang.c:450 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." msgstr "" -#: src/lang.c:449 +#: src/lang.c:451 #, c-format msgid "Invalid Sender:-header %s" msgstr "" -#: src/lang.c:450 +#: src/lang.c:452 msgid "Inverse video disabled" msgstr "" -#: src/lang.c:451 +#: src/lang.c:453 msgid "Inverse video enabled" msgstr "" -#: src/lang.c:453 +#: src/lang.c:455 #, c-format msgid "Missing definition for %s\n" msgstr "" -#: src/lang.c:454 +#: src/lang.c:456 #, c-format msgid "Invalid key definition '%s'\n" msgstr "" -#: src/lang.c:455 +#: src/lang.c:457 #, c-format msgid "Invalid keyname '%s'\n" msgstr "" -#: src/lang.c:456 +#: src/lang.c:458 #, c-format msgid "Key '%s' is defined for both %s%s and %s%s\n" msgstr "" -#: src/lang.c:457 +#: src/lang.c:459 #, c-format msgid "Kill From: [%s] (y/n): " msgstr "" -#: src/lang.c:458 +#: src/lang.c:460 msgid "Kill Lines: (num): " msgstr "" -#: src/lang.c:459 +#: src/lang.c:461 msgid "Kill Article Menu" msgstr "" -#: src/lang.c:460 +#: src/lang.c:462 #, c-format msgid "Kill Msg-Id: [%s] (f/l/o/n): " msgstr "" -#: src/lang.c:461 +#: src/lang.c:463 msgid "Kill pattern scope : " msgstr "" -#: src/lang.c:462 +#: src/lang.c:464 #, c-format msgid "Kill Subject: [%s] (y/n): " msgstr "" -#: src/lang.c:463 +#: src/lang.c:465 msgid "Kill text pattern : " msgstr "" -#: src/lang.c:464 +#: src/lang.c:466 msgid "Kill time in days : " msgstr "" -#: src/lang.c:466 +#: src/lang.c:468 msgid "Last" msgstr "" -#: src/lang.c:467 +#: src/lang.c:469 msgid "-- Last response --" msgstr "" -#: src/lang.c:468 +#: src/lang.c:470 #, c-format msgid "Lines %s " msgstr "" -#: src/lang.c:470 +#: src/lang.c:472 msgid "Message-ID: line " msgstr "" -#: src/lang.c:472 +#: src/lang.c:474 msgid "mailbox " msgstr "" -#: src/lang.c:473 +#: src/lang.c:475 #, c-format msgid "Mail article(s) to [%.*s]> " msgstr "" -#: src/lang.c:474 +#: src/lang.c:476 #, c-format msgid "Mailing log to %s\n" msgstr "" -#: src/lang.c:475 +#: src/lang.c:477 msgid "Mail bug report..." msgstr "" -#: src/lang.c:476 +#: src/lang.c:478 #, c-format msgid "Mail BUG REPORT to %s?" msgstr "" -#: src/lang.c:477 +#: src/lang.c:479 msgid "Mailed" msgstr "" -#: src/lang.c:478 +#: src/lang.c:480 #, c-format msgid "Mailing to %s..." msgstr "" -#: src/lang.c:479 +#: src/lang.c:481 msgid "" "# [Mail/Save] active file. Format is like news active file:\n" "# groupname max.artnum min.artnum /dir\n" @@ -1958,285 +1966,285 @@ msgid "" "#\n" msgstr "" -#: src/lang.c:482 +#: src/lang.c:484 #, c-format msgid "%s marked as unread" msgstr "" -#: src/lang.c:483 +#: src/lang.c:485 #, c-format msgid "Marked %d of %d tagged %s as read" msgstr "" -#: src/lang.c:484 +#: src/lang.c:486 #, c-format msgid "Mark all articles as read%s?" msgstr "" -#: src/lang.c:485 +#: src/lang.c:487 #, c-format msgid "Mark %s=tagged articles, %s=current article, %s=quit: " msgstr "" -#: src/lang.c:486 +#: src/lang.c:488 #, c-format msgid "Mark group %s as read?" msgstr "" -#: src/lang.c:487 +#: src/lang.c:489 #, c-format msgid "Mark thread as read%s?" msgstr "" -#: src/lang.c:488 +#: src/lang.c:490 #, c-format msgid "Mark %s=tagged articles/threads, %s=current thread, %s=quit: " msgstr "" -#: src/lang.c:489 +#: src/lang.c:491 #, c-format msgid "Matching %s groups..." msgstr "" -#: src/lang.c:490 src/lang.c:494 +#: src/lang.c:492 src/lang.c:496 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "" -#: src/lang.c:491 +#: src/lang.c:493 #, c-format msgid "" "%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; " "%s=list thread" msgstr "" -#: src/lang.c:492 +#: src/lang.c:494 #, c-format msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" msgstr "" -#: src/lang.c:493 +#: src/lang.c:495 #, c-format msgid "%s=search forwards; %s=search backwards; %s=quit" msgstr "" -#: src/lang.c:495 +#: src/lang.c:497 #, c-format msgid "%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read" msgstr "" -#: src/lang.c:496 +#: src/lang.c:498 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" msgstr "" -#: src/lang.c:497 +#: src/lang.c:499 #, c-format msgid "" "%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" msgstr "" -#: src/lang.c:498 +#: src/lang.c:500 #, c-format msgid "" "%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank " "in/out" msgstr "" -#: src/lang.c:499 +#: src/lang.c:501 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" msgstr "" -#: src/lang.c:500 +#: src/lang.c:502 #, c-format msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" msgstr "" -#: src/lang.c:501 +#: src/lang.c:503 msgid "--More--" msgstr "" -#: src/lang.c:502 +#: src/lang.c:504 #, c-format msgid "Moving %s..." msgstr "" -#: src/lang.c:504 +#: src/lang.c:506 msgid ", name: " msgstr "" -#: src/lang.c:505 +#: src/lang.c:507 #, c-format msgid "Goto newsgroup [%s]> " msgstr "" -#: src/lang.c:506 +#: src/lang.c:508 msgid "newsgroups" msgstr "" -#: src/lang.c:507 +#: src/lang.c:509 #, c-format msgid "Position %s in group list (1,2,..,$) [%d]> " msgstr "" -#: src/lang.c:508 +#: src/lang.c:510 msgid "newsgroup" msgstr "" -#: src/lang.c:509 +#: src/lang.c:511 msgid "Try and save newsrc file again?" msgstr "" -#: src/lang.c:510 +#: src/lang.c:512 msgid "Warning: No newsgroups were written to your newsrc file. Save aborted." msgstr "" -#: src/lang.c:511 +#: src/lang.c:513 msgid "newsrc file saved successfully.\n" msgstr "" -#: src/lang.c:512 +#: src/lang.c:514 msgid "-- Next response --" msgstr "" -#: src/lang.c:513 +#: src/lang.c:515 #, c-format msgid "NNTP authorization password not found for %s" msgstr "" -#: src/lang.c:514 +#: src/lang.c:516 msgid "No " msgstr "" -#: src/lang.c:515 +#: src/lang.c:517 msgid "*** No articles ***" msgstr "" -#: src/lang.c:516 +#: src/lang.c:518 msgid "No articles have been posted" msgstr "" -#: src/lang.c:517 +#: src/lang.c:519 msgid "*** No description ***" msgstr "" -#: src/lang.c:518 +#: src/lang.c:520 msgid "No filename" msgstr "" -#: src/lang.c:519 +#: src/lang.c:521 msgid "No group" msgstr "" -#: src/lang.c:520 +#: src/lang.c:522 msgid "*** No groups ***" msgstr "" -#: src/lang.c:521 +#: src/lang.c:523 msgid "No more groups to read" msgstr "" -#: src/lang.c:522 +#: src/lang.c:524 msgid "No last message" msgstr "" -#: src/lang.c:523 +#: src/lang.c:525 msgid "No mail address" msgstr "" -#: src/lang.c:524 +#: src/lang.c:526 msgid "No articles marked for saving" msgstr "" -#: src/lang.c:525 +#: src/lang.c:527 msgid "No match" msgstr "" -#: src/lang.c:526 +#: src/lang.c:528 msgid "No more groups" msgstr "" -#: src/lang.c:527 +#: src/lang.c:529 msgid "No newsgroups" msgstr "" -#: src/lang.c:528 +#: src/lang.c:530 msgid "No next unread article" msgstr "" -#: src/lang.c:529 +#: src/lang.c:531 msgid "No previous group" msgstr "" -#: src/lang.c:530 +#: src/lang.c:532 msgid "No previous unread article" msgstr "" -#: src/lang.c:531 +#: src/lang.c:533 msgid "No responses" msgstr "" -#: src/lang.c:532 +#: src/lang.c:534 msgid "No responses to list in current thread" msgstr "" -#: src/lang.c:533 +#: src/lang.c:535 msgid "No search string" msgstr "" -#: src/lang.c:534 +#: src/lang.c:536 msgid "No subject" msgstr "" -#: src/lang.c:535 +#: src/lang.c:538 #, c-format msgid "%s: Terminal must have clear to end-of-line (ce)\n" msgstr "" -#: src/lang.c:536 +#: src/lang.c:539 #, c-format msgid "%s: Terminal must have clear to end-of-screen (cd)\n" msgstr "" -#: src/lang.c:537 +#: src/lang.c:540 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" msgstr "" -#: src/lang.c:538 +#: src/lang.c:541 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" msgstr "" -#: src/lang.c:539 +#: src/lang.c:542 #, c-format msgid "%s: TERM variable must be set to use screen capabilities\n" msgstr "" -#: src/lang.c:540 +#: src/lang.c:544 #, c-format msgid "No viewer found for %s/%s\n" msgstr "" -#: src/lang.c:541 +#: src/lang.c:545 msgid "Newsgroup does not exist on this server" msgstr "" -#: src/lang.c:542 +#: src/lang.c:546 #, c-format msgid "Group %s not found in active file" msgstr "" -#: src/lang.c:543 +#: src/lang.c:547 msgid "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "" -#: src/lang.c:544 +#: src/lang.c:548 msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "" -#: src/lang.c:545 +#: src/lang.c:549 #, c-format msgid "" "# NNTP-server -> newsrc translation table and NNTP-server\n" @@ -2253,316 +2261,316 @@ msgid "" "#\n" msgstr "" -#: src/lang.c:552 +#: src/lang.c:556 msgid "Only" msgstr "" -#: src/lang.c:553 +#: src/lang.c:557 #, c-format msgid "Option not enabled. Recompile with %s." msgstr "" -#: src/lang.c:554 +#: src/lang.c:558 msgid "Options Menu" msgstr "" -#: src/lang.c:557 +#: src/lang.c:561 #, c-format msgid "Error in regex: %s at pos. %d '%s'" msgstr "" -#: src/lang.c:558 +#: src/lang.c:562 #, c-format msgid "Error in regex: pcre internal error %d" msgstr "" -#: src/lang.c:559 +#: src/lang.c:563 #, c-format msgid "Error in regex: study - pcre internal error %s" msgstr "" -#: src/lang.c:560 +#: src/lang.c:564 msgid "Post a followup..." msgstr "" #. TODO: replace hardcoded key-name in txt_post_error_ask_postpone -#: src/lang.c:562 +#: src/lang.c:566 msgid "" "An error has occurred while posting the article. If you think that this\n" "error is temporary or otherwise correctable, you can postpone the article\n" "and pick it up again with ^O later.\n" msgstr "" -#: src/lang.c:565 +#: src/lang.c:569 msgid "Posted articles history" msgstr "" -#: src/lang.c:566 +#: src/lang.c:570 #, c-format msgid "Post to newsgroup(s) [%s]> " msgstr "" -#: src/lang.c:567 +#: src/lang.c:571 msgid "-- post processing started --" msgstr "" -#: src/lang.c:568 +#: src/lang.c:572 msgid "-- post processing completed --" msgstr "" -#: src/lang.c:569 +#: src/lang.c:573 #, c-format msgid "Post subject [%s]> " msgstr "" -#: src/lang.c:570 +#: src/lang.c:574 msgid "" "# Summary of mailed/posted messages viewable by 'W' command from within " "tin.\n" msgstr "" -#: src/lang.c:571 +#: src/lang.c:575 msgid "Posting article..." msgstr "" -#: src/lang.c:572 +#: src/lang.c:576 msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " msgstr "" -#: src/lang.c:573 +#: src/lang.c:577 #, c-format msgid "Hot %s" msgstr "" -#: src/lang.c:574 +#: src/lang.c:578 #, c-format msgid "Tagged %s" msgstr "" -#: src/lang.c:575 +#: src/lang.c:579 #, c-format msgid "Untagged %s" msgstr "" -#: src/lang.c:576 +#: src/lang.c:580 msgid "Processing mail messages marked for deletion." msgstr "" -#: src/lang.c:577 +#: src/lang.c:581 msgid "Processing saved articles marked for deletion." msgstr "" -#: src/lang.c:578 +#: src/lang.c:582 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "" -#: src/lang.c:579 +#: src/lang.c:583 msgid "Article unchanged, abort mailing?" msgstr "" -#: src/lang.c:580 +#: src/lang.c:584 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "" -#: src/lang.c:582 +#: src/lang.c:586 msgid "Add quick kill filter?" msgstr "" -#: src/lang.c:583 +#: src/lang.c:587 msgid "Add quick selection filter?" msgstr "" -#: src/lang.c:584 +#: src/lang.c:588 msgid "Do you really want to quit?" msgstr "" -#: src/lang.c:585 +#: src/lang.c:589 msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "" -#: src/lang.c:586 +#: src/lang.c:590 msgid "You have tagged articles in this group - quit anyway?" msgstr "" -#: src/lang.c:587 +#: src/lang.c:591 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "" -#: src/lang.c:588 +#: src/lang.c:592 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "" -#: src/lang.c:589 +#: src/lang.c:593 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "" -#: src/lang.c:590 +#: src/lang.c:594 msgid "Do you really want to quit without saving your configuration?" msgstr "" -#: src/lang.c:593 +#: src/lang.c:597 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "" -#: src/lang.c:594 +#: src/lang.c:598 msgid "Do you want to abort this operation?" msgstr "" -#: src/lang.c:595 +#: src/lang.c:599 msgid "Do you want to exit tin immediately?" msgstr "" -#: src/lang.c:596 +#: src/lang.c:600 msgid "Read response> " msgstr "" -#: src/lang.c:597 +#: src/lang.c:601 msgid "Reading ('q' to quit)..." msgstr "" -#: src/lang.c:598 +#: src/lang.c:602 #, c-format msgid "Reading %sarticles..." msgstr "" -#: src/lang.c:599 +#: src/lang.c:603 #, c-format msgid "Reading %sattributes file...\n" msgstr "" -#: src/lang.c:600 +#: src/lang.c:604 #, c-format msgid "Reading %sconfig file...\n" msgstr "" -#: src/lang.c:601 +#: src/lang.c:605 msgid "Reading filter file...\n" msgstr "" -#: src/lang.c:602 +#: src/lang.c:606 #, c-format msgid "Reading %s groups..." msgstr "" -#: src/lang.c:603 +#: src/lang.c:607 msgid "Reading input history file...\n" msgstr "" -#: src/lang.c:604 +#: src/lang.c:608 msgid "Reading keymap file...\n" msgstr "" -#: src/lang.c:605 +#: src/lang.c:609 msgid "Reading groups from active file... " msgstr "" -#: src/lang.c:606 +#: src/lang.c:610 msgid "Reading groups from newsrc file... " msgstr "" -#: src/lang.c:607 +#: src/lang.c:611 msgid "Reading newsgroups file... " msgstr "" -#: src/lang.c:608 +#: src/lang.c:612 msgid "Reading newsrc file..." msgstr "" -#: src/lang.c:610 +#: src/lang.c:614 #, c-format msgid "(%d:%02d remaining)" msgstr "" -#: src/lang.c:612 +#: src/lang.c:616 #, c-format msgid "Bogus group %s removed." msgstr "" -#: src/lang.c:613 +#: src/lang.c:617 #, c-format msgid "Error: rename %s to %s" msgstr "" -#: src/lang.c:614 +#: src/lang.c:618 msgid "Reply to author..." msgstr "" -#: src/lang.c:615 +#: src/lang.c:619 msgid "Repost" msgstr "" -#: src/lang.c:616 +#: src/lang.c:620 msgid "Reposting article..." msgstr "" -#: src/lang.c:617 +#: src/lang.c:621 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "" -#: src/lang.c:618 +#: src/lang.c:622 msgid "Reset newsrc?" msgstr "" -#: src/lang.c:619 +#: src/lang.c:623 msgid "Responses have been directed to the following newsgroups" msgstr "" -#: src/lang.c:620 +#: src/lang.c:624 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " msgstr "" -#: src/lang.c:621 +#: src/lang.c:625 #, c-format msgid "RespNo %4d of %4d" msgstr "" -#: src/lang.c:622 +#: src/lang.c:626 msgid "Press to continue..." msgstr "" -#: src/lang.c:624 +#: src/lang.c:628 #, c-format msgid "Select From [%s] (y/n): " msgstr "" -#: src/lang.c:625 +#: src/lang.c:629 msgid "Select Lines: (num): " msgstr "" -#: src/lang.c:626 +#: src/lang.c:630 msgid "Auto-select Article Menu" msgstr "" -#: src/lang.c:627 +#: src/lang.c:631 #, c-format msgid "Select Msg-Id [%s] (f/l/o/n): " msgstr "" -#: src/lang.c:628 +#: src/lang.c:632 msgid "Select pattern scope: " msgstr "" -#: src/lang.c:629 +#: src/lang.c:633 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "" -#: src/lang.c:630 +#: src/lang.c:634 msgid "Select text pattern : " msgstr "" -#: src/lang.c:631 +#: src/lang.c:635 msgid "Select time in days : " msgstr "" -#: src/lang.c:632 +#: src/lang.c:636 #, c-format msgid "" "# %s server configuration file\n" @@ -2576,219 +2584,223 @@ msgid "" "\n" msgstr "" -#: src/lang.c:638 +#: src/lang.c:642 msgid "Showing unread groups only" msgstr "" -#: src/lang.c:639 +#: src/lang.c:643 msgid "Subject: line (ignore case) " msgstr "" -#: src/lang.c:640 +#: src/lang.c:644 msgid "Subject: line (case sensitive)" msgstr "" -#: src/lang.c:641 +#: src/lang.c:645 msgid "Save" msgstr "" -#: src/lang.c:642 +#: src/lang.c:646 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "" -#: src/lang.c:643 +#: src/lang.c:647 msgid "Save configuration before continuing?" msgstr "" -#: src/lang.c:644 +#: src/lang.c:648 msgid "Save filename> " msgstr "" -#: src/lang.c:645 +#: src/lang.c:649 msgid "Saved" msgstr "" -#: src/lang.c:646 +#: src/lang.c:650 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "" -#: src/lang.c:647 +#: src/lang.c:651 #, c-format msgid "Saved %s...\n" msgstr "" -#: src/lang.c:648 +#: src/lang.c:652 msgid "Nothing was saved" msgstr "" -#: src/lang.c:649 +#: src/lang.c:653 #, c-format msgid "" "\n" "%s %d %s from %d %s\n" msgstr "" -#: src/lang.c:650 +#: src/lang.c:654 #, c-format msgid "-- %s saved to %s%s --" msgstr "" -#: src/lang.c:651 +#: src/lang.c:655 #, c-format msgid "-- %s saved to %s - %s --" msgstr "" -#: src/lang.c:652 +#: src/lang.c:656 msgid "Saving..." msgstr "" -#: src/lang.c:653 +#: src/lang.c:657 #, c-format msgid "%s: Screen initialization failed" msgstr "" -#: src/lang.c:654 +#: src/lang.c:659 #, c-format msgid "%s: screen is too small\n" msgstr "" -#: src/lang.c:655 +#: src/lang.c:661 #, c-format msgid "screen is too small, %s is exiting\n" msgstr "" -#: src/lang.c:656 +#: src/lang.c:662 #, c-format msgid "Search backwards [%s]> " msgstr "" -#: src/lang.c:657 +#: src/lang.c:663 #, c-format msgid "Search body [%s]> " msgstr "" -#: src/lang.c:658 +#: src/lang.c:664 #, c-format msgid "Search forwards [%s]> " msgstr "" -#: src/lang.c:659 +#: src/lang.c:665 msgid "Searching..." msgstr "" -#: src/lang.c:660 +#: src/lang.c:666 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "" -#: src/lang.c:661 +#: src/lang.c:667 msgid "Select article> " msgstr "" -#: src/lang.c:662 +#: src/lang.c:668 msgid "" "Select option number before text or use arrow keys and . 'q' to quit." msgstr "" -#: src/lang.c:663 +#: src/lang.c:669 msgid "Select group> " msgstr "" -#: src/lang.c:664 +#: src/lang.c:670 #, c-format msgid "Enter selection pattern [%s]> " msgstr "" -#: src/lang.c:665 +#: src/lang.c:671 msgid "Select thread > " msgstr "" -#: src/lang.c:666 +#: src/lang.c:672 #, c-format msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" msgstr "" -#: src/lang.c:667 +#: src/lang.c:673 msgid "servers active-file" msgstr "" -#: src/lang.c:668 +#: src/lang.c:674 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "" -#: src/lang.c:669 +#: src/lang.c:675 msgid "" msgstr "" -#: src/lang.c:670 +#: src/lang.c:676 #, c-format msgid "Starting: (%s)" msgstr "" -#: src/lang.c:671 +#: src/lang.c:677 #, c-format msgid "List Thread (%d of %d)" msgstr "" -#: src/lang.c:672 +#: src/lang.c:678 #, c-format msgid "Thread (%.*s)" msgstr "" -#: src/lang.c:673 +#: src/lang.c:679 msgid "Enter wildcard subscribe pattern> " msgstr "" -#: src/lang.c:674 +#: src/lang.c:680 #, c-format msgid "subscribed to %d groups" msgstr "" -#: src/lang.c:675 +#: src/lang.c:681 #, c-format msgid "Subscribed to %s" msgstr "" -#: src/lang.c:676 +#: src/lang.c:682 msgid "Subscribing... " msgstr "" -#: src/lang.c:677 +#: src/lang.c:683 msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " msgstr "" -#: src/lang.c:678 +#: src/lang.c:684 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "" -#: src/lang.c:679 +#: src/lang.c:685 msgid "Superseding article ..." msgstr "" -#: src/lang.c:680 +#: src/lang.c:686 #, c-format msgid "" "\n" "Stopped. Type 'fg' to restart %s\n" msgstr "" -#: src/lang.c:682 +#: src/lang.c:688 #, c-format msgid "%d days" msgstr "" -#: src/lang.c:683 +#: src/lang.c:689 msgid "" msgstr "" -#: src/lang.c:684 +#: src/lang.c:690 +msgid "TeX " +msgstr "" + +#: src/lang.c:691 msgid "# Default action/prompt strings\n" msgstr "" -#: src/lang.c:685 +#: src/lang.c:692 msgid "" "# Defaults for quick (1 key) kill & auto-selection filters\n" "# header=NUM 0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n" @@ -2799,262 +2811,262 @@ msgid "" "# expire=ON/OFF ON=limit to default_filter_days OFF=don't ever expire\n" msgstr "" -#: src/lang.c:698 +#: src/lang.c:705 msgid "" "# If ON use print current subject or newsgroup description in the last line\n" msgstr "" -#: src/lang.c:699 +#: src/lang.c:706 msgid "# Host & time info used for detecting new groups (don't touch)\n" msgstr "" -#: src/lang.c:700 +#: src/lang.c:707 msgid "There is no news\n" msgstr "" -#: src/lang.c:701 +#: src/lang.c:708 msgid "Thread" msgstr "" -#: src/lang.c:702 +#: src/lang.c:709 msgid "Thread Level Commands" msgstr "" -#: src/lang.c:703 +#: src/lang.c:710 msgid "Thread deselected" msgstr "" -#: src/lang.c:704 +#: src/lang.c:711 msgid "Thread selected" msgstr "" -#: src/lang.c:705 +#: src/lang.c:712 msgid "threads" msgstr "" -#: src/lang.c:706 +#: src/lang.c:713 msgid "Thread range" msgstr "" -#: src/lang.c:707 +#: src/lang.c:714 msgid "thread" msgstr "" -#: src/lang.c:708 +#: src/lang.c:715 #, c-format msgid "Thread %4s of %4s" msgstr "" -#: src/lang.c:709 +#: src/lang.c:716 msgid "Threading articles..." msgstr "" -#: src/lang.c:710 +#: src/lang.c:717 #, c-format msgid "Toggled word highlighting %s" msgstr "" -#: src/lang.c:711 +#: src/lang.c:718 msgid "Toggled rot13 encoding" msgstr "" -#: src/lang.c:712 +#: src/lang.c:719 #, c-format msgid "Toggled german TeX encoding %s" msgstr "" -#: src/lang.c:713 +#: src/lang.c:720 #, c-format msgid "Toggled tab-width to %d" msgstr "" -#: src/lang.c:714 +#: src/lang.c:721 #, c-format msgid "%d Trying to dotlock %s" msgstr "" -#: src/lang.c:715 +#: src/lang.c:722 #, c-format msgid "%d Trying to lock %s" msgstr "" -#: src/lang.c:716 +#: src/lang.c:723 msgid " h=help\n" msgstr "" -#: src/lang.c:718 +#: src/lang.c:725 msgid "Unlimited" msgstr "" -#: src/lang.c:719 +#: src/lang.c:726 msgid "Enter wildcard unsubscribe pattern> " msgstr "" -#: src/lang.c:720 +#: src/lang.c:727 #, c-format msgid "Error decoding %s : %s" msgstr "" -#: src/lang.c:721 +#: src/lang.c:728 msgid "No end." msgstr "" -#: src/lang.c:722 +#: src/lang.c:729 #, c-format msgid "%s successfully decoded." msgstr "" -#: src/lang.c:723 +#: src/lang.c:730 #, c-format msgid "" "%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" "\n" msgstr "" -#: src/lang.c:724 +#: src/lang.c:731 msgid "unread " msgstr "" -#: src/lang.c:725 +#: src/lang.c:732 #, c-format msgid "unsubscribed from %d groups" msgstr "" -#: src/lang.c:726 +#: src/lang.c:733 #, c-format msgid "Unsubscribed from %s" msgstr "" -#: src/lang.c:727 +#: src/lang.c:734 msgid "Unsubscribing... " msgstr "" -#: src/lang.c:728 +#: src/lang.c:735 msgid "Unthreading articles..." msgstr "" -#: src/lang.c:729 +#: src/lang.c:736 msgid "Updated" msgstr "" -#: src/lang.c:730 +#: src/lang.c:737 msgid "Updating" msgstr "" -#: src/lang.c:731 +#: src/lang.c:738 #, c-format msgid "Opening %s\n" msgstr "" -#: src/lang.c:732 +#: src/lang.c:739 msgid "No more URL's in this article" msgstr "" -#: src/lang.c:733 +#: src/lang.c:740 msgid "Use MIME display program for this message?" msgstr "" -#: src/lang.c:734 +#: src/lang.c:741 msgid " -c mark all news as read in subscribed newsgroups (batch mode)" msgstr "" -#: src/lang.c:735 +#: src/lang.c:742 msgid " -Z return status indicating if any unread news (batch mode)" msgstr "" -#: src/lang.c:736 +#: src/lang.c:743 msgid " -q don't check for new newsgroups" msgstr "" -#: src/lang.c:737 +#: src/lang.c:744 msgid " -X don't save any files on quit" msgstr "" -#: src/lang.c:738 +#: src/lang.c:745 msgid " -d don't show newsgroup descriptions" msgstr "" -#: src/lang.c:739 +#: src/lang.c:746 msgid " -G limit get only limit articles/group" msgstr "" -#: src/lang.c:740 +#: src/lang.c:747 #, c-format msgid " -H help information about %s" msgstr "" -#: src/lang.c:741 +#: src/lang.c:748 msgid " -h this help message" msgstr "" -#: src/lang.c:742 +#: src/lang.c:749 #, c-format msgid " -I dir news index file directory [default=%s]" msgstr "" -#: src/lang.c:743 +#: src/lang.c:750 msgid " -u update index files (batch mode)" msgstr "" -#: src/lang.c:744 +#: src/lang.c:751 #, c-format msgid " -m dir mailbox directory [default=%s]" msgstr "" -#: src/lang.c:745 +#: src/lang.c:752 #, c-format msgid "" "\n" "Mail bug reports/comments to %s" msgstr "" -#: src/lang.c:746 +#: src/lang.c:753 msgid " -N mail new news to your posts (batch mode)" msgstr "" -#: src/lang.c:747 +#: src/lang.c:754 msgid " -M user mail new news to specified user (batch mode)" msgstr "" -#: src/lang.c:748 +#: src/lang.c:755 #, c-format msgid " -f file subscribed to newsgroups file [default=%s]" msgstr "" -#: src/lang.c:749 +#: src/lang.c:756 msgid " -x no posting mode" msgstr "" -#: src/lang.c:750 +#: src/lang.c:757 msgid " -w post an article and exit" msgstr "" -#: src/lang.c:751 +#: src/lang.c:758 msgid " -o post all postponed articles and exit" msgstr "" -#: src/lang.c:752 +#: src/lang.c:759 msgid " -r read news remotely from default NNTP server" msgstr "" -#: src/lang.c:753 +#: src/lang.c:760 msgid " -R read news saved by -S option" msgstr "" -#: src/lang.c:754 +#: src/lang.c:761 #, c-format msgid " -s dir save news directory [default=%s]" msgstr "" -#: src/lang.c:755 +#: src/lang.c:762 msgid " -S save new news for later reading (batch mode)" msgstr "" -#: src/lang.c:756 +#: src/lang.c:763 msgid " -z start if any unread news" msgstr "" -#: src/lang.c:757 +#: src/lang.c:764 #, c-format msgid "" "A Usenet reader.\n" @@ -3062,37 +3074,37 @@ msgid "" "Usage: %s [options] [newsgroup[,...]]" msgstr "" -#: src/lang.c:758 +#: src/lang.c:765 msgid " -v verbose output for batch mode options" msgstr "" -#: src/lang.c:759 +#: src/lang.c:766 msgid " -V print version & date information" msgstr "" -#: src/lang.c:760 +#: src/lang.c:767 #, c-format msgid "%s only useful without batch mode operations\n" msgstr "" -#: src/lang.c:761 +#: src/lang.c:768 #, c-format msgid "%s only useful for batch mode operations\n" msgstr "" -#: src/lang.c:763 +#: src/lang.c:770 #, c-format msgid "" "\n" "%s%d out of range (0 - %d). Reset to 0" msgstr "" -#: src/lang.c:764 +#: src/lang.c:771 #, c-format msgid "View '%s' (%s/%s)?" msgstr "" -#: src/lang.c:766 +#: src/lang.c:773 #, c-format msgid "" "\n" @@ -3100,33 +3112,33 @@ msgid "" "%-100s\n" msgstr "" -#: src/lang.c:767 +#: src/lang.c:774 msgid "" "\n" "Warning: article unchanged after editing\n" msgstr "" -#: src/lang.c:768 +#: src/lang.c:775 msgid "" "\n" "Warning: \"Subject:\" contains only whitespaces.\n" msgstr "" -#: src/lang.c:769 +#: src/lang.c:776 msgid "" "\n" "Warning: \"Subject:\" begins with \"Re: \" but there are no " "\"References:\".\n" msgstr "" -#: src/lang.c:771 +#: src/lang.c:778 msgid "" "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" " with \"Re: \" and does not contain \"(was:\".\n" msgstr "" -#: src/lang.c:774 +#: src/lang.c:781 msgid "" "Read carefully!\n" "\n" @@ -3140,7 +3152,7 @@ msgid "" "\n" msgstr "" -#: src/lang.c:778 +#: src/lang.c:785 msgid "" "\n" "Warning: You are using a non-plain transfer encoding (such as base64 or\n" @@ -3149,7 +3161,7 @@ msgid "" " not be encoded properly.\n" msgstr "" -#: src/lang.c:783 +#: src/lang.c:790 #, c-format msgid "" "\n" @@ -3159,7 +3171,7 @@ msgid "" "Read WHATSNEW, etc...\n" msgstr "" -#: src/lang.c:785 +#: src/lang.c:792 #, c-format msgid "" "\n" @@ -3168,7 +3180,7 @@ msgid "" "Some values in your %s file may be ignored, others might have changed!\n" msgstr "" -#: src/lang.c:788 +#: src/lang.c:795 #, c-format msgid "" "Warning: tin wrote fewer groups to your\n" @@ -3178,19 +3190,19 @@ msgid "" "before you start tin once again!\n" msgstr "" -#: src/lang.c:792 +#: src/lang.c:799 #, c-format msgid "" "\n" "Warning: Found %d '-- \\n' lines, this may confuse some people.\n" msgstr "" -#: src/lang.c:793 +#: src/lang.c:800 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "" -#: src/lang.c:794 +#: src/lang.c:801 #, c-format msgid "" "\n" @@ -3201,49 +3213,49 @@ msgid "" " possible.\n" msgstr "" -#: src/lang.c:798 +#: src/lang.c:805 #, c-format msgid "" "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " msgstr "" -#: src/lang.c:799 +#: src/lang.c:806 msgid "" "\n" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" msgstr "" -#: src/lang.c:800 +#: src/lang.c:807 msgid "Writing attributes file..." msgstr "" -#: src/lang.c:802 +#: src/lang.c:809 #, c-format msgid "%d Responses" msgstr "" -#: src/lang.c:804 +#: src/lang.c:811 #, c-format msgid "Added %d %s" msgstr "" -#: src/lang.c:805 +#: src/lang.c:812 msgid "No unsubscribed groups to show" msgstr "" -#: src/lang.c:806 +#: src/lang.c:813 msgid "Showing subscribed to groups only" msgstr "" -#: src/lang.c:807 +#: src/lang.c:814 msgid "Yes " msgstr "" -#: src/lang.c:808 +#: src/lang.c:815 msgid " You have mail\n" msgstr "" -#: src/lang.c:813 +#: src/lang.c:820 #, c-format msgid "" "\n" @@ -3256,16 +3268,16 @@ msgid "" " M)enu option.\n" msgstr "" -#: src/lang.c:824 +#: src/lang.c:831 #, c-format msgid "Redefined key %s '%s' -> '%s'\n" msgstr "" -#: src/lang.c:825 +#: src/lang.c:832 msgid " -D debug mode 1=NNTP 2=ALL" msgstr "" -#: src/lang.c:829 +#: src/lang.c:836 msgid "" "Read carefully!\n" "\n" @@ -3282,368 +3294,380 @@ msgid "" "\n" msgstr "" -#: src/lang.c:838 +#: src/lang.c:845 msgid "toggle color" msgstr "" -#: src/lang.c:839 +#: src/lang.c:846 msgid "" -"# For color-adjust use the following numbers\n" -"# 0-black 1-red 2-green 3-brown\n" -"# 4-blue 5-pink 6-cyan 7-white\n" +"# Changing colors of several screen parts\n" +"# Possible values are:\n" +"# -1 = default (white for foreground and black for background)\n" +"# 0 = black\n" +"# 1 = red\n" +"# 2 = green\n" +"# 3 = brown\n" +"# 4 = blue\n" +"# 5 = pink\n" +"# 6 = cyan\n" +"# 7 = white\n" "# These are *only* for foreground:\n" -"# 8-gray 9-lightred 10-lightgreen 11-yellow\n" -"# 12-lightblue 13-lightpink 14-lightcyan 15-lightwhite\n" -"# A '-1' is interpreted as default (foreground normally is white, and\n" -"# background black)\n" +"# 8 = gray\n" +"# 9 = light red\n" +"# 10 = light green\n" +"# 11 = yellow\n" +"# 12 = light blue\n" +"# 13 = light pink\n" +"# 14 = light cyan\n" +"# 15 = light white\n" "\n" msgstr "" -#: src/lang.c:847 +#: src/lang.c:866 msgid " -a toggle color flag" msgstr "" -#: src/lang.c:851 +#: src/lang.c:870 msgid "" "\n" "Error: Followup-To set to more than one newsgroup!\n" msgstr "" -#: src/lang.c:852 +#: src/lang.c:871 #, c-format msgid "" "\n" "Error: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "" -#: src/lang.c:853 +#: src/lang.c:872 #, c-format msgid "" "\n" "Error: \"%s\" is not a valid newsgroup!\n" msgstr "" -#: src/lang.c:855 +#: src/lang.c:874 msgid "" "\n" "Warning: Followup-To set to more than one newsgroup!\n" msgstr "" -#: src/lang.c:856 +#: src/lang.c:875 #, c-format msgid "" "\n" "Warning: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "" -#: src/lang.c:857 +#: src/lang.c:876 #, c-format msgid "" "\n" "Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n" msgstr "" -#: src/lang.c:858 +#: src/lang.c:877 #, c-format msgid "" "\n" "Warning: \"%s\" is not a valid newsgroup at this site!\n" msgstr "" -#: src/lang.c:862 +#: src/lang.c:881 #, c-format msgid "%d files successfully written from %d articles. %d %s occurred." msgstr "" -#: src/lang.c:863 +#: src/lang.c:882 msgid "Missing parts." msgstr "" -#: src/lang.c:864 +#: src/lang.c:883 msgid "No beginning." msgstr "" -#: src/lang.c:865 +#: src/lang.c:884 msgid "No data." msgstr "" -#: src/lang.c:866 +#: src/lang.c:885 msgid "Unknown error." msgstr "" -#: src/lang.c:868 +#: src/lang.c:887 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "" -#: src/lang.c:872 +#: src/lang.c:891 msgid "Reading mail active file... " msgstr "" -#: src/lang.c:873 +#: src/lang.c:892 msgid "Reading mailgroups file... " msgstr "" -#: src/lang.c:877 +#: src/lang.c:896 msgid "perform PGP operations on article" msgstr "" -#: src/lang.c:878 +#: src/lang.c:897 msgid "Add key(s) to public keyring?" msgstr "" -#: src/lang.c:879 +#: src/lang.c:898 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "" -#: src/lang.c:880 +#: src/lang.c:899 #, c-format msgid "%s=sign, %s=sign & include public key, %s=quit: " msgstr "" -#: src/lang.c:881 +#: src/lang.c:900 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "" -#: src/lang.c:882 +#: src/lang.c:901 msgid "Article not signed and no public keys found" msgstr "" -#: src/lang.c:884 +#: src/lang.c:903 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:885 +#: src/lang.c:904 msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " msgstr "" -#: src/lang.c:886 +#: src/lang.c:905 msgid "" "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:888 +#: src/lang.c:907 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:889 +#: src/lang.c:908 msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "" -#: src/lang.c:890 +#: src/lang.c:909 msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:894 +#: src/lang.c:913 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:895 +#: src/lang.c:914 msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "" -#: src/lang.c:896 +#: src/lang.c:915 msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:898 +#: src/lang.c:917 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:899 +#: src/lang.c:918 msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "" -#: src/lang.c:900 +#: src/lang.c:919 msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:909 +#: src/lang.c:928 msgid "Try cache_overview_files to speed up things.\n" msgstr "" -#: src/lang.c:910 +#: src/lang.c:929 msgid "Tin will use local index files instead.\n" msgstr "" -#: src/lang.c:911 +#: src/lang.c:930 msgid "Cannot find NNTP server name" msgstr "" -#: src/lang.c:912 +#: src/lang.c:931 #, c-format msgid "Connecting to %s:%d..." msgstr "" -#: src/lang.c:913 +#: src/lang.c:932 msgid "Disconnecting from server...\n" msgstr "" -#: src/lang.c:914 +#: src/lang.c:933 #, c-format msgid "Wrong newsgroup name in response of GROUP command, %s for %s" msgstr "" -#: src/lang.c:915 +#: src/lang.c:934 #, c-format msgid "Failed to connect to NNTP server %s. Exiting..." msgstr "" -#: src/lang.c:916 +#: src/lang.c:935 msgid "205 Closing connection" msgstr "" -#: src/lang.c:917 +#: src/lang.c:936 msgid "Your server does not support the NNTP XOVER or OVER command.\n" msgstr "" -#: src/lang.c:918 +#: src/lang.c:937 msgid "Connection to news server has timed out. Reconnect?" msgstr "" -#: src/lang.c:919 +#: src/lang.c:938 #, c-format msgid "" "Put the server name in the file %s,\n" "or set the environment variable NNTPSERVER" msgstr "" -#: src/lang.c:920 +#: src/lang.c:939 msgid " -A force authentication on connect" msgstr "" -#: src/lang.c:921 +#: src/lang.c:940 #, c-format msgid " -g serv read news from NNTP server serv [default=%s]" msgstr "" -#: src/lang.c:922 +#: src/lang.c:941 #, c-format msgid " -p port use port as NNTP port [default=%d]" msgstr "" -#: src/lang.c:923 +#: src/lang.c:942 msgid " -Q quick start. Same as -nqd" msgstr "" -#: src/lang.c:924 +#: src/lang.c:943 msgid " -l use only LIST instead of GROUP (-n) command" msgstr "" -#: src/lang.c:925 +#: src/lang.c:944 msgid " -n only read subscribed .newsrc groups from NNTP server" msgstr "" -#: src/lang.c:927 +#: src/lang.c:946 #, c-format msgid "%s/tcp: Unknown service.\n" msgstr "" -#: src/lang.c:930 +#: src/lang.c:949 msgid "" "\n" "socket or connect problem\n" msgstr "" -#: src/lang.c:932 +#: src/lang.c:951 #, c-format msgid "" "\n" "Connection to %s: " msgstr "" -#: src/lang.c:933 +#: src/lang.c:952 msgid "Giving up...\n" msgstr "" -#: src/lang.c:936 +#: src/lang.c:955 msgid "" "Your server does not have Xref: in its XOVER information.\n" "Tin will try to use XHDR XREF instead (slows down things a bit).\n" msgstr "" -#: src/lang.c:939 +#: src/lang.c:958 msgid "Your server does not have Xref: in its XOVER information.\n" msgstr "" -#: src/lang.c:942 +#: src/lang.c:961 #, c-format msgid "Can't open %s. Try %s -r to read news via NNTP.\n" msgstr "" -#: src/lang.c:945 +#: src/lang.c:964 msgid " -Q quick start. Same as -qd" msgstr "" -#: src/lang.c:946 +#: src/lang.c:965 msgid " -l read only active file instead of scanning spool (-n) command" msgstr "" -#: src/lang.c:947 +#: src/lang.c:966 msgid " -n only read subscribed .newsrc groups from spool" msgstr "" -#: src/lang.c:948 +#: src/lang.c:967 msgid "Your server does not have Xref: in its NOV-files.\n" msgstr "" -#: src/lang.c:952 +#: src/lang.c:971 msgid "Posting using external inews failed. Use built in inews instead?" msgstr "" -#: src/lang.c:953 +#: src/lang.c:972 msgid "It worked! Should I always use my built in inews from now on?" msgstr "" -#: src/lang.c:961 +#: src/lang.c:980 #, c-format msgid "%d %s printed" msgstr "" -#: src/lang.c:962 +#: src/lang.c:981 msgid "output article/thread/hot/pattern/tagged articles to printer" msgstr "" -#: src/lang.c:963 +#: src/lang.c:982 msgid "Print" msgstr "" -#: src/lang.c:964 +#: src/lang.c:983 msgid "Printing..." msgstr "" -#: src/lang.c:968 +#: src/lang.c:987 msgid "pipe article/thread/hot/pattern/tagged articles into command" msgstr "" -#: src/lang.c:969 +#: src/lang.c:988 msgid "No command" msgstr "" -#: src/lang.c:970 +#: src/lang.c:989 msgid "Pipe" msgstr "" -#: src/lang.c:971 +#: src/lang.c:990 #, c-format msgid "Pipe to command [%.*s]> " msgstr "" -#: src/lang.c:972 +#: src/lang.c:991 msgid "Piping..." msgstr "" -#: src/lang.c:974 +#: src/lang.c:993 msgid "Piping not enabled." msgstr "" -#: src/lang.c:978 +#: src/lang.c:997 #, c-format msgid "" "\n" @@ -3653,7 +3677,7 @@ msgid "" " newsgroup names.\n" msgstr "" -#: src/lang.c:983 +#: src/lang.c:1002 #, c-format msgid "" "\n" @@ -3662,7 +3686,7 @@ msgid "" " Please write all newsgroups into a single line.\n" msgstr "" -#: src/lang.c:988 +#: src/lang.c:1007 #, c-format msgid "" "\n" @@ -3671,14 +3695,14 @@ msgid "" " To avoid trouble please write all newsgroups into a single line.\n" msgstr "" -#: src/lang.c:992 +#: src/lang.c:1011 #, c-format msgid "" "\n" "Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n" msgstr "" -#: src/lang.c:997 +#: src/lang.c:1016 msgid "" "\n" " If your article contains quoted text please take some time to pare it " @@ -3700,894 +3724,935 @@ msgid "" " likely to ignore it completely. It's a crowded net out there.\n" msgstr "" -#: src/lang.c:1010 +#: src/lang.c:1029 msgid "shell escape" msgstr "" -#: src/lang.c:1011 +#: src/lang.c:1030 #, c-format msgid "Shell Command (%s)" msgstr "" -#: src/lang.c:1012 +#: src/lang.c:1031 #, c-format msgid "Enter shell command [%s]> " msgstr "" -#: src/lang.c:1016 +#: src/lang.c:1035 #, c-format msgid "%s: Can't get entry for TERM\n" msgstr "" -#: src/lang.c:1020 +#: src/lang.c:1039 #, c-format msgid "Group %.*s ('q' to quit)..." msgstr "" -#: src/lang.c:1022 +#: src/lang.c:1041 #, c-format msgid "Group %.*s..." msgstr "" -#: src/lang.c:1026 +#: src/lang.c:1045 msgid "Server unavailable\n" msgstr "" -#: src/lang.c:1032 +#: src/lang.c:1051 #, c-format msgid "" "%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; " "%s=post" msgstr "" -#: src/lang.c:1033 +#: src/lang.c:1052 #, c-format msgid "" "%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1035 +#: src/lang.c:1054 #, c-format msgid "" "%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1036 +#: src/lang.c:1055 #, c-format msgid "%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1040 +#: src/lang.c:1059 #, c-format msgid "" "%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1041 +#: src/lang.c:1060 #, c-format msgid "%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1043 +#: src/lang.c:1062 #, c-format msgid "%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1044 +#: src/lang.c:1063 #, c-format msgid "%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1050 +#: src/lang.c:1069 msgid "Terminal does not support color" msgstr "" -#: src/lang.c:1055 +#: src/lang.c:1074 #, c-format msgid "Trying %s" msgstr "" -#: src/lang.c:1069 src/lang.c:1094 src/lang.c:1110 src/lang.c:1289 +#: src/lang.c:1088 src/lang.c:1113 src/lang.c:1129 src/lang.c:1308 #: src/refs.c:296 msgid "None" msgstr "" -#: src/lang.c:1070 +#: src/lang.c:1089 msgid "Subject" msgstr "" -#: src/lang.c:1071 +#: src/lang.c:1090 msgid "References" msgstr "" -#: src/lang.c:1072 +#: src/lang.c:1091 msgid "Both Subject and References" msgstr "" -#: src/lang.c:1073 +#: src/lang.c:1092 msgid "Multipart Subject" msgstr "" -#: src/lang.c:1085 src/lang.c:1196 +#: src/lang.c:1104 src/lang.c:1215 msgid "No" msgstr "" -#: src/lang.c:1086 src/lang.c:1198 +#: src/lang.c:1105 src/lang.c:1217 msgid "Yes" msgstr "" -#: src/lang.c:1087 +#: src/lang.c:1106 msgid "Hide All" msgstr "" -#: src/lang.c:1095 +#: src/lang.c:1114 msgid "Address" msgstr "" -#: src/lang.c:1096 +#: src/lang.c:1115 msgid "Full Name" msgstr "" -#: src/lang.c:1097 +#: src/lang.c:1116 msgid "Address and Name" msgstr "" -#: src/lang.c:1104 +#: src/lang.c:1123 msgid "Max" msgstr "" -#: src/lang.c:1105 +#: src/lang.c:1124 msgid "Sum" msgstr "" -#: src/lang.c:1106 +#: src/lang.c:1125 msgid "Average" msgstr "" -#: src/lang.c:1111 +#: src/lang.c:1130 msgid "Lines" msgstr "" -#: src/lang.c:1112 +#: src/lang.c:1131 msgid "Score" msgstr "" -#: src/lang.c:1113 +#: src/lang.c:1132 msgid "Lines & Score" msgstr "" -#: src/lang.c:1122 +#: src/lang.c:1141 msgid "Black" msgstr "" -#: src/lang.c:1123 +#: src/lang.c:1142 msgid "Red" msgstr "" -#: src/lang.c:1124 +#: src/lang.c:1143 msgid "Green" msgstr "" -#: src/lang.c:1125 +#: src/lang.c:1144 msgid "Brown" msgstr "" -#: src/lang.c:1126 +#: src/lang.c:1145 msgid "Blue" msgstr "" -#: src/lang.c:1127 +#: src/lang.c:1146 msgid "Pink" msgstr "" -#: src/lang.c:1128 +#: src/lang.c:1147 msgid "Cyan" msgstr "" -#: src/lang.c:1129 +#: src/lang.c:1148 msgid "White" msgstr "" -#: src/lang.c:1130 +#: src/lang.c:1149 msgid "Gray" msgstr "" -#: src/lang.c:1131 +#: src/lang.c:1150 msgid "Light Red" msgstr "" -#: src/lang.c:1132 +#: src/lang.c:1151 msgid "Light Green" msgstr "" -#: src/lang.c:1133 +#: src/lang.c:1152 msgid "Yellow" msgstr "" -#: src/lang.c:1134 +#: src/lang.c:1153 msgid "Light Blue" msgstr "" -#: src/lang.c:1135 +#: src/lang.c:1154 msgid "Light Pink" msgstr "" -#: src/lang.c:1136 +#: src/lang.c:1155 msgid "Light Cyan" msgstr "" -#: src/lang.c:1137 +#: src/lang.c:1156 msgid "Light White" msgstr "" -#: src/lang.c:1145 src/lang.c:1202 src/lang.c:1216 +#: src/lang.c:1164 src/lang.c:1221 src/lang.c:1235 msgid "Nothing" msgstr "" -#: src/lang.c:1146 +#: src/lang.c:1165 msgid "Mark" msgstr "" -#: src/lang.c:1147 +#: src/lang.c:1166 msgid "Space" msgstr "" -#: src/lang.c:1154 +#: src/lang.c:1173 msgid "Normal" msgstr "" -#: src/lang.c:1155 +#: src/lang.c:1174 msgid "Best highlighting" msgstr "" -#: src/lang.c:1156 +#: src/lang.c:1175 msgid "Underline" msgstr "" -#: src/lang.c:1157 +#: src/lang.c:1176 msgid "Reverse video" msgstr "" -#: src/lang.c:1158 +#: src/lang.c:1177 msgid "Blinking" msgstr "" -#: src/lang.c:1159 +#: src/lang.c:1178 msgid "Half bright" msgstr "" -#: src/lang.c:1160 +#: src/lang.c:1179 msgid "Bold" msgstr "" -#: src/lang.c:1165 +#: src/lang.c:1184 msgid "none" msgstr "" -#: src/lang.c:1166 +#: src/lang.c:1185 msgid "commands" msgstr "" -#: src/lang.c:1167 +#: src/lang.c:1186 msgid "select" msgstr "" -#: src/lang.c:1169 +#: src/lang.c:1188 msgid "commands & quit" msgstr "" -#: src/lang.c:1170 +#: src/lang.c:1189 msgid "commands & select" msgstr "" -#: src/lang.c:1171 +#: src/lang.c:1190 msgid "quit & select" msgstr "" -#: src/lang.c:1172 +#: src/lang.c:1191 msgid "commands & quit & select" msgstr "" -#: src/lang.c:1197 +#: src/lang.c:1216 msgid "Shell archive" msgstr "" -#: src/lang.c:1203 +#: src/lang.c:1222 msgid "Subject: (descending)" msgstr "" -#: src/lang.c:1204 +#: src/lang.c:1223 msgid "Subject: (ascending)" msgstr "" -#: src/lang.c:1205 +#: src/lang.c:1224 msgid "From: (descending)" msgstr "" -#: src/lang.c:1206 +#: src/lang.c:1225 msgid "From: (ascending)" msgstr "" -#: src/lang.c:1207 +#: src/lang.c:1226 msgid "Date: (descending)" msgstr "" -#: src/lang.c:1208 +#: src/lang.c:1227 msgid "Date: (ascending)" msgstr "" -#: src/lang.c:1209 src/lang.c:1217 +#: src/lang.c:1228 src/lang.c:1236 msgid "Score (descending)" msgstr "" -#: src/lang.c:1210 src/lang.c:1218 +#: src/lang.c:1229 src/lang.c:1237 msgid "Score (ascending)" msgstr "" -#: src/lang.c:1211 +#: src/lang.c:1230 msgid "Lines: (descending)" msgstr "" -#: src/lang.c:1212 +#: src/lang.c:1231 msgid "Lines: (ascending)" msgstr "" -#: src/lang.c:1223 +#: src/lang.c:1242 msgid "Always Keep" msgstr "" -#: src/lang.c:1224 +#: src/lang.c:1243 msgid "Always Remove" msgstr "" -#: src/lang.c:1225 +#: src/lang.c:1244 msgid "Mark with D on selection screen" msgstr "" -#: src/lang.c:1230 +#: src/lang.c:1249 msgid "Kill only unread arts" msgstr "" -#: src/lang.c:1231 +#: src/lang.c:1250 msgid "Kill all arts & show with K" msgstr "" #. TODO: s/K/art_marked_killed/ -#: src/lang.c:1232 +#: src/lang.c:1251 msgid "Kill all arts and never show" msgstr "" -#: src/lang.c:1237 +#: src/lang.c:1256 msgid "Nothing special" msgstr "" -#: src/lang.c:1238 +#: src/lang.c:1257 msgid "Compress quotes" msgstr "" -#: src/lang.c:1239 +#: src/lang.c:1258 msgid "Quote signatures" msgstr "" -#: src/lang.c:1240 +#: src/lang.c:1259 msgid "Compress quotes, quote sigs" msgstr "" -#: src/lang.c:1241 +#: src/lang.c:1260 msgid "Quote empty lines" msgstr "" -#: src/lang.c:1242 +#: src/lang.c:1261 msgid "Compress quotes, quote empty lines" msgstr "" -#: src/lang.c:1243 +#: src/lang.c:1262 msgid "Quote sigs & empty lines" msgstr "" -#: src/lang.c:1244 +#: src/lang.c:1263 msgid "Comp. q., quote sigs & empty lines" msgstr "" -#: src/lang.c:1282 +#: src/lang.c:1301 msgid "no" msgstr "" -#: src/lang.c:1283 +#: src/lang.c:1302 msgid "with headers" msgstr "" -#: src/lang.c:1284 +#: src/lang.c:1303 msgid "without headers" msgstr "" -#: src/lang.c:1291 src/lang.c:1297 +#: src/lang.c:1310 src/lang.c:1316 msgid "NFKC" msgstr "" -#: src/lang.c:1292 +#: src/lang.c:1311 msgid "NFKD" msgstr "" -#: src/lang.c:1293 +#: src/lang.c:1312 msgid "NFC" msgstr "" -#: src/lang.c:1294 +#: src/lang.c:1313 msgid "NFD" msgstr "" -#: src/lang.c:1305 +#: src/lang.c:1324 msgid "Display Options" msgstr "" -#: src/lang.c:1311 +#: src/lang.c:1330 msgid "Color Options" msgstr "" -#: src/lang.c:1317 +#: src/lang.c:1336 msgid "Article-Limiting Options" msgstr "" -#: src/lang.c:1323 +#: src/lang.c:1342 msgid "Posting/Mailing Options" msgstr "" -#: src/lang.c:1329 +#: src/lang.c:1348 msgid "Saving/Printing Options" msgstr "" -#: src/lang.c:1335 +#: src/lang.c:1354 msgid "Expert Options" msgstr "" -#: src/lang.c:1341 +#: src/lang.c:1360 msgid "Filtering Options" msgstr "" -#: src/lang.c:1346 src/lang.c:1372 src/lang.c:1378 src/lang.c:1385 -#: src/lang.c:1417 src/lang.c:1423 src/lang.c:1431 src/lang.c:1451 -#: src/lang.c:1526 src/lang.c:1688 src/lang.c:1694 src/lang.c:1700 -#: src/lang.c:1706 src/lang.c:1718 src/lang.c:1725 src/lang.c:1776 -#: src/lang.c:1785 src/lang.c:1791 src/lang.c:1797 src/lang.c:1803 -#: src/lang.c:1809 src/lang.c:1815 src/lang.c:1821 src/lang.c:1827 -#: src/lang.c:1833 src/lang.c:1839 src/lang.c:1845 src/lang.c:1851 -#: src/lang.c:1857 src/lang.c:1863 src/lang.c:1869 src/lang.c:1875 -#: src/lang.c:1881 src/lang.c:1887 src/lang.c:1893 src/lang.c:1899 -#: src/lang.c:1905 src/lang.c:1912 src/lang.c:1918 src/lang.c:1924 -#: src/lang.c:1931 src/lang.c:1942 src/lang.c:1948 src/lang.c:1954 -#: src/lang.c:1960 src/lang.c:1966 src/lang.c:1972 src/lang.c:1986 -#: src/lang.c:1998 src/lang.c:2032 src/lang.c:2084 src/lang.c:2091 -#: src/lang.c:2097 src/lang.c:2122 src/lang.c:2139 src/lang.c:2192 -#: src/lang.c:2225 src/lang.c:2245 src/lang.c:2280 src/lang.c:2289 -#: src/lang.c:2314 src/lang.c:2326 src/lang.c:2345 src/lang.c:2353 +#: src/lang.c:1365 src/lang.c:1396 src/lang.c:1402 src/lang.c:1414 +#: src/lang.c:1464 src/lang.c:1470 src/lang.c:1480 src/lang.c:1500 +#: src/lang.c:1575 src/lang.c:1745 src/lang.c:1751 src/lang.c:1757 +#: src/lang.c:1763 src/lang.c:1775 src/lang.c:1782 src/lang.c:1836 +#: src/lang.c:1845 src/lang.c:1851 src/lang.c:1858 src/lang.c:1865 +#: src/lang.c:1872 src/lang.c:1879 src/lang.c:1886 src/lang.c:1893 +#: src/lang.c:1900 src/lang.c:1907 src/lang.c:1914 src/lang.c:1921 +#: src/lang.c:1928 src/lang.c:1935 src/lang.c:1942 src/lang.c:1949 +#: src/lang.c:1956 src/lang.c:1963 src/lang.c:1970 src/lang.c:1977 +#: src/lang.c:1984 src/lang.c:1991 src/lang.c:1998 src/lang.c:2005 +#: src/lang.c:2013 src/lang.c:2029 src/lang.c:2036 src/lang.c:2043 +#: src/lang.c:2050 src/lang.c:2056 src/lang.c:2062 src/lang.c:2079 +#: src/lang.c:2091 src/lang.c:2125 src/lang.c:2178 src/lang.c:2185 +#: src/lang.c:2191 src/lang.c:2216 src/lang.c:2233 src/lang.c:2286 +#: src/lang.c:2322 src/lang.c:2342 src/lang.c:2377 src/lang.c:2387 +#: src/lang.c:2412 src/lang.c:2428 src/lang.c:2447 src/lang.c:2460 msgid " toggles, sets, cancels." msgstr "" -#: src/lang.c:1347 +#: src/lang.c:1366 msgid "Show mini menu & posting etiquette" msgstr "" -#: src/lang.c:1348 +#: src/lang.c:1367 msgid "" "# If ON show a mini menu of useful commands at each level\n" "# and posting etiquette after composing an article\n" msgstr "" -#: src/lang.c:1353 +#: src/lang.c:1372 msgid "Show short description for each newsgroup. toggles & sets." msgstr "" -#: src/lang.c:1354 +#: src/lang.c:1373 msgid "Show description of each newsgroup" msgstr "" -#: src/lang.c:1355 +#: src/lang.c:1374 msgid "" "# If ON show group description text after newsgroup name at\n" "# group selection level\n" msgstr "" -#: src/lang.c:1360 +#: src/lang.c:1379 msgid "" "Show Subject & From (author) fields in group menu. toggles & " "sets." msgstr "" -#: src/lang.c:1361 +#: src/lang.c:1380 msgid "In group menu, show author by" msgstr "" -#: src/lang.c:1362 +#: src/lang.c:1381 msgid "" -"# Part of from field to display 0) none 1) address 2) full name 3) both\n" +"# Part of from field to display\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = none\n" +"# 1 = address\n" +"# * 2 = full name\n" +"# 3 = both\n" msgstr "" -#: src/lang.c:1366 +#: src/lang.c:1390 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "" -#: src/lang.c:1367 +#: src/lang.c:1391 msgid "Draw -> instead of highlighted bar" msgstr "" -#: src/lang.c:1368 +#: src/lang.c:1392 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "" -#: src/lang.c:1373 +#: src/lang.c:1397 msgid "Use inverse video for page headers" msgstr "" -#: src/lang.c:1374 +#: src/lang.c:1398 msgid "# If ON use inverse video for page headers at different levels\n" msgstr "" -#: src/lang.c:1379 +#: src/lang.c:1403 msgid "Thread articles by" msgstr "" -#: src/lang.c:1380 +#: src/lang.c:1404 msgid "" -"# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n" -"# 4=(Multipart Subject).\n" +"# Thread articles by ...\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = nothing\n" +"# 1 = Subject\n" +"# 2 = References\n" +"# * 3 = Both (Subject and References)\n" +"# 4 = Multipart Subject\n" msgstr "" -#: src/lang.c:1386 +#: src/lang.c:1415 msgid "Score of a thread" msgstr "" -#: src/lang.c:1387 -msgid "# Thread score 0=(Max) 1=(Sum) 2=(Average)\n" +#: src/lang.c:1416 +msgid "" +"# Thread score\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = max\n" +"# 1 = sum\n" +"# 2 = average\n" msgstr "" -#: src/lang.c:1391 +#: src/lang.c:1424 msgid "" "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "" -#: src/lang.c:1392 +#: src/lang.c:1425 msgid "Sort articles by" msgstr "" -#: src/lang.c:1393 +#: src/lang.c:1426 msgid "" -"# Sort articles by 0=(nothing) 1=(Subject descend) 2=(Subject ascend)\n" -"# 3=(From descend) 4=(From ascend) 5=(Date descend) 6=(Date ascend)\n" -"# 7=(Score descend) 8=(Score ascend) 9=(Lines descend) 10=(Lines ascend).\n" +"# Sort articles by ...\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = nothing\n" +"# 1 = Subject descending\n" +"# 2 = Subject ascending\n" +"# 3 = From descending\n" +"# 4 = From ascending\n" +"# 5 = Date descending\n" +"# * 6 = Date ascending\n" +"# 7 = Score descending\n" +"# 8 = Score ascending\n" +"# 9 = Lines descending\n" +"# 10 = Lines ascending\n" msgstr "" -#: src/lang.c:1399 +#: src/lang.c:1442 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "" -#: src/lang.c:1400 +#: src/lang.c:1443 msgid "Sort threads by" msgstr "" -#: src/lang.c:1401 -msgid "# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n" +#: src/lang.c:1444 +msgid "" +"# Sort thread by ...\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = nothing\n" +"# * 1 = Score descending\n" +"# 2 = Score ascending\n" msgstr "" -#: src/lang.c:1405 +#: src/lang.c:1452 msgid "" "Put cursor at first/last unread art in groups. toggles & sets." msgstr "" -#: src/lang.c:1406 +#: src/lang.c:1453 msgid "Goto first unread article in group" msgstr "" -#: src/lang.c:1407 +#: src/lang.c:1454 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "" -#: src/lang.c:1411 +#: src/lang.c:1458 msgid "Show all articles or only unread articles. toggles & sets." msgstr "" -#: src/lang.c:1412 +#: src/lang.c:1459 msgid "Show only unread articles" msgstr "" -#: src/lang.c:1413 +#: src/lang.c:1460 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "" -#: src/lang.c:1418 +#: src/lang.c:1465 msgid "Show only groups with unread arts" msgstr "" -#: src/lang.c:1419 +#: src/lang.c:1466 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "" -#: src/lang.c:1424 +#: src/lang.c:1471 msgid "Filter which articles" msgstr "" -#: src/lang.c:1425 +#: src/lang.c:1472 msgid "" -"# 0=(Only kill unread articles)\n" -"# 1=(Kill all articles and show in threads marked with K)\n" -"# 2=(Kill all articles and never show them).\n" +"# Filter which articles\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = only kill unread articles\n" +"# 1 = kill all articles and show in threads marked with K\n" +"# 2 = kill all articles and never show them\n" msgstr "" -#: src/lang.c:1432 +#: src/lang.c:1481 msgid "Tab goes to next unread article" msgstr "" -#: src/lang.c:1433 +#: src/lang.c:1482 msgid "" "# If ON the TAB command will go to next unread article at article viewer " "level\n" msgstr "" -#: src/lang.c:1437 +#: src/lang.c:1486 msgid "" "Scrolling with past the end of an art. jumps to the next unread one." msgstr "" -#: src/lang.c:1438 +#: src/lang.c:1487 msgid "Space goes to next unread article" msgstr "" -#: src/lang.c:1439 +#: src/lang.c:1488 msgid "" "# If ON the SPACE command will go to next unread article at article viewer\n" "# level when the end of the article is reached (rn-style pager)\n" msgstr "" -#: src/lang.c:1444 +#: src/lang.c:1493 msgid "" "Scrolling with / past the end of an art. jumps to the unread one." msgstr "" -#: src/lang.c:1445 +#: src/lang.c:1494 msgid "PgDn goes to next unread article" msgstr "" -#: src/lang.c:1446 +#: src/lang.c:1495 msgid "" "# If ON the PGDN or DOWN command will go to next unread article when\n" "# pressed at end of message\n" msgstr "" -#: src/lang.c:1452 +#: src/lang.c:1501 msgid "List thread using right arrow key" msgstr "" -#: src/lang.c:1453 +#: src/lang.c:1502 msgid "" "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "" -#: src/lang.c:1457 +#: src/lang.c:1506 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "" -#: src/lang.c:1458 +#: src/lang.c:1507 msgid "Character to show deleted articles" msgstr "" -#: src/lang.c:1459 +#: src/lang.c:1508 msgid "" "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1464 +#: src/lang.c:1513 msgid "" "Enter character to indicate articles in a range. sets, cancels." msgstr "" -#: src/lang.c:1465 +#: src/lang.c:1514 msgid "Character to show inrange articles" msgstr "" -#: src/lang.c:1466 +#: src/lang.c:1515 msgid "" "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1471 +#: src/lang.c:1520 msgid "" "Enter character to indicate that article will return. sets, " "cancels." msgstr "" -#: src/lang.c:1472 +#: src/lang.c:1521 msgid "Character to show returning arts" msgstr "" -#: src/lang.c:1473 +#: src/lang.c:1522 msgid "" "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1478 +#: src/lang.c:1527 msgid "" "Enter character to indicate selected articles. sets, cancels." msgstr "" -#: src/lang.c:1479 +#: src/lang.c:1528 msgid "Character to show selected articles" msgstr "" -#: src/lang.c:1480 +#: src/lang.c:1529 msgid "" "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1485 +#: src/lang.c:1534 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "" -#: src/lang.c:1486 +#: src/lang.c:1535 msgid "Character to show recent articles" msgstr "" -#: src/lang.c:1487 +#: src/lang.c:1536 msgid "" "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1492 +#: src/lang.c:1541 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "" -#: src/lang.c:1493 +#: src/lang.c:1542 msgid "Character to show unread articles" msgstr "" -#: src/lang.c:1494 +#: src/lang.c:1543 msgid "" "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1499 +#: src/lang.c:1548 msgid "Enter character to indicate read articles. sets, cancels." msgstr "" -#: src/lang.c:1500 +#: src/lang.c:1549 msgid "Character to show read articles" msgstr "" -#: src/lang.c:1501 +#: src/lang.c:1550 msgid "" "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1506 +#: src/lang.c:1555 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "" -#: src/lang.c:1507 +#: src/lang.c:1556 msgid "Character to show killed articles" msgstr "" -#: src/lang.c:1508 +#: src/lang.c:1557 msgid "" "# Character used to show that an art was killed (default 'K')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" msgstr "" -#: src/lang.c:1513 +#: src/lang.c:1562 msgid "" "Enter character to indicate read selected articles. sets, cancels." msgstr "" -#: src/lang.c:1514 +#: src/lang.c:1563 msgid "Character to show readselected arts" msgstr "" -#: src/lang.c:1515 +#: src/lang.c:1564 msgid "" "# Character used to show that an art was selected before read (default ':')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" msgstr "" -#: src/lang.c:1520 +#: src/lang.c:1569 msgid "Enter maximum length of newsgroup names displayed. sets." msgstr "" -#: src/lang.c:1521 +#: src/lang.c:1570 msgid "Max. length of group names shown" msgstr "" -#: src/lang.c:1522 +#: src/lang.c:1571 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "" -#: src/lang.c:1527 +#: src/lang.c:1576 msgid "Show lines/score in listings" msgstr "" -#: src/lang.c:1528 +#: src/lang.c:1577 msgid "" "# What informations should be displayed in article/thread listing\n" -"# 0 = nothing, 1 = lines, 2 = score, 3 = lines & score\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = nothing\n" +"# * 1 = lines\n" +"# 2 = score\n" +"# 3 = lines & score\n" msgstr "" -#: src/lang.c:1533 +#: src/lang.c:1586 msgid "" "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" msgstr "" -#: src/lang.c:1534 +#: src/lang.c:1587 msgid "Number of lines to scroll in pager" msgstr "" -#: src/lang.c:1535 +#: src/lang.c:1588 msgid "" "# Number of lines that cursor-up/down will scroll in article pager\n" -"# eg, 1+ = line-by-line, 0 = page-by-page (traditional behavior),\n" -"# -1 = the top/bottom line is carried over onto the next page,\n" -"# -2 = half-page scrolling\n" +"# Possible values are (the default is marked with *):\n" +"# -2 = half-page scrolling\n" +"# -1 = the top/bottom line is carried over onto the next page\n" +"# 0 = page-by-page (traditional behavior)\n" +"# * 1 = line-by-line\n" +"# 2 or greater = scroll by 2 or more lines (only in the pager)\n" msgstr "" -#: src/lang.c:1542 +#: src/lang.c:1598 msgid "Display signatures. toggles & sets." msgstr "" -#: src/lang.c:1543 +#: src/lang.c:1599 msgid "Display signatures" msgstr "" -#: src/lang.c:1544 +#: src/lang.c:1600 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "" -#: src/lang.c:1548 +#: src/lang.c:1604 msgid "" "Display uuencoded data as tagged attachments. toggles & sets." msgstr "" -#: src/lang.c:1549 +#: src/lang.c:1605 msgid "Display uue data as an attachment" msgstr "" -#: src/lang.c:1550 +#: src/lang.c:1606 msgid "" "# Handling of uuencoded data in the pager\n" -"# 0 = display raw uuencoded data\n" -"# 1 = uuencoded data will be condensed to a single tag line showing\n" -"# size and filename, similar to how MIME attachments are displayed\n" -"# 2 = as for 1, but any line that looks like uuencoded data will be folded\n" -"# into a tag line.\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = no, display raw uuencoded data\n" +"# 1 = yes, uuencoded data will be condensed to a single tag line showing\n" +"# size and filename, similar to how MIME attachments are displayed\n" +"# 2 = hide all, as for 1, but any line that looks like uuencoded data " +"will\n" +"# be folded into a tag line.\n" msgstr "" -#: src/lang.c:1559 +#: src/lang.c:1616 msgid "" "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "" -#: src/lang.c:1560 +#: src/lang.c:1617 msgid "Display \"a as Umlaut-a" msgstr "" -#: src/lang.c:1561 +#: src/lang.c:1618 msgid "" "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" msgstr "" -#: src/lang.c:1566 src/lang.c:1576 +#: src/lang.c:1623 src/lang.c:1633 msgid "Space separated list of header fields" msgstr "" -#: src/lang.c:1567 +#: src/lang.c:1624 msgid "Display these header fields (or *)" msgstr "" -#: src/lang.c:1568 +#: src/lang.c:1625 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" @@ -4597,11 +4662,11 @@ msgid "" "# spaces. Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1577 +#: src/lang.c:1634 msgid "Do not display these header fields" msgstr "" -#: src/lang.c:1578 +#: src/lang.c:1635 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" @@ -4613,163 +4678,163 @@ msgid "" "# Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1588 +#: src/lang.c:1645 msgid "" "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "" -#: src/lang.c:1589 +#: src/lang.c:1646 msgid "Skip multipart/alternative parts" msgstr "" -#: src/lang.c:1590 +#: src/lang.c:1647 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "" -#: src/lang.c:1595 +#: src/lang.c:1652 msgid "A regex used to decide which lines to show in col_quote." msgstr "" -#: src/lang.c:1596 +#: src/lang.c:1653 msgid "Regex used to show quoted lines" msgstr "" -#: src/lang.c:1597 +#: src/lang.c:1654 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# quoted when viewing articles. Quoted lines are shown in col_quote.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1603 +#: src/lang.c:1660 msgid "A regex used to decide which lines to show in col_quote2." msgstr "" -#: src/lang.c:1604 +#: src/lang.c:1661 msgid "Regex used to show twice quoted l." msgstr "" -#: src/lang.c:1605 +#: src/lang.c:1662 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# quoted twice. Twice quoted lines are shown in col_quote2.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1611 +#: src/lang.c:1668 msgid "A regex used to decide which lines to show in col_quote3." msgstr "" -#: src/lang.c:1612 +#: src/lang.c:1669 msgid "Regex used to show >= 3 times q.l." msgstr "" -#: src/lang.c:1613 +#: src/lang.c:1670 msgid "" "# A regular expression that tin will use to decide which lines are\n" "# quoted >=3 times. >=3 times quoted lines are shown in col_quote3.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1620 +#: src/lang.c:1677 msgid "A regex used to decide which words to show in col_markslashes." msgstr "" -#: src/lang.c:1621 +#: src/lang.c:1678 msgid "Regex used to highlight /slashes/" msgstr "" -#: src/lang.c:1622 +#: src/lang.c:1679 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '/' are to be shown in col_markslashes.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1628 +#: src/lang.c:1685 msgid "A regex used to decide which words to show in col_markstars." msgstr "" -#: src/lang.c:1629 +#: src/lang.c:1686 msgid "Regex used to highlight *stars*" msgstr "" -#: src/lang.c:1630 +#: src/lang.c:1687 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '*' are to be shown in col_markstars.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1636 +#: src/lang.c:1693 msgid "A regex used to decide which words to show in col_markstroke." msgstr "" -#: src/lang.c:1637 +#: src/lang.c:1694 msgid "Regex used to highlight -strokes-" msgstr "" -#: src/lang.c:1638 +#: src/lang.c:1695 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '-' are to be shown in col_markstroke.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1644 +#: src/lang.c:1701 msgid "A regex used to decide which words to show in col_markdash." msgstr "" -#: src/lang.c:1645 +#: src/lang.c:1702 msgid "Regex used to highlight _underline_" msgstr "" -#: src/lang.c:1646 +#: src/lang.c:1703 msgid "" "# A regular expression that tin will use to decide which words\n" "# bounded by '_' are to be shown in col_markdash.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1652 +#: src/lang.c:1709 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:1653 +#: src/lang.c:1710 msgid "Regex with Subject prefixes" msgstr "" -#: src/lang.c:1654 +#: src/lang.c:1711 msgid "" "# A regular expression that tin will use to find Subject prefixes\n" "# which will be removed before showing the header.\n" msgstr "" -#: src/lang.c:1659 +#: src/lang.c:1716 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:1660 +#: src/lang.c:1717 msgid "Regex with Subject suffixes" msgstr "" -#: src/lang.c:1661 +#: src/lang.c:1718 msgid "" "# A regular expression that tin will use to find Subject suffixes\n" "# which will be removed when replying or posting followup.\n" msgstr "" -#: src/lang.c:1666 +#: src/lang.c:1723 msgid "" "Enter name and options for external MIME viewer, --internal for built-in " "viewer" msgstr "" -#: src/lang.c:1667 +#: src/lang.c:1724 msgid "MIME binary content viewer" msgstr "" -#: src/lang.c:1668 +#: src/lang.c:1725 msgid "" "# If --internal automatically use the built in MIME viewer for non-text\n" "# parts of articles.\n" @@ -4778,471 +4843,558 @@ msgid "" "# for no automatic viewing\n" msgstr "" -#: src/lang.c:1675 +#: src/lang.c:1732 msgid "Confirm before starting non-text viewing program" msgstr "" -#: src/lang.c:1676 +#: src/lang.c:1733 msgid "Ask before using MIME viewer" msgstr "" -#: src/lang.c:1677 +#: src/lang.c:1734 msgid "" "# If ON tin will ask before using metamail to display MIME messages\n" "# this only happens if metamail_prog is set to something\n" msgstr "" -#: src/lang.c:1682 +#: src/lang.c:1739 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "" -#: src/lang.c:1683 +#: src/lang.c:1740 msgid "Catchup read groups when quitting" msgstr "" -#: src/lang.c:1684 +#: src/lang.c:1741 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "" -#: src/lang.c:1689 +#: src/lang.c:1746 msgid "Catchup group using left key" msgstr "" -#: src/lang.c:1690 +#: src/lang.c:1747 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "" -#: src/lang.c:1695 +#: src/lang.c:1752 msgid "Catchup thread by using left key" msgstr "" -#: src/lang.c:1701 +#: src/lang.c:1758 msgid "Which actions require confirmation" msgstr "" -#: src/lang.c:1702 +#: src/lang.c:1759 msgid "# What should we ask confirmation for.\n" msgstr "" -#: src/lang.c:1707 +#: src/lang.c:1764 msgid "'Mark article read' ignores tags" msgstr "" -#: src/lang.c:1708 +#: src/lang.c:1765 msgid "" "# If ON the 'Mark article read' function marks only the current article.\n" msgstr "" -#: src/lang.c:1712 +#: src/lang.c:1769 msgid "Program to run to open URL's, sets, cancels." msgstr "" -#: src/lang.c:1713 +#: src/lang.c:1770 msgid "Program that opens URL's" msgstr "" -#: src/lang.c:1714 +#: src/lang.c:1771 msgid "# The program used to open URL's. The actual URL will be appended\n" msgstr "" -#: src/lang.c:1719 +#: src/lang.c:1776 msgid "Use mouse in xterm" msgstr "" -#: src/lang.c:1720 +#: src/lang.c:1777 msgid "# If ON enable mouse key support on xterm terminals\n" msgstr "" -#: src/lang.c:1726 +#: src/lang.c:1783 msgid "Use scroll keys on keypad" msgstr "" -#: src/lang.c:1727 +#: src/lang.c:1784 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "" -#: src/lang.c:1732 +#: src/lang.c:1789 msgid "Enter maximum number of article to get. sets." msgstr "" -#: src/lang.c:1733 +#: src/lang.c:1790 msgid "Number of articles to get" msgstr "" -#: src/lang.c:1734 +#: src/lang.c:1791 msgid "" "# Number of articles to get (0=no limit), if negative sets maximum number\n" "# of already read articles to be read before first unread one\n" msgstr "" -#: src/lang.c:1739 +#: src/lang.c:1796 msgid "Enter number of days article is considered recent. sets." msgstr "" -#: src/lang.c:1740 +#: src/lang.c:1797 msgid "Article recentness time limit" msgstr "" -#: src/lang.c:1741 +#: src/lang.c:1798 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "" -#: src/lang.c:1745 +#: src/lang.c:1802 msgid "" "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "" -#: src/lang.c:1746 +#: src/lang.c:1803 msgid "Wildcard matching" msgstr "" -#: src/lang.c:1747 -msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" +#: src/lang.c:1804 +msgid "" +"# Wildcard matching\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = wildmat\n" +"# 1 = regex\n" msgstr "" -#: src/lang.c:1751 +#: src/lang.c:1811 msgid "Enter minimal score before an article is marked killed. sets." msgstr "" -#: src/lang.c:1752 +#: src/lang.c:1812 msgid "Score limit (kill)" msgstr "" -#: src/lang.c:1753 +#: src/lang.c:1813 msgid "# Score limit before an article is marked killed\n" msgstr "" -#: src/lang.c:1757 +#: src/lang.c:1817 msgid "Enter default score to kill articles. sets." msgstr "" -#: src/lang.c:1758 +#: src/lang.c:1818 msgid "Default score to kill articles" msgstr "" -#: src/lang.c:1759 +#: src/lang.c:1819 msgid "# Default score to kill articles\n" msgstr "" -#: src/lang.c:1763 +#: src/lang.c:1823 msgid "Enter minimal score before an article is marked hot. sets." msgstr "" -#: src/lang.c:1764 +#: src/lang.c:1824 msgid "Score limit (select)" msgstr "" -#: src/lang.c:1765 +#: src/lang.c:1825 msgid "# Score limit before an article is marked hot\n" msgstr "" -#: src/lang.c:1769 +#: src/lang.c:1829 msgid "Enter default score to select articles. sets." msgstr "" -#: src/lang.c:1770 +#: src/lang.c:1830 msgid "Default score to select articles" msgstr "" -#: src/lang.c:1771 +#: src/lang.c:1831 msgid "# Default score to select articles\n" msgstr "" -#: src/lang.c:1777 +#: src/lang.c:1837 msgid "Use slrnface to show ''X-Face:''s" msgstr "" -#: src/lang.c:1778 +#: src/lang.c:1838 msgid "" "# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n" "# Only useful when running in an xterm.\n" msgstr "" -#: src/lang.c:1786 +#: src/lang.c:1846 msgid "Use ANSI color" msgstr "" -#: src/lang.c:1787 +#: src/lang.c:1847 msgid "# If ON using ANSI-color\n" msgstr "" -#: src/lang.c:1792 +#: src/lang.c:1852 msgid "Standard foreground color" msgstr "" -#: src/lang.c:1793 -msgid "# Standard foreground color\n" +#: src/lang.c:1853 +msgid "" +"# Standard foreground color\n" +"# Default: -1 (default color)\n" msgstr "" -#: src/lang.c:1798 +#: src/lang.c:1859 msgid "Standard background color" msgstr "" -#: src/lang.c:1799 -msgid "# Standard-Background-Color\n" +#: src/lang.c:1860 +msgid "" +"# Standard background color\n" +"# Default: -1 (default color)\n" msgstr "" -#: src/lang.c:1804 +#: src/lang.c:1866 msgid "Color for inverse text (background)" msgstr "" -#: src/lang.c:1805 -msgid "# Color of background for inverse text\n" +#: src/lang.c:1867 +msgid "" +"# Color of background for inverse text\n" +"# Default: 4 (blue)\n" msgstr "" -#: src/lang.c:1810 +#: src/lang.c:1873 msgid "Color for inverse text (foreground)" msgstr "" -#: src/lang.c:1811 -msgid "# Color of foreground for inverse text\n" +#: src/lang.c:1874 +msgid "" +"# Color of foreground for inverse text\n" +"# Default: 7 (white)\n" msgstr "" -#: src/lang.c:1816 +#: src/lang.c:1880 msgid "Color of text lines" msgstr "" -#: src/lang.c:1817 -msgid "# Color of text-lines\n" +#: src/lang.c:1881 +msgid "" +"# Color of text lines\n" +"# Default: -1 (default color)\n" msgstr "" -#: src/lang.c:1822 +#: src/lang.c:1887 msgid "Color of mini help menu" msgstr "" -#: src/lang.c:1823 -msgid "# Color of mini help menu\n" +#: src/lang.c:1888 +msgid "" +"# Color of mini help menu\n" +"# Default: 3 (brown)\n" msgstr "" -#: src/lang.c:1828 +#: src/lang.c:1894 msgid "Color of help text" msgstr "" -#: src/lang.c:1829 -msgid "# Color of help pages\n" +#: src/lang.c:1895 +msgid "" +"# Color of help pages\n" +"# Default: -1 (default color)\n" msgstr "" -#: src/lang.c:1834 +#: src/lang.c:1901 msgid "Color of status messages" msgstr "" -#: src/lang.c:1835 -msgid "# Color of messages in last line\n" +#: src/lang.c:1902 +msgid "" +"# Color of messages in last line\n" +"# Default: 6 (cyan)\n" msgstr "" -#: src/lang.c:1840 +#: src/lang.c:1908 msgid "Color of quoted lines" msgstr "" -#: src/lang.c:1841 -msgid "# Color of quote-lines\n" +#: src/lang.c:1909 +msgid "" +"# Color of quote-lines\n" +"# Default: 2 (green)\n" msgstr "" -#: src/lang.c:1846 +#: src/lang.c:1915 msgid "Color of twice quoted line" msgstr "" -#: src/lang.c:1847 -msgid "# Color of twice quoted lines\n" +#: src/lang.c:1916 +msgid "" +"# Color of twice quoted lines\n" +"# Default: 3 (brown)\n" msgstr "" -#: src/lang.c:1852 +#: src/lang.c:1922 msgid "Color of =>3 times quoted line" msgstr "" -#: src/lang.c:1853 -msgid "# Color of >=3 times quoted lines\n" +#: src/lang.c:1923 +msgid "" +"# Color of >=3 times quoted lines\n" +"# Default: 4 (blue)\n" msgstr "" -#: src/lang.c:1858 +#: src/lang.c:1929 msgid "Color of article header lines" msgstr "" -#: src/lang.c:1859 -msgid "# Color of header-lines\n" +#: src/lang.c:1930 +msgid "" +"# Color of header-lines\n" +"# Default: 2 (green)\n" msgstr "" -#: src/lang.c:1864 +#: src/lang.c:1936 msgid "Color of actual news header fields" msgstr "" -#: src/lang.c:1865 -msgid "# Color of actual news header fields\n" +#: src/lang.c:1937 +msgid "" +"# Color of actual news header fields\n" +"# Default: 9 (light red)\n" msgstr "" -#: src/lang.c:1870 +#: src/lang.c:1943 msgid "Color of article subject lines" msgstr "" -#: src/lang.c:1871 -msgid "# Color of article subject\n" +#: src/lang.c:1944 +msgid "" +"# Color of article subject\n" +"# Default: 6 (cyan)\n" msgstr "" -#: src/lang.c:1876 +#: src/lang.c:1950 msgid "Color of response counter" msgstr "" -#: src/lang.c:1877 -msgid "# Color of response counter\n" +#: src/lang.c:1951 +msgid "" +"# Color of response counter\n" +"# Default: 2 (green)\n" msgstr "" -#: src/lang.c:1882 +#: src/lang.c:1957 msgid "Color of sender (From:)" msgstr "" -#: src/lang.c:1883 -msgid "# Color of sender (From:)\n" +#: src/lang.c:1958 +msgid "" +"# Color of sender (From:)\n" +"# Default: 2 (green)\n" msgstr "" -#: src/lang.c:1888 +#: src/lang.c:1964 msgid "Color of help/mail sign" msgstr "" -#: src/lang.c:1889 -msgid "# Color of Help/Mail-Sign\n" +#: src/lang.c:1965 +msgid "" +"# Color of Help/Mail-Sign\n" +"# Default: 4 (blue)\n" msgstr "" -#: src/lang.c:1894 +#: src/lang.c:1971 msgid "Color of signatures" msgstr "" -#: src/lang.c:1895 -msgid "# Color of signature\n" +#: src/lang.c:1972 +msgid "" +"# Color of signature\n" +"# Default: 4 (blue)\n" msgstr "" -#: src/lang.c:1900 +#: src/lang.c:1978 msgid "Color of highlighted URLs" msgstr "" -#: src/lang.c:1901 -msgid "# Color of highlighted URLs\n" +#: src/lang.c:1979 +msgid "" +"# Color of highlighted URLs\n" +"# Default: -1 (default color)\n" msgstr "" -#: src/lang.c:1906 +#: src/lang.c:1985 msgid "Color of highlighting with *stars*" msgstr "" -#: src/lang.c:1907 +#: src/lang.c:1986 msgid "" -"# Color of word highlighting. There are four possibilities\n" -"# in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n" +"# Color of word highlighting with *stars*\n" +"# Default: 11 (yellow)\n" msgstr "" -#: src/lang.c:1913 +#: src/lang.c:1992 msgid "Color of highlighting with _dash_" msgstr "" -#: src/lang.c:1919 +#: src/lang.c:1993 +msgid "" +"# Color of word highlighting with _dash_\n" +"# Default: 13 (light pink)\n" +msgstr "" + +#: src/lang.c:1999 msgid "Color of highlighting with /slash/" msgstr "" -#: src/lang.c:1925 +#: src/lang.c:2000 +msgid "" +"# Color of word highlighting with /slash/\n" +"# Default: 14 (light cyan)\n" +msgstr "" + +#: src/lang.c:2006 msgid "Color of highlighting with -stroke-" msgstr "" -#: src/lang.c:1932 +#: src/lang.c:2007 +msgid "" +"# Color of word highlighting with -stroke-\n" +"# Default: 12 (light blue)\n" +msgstr "" + +#: src/lang.c:2014 msgid "Attr. of highlighting with *stars*" msgstr "" -#: src/lang.c:1933 +#: src/lang.c:2015 msgid "" -"# Attribute of word highlighting on mono terminals.\n" -"# There are four possibilities in articles:\n" -"# *stars*, /slashes/, _underdashes_ and -strokes-.\n" -"# The possible values are:\n" -"# 0 - Normal, 1 - Underline, 2 - Best highlighting,\n" -"# 3 - Reverse video, 4 - Blinking, 5 - Half bright, 6 - Bold\n" +"# Attributes of word highlighting on mono terminals\n" +"# Possible values are:\n" +"# 0 = Normal\n" +"# 1 = Underline\n" +"# 2 = Best highlighting\n" +"# 3 = Reverse video\n" +"# 4 = Blinking\n" +"# 5 = Half bright\n" +"# 6 = Bold\n" +"\n" +"# Attribute of word highlighting with *stars*\n" +"# Default: 6 (bold)\n" msgstr "" -#: src/lang.c:1943 +#: src/lang.c:2030 msgid "Attr. of highlighting with _dash_" msgstr "" -#: src/lang.c:1949 +#: src/lang.c:2031 +msgid "" +"# Attribute of word highlighting with _dash_\n" +"# Default: 2 (best highlighting)\n" +msgstr "" + +#: src/lang.c:2037 msgid "Attr. of highlighting with /slash/" msgstr "" -#: src/lang.c:1955 +#: src/lang.c:2038 +msgid "" +"# Attribute of word highlighting with /slash/\n" +"# Default: 5 (half bright)\n" +msgstr "" + +#: src/lang.c:2044 msgid "Attr. of highlighting with -stroke-" msgstr "" -#: src/lang.c:1961 +#: src/lang.c:2045 +msgid "" +"# Attribute of word highlighting with -stroke-\n" +"# Default: 3 (reverse video)\n" +msgstr "" + +#: src/lang.c:2051 msgid "URL highlighting in message body" msgstr "" -#: src/lang.c:1962 +#: src/lang.c:2052 msgid "# Enable URL highlighting?\n" msgstr "" -#: src/lang.c:1967 +#: src/lang.c:2057 msgid "Word highlighting in message body" msgstr "" -#: src/lang.c:1968 +#: src/lang.c:2058 msgid "# Enable word highlighting?\n" msgstr "" -#: src/lang.c:1973 +#: src/lang.c:2063 msgid "What to display instead of mark" msgstr "" -#: src/lang.c:1974 +#: src/lang.c:2064 msgid "" "# Should the leading and ending stars and dashes also be displayed,\n" "# even when they are highlighting marks?\n" -"# 0 - no 1 - yes, display mark 2 - print a space instead\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = no\n" +"# 1 = yes, display mark\n" +"# * 2 = print a space instead\n" msgstr "" -#: src/lang.c:1980 +#: src/lang.c:2073 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "" -#: src/lang.c:1981 +#: src/lang.c:2074 msgid "Page line wrap column" msgstr "" -#: src/lang.c:1982 +#: src/lang.c:2075 msgid "# Wrap article lines at column\n" msgstr "" -#: src/lang.c:1987 +#: src/lang.c:2080 msgid "Wrap around threads on next unread" msgstr "" -#: src/lang.c:1988 +#: src/lang.c:2081 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "" -#: src/lang.c:1992 +#: src/lang.c:2085 msgid "Enter default mail address (and fullname). sets." msgstr "" -#: src/lang.c:1993 +#: src/lang.c:2086 msgid "Mail address (and fullname)" msgstr "" -#: src/lang.c:1994 +#: src/lang.c:2087 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "" -#: src/lang.c:1999 +#: src/lang.c:2092 msgid "Show empty Followup-To in editor" msgstr "" -#: src/lang.c:2000 +#: src/lang.c:2093 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "" -#: src/lang.c:2004 +#: src/lang.c:2097 msgid "" "Enter path/! command/--none to create your default signature. sets." msgstr "" -#: src/lang.c:2005 +#: src/lang.c:2098 msgid "Create signature from path/command" msgstr "" -#: src/lang.c:2006 +#: src/lang.c:2099 msgid "" "# Signature path (random sigs)/file to be used when posting/replying\n" "# default_sigfile=file appends file as signature\n" @@ -5251,108 +5403,109 @@ msgid "" "# default_sigfile=--none don't append a signature\n" msgstr "" -#: src/lang.c:2013 +#: src/lang.c:2106 msgid "" "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "" -#: src/lang.c:2014 +#: src/lang.c:2107 msgid "Prepend signature with \"-- \"" msgstr "" -#: src/lang.c:2015 +#: src/lang.c:2108 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "" -#: src/lang.c:2019 +#: src/lang.c:2112 msgid "Add signature when reposting articles. toggles & sets." msgstr "" -#: src/lang.c:2020 +#: src/lang.c:2113 msgid "Add signature when reposting" msgstr "" -#: src/lang.c:2021 +#: src/lang.c:2114 msgid "# If ON add signature to reposted articles\n" msgstr "" -#: src/lang.c:2025 +#: src/lang.c:2118 msgid "Enter quotation marks, %s or %S for author's initials." msgstr "" -#: src/lang.c:2026 +#: src/lang.c:2119 msgid "Characters used as quote-marks" msgstr "" -#: src/lang.c:2027 +#: src/lang.c:2120 msgid "" "# Characters used in quoting to followups and replies.\n" "# '_' is replaced by ' ', %%s, %%S are replaced by author's initials.\n" msgstr "" -#: src/lang.c:2033 +#: src/lang.c:2126 msgid "Quoting behavior" msgstr "" -#: src/lang.c:2034 +#: src/lang.c:2127 msgid "" "# How quoting should be handled when following up or replying.\n" -"# 0 = Nothing special\n" -"# 1 = Compress quotes\n" -"# 2 = Quote signatures\n" -"# 3 = Compress quotes, quote signatures\n" -"# 4 = Quote empty lines\n" -"# 5 = Compress quotes, quote empty lines\n" -"# 6 = Quote signatures, quote empty lines\n" -"# 7 = Compress quotes, quote signatures, quote empty lines\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = Nothing special\n" +"# 1 = Compress quotes\n" +"# 2 = Quote signatures\n" +"# 3 = Compress quotes, quote signatures\n" +"# 4 = Quote empty lines\n" +"# * 5 = Compress quotes, quote empty lines\n" +"# 6 = Quote signatures, quote empty lines\n" +"# 7 = Compress quotes, quote signatures, quote empty lines\n" msgstr "" -#: src/lang.c:2046 src/lang.c:2054 src/lang.c:2060 +#: src/lang.c:2140 src/lang.c:2148 src/lang.c:2154 msgid "" "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "" -#: src/lang.c:2047 +#: src/lang.c:2141 msgid "Quote line when following up" msgstr "" -#: src/lang.c:2048 +#: src/lang.c:2142 msgid "" "# Format of quote line when mailing/posting/following-up an article\n" "# %%A Address %%D Date %%F Addr+Name %%G Groupname %%M Message-ID\n" "# %%N Full Name %%C First Name %%I Initials\n" msgstr "" -#: src/lang.c:2055 +#: src/lang.c:2149 msgid "Quote line when cross-posting" msgstr "" -#: src/lang.c:2061 +#: src/lang.c:2155 msgid "Quote line when mailing" msgstr "" -#: src/lang.c:2066 +#: src/lang.c:2160 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "" -#: src/lang.c:2067 +#: src/lang.c:2161 msgid "Insert 'User-Agent:'-header" msgstr "" -#: src/lang.c:2068 +#: src/lang.c:2162 msgid "# If ON include advertising User-Agent: header\n" msgstr "" -#: src/lang.c:2073 +#: src/lang.c:2167 msgid "" "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" -#: src/lang.c:2074 +#: src/lang.c:2168 msgid "MM_CHARSET" msgstr "" -#: src/lang.c:2075 +#: src/lang.c:2169 msgid "" "# Charset supported locally which is also used for MIME header and\n" "# Content-Type header.\n" @@ -5362,27 +5515,27 @@ msgid "" "# mm_charset is considered not displayable and represented as '?'.\n" msgstr "" -#: src/lang.c:2085 +#: src/lang.c:2179 msgid "MM_NETWORK_CHARSET" msgstr "" -#: src/lang.c:2086 +#: src/lang.c:2180 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "" -#: src/lang.c:2092 +#: src/lang.c:2186 msgid "Mailbox format" msgstr "" -#: src/lang.c:2093 +#: src/lang.c:2187 msgid "# Format of the mailbox.\n" msgstr "" -#: src/lang.c:2098 +#: src/lang.c:2192 msgid "MIME encoding in news messages" msgstr "" -#: src/lang.c:2099 +#: src/lang.c:2193 msgid "" "# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n" "# for mails and posts, if necessary. QP is efficient for most European\n" @@ -5391,15 +5544,15 @@ msgid "" "# Russian charsets with a lot of 8bit characters.\n" msgstr "" -#: src/lang.c:2107 src/lang.c:2128 +#: src/lang.c:2201 src/lang.c:2222 msgid "Don't change unless you know what you are doing. cancels." msgstr "" -#: src/lang.c:2108 +#: src/lang.c:2202 msgid "Use 8bit characters in news headers" msgstr "" -#: src/lang.c:2109 +#: src/lang.c:2203 msgid "" "# If ON, 8bit characters in news headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -5407,28 +5560,28 @@ msgid "" "# parameter unless post_mime_encoding is 8bit as well.\n" msgstr "" -#: src/lang.c:2116 +#: src/lang.c:2210 msgid "" "Auto-view post-processed files toggles, sets, cancels." msgstr "" -#: src/lang.c:2117 +#: src/lang.c:2211 msgid "View post-processed files" msgstr "" -#: src/lang.c:2118 +#: src/lang.c:2212 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "" -#: src/lang.c:2123 +#: src/lang.c:2217 msgid "MIME encoding in mail messages" msgstr "" -#: src/lang.c:2129 +#: src/lang.c:2223 msgid "Use 8bit characters in mail headers" msgstr "" -#: src/lang.c:2130 +#: src/lang.c:2224 msgid "" "# If ON, 8bit characters in mail headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -5439,278 +5592,281 @@ msgid "" "# turn it ON unless you have some compelling reason.\n" msgstr "" -#: src/lang.c:2140 +#: src/lang.c:2234 msgid "Strip blanks from ends of lines" msgstr "" -#: src/lang.c:2141 +#: src/lang.c:2235 msgid "" "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" msgstr "" -#: src/lang.c:2146 +#: src/lang.c:2240 msgid "If ON, use transliteration. toggles & sets." msgstr "" -#: src/lang.c:2147 +#: src/lang.c:2241 msgid "Transliteration" msgstr "" -#: src/lang.c:2148 +#: src/lang.c:2242 msgid "" "# If ON, use //TRANSLIT extension. This means that when a character cannot\n" "# be represented in the in the target character set, it can be approximated\n" "# through one or several similarly looking characters.\n" msgstr "" -#: src/lang.c:2155 +#: src/lang.c:2249 msgid "Send you a carbon copy automatically. toggles & sets." msgstr "" -#: src/lang.c:2156 +#: src/lang.c:2250 msgid "Send you a cc automatically" msgstr "" -#: src/lang.c:2157 +#: src/lang.c:2251 msgid "" "# If ON automatically put your name in the Cc: field when mailing an " "article\n" msgstr "" -#: src/lang.c:2161 +#: src/lang.c:2255 msgid "" "Send you a blind carbon copy automatically. toggles & sets." msgstr "" -#: src/lang.c:2162 +#: src/lang.c:2256 msgid "Send you a blind cc automatically" msgstr "" -#: src/lang.c:2163 +#: src/lang.c:2257 msgid "" "# If ON automatically put your name in the Bcc: field when mailing an " "article\n" msgstr "" -#: src/lang.c:2167 +#: src/lang.c:2261 msgid "Enter address elements about which you want to be warned. sets." msgstr "" -#: src/lang.c:2168 +#: src/lang.c:2262 msgid "Spamtrap warning address parts" msgstr "" -#: src/lang.c:2169 +#: src/lang.c:2263 msgid "" "# A comma-delimited list of address-parts you want to be warned\n" "# about when trying to reply by email.\n" msgstr "" -#: src/lang.c:2174 +#: src/lang.c:2268 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "" -#: src/lang.c:2175 +#: src/lang.c:2269 msgid "No. of days a filter entry is valid" msgstr "" -#: src/lang.c:2176 +#: src/lang.c:2270 msgid "# Number of days a short term filter will be active\n" msgstr "" -#: src/lang.c:2180 +#: src/lang.c:2274 msgid "Add posted articles to filter. toggles & sets." msgstr "" -#: src/lang.c:2181 +#: src/lang.c:2275 msgid "Add posted articles to filter" msgstr "" -#: src/lang.c:2182 +#: src/lang.c:2276 msgid "" "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" msgstr "" -#: src/lang.c:2186 +#: src/lang.c:2280 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "" -#: src/lang.c:2187 +#: src/lang.c:2281 msgid "Mail directory" msgstr "" -#: src/lang.c:2188 +#: src/lang.c:2282 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "" -#: src/lang.c:2193 +#: src/lang.c:2287 msgid "Save articles in batch mode (-S)" msgstr "" -#: src/lang.c:2194 +#: src/lang.c:2288 msgid "" "# If ON articles/threads will be saved in batch mode when save -S\n" "# or mail (-M/-N) is specified on the command line\n" msgstr "" -#: src/lang.c:2199 +#: src/lang.c:2293 msgid "The directory where you want articles/threads saved." msgstr "" -#: src/lang.c:2200 +#: src/lang.c:2294 msgid "Directory to save arts/threads in" msgstr "" -#: src/lang.c:2201 +#: src/lang.c:2295 msgid "# Directory where articles/threads are saved\n" msgstr "" -#: src/lang.c:2205 +#: src/lang.c:2299 msgid "" "Auto save article/thread by Archive-name: header. toggles & " "sets." msgstr "" -#: src/lang.c:2206 +#: src/lang.c:2300 msgid "Use Archive-name: header for save" msgstr "" -#: src/lang.c:2207 +#: src/lang.c:2301 msgid "" "# If ON articles/threads with Archive-name: in mail header will\n" "# be automatically saved with the Archive-name & part/patch no.\n" msgstr "" -#: src/lang.c:2212 +#: src/lang.c:2306 msgid "" "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "" -#: src/lang.c:2213 +#: src/lang.c:2307 msgid "Mark saved articles/threads as read" msgstr "" -#: src/lang.c:2214 +#: src/lang.c:2308 msgid "# If ON mark articles that are saved as read\n" msgstr "" -#: src/lang.c:2218 +#: src/lang.c:2312 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "" -#: src/lang.c:2219 +#: src/lang.c:2313 msgid "Post process saved articles" msgstr "" -#: src/lang.c:2220 +#: src/lang.c:2314 msgid "" "# Perform post processing (saving binary attachments) from saved articles.\n" -"# 0=(no) 1=(yes) 2=(extract shell archives (shar) only)\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = no\n" +"# 1 = extract shell archives (shar) only\n" +"# 2 = yes\n" msgstr "" -#: src/lang.c:2226 +#: src/lang.c:2323 msgid "Process only unread articles" msgstr "" -#: src/lang.c:2227 +#: src/lang.c:2324 msgid "" "# If ON only save/print/pipe/mail unread articles (tagged articles " "excepted)\n" msgstr "" -#: src/lang.c:2232 +#: src/lang.c:2329 msgid "Print all or just part of header. toggles & sets." msgstr "" -#: src/lang.c:2233 +#: src/lang.c:2330 msgid "Print all headers when printing" msgstr "" -#: src/lang.c:2234 +#: src/lang.c:2331 msgid "" "# If ON print all of article header otherwise just the important lines\n" msgstr "" -#: src/lang.c:2238 +#: src/lang.c:2335 msgid "" "The printer program with options that is to be used to print " "articles/threads." msgstr "" -#: src/lang.c:2239 +#: src/lang.c:2336 msgid "Printer program with options" msgstr "" -#: src/lang.c:2240 +#: src/lang.c:2337 msgid "# Print program with parameters used to print articles/threads\n" msgstr "" -#: src/lang.c:2246 +#: src/lang.c:2343 msgid "Force redraw after certain commands" msgstr "" -#: src/lang.c:2247 +#: src/lang.c:2344 msgid "" "# If ON a screen redraw will always be done after certain external commands\n" msgstr "" -#: src/lang.c:2251 +#: src/lang.c:2348 msgid "" "Start editor with line offset. toggles, sets, cancels." msgstr "" -#: src/lang.c:2252 +#: src/lang.c:2349 msgid "Start editor with line offset" msgstr "" -#: src/lang.c:2253 +#: src/lang.c:2350 msgid "" "# If ON editor will be started with cursor offset into the file\n" "# otherwise the cursor will be positioned at the first line\n" msgstr "" -#: src/lang.c:2258 +#: src/lang.c:2355 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "" -#: src/lang.c:2259 +#: src/lang.c:2356 msgid "Invocation of your editor" msgstr "" -#: src/lang.c:2260 +#: src/lang.c:2357 msgid "" "# Format of editor line including parameters\n" "# %%E Editor %%F Filename %%N Linenumber\n" msgstr "" -#: src/lang.c:2265 +#: src/lang.c:2362 msgid "" "Enter name and options for external-inews, --internal for internal inews" msgstr "" -#: src/lang.c:2266 +#: src/lang.c:2363 msgid "External inews" msgstr "" -#: src/lang.c:2267 +#: src/lang.c:2364 msgid "" "# If --internal use the built in mini inews for posting via NNTP\n" "# otherwise use an external inews program\n" msgstr "" -#: src/lang.c:2271 +#: src/lang.c:2368 msgid "" "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" -#: src/lang.c:2272 +#: src/lang.c:2369 msgid "Invocation of your mail command" msgstr "" -#: src/lang.c:2273 +#: src/lang.c:2370 msgid "" "# Format of mailer line including parameters\n" "# %%M Mailer %%S Subject %%T To %%F Filename\n" @@ -5718,146 +5874,155 @@ msgid "" "# ie. elm interactive : elm -i %%F -s \"%%S\" \"%%T\"\n" msgstr "" -#: src/lang.c:2281 +#: src/lang.c:2378 msgid "Use interactive mail reader" msgstr "" -#: src/lang.c:2282 +#: src/lang.c:2379 msgid "" -"# Interactive mailreader:\n" -"# 0 = no interactive mailreader\n" -"# 1 = use interactive mailreader with headers in file\n" -"# 2 = use interactive mailreader without headers in file\n" +"# Interactive mailreader\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = no interactive mailreader\n" +"# 1 = use interactive mailreader with headers in file\n" +"# 2 = use interactive mailreader without headers in file\n" msgstr "" -#: src/lang.c:2290 +#: src/lang.c:2388 msgid "Remove ~/.article after posting" msgstr "" -#: src/lang.c:2291 +#: src/lang.c:2389 msgid "# If ON remove ~/.article after posting.\n" msgstr "" -#: src/lang.c:2295 +#: src/lang.c:2393 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "" -#: src/lang.c:2296 +#: src/lang.c:2394 msgid "Filename for posted articles" msgstr "" -#: src/lang.c:2297 +#: src/lang.c:2395 msgid "" "# Filename where to keep all postings (default posted)\n" "# If no filename is set then postings will not be saved\n" msgstr "" -#: src/lang.c:2302 +#: src/lang.c:2400 msgid "" "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "" -#: src/lang.c:2303 +#: src/lang.c:2401 msgid "Keep failed arts in ~/dead.articles" msgstr "" -#: src/lang.c:2304 +#: src/lang.c:2402 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "" -#: src/lang.c:2308 +#: src/lang.c:2406 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "" -#: src/lang.c:2309 +#: src/lang.c:2407 msgid "No unsubscribed groups in newsrc" msgstr "" -#: src/lang.c:2310 +#: src/lang.c:2408 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "" -#: src/lang.c:2315 +#: src/lang.c:2413 msgid "Remove bogus groups from newsrc" msgstr "" -#: src/lang.c:2316 +#: src/lang.c:2414 msgid "" "# What to do with bogus groups in newsrc file\n" -"# 0=(Keep) 1=(Remove) 2=(Highlight with D on selection screen).\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = keep\n" +"# 1 = remove\n" +"# 2 = highlight with D on selection screen\n" msgstr "" -#: src/lang.c:2320 +#: src/lang.c:2422 msgid "Enter number of seconds until active file will be reread. sets." msgstr "" -#: src/lang.c:2321 +#: src/lang.c:2423 msgid "Interval in secs to reread active" msgstr "" -#: src/lang.c:2322 +#: src/lang.c:2424 msgid "" "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "" -#: src/lang.c:2327 +#: src/lang.c:2429 msgid "Reconnect to server automatically" msgstr "" -#: src/lang.c:2328 +#: src/lang.c:2430 msgid "" "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "" -#: src/lang.c:2332 +#: src/lang.c:2434 msgid "" "Create local copies of NNTP overview files. toggles & sets." msgstr "" -#: src/lang.c:2333 +#: src/lang.c:2435 msgid "Cache NNTP overview files locally" msgstr "" -#: src/lang.c:2334 +#: src/lang.c:2436 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "" -#: src/lang.c:2338 +#: src/lang.c:2440 msgid "Enter format string. sets, cancels." msgstr "" -#: src/lang.c:2339 +#: src/lang.c:2441 msgid "Format string for display of dates" msgstr "" -#: src/lang.c:2340 +#: src/lang.c:2442 msgid "# Format string for date representation\n" msgstr "" -#: src/lang.c:2346 +#: src/lang.c:2448 msgid "Unicode normalization form" msgstr "" -#: src/lang.c:2347 +#: src/lang.c:2449 msgid "" "# Unicode normalization form\n" -"# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = None\n" +"# * 1 = NFKC\n" +"# 2 = NFKD\n" +"# 3 = NFC\n" +"# 4 = NFD\n" msgstr "" -#: src/lang.c:2354 +#: src/lang.c:2461 msgid "Render BiDi" msgstr "" -#: src/lang.c:2355 +#: src/lang.c:2462 msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "" -#: src/misc.c:3711 +#: src/misc.c:3713 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "" -#: src/misc.c:3714 +#: src/misc.c:3716 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "" @@ -5892,7 +6057,7 @@ msgstr "" msgid "couldn't expand %s\n" msgstr "" -#: src/post.c:1962 +#: src/post.c:1970 #, c-format msgid "Posting: %.*s ..." msgstr "" @@ -5937,15 +6102,15 @@ msgstr "" msgid "bytes" msgstr "" -#: src/select.c:352 +#: src/select.c:375 msgid "unread" msgstr "" -#: src/select.c:352 +#: src/select.c:375 msgid "all" msgstr "" -#: src/select.c:530 src/select.c:532 +#: src/select.c:547 src/select.c:549 msgid " R" msgstr "" diff -Nurp tin-1.7.6/src/Makefile.in tin-1.7.7/src/Makefile.in --- tin-1.7.6/src/Makefile.in 2004-09-06 10:58:27.000000000 +0200 +++ tin-1.7.7/src/Makefile.in 2004-11-15 18:44:26.000000000 +0100 @@ -1,7 +1,7 @@ # Source Makefile for tin # - for configuration options read the ../doc/INSTALL file. # -# Updated: 2004-09-06 +# Updated: 2004-10-19 # # Copyright (c) 1995-2004 Thomas E. Dickey # All rights reserved. @@ -51,7 +51,7 @@ x = @EXEEXT@ o = .@OBJEXT@ DEBUG = @ENABLE_DEBUG@ -DDEBUG #-DDEBUG_NEWSRC -DPROFILE -DDEBUG_REFS -CANLOCK = # -DUSE_CANLOCK # -DEVIL_INSIDE +CANLOCK = # -DUSE_CANLOCK # -DEVIL_INSIDE INTL_CPPFLAGS = -DLOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" PCRE_CPPFLAGS = @PCREDIR_CPPFLAGS@ @PCREDIR_MAKE@ -I$(top_builddir)/pcre -I$(top_srcdir)/pcre @@ -525,7 +525,8 @@ $(OBJDIR)/init$o : $(SRCDIR)/init.c $(T $(OBJDIR)/joinpath$o : $(SRCDIR)/joinpath.c $(TIN_DEP) $(OBJDIR)/keymap$o : $(SRCDIR)/keymap.c $(TIN_DEP) \ $(INCDIR)/keymap.h \ - $(INCDIR)/menukeys.h + $(INCDIR)/menukeys.h \ + $(INCDIR)/version.h $(OBJDIR)/lang$o : $(SRCDIR)/lang.c $(TIN_DEP) $(OBJDIR)/langinfo$o : $(SRCDIR)/langinfo.c $(TIN_DEP) $(OBJDIR)/list$o : $(SRCDIR)/list.c $(TIN_DEP) diff -Nurp tin-1.7.6/src/art.c tin-1.7.7/src/art.c --- tin-1.7.6/src/art.c 2004-08-20 10:30:49.000000000 +0200 +++ tin-1.7.7/src/art.c 2004-12-02 18:12:33.000000000 +0100 @@ -324,7 +324,7 @@ index_group( struct t_group *group) { int i; - int changed = 0; /* Count of articles whose overview has changed */ + int changed; /* Count of articles whose overview has changed */ int respnum; int total; long last_read_article; diff -Nurp tin-1.7.6/src/config.c tin-1.7.7/src/config.c --- tin-1.7.6/src/config.c 2004-09-05 16:02:45.000000000 +0200 +++ tin-1.7.7/src/config.c 2004-11-15 18:44:24.000000000 +0100 @@ -3,7 +3,7 @@ * Module : config.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2004-09-05 + * Updated : 2004-10-26 * Notes : Configuration file routines * * Copyright (c) 1991-2004 Iain Lea @@ -1207,40 +1207,46 @@ write_config_file( fprintf(fp, "col_urls=%d\n\n", tinrc.col_urls); #endif /* HAVE_COLOR */ -#ifdef XFACE_ABLE - fprintf(fp, _(txt_use_slrnface.tinrc)); - fprintf(fp, "use_slrnface=%s\n\n", print_boolean(tinrc.use_slrnface)); -#endif /*XFACE_ABLE */ - fprintf(fp, _(txt_url_highlight.tinrc)); fprintf(fp, "url_highlight=%s\n\n", print_boolean(tinrc.url_highlight)); fprintf(fp, _(txt_word_highlight.tinrc)); fprintf(fp, "word_highlight=%s\n\n", print_boolean(tinrc.word_highlight)); - fprintf(fp, _(txt_wrap_column.tinrc)); - fprintf(fp, "wrap_column=%d\n\n", tinrc.wrap_column); - fprintf(fp, _(txt_word_h_display_marks.tinrc)); fprintf(fp, "word_h_display_marks=%d\n\n", tinrc.word_h_display_marks); #ifdef HAVE_COLOR fprintf(fp, _(txt_col_markstar.tinrc)); - fprintf(fp, "col_markstar=%d\n", tinrc.col_markstar); - fprintf(fp, "col_markdash=%d\n", tinrc.col_markdash); - fprintf(fp, "col_markslash=%d\n", tinrc.col_markslash); + fprintf(fp, "col_markstar=%d\n\n", tinrc.col_markstar); + fprintf(fp, _(txt_col_markdash.tinrc)); + fprintf(fp, "col_markdash=%d\n\n", tinrc.col_markdash); + fprintf(fp, _(txt_col_markslash.tinrc)); + fprintf(fp, "col_markslash=%d\n\n", tinrc.col_markslash); + fprintf(fp, _(txt_col_markstroke.tinrc)); fprintf(fp, "col_markstroke=%d\n\n", tinrc.col_markstroke); #endif /* HAVE_COLOR */ fprintf(fp, _(txt_mono_markstar.tinrc)); - fprintf(fp, "mono_markstar=%d\n", tinrc.mono_markstar); - fprintf(fp, "mono_markdash=%d\n", tinrc.mono_markdash); - fprintf(fp, "mono_markslash=%d\n", tinrc.mono_markslash); + fprintf(fp, "mono_markstar=%d\n\n", tinrc.mono_markstar); + fprintf(fp, _(txt_mono_markdash.tinrc)); + fprintf(fp, "mono_markdash=%d\n\n", tinrc.mono_markdash); + fprintf(fp, _(txt_mono_markslash.tinrc)); + fprintf(fp, "mono_markslash=%d\n\n", tinrc.mono_markslash); + fprintf(fp, _(txt_mono_markstroke.tinrc)); fprintf(fp, "mono_markstroke=%d\n\n", tinrc.mono_markstroke); fprintf(fp, _(txt_mail_address.tinrc)); fprintf(fp, "mail_address=%s\n\n", tinrc.mail_address); +#ifdef XFACE_ABLE + fprintf(fp, _(txt_use_slrnface.tinrc)); + fprintf(fp, "use_slrnface=%s\n\n", print_boolean(tinrc.use_slrnface)); +#endif /*XFACE_ABLE */ + + fprintf(fp, _(txt_wrap_column.tinrc)); + fprintf(fp, "wrap_column=%d\n\n", tinrc.wrap_column); + #ifndef CHARSET_CONVERSION fprintf(fp, _(txt_mm_charset.tinrc)); fprintf(fp, "mm_charset=%s\n\n", tinrc.mm_charset); @@ -1754,7 +1760,7 @@ rc_update( } /* update the values */ - tinrc.confirm_choice = (confirm_action ? 1 : 0 ) + (confirm_to_quit ? 3 : 0); + tinrc.confirm_choice = (confirm_action ? 1 : 0) + (confirm_to_quit ? 3 : 0); if (!use_getart_limit) tinrc.getart_limit = 0; diff -Nurp tin-1.7.6/src/cook.c tin-1.7.7/src/cook.c --- tin-1.7.6/src/cook.c 2004-08-20 10:30:49.000000000 +0200 +++ tin-1.7.7/src/cook.c 2004-12-01 11:48:37.000000000 +0100 @@ -3,7 +3,7 @@ * Module : cook.c * Author : J. Faultless * Created : 2000-03-08 - * Updated : 2004-07-22 + * Updated : 2004-11-04 * Notes : Split from page.c * * Copyright (c) 2000-2004 Jason Faultless @@ -57,14 +57,10 @@ #define MATCH_REGEX(x,y,z) (pcre_exec(x.re, x.extra, y, z, 0, 0, NULL, 0) >= 0) -static int put_rest(char **rest, char **line, int *max_line_len, const int offset); -static int read_decoded_base64_line(FILE *file, char **line, int *max_line_len, const int max_lines_to_read, char **rest); -static int read_decoded_qp_line(FILE *file, char **line, int *max_line_len, const int max_lines_to_read); static t_bool header_wanted(const char *line); static t_part *new_uue(t_part **part, char *name); static void process_text_body_part(t_bool wrap_lines, FILE *in, t_part *part, int hide_uue, int tabs); static void put_cooked(size_t buf_len, t_bool wrap_lines, int flags, const char *fmt, ...); -static void set_rest(char **rest, const char *ptr); #ifdef DEBUG_ART static void dump_cooked(void); #endif /* DEBUG_ART */ @@ -160,7 +156,7 @@ put_cooked( char *p, *bufp, *buf; int wrap_column; int space; - static int overflow = 0; +/* static int overflow = 0; *//* TODO: we don't use it (anymore?) */ static int saved_flags = 0; va_list ap; #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) @@ -209,7 +205,7 @@ put_cooked( if (*p == '\n') p++; bufp = p; - overflow = 0; +/* overflow = 0; */ if (art->cooked_lines == 0) { art->cookl = my_malloc(sizeof(t_lineinfo) * CHUNK); @@ -246,7 +242,7 @@ put_cooked( if (*bufp != '\0') { fputs(bufp, art->cooked); saved_flags = flags; - overflow += strlen(bufp); +/* overflow += strlen(bufp); */ } va_end(ap); @@ -255,322 +251,6 @@ put_cooked( /* - * FIXME: should go into rfc1521.c - * - * Set everything in ptr as the rest of a physical line to be processed - * later. - */ -static void -set_rest( - char **rest, - const char *ptr) -{ - char *old_rest = *rest; - - if (ptr == NULL || strlen(ptr) == 0) { - FreeAndNull(*rest); - return; - } - *rest = my_strdup(ptr); - FreeIfNeeded(old_rest); -} - - -/* - * FIXME: should go into rfc1521.c - * - * Copy things that were left over from the last decoding into the new line. - * If there's a newline in the rest, copy everything up to and including that - * newline into the expected buffer, adjust rest and return. If there's no - * newline in the rest, copy all of it to the expected buffer and return. - * - * Side effects: resizes line if necessary, adjusts max_line_len - * accordingly. - * - * This function returns the number of characters written to the line buffer. - */ -static int -put_rest( - char **rest, - char **line, - int *max_line_len, - const int offset) -{ - char *my_rest = *rest; - char *ptr; - char c; - int put_chars = offset; - - if ((ptr = my_rest) == NULL) - return put_chars; - if (strlen(my_rest) == 0) { - FreeAndNull(*rest); - return put_chars; - } - - while ((c = *ptr++) && (c != '\n')) { - if ((c == '\r') && (*ptr == '\n')) - continue; /* step over CRLF */ - /* - * Resize line if necessary. Keep in mind that we add LF and \0 later. - */ - if (put_chars >= *max_line_len - 2) { - if (*max_line_len == 0) - *max_line_len = LEN; - else - *max_line_len <<= 1; - *line = my_realloc(*line, *max_line_len); - } - (*line)[put_chars++] = c; - } - if (c == '\n') { - /* - * FIXME: Adding a newline may be not correct. At least it may - * be not what the author of that article intended. - * Unfortunately, a newline is expected at the end of a line by - * some other code in cook.c and even those functions invoking - * this one rely on it. - */ - (*line)[put_chars++] = '\n'; - set_rest(rest, ptr); - } else /* c == 0 */ - /* rest is now empty */ - FreeAndNull(*rest); - - (*line)[put_chars] = '\0'; /* don't count the termining NULL! */ - return put_chars; -} - - -/* - * FIXME: should go into rfc1521.c - * - * Read a logical base64 encoded line into the specified line buffer. - * Logical lines can be split over several physical base64 encoded lines and - * a single physical base64 encoded line can contain serveral logical lines. - * This function keeps track of all these cases and always copies only one - * decoded line to the line buffer. - * - * Side effects: resizes line if necessary, adjusts max_line_len - * accordingly. - * - * This function returns the number of physical lines read or a negative - * value on error. - */ -static int -read_decoded_base64_line( - FILE *file, - char **line, - int *max_line_len, - const int max_lines_to_read, - char **rest) -{ - char *buf2; /* holds the entire decoded line */ - char *buf; /* holds the entire encoded line*/ - int count = 0; - int lines_read = 0; - int put_chars = 0; - - /* - * First of all, catch everything that is left over from the last decoding. - * If there's a newline in that rest, copy everything up to and including - * that newline in the expected buffer, adjust rest and return. If there's - * no newline in the rest, copy all of it (modulo length of the buffer) to - * the expected buffer and continue as if there was no rest. - */ - put_chars = put_rest(rest, line, max_line_len, 0); - if (put_chars && ((*line)[put_chars - 1] == '\n')) - return 0; /* we didn't read any new lines but filled the line */ - - /* - * At this point, either there was no rest or there was no newline in the - * rest. In any case, we need to read further encoded lines and decode - * them until we find a newline or there are no more (encoded or physical) - * lines in this part of the posting. To be sure, now allocate memory for - * the output if it wasn't already done. - */ - if (*max_line_len == 0) { - *max_line_len = LEN; - *line = my_malloc(*max_line_len); - } - - /* - * max_lines_to_read==0 occurs at end of an encoded part and if there was - * no trailing newline in the encoded text. So we put one there and exit. - * FIXME: Adding a newline may be not correct. At least it may be not - * what the author of that article intended. Unfortunately, a newline is - * expected at the end of a line by some other code in cook.c. - */ - if (max_lines_to_read <= 0) { - if (put_chars) { - (*line)[put_chars++] = '\n'; - (*line)[put_chars] = '\0'; - } - return max_lines_to_read; - } - /* - * Ok, now read a new line from the original article. - */ - do { - if ((buf = tin_fgets(file, FALSE)) == NULL) { - /* - * Premature end of file (or file error), leave loop. To prevent - * re-invoking of this function, set the numbers of read lines to - * the expected maximum that should be read at most. - * - * FIXME: Adding a newline may be not correct. At least it may be - * not what the author of that article intended. Unfortunately, a - * newline is expected at the end of a line by some other code in - * cook.c. - */ - if (put_chars > *max_line_len - 2) { - *max_line_len <<= 1; - *line = my_realloc(*line, *max_line_len); - } - (*line)[put_chars++] = '\n'; - (*line)[put_chars] = '\0'; - return max_lines_to_read; - } - lines_read++; - buf2 = my_malloc(strlen(buf) + 1); /* decoded string is always shorter than encoded string, so this is safe */ - count = mmdecode(buf, 'b', '\0', buf2); - buf2[count] = '\0'; - FreeIfNeeded(*rest); - *rest = buf2; - put_chars = put_rest(rest, line, max_line_len, put_chars); - if (put_chars && ((*line)[put_chars - 1] == '\n')) /* end of logical line reached */ - return lines_read; - } while (lines_read < max_lines_to_read); - /* - * FIXME: Adding a newline may be not correct. At least it may be - * not what the author of that article intended. Unfortunately, a - * newline is expected at the end of a line by some other code in - * cook.c. - */ - if (put_chars > *max_line_len - 2) { - *max_line_len <<= 1; - *line = my_realloc(*line, *max_line_len); - } - if ((0 == put_chars) || ('\n' != (*line)[put_chars - 1])) - (*line)[put_chars++] = '\n'; - (*line)[put_chars] = '\0'; - return lines_read; -} - - -/* - * FIXME: should go into rfc1521.c - * - * Read a logical quoted-printable encoded line into the specified line - * buffer. Quoted-printable lines can be split over several physical lines, - * so this function collects all affected lines, concatenates and decodes - * them. - * - * Side effects: resizes line if necessary, adjusts max_line_len - * accordingly. - * - * This function returns the number of physical lines read or a negative - * value on error. - */ -static int -read_decoded_qp_line( - FILE *file, - char **line, /* where to copy the decoded line */ - int *max_line_len, /* (maximum) line length */ - const int max_lines_to_read) /* don't read more physical lines than told here */ -{ - char *buf, *buf2; - char *ptr; - char c; - int buflen = LEN; - int count = 0; - int lines_read = 0; - size_t chars_to_add = 0; - - buf = my_malloc(buflen); /* initial internal line buffer */ - *buf = '\0'; - do { - if ((buf2 = tin_fgets(file, FALSE)) == NULL) { - /* - * Premature end of file (or file error, leave loop. To prevent - * re-invokation of this function, set the numbers of read lines - * to the expected maximum that should be read at most. - */ - lines_read = max_lines_to_read; - break; - } - lines_read++; - if ((chars_to_add = strlen(buf2)) == 0) /* Empty line, leave loop. */ - break; - - /* - * Strip trailing white space at the end of the line. - * See RFC 2045, section 6.7, #3 - */ - c = buf2[chars_to_add - 1]; - while ((chars_to_add > 0) && ((c == ' ') || (c == '\t') || (c == '\n') || (c == '\r'))) { - --chars_to_add; - c = (chars_to_add > 0 ? buf2[chars_to_add - 1] : '\0'); - } - - /* - * '=' at the end of a line indicates a soft break meaning - * that the following physical line "belongs" to this one. - * (See RFC 2045, section 6.7, #5) - * - * Skip that equal sign now; since c holds this char, the - * loop is not left but the next line is read and concatenated - * with this one while the '=' is overwritten. - */ - if (c == '=') /* c is 0 when chars_to_add is 0 so this is safe */ - buf2[--chars_to_add] = '\0'; - - /* - * Join physical lines to a logical one; keep in mind that a LF is - * added afterwards. - */ - if (chars_to_add > buflen - strlen(buf) - 2) { - buflen <<= 1; - buf = my_realloc(buf, buflen); - } - strncat(buf, buf2, buflen); - } while ((c == '=') && (lines_read < max_lines_to_read)); - /* - * re-add newline and NULL termination at end of line - * FIXME: Adding a newline may be not correct. At least it may be not - * what the author of that article intended. Unfortunately, a newline is - * expected at the end of a line by some other code in cook.c. - */ - strcat(buf, "\n"); - - /* - * Now decode complete (logical) line from buf to buf2 and copy it to the - * buffer where the invoking function expects it. Don't decode directly - * to the buffer of the other function to prevent buffer overruns and to - * decide if the encoding was ok. - */ - buf2 = my_malloc(strlen(buf) + 1); /* Don't use realloc here, tin_fgets relies on its internal state! */ - count = mmdecode(buf, 'q', '\0', buf2); - - if (count >= 0) { - buf2[count] = '\0'; - ptr = buf2; - } else /* error in encoding: copy raw line */ - ptr = buf; - - if (*max_line_len < (int) strlen(ptr) + 1) { - *max_line_len = strlen(ptr) + 1; - *line = my_realloc(*line, *max_line_len); - } - strncpy(*line, ptr, *max_line_len); - (*line)[*max_line_len - 1] = '\0'; /* be sure to terminate string */ - free(buf); - free(buf2); - return lines_read; -} - - -/* * Add a new uuencode attachment description to the current part */ static t_part * diff -Nurp tin-1.7.6/src/filter.c tin-1.7.7/src/filter.c --- tin-1.7.6/src/filter.c 2004-09-04 16:10:19.000000000 +0200 +++ tin-1.7.7/src/filter.c 2004-11-15 18:44:25.000000000 +0100 @@ -1344,7 +1344,7 @@ filter_menu( if ((i = get_choice(INDEX_TOP + 13, ptr_filter_help_scope, ptr_filter_scope, list, j + 1)) > 0) strncpy(rule.scope, i == j ? "*" : list[i], sizeof(rule.scope)); - for(j--; j >= 0; j--) + for (j--; j >= 0; j--) free(list[j]); free(list); diff -Nurp tin-1.7.6/src/global.c tin-1.7.7/src/global.c --- tin-1.7.6/src/global.c 2004-08-20 10:30:49.000000000 +0200 +++ tin-1.7.7/src/global.c 2004-11-16 14:27:09.000000000 +0100 @@ -3,7 +3,7 @@ * Module : global.c * Author : Jason Faultless * Created : 1999-12-12 - * Updated : 2000-01-05 + * Updated : 2004-11-16 * Notes : Generic nagivation and key handling routines * * Copyright (c) 1999-2004 Jason Faultless @@ -48,60 +48,10 @@ /* * Local prototypes */ -static int _page_up(int curslot, int maxslot); -static int _page_down(int curslot, int maxslot); static int mouse_action(int ch, int (*left_action) (void), int (*right_action) (void)); - -/* - * Return the new line index following a PageUp request. - * Take half page scrolling into account - */ -static int -_page_up( - int curslot, - int maxslot) -{ - int n, scroll_lines; - - if (curslot == 0) - return (maxslot - 1); - - scroll_lines = (tinrc.scroll_lines == -2) ? NOTESLINES / 2 : NOTESLINES; - - if ((n = curslot % scroll_lines) > 0) - curslot -= n; - else - curslot = ((curslot - scroll_lines) / scroll_lines) * scroll_lines; - - return ((curslot < 0) ? 0 : curslot); -} - - -/* - * Return the new line index following a PageDown request. - * Take half page scrolling into account - */ -static int -_page_down( - int curslot, - int maxslot) -{ - int scroll_lines; - - if (curslot == maxslot - 1) - return 0; - - scroll_lines = (tinrc.scroll_lines == -2) ? NOTESLINES / 2 : NOTESLINES; - - curslot = ((curslot + scroll_lines) / scroll_lines) * scroll_lines; - - if (curslot >= maxslot) { - curslot = (maxslot / scroll_lines) * scroll_lines; - if (curslot < maxslot - 1) - curslot = maxslot - 1; - } - return curslot; -} +#ifdef USE_CURSES + static void do_scroll(int jump); +#endif /* USE_CURSES */ /* @@ -112,29 +62,19 @@ void set_first_screen_item( void) { - if (currmenu->curr >= currmenu->max) - currmenu->curr = currmenu->max - 1; - - if (NOTESLINES <= 0) + if (currmenu->max == 0) { currmenu->first = 0; - else { - currmenu->first = (currmenu->curr / NOTESLINES) * NOTESLINES; - if (currmenu->first < 0) - currmenu->first = 0; + currmenu->curr = -1; + return; } - currmenu->last = currmenu->first + NOTESLINES; - - if (currmenu->last >= currmenu->max) { - currmenu->last = currmenu->max; - currmenu->first = (currmenu->max / NOTESLINES) * NOTESLINES; - - if (currmenu->first == currmenu->last || currmenu->first < 0) - currmenu->first = ((currmenu->first < 0) ? 0 : currmenu->last - NOTESLINES); - } + if (currmenu->curr >= currmenu->max) + currmenu->curr = currmenu->max - 1; + else if (currmenu->curr < -1) + currmenu->curr = -1; - if (currmenu->max == 0) - currmenu->first = currmenu->last = 0; + if (currmenu->curr < currmenu->first || currmenu->curr > currmenu->first + NOTESLINES - 1) /* current selection is out of screen */ + currmenu->first = (currmenu->curr / NOTESLINES) * NOTESLINES; } @@ -142,8 +82,28 @@ void move_up( void) { - if (currmenu->max) - move_to_item((currmenu->curr == 0) ? (currmenu->max - 1) : (currmenu->curr - 1)); + if (!currmenu->max) + return; + + if (currmenu->curr - 1 < currmenu->first && currmenu->curr != 0) { + currmenu->first--; +#ifdef USE_CURSES + do_scroll(-1); + currmenu->draw_item(currmenu->curr - 1); +#else + currmenu->redraw(); +#endif /* USE_CURSES */ + } + if (currmenu->curr == 0) { + currmenu->first = MAX(0, currmenu->max - NOTESLINES); + + if (currmenu->max - 1 >= NOTESLINES) { + currmenu->curr = currmenu->max - 1; + currmenu->redraw(); + } else + move_to_item(currmenu->max - 1); + } else + move_to_item(currmenu->curr - 1); } @@ -151,8 +111,19 @@ void move_down( void) { - if (currmenu->max) - move_to_item((currmenu->curr + 1 >= currmenu->max) ? 0 : (currmenu->curr + 1)); + if (!currmenu->max) + return; + + if (currmenu->curr + 1 > currmenu->first + NOTESLINES - 1 && currmenu->curr + 1 < currmenu->max) { + currmenu->first++; +#ifdef USE_CURSES + do_scroll(1); + currmenu->draw_item(currmenu->curr + 1); +#else + currmenu->redraw(); +#endif /* USE_CURSES */ + } + move_to_item((currmenu->curr + 1 >= currmenu->max) ? 0 : (currmenu->curr + 1)); } @@ -160,8 +131,24 @@ void page_up( void) { - if (currmenu->max) - move_to_item(_page_up(currmenu->curr, currmenu->max)); + int scroll_lines; + + if (!currmenu->max) + return; + + if (currmenu->curr == currmenu->first) { + scroll_lines = (tinrc.scroll_lines == -2) ? NOTESLINES / 2 : NOTESLINES; + if (currmenu->first == 0) { + /* wrap around */ + currmenu->first = MAX(0, currmenu->max - scroll_lines); + currmenu->curr = currmenu->max - 1; + } else { + currmenu->first = MAX(0, currmenu->first - scroll_lines); + currmenu->curr = currmenu->first; + } + currmenu->redraw(); + } else + move_to_item(currmenu->first); } @@ -169,8 +156,26 @@ void page_down( void) { - if (currmenu->max) - move_to_item(_page_down(currmenu->curr, currmenu->max)); + int scroll_lines; + + if (!currmenu->max) + return; + + if (currmenu->curr == currmenu->max - 1) { + /* wrap around */ + currmenu->first = 0; + currmenu->curr = 0; + currmenu->redraw(); + } else { + scroll_lines = (tinrc.scroll_lines == -2) ? NOTESLINES / 2 : NOTESLINES; + if (currmenu->first + scroll_lines >= currmenu->max) + move_to_item(currmenu->max - 1); + else { + currmenu->first += scroll_lines; + currmenu->curr = currmenu->first; + currmenu->redraw(); + } + } } @@ -229,12 +234,11 @@ move_to_item( HpGlitch(erase_arrow()); erase_arrow(); - currmenu->curr = n; - if (currmenu->curr < 0) + if ((currmenu->curr = n) < 0) currmenu->curr = 0; clear_message(); - if (n >= currmenu->first && n < currmenu->last) + if (n >= currmenu->first && n < currmenu->first + NOTESLINES) currmenu->draw_arrow(); else currmenu->redraw(); @@ -242,6 +246,75 @@ move_to_item( /* + * scroll the screen one line down + * the selected item is only moved if it is scrolled off the screen + */ +void +scroll_down( + void) +{ + if (!currmenu->max || currmenu->first + NOTESLINES >= currmenu->max) + return; + + currmenu->first++; +#ifdef USE_CURSES + do_scroll(1); + currmenu->draw_item(currmenu->first + NOTESLINES - 1); + stow_cursor(); + if (currmenu->curr < currmenu->first) + move_to_item(currmenu->curr + 1); +#else + if (currmenu->curr < currmenu->first) + currmenu->curr++; + currmenu->redraw(); +#endif /* USE_CURSES */ +} + + +/* + * scroll the screen one line up + * the selected item is only moved if it is scrolled off the screen + */ +void +scroll_up( + void) +{ + if (!currmenu->max || currmenu->first == 0) + return; + + currmenu->first--; +#ifdef USE_CURSES + do_scroll(-1); + currmenu->draw_item(currmenu->first); + stow_cursor(); + if (currmenu->curr >= currmenu->first + NOTESLINES) + move_to_item(currmenu->curr - 1); +#else + if (currmenu->curr >= currmenu->first + NOTESLINES) + currmenu->curr--; + currmenu->redraw(); +#endif /* USE_CURSES */ +} + + +#ifdef USE_CURSES +/* TODO: merge with options_menu.c:do_scroll() and move to tcurses.c */ +/* scroll the screen 'jump' lines down or up (if 'jump' < 0) */ +static void +do_scroll( + int jump) +{ + scrollok(stdscr, TRUE); + MoveCursor(INDEX_TOP, 0); + SetScrollRegion(INDEX_TOP, INDEX_TOP + NOTESLINES - 1); + ScrollScreen(jump); + SetScrollRegion(0, LINES - 1); + scrollok(stdscr, FALSE); +} +#endif /* USE_CURSES */ + + +/* * Handle mouse clicks. We simply map the event to a return * keymap code that will drop through to call the correct function */ @@ -251,7 +324,7 @@ mouse_action( int (*left_action) (void), /* Typically catchup type event */ int (*right_action) (void)) /* Typically read next etc.. */ { - int INDEX_BOTTOM = INDEX_TOP + currmenu->last - currmenu->first; + int INDEX_BOTTOM = INDEX_TOP + NOTESLINES; switch (xmouse) { case MOUSE_BUTTON_1: diff -Nurp tin-1.7.6/src/group.c tin-1.7.7/src/group.c --- tin-1.7.6/src/group.c 2004-08-20 10:30:49.000000000 +0200 +++ tin-1.7.7/src/group.c 2004-11-16 14:27:17.000000000 +0100 @@ -3,7 +3,7 @@ * Module : group.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-07-19 + * Updated : 2004-11-16 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -76,9 +76,9 @@ static void update_group_page(void); /* * grpmenu.curr is an index into base[] and so equates to the cursor location * (thread number) on group page - * grpmenu.first, last are static here + * grpmenu.first is static here */ -t_menu grpmenu = { 0, 0, 0, 0, show_group_page, draw_subject_arrow }; +t_menu grpmenu = { 0, 0, 0, show_group_page, draw_subject_arrow, build_sline }; static void show_tagged_lines( @@ -86,7 +86,7 @@ show_tagged_lines( { int i, j; - for (i = grpmenu.first; i < grpmenu.last; ++i) { + for (i = grpmenu.first; i < grpmenu.first + NOTESLINES && i < grpmenu.max; ++i) { if ((i != grpmenu.curr) && (j = line_is_tagged(base[i]))) mark_screen(i, MARK_OFFSET - 2, tin_ltoa(j, 3)); } @@ -171,6 +171,8 @@ group_page( * Position 'grpmenu.curr' accordingly */ pos_first_unread_thread(); + /* reset grpmenu.first */ + grpmenu.first = 0; clear_note_area(); @@ -379,6 +381,14 @@ group_page( page_up(); break; + case iKeyScrollDown: + scroll_down(); + break; + + case iKeyScrollUp: + scroll_up(); + break; + case iKeyCatchupLeft: case iKeyGroupCatchup: case iKeyGroupCatchupNextUnread: @@ -892,31 +902,19 @@ show_group_page( signal_context = cGroup; currmenu = &grpmenu; - MoveCursor(0, 0); - CleartoEOLN(); - - show_group_title(FALSE); - - MoveCursor(1, 0); - CleartoEOLN(); - MoveCursor(INDEX_TOP, 0); - + ClearScreen(); set_first_screen_item(); + show_group_title(FALSE); - if (tinrc.draw_arrow) - CleartoEOS(); - - for (i = grpmenu.first; i < grpmenu.last; ++i) + for (i = grpmenu.first; i < grpmenu.first + NOTESLINES && i < grpmenu.max; ++i) build_sline(i); - CleartoEOS(); show_mini_help(GROUP_LEVEL); if (grpmenu.max <= 0) { info_message(_(txt_no_arts)); return; - } else if (grpmenu.last == grpmenu.max) - info_message(_(txt_end_of_arts)); + } draw_subject_arrow(); } @@ -930,7 +928,7 @@ update_group_page( char mark[] = { '\0', '\0' }; struct t_art_stat sbuf; - for (i = grpmenu.first; i < grpmenu.last; ++i) { + for (i = grpmenu.first; i < grpmenu.first + NOTESLINES && i < grpmenu.max; ++i) { if ((j = line_is_tagged(base[i]))) mark_screen(i, MARK_OFFSET - 2, tin_ltoa(j, 3)); else { @@ -961,10 +959,8 @@ draw_subject_arrow( stat_thread(grpmenu.curr, &statbuf); info_message("%s", arts[(statbuf.unread ? next_unread(base[grpmenu.curr]) : base[grpmenu.curr])].subject); - } else { - if (grpmenu.last == grpmenu.max) - info_message(_(txt_end_of_arts)); - } + } else if (grpmenu.curr == grpmenu.max - 1) + info_message(_(txt_end_of_arts)); } @@ -1271,10 +1267,19 @@ build_sline( if ((tmp_subj2 = char2wchar_t(arts_sub)) != NULL) { tmp_subj = wcspart(tmp_subj2, len_subj - 12, TRUE); free(tmp_subj2); + } else { + wchar_t wc[1] = {0}; + + tmp_subj = wcspart(wc, len_subj - 12, TRUE); } + if ((tmp_from2 = char2wchar_t(from)) != NULL) { tmp_from = wcspart(tmp_from2, len_from, TRUE); free(tmp_from2); + } else { + wchar_t wc[1] = {0}; + + tmp_from = wcspart(wc, len_from, TRUE); } if (curr_group->attribute->show_info == SHOW_INFO_SCORE || curr_group->attribute->show_info == SHOW_INFO_BOTH) { @@ -1321,7 +1326,6 @@ build_sline( #endif /* USE_CURSES */ if (sbuf.art_mark == tinrc.art_marked_selected) draw_mark_selected(i); - MoveCursor(INDEX2LNUM(i) + 1, 0); } diff -Nurp tin-1.7.6/src/help.c tin-1.7.7/src/help.c --- tin-1.7.6/src/help.c 2004-08-20 10:30:49.000000000 +0200 +++ tin-1.7.7/src/help.c 2004-11-16 14:27:27.000000000 +0100 @@ -3,7 +3,7 @@ * Module : help.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2004-02-21 + * Updated : 2004-11-16 * Notes : * * Copyright (c) 1991-2004 Iain Lea @@ -71,6 +71,8 @@ static t_help_page select_help_page[] = { txt_help_global_line_down, iKeyDown }, { txt_help_global_line_up, iKeyUp2 }, { txt_help_global_line_up, iKeyUp }, + { txt_help_global_scroll_down, iKeyScrollDown }, + { txt_help_global_scroll_up, iKeyScrollUp }, { txt_help_empty_line, 0 }, { txt_help_select_first_group, iKeyFirstPage }, { txt_help_select_last_group, iKeyLastPage }, @@ -148,6 +150,8 @@ static t_help_page group_help_page[] = { { txt_help_global_line_down, iKeyDown }, { txt_help_global_line_up, iKeyUp2 }, { txt_help_global_line_up, iKeyUp }, + { txt_help_global_scroll_down, iKeyScrollDown }, + { txt_help_global_scroll_up, iKeyScrollUp }, { txt_help_empty_line, 0 }, { txt_help_group_first_thread, iKeyFirstPage }, { txt_help_group_last_thread, iKeyLastPage }, @@ -255,6 +259,8 @@ static t_help_page thread_help_page[] = { txt_help_global_line_down, iKeyDown }, { txt_help_global_line_up, iKeyUp2 }, { txt_help_global_line_up, iKeyUp }, + { txt_help_global_scroll_down, iKeyScrollDown }, + { txt_help_global_scroll_up, iKeyScrollUp }, { txt_help_empty_line, 0 }, { txt_help_thread_first_article, iKeyFirstPage }, { txt_help_thread_last_article, iKeyLastPage }, diff -Nurp tin-1.7.6/src/inews.c tin-1.7.7/src/inews.c --- tin-1.7.6/src/inews.c 2004-08-20 10:30:49.000000000 +0200 +++ tin-1.7.7/src/inews.c 2004-12-02 18:16:03.000000000 +0100 @@ -391,7 +391,7 @@ submit_news_file( { char buf[PATH_LEN]; char *cp = buf; - char *fcc = NULL; + char *fcc; t_bool ret_code; t_bool ismail = FALSE; diff -Nurp tin-1.7.6/src/init.c tin-1.7.7/src/init.c --- tin-1.7.6/src/init.c 2004-08-20 11:55:11.000000000 +0200 +++ tin-1.7.7/src/init.c 2004-11-15 18:44:25.000000000 +0100 @@ -3,7 +3,7 @@ * Module : init.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2004-08-20 + * Updated : 2004-09-08 * Notes : * * Copyright (c) 1991-2004 Iain Lea @@ -512,7 +512,7 @@ init_selfinfo( #ifdef HAVE_SYS_UTSNAME_H # ifdef HAVE_UNAME - if (!uname(&system_info)) + if (uname(&system_info) != -1) ; else # endif /* HAVE_UNAME */ diff -Nurp tin-1.7.6/src/keymap.c tin-1.7.7/src/keymap.c --- tin-1.7.6/src/keymap.c 2004-08-20 10:30:49.000000000 +0200 +++ tin-1.7.7/src/keymap.c 2004-11-16 14:27:36.000000000 +0100 @@ -3,7 +3,7 @@ * Module : keymap.c * Author : D. Nimmich, J. Faultless * Created : 2000-05-25 - * Updated : 2003-05-14 + * Updated : 2004-11-16 * Notes : This file contains key mapping routines and variables. * * Copyright (c) 2000-2004 Dirk Nimmich @@ -43,6 +43,9 @@ #ifndef MENUKEYS_H # include "menukeys.h" #endif /* !MENUKEYS_H */ +#ifndef VERSION_H +# include "version.h" +#endif /* !VERSION_H */ static size_t keymapsize(t_keynode *ptr[]); static t_bool check_duplicates(t_keynode *keyptr1, t_keynode *keyptr2); @@ -108,6 +111,8 @@ static struct keymap Key = { { iKeyVersion, iKeyVersion, "Version" }, { iKeyPost, iKeyPost, "Post" }, { iKeyPipe, iKeyPipe, "Pipe" }, + { iKeyScrollUp, iKeyScrollUp, "ScrollUp" }, + { iKeyScrollDown, iKeyScrollDown, "ScrollDown" }, /* * The following two are "internal" keys that don't have a real * mapping. @@ -399,7 +404,7 @@ static t_keynode *keys_config_change[] = &Key.Config.Select2, &Key.Global.RedrawScr, &Key.Global.One, &Key.Global.Two, &Key.Global.Three, &Key.Global.Four, &Key.Global.Five, &Key.Global.Six, &Key.Global.Seven, &Key.Global.Eight, &Key.Global.Nine, - NULL }; + &Key.Global.ScrollUp, &Key.Global.ScrollDown, NULL }; static t_keynode *keys_feed_art_thread_regex_tag[] = { &Key.Global.Abort, &Key.Global.Quit, &Key.Feed.Art, &Key.Feed.Hot, @@ -480,7 +485,7 @@ static t_keynode *keys_group_nav[] = { &Key.Group.ToggleThdSel, &Key.Group.ReverseSel, &Key.Group.UndoSel, &Key.Group.SelPattern, &Key.Group.SelThdIfUnreadSelected, &Key.Group.MarkUnselArtRead, &Key.Group.DoAutoSel, - &Key.Global.ToggleInfoLastLine, NULL }; + &Key.Global.ToggleInfoLastLine, &Key.Global.ScrollUp, &Key.Global.ScrollDown, NULL }; static t_keynode *keys_info_nav[] = { &Key.Global.Abort, &Key.Global.MouseToggle, &Key.Global.Up, @@ -643,7 +648,8 @@ static t_keynode *keys_select_nav[] = { &Key.Select.UnsubscribePat, &Key.Global.Version, &Key.Global.Post, &Key.Global.Postponed, &Key.Global.Postponed2, &Key.Global.DisplayPostHist, &Key.Select.YankActive, &Key.Select.SyncWithActive, - &Key.Select.MarkGrpUnread, &Key.Select.MarkGrpUnread2, NULL }; + &Key.Select.MarkGrpUnread, &Key.Select.MarkGrpUnread2, + &Key.Global.ScrollUp, &Key.Global.ScrollDown, NULL }; static t_keynode *keys_thread_nav[] = { &Key.Global.Abort, &Key.Global.One, &Key.Global.Two, &Key.Global.Three, @@ -675,7 +681,7 @@ static t_keynode *keys_thread_nav[] = { &Key.Thread.MarkArtUnread, &Key.Thread.MarkThdUnread, &Key.Thread.SelArt, &Key.Thread.ToggleArtSel, &Key.Thread.ReverseSel, &Key.Thread.UndoSel, &Key.Global.Postponed, &Key.Global.Postponed2, &Key.Global.DisplayPostHist, - &Key.Global.ToggleInfoLastLine, NULL }; + &Key.Global.ToggleInfoLastLine, &Key.Global.ScrollUp, &Key.Global.ScrollDown, NULL }; t_menukeymap menukeymap = { { keys_config_change, NULL, NULL }, @@ -923,6 +929,7 @@ read_keymap_file( char buf[LEN], buff[NAME_LEN + 1]; char key; int i; + int upgrade = RC_CHECK; t_bool ret = TRUE; /* @@ -962,12 +969,18 @@ read_keymap_file( if (!fp) return TRUE; /* no keymap file is not an error */ + map = my_strdup(buf); /* remember keymap-name */ + while ((line = fgets(buf, sizeof(buf), fp)) != NULL) { /* * Ignore blank and comment lines */ - if (line[0] == '#' || line[0] == '\n') + if (line[0] == '#' || line[0] == '\n') { + if (upgrade == RC_CHECK) + upgrade = check_upgrade(line, "# Keymap file V", KEYMAP_VERSION); + continue; + } kname = strtok(line, KEYSEPS); keydef = strtok(NULL, KEYSEPS); @@ -1046,6 +1059,14 @@ read_keymap_file( } fclose(fp); + /* TODO: do something usefull */ + /* + if (upgrade != RC_IGNORE) { + upgrade_prompt_quit(upgrade, map); + } + */ + free(map); + build_keymaps(); return ret; } diff -Nurp tin-1.7.6/src/lang.c tin-1.7.7/src/lang.c --- tin-1.7.6/src/lang.c 2004-09-03 17:31:14.000000000 +0200 +++ tin-1.7.7/src/lang.c 2004-11-16 14:27:48.000000000 +0100 @@ -3,7 +3,7 @@ * Module : lang.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2004-09-03 + * Updated : 2004-11-16 * Notes : * * Copyright (c) 1991-2004 Iain Lea @@ -334,6 +334,8 @@ constext txt_help_global_quit_tin[] = N_ constext txt_help_global_redraw_screen[] = N_("redraw page"); constext txt_help_global_save[] = N_("save article/thread/hot/pattern/tagged articles to file"); constext txt_help_global_auto_save[] = N_("save marked articles automatically without user prompts"); +constext txt_help_global_scroll_down[] = N_("scroll the screen one line down"); +constext txt_help_global_scroll_up[] = N_("scroll the screen one line up"); constext txt_help_global_search_auth_backwards[] = N_("search for articles by author backwards"); constext txt_help_global_search_auth_forwards[] = N_("search for articles by author forwards"); constext txt_help_global_search_body[] = N_("search all articles for a given string (this may take some time)"); @@ -532,11 +534,13 @@ constext txt_no_responses[] = N_("No res constext txt_no_resps_in_thread[] = N_("No responses to list in current thread"); constext txt_no_search_string[] = N_("No search string"); constext txt_no_subject[] = N_("No subject"); -constext txt_no_term_clear_eol[] = N_("%s: Terminal must have clear to end-of-line (ce)\n"); -constext txt_no_term_clear_eos[] = N_("%s: Terminal must have clear to end-of-screen (cd)\n"); -constext txt_no_term_clearscreen[] = N_("%s: Terminal must have clearscreen (cl) capability\n"); -constext txt_no_term_cursor_motion[] = N_("%s: Terminal must have cursor motion (cm)\n"); -constext txt_no_term_set[] = N_("%s: TERM variable must be set to use screen capabilities\n"); +#ifndef USE_CURSES + constext txt_no_term_clear_eol[] = N_("%s: Terminal must have clear to end-of-line (ce)\n"); + constext txt_no_term_clear_eos[] = N_("%s: Terminal must have clear to end-of-screen (cd)\n"); + constext txt_no_term_clearscreen[] = N_("%s: Terminal must have clearscreen (cl) capability\n"); + constext txt_no_term_cursor_motion[] = N_("%s: Terminal must have cursor motion (cm)\n"); + constext txt_no_term_set[] = N_("%s: TERM variable must be set to use screen capabilities\n"); +#endif /* !USE_CURSES */ constext txt_no_viewer_found[] = N_("No viewer found for %s/%s\n"); constext txt_not_exist[] = N_("Newsgroup does not exist on this server"); constext txt_not_in_active_file[] = N_("Group %s not found in active file"); @@ -651,7 +655,9 @@ constext txt_saved_to[] = N_("-- %s save constext txt_saved_to_range[] = N_("-- %s saved to %s - %s --"); constext txt_saving[] = N_("Saving..."); constext txt_screen_init_failed[] = N_("%s: Screen initialization failed"); -constext txt_screen_too_small[] = N_("%s: screen is too small\n"); +#ifndef USE_CURSES + constext txt_screen_too_small[] = N_("%s: screen is too small\n"); +#endif /* !USE_CURSES */ constext txt_screen_too_small_exiting[] = N_("screen is too small, %s is exiting\n"); constext txt_search_backwards[] = N_("Search backwards [%s]> "); constext txt_search_body[] = N_("Search body [%s]> "); @@ -681,6 +687,7 @@ constext txt_suspended_message[] = N_("\ constext txt_time_default_days[] = N_("%d days"); constext txt_tab[] = N_(""); +constext txt_tex[] = N_("TeX "); constext txt_tinrc_defaults[] = N_("# Default action/prompt strings\n"); constext txt_tinrc_filter[] = N_("# Defaults for quick (1 key) kill & auto-selection filters\n\ # header=NUM 0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n\ @@ -836,14 +843,26 @@ Warning: Posting is in %s and contains c #ifdef HAVE_COLOR constext txt_help_global_toggle_color[] = N_("toggle color"); - constext txt_tinrc_colors[] = N_("# For color-adjust use the following numbers\n\ -# 0-black 1-red 2-green 3-brown\n\ -# 4-blue 5-pink 6-cyan 7-white\n\ + constext txt_tinrc_colors[] = N_("# Changing colors of several screen parts\n\ +# Possible values are:\n\ +# -1 = default (white for foreground and black for background)\n\ +# 0 = black\n\ +# 1 = red\n\ +# 2 = green\n\ +# 3 = brown\n\ +# 4 = blue\n\ +# 5 = pink\n\ +# 6 = cyan\n\ +# 7 = white\n\ # These are *only* for foreground:\n\ -# 8-gray 9-lightred 10-lightgreen 11-yellow\n\ -# 12-lightblue 13-lightpink 14-lightcyan 15-lightwhite\n\ -# A '-1' is interpreted as default (foreground normally is white, and\n\ -# background black)\n\n"); +# 8 = gray\n\ +# 9 = light red\n\ +# 10 = light green\n\ +# 11 = yellow\n\ +# 12 = light blue\n\ +# 13 = light pink\n\ +# 14 = light cyan\n\ +# 15 = light white\n\n"); constext txt_usage_toggle_color[] = N_(" -a toggle color flag"); #endif /* HAVE_COLOR */ @@ -1012,9 +1031,9 @@ Warning: The \"%s:\" line has spaces in constext txt_shell_escape[] = N_("Enter shell command [%s]> "); #endif /* !NO_SHELL_ESCAPE */ -#if defined(M_UNIX) && !defined(USE_TERMINFO) +#if !defined(USE_CURSES) && defined(M_UNIX) && !defined(USE_TERMINFO) constext txt_cannot_get_term_entry[] = N_("%s: Can't get entry for TERM\n"); -#endif /* M_UNIX && !USE_TERMINFO */ +#endif /* !USE_CURSES && M_UNIX && !USE_TERMINFO */ #if defined(HAVE_POLL) || defined(HAVE_SELECT) constext txt_group[] = N_("Group %.*s ('q' to quit)..."); @@ -1359,7 +1378,12 @@ struct opttxt txt_show_description = { struct opttxt txt_show_author = { N_("Show Subject & From (author) fields in group menu. toggles & sets."), N_("In group menu, show author by"), - N_("# Part of from field to display 0) none 1) address 2) full name 3) both\n") + N_("# Part of from field to display\n\ +# Possible values are (the default is marked with *):\n\ +# 0 = none\n\ +# 1 = address\n\ +# * 2 = full name\n\ +# 3 = both\n") }; struct opttxt txt_draw_arrow = { @@ -1377,28 +1401,51 @@ struct opttxt txt_inverse_okay = { struct opttxt txt_thread_articles = { N_(" toggles, sets, cancels."), N_("Thread articles by"), - N_("# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n\ -# 4=(Multipart Subject).\n") + N_("# Thread articles by ...\n\ +# Possible values are (the default is marked with *):\n\ +# 0 = nothing\n\ +# 1 = Subject\n\ +# 2 = References\n\ +# * 3 = Both (Subject and References)\n\ +# 4 = Multipart Subject\n") }; struct opttxt txt_thread_score = { N_(" toggles, sets, cancels."), N_("Score of a thread"), - N_("# Thread score 0=(Max) 1=(Sum) 2=(Average)\n") + N_("# Thread score\n\ +# Possible values are (the default is marked with *):\n\ +# * 0 = max\n\ +# 1 = sum\n\ +# 2 = average\n") }; struct opttxt txt_sort_article_type = { N_("Sort articles by Subject, From, Date or Score. toggles & sets."), N_("Sort articles by"), - N_("# Sort articles by 0=(nothing) 1=(Subject descend) 2=(Subject ascend)\n\ -# 3=(From descend) 4=(From ascend) 5=(Date descend) 6=(Date ascend)\n\ -# 7=(Score descend) 8=(Score ascend) 9=(Lines descend) 10=(Lines ascend).\n") + N_("# Sort articles by ...\n\ +# Possible values are (the default is marked with *):\n\ +# 0 = nothing\n\ +# 1 = Subject descending\n\ +# 2 = Subject ascending\n\ +# 3 = From descending\n\ +# 4 = From ascending\n\ +# 5 = Date descending\n\ +# * 6 = Date ascending\n\ +# 7 = Score descending\n\ +# 8 = Score ascending\n\ +# 9 = Lines descending\n\ +# 10 = Lines ascending\n") }; struct opttxt txt_sort_threads_type = { N_("Sort threads by Nothing or Score. toggles & sets."), N_("Sort threads by"), - N_("# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n") + N_("# Sort thread by ...\n\ +# Possible values are (the default is marked with *):\n\ +# 0 = nothing\n\ +# * 1 = Score descending\n\ +# 2 = Score ascending\n") }; struct opttxt txt_pos_first_unread = { @@ -1422,9 +1469,11 @@ struct opttxt txt_show_only_unread_group struct opttxt txt_kill_level = { N_(" toggles, sets, cancels."), N_("Filter which articles"), - N_("# 0=(Only kill unread articles)\n\ -# 1=(Kill all articles and show in threads marked with K)\n\ -# 2=(Kill all articles and never show them).\n") + N_("# Filter which articles\n\ +# Possible values are (the default is marked with *):\n\ +# * 0 = only kill unread articles\n\ +# 1 = kill all articles and show in threads marked with K\n\ +# 2 = kill all articles and never show them\n") }; struct opttxt txt_tab_goto_next_unread = { @@ -1526,16 +1575,23 @@ struct opttxt txt_show_info = { N_(" toggles, sets, cancels."), N_("Show lines/score in listings"), N_("# What informations should be displayed in article/thread listing\n\ -# 0 = nothing, 1 = lines, 2 = score, 3 = lines & score\n") +# Possible values are (the default is marked with *):\n\ +# 0 = nothing\n\ +# * 1 = lines\n\ +# 2 = score\n\ +# 3 = lines & score\n") }; struct opttxt txt_scroll_lines = { N_("0 = full page scrolling, -1 = show previous last line as first on next page, -2 = half page"), N_("Number of lines to scroll in pager"), N_("# Number of lines that cursor-up/down will scroll in article pager\n\ -# eg, 1+ = line-by-line, 0 = page-by-page (traditional behavior),\n\ -# -1 = the top/bottom line is carried over onto the next page,\n\ -# -2 = half-page scrolling\n") +# Possible values are (the default is marked with *):\n\ +# -2 = half-page scrolling\n\ +# -1 = the top/bottom line is carried over onto the next page\n\ +# 0 = page-by-page (traditional behavior)\n\ +# * 1 = line-by-line\n\ +# 2 or greater = scroll by 2 or more lines (only in the pager)\n") }; struct opttxt txt_show_signatures = { @@ -1548,11 +1604,12 @@ struct opttxt txt_hide_uue = { N_("Display uuencoded data as tagged attachments. toggles & sets."), N_("Display uue data as an attachment"), N_("# Handling of uuencoded data in the pager\n\ -# 0 = display raw uuencoded data\n\ -# 1 = uuencoded data will be condensed to a single tag line showing\n\ -# size and filename, similar to how MIME attachments are displayed\n\ -# 2 = as for 1, but any line that looks like uuencoded data will be folded\n\ -# into a tag line.\n") +# Possible values are (the default is marked with *):\n\ +# * 0 = no, display raw uuencoded data\n\ +# 1 = yes, uuencoded data will be condensed to a single tag line showing\n\ +# size and filename, similar to how MIME attachments are displayed\n\ +# 2 = hide all, as for 1, but any line that looks like uuencoded data will\n\ +# be folded into a tag line.\n") }; struct opttxt txt_tex2iso_conv = { @@ -1744,7 +1801,10 @@ struct opttxt txt_recent_time = { struct opttxt txt_wildcard = { N_("WILDMAT for normal wildcards, REGEX for full regular expression matching."), N_("Wildcard matching"), - N_("# Wildcard matching 0=(wildmat) 1=(regex)\n") + N_("# Wildcard matching\n\ +# Possible values are (the default is marked with *):\n\ +# * 0 = wildmat\n\ +# 1 = regex\n") }; struct opttxt txt_score_limit_kill = { @@ -1790,170 +1850,200 @@ struct opttxt txt_use_color = { struct opttxt txt_col_normal = { N_(" toggles, sets, cancels."), N_("Standard foreground color"), - N_("# Standard foreground color\n") + N_("# Standard foreground color\n\ +# Default: -1 (default color)\n") }; struct opttxt txt_col_back = { N_(" toggles, sets, cancels."), N_("Standard background color"), - N_("# Standard-Background-Color\n") + N_("# Standard background color\n\ +# Default: -1 (default color)\n") }; struct opttxt txt_col_invers_bg = { N_(" toggles, sets, cancels."), N_("Color for inverse text (background)"), - N_("# Color of background for inverse text\n") + N_("# Color of background for inverse text\n\ +# Default: 4 (blue)\n") }; struct opttxt txt_col_invers_fg = { N_(" toggles, sets, cancels."), N_("Color for inverse text (foreground)"), - N_("# Color of foreground for inverse text\n") + N_("# Color of foreground for inverse text\n\ +# Default: 7 (white)\n") }; struct opttxt txt_col_text = { N_(" toggles, sets, cancels."), N_("Color of text lines"), - N_("# Color of text-lines\n") + N_("# Color of text lines\n\ +# Default: -1 (default color)\n") }; struct opttxt txt_col_minihelp = { N_(" toggles, sets, cancels."), N_("Color of mini help menu"), - N_("# Color of mini help menu\n") + N_("# Color of mini help menu\n\ +# Default: 3 (brown)\n") }; struct opttxt txt_col_help = { N_(" toggles, sets, cancels."), N_("Color of help text"), - N_("# Color of help pages\n") + N_("# Color of help pages\n\ +# Default: -1 (default color)\n") }; struct opttxt txt_col_message = { N_(" toggles, sets, cancels."), N_("Color of status messages"), - N_("# Color of messages in last line\n") + N_("# Color of messages in last line\n\ +# Default: 6 (cyan)\n") }; struct opttxt txt_col_quote = { N_(" toggles, sets, cancels."), N_("Color of quoted lines"), - N_("# Color of quote-lines\n") + N_("# Color of quote-lines\n\ +# Default: 2 (green)\n") }; struct opttxt txt_col_quote2 = { N_(" toggles, sets, cancels."), N_("Color of twice quoted line"), - N_("# Color of twice quoted lines\n") + N_("# Color of twice quoted lines\n\ +# Default: 3 (brown)\n") }; struct opttxt txt_col_quote3 = { N_(" toggles, sets, cancels."), N_("Color of =>3 times quoted line"), - N_("# Color of >=3 times quoted lines\n") + N_("# Color of >=3 times quoted lines\n\ +# Default: 4 (blue)\n") }; struct opttxt txt_col_head = { N_(" toggles, sets, cancels."), N_("Color of article header lines"), - N_("# Color of header-lines\n") + N_("# Color of header-lines\n\ +# Default: 2 (green)\n") }; struct opttxt txt_col_newsheaders = { N_(" toggles, sets, cancels."), N_("Color of actual news header fields"), - N_("# Color of actual news header fields\n") + N_("# Color of actual news header fields\n\ +# Default: 9 (light red)\n") }; struct opttxt txt_col_subject = { N_(" toggles, sets, cancels."), N_("Color of article subject lines"), - N_("# Color of article subject\n") + N_("# Color of article subject\n\ +# Default: 6 (cyan)\n") }; struct opttxt txt_col_response = { N_(" toggles, sets, cancels."), N_("Color of response counter"), - N_("# Color of response counter\n") + N_("# Color of response counter\n\ +# Default: 2 (green)\n") }; struct opttxt txt_col_from = { N_(" toggles, sets, cancels."), N_("Color of sender (From:)"), - N_("# Color of sender (From:)\n") + N_("# Color of sender (From:)\n\ +# Default: 2 (green)\n") }; struct opttxt txt_col_title = { N_(" toggles, sets, cancels."), N_("Color of help/mail sign"), - N_("# Color of Help/Mail-Sign\n") + N_("# Color of Help/Mail-Sign\n\ +# Default: 4 (blue)\n") }; struct opttxt txt_col_signature = { N_(" toggles, sets, cancels."), N_("Color of signatures"), - N_("# Color of signature\n") + N_("# Color of signature\n\ +# Default: 4 (blue)\n") }; struct opttxt txt_col_urls = { N_(" toggles, sets, cancels."), N_("Color of highlighted URLs"), - N_("# Color of highlighted URLs\n") + N_("# Color of highlighted URLs\n\ +# Default: -1 (default color)\n") }; struct opttxt txt_col_markstar = { N_(" toggles, sets, cancels."), N_("Color of highlighting with *stars*"), - N_("# Color of word highlighting. There are four possibilities\n\ -# in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n") + N_("# Color of word highlighting with *stars*\n\ +# Default: 11 (yellow)\n") }; struct opttxt txt_col_markdash = { N_(" toggles, sets, cancels."), N_("Color of highlighting with _dash_"), - "" + N_("# Color of word highlighting with _dash_\n\ +# Default: 13 (light pink)\n") }; struct opttxt txt_col_markslash = { N_(" toggles, sets, cancels."), N_("Color of highlighting with /slash/"), - "" + N_("# Color of word highlighting with /slash/\n\ +# Default: 14 (light cyan)\n") }; struct opttxt txt_col_markstroke = { N_(" toggles, sets, cancels."), N_("Color of highlighting with -stroke-"), - "" + N_("# Color of word highlighting with -stroke-\n\ +# Default: 12 (light blue)\n") }; #endif /* HAVE_COLOR */ struct opttxt txt_mono_markstar = { N_(" toggles, sets, cancels."), N_("Attr. of highlighting with *stars*"), - N_("# Attribute of word highlighting on mono terminals.\n\ -# There are four possibilities in articles:\n\ -# *stars*, /slashes/, _underdashes_ and -strokes-.\n\ -# The possible values are:\n\ -# 0 - Normal, 1 - Underline, 2 - Best highlighting,\n\ -# 3 - Reverse video, 4 - Blinking, 5 - Half bright, 6 - Bold\n") + N_("# Attributes of word highlighting on mono terminals\n\ +# Possible values are:\n\ +# 0 = Normal\n\ +# 1 = Underline\n\ +# 2 = Best highlighting\n\ +# 3 = Reverse video\n\ +# 4 = Blinking\n\ +# 5 = Half bright\n\ +# 6 = Bold\n\n\ +# Attribute of word highlighting with *stars*\n\ +# Default: 6 (bold)\n") }; struct opttxt txt_mono_markdash = { N_(" toggles, sets, cancels."), N_("Attr. of highlighting with _dash_"), - "" + N_("# Attribute of word highlighting with _dash_\n\ +# Default: 2 (best highlighting)\n") }; struct opttxt txt_mono_markslash = { N_(" toggles, sets, cancels."), N_("Attr. of highlighting with /slash/"), - "" + N_("# Attribute of word highlighting with /slash/\n\ +# Default: 5 (half bright)\n") }; struct opttxt txt_mono_markstroke = { N_(" toggles, sets, cancels."), N_("Attr. of highlighting with -stroke-"), - "" + N_("# Attribute of word highlighting with -stroke-\n\ +# Default: 3 (reverse video)\n") }; struct opttxt txt_url_highlight = { @@ -1973,7 +2063,10 @@ struct opttxt txt_word_h_display_marks = N_("What to display instead of mark"), N_("# Should the leading and ending stars and dashes also be displayed,\n\ # even when they are highlighting marks?\n\ -# 0 - no 1 - yes, display mark 2 - print a space instead\n") +# Possible values are (the default is marked with *):\n\ +# 0 = no\n\ +# 1 = yes, display mark\n\ +# * 2 = print a space instead\n") }; struct opttxt txt_wrap_column = { @@ -2032,14 +2125,15 @@ struct opttxt txt_quote_style = { N_(" toggles, sets, cancels."), N_("Quoting behavior"), N_("# How quoting should be handled when following up or replying.\n\ -# 0 = Nothing special\n\ -# 1 = Compress quotes\n\ -# 2 = Quote signatures\n\ -# 3 = Compress quotes, quote signatures\n\ -# 4 = Quote empty lines\n\ -# 5 = Compress quotes, quote empty lines\n\ -# 6 = Quote signatures, quote empty lines\n\ -# 7 = Compress quotes, quote signatures, quote empty lines\n") +# Possible values are (the default is marked with *):\n\ +# 0 = Nothing special\n\ +# 1 = Compress quotes\n\ +# 2 = Quote signatures\n\ +# 3 = Compress quotes, quote signatures\n\ +# 4 = Quote empty lines\n\ +# * 5 = Compress quotes, quote empty lines\n\ +# 6 = Quote signatures, quote empty lines\n\ +# 7 = Compress quotes, quote signatures, quote empty lines\n") }; struct opttxt txt_news_quote_format = { @@ -2218,7 +2312,10 @@ struct opttxt txt_post_process = { N_("Do post processing (eg. extract attachments) for saved articles."), N_("Post process saved articles"), N_("# Perform post processing (saving binary attachments) from saved articles.\n\ -# 0=(no) 1=(yes) 2=(extract shell archives (shar) only)\n") +# Possible values are (the default is marked with *):\n\ +# * 0 = no\n\ +# 1 = extract shell archives (shar) only\n\ +# 2 = yes\n") }; struct opttxt txt_process_only_unread = { @@ -2279,10 +2376,11 @@ struct opttxt txt_mailer_format = { struct opttxt txt_interactive_mailer = { N_(" toggles, sets, cancels."), N_("Use interactive mail reader"), - N_("# Interactive mailreader:\n\ -# 0 = no interactive mailreader\n\ -# 1 = use interactive mailreader with headers in file\n\ -# 2 = use interactive mailreader without headers in file\n") + N_("# Interactive mailreader\n\ +# Possible values are (the default is marked with *):\n\ +# * 0 = no interactive mailreader\n\ +# 1 = use interactive mailreader with headers in file\n\ +# 2 = use interactive mailreader without headers in file\n") }; struct opttxt txt_unlink_article = { @@ -2313,7 +2411,11 @@ struct opttxt txt_strip_newsrc = { struct opttxt txt_strip_bogus = { N_(" toggles, sets, cancels."), N_("Remove bogus groups from newsrc"), - N_("# What to do with bogus groups in newsrc file\n# 0=(Keep) 1=(Remove) 2=(Highlight with D on selection screen).\n") + N_("# What to do with bogus groups in newsrc file\n\ +# Possible values are (the default is marked with *):\n\ +# * 0 = keep\n\ +# 1 = remove\n\ +# 2 = highlight with D on selection screen\n") }; struct opttxt txt_reread_active_file_secs = { @@ -2345,7 +2447,12 @@ struct opttxt txt_normalization_form = { N_(" toggles, sets, cancels."), N_("Unicode normalization form"), N_("# Unicode normalization form\n\ -# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n") +# Possible values are (the default is marked with *):\n\ +# 0 = None\n\ +# * 1 = NFKC\n\ +# 2 = NFKD\n\ +# 3 = NFC\n\ +# 4 = NFD\n") }; #endif /* HAVE_UNICODE_NORMALIZATION */ #if defined(HAVE_LIBICUUC) && defined(MULTIBYTE_ABLE) && defined(HAVE_UNICODE_UBIDI_H) && !defined(NO_LOCALE) diff -Nurp tin-1.7.6/src/misc.c tin-1.7.7/src/misc.c --- tin-1.7.6/src/misc.c 2004-08-20 10:51:50.000000000 +0200 +++ tin-1.7.7/src/misc.c 2004-11-15 18:44:25.000000000 +0100 @@ -3,7 +3,7 @@ * Module : misc.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-08-20 + * Updated : 2004-09-14 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -911,6 +911,8 @@ dir_name( /* * Return TRUE if new mail has arrived + * + * TODO: why not cache the mailbox_name? */ t_bool mail_check( @@ -3753,6 +3755,8 @@ tin_version_info( wlines++; # endif /* TIN_LIBS */ #endif /* TIN_LD */ + fprintf(fp, "\tPCRE = \"%s\"\n", pcre_version()); + wlines++; fprintf(fp, "Characteristics:\n\t" /* TODO: complete list and do some useful grouping */ diff -Nurp tin-1.7.6/src/newsrc.c tin-1.7.7/src/newsrc.c --- tin-1.7.6/src/newsrc.c 2004-08-20 10:30:49.000000000 +0200 +++ tin-1.7.7/src/newsrc.c 2004-11-16 14:28:40.000000000 +0100 @@ -3,7 +3,7 @@ * Module : newsrc.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-03-14 + * Updated : 2004-11-16 * Notes : ArtCount = (ArtMax - ArtMin) + 1 [could have holes] * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -682,10 +682,7 @@ grp_mark_unread( if (group->xmin > 0) group->newsrc.xmin = group->xmin; - bitlength = (group->newsrc.xmax - group->newsrc.xmin) + 1; - - if (bitlength < 0) - bitlength = 0; + bitlength = MAX(0, group->newsrc.xmax - group->newsrc.xmin + 1); if (bitlength > 0) newbitmap = my_malloc(BITS_TO_BYTES(bitlength)); diff -Nurp tin-1.7.6/src/nntplib.c tin-1.7.7/src/nntplib.c --- tin-1.7.6/src/nntplib.c 2004-08-20 10:30:49.000000000 +0200 +++ tin-1.7.7/src/nntplib.c 2004-11-15 18:44:25.000000000 +0100 @@ -335,7 +335,7 @@ get_tcp_socket( else strcpy(device, "/dev/tcp"); - if ((s = t_open(device, O_RDWR, (struct t_info *) 0)) < 0){ + if ((s = t_open(device, O_RDWR, (struct t_info *) 0)) < 0) { t_error(txt_error_topen); return -EPROTO; } @@ -369,7 +369,7 @@ get_tcp_socket( * Allocate a t_call structure and initialize it. * Let t_alloc() initialize the addr structure of the t_call structure. */ - if ((callptr = (struct t_call *) t_alloc(s, T_CALL, T_ADDR)) == NULL){ + if ((callptr = (struct t_call *) t_alloc(s, T_CALL, T_ADDR)) == NULL) { t_error("t_alloc"); t_close(s); return -EPROTO; diff -Nurp tin-1.7.6/src/options_menu.c tin-1.7.7/src/options_menu.c --- tin-1.7.6/src/options_menu.c 2004-09-05 16:19:25.000000000 +0200 +++ tin-1.7.7/src/options_menu.c 2004-11-16 14:27:59.000000000 +0100 @@ -3,7 +3,7 @@ * Module : options_menu.c * Author : Michael Bienia * Created : 2004-09-05 - * Updated : 2004-09-05 + * Updated : 2004-11-16 * Notes : Split from config.c * * Copyright (c) 2004 Michael Bienia @@ -57,6 +57,8 @@ static enum option_enum first_option_on_ */ static enum option_enum move_cursor(enum option_enum cur_option, t_bool down); static enum option_enum next_option(enum option_enum option, t_bool incl_titles); +static enum option_enum opt_scroll_down(enum option_enum option); +static enum option_enum opt_scroll_up(enum option_enum option); static enum option_enum prev_option(enum option_enum option, t_bool incl_titles); static enum option_enum set_option_num(int num); static int get_option_num(enum option_enum option); @@ -138,6 +140,7 @@ option_is_visible( int option) { switch (option) { +#ifdef HAVE_COLOR case OPT_COL_BACK: case OPT_COL_FROM: case OPT_COL_HEAD: @@ -164,6 +167,7 @@ option_is_visible( case OPT_COL_MARKSLASH: case OPT_COL_MARKSTROKE: return tinrc.word_highlight && tinrc.use_color; +#endif /* HAVE_COLOR */ case OPT_WORD_H_DISPLAY_MARKS: case OPT_MONO_MARKSTAR: @@ -220,46 +224,33 @@ fmt_option_prompt( int num = get_option_num(option); #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) if (wbuf != NULL) { - wbuf2 = my_malloc(sizeof(wchar_t) * (option_width + 1)); - wstrunc(wbuf, wbuf2, option_width + 1, option_width); - + wbuf2 = wstrunc(wbuf, option_width); if ((buf = wchar_t2char(wbuf2)) == NULL) { /* conversion failed, truncate original string */ - buf = my_malloc(option_width + 1); - strunc(_(option_table[option].txt->opt), buf, option_width + 1, option_width); + buf = strunc(_(option_table[option].txt->opt), option_width); snprintf(dst, len, "%s %3d. %-*.*s: ", editing ? "->" : " ", num, (int) option_width, (int) option_width, buf); - } else { + } else snprintf(dst, len, "%s %3d. %-*.*s: ", editing ? "->" : " ", num, (int) (strlen(buf) + option_width - wcswidth(wbuf2, option_width + 1)), (int) (strlen(buf) + option_width - wcswidth(wbuf2, option_width + 1)), buf); - } free(wbuf2); } else #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ { /* truncate original string */ - buf = my_malloc(option_width + 1); - strunc(_(option_table[option].txt->opt), buf, option_width + 1, option_width); + buf = strunc(_(option_table[option].txt->opt), option_width); snprintf(dst, len, "%s %3d. %-*.*s: ", editing ? "->" : " ", num, (int) option_width, (int) option_width, buf); } } else { #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) if (wbuf != NULL) { - wbuf2 = my_malloc(sizeof(wchar_t) * (cCOLS - 3 + 1)); - wstrunc(wbuf, wbuf2, cCOLS - 3 + 1, cCOLS - 3); - if ((buf = wchar_t2char(wbuf2)) == NULL) { - /* conversion failed, truncate original string */ - buf = my_malloc(cCOLS - 3 + 1); - strunc(_(option_table[option].txt->opt), buf, cCOLS - 3 + 1, cCOLS - 3); - } + wbuf2 = wstrunc(wbuf, cCOLS - 3); + if ((buf = wchar_t2char(wbuf2)) == NULL) /* conversion failed, truncate original string */ + buf = strunc(_(option_table[option].txt->opt), cCOLS - 3); free(wbuf2); } else #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ - { - /* truncate original string */ - buf = my_malloc(cCOLS - 3 + 1); - strunc(_(option_table[option].txt->opt), buf, cCOLS - 3 + 1, cCOLS - 3); - } + buf = strunc(_(option_table[option].txt->opt), cCOLS - 3); /* truncate original string */ snprintf(dst, len, " %s", buf); } @@ -411,6 +402,76 @@ move_cursor( /* + * scroll the screen one line down + * the selected option is only moved if it is scrolled off the screen + */ +static enum option_enum +opt_scroll_down( + enum option_enum option) +{ + if (last_option_on_screen < LAST_OPT) { + first_option_on_screen = next_option(first_option_on_screen, TRUE); + set_last_option_on_screen(first_option_on_screen); +#ifdef USE_CURSES + do_scroll(1); + print_any_option(last_option_on_screen); + stow_cursor(); +#else + show_config_page(); +#endif /* USE_CURSES */ + if (option < first_option_on_screen) { + option = first_option_on_screen; + if (option_is_title(option)) + option = next_option(option, FALSE); +#ifdef USE_CURSES + highlight_option(option); +#endif /* USE_CURSES */ + } +#ifndef USE_CURSES + /* in the !USE_CURSES case we must always highlight the option */ + highlight_option(option); +#endif /* !USE_CURSES */ + } + return option; +} + + +/* + * scroll the screen one line up + * the selected option is only moved if it is scrolled off the screen + */ +static enum option_enum +opt_scroll_up( + enum option_enum option) +{ + if (first_option_on_screen > 0) { + first_option_on_screen = prev_option(first_option_on_screen, TRUE); + set_last_option_on_screen(first_option_on_screen); +#ifdef USE_CURSES + do_scroll(-1); + print_any_option(first_option_on_screen); + stow_cursor(); +#else + show_config_page(); +#endif /* USE_CURSES */ + if (option > last_option_on_screen) { + option = last_option_on_screen; + if (option_is_title(option)) + option = prev_option(option, FALSE); +#ifdef USE_CURSES + highlight_option(option); +#endif /* USE_CURSES */ + } +#ifndef USE_CURSES + /* in the !USE_CURSES case we must always highlight the option */ + highlight_option(option); +#endif /* !USE_CURSES */ + } + return option; +} + + +/* * returns the next visible option * if 'incl_titles' is TRUE titles are also returned else they are skipped */ @@ -506,7 +567,7 @@ unhighlight_option( { /* Astonishing hack */ t_menu *savemenu = currmenu; - t_menu cfgmenu = { 0, 1, 0, 0, NULL, NULL }; + t_menu cfgmenu = { 0, 1, 0, NULL, NULL, NULL }; currmenu = &cfgmenu; currmenu->curr = option_row(option) - INDEX_TOP; @@ -526,11 +587,10 @@ refresh_config_page( int act_option) { static int last_option = 0; - t_bool force_redraw = FALSE; + /* t_bool force_redraw = FALSE; */ - if (act_option < 0) { - /* called by signal handler */ - force_redraw = TRUE; + if (act_option < 0) { /* called by signal handler */ + /* force_redraw = TRUE; */ act_option = last_option; set_last_option_on_screen(first_option_on_screen); /* terminal size may have changed */ if (!option_on_page(last_option)) { @@ -580,13 +640,12 @@ show_config_page( center_line(0, TRUE, _(txt_options_menu)); for (i = first_option_on_screen; i <= last_option_on_screen; i++) { - while(!option_is_visible(i)) + while (!option_is_visible(i)) i++; if (i > LAST_OPT) break; print_any_option(i); } - CleartoEOS(); show_menu_help(txt_select_config_file_option); my_flush(); @@ -743,7 +802,10 @@ change_config_file( last_option_on_screen = prev_option(first_option_on_screen, TRUE); set_first_option_on_screen(last_option_on_screen); - option = first_option_on_screen; + if (last_option_on_screen == LAST_OPT) + option = last_option_on_screen; + else + option = first_option_on_screen; if (option_is_title(option)) option = next_option(option, FALSE); redraw_screen(option); @@ -754,26 +816,48 @@ change_config_file( case iKeyPageDown2: case iKeyPageDown3: unhighlight_option(option); - if (tinrc.scroll_lines == -2 ) { - int i = option_lines_per_page / 2; + if (option == LAST_OPT) { + /* wrap around */ + first_option_on_screen = 0; + option = 0; + } else { + enum option_enum old_first = first_option_on_screen; + + if (tinrc.scroll_lines == -2) { + int i = option_lines_per_page / 2; + + for (; i > 0; i--) { + first_option_on_screen = next_option(first_option_on_screen, TRUE); + if (first_option_on_screen == 0) /* end on wrap_around */ + break; + } + } else + first_option_on_screen = next_option(last_option_on_screen, TRUE); - for (; i > 0; i--) { - first_option_on_screen = next_option(first_option_on_screen, TRUE); - if (first_option_on_screen == 0) /* end on wrap_around */ - break; - } - } else - first_option_on_screen = next_option(last_option_on_screen, TRUE); + if (first_option_on_screen == 0) { + first_option_on_screen = old_first; + option = LAST_OPT; + highlight_option(option); + break; + } else + option = first_option_on_screen; + } set_last_option_on_screen(first_option_on_screen); - option = first_option_on_screen; if (option_is_title(option)) option = next_option(option, FALSE); - redraw_screen(option); /* highlight_option(option); is already done by redraw_screen() */ break; + case iKeyScrollUp: + option = opt_scroll_up(option); + break; + + case iKeyScrollDown: + option = opt_scroll_down(option); + break; + case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': unhighlight_option(option); @@ -811,6 +895,7 @@ change_config_file( break; case iKeyRedrawScr: /* redraw screen */ + set_last_option_on_screen(first_option_on_screen); redraw_screen(option); break; diff -Nurp tin-1.7.6/src/page.c tin-1.7.7/src/page.c --- tin-1.7.6/src/page.c 2004-08-20 10:30:49.000000000 +0200 +++ tin-1.7.7/src/page.c 2004-12-01 16:21:53.000000000 +0100 @@ -3,7 +3,7 @@ * Module : page.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-06-07 + * Updated : 2004-10-17 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -340,7 +340,7 @@ show_page( int old_sort_art_type = tinrc.sort_article_type; int art_type = GROUP_TYPE_NEWS; t_bool mouse_click_on = TRUE; - t_bool repeat_search = FALSE; + t_bool repeat_search; filtered_articles = FALSE; /* used in thread level */ @@ -366,8 +366,7 @@ show_page( if ((ch = handle_pager_keypad(&menukeymap.page_nav)) == iKeySearchRepeat) { ch = i_key_search_last; repeat_search = TRUE; - } - else + } else repeat_search = FALSE; switch (ch) { @@ -1287,12 +1286,12 @@ draw_page_header( char *buf; int i; int whichresp, x_resp; - int right_len, center_pos; - size_t len, line_len; + int len, right_len, center_pos, cur_pos; + size_t line_len; #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - wchar_t *fmt_resp, *fmt_thread, *line, *wbuf, *wtmp; + wchar_t *fmt_resp, *fmt_thread, *wtmp, *wtmp2; #else - char *line, *tmp; + char *tmp; #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ whichresp = which_response(this_resp); @@ -1307,10 +1306,6 @@ draw_page_header( } #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - line = my_malloc(line_len * sizeof(wchar_t)); - wbuf = my_malloc(line_len * sizeof(wchar_t)); - wtmp = my_malloc(line_len * sizeof(wchar_t)); - /* convert to wide-char format strings */ fmt_thread = char2wchar_t(_(txt_thread_x_of_n)); fmt_resp = char2wchar_t(_(txt_resp_x_of_n)); @@ -1328,65 +1323,59 @@ draw_page_header( right_len = wcswidth(fmt_resp, wcslen(fmt_resp)) - 6 + 8; else right_len = 0; + FreeIfNeeded(fmt_thread); + FreeIfNeeded(fmt_resp); /* * first line */ - /* date */ - if (mbstowcs(wbuf, buf, line_len) == (size_t) (-1)) - wbuf[0] = (wchar_t) '\0'; /* conversion failed */ - else - wbuf[line_len - 1] = (wchar_t) '\0'; + cur_pos = 0; - wcsncpy(line, wbuf, line_len); - line[line_len - 1] = (wchar_t) '\0'; +# ifdef HAVE_COLOR + fcol(tinrc.col_head); +# endif /* HAVE_COLOR */ + + /* date */ + if ((wtmp = char2wchar_t(buf)) != NULL) { + my_fputws(wtmp, stdout); + cur_pos += wcswidth(wtmp, wcslen(wtmp)); + free(wtmp); + } /* * determine max len for centered group name * allow one space before and after group name */ - len = cCOLS - 2 * MAX(wcswidth(wbuf, line_len), right_len) - 3; + len = cCOLS - 2 * MAX(cur_pos, right_len) - 3; /* group name */ - if (mbstowcs(wbuf, group, line_len) == (size_t) (-1)) - wbuf[0] = (wchar_t) '\0'; /* conversion failed */ - else - wbuf[line_len - 1] = (wchar_t) '\0'; - - if ((i = wcswidth(wbuf, line_len)) < (int) len) - len = i; - - center_pos = (cCOLS - len) / 2; - - /* pad out to left */ - wtmp[0] = (wchar_t) ' '; - wtmp[1] = (wchar_t) '\0'; - while (wcswidth(line, line_len) < center_pos && wcslen(line) < line_len - 1) - wcscat(line, wtmp); - - wcsncat(line, wstrunc(wbuf, wtmp, line_len, len), line_len - wcslen(line) - 1); + if ((wtmp = char2wchar_t(group)) != NULL) { + /* wconvert_to_printable(wtmp); */ + if ((i = wcswidth(wtmp, wcslen(wtmp))) < len) + len = i; + + center_pos = (cCOLS - len) / 2; + + /* pad out to left */ + for (; cur_pos < center_pos; cur_pos++) + my_fputc(' ', stdout); + + wtmp2 = wstrunc(wtmp, len); + my_fputws(wtmp2, stdout); + cur_pos += wcswidth(wtmp2, wcslen(wtmp2)); + free(wtmp2); + free(wtmp); + } /* pad out to right */ - wtmp[0] = (wchar_t) ' '; - wtmp[1] = (wchar_t) '\0'; - while (wcswidth(line, line_len) < cCOLS - right_len - 1 && wcslen(line) < line_len - 1) - wcscat(line, wtmp); + for (; cur_pos < cCOLS - right_len - 1; cur_pos++) + my_fputc(' ', stdout); /* thread info */ /* can't eval tin_ltoa() more than once in a statement due to statics */ - if (fmt_thread) { - strcpy(buf, tin_ltoa(which_thread(this_resp) + 1, 4)); - swprintf(wbuf, line_len, fmt_thread, buf, tin_ltoa(grpmenu.max, 4)); - } else - wbuf[0] = (wchar_t) '\0'; - - wcsncat(line, wbuf, line_len - wcslen(line) - 1); - -# ifdef HAVE_COLOR - fcol(tinrc.col_head); -# endif /* HAVE_COLOR */ + strcpy(buf, tin_ltoa(which_thread(this_resp) + 1, 4)); + my_printf(_(txt_thread_x_of_n), buf, tin_ltoa(grpmenu.max, 4)); - my_fputws(line, stdout); my_fputs(cCRLF, stdout); # if 0 @@ -1397,6 +1386,12 @@ draw_page_header( /* * second line */ + cur_pos = 0; + +# ifdef HAVE_COLOR + fcol(tinrc.col_head); +# endif /* HAVE_COLOR */ + /* line count */ if (arts[this_resp].line_count < 0) strcpy(buf, "?"); @@ -1407,29 +1402,25 @@ draw_page_header( wchar_t *fmt; if ((fmt = char2wchar_t(_(txt_lines))) != NULL) { - swprintf(wbuf, line_len, fmt, buf); + wtmp = my_malloc(sizeof(wchar_t) * line_len); + swprintf(wtmp, line_len, fmt, buf); + my_fputws(wtmp, stdout); + cur_pos += wcswidth(wtmp, wcslen(wtmp)); free(fmt); - } else - wbuf[0] = (wchar_t) '\0'; + free(wtmp); + } } - len = wcswidth(wbuf, line_len); - -# ifdef HAVE_COLOR - fcol(tinrc.col_head); -# endif /* HAVE_COLOR */ - - my_fputws(wbuf, stdout); - # ifdef HAVE_COLOR fcol(tinrc.col_subject); # endif /* HAVE_COLOR */ /* tex2iso */ if (pgart.tex2iso) { - mbstowcs(wtmp, "TeX ", line_len); /* TODO: -> lang.c */ - len += wcswidth(wtmp, line_len); + wtmp = char2wchar_t(_(txt_tex)); my_fputws(wtmp, stdout); + cur_pos += wcswidth(wtmp, wcslen(wtmp)); + free(wtmp); } /* subject */ @@ -1440,51 +1431,34 @@ draw_page_header( */ strncpy(buf, (note_h->subj ? note_h->subj : arts[this_resp].subject), line_len); buf[line_len - 1] = '\0'; - if (mbstowcs(wtmp, buf, line_len) == (size_t) (-1)) - wtmp[0] = (wchar_t) '\0'; /* conversion failed */ - else - wtmp[line_len - 1] = (wchar_t) '\0'; - if (wcswidth(wtmp, line_len) > cCOLS - 2 * right_len - 3) - wstrunc(wtmp, wbuf, line_len, cCOLS - 2 * right_len - 3); - else - wcscpy(wbuf, wtmp); - - center_pos = (cCOLS - wcswidth(wbuf, line_len)) / 2; + if ((wtmp = char2wchar_t(buf)) != NULL) { + wtmp2 = wstrunc(wtmp, cCOLS - 2 * right_len - 3); - /* pad out to left */ - line[0] = (wchar_t) '\0'; - wtmp[0] = (wchar_t) ' '; - wtmp[1] = (wchar_t) '\0'; - while (wcswidth(line, line_len) < center_pos - (int) len && wcslen(line) < line_len - 1) - wcscat(line, wtmp); + center_pos = (cCOLS - wcswidth(wtmp2, wcslen(wtmp2))) / 2; - len += wcswidth(line, line_len); - my_fputws(line, stdout); + /* pad out to left */ + for (; cur_pos < center_pos; cur_pos++) + my_fputc(' ', stdout); - StartInverse(); - my_fputws(wbuf, stdout); - EndInverse(); - len += wcswidth(wbuf, line_len); + StartInverse(); + my_fputws(wtmp2, stdout); + EndInverse(); + cur_pos += wcswidth(wtmp2, wcslen(wtmp2)); + free(wtmp2); + free(wtmp); + } # ifdef HAVE_COLOR fcol(tinrc.col_response); # endif /* HAVE_COLOR */ /* pad out to right */ - line[0] = (wchar_t) '\0'; - wtmp[0] = (wchar_t) ' '; - wtmp[1] = (wchar_t) '\0'; - while (wcswidth(line, line_len) < cCOLS - right_len - (int) len - 1 && wcslen(line) < line_len - 1) - wcscat(line, wtmp); - - my_fputws(line, stdout); - - if (whichresp) { - if (fmt_resp) { - swprintf(line, line_len, fmt_resp, whichresp, x_resp); - my_fputws(line, stdout); - } - } else { + for (; cur_pos < cCOLS - right_len - 1; cur_pos++) + my_fputc(' ', stdout); + + if (whichresp) + my_printf(_(txt_resp_x_of_n), whichresp, x_resp); + else { if (!x_resp) my_printf(_(txt_no_responses)); else if (x_resp == 1) @@ -1497,6 +1471,11 @@ draw_page_header( /* * third line */ + cur_pos = 0; + +# ifdef HAVE_COLOR + fcol(tinrc.col_from); +# endif /* HAVE_COLOR */ /* from */ /* * TODO: don't use arts[this_resp].name/arts[this_resp].from @@ -1515,52 +1494,42 @@ draw_page_header( free(p); } - if (mbstowcs(wbuf, buf, line_len) == (size_t) (-1)) - line[0] = (wchar_t) '\0'; - wstrunc(wbuf, line, line_len, cCOLS - 1); + if ((wtmp = char2wchar_t(buf)) != NULL) { + wtmp2 = wstrunc(wtmp, cCOLS - 1); + my_fputws(wtmp2, stdout); + cur_pos += wcswidth(wtmp2, wcslen(wtmp2)); + free(wtmp2); + free(wtmp); + } /* organization */ - if (note_h->org) { + if ((wtmp = char2wchar_t(_(txt_at_s))) != NULL) { + len = wcswidth(wtmp, wcslen(wtmp)); + free(wtmp); + } else + len = 0; + if (note_h->org && cCOLS - cur_pos - 1 >= len - 2 + 3) { + /* we have enough space to print at least " at ..." */ snprintf(buf, line_len, _(txt_at_s), note_h->org); - if (mbstowcs(wbuf, buf, line_len) == (size_t) (-1)) - wbuf[0] = (wchar_t) '\0'; - - if (wcswidth(line, line_len) + wcswidth(wbuf, line_len) >= cCOLS - 1) { - wcsncat(line, wbuf, line_len - wcslen(line) - 1); - wcscpy(wbuf, line); - wstrunc(wbuf, line, line_len, cCOLS - 1); - } else { - i = cCOLS - 1 - wcswidth(wbuf, line_len); - - wtmp[0] = (wchar_t) ' '; - wtmp[1] = (wchar_t) '\0'; - while (wcswidth(line, line_len) < i && wcslen(line) < line_len - 1) - wcscat(line, wtmp); - wcsncat(line, wbuf, line_len - wcslen(line) - 1); + if ((wtmp = char2wchar_t(buf)) != NULL) { + wconvert_to_printable(wtmp); + wtmp2 = wstrunc(wtmp, cCOLS - cur_pos - 1); + + i = cCOLS - wcswidth(wtmp2, wcslen(wtmp2)) - 1; + for (; cur_pos < i; cur_pos++) + my_fputc(' ', stdout); + + my_fputws(wtmp2, stdout); + free(wtmp2); + free(wtmp); } } -# ifdef HAVE_COLOR - fcol(tinrc.col_from); -# endif /* HAVE_COLOR */ - - my_fputws(line, stdout); my_fputs(cCRLF, stdout); my_fputs(cCRLF, stdout); - /* clean up */ - free(line); - free(wbuf); - free(wtmp); - FreeIfNeeded(fmt_thread); - FreeIfNeeded(fmt_resp); - #else /* !MULTIBYTE_ABLE || NO_LOCALE */ - - line = my_malloc(line_len); - tmp = my_malloc(line_len); - /* * determine the needed space for the text at the right hand margin * the formating info (%4s) needs 3 positions but we need 4 positions @@ -1571,46 +1540,46 @@ draw_page_header( /* * first line */ + cur_pos = 0; + +# ifdef HAVE_COLOR + fcol(tinrc.col_head); +# endif /* HAVE_COLOR */ + /* date */ - strncpy(line, buf, line_len); - line[line_len - 1] = '\0'; + my_fputs(buf, stdout); + cur_pos += strlen(buf); /* * determine max len for centered group name * allow one space before and after group name */ - len = cCOLS - 2 * MAX((int) strlen(buf), right_len) - 3; + len = cCOLS - 2 * MAX(cur_pos, right_len) - 3; /* group name */ - if ((i = strlen(group)) < (int) len) + if ((i = strlen(group)) < len) len = i; center_pos = (cCOLS - len) / 2; /* pad out to left */ - for (i = strlen(line); i < center_pos && i < (int) line_len - 1; i++) - line[i] = ' '; - line[i] = '\0'; + for (; cur_pos < center_pos; cur_pos++) + my_fputc(' ', stdout); - strunc(group, line + i, line_len - i, len); + tmp = strunc(group, len); + my_fputs(tmp, stdout); + cur_pos += strlen(tmp); + free(tmp); /* pad out to right */ - for (i = strlen(line); i < cCOLS - right_len - 1 && i < (int) line_len - 1; i++) - line[i] = ' '; - line[i] = '\0'; + for (; cur_pos < cCOLS - right_len - 1; cur_pos++) + my_fputc(' ', stdout); /* thread info */ /* can't eval tin_ltoa() more than once in a statement due to statics */ - strcpy(tmp, tin_ltoa(which_thread(this_resp) + 1, 4)); - snprintf(buf, line_len, _(txt_thread_x_of_n), tmp, tin_ltoa(grpmenu.max, 4)); - - strncat(line, buf, line_len - strlen(line) - 1); - -# ifdef HAVE_COLOR - fcol(tinrc.col_head); -# endif /* HAVE_COLOR */ + strcpy(buf, tin_ltoa(which_thread(this_resp) + 1, 4)); + my_printf(_(txt_thread_x_of_n), buf, tin_ltoa(grpmenu.max, 4)); - my_fputs(line, stdout); my_fputs(cCRLF, stdout); # if 0 @@ -1621,6 +1590,12 @@ draw_page_header( /* * second line */ + cur_pos = 0; + +# ifdef HAVE_COLOR + fcol(tinrc.col_head); +# endif /* HAVE_COLOR */ + /* line count */ /* an accurate line count will appear in the footer anymay */ if (arts[this_resp].line_count < 0) @@ -1628,15 +1603,11 @@ draw_page_header( else snprintf(buf, line_len, "%-4d", arts[this_resp].line_count); - snprintf(line, line_len, _(txt_lines), buf); - - len = strlen(line); - -# ifdef HAVE_COLOR - fcol(tinrc.col_head); -# endif /* HAVE_COLOR */ - - my_fputs(line, stdout); + tmp = my_malloc(line_len); + snprintf(tmp, line_len, _(txt_lines), buf); + my_fputs(tmp, stdout); + cur_pos += strlen(tmp); + free(tmp); # ifdef HAVE_COLOR fcol(tinrc.col_subject); @@ -1644,9 +1615,8 @@ draw_page_header( /* tex2iso */ if (pgart.tex2iso) { - strcpy(buf, "TeX "); /* TODO: -> lang.c */ - len += strlen(buf); - my_fputs(buf, stdout); + my_fputs(_(txt_tex), stdout); + cur_pos += strlen(_(txt_tex)); } /* subject */ @@ -1658,39 +1628,27 @@ draw_page_header( strncpy(buf, (note_h->subj ? note_h->subj : arts[this_resp].subject), line_len); buf[line_len - 1] = '\0'; - if ((int) strlen(buf) > cCOLS - 2 * right_len - 3) - strunc(buf, line, line_len, cCOLS - 2 * right_len - 3); - else { - strncpy(line, buf, line_len); - buf[line_len - 1] = '\0'; - } + tmp = strunc(buf, cCOLS - 2 * right_len - 3); - center_pos = (cCOLS - strlen(line)) / 2; + center_pos = (cCOLS - strlen(tmp)) / 2; /* pad out to left */ - tmp[0] = '\0'; - for (i = 0; i < center_pos - (int) len && i < (int) line_len - 1; i++) - tmp[i] = ' '; - tmp[i] = '\0'; - len += strlen(tmp); - my_fputs(tmp, stdout); + for (; cur_pos < center_pos; cur_pos++) + my_fputc(' ', stdout); StartInverse(); - my_fputs(line, stdout); + my_fputs(tmp, stdout); EndInverse(); - len += strlen(line); + cur_pos += strlen(tmp); + free(tmp); # ifdef HAVE_COLOR fcol(tinrc.col_response); # endif /* HAVE_COLOR */ /* pad out to right */ - tmp[0] = '\0'; - for (i = 0; i < cCOLS - right_len - (int) len - 1 && i < (int) line_len - 1; i++) - tmp[i] = ' '; - tmp[i] = '\0'; - - my_fputs(tmp, stdout); + for (; cur_pos < cCOLS - right_len - 1; cur_pos++) + my_fputc(' ', stdout); if (whichresp) my_printf(_(txt_resp_x_of_n), whichresp, x_resp); @@ -1707,6 +1665,11 @@ draw_page_header( /* * third line */ + cur_pos = 0; + +#ifdef HAVE_COLOR + fcol(tinrc.col_from); +#endif /* HAVE_COLOR */ /* from */ /* * TODO: don't use arts[this_resp].name/arts[this_resp].from @@ -1720,36 +1683,25 @@ draw_page_header( buf[line_len - 1] = '\0'; } - strcpy(tmp, buf); - strunc(tmp, buf, line_len, cCOLS - 1); + tmp = strunc(buf, cCOLS - 1); + my_fputs(tmp, stdout); + cur_pos += strlen(tmp); + free(tmp); - if (note_h->org) { - snprintf(tmp, line_len, _(txt_at_s), note_h->org); + if (note_h->org && cCOLS - cur_pos - 1 >= strlen(_(txt_at_s)) - 2 + 3) { + /* we have enough space to print at least " at ..." */ + snprintf(buf, line_len, _(txt_at_s), note_h->org); - if ((int) strlen(buf) + (int) strlen(tmp) >= cCOLS - 1) { - strncat(buf, tmp, line_len - strlen(buf) - 1); - strcpy(tmp, buf); - strunc(tmp, buf, line_len, cCOLS - 1); - } else { - len = cCOLS - 1 - (int) strlen(tmp); - for (i = strlen(buf); i < (int) len; i++) - buf[i] = ' '; - buf[i] = '\0'; - strncat(buf, tmp, line_len - strlen(buf) - 1); - } + tmp = strunc(buf, cCOLS - cur_pos - 1); + len = cCOLS - (int) strlen(tmp) - 1; + for (; cur_pos < len; cur_pos++) + my_fputc(' ', stdout); + my_fputs(tmp, stdout); + free(tmp); } -#ifdef HAVE_COLOR - fcol(tinrc.col_from); -#endif /* HAVE_COLOR */ - - my_fputs(buf, stdout); my_fputs(cCRLF, stdout); my_fputs(cCRLF, stdout); - - /* clean up */ - free(line); - free(tmp); #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ free(buf); @@ -1826,6 +1778,7 @@ load_article( artline = pgart.cookl; artlines = pgart.cooked_lines; search_line = 0; + reset_srch_offsets(); rotate = 0; /* normal mode, not rot13 */ reveal_ctrl_l = FALSE; reveal_ctrl_l_lines = -1; /* all ^L's active */ @@ -2004,7 +1957,7 @@ toggle_raw( * an octal value (needs 4 columns) see also * color.c:draw_pager_line() */ - if ((space -= 4) < 0 ) + if ((space -= 4) < 0) break; offset++; p++; @@ -2131,6 +2084,7 @@ info_pager( int offset; search_line = 0; + reset_srch_offsets(); info_file = info_fh; info_title = title; curr_info_line = 0; diff -Nurp tin-1.7.6/src/pgp.c tin-1.7.7/src/pgp.c --- tin-1.7.6/src/pgp.c 2004-08-20 10:30:49.000000000 +0200 +++ tin-1.7.7/src/pgp.c 2004-12-01 16:01:28.000000000 +0100 @@ -3,7 +3,7 @@ * Module : pgp.c * Author : Steven J. Madsen * Created : 1995-05-12 - * Updated : 2004-01-07 + * Updated : 2004-12-01 * Notes : PGP support * * Copyright (c) 1995-2004 Steven J. Madsen @@ -38,14 +38,15 @@ #ifndef TIN_H # include "tin.h" #endif /* !TIN_H */ -#ifndef TCURSES_H -# include "tcurses.h" -#endif /* !TCURSES_H */ -#ifndef MENUKEYS_H -# include "menukeys.h" -#endif /* !MENUKEYS_H */ #ifdef HAVE_PGP_GPG +# ifndef TCURSES_H +# include "tcurses.h" +# endif /* !TCURSES_H */ +# ifndef MENUKEYS_H +# include "menukeys.h" +# endif /* !MENUKEYS_H */ + /* * The first two args are typically the PGP command name and then $PGPOPTS diff -Nurp tin-1.7.6/src/post.c tin-1.7.7/src/post.c --- tin-1.7.6/src/post.c 2004-08-20 18:53:08.000000000 +0200 +++ tin-1.7.7/src/post.c 2004-12-10 17:42:51.000000000 +0100 @@ -3,7 +3,7 @@ * Module : post.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2004-08-20 + * Updated : 2004-09-19 * Notes : mail/post/replyto/followup/repost & cancel articles * * Copyright (c) 1991-2004 Iain Lea @@ -734,7 +734,7 @@ check_article_to_be_posted( char references[HEADER_LEN]; char subject[HEADER_LEN]; int cnt = 0; - int col, i = 0; + int col, i; int errors = 0; int warnings = 0; int init = 1; @@ -927,6 +927,10 @@ check_article_to_be_posted( saw_references = TRUE; } + /* + * TODO: also check for other illegal chars? + * a 'common' error is to use a semicolon instead of a comma. + */ if (cp - line == 10 && !strncasecmp(line, "Newsgroups", 10)) { found_newsgroups_lines++; for (cp = line + 11; *cp == ' '; cp++) @@ -1817,19 +1821,23 @@ create_normal_article_headers( { FILE *fp; char from_name[HEADER_LEN]; +#ifdef FORGERY char tmp[HEADER_LEN]; - char *prompt; +#endif /* FORGERY */ + char *prompt, *tmp2; /* Get subject for posting article - Limit the display if needed */ - strunc(tinrc.default_post_subject, tmp, sizeof(tmp), DISPLAY_SUBJECT_LEN); + tmp2 = strunc(tinrc.default_post_subject, DISPLAY_SUBJECT_LEN); - prompt = fmt_string(_(txt_post_subject), tmp); + prompt = fmt_string(_(txt_post_subject), tmp2); if (!(prompt_string_default(prompt, tinrc.default_post_subject, _(txt_no_subject), HIST_POST_SUBJECT))) { free(prompt); + free(tmp2); return FALSE; } free(prompt); + free(tmp2); if ((fp = fopen(article, "w")) == NULL) { perror_message(_(txt_cannot_open), article); @@ -3912,6 +3920,7 @@ checknadd_headers( suffix[0] = '\0'; #if defined(HAVE_SYS_UTSNAME_H) && defined(HAVE_UNAME) + if (*system_info.release) { # ifdef _AIX snprintf(suffix, sizeof(suffix), " (%s/%s.%s)", system_info.sysname, system_info.version, system_info.release); @@ -3924,12 +3933,15 @@ checknadd_headers( system_info.sysname, system_info.release, system_info.machine); # endif /* SEIUX */ # endif /* _AIX */ -#else -# ifdef SYSTEM_NAME - if (strlen(SYSTEM_NAME)) - snprintf(suffix, sizeof(suffix), " (%s)", SYSTEM_NAME); -# endif /* SYSTEM_NAME */ + } #endif /* HAVE_SYS_UTSNAME_H && HAVE_UNAME */ +#ifdef SYSTEM_NAME + if (!*suffix) { + if (strlen(SYSTEM_NAME)) + snprintf(suffix, sizeof(suffix), " (%s)", SYSTEM_NAME); + } +#endif /* SYSTEM_NAME */ + fprintf(fp_out, "User-Agent: %s/%s-%s (\"%s\") (%s)%s\n", PRODUCT, VERSION, RELEASEDATE, RELEASENAME, OSNAME, suffix); } @@ -4178,7 +4190,7 @@ submit_mail_file( t_bool include_text) { FILE *fp; - char *fcc = NULL; + char *fcc; char buf[HEADER_LEN]; char mail_to[HEADER_LEN]; struct t_header hdr; @@ -4411,7 +4423,7 @@ address_in_list( const char *address) { char **addr_list; - char *curr_address = NULL, *this_address = NULL; + char *curr_address = NULL, *this_address; t_bool found = FALSE; unsigned int num_addr = 0, i; @@ -4533,7 +4545,7 @@ static const char * build_messageid( void) { - int i = 0; + int i; static char buf[1024]; /* Message-IDs are limited to 998-12+CRLF octets */ static unsigned long int seqnum = 0; /* we'd use a counter in tinrc */ time_t t = time(NULL); diff -Nurp tin-1.7.6/src/prompt.c tin-1.7.7/src/prompt.c --- tin-1.7.6/src/prompt.c 2004-08-20 10:30:49.000000000 +0200 +++ tin-1.7.7/src/prompt.c 2004-11-15 18:44:26.000000000 +0100 @@ -3,7 +3,7 @@ * Module : prompt.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2004-07-03 + * Updated : 2004-09-19 * Notes : * * Copyright (c) 1991-2004 Iain Lea @@ -599,8 +599,7 @@ sized_message( #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ max_len = cCOLS - strlen(format) + 2 - 1; /* The formatting info (%s) wastes 2 chars, but our prompt needs 1 char */ - buf = my_malloc(strlen(subject) + 1); - strunc(subject, buf, strlen(subject) + 1, max_len); + buf = strunc(subject, max_len); *result = fmt_string(format, buf); free(buf); diff -Nurp tin-1.7.6/src/refs.c tin-1.7.7/src/refs.c --- tin-1.7.6/src/refs.c 2004-08-20 10:30:49.000000000 +0200 +++ tin-1.7.7/src/refs.c 2004-11-15 18:44:26.000000000 +0100 @@ -731,7 +731,6 @@ find_next( * a sibling if we can find one */ if (ptr->child == NULL && ptr->sibling == NULL) { - while (ptr != NULL && ptr->sibling == NULL) ptr = ptr->parent; @@ -770,13 +769,10 @@ build_thread( * Keep working through the thread, updating the ptrs as we go */ while ((newptr = find_next(ptr)) != NULL) { - arts[newptr->article].prev = ptr->article; arts[ptr->article].thread = newptr->article; - ptr = newptr; } - } diff -Nurp tin-1.7.6/src/rfc1524.c tin-1.7.7/src/rfc1524.c --- tin-1.7.6/src/rfc1524.c 2004-08-20 10:30:49.000000000 +0200 +++ tin-1.7.7/src/rfc1524.c 2004-12-01 16:18:18.000000000 +0100 @@ -3,7 +3,7 @@ * Module : rfc1524.c * Author : Urs Janssen , Jason Faultless * Created : 2000-05-15 - * Updated : 2002-08-24 + * Updated : 2004-11-28 * Notes : mailcap parsing as defined in RFC 1524 * * Copyright (c) 2000-2004 Urs Janssen , Jason Faultless @@ -70,19 +70,18 @@ get_mailcap_entry( char buf[LEN]; char filename[LEN]; /* name of current mailcap file */ char mailcap[LEN]; /* full match */ - char mailcaps[LEN]; /* possible mailcap files */ + char *mailcaps = NULL; /* possible mailcap files */ char wildcap[LEN]; /* basetype match */ t_mailcap *foo = (t_mailcap *) 0; - mailcaps[0] = '\0'; /* build list of mailcap files */ - if ((ptr = getenv("MAILCAPS")) != NULL) { - if (strlen(ptr)) { - STRCPY(mailcaps, ptr); - strncat(mailcaps, ":", sizeof(mailcaps) - 1); - } - } - strncat(mailcaps, DEFAULT_MAILCAPS, sizeof(mailcaps) - 1); + if ((ptr = getenv("MAILCAPS")) != NULL && strlen(ptr)) + mailcaps = my_strdup(ptr); + if (mailcaps != NULL) { + mailcaps = my_realloc(mailcaps, strlen(mailcaps) + strlen(DEFAULT_MAILCAPS) + 2); + strcat(strcat(mailcaps, ":"), DEFAULT_MAILCAPS); + } else + mailcaps = my_strdup(DEFAULT_MAILCAPS); mailcap[0] = '\0'; wildcap[0] = '\0'; @@ -117,6 +116,7 @@ get_mailcap_entry( foo = parse_mailcap_line(mailcap, part, path); if (foo != NULL) { fclose(fp); /* perfect match with test succeded (if given) */ + free(mailcaps); return foo; } } else { @@ -133,6 +133,7 @@ get_mailcap_entry( } /* else invalid mailcap line (no /), no action required */ if (strlen(wildcap)) { /* we just had a wildmat match */ fclose(fp); + free(mailcaps); return foo; } } /* while ((fgets(ptr, ... */ @@ -141,6 +142,7 @@ get_mailcap_entry( } /* else strfpath() failed, no action required */ nptr = strtok(NULL, ":"); /* get next filename */ } + free(mailcaps); foo = (t_mailcap *) 0; /* no match, weed out possible junk */ return foo; } @@ -353,7 +355,7 @@ expand_mailcap_meta( int quote = no_quote; size_t linelen, space, olen; - if ((ptr = strchr(mailcap, '%')) == NULL) /* nothing to expand */ + if (!(strchr(mailcap, '%'))) /* nothing to expand */ return my_strdup(mailcap); /* waste of mem, but simplyfies the frees */ linelen = LEN * 2; /* initial maxlen */ diff -Nurp tin-1.7.6/src/rfc2045.c tin-1.7.7/src/rfc2045.c --- tin-1.7.6/src/rfc2045.c 2004-08-20 10:30:49.000000000 +0200 +++ tin-1.7.7/src/rfc2045.c 2004-12-01 11:50:17.000000000 +0100 @@ -3,7 +3,7 @@ * Module : rfc2045.c * Author : Chris Blum * Created : 1995-09-01 - * Updated : 2003-02-01 + * Updated : 2004-11-04 * Notes : RFC 2045/2047 encoding * * Copyright (c) 1995-2004 Chris Blum @@ -42,7 +42,9 @@ /* * local prototypes */ +static int put_rest(char **rest, char **line, int *max_line_len, const int offset); static unsigned char bin2hex(unsigned int x); +static void set_rest(char **rest, const char *ptr); static unsigned char @@ -212,3 +214,311 @@ rfc1521_encode( } else if (line) fputs(line, f); } + + +/* + * Set everything in ptr as the rest of a physical line to be processed + * later. + */ +static void +set_rest( + char **rest, + const char *ptr) +{ + char *old_rest = *rest; + + if (ptr == NULL || strlen(ptr) == 0) { + FreeAndNull(*rest); + return; + } + *rest = my_strdup(ptr); + FreeIfNeeded(old_rest); +} + + +/* + * Copy things that were left over from the last decoding into the new line. + * If there's a newline in the rest, copy everything up to and including that + * newline into the expected buffer, adjust rest and return. If there's no + * newline in the rest, copy all of it to the expected buffer and return. + * + * Side effects: resizes line if necessary, adjusts max_line_len + * accordingly. + * + * This function returns the number of characters written to the line buffer. + */ +static int +put_rest( + char **rest, + char **line, + int *max_line_len, + const int offset) +{ + char *my_rest = *rest; + char *ptr; + char c; + int put_chars = offset; + + if ((ptr = my_rest) == NULL) + return put_chars; + if (strlen(my_rest) == 0) { + FreeAndNull(*rest); + return put_chars; + } + + while ((c = *ptr++) && (c != '\n')) { + if ((c == '\r') && (*ptr == '\n')) + continue; /* step over CRLF */ + /* + * Resize line if necessary. Keep in mind that we add LF and \0 later. + */ + if (put_chars >= *max_line_len - 2) { + if (*max_line_len == 0) + *max_line_len = LEN; + else + *max_line_len <<= 1; + *line = my_realloc(*line, *max_line_len); + } + (*line)[put_chars++] = c; + } + if (c == '\n') { + /* + * FIXME: Adding a newline may be not correct. At least it may + * be not what the author of that article intended. + * Unfortunately, a newline is expected at the end of a line by + * some other code in cook.c and even those functions invoking + * this one rely on it. + */ + (*line)[put_chars++] = '\n'; + set_rest(rest, ptr); + } else /* c == 0 */ + /* rest is now empty */ + FreeAndNull(*rest); + + (*line)[put_chars] = '\0'; /* don't count the termining NULL! */ + return put_chars; +} + + +/* + * Read a logical base64 encoded line into the specified line buffer. + * Logical lines can be split over several physical base64 encoded lines and + * a single physical base64 encoded line can contain serveral logical lines. + * This function keeps track of all these cases and always copies only one + * decoded line to the line buffer. + * + * Side effects: resizes line if necessary, adjusts max_line_len + * accordingly. + * + * This function returns the number of physical lines read or a negative + * value on error. + */ +int +read_decoded_base64_line( + FILE *file, + char **line, + int *max_line_len, + const int max_lines_to_read, + char **rest) +{ + char *buf2; /* holds the entire decoded line */ + char *buf; /* holds the entire encoded line*/ + int count = 0; + int lines_read = 0; + int put_chars = 0; + + /* + * First of all, catch everything that is left over from the last decoding. + * If there's a newline in that rest, copy everything up to and including + * that newline in the expected buffer, adjust rest and return. If there's + * no newline in the rest, copy all of it (modulo length of the buffer) to + * the expected buffer and continue as if there was no rest. + */ + put_chars = put_rest(rest, line, max_line_len, 0); + if (put_chars && ((*line)[put_chars - 1] == '\n')) + return 0; /* we didn't read any new lines but filled the line */ + + /* + * At this point, either there was no rest or there was no newline in the + * rest. In any case, we need to read further encoded lines and decode + * them until we find a newline or there are no more (encoded or physical) + * lines in this part of the posting. To be sure, now allocate memory for + * the output if it wasn't already done. + */ + if (*max_line_len == 0) { + *max_line_len = LEN; + *line = my_malloc(*max_line_len); + } + + /* + * max_lines_to_read==0 occurs at end of an encoded part and if there was + * no trailing newline in the encoded text. So we put one there and exit. + * FIXME: Adding a newline may be not correct. At least it may be not + * what the author of that article intended. Unfortunately, a newline is + * expected at the end of a line by some other code in cook.c. + */ + if (max_lines_to_read <= 0) { + if (put_chars) { + (*line)[put_chars++] = '\n'; + (*line)[put_chars] = '\0'; + } + return max_lines_to_read; + } + /* + * Ok, now read a new line from the original article. + */ + do { + if ((buf = tin_fgets(file, FALSE)) == NULL) { + /* + * Premature end of file (or file error), leave loop. To prevent + * re-invoking of this function, set the numbers of read lines to + * the expected maximum that should be read at most. + * + * FIXME: Adding a newline may be not correct. At least it may be + * not what the author of that article intended. Unfortunately, a + * newline is expected at the end of a line by some other code in + * cook.c. + */ + if (put_chars > *max_line_len - 2) { + *max_line_len <<= 1; + *line = my_realloc(*line, *max_line_len); + } + (*line)[put_chars++] = '\n'; + (*line)[put_chars] = '\0'; + return max_lines_to_read; + } + lines_read++; + buf2 = my_malloc(strlen(buf) + 1); /* decoded string is always shorter than encoded string, so this is safe */ + count = mmdecode(buf, 'b', '\0', buf2); + buf2[count] = '\0'; + FreeIfNeeded(*rest); + *rest = buf2; + put_chars = put_rest(rest, line, max_line_len, put_chars); + if (put_chars && ((*line)[put_chars - 1] == '\n')) /* end of logical line reached */ + return lines_read; + } while (lines_read < max_lines_to_read); + /* + * FIXME: Adding a newline may be not correct. At least it may be + * not what the author of that article intended. Unfortunately, a + * newline is expected at the end of a line by some other code in + * cook.c. + */ + if (put_chars > *max_line_len - 2) { + *max_line_len <<= 1; + *line = my_realloc(*line, *max_line_len); + } + if ((0 == put_chars) || ('\n' != (*line)[put_chars - 1])) + (*line)[put_chars++] = '\n'; + (*line)[put_chars] = '\0'; + return lines_read; +} + + +/* + * Read a logical quoted-printable encoded line into the specified line + * buffer. Quoted-printable lines can be split over several physical lines, + * so this function collects all affected lines, concatenates and decodes + * them. + * + * Side effects: resizes line if necessary, adjusts max_line_len + * accordingly. + * + * This function returns the number of physical lines read or a negative + * value on error. + */ +int +read_decoded_qp_line( + FILE *file, + char **line, /* where to copy the decoded line */ + int *max_line_len, /* (maximum) line length */ + const int max_lines_to_read) /* don't read more physical lines than told here */ +{ + char *buf, *buf2; + char *ptr; + char c; + int buflen = LEN; + int count = 0; + int lines_read = 0; + size_t chars_to_add = 0; + + buf = my_malloc(buflen); /* initial internal line buffer */ + *buf = '\0'; + do { + if ((buf2 = tin_fgets(file, FALSE)) == NULL) { + /* + * Premature end of file (or file error, leave loop. To prevent + * re-invokation of this function, set the numbers of read lines + * to the expected maximum that should be read at most. + */ + lines_read = max_lines_to_read; + break; + } + lines_read++; + if ((chars_to_add = strlen(buf2)) == 0) /* Empty line, leave loop. */ + break; + + /* + * Strip trailing white space at the end of the line. + * See RFC 2045, section 6.7, #3 + */ + c = buf2[chars_to_add - 1]; + while ((chars_to_add > 0) && ((c == ' ') || (c == '\t') || (c == '\n') || (c == '\r'))) { + --chars_to_add; + c = (chars_to_add > 0 ? buf2[chars_to_add - 1] : '\0'); + } + + /* + * '=' at the end of a line indicates a soft break meaning + * that the following physical line "belongs" to this one. + * (See RFC 2045, section 6.7, #5) + * + * Skip that equal sign now; since c holds this char, the + * loop is not left but the next line is read and concatenated + * with this one while the '=' is overwritten. + */ + if (c == '=') /* c is 0 when chars_to_add is 0 so this is safe */ + buf2[--chars_to_add] = '\0'; + + /* + * Join physical lines to a logical one; keep in mind that a LF is + * added afterwards. + */ + if (chars_to_add > buflen - strlen(buf) - 2) { + buflen <<= 1; + buf = my_realloc(buf, buflen); + } + strncat(buf, buf2, buflen); + } while ((c == '=') && (lines_read < max_lines_to_read)); + /* + * re-add newline and NULL termination at end of line + * FIXME: Adding a newline may be not correct. At least it may be not + * what the author of that article intended. Unfortunately, a newline is + * expected at the end of a line by some other code in cook.c. + */ + strcat(buf, "\n"); + + /* + * Now decode complete (logical) line from buf to buf2 and copy it to the + * buffer where the invoking function expects it. Don't decode directly + * to the buffer of the other function to prevent buffer overruns and to + * decide if the encoding was ok. + */ + buf2 = my_malloc(strlen(buf) + 1); /* Don't use realloc here, tin_fgets relies on its internal state! */ + count = mmdecode(buf, 'q', '\0', buf2); + + if (count >= 0) { + buf2[count] = '\0'; + ptr = buf2; + } else /* error in encoding: copy raw line */ + ptr = buf; + + if (*max_line_len < (int) strlen(ptr) + 1) { + *max_line_len = strlen(ptr) + 1; + *line = my_realloc(*line, *max_line_len); + } + strncpy(*line, ptr, *max_line_len); + (*line)[*max_line_len - 1] = '\0'; /* be sure to terminate string */ + free(buf); + free(buf2); + return lines_read; +} diff -Nurp tin-1.7.6/src/rfc2046.c tin-1.7.7/src/rfc2046.c --- tin-1.7.6/src/rfc2046.c 2004-08-20 10:30:49.000000000 +0200 +++ tin-1.7.7/src/rfc2046.c 2004-12-01 16:19:37.000000000 +0100 @@ -1106,7 +1106,7 @@ open_art_fp( struct t_group *group, long art) { - FILE *art_fp = (FILE *) 0; + FILE *art_fp; char buf[NNTP_STRLEN]; #ifdef NNTP_ABLE diff -Nurp tin-1.7.6/src/rfc2047.c tin-1.7.7/src/rfc2047.c --- tin-1.7.6/src/rfc2047.c 2004-08-20 10:30:49.000000000 +0200 +++ tin-1.7.7/src/rfc2047.c 2004-12-01 16:16:44.000000000 +0100 @@ -3,7 +3,7 @@ * Module : rfc2047.c * Author : Chris Blum * Created : 1995-09-01 - * Updated : 2004-03-10 + * Updated : 2004-11-26 * Notes : MIME header encoding/decoding stuff * * Copyright (c) 1995-2004 Chris Blum @@ -789,7 +789,7 @@ do_rfc15211522_encode( BodyPtr body_encode; int i; #ifdef CHARSET_CONVERSION - int mmnwcharset = 0; + int mmnwcharset; if (group) /* Posting */ mmnwcharset = group->attribute->mm_network_charset; @@ -843,12 +843,12 @@ do_rfc15211522_encode( } } } - /* - * This should work as g should be at least as long as f. - * We could use ftruncate(), but this isn't part of ISO-C. - */ - rewind(f); + rewind(g); + rewind(f); +#ifdef HAVE_FTRUNCATE + ftruncate(fileno(f), 0); +#endif /* HAVE_FTRUNCATE */ /* copy header */ while (fgets(buffer, 2048, g) && !isreturn(buffer[0])) diff -Nurp tin-1.7.6/src/screen.c tin-1.7.7/src/screen.c --- tin-1.7.6/src/screen.c 2004-09-03 17:32:02.000000000 +0200 +++ tin-1.7.7/src/screen.c 2004-11-15 18:44:26.000000000 +0100 @@ -3,7 +3,7 @@ * Module : screen.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-09-03 + * Updated : 2004-09-19 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -76,9 +76,8 @@ fmt_message( { char *msg; #ifdef HAVE_VASPRINTF - int n; - if ((n = vasprintf(&msg, fmt, ap)) == -1) /* something went wrong */ + if (vasprintf(&msg, fmt, ap) == -1) /* something went wrong */ #endif /* HAVE_VASPRINTF */ { size_t size = LEN; @@ -273,10 +272,11 @@ center_line( } if (len >= cCOLS) { - char buffer[256]; + char *buffer; - strunc(str, buffer, sizeof(buffer), cCOLS - 2); + buffer = strunc(str, cCOLS - 2); my_fputs(buffer, stdout); + free(buffer); } else my_fputs(str, stdout); diff -Nurp tin-1.7.6/src/search.c tin-1.7.7/src/search.c --- tin-1.7.6/src/search.c 2004-09-04 21:23:00.000000000 +0200 +++ tin-1.7.7/src/search.c 2004-11-15 18:44:26.000000000 +0100 @@ -3,7 +3,7 @@ * Module : search.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-09-04 + * Updated : 2004-10-17 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -518,7 +518,9 @@ search_article( { char *pattern, *ptr, *tmp; int i = start_line; + int tmp_srch_offsets[2]; t_bool wrap = FALSE; + t_bool match = FALSE; if (!(pattern = get_search_pattern(&forward, repeat, _(txt_search_forwards), _(txt_search_backwards), tinrc.default_search_art, HIST_ART_SEARCH))) return 0; @@ -543,6 +545,10 @@ search_article( break; tmp = tin_fgets(fp, FALSE); + if (!forward && srch_offsets[0] >= 0) { + tmp[srch_offsets[0]] = '\0'; /* ignore anything on this line after the last match */ + srch_offsets[1] = 0; /* start backwards search at the beginning of the line */ + } #ifdef HAVE_UNICODE_NORMALIZATION if (IS_LOCAL_CHARSET("UTF-8")) @@ -552,8 +558,20 @@ search_article( ptr = my_strdup(tmp); if (tinrc.wildcard) { - if (pcre_exec(search_regex.re, search_regex.extra, ptr, strlen(ptr), srch_offsets[1], 0, - srch_offsets, srch_offsets_size) != PCRE_ERROR_NOMATCH) { + while (pcre_exec(search_regex.re, search_regex.extra, ptr, strlen(ptr), srch_offsets[1], 0, srch_offsets, srch_offsets_size) != PCRE_ERROR_NOMATCH) { + match = TRUE; + if (forward) + break; + else { + tmp_srch_offsets[0] = srch_offsets[0]; + tmp_srch_offsets[1] = srch_offsets[1]; + } + } + if (match) { + if (!forward) { + srch_offsets[0] = tmp_srch_offsets[0]; + srch_offsets[1] = tmp_srch_offsets[1]; + } srch_lineno = i; FreeAndNull(search_regex.re); FreeAndNull(search_regex.extra); @@ -660,3 +678,15 @@ get_search_vectors( srch_lineno = -1; /* We can only retrieve this info once */ return i; } + + +/* + * Reset offsets so that the next search starts at the beginning of the line. + * This function is needed to access srch_offsets from within other modules. + */ +void +reset_srch_offsets( + void) +{ + srch_offsets[0] = srch_offsets[1] = 0; +} diff -Nurp tin-1.7.6/src/select.c tin-1.7.7/src/select.c --- tin-1.7.6/src/select.c 2004-08-20 10:30:49.000000000 +0200 +++ tin-1.7.7/src/select.c 2004-11-16 14:28:11.000000000 +0100 @@ -3,7 +3,7 @@ * Module : select.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-07-19 + * Updated : 2004-11-16 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -55,6 +55,7 @@ static int select_left(void); static int select_right(void); static t_bool pos_next_unread_group(t_bool redraw); static t_bool yanked_out = TRUE; +static void build_gline(int i); static void catchup_group(struct t_group *group, t_bool goto_next_unread_group); static void draw_group_arrow(void); static void read_groups(void); @@ -71,9 +72,11 @@ static void yank_active_file(void); * selmenu.curr = index (start at 0) of cursor position on menu, * or -1 when no groups visible on screen * selmenu.max = Total # of groups in my_group[] - * selmenu.first, selmenu.last are static here + * selmenu.first is static here */ -t_menu selmenu = { 1, 0, 0, 0, show_selection_page, draw_group_arrow }; +t_menu selmenu = { 1, 0, 0, show_selection_page, draw_group_arrow, build_gline }; + +static int groupname_len; /* max. group name length */ static int @@ -116,6 +119,7 @@ selection_page( if (num_cmd_line_groups == 1) select_read_group(); + cursoroff(); show_selection_page(); /* display group selection page */ forever { @@ -177,6 +181,14 @@ selection_page( move_down(); break; + case iKeyScrollDown: + scroll_down(); + break; + + case iKeyScrollUp: + scroll_up(); + break; + case iKeySelectSortActive: /* Sort active groups */ sort_active_file(); break; @@ -248,8 +260,19 @@ selection_page( break; case iKeySelectGoto: /* prompt for a new group name */ - if ((n = choose_new_group()) >= 0) - move_to_item(n); + { + int oldmax = selmenu.max; + + if ((n = choose_new_group()) >= 0) { + /* + * If a new group was added and it is on the actual screen + * draw it. If it is off screen the redraw will handle it. + */ + if (oldmax != selmenu.max && n >= selmenu.first && n < selmenu.first + NOTESLINES) + build_gline(n); + move_to_item(n); + } + } break; case iKeyHelp: /* help */ @@ -302,7 +325,7 @@ selection_page( n = selmenu.curr; selmenu.curr = reposition_group(&active[my_group[n]], n); HpGlitch(erase_arrow()); - if (selmenu.curr < selmenu.first || selmenu.curr >= selmenu.last || selmenu.curr != n) + if (selmenu.curr < selmenu.first || selmenu.curr >= selmenu.first + NOTESLINES - 1 || selmenu.curr != n) show_selection_page(); else { i = selmenu.curr; @@ -515,13 +538,7 @@ show_selection_page( void) { char buf[LEN]; - char tmp[10]; - char active_name[255]; - char group_descript[255]; - char subs; - int i, j, n; - int blank_len; - int len, groupname_len = 0; + int i, len; signal_context = cSelect; currmenu = &selmenu; @@ -531,17 +548,12 @@ show_selection_page( else snprintf(buf, sizeof(buf), "%s (%d%s)", _(txt_group_selection), selmenu.max, (tinrc.show_only_unread_groups ? _(" R") : "")); - MoveCursor(0, 0); /* top left corner */ - CleartoEOLN(); - show_title(buf); - MoveCursor(1, 0); - CleartoEOLN(); - MoveCursor(INDEX_TOP, 0); - if (selmenu.curr < 0) selmenu.curr = 0; + ClearScreen(); set_first_screen_item(); + show_title(buf); /* * calculate max length of groupname field @@ -574,80 +586,87 @@ show_selection_page( if (groupname_len < 0) groupname_len = 0; - blank_len = (MIN(cCOLS, (int) sizeof(group_descript)) - (groupname_len + SELECT_MISC_COLS)) + (show_description ? 2 : 4); + for (i = selmenu.first; i < selmenu.first + NOTESLINES && i < selmenu.max; i++) + build_gline(i); + + show_mini_help(SELECT_LEVEL); + + if (selmenu.max <= 0) { + info_message(_(txt_no_groups)); + return; + } + + draw_group_arrow(); +} - for (j = 0, i = selmenu.first; i < selmenu.last; i++, j++) { + +static void +build_gline( + int i) +{ + char tmp[10]; + char active_name[255]; + char group_descript[255]; + char subs; #ifdef USE_CURSES - char sptr[BUFSIZ]; + char sptr[BUFSIZ]; #else - char *sptr = screen[j].col; + char *sptr = screen[INDEX2SNUM(i)].col; #endif /* USE_CURSES */ - if (active[my_group[i]].inrange) - strcpy(tmp, " #"); - else if (active[my_group[i]].newsrc.num_unread) { - strcpy(tmp, tin_ltoa(active[my_group[i]].newsrc.num_unread, 5)); - } else - strcpy(tmp, " "); + int n, blank_len; - n = my_group[i]; + blank_len = (MIN(cCOLS, (int) sizeof(group_descript)) - (groupname_len + SELECT_MISC_COLS)) + (show_description ? 2 : 4); - /* - * Display a flag for this group if needed - * . Bogus groups are dumped immediately - * . Normal subscribed groups may be - * ' ' normal, 'X' not postable, 'M' moderated, '=' renamed - * . Newgroups are 'N' - * . Unsubscribed groups are 'u' - */ - if (active[n].bogus) /* Group is not in active list */ - subs = 'D'; - else if (active[n].subscribed) /* Important that this preceeds Newgroup */ - subs = group_flag(active[n].moderated); - else - subs = ((active[n].newgroup) ? 'N' : 'u'); /* New (but unsubscribed) group or unsubscribed group */ + if (active[my_group[i]].inrange) + strcpy(tmp, " #"); + else if (active[my_group[i]].newsrc.num_unread) { + strcpy(tmp, tin_ltoa(active[my_group[i]].newsrc.num_unread, 5)); + } else + strcpy(tmp, " "); - strncpy(active_name, active[n].name, groupname_len); - active_name[groupname_len] = '\0'; + n = my_group[i]; - if (blank_len > (int) (sizeof(group_descript) - 1)) - blank_len = sizeof(group_descript) - 1; + /* + * Display a flag for this group if needed + * . Bogus groups are dumped immediately + * . Normal subscribed groups may be + * ' ' normal, 'X' not postable, 'M' moderated, '=' renamed + * . Newgroups are 'N' + * . Unsubscribed groups are 'u' + */ + if (active[n].bogus) /* Group is not in active list */ + subs = 'D'; + else if (active[n].subscribed) /* Important that this preceeds Newgroup */ + subs = group_flag(active[n].moderated); + else + subs = ((active[n].newgroup) ? 'N' : 'u'); /* New (but unsubscribed) group or unsubscribed group */ - if (show_description) { - if (active[n].description) { - strncpy(group_descript, active[n].description, blank_len); - group_descript[blank_len] = '\0'; - sprintf(sptr, " %c %s %s %-*.*s %-*.*s%s", - subs, tin_ltoa(i + 1, 4), tmp, - groupname_len, groupname_len, active_name, - blank_len, blank_len, group_descript, cCRLF); - } else - sprintf(sptr, " %c %s %s %-*.*s %s", - subs, tin_ltoa(i + 1, 4), tmp, - (groupname_len + blank_len), - (groupname_len + blank_len), active[n].name, cCRLF); - } else { - if (tinrc.draw_arrow) - sprintf(sptr, " %c %s %s %-*.*s%s", subs, tin_ltoa(i + 1, 4), tmp, groupname_len, groupname_len, active_name, cCRLF); - else - sprintf(sptr, " %c %s %s %-*.*s%*s%s", subs, tin_ltoa(i + 1, 4), tmp, groupname_len, groupname_len, active_name, blank_len, " ", cCRLF); - } - if (tinrc.strip_blanks) - strcat(strip_line(sptr), cCRLF); + strncpy(active_name, active[n].name, groupname_len); + active_name[groupname_len] = '\0'; - CleartoEOLN(); - my_fputs(sptr, stdout); + if (show_description) { + if (active[n].description) { + strncpy(group_descript, active[n].description, blank_len); + group_descript[blank_len] = '\0'; + sprintf(sptr, " %c %s %s %-*.*s %-*.*s%s", + subs, tin_ltoa(i + 1, 4), tmp, + groupname_len, groupname_len, active_name, + blank_len, blank_len, group_descript, cCRLF); + } else + sprintf(sptr, " %c %s %s %-*.*s %s", + subs, tin_ltoa(i + 1, 4), tmp, + (groupname_len + blank_len), + (groupname_len + blank_len), active[n].name, cCRLF); + } else { + if (tinrc.draw_arrow) + sprintf(sptr, " %c %s %s %-*.*s%s", subs, tin_ltoa(i + 1, 4), tmp, groupname_len, groupname_len, active_name, cCRLF); + else + sprintf(sptr, " %c %s %s %-*.*s%*s%s", subs, tin_ltoa(i + 1, 4), tmp, groupname_len, groupname_len, active_name, blank_len, " ", cCRLF); } + if (tinrc.strip_blanks) + strcat(strip_line(sptr), cCRLF); - CleartoEOS(); - show_mini_help(SELECT_LEVEL); - - if (selmenu.max <= 0) { - info_message(_(txt_no_groups)); - return; - } else if (selmenu.last == selmenu.max) - info_message(_(txt_end_of_groups)); - - draw_group_arrow(); + WriteLine(INDEX2LNUM(i), sptr); } @@ -663,6 +682,8 @@ draw_group_arrow( info_message(_(txt_group_aliased), CURR_GROUP.aliasedto); else if (tinrc.info_in_last_line) info_message("%s", CURR_GROUP.description ? CURR_GROUP.description : _(txt_no_description)); + else if (selmenu.curr == selmenu.max - 1) + info_message(_(txt_end_of_groups)); } } diff -Nurp tin-1.7.6/src/string.c tin-1.7.7/src/string.c --- tin-1.7.6/src/string.c 2004-08-21 13:29:40.000000000 +0200 +++ tin-1.7.7/src/string.c 2004-11-15 18:44:26.000000000 +0100 @@ -3,7 +3,7 @@ * Module : string.c * Author : Urs Janssen * Created : 1997-01-20 - * Updated : 2004-08-21 + * Updated : 2004-09-19 * Notes : * * Copyright (c) 1997-2004 Urs Janssen @@ -766,42 +766,34 @@ wcspart( char * strunc( const char *message, - char *buf, - size_t buf_len, int len) { -#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) char *tmp; +#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) wchar_t *wmessage, *wbuf; - size_t wbuf_len; if ((wmessage = char2wchar_t(message)) != NULL) { - wbuf_len = wcslen(wmessage) + 1; - wbuf = my_malloc(sizeof(wchar_t) * wbuf_len); - - wstrunc(wmessage, wbuf, wbuf_len, len); + wbuf = wstrunc(wmessage, len); free(wmessage); if ((tmp = wchar_t2char(wbuf)) != NULL) { - strncpy(buf, tmp, buf_len); - buf[buf_len - 1] = '\0'; - free(wbuf); - free(tmp); - return buf; + return tmp; } free(wbuf); } /* something went wrong using wide-chars, default back to normal chars */ #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ - if ((int) strlen(message) <= len && len < (int) buf_len) - strcpy(buf, message); - else - snprintf(buf, buf_len, "%-.*s%s", len - 3, message, TRUNC_TAIL); + if ((int) strlen(message) <= len) + tmp = my_strdup(message); + else { + tmp = my_malloc(len + 1); + snprintf(tmp, len + 1, "%-.*s%s", len - 3, message, TRUNC_TAIL); + } - return buf; + return tmp; } /* @@ -816,8 +808,6 @@ strunc( wchar_t * wstrunc( const wchar_t *wmessage, - wchar_t *wbuf, - size_t wbuf_len, int len) { wchar_t *wtmp; @@ -826,11 +816,9 @@ wstrunc( wtmp = my_wcsdup(wmessage); wconvert_to_printable(wtmp); - if (wcswidth(wtmp, wcslen(wtmp)) <= len && wcslen(wtmp) < wbuf_len) /* wtmp doesn't need to be truncated */ - wcscpy(wbuf, wtmp); - else { + if (wcswidth(wtmp, wcslen(wtmp)) > len) { /* wtmp must be truncated */ - wchar_t *wtmp2, *format; + wchar_t *wtmp2, *tail; # ifdef USE_UTF8_HORIZONTAL_ELLIPSIS if (IS_LOCAL_CHARSET("UTF-8")) { @@ -838,28 +826,21 @@ wstrunc( * use U+2026 (HORIZONTAL ELLIPSIS) instead of "..." * we gain two additional screen positions */ - format = char2wchar_t("%ls%lc"); - - wtmp2 = wcspart(wtmp, MIN(len - 1, (int) wbuf_len - 2), FALSE); - swprintf(wbuf, wbuf_len, format, wtmp2, 8230); /* U+2026 */ + tail = my_malloc(sizeof(wchar_t) * 2); + tail[0] = 8230; /* U+2026 */ + tail[1] = 0; /* \0 */ } else # endif /* USE_UTF8_HORIZONTAL_ELLIPSIS */ - { - wchar_t *tail; - tail = char2wchar_t(TRUNC_TAIL); - format = char2wchar_t("%ls%ls"); - wtmp2 = wcspart(wtmp, MIN(len - 3, (int) wbuf_len - 4), FALSE); - swprintf(wbuf, wbuf_len, format, wtmp2, tail); - free(tail); - } - free(format); - free(wtmp2); + wtmp2 = wcspart(wtmp, len - wcslen(tail), FALSE); + free(wtmp); + wtmp = my_realloc(wtmp2, sizeof(wchar_t) * (wcslen(wtmp2) + wcslen(tail) + 1)); /* wtmp2 isn't valid snymore and doesn't have to be free()ed */ + wcscat(wtmp, tail); + free(tail); } - free(wtmp); - return wbuf; + return wtmp; } diff -Nurp tin-1.7.6/src/thread.c tin-1.7.7/src/thread.c --- tin-1.7.6/src/thread.c 2004-09-01 19:31:23.000000000 +0200 +++ tin-1.7.7/src/thread.c 2004-12-01 16:14:43.000000000 +0100 @@ -3,7 +3,7 @@ * Module : thread.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2004-07-19 + * Updated : 2004-12-01 * Notes : * * Copyright (c) 1991-2004 Iain Lea @@ -65,6 +65,7 @@ static t_bool find_unexpired(struct t_ms static t_bool has_sibling(struct t_msgid *ptr); static void build_tline(int l, struct t_article *art); static void draw_thread_arrow(void); +static void draw_thread_item(int item); static void make_prefix(struct t_msgid *art, char *prefix, int maxlen); static void show_thread_page(void); static void update_thread_page(void); @@ -74,9 +75,8 @@ static void update_thread_page(void); * thdmenu.curr Current screen cursor position in thread * thdmenu.max Essentially = # threaded arts in current thread * thdmenu.first Response # at top of screen - * thdmenu.last Response # at end of screen */ -static t_menu thdmenu = {0, 0, 0, 0, show_thread_page, draw_thread_arrow }; +static t_menu thdmenu = {0, 0, 0, show_thread_page, draw_thread_arrow, draw_thread_item }; /* @@ -343,7 +343,15 @@ build_tline( if (mark == tinrc.art_marked_selected) draw_mark_selected(l); - MoveCursor(INDEX2LNUM(l) + 1, 0); +} + + +static void +draw_thread_item( + int item) +{ + build_tline(item, &arts[find_response(thread_basenote, item)]); + return; } @@ -390,9 +398,9 @@ thread_page( char key[MAXKEYLEN]; char mark[] = { '\0', '\0' }; int ret_code = 0; /* Set to < 0 when it is time to leave this menu */ - int ch = 0; + int ch; int i, n; - t_bool repeat_search = FALSE; + t_bool repeat_search; thread_respnum = respnum; /* Bodge to make this variable global */ @@ -408,6 +416,8 @@ thread_page( * or an explicit thread_depth has been specified */ thdmenu.curr = thdmenu.max; + /* reset the first item on screen to 0 */ + thdmenu.first = 0; if (thread_depth) thdmenu.curr = thread_depth; @@ -447,8 +457,7 @@ thread_page( if ((ch = handle_keypad(thread_left, thread_right, &menukeymap.thread_nav)) == iKeySearchRepeat) { ch = i_key_search_last; repeat_search = TRUE; - } - else + } else repeat_search = FALSE; switch (ch) { @@ -569,6 +578,14 @@ thread_page( page_down(); break; + case iKeyScrollDown: + scroll_down(); + break; + + case iKeyScrollUp: + scroll_up(); + break; + case iKeyCatchupLeft: /* come here when exiting thread via <- */ case iKeyThreadCatchup: /* catchup thread, move to next one */ case iKeyThreadCatchupNextUnread: /* -> next with unread arts */ @@ -703,8 +720,8 @@ thread_page( art_mark(group, &arts[n], ART_WILL_RETURN); mark[0] = get_art_mark(&arts[n]); mark_screen(thdmenu.curr, MARK_OFFSET, mark); - info_message(_(txt_marked_as_unread), _(txt_article_upper)); draw_thread_arrow(); + info_message(_(txt_marked_as_unread), _(txt_article_upper)); break; case iKeyThreadMarkThdUnread: /* mark thread as unread */ @@ -781,11 +798,8 @@ show_thread_page( currmenu = &thdmenu; ClearScreen(); - set_first_screen_item(); - art = find_response(thread_basenote, thdmenu.first); - /* * If threading by Refs, it helps to see the subject line */ @@ -798,19 +812,13 @@ show_thread_page( show_title(title); free(title); - MoveCursor(INDEX_TOP, 0); - - for (i = thdmenu.first; i < thdmenu.last; ++i) { + art = find_response(thread_basenote, thdmenu.first); + for (i = thdmenu.first; i < thdmenu.first + NOTESLINES && i < thdmenu.max; ++i) { build_tline(i, &arts[art]); art = next_response(art); } - CleartoEOS(); show_mini_help(THREAD_LEVEL); - - if (thdmenu.last == thdmenu.max) - info_message(_(txt_end_of_thread)); - draw_thread_arrow(); } @@ -820,15 +828,15 @@ update_thread_page( void) { char mark[] = { '\0', '\0' }; - int i, j, the_index; + int i, the_index; the_index = find_response(thread_basenote, thdmenu.first); assert(thdmenu.first != 0 || the_index == thread_respnum); - for (j = 0, i = thdmenu.first; j < NOTESLINES && i < thdmenu.last; ++i, ++j) { - if ((&arts[the_index])->tagged) { + for (i = thdmenu.first; i < thdmenu.first + NOTESLINES && i < thdmenu.max; ++i) { + if ((&arts[the_index])->tagged) mark_screen(i, MARK_OFFSET - 2, tin_ltoa((&arts[the_index])->tagged, 3)); - } else { + else { mark[0] = get_art_mark(&arts[the_index]); mark_screen(i, MARK_OFFSET - 2, " "); /* clear space used by tag numbering */ mark_screen(i, MARK_OFFSET, mark); @@ -851,6 +859,8 @@ draw_thread_arrow( if (tinrc.info_in_last_line) info_message("%s", arts[find_response(thread_basenote, thdmenu.curr)].subject); + else if (thdmenu.curr == thdmenu.max - 1) + info_message(_(txt_end_of_thread)); } @@ -921,9 +931,10 @@ which_thread( for (i = n; arts[i].prev >= 0; i = arts[i].prev) ; /* Find in base[] */ - for (j = 0; j < grpmenu.max; j++) + for (j = 0; j < grpmenu.max; j++) { if (base[j] == i) return j; + } error_message(_(txt_cannot_find_base_art), n); return -1; @@ -966,10 +977,7 @@ num_of_responses( int oldi = -3; int sum = 0; - assert(n < grpmenu.max); - - if (n < 0) - n = 0; + assert(n < grpmenu.max && n >= 0); for_each_art_in_thread(i, n) { assert(i != ART_EXPIRED); diff -Nurp tin-1.7.6/src/version.c tin-1.7.7/src/version.c --- tin-1.7.6/src/version.c 2004-08-20 10:30:49.000000000 +0200 +++ tin-1.7.7/src/version.c 2004-12-10 18:04:53.000000000 +0100 @@ -3,7 +3,7 @@ * Module : version.c * Author : U. Janssen * Created : 2003-05-11 - * Updated : 2003-08-21 + * Updated : 2004-12-10 * Notes : * * Copyright (c) 2003-2004 Urs Janssen @@ -55,6 +55,9 @@ * RC_UPGRADE 1st args dotted triple is older than 3rd arg * RC_DOWNGRADE 1st args dotted triple is newer than 3rd arg * RC_ERROR 3rd arg is not a dotted triple (usage error) + * + * Don't make the arguments to sscanf() consts, as some old systems require + * them to writable (but do not change them) */ int check_upgrade( @@ -63,20 +66,28 @@ check_upgrade( const char *version) { char *format; - const char *fmt = "%d.%d.%d"; /* we are expecting dotted triples */ + char *lskip = my_strdup(skip); + char *lversion = my_strdup(version); + char fmt[10]; int rc_majorv, rc_minorv, rc_subv; /* version numbers in the file */ int c_majorv, c_minorv, c_subv; /* version numbers we require */ - size_t len = strlen(skip) + strlen(fmt) + 1; /* format buffer len */ + size_t len; rc_majorv = rc_minorv = rc_subv = c_majorv = c_minorv = c_subv = -1; + strcpy(fmt, "%d.%d.%d"); /* we are expecting dotted triples */ + len = strlen(lskip) + strlen(fmt) + 1; /* format buffer len */ format = my_malloc(len + 1); - snprintf(format, len, "%s%s", skip, fmt); + snprintf(format, len, "%s%s", lskip, fmt); sscanf(line, format, &rc_majorv, &rc_minorv, &rc_subv); free(format); + free(lskip); /* we can't parse our own version number - should never happen */ - if (sscanf(version, fmt, &c_majorv, &c_minorv, &c_subv) != 3) + if (sscanf(lversion, fmt, &c_majorv, &c_minorv, &c_subv) != 3) { + free(lversion); return RC_ERROR; + } + free(lversion); if (c_majorv == rc_majorv && c_minorv == rc_minorv && c_subv == rc_subv) return RC_IGNORE; diff -Nurp tin-1.7.6/src/xref.c tin-1.7.7/src/xref.c --- tin-1.7.6/src/xref.c 2004-08-31 23:11:07.000000000 +0200 +++ tin-1.7.7/src/xref.c 2004-12-01 15:47:48.000000000 +0100 @@ -126,7 +126,7 @@ read_xref_header( FILE *fp; char *ptr, *q; char buf[HEADER_LEN]; - long artnum = 0L; + long artnum; snprintf(buf, sizeof(buf), "XHDR XREF %ld", art->artnum); if ((fp = nntp_command(buf, OK_HEAD, NULL, 0)) == NULL) diff -Nurp tin-1.7.6/tin.spec tin-1.7.7/tin.spec --- tin-1.7.6/tin.spec 2004-08-20 10:30:47.000000000 +0200 +++ tin-1.7.7/tin.spec 2004-11-15 18:44:21.000000000 +0100 @@ -1,6 +1,6 @@ Name: tin Summary: tin - an easy-to-use USENET news reader -Version: 1.7.6 +Version: 1.7.7 Release: 1 Copyright: BSD Group: Applications/News