about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--CHANGES68
-rw-r--r--INSTALLATION5
-rw-r--r--WWW/Library/Implementation/HTCJK.h4
-rw-r--r--WWW/Library/Implementation/HTGopher.c9
-rw-r--r--WWW/Library/Implementation/HTGroup.c4
-rw-r--r--WWW/Library/Implementation/HTLex.c18
-rw-r--r--WWW/Library/Implementation/HTMIME.c85
-rw-r--r--WWW/Library/Implementation/HTMIME.h14
-rw-r--r--WWW/Library/Implementation/HTNews.c84
-rw-r--r--WWW/Library/Implementation/HTParse.c16
-rw-r--r--WWW/Library/Implementation/HTTCP.c21
-rw-r--r--WWW/Library/Implementation/HTTP.c2
-rw-r--r--WWW/Library/Implementation/SGML.c44
-rw-r--r--WWW/Library/Implementation/UCMap.h5
-rw-r--r--aclocal.m4309
-rwxr-xr-xconfig.guess536
-rwxr-xr-xconfig.sub67
-rwxr-xr-xconfigure5392
-rw-r--r--configure.in14
-rw-r--r--docs/CMU.announce31
-rwxr-xr-xinstall.sh139
-rw-r--r--lynx.cfg16
-rw-r--r--lynx.rsp1
-rw-r--r--makefile.bcb4
-rwxr-xr-xmkdirs.sh3
-rw-r--r--po/ChangeLog99
-rw-r--r--po/ca.po415
-rw-r--r--po/cs.po415
-rw-r--r--po/da.po415
-rw-r--r--po/de.po415
-rw-r--r--po/es.po27
-rw-r--r--po/et.po415
-rw-r--r--po/fr.po415
-rw-r--r--po/hu.po415
-rw-r--r--po/it.po415
-rw-r--r--po/ja.po415
-rw-r--r--po/ko.po11
-rw-r--r--po/lynx.pot421
-rw-r--r--po/nl.po415
-rw-r--r--po/no.po11
-rw-r--r--po/pl.po11
-rw-r--r--po/pt.po27
-rw-r--r--po/pt_BR.po415
-rw-r--r--po/ru.po415
-rw-r--r--po/rw.po415
-rw-r--r--po/sl.po417
-rw-r--r--po/sv.po415
-rw-r--r--po/tr.po415
-rw-r--r--po/uk.po417
-rw-r--r--po/vi.po415
-rw-r--r--po/zh_CN.po415
-rw-r--r--po/zh_TW.po415
-rw-r--r--src/GridText.c38
-rw-r--r--src/HTML.c25
-rw-r--r--src/LYCharUtils.c15
-rw-r--r--src/LYCookie.c4
-rw-r--r--src/LYCurses.c38
-rw-r--r--src/LYForms.c3
-rw-r--r--src/LYJump.c2
-rw-r--r--src/LYMain.c21
-rw-r--r--src/LYMainLoop.c6
-rw-r--r--src/LYOptions.c4
-rw-r--r--src/LYReadCFG.c6
-rw-r--r--src/LYStrings.c40
-rw-r--r--src/LYUtils.c97
-rw-r--r--src/LYUtils.h1
-rw-r--r--src/LYrcFile.h2
-rw-r--r--src/TRSTable.c4
-rw-r--r--src/UCAux.c4
-rw-r--r--src/UCdomap.c86
-rw-r--r--userdefs.h4
71 files changed, 8602 insertions, 7600 deletions
diff --git a/CHANGES b/CHANGES
index f40dd9b5..b71d923f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,14 +1,72 @@
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2005-10-17 (2.8.6dev.14)
+* add configure script support for large files; some changes made be needed to
+  the C code in dev.15 to exploit this -TD
+* work around part of the forms-menu extra wrapping from dev.12 by adjusting
+  text-field maximum size in HText_beginInput().  There is still wrapping of
+  options lists, which has to be treated differently.  The cause for this
+  is the fix made to HText_appendCharacter() in dev.12 -TD
+* extend experimental option --enable-japanese-utf8, allowing lynx to convert
+  EUC-JP and Shift_JIS strings to UTF-8 -TH
+* modify CF_BUILD_CC to avoid clobbering environment variable $BUILD_CC
+  (from ncurses changes) -TD
+* remove special case in CF_XOPEN_SOURCE which suppresses _XOPEN_SOURCE
+  definition for Darwin (request by Emanuele Giaquinta)
+* fix an off-by-one error in comparison in HText_appendCharacter(), from dev.12
+  changes which showed up as wrapped lines in the options menu -TD
+* use h_addr_list[0] rather than h_addr in HTTCP.c for POSIX compatibility
+  (Emanuele Giaquinta)
+* remove references to LIBCMU in HTTCP.c, since it is long obsolete -TD
+* force a newline in HTML_end_element() after a </pre>, which causes lines
+  containing only whitespace before the </pre> to display a new line, rather
+  than putting that whitespace before text that follows the </pre> (report by
+  Thorsten Glaser for http://gcc.gnu.org/gcc-4.1/changes.html) -TD
+* improve fix for LYstartPopup() in dev.6 by keeping the menu width as-is and
+  adjusting its position rather than simply using the full screen-width when
+  the first try fails (report by Gene Small) -TD
+* correct logic in lynx_default_colors() so the color-style configuration does
+  not attempt to use default colors on a terminal which does not support it
+  (report by Bryan Henderson) -TD
+* add/improve limit checks in HTLex.c -Ulf Harnhammar, TD
+* ifdef'd out unused code in HTGroup.c -TD
+* eliminate fixed-size buffers in LYExpandHostForURL() to guard against
+  buffer overflow resulting from too-long domain prefix/suffix data from
+  lynx.cfg (report by Ulf Harnhammar, CAN-2005-3120) -TD
+* add a check for missing ':' in gopher response, to recover from the error
+  (patch by Ulf Harnhammar)
+* eliminate fixed-size buffers in HTrjis() and related functions to avoid
+  potential buffer overflow in nntp pages (report by Ulf Harnhammar) -TD
+* correct "escape" character used in HTMake822Word, which was literally an
+  ASCII escape character rather than the RFC-822 backslash from 2.8.2dev.3
+  changes (report by Frederic Briere, Debian #318034) -TD
+* fix:  when first "option" element of "select" had "disabled" attribute, Lynx
+  turned the entire "option/choice list" UNMODIFIABLE.  The "disabled"
+  attribute of later "option" elements within the same "select" did not have
+  this effect.  If the "disabled" attribute is honored, it should disable only
+  that element, not parent element or sibling elements (report by Paavo
+  Hartikainen) -TD
+* make CF_TAR_OPTIONS configure macro work with DJGPP by using $EXEEXT -DK
+* update config.guess (2005-09-19) and config.sub (2005-07-08)
+* configure script updates from tin and ncurses -TD
+* modify LYwaddnstr() to avoid sign-extension from changes in dev.12 (report
+  by FLWM) -TD
+* modify initialization so that
+	cat options.txt | lynx -
+  will allow interactive use (report by Arne Kowallik) -TD
+* add NO_MARGINS and NO_TITLE to lynx.cfg (request by Stef Caunter) -TD
+* adjust line-position for form fields when -notitle option is used (report by
+  Arne Kowallik) -TD
+
 2005-06-07 (2.8.6dev.13)
-+ add a check in LYnormalColor() to ensure that the color value is really
+* add a check in LYnormalColor() to ensure that the color value is really
   a color, i.e., do not do anything for monochrome displays (reports by
   OpenMacNews and Jens Schleusener) -TD
-+ make -nomargins option apply to Options menu layout -TD
-+ changes to LYwaddnstr() in dev.12 exposed a case from dev.6 where the title
+* make -nomargins option apply to Options menu layout -TD
+* changes to LYwaddnstr() in dev.12 exposed a case from dev.6 where the title
   string was not truncated to avoid wrapping (report by PG) -TD
-+ changes to LYwaddnstr() in dev.12 allowed recursion in a case that was only
+* changes to LYwaddnstr() in dev.12 allowed recursion in a case that was only
   designed for iteration (report by OpenMacNews) -TD
 
 2005-06-02 (2.8.6dev.12)
@@ -48,7 +106,7 @@ Changes since Lynx 2.8 release
   modified the LYcolLimit variable, changing it from the last usable column
   value to the number of columns (report by DK) -TD
 * correct expression in HText_appendCharacter() which was simplified in
-  2.8.5dev.4, but broke a comparison used for text-justification -TD 
+  2.8.5dev.4, but broke a comparison used for text-justification -TD
 * adjust wide-character offset computation in HText_trimHightext() to account
   for soft newlines, i.e., the cell reserved to show continuation lines -TD
 * modify source-view toggle to keep the current anchor visible.  Toggling
diff --git a/INSTALLATION b/INSTALLATION
index 7d7d94c6..9a137992 100644
--- a/INSTALLATION
+++ b/INSTALLATION
@@ -285,6 +285,11 @@ II. Compile instructions -- UNIX
 	requested, the configure script will otherwise use the messages in the
 	./po subdirectory.
 
+  --disable-largefiles			(prevent defining LONG_LIST)
+
+	Use this option to disable the compiler and linker options that
+	provide largefile interfaces.
+
   --disable-long-list			(prevent defining LONG_LIST)
 	Use this option to disable long "ls -l" directory listings (when
 	enabled, the actual directory style is configurable from lynx.cfg).
diff --git a/WWW/Library/Implementation/HTCJK.h b/WWW/Library/Implementation/HTCJK.h
index 6bdc41c4..5835a3c8 100644
--- a/WWW/Library/Implementation/HTCJK.h
+++ b/WWW/Library/Implementation/HTCJK.h
@@ -21,10 +21,6 @@ extern "C" {
 /*
  *	STATUS CHANGE CODES
  */
-#ifdef ESC
-#undef ESC
-#endif				/* ESC */
-#define ESC		CH_ESC	/* S/390 -- gil -- 0098 */
 #define TO_2BCODE	'$'
 #define TO_1BCODE	'('
 #define TO_KANA		'\016'
diff --git a/WWW/Library/Implementation/HTGopher.c b/WWW/Library/Implementation/HTGopher.c
index 49a8ce83..b9bdeb48 100644
--- a/WWW/Library/Implementation/HTGopher.c
+++ b/WWW/Library/Implementation/HTGopher.c
@@ -455,7 +455,7 @@ static void parse_cso(const char *arg,
     int ich;
     char line[BIG];
     char *p = line;
-    char *second_colon, last_char = '\0';
+    char *first_colon, *second_colon, last_char = '\0';
     const char *title;
 
     START(HTML_HEAD);
@@ -524,7 +524,11 @@ static void parse_cso(const char *arg,
 		/*
 		 * Find the second_colon.
 		 */
-		second_colon = strchr(strchr(p, ':') + 1, ':');
+		second_colon = NULL;
+		first_colon = strchr(p, ':');
+		if (first_colon != NULL) {
+		    second_colon = strchr(first_colon + 1, ':');
+		}
 
 		if (second_colon != NULL) {	/* error check */
 
@@ -1107,6 +1111,7 @@ static int generate_cso_form(char *host,
     };
 
     out = 0;
+    memset(&ctx, 0, sizeof(ctx));
     ctx.host = host;
     ctx.seek = (char *) 0;
     ctx.port = port;
diff --git a/WWW/Library/Implementation/HTGroup.c b/WWW/Library/Implementation/HTGroup.c
index 3bbec6d1..81de673e 100644
--- a/WWW/Library/Implementation/HTGroup.c
+++ b/WWW/Library/Implementation/HTGroup.c
@@ -293,6 +293,7 @@ GroupDef *HTAA_parseGroupDef(FILE *fp)
     return group_def;
 }
 
+#if 0
 static GroupDef *parse_group_decl(FILE *fp)
 {
     char *group_name = NULL;
@@ -381,6 +382,7 @@ static GroupDefList *parse_group_file(FILE *fp)
 
     return group_def_list;
 }
+#endif
 
 /*
  * Trace functions
@@ -442,6 +444,7 @@ void HTAA_printGroupDef(GroupDef *group_def)
     fprintf(tfp, "\n");
 }
 
+#if 0
 static void print_group_def_list(GroupDefList *group_list)
 {
     GroupDefList *cur = group_list;
@@ -748,3 +751,4 @@ void GroupDef_delete(GroupDef *group_def)
 	FREE(group_def);
     }
 }
+#endif
diff --git a/WWW/Library/Implementation/HTLex.c b/WWW/Library/Implementation/HTLex.c
index 6a7025a7..5a0df917 100644
--- a/WWW/Library/Implementation/HTLex.c
+++ b/WWW/Library/Implementation/HTLex.c
@@ -44,9 +44,9 @@ LexItem lex(FILE *fp)
 
     if (fp != cache) {		/* This cache doesn't work ok because the system  */
 	cache = fp;		/* often assign same FILE structure the next open */
-	HTlex_line = 1;		/* file.  So, if there are syntax errors in setup */
+	HTlex_line = 1;		/* file.  So, if there are syntax errors in setup *
+				   files it may confuse things later on.      */
     }
-    /* files it may confuse things later on.      */
     if (lex_pushed_back != LEX_NONE) {
 	LexItem ret = lex_pushed_back;
 
@@ -93,11 +93,13 @@ LexItem lex(FILE *fp)
 		    return LEX_CLOSE_PAREN;
 		case '@':
 		    return LEX_AT_SIGN;
-		default:;	/* Leading white space ignored (SP,TAB,CR) */
+		default:	/* Leading white space ignored (SP,TAB,CR) */
+		    break;
 		}
 	    break;
 	default:
-	    HTlex_buffer[lex_cnt++] = (char) ch;
+	    if (lex_cnt < (int) (sizeof(HTlex_buffer) - 1))
+		HTlex_buffer[lex_cnt++] = (char) ch;
 	    HTlex_buffer[lex_cnt] = '\0';
 	    if ('*' == ch)
 		lex_template = YES;
@@ -107,7 +109,7 @@ LexItem lex(FILE *fp)
 
 const char *lex_verbose(LexItem lex_item)
 {
-    static char msg[100];	/* @@@@@@@@ */
+    static char msg[sizeof(HTlex_buffer) + 30];		/* @@@@@@@@ */
 
     switch (lex_item) {
     case LEX_NONE:		/* Internally used      */
@@ -127,10 +129,12 @@ const char *lex_verbose(LexItem lex_item)
     case LEX_AT_SIGN:		/* Address qualifier    */
 	return "address qualifier '@'";
     case LEX_ALPH_STR:		/* Alphanumeric string  */
-	sprintf(msg, "alphanumeric string '%.70s'", HTlex_buffer);
+	sprintf(msg, "alphanumeric string '%.*s'",
+		(int) sizeof(HTlex_buffer), HTlex_buffer);
 	return msg;
     case LEX_TMPL_STR:		/* Template string      */
-	sprintf(msg, "template string '%.70s'", HTlex_buffer);
+	sprintf(msg, "template string '%.*s'",
+		(int) sizeof(HTlex_buffer), HTlex_buffer);
 	return msg;
     default:
 	return "UNKNOWN-LEX-ITEM";
diff --git a/WWW/Library/Implementation/HTMIME.c b/WWW/Library/Implementation/HTMIME.c
index 314d7b1a..61b92f65 100644
--- a/WWW/Library/Implementation/HTMIME.c
+++ b/WWW/Library/Implementation/HTMIME.c
@@ -2122,26 +2122,23 @@ HTStream *HTMIMERedirect(HTPresentation *pres,
  *
  *	Written by S. Ichikawa,
  *	partially inspired by encdec.c of <jh@efd.lth.se>.
- *	Assume caller's buffer is LINE_LENGTH bytes, these decode to
- *	no longer than the input strings.
+ *	Caller's buffers decode to no longer than the input strings.
  */
-#define LINE_LENGTH 512		/* Maximum length of line of ARTICLE etc */
-#ifdef ESC
-#undef ESC
-#endif /* ESC */
 #include <LYCharVals.h>		/* S/390 -- gil -- 0163 */
-#define ESC	CH_ESC
 
 static char HTmm64[] =
 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
 static char HTmmquote[] = "0123456789ABCDEF";
 static int HTmmcont = 0;
 
-void HTmmdec_base64(char *t,
-		    char *s)
+static void HTmmdec_base64(char **t,
+			   char *s)
 {
     int d, count, j, val;
-    char buf[LINE_LENGTH], *bp, nw[4], *p;
+    char *buf, *bp, nw[4], *p;
+
+    if ((buf = malloc(strlen(s) * 3 + 1)) == 0)
+	outofmem(__FILE__, "HTmmdec_base64");
 
     for (bp = buf; *s; s += 4) {
 	val = 0;
@@ -2172,13 +2169,17 @@ void HTmmdec_base64(char *t,
 	    *bp++ = nw[2];
     }
     *bp = '\0';
-    strcpy(t, buf);
+    StrAllocCopy(*t, buf);
+    FREE(buf);
 }
 
-void HTmmdec_quote(char *t,
-		   char *s)
+static void HTmmdec_quote(char **t,
+			  char *s)
 {
-    char buf[LINE_LENGTH], cval, *bp, *p;
+    char *buf, cval, *bp, *p;
+
+    if ((buf = malloc(strlen(s) + 1)) == 0)
+	outofmem(__FILE__, "HTmmdec_quote");
 
     for (bp = buf; *s;) {
 	if (*s == '=') {
@@ -2205,22 +2206,26 @@ void HTmmdec_quote(char *t,
 	}
     }
     *bp = '\0';
-    strcpy(t, buf);
+    StrAllocCopy(*t, buf);
+    FREE(buf);
 }
 
 /*
  *	HTmmdecode for ISO-2022-JP - FM
  */
-void HTmmdecode(char *trg,
-		char *str)
+void HTmmdecode(char **target,
+		char *source)
 {
-    char buf[LINE_LENGTH], mmbuf[LINE_LENGTH];
+    char *buf;
+    char *mmbuf = NULL;
+    char *m2buf = NULL;
     char *s, *t, *u;
     int base64, quote;
 
-    buf[0] = '\0';
+    if ((buf = malloc(strlen(source) + 1)) == 0)
+	outofmem(__FILE__, "HTmmdecode");
 
-    for (s = str, u = buf; *s;) {
+    for (s = source, u = buf; *s;) {
 	if (!strncasecomp(s, "=?ISO-2022-JP?B?", 16)) {
 	    base64 = 1;
 	} else {
@@ -2234,15 +2239,18 @@ void HTmmdecode(char *trg,
 	if (base64 || quote) {
 	    if (HTmmcont) {
 		for (t = s - 1;
-		     t >= str && (*t == ' ' || *t == '\t'); t--) {
+		     t >= source && (*t == ' ' || *t == '\t'); t--) {
 		    u--;
 		}
 	    }
+	    if (mmbuf == 0)	/* allocate buffer big enough for source */
+		StrAllocCopy(mmbuf, source);
 	    for (s += 16, t = mmbuf; *s;) {
 		if (s[0] == '?' && s[1] == '=') {
 		    break;
 		} else {
 		    *t++ = *s++;
+		    *t = '\0';
 		}
 	    }
 	    if (s[0] != '?' || s[1] != '=') {
@@ -2252,14 +2260,12 @@ void HTmmdecode(char *trg,
 		*t = '\0';
 	    }
 	    if (base64)
-		HTmmdec_base64(mmbuf, mmbuf);
+		HTmmdec_base64(&m2buf, mmbuf);
 	    if (quote)
-		HTmmdec_quote(mmbuf, mmbuf);
-	    for (t = mmbuf; *t;)
+		HTmmdec_quote(&m2buf, mmbuf);
+	    for (t = m2buf; *t;)
 		*u++ = *t++;
 	    HTmmcont = 1;
-	    /* if (*s == ' ' || *s == '\t') *u++ = *s; */
-	    /* for ( ; *s == ' ' || *s == '\t'; s++) ; */
 	} else {
 	    if (*s != ' ' && *s != '\t')
 		HTmmcont = 0;
@@ -2268,29 +2274,37 @@ void HTmmdecode(char *trg,
     }
     *u = '\0';
   end:
-    strcpy(trg, buf);
+    StrAllocCopy(*target, buf);
+    FREE(m2buf);
+    FREE(mmbuf);
+    FREE(buf);
 }
 
 /*
  *  Insert ESC where it seems lost.
  *  (The author of this function "rjis" is S. Ichikawa.)
  */
-int HTrjis(char *t,
+int HTrjis(char **t,
 	   char *s)
 {
-    char *p, buf[LINE_LENGTH];
+    char *p;
+    char *buf = NULL;
     int kanji = 0;
 
-    if (strchr(s, ESC) || !strchr(s, '$')) {
-	if (s != t)
-	    strcpy(t, s);
+    if (strchr(s, CH_ESC) || !strchr(s, '$')) {
+	if (s != *t)
+	    StrAllocCopy(*t, s);
 	return 1;
     }
+
+    if ((buf = malloc(strlen(s) * 2 + 1)) == 0)
+	outofmem(__FILE__, "HTrjis");
+
     for (p = buf; *s;) {
 	if (!kanji && s[0] == '$' && (s[1] == '@' || s[1] == 'B')) {
 	    if (HTmaybekanji((int) s[2], (int) s[3])) {
 		kanji = 1;
-		*p++ = ESC;
+		*p++ = CH_ESC;
 		*p++ = *s++;
 		*p++ = *s++;
 		*p++ = *s++;
@@ -2302,7 +2316,7 @@ int HTrjis(char *t,
 	}
 	if (kanji && s[0] == '(' && (s[1] == 'J' || s[1] == 'B')) {
 	    kanji = 0;
-	    *p++ = ESC;
+	    *p++ = CH_ESC;
 	    *p++ = *s++;
 	    *p++ = *s++;
 	    continue;
@@ -2311,7 +2325,8 @@ int HTrjis(char *t,
     }
     *p = *s;			/* terminate string */
 
-    strcpy(t, buf);
+    StrAllocCopy(*t, buf);
+    FREE(buf);
     return 0;
 }
 
diff --git a/WWW/Library/Implementation/HTMIME.h b/WWW/Library/Implementation/HTMIME.h
index e8ecb3b4..6410c158 100644
--- a/WWW/Library/Implementation/HTMIME.h
+++ b/WWW/Library/Implementation/HTMIME.h
@@ -69,17 +69,11 @@ extern "C" {
   For handling Japanese headers.
 
 */
-    extern void HTmmdec_base64(char *t,
-			       char *s);
+    extern void HTmmdecode(char **target,
+			   char *source);
 
-    extern void HTmmdec_quote(char *t,
-			      char *s);
-
-    extern void HTmmdecode(char *trg,
-			   char *str);
-
-    extern int HTrjis(char *t,
-		      char *s);
+    extern int HTrjis(char **target,
+		      char *source);
 
     extern int HTmaybekanji(int c1,
 			    int c2);
diff --git a/WWW/Library/Implementation/HTNews.c b/WWW/Library/Implementation/HTNews.c
index 6163fdee..bea534fa 100644
--- a/WWW/Library/Implementation/HTNews.c
+++ b/WWW/Library/Implementation/HTNews.c
@@ -980,7 +980,6 @@ static void post_article(char *postfile)
     }
 }
 
-#ifdef SH_EX			/* for MIME */
 #ifdef NEWS_DEBUG
 /* for DEBUG 1997/11/07 (Fri) 17:20:16 */
 void debug_print(unsigned char *p)
@@ -1002,44 +1001,15 @@ void debug_print(unsigned char *p)
 }
 #endif
 
-static char *decode_mime(char *str)
+static char *decode_mime(char **str)
 {
-    char temp[LINE_LENGTH];	/* FIXME: what determines the actual size? */
-    char *p, *q;
-
-    if (str == NULL)
-	return "";
-
+#ifdef SH_EX
     if (HTCJK != JAPANESE)
-	return str;
-
-    LYstrncpy(temp, str, sizeof(temp) - 1);
-    q = temp;
-    while ((p = strchr(q, '=')) != 0) {
-	if (p[1] == '?') {
-	    HTmmdecode(p, p);
-	    q = p + 2;
-	} else {
-	    q = p + 1;
-	}
-    }
-#ifdef NEWS_DEBUG
-    printf("new=[");
-    debug_print(temp);
+	return *str;
 #endif
-    HTrjis(temp, temp);
-    strcpy(str, temp);
-
-    return str;
+    HTmmdecode(str, *str);
+    return HTrjis(str, *str) ? *str : "";
 }
-#else /* !SH_EX */
-static char *decode_mime(char *str)
-{
-    HTmmdecode(str, str);
-    HTrjis(str, str);
-    return str;
-}
-#endif
 
 /*	Read in an Article					read_article
  *	------------------
@@ -1128,22 +1098,22 @@ static int read_article(HTParentAnchor *thisanchor)
 
 		} else if (match(full_line, "SUBJECT:")) {
 		    StrAllocCopy(subject, HTStrip(strchr(full_line, ':') + 1));
-		    decode_mime(subject);
+		    decode_mime(&subject);
 		} else if (match(full_line, "DATE:")) {
 		    StrAllocCopy(date, HTStrip(strchr(full_line, ':') + 1));
 
 		} else if (match(full_line, "ORGANIZATION:")) {
 		    StrAllocCopy(organization,
 				 HTStrip(strchr(full_line, ':') + 1));
-		    decode_mime(organization);
+		    decode_mime(&organization);
 
 		} else if (match(full_line, "FROM:")) {
 		    StrAllocCopy(from, HTStrip(strchr(full_line, ':') + 1));
-		    decode_mime(from);
+		    decode_mime(&from);
 
 		} else if (match(full_line, "REPLY-TO:")) {
 		    StrAllocCopy(replyto, HTStrip(strchr(full_line, ':') + 1));
-		    decode_mime(replyto);
+		    decode_mime(&replyto);
 
 		} else if (match(full_line, "NEWSGROUPS:")) {
 		    StrAllocCopy(newsgroups, HTStrip(strchr(full_line, ':') + 1));
@@ -1756,8 +1726,8 @@ static int read_group(const char *groupName,
 		      int last_required)
 {
     char line[LINE_LENGTH + 1];
-    char author[LINE_LENGTH + 1];
-    char subject[LINE_LENGTH + 1];
+    char *author = NULL;
+    char *subject = NULL;
     char *date = NULL;
     int i;
     char *p;
@@ -1769,9 +1739,6 @@ static int read_group(const char *groupName,
     int art;			/* Article number WITHIN GROUP */
     int status, count, first, last;	/* Response fields */
 
-    /* count is only an upper limit */
-
-    author[0] = '\0';
     START(HTML_HEAD);
     PUTC('\n');
     START(HTML_TITLE);
@@ -1995,8 +1962,8 @@ static int read_group(const char *groupName,
 			case 'S':
 			case 's':
 			    if (match(line, "SUBJECT:")) {
-				LYstrncpy(subject, line + 9, sizeof(subject) - 1);	/* Save subject */
-				decode_mime(subject);
+				StrAllocCopy(subject, line + 9);
+				decode_mime(&subject);
 			    }
 			    break;
 
@@ -2015,10 +1982,8 @@ static int read_group(const char *groupName,
 			    if (match(line, "FROM:")) {
 				char *p2;
 
-				LYstrncpy(author,
-					  author_name(strchr(line, ':') + 1),
-					  sizeof(author) - 1);
-				decode_mime(author);
+				StrAllocCopy(author, strchr(line, ':') + 1);
+				decode_mime(&author);
 				p2 = author + strlen(author) - 1;
 				if (*p2 == LF)
 				    *p2 = '\0';		/* Chop off newline */
@@ -2039,11 +2004,8 @@ static int read_group(const char *groupName,
 
 		PUTC('\n');
 		START(HTML_LI);
-#ifdef SH_EX			/* for MIME */
-		HTSprintf0(&temp, "\"%s\"", decode_mime(subject));
-#else
-		HTSprintf0(&temp, "\"%s\"", subject);
-#endif
+		p = decode_mime(&subject);
+		HTSprintf0(&temp, "\"%s\"", NonNull(p));
 		if (reference) {
 		    write_anchor(temp, reference);
 		    FREE(reference);
@@ -2052,18 +2014,14 @@ static int read_group(const char *groupName,
 		}
 		FREE(temp);
 
-		if (author[0] != '\0') {
+		if (author != NULL) {
 		    PUTS(" - ");
 		    if (LYListNewsDates)
 			START(HTML_I);
-#ifdef SH_EX			/* for MIME */
-		    PUTS(decode_mime(author));
-#else
-		    PUTS(author);
-#endif
+		    PUTS(decode_mime(&author));
 		    if (LYListNewsDates)
 			END(HTML_I);
-		    author[0] = '\0';
+		    FREE(author);
 		}
 		if (date) {
 		    if (!diagnostic) {
@@ -2107,6 +2065,8 @@ static int read_group(const char *groupName,
 		MAYBE_END(HTML_LI);
 	    }			/* Handle response to HEAD request */
 	}			/* Loop over article */
+	FREE(author);
+	FREE(subject);
     }				/* If read headers */
     PUTC('\n');
     if (LYListNewsNumbers)
diff --git a/WWW/Library/Implementation/HTParse.c b/WWW/Library/Implementation/HTParse.c
index 70dfa175..62f06736 100644
--- a/WWW/Library/Implementation/HTParse.c
+++ b/WWW/Library/Implementation/HTParse.c
@@ -1113,6 +1113,12 @@ static const unsigned char crfc[96] =
 	 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3 };	/* 7X  pqrstuvwxyz{|}~	DEL */
 /* *INDENT-ON* */
 
+#define ASCII_TAB '\011'
+#define ASCII_LF  '\012'
+#define ASCII_CR  '\015'
+#define ASCII_SPC '\040'
+#define ASCII_BAK '\134'
+
 /*
  *  Turn a string which is not a RFC 822 token into a quoted-string. - KW
  *  The "quoted" parameter tells whether we need the beginning/ending quote
@@ -1163,11 +1169,13 @@ void HTMake822Word(char **str,
     /* S/390 -- gil -- 0268 */
     for (p = *str; *p; p++) {
 	a = TOASCII(*p);
-	if ((a != '\011') && ((a & 127) < 32 ||
-			      (a < 128 && ((crfc[a - 32]) & 2))))
-	    *q++ = '\033';
+	if ((a != ASCII_TAB) &&
+	    ((a & 127) < ASCII_SPC ||
+	     (a < 128 && ((crfc[a - 32]) & 2))))
+	    *q++ = ASCII_BAK;
 	*q++ = *p;
-	if (a == '\012' || (a == '\015' && (TOASCII(*(p + 1)) != '\012')))
+	if (a == ASCII_LF ||
+	    (a == ASCII_CR && (TOASCII(*(p + 1)) != ASCII_LF)))
 	    *q++ = ' ';
     }
     if (quoted)
diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c
index 452dfae7..3b02528d 100644
--- a/WWW/Library/Implementation/HTTCP.c
+++ b/WWW/Library/Implementation/HTTCP.c
@@ -629,7 +629,7 @@ extern int h_errno;
  *  itself, in a buffer of size REHOSTENT_SIZE.  If not everything fits,
  *  some info is omitted, but the function is careful to still return
  *  a valid structure, without truncating strings; it tries to return,
- *  in order of decreasing priority, the first address (h_addr), the
+ *  in order of decreasing priority, the first address (h_addr_list[0]), the
  *  official name (h_name), the additional addresses, then alias names.
  *
  *  If NULL is returned, the reason is made available in the global
@@ -1293,7 +1293,7 @@ static int HTParseInet(SockA * soc_in, const char *str)
 	phost = LYGetHostByName(host);	/* See above */
 	if (!phost)
 	    goto failed;
-	memcpy((void *) &soc_in->sin_addr, phost->h_addr, phost->h_length);
+	memcpy((void *) &soc_in->sin_addr, phost->h_addr_list[0], phost->h_length);
 #else /* !_WINDOWS_NSL */
 	{
 	    LYNX_HOSTENT *phost;
@@ -1302,25 +1302,12 @@ static int HTParseInet(SockA * soc_in, const char *str)
 
 	    if (!phost)
 		goto failed;
-#if defined(VMS) && defined(CMU_TCP)
-	    /*
-	     * In LIBCMU, phost->h_length contains not the length of one
-	     * address (four bytes) but the number of bytes in *h_addr, i.e.,
-	     * some multiple of four.  Thus we need to hard code the value
-	     * here, and remember to change it if/when IP addresses change in
-	     * size.  :-( LIBCMU is no longer supported, and CMU users are
-	     * encouraged to obtain and use SOCKETSHR/NETLIB instead.  - S. 
-	     * Bjorndahl
-	     */
-	    memcpy((void *) &soc_in->sin_addr, phost->h_addr, 4);
-#else
 	    if (!phost)
 		goto failed;
 	    if (phost->h_length != sizeof soc_in->sin_addr) {
 		HTAlwaysAlert(host, gettext("Address length looks invalid"));
 	    }
-	    memcpy((void *) &soc_in->sin_addr, phost->h_addr, phost->h_length);
-#endif /* VMS && CMU_TCP */
+	    memcpy((void *) &soc_in->sin_addr, phost->h_addr_list[0], phost->h_length);
 	}
 #endif /* _WINDOWS_NSL */
 
@@ -1478,7 +1465,7 @@ static void get_host_details(void)
 	return;			/* Fail! */
     }
     StrAllocCopy(hostname, phost->h_name);
-    memcpy(&HTHostAddress, &phost->h_addr, phost->h_length);
+    memcpy(&HTHostAddress, &phost->h_addr_list[0], phost->h_length);
 #endif /* INET6 */
     CTRACE((tfp, "     Name server says that I am `%s' = %s\n",
 	    hostname, HTInetString(&HTHostAddress)));
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c
index 0743cffc..7ced53bf 100644
--- a/WWW/Library/Implementation/HTTP.c
+++ b/WWW/Library/Implementation/HTTP.c
@@ -431,7 +431,7 @@ static int HTLoadHTTP(const char *arg,
     BOOL had_header;		/* Have we had at least one header? */
     char *line_buffer;
     char *line_kept_clean;
-    int real_length_of_line;
+    int real_length_of_line = 0;
     BOOL extensions;		/* Assume good HTTP server */
     char *linebuf = NULL;
     char temp[80];
diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c
index c73d312c..48e0587d 100644
--- a/WWW/Library/Implementation/SGML.c
+++ b/WWW/Library/Implementation/SGML.c
@@ -1605,9 +1605,45 @@ static void SGML_character(HTStream *context, char c_in)
      * If we want the raw input converted to Unicode, try that now.  - FM
      */
     if (context->T.trans_to_uni &&
-	((TOASCII(unsign_c) >= LYlowest_eightbit[context->inUCLYhndl]) ||	/* S/390 -- gil -- 0744 */
-	 (unsign_c < ' ' && unsign_c != 0 &&
-	  context->T.trans_C0_to_uni))) {
+#ifdef EXP_JAPANESEUTF8_SUPPORT
+	((strcmp(LYCharSet_UC[context->inUCLYhndl].MIMEname, "euc-jp") == 0) ||
+	 (strcmp(LYCharSet_UC[context->inUCLYhndl].MIMEname, "shift_jis") == 0))) {
+	if (strcmp(LYCharSet_UC[context->inUCLYhndl].MIMEname, "shift_jis") == 0) {
+	    if (context->utf_count == 0) {
+		if (IS_SJIS_HI1((unsigned char) c) ||
+		    IS_SJIS_HI2((unsigned char) c)) {
+		    context->utf_buf[0] = c;
+		    context->utf_count = 1;
+		    clong = -11;
+		}
+	    } else {
+		if (IS_SJIS_LO((unsigned char) c)) {
+		    context->utf_buf[1] = c;
+		    clong = UCTransJPToUni(context->utf_buf, 2, context->inUCLYhndl);
+		}
+		context->utf_count = 0;
+	    }
+	} else {
+	    if (context->utf_count == 0) {
+		if (IS_EUC_HI((unsigned char) c)) {
+		    context->utf_buf[0] = c;
+		    context->utf_count = 1;
+		    clong = -11;
+		}
+	    } else {
+		if (IS_EUC_LOX((unsigned char) c)) {
+		    context->utf_buf[1] = c;
+		    clong = UCTransJPToUni(context->utf_buf, 2, context->inUCLYhndl);
+		}
+		context->utf_count = 0;
+	    }
+	}
+	goto top1;
+    } else if (context->T.trans_to_uni &&
+#endif
+	       ((TOASCII(unsign_c) >= LYlowest_eightbit[context->inUCLYhndl]) ||	/* S/390 -- gil -- 0744 */
+		(unsign_c < ' ' && unsign_c != 0 &&
+		 context->T.trans_C0_to_uni))) {
 	/*
 	 * Convert the octet to Unicode.  - FM
 	 */
@@ -4851,7 +4887,7 @@ unsigned char *TO_EUC(const unsigned char *jis,
 		}
 	    }
 	}
-	if (c == ESC) {
+	if (c == CH_ESC) {
 	    if (*s == to2B) {
 		if ((s[1] == 'B') || (s[1] == '@')) {
 		    jis_stat = 0x80;
diff --git a/WWW/Library/Implementation/UCMap.h b/WWW/Library/Implementation/UCMap.h
index 7f074d3c..e0e86d36 100644
--- a/WWW/Library/Implementation/UCMap.h
+++ b/WWW/Library/Implementation/UCMap.h
@@ -29,6 +29,11 @@ extern "C" {
 			      int charset_in,
 			      int charset_out,
 			      int chk_single_flag);
+#ifdef EXP_JAPANESEUTF8_SUPPORT
+    extern UCode_t UCTransJPToUni(char *inbuf,
+				  int buflen,
+				  int charset_in);
+#endif
     extern UCode_t UCTransToUni(char ch_in,
 				int charset_in);
     extern int UCGetRawUniMode_byLYhndl(int i);
diff --git a/aclocal.m4 b/aclocal.m4
index aae0dfdd..c3dea1f1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -4,7 +4,7 @@ dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
 dnl and Philippe De Muyter <phdm@macqel.be>
 dnl
 dnl Created: 1997/1/28
-dnl Updated: 2005/1/1
+dnl Updated: 2005/10/16
 dnl
 dnl The autoconf used in Lynx development is GNU autoconf 2.13 or 2.52, patched
 dnl by Tom Dickey.  See your local GNU archives, and this URL:
@@ -97,7 +97,7 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl AM_ICONV version: 3 updated: 2002/10/27 23:21:42
+dnl AM_ICONV version: 4 updated: 2005/06/20 05:31:53
 dnl --------
 dnl Inserted as requested by gettext 0.10.40
 dnl File from /usr/share/aclocal
@@ -112,7 +112,8 @@ AC_DEFUN([AM_ICONV],
   dnl those with the standalone portable GNU libiconv installed).
 
   AC_ARG_WITH([libiconv-prefix],
-[  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib], [
+[  --with-libiconv-prefix=DIR
+                          search for libiconv in DIR/include and DIR/lib], [
     for dir in `echo "$withval" | tr : ' '`; do
       if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
       if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
@@ -866,7 +867,7 @@ if test "$cf_cv_bool_defs" = no ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_BUILD_CC version: 4 updated: 2004/11/27 16:03:59
+dnl CF_BUILD_CC version: 5 updated: 2005/09/24 17:55:52
 dnl -----------
 dnl If we're cross-compiling, allow the user to override the tools and their
 dnl options.  The configure script is oriented toward identifying the host
@@ -878,39 +879,59 @@ dnl $2 = default for $LIBS
 AC_DEFUN([CF_BUILD_CC],[
 AC_REQUIRE([CF_PROG_EXT])
 if test "$cross_compiling" = yes ; then
+
 	# defaults that we might want to override
-	: ${BUILD_CC:='$(CC)'}
-	: ${BUILD_CPP:='$(CC) -E'}
 	: ${BUILD_CFLAGS:=''}
 	: ${BUILD_CPPFLAGS:='ifelse([$1],,,[$1])'}
 	: ${BUILD_LDFLAGS:=''}
 	: ${BUILD_LIBS:='ifelse([$2],,,[$2])'}
 	: ${BUILD_EXEEXT:='$x'}
 	: ${BUILD_OBJEXT:='o'}
+
 	AC_ARG_WITH(build-cc,
 		[  --with-build-cc=XXX     the build C compiler ($BUILD_CC)],
 		[BUILD_CC="$withval"],
-		[AC_CHECK_PROGS(BUILD_CC, $CC gcc cc)])
+		[AC_CHECK_PROGS(BUILD_CC, gcc cc cl)])
+	AC_MSG_CHECKING(for native build C compiler)
+	AC_MSG_RESULT($BUILD_CC)
+
+	AC_MSG_CHECKING(for native build C preprocessor)
 	AC_ARG_WITH(build-cpp,
 		[  --with-build-cpp=XXX    the build C preprocessor ($BUILD_CPP)],
 		[BUILD_CPP="$withval"],
-		[BUILD_CPP='$(CC) -E'])
+		[BUILD_CPP='$(BUILD_CC) -E'])
+	AC_MSG_RESULT($BUILD_CPP)
+
+	AC_MSG_CHECKING(for native build C flags)
 	AC_ARG_WITH(build-cflags,
-		[  --with-build-cflags=XXX the build C compiler-flags],
+		[  --with-build-cflags=XXX the build C compiler-flags ($BUILD_CFLAGS)],
 		[BUILD_CFLAGS="$withval"])
+	AC_MSG_RESULT($BUILD_CFLAGS)
+
+	AC_MSG_CHECKING(for native build C preprocessor-flags)
 	AC_ARG_WITH(build-cppflags,
-		[  --with-build-cppflags=XXX the build C preprocessor-flags],
+		[  --with-build-cppflags=XXX the build C preprocessor-flags ($BUILD_CPPFLAGS)],
 		[BUILD_CPPFLAGS="$withval"])
+	AC_MSG_RESULT($BUILD_CPPFLAGS)
+
+	AC_MSG_CHECKING(for native build linker-flags)
 	AC_ARG_WITH(build-ldflags,
-		[  --with-build-ldflags=XXX the build linker-flags],
+		[  --with-build-ldflags=XXX the build linker-flags ($BUILD_LDFLAGS)],
 		[BUILD_LDFLAGS="$withval"])
+	AC_MSG_RESULT($BUILD_LDFLAGS)
+
+	AC_MSG_CHECKING(for native build linker-libraries)
 	AC_ARG_WITH(build-libs,
-		[  --with-build-libs=XXX   the build libraries],
+		[  --with-build-libs=XXX   the build libraries ($(BUILD_LIBS)],
 		[BUILD_LIBS="$withval"])
+	AC_MSG_RESULT($BUILD_LIBS)
+
 	# this assumes we're on Unix.
 	BUILD_EXEEXT=
 	BUILD_OBJEXT=o
 
+	: ${BUILD_CC:='$(CC)'}
+
 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '$(CC)' ) ; then
 		AC_MSG_ERROR([Cross-build requires two compilers.
 Use --with-build-cc to specify the native compiler.])
@@ -937,7 +958,7 @@ AC_SUBST(BUILD_EXEEXT)
 AC_SUBST(BUILD_OBJEXT)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_BUNDLED_INTL version: 11 updated: 2004/09/12 19:45:55
+dnl CF_BUNDLED_INTL version: 12 updated: 2005/06/21 18:24:28
 dnl ---------------
 dnl Top-level macro for configuring an application with a bundled copy of
 dnl the intl and po directories for gettext.
@@ -1002,7 +1023,7 @@ if test "$USE_INCLUDED_LIBINTL" = yes ; then
 			$srcdir/intl/makefile.in
 		do
 			if test -f "$cf_makefile" ; then
-				SUB_MAKEFILE="$SUB_MAKEFILE `echo ${cf_makefile}|sed -e ',^'$srcdir',,' -e 's/\.in$//'`:${cf_makefile}"
+				SUB_MAKEFILE="$SUB_MAKEFILE `echo \"${cf_makefile}\"|sed -e 's,^'$srcdir/',,' -e 's/\.in$//'`:${cf_makefile}"
 				break
 			fi
 		done
@@ -2124,7 +2145,7 @@ if test $cf_cv_type_unionwait = yes; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_ATTRIBUTES version: 9 updated: 2002/12/21 19:25:52
+dnl CF_GCC_ATTRIBUTES version: 10 updated: 2005/05/28 13:16:28
 dnl -----------------
 dnl Test for availability of useful gcc __attribute__ directives to quiet
 dnl compiler warnings.  Though useful, not all are supported -- and contrary
@@ -2172,18 +2193,18 @@ int main(int argc GCC_UNUSED, char *argv[[]] GCC_UNUSED) { return 0; }
 EOF
 	for cf_attribute in scanf printf unused noreturn
 	do
-		CF_UPPER(CF_ATTRIBUTE,$cf_attribute)
+		CF_UPPER(cf_ATTRIBUTE,$cf_attribute)
 		cf_directive="__attribute__(($cf_attribute))"
 		echo "checking for $CC $cf_directive" 1>&AC_FD_CC
 		case $cf_attribute in
 		scanf|printf)
 		cat >conftest.h <<EOF
-#define GCC_$CF_ATTRIBUTE 1
+#define GCC_$cf_ATTRIBUTE 1
 EOF
 			;;
 		*)
 		cat >conftest.h <<EOF
-#define GCC_$CF_ATTRIBUTE $cf_directive
+#define GCC_$cf_ATTRIBUTE $cf_directive
 EOF
 			;;
 		esac
@@ -2199,7 +2220,7 @@ rm -rf conftest*
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_VERSION version: 3 updated: 2003/09/06 19:16:57
+dnl CF_GCC_VERSION version: 4 updated: 2005/08/27 09:53:42
 dnl --------------
 dnl Find version of gcc
 AC_DEFUN([CF_GCC_VERSION],[
@@ -2207,13 +2228,13 @@ AC_REQUIRE([AC_PROG_CC])
 GCC_VERSION=none
 if test "$GCC" = yes ; then
 	AC_MSG_CHECKING(version of $CC)
-	GCC_VERSION="`${CC} --version|sed -e '2,$d' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
+	GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
 	AC_MSG_RESULT($GCC_VERSION)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 18 updated: 2004/12/03 20:51:07
+dnl CF_GCC_WARNINGS version: 20 updated: 2005/08/06 18:37:29
 dnl ---------------
 dnl Check if the compiler supports useful warning options.  There's a few that
 dnl we don't use, simply because they're too noisy:
@@ -2234,32 +2255,53 @@ dnl	If $with_ext_const is "yes", add a check for -Wwrite-strings
 dnl
 AC_DEFUN([CF_GCC_WARNINGS],
 [
-AC_REQUIRE([CF_INTEL_COMPILER])
 AC_REQUIRE([CF_GCC_VERSION])
+CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
+
+cat > conftest.$ac_ext <<EOF
+#line __oline__ "configure"
+int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
+EOF
+
 if test "$INTEL_COMPILER" = yes
 then
 # The "-wdXXX" options suppress warnings:
 # remark #1419: external declaration in primary source file
+# remark #1682: implicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
+# remark #1683: explicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
+# remark #1684: conversion from pointer to same-sized integral type (potential portability problem)
 # remark #193: zero used for undefined preprocessing identifier
 # remark #593: variable "curs_sb_left_arrow" was set but never used
 # remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits
 # remark #869: parameter "tw" was never referenced
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
-	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall \
- -wd1419 \
- -wd193 \
- -wd279 \
- -wd593 \
- -wd810 \
- -wd869 \
- -wd981"
+
+	AC_CHECKING([for $CC warning options])
+	cf_save_CFLAGS="$CFLAGS"
+	EXTRA_CFLAGS="-Wall"
+	for cf_opt in $1 \
+		wd1419 \
+		wd1682 \
+		wd1683 \
+		wd1684 \
+		wd193 \
+		wd279 \
+		wd593 \
+		wd810 \
+		wd869 \
+		wd981
+	do
+		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+		if AC_TRY_EVAL(ac_compile); then
+			test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt)
+			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+		fi
+	done
+	CFLAGS="$cf_save_CFLAGS"
+
 elif test "$GCC" = yes
 then
-	cat > conftest.$ac_ext <<EOF
-#line __oline__ "configure"
-int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
-EOF
 	AC_CHECKING([for $CC warning options])
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-W -Wall"
@@ -2296,9 +2338,10 @@ EOF
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
 	done
-	rm -f conftest*
 	CFLAGS="$cf_save_CFLAGS"
 fi
+rm -f conftest*
+
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
@@ -2405,7 +2448,7 @@ if test "$cf_x509_support" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GNU_SOURCE version: 4 updated: 2004/12/03 20:43:00
+dnl CF_GNU_SOURCE version: 6 updated: 2005/07/09 13:23:07
 dnl -------------
 dnl Check if we must define _GNU_SOURCE to get a reasonable value for
 dnl _XOPEN_SOURCE, upon which many POSIX definitions depend.  This is a defect
@@ -2415,9 +2458,6 @@ dnl
 dnl Well, yes we could work around it...
 AC_DEFUN([CF_GNU_SOURCE],
 [
-AC_REQUIRE([CF_INTEL_COMPILER])
-
-if test "$INTEL_COMPILER" = no ; then
 AC_CACHE_CHECK(if we must define _GNU_SOURCE,cf_cv_gnu_source,[
 AC_TRY_COMPILE([#include <sys/types.h>],[
 #ifndef _XOPEN_SOURCE
@@ -2436,7 +2476,6 @@ make an error
 	])
 ])
 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_HEADER_PATH version: 8 updated: 2002/11/10 14:46:59
@@ -2521,40 +2560,79 @@ else
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_INTEL_COMPILER version: 1 updated: 2004/12/03 20:27:48
+dnl CF_INTEL_COMPILER version: 3 updated: 2005/08/06 18:37:29
 dnl -----------------
-dnl Check if the given compiler is really the Intel compiler for Linux.
-dnl It tries to imitate gcc, but does not return an error when it finds a
-dnl mismatch between prototypes, e.g., as exercised by CF_MISSING_CHECK.
+dnl Check if the given compiler is really the Intel compiler for Linux.  It
+dnl tries to imitate gcc, but does not return an error when it finds a mismatch
+dnl between prototypes, e.g., as exercised by CF_MISSING_CHECK.
+dnl
+dnl This macro should be run "soon" after AC_PROG_CC or AC_PROG_CPLUSPLUS, to
+dnl ensure that it is not mistaken for gcc/g++.  It is normally invoked from
+dnl the wrappers for gcc and g++ warnings.
 dnl
-dnl This macro should be run "soon" after AC_PROG_CC, to ensure that it is
-dnl not mistaken for gcc.
+dnl $1 = GCC (default) or GXX
+dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
+dnl $3 = CFLAGS (default) or CXXFLAGS
 AC_DEFUN([CF_INTEL_COMPILER],[
-AC_REQUIRE([AC_PROG_CC])
+ifelse($2,,INTEL_COMPILER,[$2])=no
 
-INTEL_COMPILER=no
-
-if test "$GCC" = yes ; then
+if test "$ifelse($1,,[$1],GCC)" = yes ; then
 	case $host_os in
 	linux*|gnu*)
-		AC_MSG_CHECKING(if this is really Intel compiler)
-		cf_save_CFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS -no-gcc"
+		AC_MSG_CHECKING(if this is really Intel ifelse($1,GXX,C++,C) compiler)
+		cf_save_CFLAGS="$ifelse($3,,CFLAGS,[$3])"
+		ifelse($3,,CFLAGS,[$3])="$ifelse($3,,CFLAGS,[$3]) -no-gcc"
 		AC_TRY_COMPILE([],[
 #ifdef __INTEL_COMPILER
 #else
 make an error
 #endif
-],[INTEL_COMPILER=yes
+],[ifelse($2,,INTEL_COMPILER,[$2])=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
 ],[])
-		CFLAGS="$cf_save_CFLAGS"
-		AC_MSG_RESULT($INTEL_COMPILER)
+		ifelse($3,,CFLAGS,[$3])="$cf_save_CFLAGS"
+		AC_MSG_RESULT($ifelse($2,,INTEL_COMPILER,[$2]))
 		;;
 	esac
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_LARGEFILE version: 5 updated: 2005/07/17 11:03:36
+dnl ------------
+dnl Add checks for large file support.
+AC_DEFUN([CF_LARGEFILE],[
+ifdef([AC_FUNC_FSEEKO],[
+	AC_FUNC_FSEEKO
+	AC_SYS_LARGEFILE
+
+	# Normally we would collect these definitions in the config.h,
+	# but (like _XOPEN_SOURCE), some environments rely on having these
+	# defined before any of the system headers are included.  Another
+	# case comes up with C++, e.g., on AIX the compiler compiles the
+	# header files by themselves before looking at the body files it is
+	# told to compile.  For ncurses, those header files do not include
+	# the config.h
+	test "$ac_cv_sys_large_files"      != no && CPPFLAGS="$CPPFLAGS -D_LARGE_FILES "
+	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
+
+	AC_CACHE_CHECK(whether to use struct dirent64, cf_cv_struct_dirent64,[
+		AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <dirent.h>
+		],[
+		/* if transitional largefile support is setup, this is true */
+		extern struct dirent64 * readdir(DIR *);
+		struct dirent64 *x = readdir((DIR *)0);
+		struct dirent *y = readdir((DIR *)0);
+		int z = x - y;
+		],
+		[cf_cv_struct_dirent64=yes],
+		[cf_cv_struct_dirent64=no])
+	])
+	test "$cf_cv_struct_dirent64" = yes && AC_DEFINE(HAVE_STRUCT_DIRENT64)
+])
+])
+dnl ---------------------------------------------------------------------------
 dnl CF_LASTLOG version: 4 updated: 2002/10/27 23:21:42
 dnl ----------
 dnl Check for header defining _PATH_LASTLOG, or failing that, see if the lastlog
@@ -3144,7 +3222,7 @@ else
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_POSIX_C_SOURCE version: 1 updated: 2004/10/17 10:43:13
+dnl CF_POSIX_C_SOURCE version: 6 updated: 2005/07/14 20:25:10
 dnl -----------------
 dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed.
 dnl
@@ -3161,6 +3239,13 @@ dnl	$1 is the nominal value for _POSIX_C_SOURCE
 AC_DEFUN([CF_POSIX_C_SOURCE],
 [
 cf_POSIX_C_SOURCE=ifelse($1,,199506L,$1)
+
+cf_save_CFLAGS="$CFLAGS"
+cf_save_CPPFLAGS="$CPPFLAGS"
+
+CF_REMOVE_DEFINE(cf_trim_CFLAGS,$cf_save_CFLAGS,_POSIX_C_SOURCE)
+CF_REMOVE_DEFINE(cf_trim_CPPFLAGS,$cf_save_CPPFLAGS,_POSIX_C_SOURCE)
+
 AC_CACHE_CHECK(if we should define _POSIX_C_SOURCE,cf_cv_posix_c_source,[
 	CF_MSG_LOG(if the symbol is already defined go no further)
 	AC_TRY_COMPILE([#include <sys/types.h>],[
@@ -3168,30 +3253,76 @@ AC_CACHE_CHECK(if we should define _POSIX_C_SOURCE,cf_cv_posix_c_source,[
 make an error
 #endif],
 	[cf_cv_posix_c_source=no],
-	[case .$cf_POSIX_C_SOURCE in
-	 .[[12]]??*)
+	[cf_want_posix_source=no
+	 case .$cf_POSIX_C_SOURCE in #(vi
+	 .[[12]]??*) #(vi
 		cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
 		;;
-	 .2)
-		cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_POSIX_SOURCE"
+	 .2) #(vi
+		cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
+		cf_want_posix_source=yes
 		;;
 	 .*)
-		cf_cv_posix_c_source="-D_POSIX_SOURCE"
+		cf_want_posix_source=yes
 		;;
 	 esac
+	 if test "$cf_want_posix_source" = yes ; then
+		AC_TRY_COMPILE([#include <sys/types.h>],[
+#ifdef _POSIX_SOURCE
+make an error
+#endif],[],
+		cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE")
+	 fi
 	 CF_MSG_LOG(ifdef from value $cf_POSIX_C_SOURCE)
-	 cf_save="$CPPFLAGS"
-	 CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source"
+	 CFLAGS="$cf_trim_CFLAGS"
+	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 	 CF_MSG_LOG(if the second compile does not leave our definition intact error)
 	 AC_TRY_COMPILE([#include <sys/types.h>],[
 #ifndef _POSIX_C_SOURCE
 make an error
 #endif],,
-	[cf_cv_posix_c_source=no])
-	CPPFLAGS="$cf_save"
+	 [cf_cv_posix_c_source=no])
+	 CFLAGS="$cf_save_CFLAGS"
+	 CPPFLAGS="$cf_save_CPPFLAGS"
 	])
 ])
-test "$cf_cv_posix_c_source" != no && CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source"
+
+if test "$cf_cv_posix_c_source" != no ; then
+	CFLAGS="$cf_trim_CFLAGS"
+	CPPFLAGS="$cf_trim_CPPFLAGS"
+	if test "$cf_cv_cc_u_d_options" = yes ; then
+		cf_temp_posix_c_source=`echo "$cf_cv_posix_c_source" | \
+				sed -e 's/-D/-U/g' -e 's/=[[^ 	]]*//g'`
+		CPPFLAGS="$CPPFLAGS $cf_temp_posix_c_source"
+	fi
+	CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source"
+fi
+
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_PROG_CC_U_D version: 1 updated: 2005/07/14 16:59:30
+dnl --------------
+dnl Check if C (preprocessor) -U and -D options are processed in the order
+dnl given rather than by type of option.  Some compilers insist on apply all
+dnl of the -U options after all of the -D options.  Others allow mixing them,
+dnl and may predefine symbols that conflict with those we define.
+AC_DEFUN([CF_PROG_CC_U_D],
+[
+AC_CACHE_CHECK(if $CC -U and -D options work together,cf_cv_cc_u_d_options,[
+	cf_save_CPPFLAGS="$CPPFLAGS"
+	CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
+	AC_TRY_COMPILE([],[
+#ifndef U_D_OPTIONS
+make an undefined-error
+#endif
+#ifdef  D_U_OPTIONS
+make a defined-error
+#endif
+	],[
+	cf_cv_cc_u_d_options=yes],[
+	cf_cv_cc_u_d_options=no])
+	CPPFLAGS="$cf_save_CPPFLAGS"
+])
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_PROG_EXT version: 10 updated: 2004/01/03 19:28:18
@@ -3275,6 +3406,24 @@ AC_MSG_RESULT($cf_cv_baddef_remove)
 test "$cf_cv_baddef_remove" != no && AC_DEFINE(NEED_REMOVE)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_REMOVE_DEFINE version: 2 updated: 2005/07/09 16:12:18
+dnl ----------------
+dnl Remove all -U and -D options that refer to the given symbol from a list
+dnl of C compiler options.  This works around the problem that not all
+dnl compilers process -U and -D options from left-to-right, so a -U option
+dnl cannot be used to cancel the effect of a preceding -D option.
+dnl
+dnl $1 = target (which could be the same as the source variable)
+dnl $2 = source (including '$')
+dnl $3 = symbol to remove
+define([CF_REMOVE_DEFINE],
+[
+# remove $3 symbol from $2
+$1=`echo "$2" | \
+	sed	-e 's/-[[UD]]$3\(=[[^ 	]]*\)\?[[ 	]]/ /g' \
+		-e 's/-[[UD]]$3\(=[[^ 	]]*\)\?[$]//g'`
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_SET_ERRNO version: 2 updated: 2000/03/26 22:37:59
 dnl ------------
 dnl Check if 'errno' is declared in a fashion that lets us set it.
@@ -3913,26 +4062,26 @@ AC_DEFUN([CF_SYS_ERRLIST],
     CF_CHECK_ERRNO(sys_errlist)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_TAR_OPTIONS version: 1 updated: 2004/01/26 20:58:41
+dnl CF_TAR_OPTIONS version: 2 updated: 2005/08/24 20:15:11
 dnl --------------
 dnl This is just a list of the most common tar options, allowing for variants
 dnl that can operate with the "-" standard input/output option.
 AC_DEFUN([CF_TAR_OPTIONS],
 [
 case ifelse($1,,tar,$1) in
-*pax)
+*pax|*pax$EXEEXT)
 	TAR_UP_OPTIONS="-w"
 	TAR_DOWN_OPTIONS="-r"
 	TAR_PIPE_OPTIONS=""
 	TAR_FILE_OPTIONS="-f"
 	;;
-*star)
+*star|*star$EXEEXT)
 	TAR_UP_OPTIONS="-c -f"
 	TAR_DOWN_OPTIONS="-x -U -f"
 	TAR_PIPE_OPTIONS="-"
 	TAR_FILE_OPTIONS=""
 	;;
-*tar)
+*tar|*tar$EXEEXT)
 	# FIXME: some versions of tar require, some don't allow the "-"
 	TAR_UP_OPTIONS="-cf"
 	TAR_DOWN_OPTIONS="-xf"
@@ -4557,7 +4706,7 @@ AC_TRY_LINK([
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 15 updated: 2004/11/23 15:41:32
+dnl CF_XOPEN_SOURCE version: 23 updated: 2005/10/15 16:39:05
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality.
@@ -4567,10 +4716,15 @@ dnl	$1 is the nominal value for _XOPEN_SOURCE
 dnl	$2 is the nominal value for _POSIX_C_SOURCE
 AC_DEFUN([CF_XOPEN_SOURCE],[
 
+AC_REQUIRE([CF_PROG_CC_U_D])
+
 cf_XOPEN_SOURCE=ifelse($1,,500,$1)
 cf_POSIX_C_SOURCE=ifelse($2,,199506L,$2)
 
 case $host_os in #(vi
+aix[[45]]*) #(vi
+	CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
+	;;
 freebsd*) #(vi
 	# 5.x headers associate
 	#	_XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
@@ -4600,6 +4754,9 @@ openbsd*) #(vi
 osf[[45]]*) #(vi
 	CPPFLAGS="$CPPFLAGS -D_OSF_SOURCE"
 	;;
+nto-qnx*) #(vi
+	CPPFLAGS="$CPPFLAGS -D_QNX_SOURCE"
+	;;
 sco*) #(vi
 	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
 	;;
@@ -4624,7 +4781,13 @@ make an error
 	CPPFLAGS="$cf_save"
 	])
 ])
-test "$cf_cv_xopen_source" != no && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_cv_xopen_source"
+	if test "$cf_cv_xopen_source" != no ; then
+		CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE)
+		CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE)
+		test "$cf_cv_cc_u_d_options" = yes && \
+			CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE"
+		CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_cv_xopen_source"
+	fi
 	CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
 	;;
 esac
diff --git a/config.guess b/config.guess
index 82294713..d0d57f69 100755
--- a/config.guess
+++ b/config.guess
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2004-11-12'
+timestamp='2005-09-19'
 
 # 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
@@ -17,13 +17,15 @@ timestamp='2004-11-12'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Originally written by Per Bothner <per@bothner.com>.
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
@@ -53,7 +55,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -66,11 +68,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -123,7 +125,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -196,55 +198,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    cats:OpenBSD:*:*)
-	echo arm-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    luna88k:OpenBSD:*:*)
-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     macppc:MirBSD:*:*)
 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -297,40 +264,43 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
+	exit ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
-	exit 0 ;;
+	exit ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit 0 ;;
+	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit 0;;
+	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
+	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
+	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit 0 ;;
+	exit ;;
     *:z/VM:*:*)
 	echo s390-ibm-zvmoe
-	exit 0 ;;
+	exit ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
-	exit 0 ;;
+	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
+	exit ;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -338,32 +308,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	exit 0 ;;
+	exit ;;
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
-	exit 0 ;;
+	exit ;;
     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 ;;
+	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     i86pc:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -372,10 +342,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
+	exit ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -387,10 +357,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit 0 ;;
+	exit ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -401,40 +371,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
+	exit ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -458,32 +428,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit 0 ;;
+	exit ;;
     Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit 0 ;;
+	exit ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit 0 ;;
+	exit ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit 0 ;;
+	exit ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -499,29 +470,29 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit 0 ;;
+ 	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit 0 ;;
+	exit ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit 0 ;;
+	exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit 0 ;;
+	exit ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
+	exit ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit 0 ;;
+	exit ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -529,7 +500,7 @@ EOF
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -544,14 +515,18 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
 	else
 		echo rs6000-ibm-aix3.2
 	fi
-	exit 0 ;;
+	exit ;;
     *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -565,28 +540,28 @@ EOF
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit 0 ;;
+	exit ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit 0 ;;
+	exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
+	exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit 0 ;;
+	exit ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit 0 ;;
+	exit ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit 0 ;;
+	exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit 0 ;;
+	exit ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
@@ -648,9 +623,19 @@ EOF
 	esac
 	if [ ${HP_ARCH} = "hppa2.0w" ]
 	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep __LP64__ >/dev/null
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -658,11 +643,11 @@ EOF
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -690,158 +675,166 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
 	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
+	exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit 0 ;;
+	exit ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit 0 ;;
+	exit ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit 0 ;;
+	exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit 0 ;;
+	exit ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit 0 ;;
+	exit ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit 0 ;;
+	exit ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit 0 ;;
+	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit 0 ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit 0 ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit 0 ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit 0 ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit 0 ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     *:UNICOS/mp:*:*)
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
+        exit ;;
     5000:UNIX_System_V:4.*:*)
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
+	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:FreeBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
+	exit ;;
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
+	exit ;;
     x86:Interix*:[34]*)
 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
+	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
 	echo i586-pc-interix
-	exit 0 ;;
+	exit ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit 0 ;;
+	exit ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     *:GNU:*:*)
 	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
+	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
+	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
+	exit ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
-	exit 0 ;;
+	exit ;;
     crisv32:Linux:*:*)
 	echo crisv32-axis-linux-gnu
-	exit 0 ;;
+	exit ;;
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -859,7 +852,7 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -878,14 +871,17 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -899,7 +895,7 @@ EOF
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -907,25 +903,25 @@ EOF
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
-	exit 0 ;;
+	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
+	exit ;;
     sh64*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -943,15 +939,15 @@ EOF
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
+		exit ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
+		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
+		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -979,15 +975,18 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	test x"${LIBC}" != x && {
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		exit
+	}
+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
 	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
 	echo i386-sequent-sysv4
-	exit 0 ;;
+	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -995,27 +994,27 @@ EOF
 	# I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
+	exit ;;
     i*86:XTS-300:*:STOP)
 	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
+	exit ;;
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-	i*86:syllable:*:*)
+	exit ;;
+    i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
-	exit 0 ;;
+	exit ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
+	exit ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1023,15 +1022,16 @@ EOF
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
+	exit ;;
+    i*86:*:5:[678]*)
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1049,73 +1049,73 @@ EOF
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
-	exit 0 ;;
+	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
-        exit 0 ;;
+        exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
-	exit 0 ;;
+	exit ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
-	exit 0 ;;
+	exit ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
-	exit 0 ;;
+	exit ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
 	echo m68010-convergent-sysv
-	exit 0 ;;
+	exit ;;
     mc68k:UNIX:SYSTEM5:3.51m)
 	echo m68k-convergent-sysv
-	exit 0 ;;
+	exit ;;
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
-	exit 0 ;;
+	exit ;;
     M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
+          && { echo i486-ncr-sysv4; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
-	exit 0 ;;
+	exit ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1123,69 +1123,72 @@ EOF
 	else
 		echo ns32k-sni-sysv
 	fi
-	exit 0 ;;
+	exit ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit 0 ;;
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
+	exit ;;
     *:*:*:FTX*)
 	# From seanf@swdc.stratus.com.
 	echo i860-stratus-sysv4
-	exit 0 ;;
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
     *:VOS:*:*)
 	# From Paul.Green@stratus.com.
 	echo hppa1.1-stratus-vos
-	exit 0 ;;
+	exit ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
-	exit 0 ;;
+	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit 0 ;;
+        exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
-	exit 0 ;;
+	exit ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 	echo powerpc-apple-beos
-	exit 0 ;;
+	exit ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
-	exit 0 ;;
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
-	    *86) UNAME_PROCESSOR=i686 ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1193,22 +1196,25 @@ EOF
 		UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
-	exit 0 ;;
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-	exit 0 ;;
+	exit ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
-	exit 0 ;;
+	exit ;;
     DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
@@ -1219,41 +1225,44 @@ EOF
 	    UNAME_MACHINE="$cputype"
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
+	exit ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-	exit 0 ;;
+	exit ;;
     *:TENEX:*:*)
 	echo pdp10-unknown-tenex
-	exit 0 ;;
+	exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-	exit 0 ;;
+	exit ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
-	exit 0 ;;
+	exit ;;
     *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
-	exit 0 ;;
+	exit ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
-	exit 0 ;;
+	exit ;;
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	exit ;;
     *:*VMS:*:*)
     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms && exit 0 ;;
-	    I*) echo ia64-dec-vms && exit 0 ;;
-	    V*) echo vax-dec-vms && exit 0 ;;
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
 	esac ;;
     *:XENIX:*:SysV)
 	echo i386-pc-xenix
-	exit 0 ;;
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1285,7 +1294,7 @@ main ()
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
+  printf ("arm-acorn-riscix\n"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1374,11 +1383,12 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1387,22 +1397,22 @@ then
     case `getsysinfo -f cpu_type` in
     c1*)
 	echo c1-convex-bsd
-	exit 0 ;;
+	exit ;;
     c2*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     c34*)
 	echo c34-convex-bsd
-	exit 0 ;;
+	exit ;;
     c38*)
 	echo c38-convex-bsd
-	exit 0 ;;
+	exit ;;
     c4*)
 	echo c4-convex-bsd
-	exit 0 ;;
+	exit ;;
     esac
 fi
 
@@ -1413,7 +1423,9 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-    ftp://ftp.gnu.org/pub/gnu/config/
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff --git a/config.sub b/config.sub
index 0f84ac2c..1c366dfd 100755
--- a/config.sub
+++ b/config.sub
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2004-11-30'
+timestamp='2005-07-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +21,15 @@ timestamp='2004-11-30'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -70,7 +71,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -83,11 +84,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -99,7 +100,7 @@ while test $# -gt 0 ; do
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -231,13 +232,14 @@ case $basic_machine in
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | mcore \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -246,6 +248,7 @@ case $basic_machine in
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
@@ -254,15 +257,17 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| ms1 \
 	| msp430 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
@@ -271,6 +276,9 @@ case $basic_machine in
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
+	m32c)
+		basic_machine=$basic_machine-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -298,7 +306,7 @@ case $basic_machine in
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
-	| bs2000-* \
+	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
@@ -310,7 +318,7 @@ case $basic_machine in
 	| ip2k-* | iq2000-* \
 	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -319,6 +327,7 @@ case $basic_machine in
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
@@ -327,6 +336,7 @@ case $basic_machine in
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
+	| ms1-* \
 	| msp430-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
@@ -334,9 +344,10 @@ case $basic_machine in
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
@@ -348,6 +359,8 @@ case $basic_machine in
 	| ymp-* \
 	| z8k-*)
 		;;
+	m32c-*)
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -758,9 +771,8 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
+	openrisc | openrisc-*)
 		basic_machine=or32-unknown
-		os=-coff
 		;;
 	os400)
 		basic_machine=powerpc-ibm
@@ -1086,12 +1098,9 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
@@ -1178,7 +1187,8 @@ case $os in
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1196,7 +1206,7 @@ case $os in
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
@@ -1385,6 +1395,9 @@ case $basic_machine in
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
@@ -1556,7 +1569,7 @@ case $basic_machine in
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/configure b/configure
index 14013d26..e9509fd2 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in 2.8.6dev.9.
+# From configure.in 2.8.6dev.13.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20030208.
 #
@@ -682,10 +682,10 @@ Optional Features:
   --with-system-type=XXX  test: override derived host system-type
   --with-build-cc=XXX     the build C compiler ($BUILD_CC)
   --with-build-cpp=XXX    the build C preprocessor ($BUILD_CPP)
-  --with-build-cflags=XXX the build C compiler-flags
-  --with-build-cppflags=XXX the build C preprocessor-flags
-  --with-build-ldflags=XXX the build linker-flags
-  --with-build-libs=XXX   the build libraries
+  --with-build-cflags=XXX the build C compiler-flags ($BUILD_CFLAGS)
+  --with-build-cppflags=XXX the build C preprocessor-flags ($BUILD_CPPFLAGS)
+  --with-build-ldflags=XXX the build linker-flags ($BUILD_LDFLAGS)
+  --with-build-libs=XXX   the build libraries ($(BUILD_LIBS)
 Development Options:
   --disable-echo          display "compiling" commands
   --enable-find-leaks     logic for testing memory leaks
@@ -696,16 +696,18 @@ Development Options:
   --with-dbmalloc         test: use Conor Cahill's dbmalloc library
   --with-dmalloc          test: use Gray Watson's dmalloc library
 Basic Configuration Options:
-  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib
+  --disable-largefile     omit support for large files
+  --with-libiconv-prefix=DIR
+                          search for libiconv in DIR/include and DIR/lib
   --enable-nls            use Native Language Support
   --with-included-gettext use the GNU gettext library included here
   --disable-included-msgs use included messages, for i18n support
   --with-nls-datadir=DIR  NLS data, parent of locale (default: PREFIX/DATADIR)
   --disable-full-paths    control whether full utility pathnames are used
-  --with-ssl=path       link with ssl library if available
-  --with-gnutls=path    link with experimental gnutls support
-  --with-socks=path     link with socks library if available
-  --with-socks5=path    link with socks5 library if available
+  --with-ssl{=path}       link with ssl library if available
+  --with-gnutls{=path}    link with experimental gnutls support
+  --with-socks{=path}     link with socks library if available
+  --with-socks5{=path}    link with socks5 library if available
   --with-screen=XXX       select screen type (XXX is curses (default),
                           ncurses, ncursesw, pdcurses or slang)
   --with-curses-dir=DIR   directory in which (n)curses is installed
@@ -966,7 +968,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:969: loading site script $ac_site_file" >&5
+    { echo "$as_me:971: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"
@@ -977,7 +979,7 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:980: loading cache $cache_file" >&5
+    { echo "$as_me:982: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -985,7 +987,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:988: creating cache $cache_file" >&5
+  { echo "$as_me:990: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1001,21 +1003,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:1004: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:1006: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:1008: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:1010: error: \`$ac_var' was not set in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:1014: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:1016: error: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:1016:   former value:  $ac_old_val" >&5
+        { echo "$as_me:1018:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:1018:   current value: $ac_new_val" >&5
+        { echo "$as_me:1020:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1034,9 +1036,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:1037: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1039: error: changes in the environment can compromise the build" >&5
 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:1039: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1041: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1056,10 +1058,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1059: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1061: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1062: \$? = $ac_status" >&5
+  echo "$as_me:1064: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_path_separator=';'
 else
@@ -1094,7 +1096,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1097: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1099: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1104,11 +1106,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1107: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1109: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1111: checking build system type" >&5
+echo "$as_me:1113: checking build system type" >&5
 echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1117,23 +1119,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1120: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1122: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:1124: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1126: error: $ac_config_sub $ac_cv_build_alias failed." >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1129: result: $ac_cv_build" >&5
+echo "$as_me:1131: result: $ac_cv_build" >&5
 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
-echo "$as_me:1136: checking host system type" >&5
+echo "$as_me:1138: checking host system type" >&5
 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1142,12 +1144,12 @@ else
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:1145: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1147: error: $ac_config_sub $ac_cv_host_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1150: result: $ac_cv_host" >&5
+echo "$as_me:1152: result: $ac_cv_host" >&5
 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1155,7 +1157,7 @@ host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
-	echo "$as_me:1158: checking target system type" >&5
+	echo "$as_me:1160: checking target system type" >&5
 echo $ECHO_N "checking target system type... $ECHO_C" >&6
 if test "${ac_cv_target+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1164,12 +1166,12 @@ else
 test "x$ac_cv_target_alias" = "x" &&
   ac_cv_target_alias=$ac_cv_host_alias
 ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:1167: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1169: error: $ac_config_sub $ac_cv_target_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1172: result: $ac_cv_target" >&5
+echo "$as_me:1174: result: $ac_cv_target" >&5
 echo "${ECHO_T}$ac_cv_target" >&6
 target=$ac_cv_target
 target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1200,13 +1202,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1203: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1205: result: Configuring for $cf_cv_system_name" >&5
 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
 
 if test ".$system_name" != ".$cf_cv_system_name" ; then
-	echo "$as_me:1207: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1209: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
-	{ { echo "$as_me:1209: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1211: error: \"Please remove config.cache and try again.\"" >&5
 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1214,14 +1216,14 @@ fi
 # Check whether --with-system-type or --without-system-type was given.
 if test "${with_system_type+set}" = set; then
   withval="$with_system_type"
-  { echo "$as_me:1217: WARNING: overriding system type $host_os to $withval" >&5
+  { echo "$as_me:1219: WARNING: overriding system type $host_os to $withval" >&5
 echo "$as_me: WARNING: overriding system type $host_os to $withval" >&2;}
  host_os=$withval
 fi;
 
 PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.6dev.13
+VERSION=2.8.6dev.14
 
 test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
 
@@ -1240,7 +1242,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1243: checking for $ac_word" >&5
+echo "$as_me:1245: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1255,7 +1257,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1258: found $ac_dir/$ac_word" >&5
+echo "$as_me:1260: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1263,10 +1265,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1266: result: $CC" >&5
+  echo "$as_me:1268: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1269: result: no" >&5
+  echo "$as_me:1271: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1275,7 +1277,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1278: checking for $ac_word" >&5
+echo "$as_me:1280: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1290,7 +1292,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1293: found $ac_dir/$ac_word" >&5
+echo "$as_me:1295: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1298,10 +1300,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1301: result: $ac_ct_CC" >&5
+  echo "$as_me:1303: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1304: result: no" >&5
+  echo "$as_me:1306: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1314,7 +1316,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1317: checking for $ac_word" >&5
+echo "$as_me:1319: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1329,7 +1331,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1332: found $ac_dir/$ac_word" >&5
+echo "$as_me:1334: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1337,10 +1339,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1340: result: $CC" >&5
+  echo "$as_me:1342: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1343: result: no" >&5
+  echo "$as_me:1345: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1349,7 +1351,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1352: checking for $ac_word" >&5
+echo "$as_me:1354: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1364,7 +1366,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1367: found $ac_dir/$ac_word" >&5
+echo "$as_me:1369: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1372,10 +1374,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1375: result: $ac_ct_CC" >&5
+  echo "$as_me:1377: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1378: result: no" >&5
+  echo "$as_me:1380: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1388,7 +1390,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1391: checking for $ac_word" >&5
+echo "$as_me:1393: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1408,7 +1410,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1411: found $ac_dir/$ac_word" >&5
+echo "$as_me:1413: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1430,10 +1432,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1433: result: $CC" >&5
+  echo "$as_me:1435: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1436: result: no" >&5
+  echo "$as_me:1438: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1444,7 +1446,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1447: checking for $ac_word" >&5
+echo "$as_me:1449: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1459,7 +1461,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1462: found $ac_dir/$ac_word" >&5
+echo "$as_me:1464: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1467,10 +1469,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1470: result: $CC" >&5
+  echo "$as_me:1472: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1473: result: no" >&5
+  echo "$as_me:1475: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1483,7 +1485,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1486: checking for $ac_word" >&5
+echo "$as_me:1488: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1498,7 +1500,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1501: found $ac_dir/$ac_word" >&5
+echo "$as_me:1503: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1506,10 +1508,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1509: result: $ac_ct_CC" >&5
+  echo "$as_me:1511: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1512: result: no" >&5
+  echo "$as_me:1514: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1521,32 +1523,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1524: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1526: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:1529:" \
+echo "$as_me:1531:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1532: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1534: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1535: \$? = $ac_status" >&5
+  echo "$as_me:1537: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1537: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1539: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1540: \$? = $ac_status" >&5
+  echo "$as_me:1542: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1542: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1544: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1545: \$? = $ac_status" >&5
+  echo "$as_me:1547: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 1549 "configure"
+#line 1551 "configure"
 #include "confdefs.h"
 
 int
@@ -1562,13 +1564,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:1565: checking for C compiler default output" >&5
+echo "$as_me:1567: checking for C compiler default output" >&5
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1568: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1570: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1571: \$? = $ac_status" >&5
+  echo "$as_me:1573: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
@@ -1591,34 +1593,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1594: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1596: error: C compiler cannot create executables" >&5
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:1600: result: $ac_file" >&5
+echo "$as_me:1602: result: $ac_file" >&5
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1605: checking whether the C compiler works" >&5
+echo "$as_me:1607: checking whether the C compiler works" >&5
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:1611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1613: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1614: \$? = $ac_status" >&5
+  echo "$as_me:1616: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1621: error: cannot run C compiled programs.
+	{ { echo "$as_me:1623: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
@@ -1626,24 +1628,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1629: result: yes" >&5
+echo "$as_me:1631: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1636: checking whether we are cross compiling" >&5
+echo "$as_me:1638: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1638: result: $cross_compiling" >&5
+echo "$as_me:1640: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1641: checking for executable suffix" >&5
+echo "$as_me:1643: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1643: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1645: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1646: \$? = $ac_status" >&5
+  echo "$as_me:1648: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -1659,25 +1661,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1662: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1664: error: cannot compute EXEEXT: cannot compile and link" >&5
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:1668: result: $ac_cv_exeext" >&5
+echo "$as_me:1670: result: $ac_cv_exeext" >&5
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:1674: checking for object suffix" >&5
+echo "$as_me:1676: checking for object suffix" >&5
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1680 "configure"
+#line 1682 "configure"
 #include "confdefs.h"
 
 int
@@ -1689,10 +1691,10 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1692: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1694: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1695: \$? = $ac_status" >&5
+  echo "$as_me:1697: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
@@ -1704,24 +1706,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1707: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1709: error: cannot compute OBJEXT: cannot compile" >&5
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:1714: result: $ac_cv_objext" >&5
+echo "$as_me:1716: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1718: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1720: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1724 "configure"
+#line 1726 "configure"
 #include "confdefs.h"
 
 int
@@ -1736,16 +1738,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1739: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1741: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1742: \$? = $ac_status" >&5
+  echo "$as_me:1744: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1745: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1748: \$? = $ac_status" >&5
+  echo "$as_me:1750: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1757,19 +1759,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1760: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1762: result: $ac_cv_c_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
-echo "$as_me:1766: checking whether $CC accepts -g" >&5
+echo "$as_me:1768: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1772 "configure"
+#line 1774 "configure"
 #include "confdefs.h"
 
 int
@@ -1781,16 +1783,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1784: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1786: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1787: \$? = $ac_status" >&5
+  echo "$as_me:1789: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1790: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1793: \$? = $ac_status" >&5
+  echo "$as_me:1795: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1800,7 +1802,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:1803: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1805: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -1827,16 +1829,16 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1830: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1832: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1833: \$? = $ac_status" >&5
+  echo "$as_me:1835: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1838: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1839: \$? = $ac_status" >&5
+  echo "$as_me:1841: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -1848,7 +1850,7 @@ if { (eval echo "$as_me:1830: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 1851 "configure"
+#line 1853 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1861,16 +1863,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1864: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1866: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1867: \$? = $ac_status" >&5
+  echo "$as_me:1869: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1872: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1873: \$? = $ac_status" >&5
+  echo "$as_me:1875: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -1880,7 +1882,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 1883 "configure"
+#line 1885 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1892,16 +1894,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1895: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1897: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1898: \$? = $ac_status" >&5
+  echo "$as_me:1900: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1901: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1903: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1904: \$? = $ac_status" >&5
+  echo "$as_me:1906: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -1933,7 +1935,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:1936: checking how to run the C preprocessor" >&5
+echo "$as_me:1938: checking how to run the C preprocessor" >&5
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -1954,18 +1956,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1957 "configure"
+#line 1959 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:1962: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1964: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:1968: \$? = $ac_status" >&5
+  echo "$as_me:1970: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1988,17 +1990,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1991 "configure"
+#line 1993 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:1995: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1997: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2001: \$? = $ac_status" >&5
+  echo "$as_me:2003: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2035,7 +2037,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2038: result: $CPP" >&5
+echo "$as_me:2040: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2045,18 +2047,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2048 "configure"
+#line 2050 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2053: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2055: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2059: \$? = $ac_status" >&5
+  echo "$as_me:2061: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2079,17 +2081,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2082 "configure"
+#line 2084 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2086: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2088: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2092: \$? = $ac_status" >&5
+  echo "$as_me:2094: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2117,7 +2119,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2120: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2122: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2128,18 +2130,18 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-echo "$as_me:2131: checking whether ln -s works" >&5
+echo "$as_me:2133: checking whether ln -s works" >&5
 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  echo "$as_me:2135: result: yes" >&5
+  echo "$as_me:2137: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:2138: result: no, using $LN_S" >&5
+  echo "$as_me:2140: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:2142: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:2144: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@@ -2159,11 +2161,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:2162: result: yes" >&5
+  echo "$as_me:2164: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:2166: result: no" >&5
+  echo "$as_me:2168: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2180,7 +2182,7 @@ fi
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:2183: checking for a BSD compatible install" >&5
+echo "$as_me:2185: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -2229,7 +2231,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2232: result: $INSTALL" >&5
+echo "$as_me:2234: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2244,7 +2246,7 @@ for ac_prog in lint alint lclint tdlint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2247: checking for $ac_word" >&5
+echo "$as_me:2249: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_LINT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2259,7 +2261,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:2262: found $ac_dir/$ac_word" >&5
+echo "$as_me:2264: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2267,20 +2269,20 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:2270: result: $LINT" >&5
+  echo "$as_me:2272: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:2273: result: no" >&5
+  echo "$as_me:2275: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$LINT" && break
 done
 
-echo "$as_me:2280: checking for AIX" >&5
+echo "$as_me:2282: checking for AIX" >&5
 echo $ECHO_N "checking for AIX... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 2283 "configure"
+#line 2285 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -2289,24 +2291,24 @@ cat >conftest.$ac_ext <<_ACEOF
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "yes" >/dev/null 2>&1; then
-  echo "$as_me:2292: result: yes" >&5
+  echo "$as_me:2294: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 cat >>confdefs.h <<\EOF
 #define _ALL_SOURCE 1
 EOF
 
 else
-  echo "$as_me:2299: result: no" >&5
+  echo "$as_me:2301: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest*
 
-echo "$as_me:2304: checking for POSIXized ISC" >&5
+echo "$as_me:2306: checking for POSIXized ISC" >&5
 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
 if test -d /etc/conf/kconfig.d &&
    grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then
-  echo "$as_me:2309: result: yes" >&5
+  echo "$as_me:2311: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   ISC=yes # If later tests want to check for ISC.
 
@@ -2320,7 +2322,7 @@ EOF
     CC="$CC -Xp"
   fi
 else
-  echo "$as_me:2323: result: no" >&5
+  echo "$as_me:2325: result: no" >&5
 echo "${ECHO_T}no" >&6
   ISC=
 fi
@@ -2343,9 +2345,8 @@ test -n "$PROG_EXT" && cat >>confdefs.h <<EOF
 EOF
 
 if test "$cross_compiling" = yes ; then
+
 	# defaults that we might want to override
-	: ${BUILD_CC:='$(CC)'}
-	: ${BUILD_CPP:='$(CC) -E'}
 	: ${BUILD_CFLAGS:=''}
 	: ${BUILD_CPPFLAGS:='#'}
 	: ${BUILD_LDFLAGS:=''}
@@ -2358,11 +2359,11 @@ if test "${with_build_cc+set}" = set; then
   withval="$with_build_cc"
   BUILD_CC="$withval"
 else
-  for ac_prog in $CC gcc cc
+  for ac_prog in gcc cc cl
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2365: checking for $ac_word" >&5
+echo "$as_me:2366: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_BUILD_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2377,7 +2378,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:2380: found $ac_dir/$ac_word" >&5
+echo "$as_me:2381: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2385,10 +2386,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:2388: result: $BUILD_CC" >&5
+  echo "$as_me:2389: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:2391: result: no" >&5
+  echo "$as_me:2392: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2396,44 +2397,76 @@ fi
 done
 
 fi;
+	echo "$as_me:2400: checking for native build C compiler" >&5
+echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+	echo "$as_me:2402: result: $BUILD_CC" >&5
+echo "${ECHO_T}$BUILD_CC" >&6
+
+	echo "$as_me:2405: checking for native build C preprocessor" >&5
+echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
 
 # Check whether --with-build-cpp or --without-build-cpp was given.
 if test "${with_build_cpp+set}" = set; then
   withval="$with_build_cpp"
   BUILD_CPP="$withval"
 else
-  BUILD_CPP='$(CC) -E'
+  BUILD_CPP='$(BUILD_CC) -E'
 fi;
+	echo "$as_me:2415: result: $BUILD_CPP" >&5
+echo "${ECHO_T}$BUILD_CPP" >&6
+
+	echo "$as_me:2418: checking for native build C flags" >&5
+echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
 
 # Check whether --with-build-cflags or --without-build-cflags was given.
 if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
+	echo "$as_me:2426: result: $BUILD_CFLAGS" >&5
+echo "${ECHO_T}$BUILD_CFLAGS" >&6
+
+	echo "$as_me:2429: checking for native build C preprocessor-flags" >&5
+echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
 
 # Check whether --with-build-cppflags or --without-build-cppflags was given.
 if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
+	echo "$as_me:2437: result: $BUILD_CPPFLAGS" >&5
+echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+
+	echo "$as_me:2440: checking for native build linker-flags" >&5
+echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
 
 # Check whether --with-build-ldflags or --without-build-ldflags was given.
 if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
+	echo "$as_me:2448: result: $BUILD_LDFLAGS" >&5
+echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+
+	echo "$as_me:2451: checking for native build linker-libraries" >&5
+echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
 
 # Check whether --with-build-libs or --without-build-libs was given.
 if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
+	echo "$as_me:2459: result: $BUILD_LIBS" >&5
+echo "${ECHO_T}$BUILD_LIBS" >&6
+
 	# this assumes we're on Unix.
 	BUILD_EXEEXT=
 	BUILD_OBJEXT=o
 
+	: ${BUILD_CC:='$(CC)'}
+
 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '$(CC)' ) ; then
-		{ { echo "$as_me:2436: error: Cross-build requires two compilers.
+		{ { echo "$as_me:2469: error: Cross-build requires two compilers.
 Use --with-build-cc to specify the native compiler." >&5
 echo "$as_me: error: Cross-build requires two compilers.
 Use --with-build-cc to specify the native compiler." >&2;}
@@ -2454,7 +2487,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:2457: checking for $ac_word" >&5
+echo "$as_me:2490: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2469,7 +2502,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:2472: found $ac_dir/$ac_word" >&5
+echo "$as_me:2505: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2477,10 +2510,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:2480: result: $RANLIB" >&5
+  echo "$as_me:2513: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:2483: result: no" >&5
+  echo "$as_me:2516: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2489,7 +2522,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:2492: checking for $ac_word" >&5
+echo "$as_me:2525: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2504,7 +2537,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:2507: found $ac_dir/$ac_word" >&5
+echo "$as_me:2540: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2513,10 +2546,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:2516: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:2549: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:2519: result: no" >&5
+  echo "$as_me:2552: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2528,7 +2561,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:2531: checking for $ac_word" >&5
+echo "$as_me:2564: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2543,7 +2576,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:2546: found $ac_dir/$ac_word" >&5
+echo "$as_me:2579: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2551,10 +2584,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:2554: result: $AR" >&5
+  echo "$as_me:2587: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:2557: result: no" >&5
+  echo "$as_me:2590: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2563,7 +2596,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:2566: checking for $ac_word" >&5
+echo "$as_me:2599: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2578,7 +2611,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:2581: found $ac_dir/$ac_word" >&5
+echo "$as_me:2614: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2587,10 +2620,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:2590: result: $ac_ct_AR" >&5
+  echo "$as_me:2623: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:2593: result: no" >&5
+  echo "$as_me:2626: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2603,10 +2636,10 @@ if test "${cf_cv_subst_AR_OPTS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "$as_me:2606: checking for archiver options (symbol AR_OPTS)" >&5
+echo "$as_me:2639: checking for archiver options (symbol AR_OPTS)" >&5
 echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
 test -z "$AR_OPTS" && AR_OPTS=rv
-echo "$as_me:2609: result: $AR_OPTS" >&5
+echo "$as_me:2642: result: $AR_OPTS" >&5
 echo "${ECHO_T}$AR_OPTS" >&6
 
 cf_cv_subst_AR_OPTS=$AR_OPTS
@@ -2614,7 +2647,7 @@ fi
 
 AR_OPTS=${cf_cv_subst_AR_OPTS}
 
-echo "$as_me:2617: checking if you want to see long compiling messages" >&5
+echo "$as_me:2650: checking if you want to see long compiling messages" >&5
 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
 
 # Check whether --enable-echo or --disable-echo was given.
@@ -2648,7 +2681,7 @@ else
     ECHO_CC=''
 
 fi;
-echo "$as_me:2651: result: $enableval" >&5
+echo "$as_me:2684: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 # special case for WWW/*
@@ -2658,7 +2691,7 @@ else
 	DONT_ECHO_CC=''
 fi
 
-echo "$as_me:2661: checking if you want to check memory-leaks" >&5
+echo "$as_me:2694: checking if you want to check memory-leaks" >&5
 echo $ECHO_N "checking if you want to check memory-leaks... $ECHO_C" >&6
 
 # Check whether --enable-find-leaks or --disable-find-leaks was given.
@@ -2675,7 +2708,7 @@ else
   with_leak_checks=no
 
 fi;
-echo "$as_me:2678: result: $with_leak_checks" >&5
+echo "$as_me:2711: result: $with_leak_checks" >&5
 echo "${ECHO_T}$with_leak_checks" >&6
 test "$with_leak_checks" = "yes" && cat >>confdefs.h <<\EOF
 #define LY_FIND_LEAKS 1
@@ -2684,7 +2717,7 @@ EOF
 # The comment about adding -g to $CFLAGS is unclear.  Autoconf tries to add
 # a -g flag; we remove it if the user's $CFLAGS was not set and debugging is
 # disabled.
-echo "$as_me:2687: checking if you want to enable debug-code" >&5
+echo "$as_me:2720: checking if you want to enable debug-code" >&5
 echo $ECHO_N "checking if you want to enable debug-code... $ECHO_C" >&6
 
 # Check whether --enable-debug or --disable-debug was given.
@@ -2701,7 +2734,7 @@ else
   with_debug=no
 
 fi;
-echo "$as_me:2704: result: $with_debug" >&5
+echo "$as_me:2737: result: $with_debug" >&5
 echo "${ECHO_T}$with_debug" >&6
 if test "$with_debug" = "yes" ; then
 	case $host_os in
@@ -2726,7 +2759,7 @@ else
 	esac
 fi
 
-echo "$as_me:2729: checking if you want to enable lynx trace code *recommended* " >&5
+echo "$as_me:2762: checking if you want to enable lynx trace code *recommended* " >&5
 echo $ECHO_N "checking if you want to enable lynx trace code *recommended* ... $ECHO_C" >&6
 
 # Check whether --enable-trace or --disable-trace was given.
@@ -2743,13 +2776,13 @@ else
   with_trace=yes
 
 fi;
-echo "$as_me:2746: result: $with_trace" >&5
+echo "$as_me:2779: result: $with_trace" >&5
 echo "${ECHO_T}$with_trace" >&6
 test $with_trace = no && cat >>confdefs.h <<\EOF
 #define NO_LYNX_TRACE 1
 EOF
 
-echo "$as_me:2752: checking if you want verbose trace code" >&5
+echo "$as_me:2785: checking if you want verbose trace code" >&5
 echo $ECHO_N "checking if you want verbose trace code... $ECHO_C" >&6
 
 # Check whether --enable-vertrace or --disable-vertrace was given.
@@ -2766,7 +2799,7 @@ else
   with_vertrace=no
 
 fi;
-echo "$as_me:2769: result: $with_vertrace" >&5
+echo "$as_me:2802: result: $with_vertrace" >&5
 echo "${ECHO_T}$with_vertrace" >&6
 test $with_vertrace = yes && cat >>confdefs.h <<\EOF
 #define LY_TRACELINE __LINE__
@@ -2774,7 +2807,7 @@ EOF
 
 if test -n "$GCC"
 then
-echo "$as_me:2777: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:2810: checking if you want to turn on gcc warnings" >&5
 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.
@@ -2791,7 +2824,7 @@ else
   with_warnings=no
 
 fi;
-echo "$as_me:2794: result: $with_warnings" >&5
+echo "$as_me:2827: result: $with_warnings" >&5
 echo "${ECHO_T}$with_warnings" >&6
 if test "$with_warnings" = "yes"
 then
@@ -2814,10 +2847,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:2817: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:2850: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > conftest.$ac_ext <<EOF
-#line 2820 "configure"
+#line 2853 "configure"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -2839,28 +2872,28 @@ EOF
 	for cf_attribute in scanf printf unused noreturn
 	do
 
-CF_ATTRIBUTE=`echo "$cf_attribute" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+cf_ATTRIBUTE=`echo "$cf_attribute" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 		cf_directive="__attribute__(($cf_attribute))"
 		echo "checking for $CC $cf_directive" 1>&5
 		case $cf_attribute in
 		scanf|printf)
 		cat >conftest.h <<EOF
-#define GCC_$CF_ATTRIBUTE 1
+#define GCC_$cf_ATTRIBUTE 1
 EOF
 			;;
 		*)
 		cat >conftest.h <<EOF
-#define GCC_$CF_ATTRIBUTE $cf_directive
+#define GCC_$cf_ATTRIBUTE $cf_directive
 EOF
 			;;
 		esac
-		if { (eval echo "$as_me:2858: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:2891: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2861: \$? = $ac_status" >&5
+  echo "$as_me:2894: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:2863: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:2896: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 		fi
@@ -2871,17 +2904,27 @@ fi
 rm -rf conftest*
 fi
 
+GCC_VERSION=none
+if test "$GCC" = yes ; then
+	echo "$as_me:2909: checking version of $CC" >&5
+echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
+	GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+	echo "$as_me:2913: result: $GCC_VERSION" >&5
+echo "${ECHO_T}$GCC_VERSION" >&6
+fi
+
 INTEL_COMPILER=no
 
 if test "$GCC" = yes ; then
 	case $host_os in
 	linux*|gnu*)
-		echo "$as_me:2879: checking if this is really Intel compiler" >&5
-echo $ECHO_N "checking if this is really Intel compiler... $ECHO_C" >&6
+		echo "$as_me:2922: checking if this is really Intel C compiler" >&5
+echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS -no-gcc"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 2884 "configure"
+#line 2927 "configure"
 #include "confdefs.h"
 
 int
@@ -2898,16 +2941,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2901: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2944: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2904: \$? = $ac_status" >&5
+  echo "$as_me:2947: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2907: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2910: \$? = $ac_status" >&5
+  echo "$as_me:2953: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
@@ -2918,47 +2961,63 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:2921: result: $INTEL_COMPILER" >&5
+		echo "$as_me:2964: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
 fi
 
-GCC_VERSION=none
-if test "$GCC" = yes ; then
-	echo "$as_me:2929: checking version of $CC" >&5
-echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
-	GCC_VERSION="`${CC} --version|sed -e '2,$d' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
-	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:2933: result: $GCC_VERSION" >&5
-echo "${ECHO_T}$GCC_VERSION" >&6
-fi
+cat > conftest.$ac_ext <<EOF
+#line 2971 "configure"
+int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+EOF
 
 if test "$INTEL_COMPILER" = yes
 then
 # The "-wdXXX" options suppress warnings:
 # remark #1419: external declaration in primary source file
+# remark #1682: implicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
+# remark #1683: explicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
+# remark #1684: conversion from pointer to same-sized integral type (potential portability problem)
 # remark #193: zero used for undefined preprocessing identifier
 # remark #593: variable "curs_sb_left_arrow" was set but never used
 # remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits
 # remark #869: parameter "tw" was never referenced
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
-	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall \
- -wd1419 \
- -wd193 \
- -wd279 \
- -wd593 \
- -wd810 \
- -wd869 \
- -wd981"
+
+	{ echo "$as_me:2989: checking for $CC warning options..." >&5
+echo "$as_me: checking for $CC warning options..." >&6;}
+	cf_save_CFLAGS="$CFLAGS"
+	EXTRA_CFLAGS="-Wall"
+	for cf_opt in  \
+		wd1419 \
+		wd1682 \
+		wd1683 \
+		wd1684 \
+		wd193 \
+		wd279 \
+		wd593 \
+		wd810 \
+		wd869 \
+		wd981
+	do
+		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+		if { (eval echo "$as_me:3006: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:3009: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+			test -n "$verbose" && echo "$as_me:3011: result: ... -$cf_opt" >&5
+echo "${ECHO_T}... -$cf_opt" >&6
+			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+		fi
+	done
+	CFLAGS="$cf_save_CFLAGS"
+
 elif test "$GCC" = yes
 then
-	cat > conftest.$ac_ext <<EOF
-#line 2958 "configure"
-int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
-EOF
-	{ echo "$as_me:2961: checking for $CC warning options..." >&5
+	{ echo "$as_me:3020: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-W -Wall"
@@ -2978,12 +3037,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:2981: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3040: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2984: \$? = $ac_status" >&5
+  echo "$as_me:3043: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:2986: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:3045: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case $cf_opt in #(vi
 			Wcast-qual) #(vi
@@ -3001,14 +3060,14 @@ echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
 	done
-	rm -f conftest*
 	CFLAGS="$cf_save_CFLAGS"
 fi
+rm -f conftest*
 
 fi
 fi
 
-echo "$as_me:3011: checking if you want to link with dbmalloc for testing" >&5
+echo "$as_me:3070: checking if you want to link with dbmalloc for testing" >&5
 echo $ECHO_N "checking if you want to link with dbmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dbmalloc or --without-dbmalloc was given.
@@ -3018,11 +3077,11 @@ if test "${with_dbmalloc+set}" = set; then
 else
   with_dbmalloc=no
 fi;
-echo "$as_me:3021: result: $with_dbmalloc" >&5
+echo "$as_me:3080: result: $with_dbmalloc" >&5
 echo "${ECHO_T}$with_dbmalloc" >&6
 if test $with_dbmalloc = yes ; then
 
-echo "$as_me:3025: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:3084: checking for debug_malloc in -ldbmalloc" >&5
 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3030,7 +3089,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3033 "configure"
+#line 3092 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3049,16 +3108,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3052: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3111: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3055: \$? = $ac_status" >&5
+  echo "$as_me:3114: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3061: \$? = $ac_status" >&5
+  echo "$as_me:3120: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -3069,7 +3128,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3072: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:3131: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
   cat >>confdefs.h <<EOF
@@ -3082,7 +3141,7 @@ fi
 
 fi
 
-echo "$as_me:3085: checking if you want to link with dmalloc for testing" >&5
+echo "$as_me:3144: checking if you want to link with dmalloc for testing" >&5
 echo $ECHO_N "checking if you want to link with dmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dmalloc or --without-dmalloc was given.
@@ -3092,11 +3151,11 @@ if test "${with_dmalloc+set}" = set; then
 else
   with_dmalloc=no
 fi;
-echo "$as_me:3095: result: $with_dmalloc" >&5
+echo "$as_me:3154: result: $with_dmalloc" >&5
 echo "${ECHO_T}$with_dmalloc" >&6
 if test $with_dmalloc = yes ; then
 
-echo "$as_me:3099: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:3158: checking for dmalloc_debug in -ldmalloc" >&5
 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3104,7 +3163,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3107 "configure"
+#line 3166 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3123,16 +3182,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3126: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3185: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3129: \$? = $ac_status" >&5
+  echo "$as_me:3188: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3191: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3135: \$? = $ac_status" >&5
+  echo "$as_me:3194: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -3143,7 +3202,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3146: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:3205: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
   cat >>confdefs.h <<EOF
@@ -3160,7 +3219,7 @@ cat >>confdefs.h <<\EOF
 #define UNIX 1
 EOF
 
-echo "$as_me:3163: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:3222: checking for $CC option to accept ANSI C" >&5
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3168,7 +3227,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 3171 "configure"
+#line 3230 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -3217,16 +3276,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3220: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3279: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3223: \$? = $ac_status" >&5
+  echo "$as_me:3282: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3226: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3229: \$? = $ac_status" >&5
+  echo "$as_me:3288: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -3243,21 +3302,21 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:3246: result: none needed" >&5
+    echo "$as_me:3305: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:3249: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:3308: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
-echo "$as_me:3254: checking for an ANSI C-conforming const" >&5
+echo "$as_me:3313: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3260 "configure"
+#line 3319 "configure"
 #include "confdefs.h"
 
 int
@@ -3315,16 +3374,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3318: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3377: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3321: \$? = $ac_status" >&5
+  echo "$as_me:3380: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3324: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3327: \$? = $ac_status" >&5
+  echo "$as_me:3386: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
@@ -3334,7 +3393,7 @@ ac_cv_c_const=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3337: result: $ac_cv_c_const" >&5
+echo "$as_me:3396: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -3382,7 +3441,7 @@ clix*)
 	# contributed by Alex Matulich (matuli_a@marlin.navsea.navy.mil) also
 	# references -lmalloc and -lbsd.
 
-echo "$as_me:3385: checking for strcmp in -lc_s" >&5
+echo "$as_me:3444: checking for strcmp in -lc_s" >&5
 echo $ECHO_N "checking for strcmp in -lc_s... $ECHO_C" >&6
 if test "${ac_cv_lib_c_s_strcmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3390,7 +3449,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_s  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3393 "configure"
+#line 3452 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3409,16 +3468,16 @@ strcmp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3412: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3471: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3415: \$? = $ac_status" >&5
+  echo "$as_me:3474: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3477: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3421: \$? = $ac_status" >&5
+  echo "$as_me:3480: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_c_s_strcmp=yes
 else
@@ -3429,7 +3488,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3432: result: $ac_cv_lib_c_s_strcmp" >&5
+echo "$as_me:3491: result: $ac_cv_lib_c_s_strcmp" >&5
 echo "${ECHO_T}$ac_cv_lib_c_s_strcmp" >&6
 if test $ac_cv_lib_c_s_strcmp = yes; then
   cat >>confdefs.h <<EOF
@@ -3500,14 +3559,14 @@ sco*)
 	# SCO's cc (which is reported to have broken const/volatile).
 	case "$CC" in #(vi
 	cc|*/cc)
-		{ echo "$as_me:3503: WARNING: You should consider using gcc or rcc if available" >&5
+		{ echo "$as_me:3562: WARNING: You should consider using gcc or rcc if available" >&5
 echo "$as_me: WARNING: You should consider using gcc or rcc if available" >&2;}
 		unset ac_cv_prog_CC
 		for ac_prog in gcc rcc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3510: checking for $ac_word" >&5
+echo "$as_me:3569: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3522,7 +3581,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_prog"
-echo "$as_me:3525: found $ac_dir/$ac_word" >&5
+echo "$as_me:3584: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3530,10 +3589,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:3533: result: $CC" >&5
+  echo "$as_me:3592: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:3536: result: no" >&5
+  echo "$as_me:3595: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3556,23 +3615,23 @@ sony-newsos*)
 for ac_header in jcurses.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:3559: checking for $ac_header" >&5
+echo "$as_me:3618: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3565 "configure"
+#line 3624 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3569: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3628: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3575: \$? = $ac_status" >&5
+  echo "$as_me:3634: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3591,7 +3650,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3594: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:3653: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -3619,23 +3678,23 @@ ultrix*)
 for ac_header in cursesX.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:3622: checking for $ac_header" >&5
+echo "$as_me:3681: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3628 "configure"
+#line 3687 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3632: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3691: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3638: \$? = $ac_status" >&5
+  echo "$as_me:3697: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3654,7 +3713,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3657: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:3716: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -3671,7 +3730,7 @@ done
 	;;
 esac
 
-echo "$as_me:3674: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "$as_me:3733: checking for ${CC-cc} option to accept ANSI C" >&5
 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
 if test "${cf_cv_ansi_cc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3765,7 +3824,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 3768 "configure"
+#line 3827 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -3786,16 +3845,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3789: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3848: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3792: \$? = $ac_status" >&5
+  echo "$as_me:3851: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3798: \$? = $ac_status" >&5
+  echo "$as_me:3857: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -3808,7 +3867,7 @@ CFLAGS="$cf_save_CFLAGS"
 CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:3811: result: $cf_cv_ansi_cc" >&5
+echo "$as_me:3870: result: $cf_cv_ansi_cc" >&5
 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
 
 if test "$cf_cv_ansi_cc" != "no"; then
@@ -3891,7 +3950,7 @@ fi
 fi
 
 if test "$cf_cv_ansi_cc" = "no"; then
-	{ { echo "$as_me:3894: error: Your compiler does not appear to recognize prototypes.
+	{ { echo "$as_me:3953: error: Your compiler does not appear to recognize prototypes.
 You have the following choices:
 	a. adjust your compiler options
 	b. get an up-to-date compiler
@@ -3904,10 +3963,489 @@ You have the following choices:
    { (exit 1); exit 1; }; }
 fi
 
+	echo "$as_me:3966: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
+if test "${ac_cv_sys_largefile_source+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  while :; do
+  ac_cv_sys_largefile_source=no
+  cat >conftest.$ac_ext <<_ACEOF
+#line 3974 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main ()
+{
+return !fseeko;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3986: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:3989: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:3992: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3995: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line 4004 "configure"
+#include "confdefs.h"
+#define _LARGEFILE_SOURCE 1
+#include <stdio.h>
+int
+main ()
+{
+return !fseeko;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4017: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4020: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4023: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4026: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sys_largefile_source=1; break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  break
+done
+fi
+echo "$as_me:4037: result: $ac_cv_sys_largefile_source" >&5
+echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
+if test "$ac_cv_sys_largefile_source" != no; then
+
+cat >>confdefs.h <<EOF
+#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
+EOF
+
+fi
+rm -f conftest*
+
+# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+# in glibc 2.1.3, but that breaks too many other things.
+# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+echo "$as_me:4051: checking for fseeko" >&5
+echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
+if test "${ac_cv_func_fseeko+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 4057 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main ()
+{
+return fseeko && fseeko (stdin, 0, 0);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:4069: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:4072: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:4075: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4078: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_fseeko=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_fseeko=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:4088: result: $ac_cv_func_fseeko" >&5
+echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+if test $ac_cv_func_fseeko = yes; then
+
+cat >>confdefs.h <<\EOF
+#define HAVE_FSEEKO 1
+EOF
+
+fi
+
+# Check whether --enable-largefile or --disable-largefile was given.
+if test "${enable_largefile+set}" = set; then
+  enableval="$enable_largefile"
+
+fi;
+if test "$enable_largefile" != no; then
+
+  echo "$as_me:4105: checking for special C compiler options needed for large files" >&5
+echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
+if test "${ac_cv_sys_largefile_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_sys_largefile_CC=no
+     if test "$GCC" != yes; then
+       ac_save_CC=$CC
+       while :; do
+     	 # IRIX 6.2 and later do not support large files by default,
+     	 # so use the C compiler's -n32 option if that helps.
+         cat >conftest.$ac_ext <<_ACEOF
+#line 4117 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+     	 rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4137: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4140: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4143: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4146: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext
+     	 CC="$CC -n32"
+     	 rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4156: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4159: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4162: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4165: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sys_largefile_CC=' -n32'; break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext
+         break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi
+fi
+echo "$as_me:4179: result: $ac_cv_sys_largefile_CC" >&5
+echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
+
+  echo "$as_me:4185: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
+if test "${ac_cv_sys_file_offset_bits+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  while :; do
+  ac_cv_sys_file_offset_bits=no
+  cat >conftest.$ac_ext <<_ACEOF
+#line 4193 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4213: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4216: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4219: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4222: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line 4231 "configure"
+#include "confdefs.h"
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4252: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4255: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4258: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4261: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sys_file_offset_bits=64; break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  break
+done
+fi
+echo "$as_me:4272: result: $ac_cv_sys_file_offset_bits" >&5
+echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
+if test "$ac_cv_sys_file_offset_bits" != no; then
+
+cat >>confdefs.h <<EOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+EOF
+
+fi
+rm -f conftest*
+  echo "$as_me:4282: checking for _LARGE_FILES value needed for large files" >&5
+echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
+if test "${ac_cv_sys_large_files+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  while :; do
+  ac_cv_sys_large_files=no
+  cat >conftest.$ac_ext <<_ACEOF
+#line 4290 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4310: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4313: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4316: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4319: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line 4328 "configure"
+#include "confdefs.h"
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4349: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4352: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4355: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4358: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sys_large_files=1; break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  break
+done
+fi
+echo "$as_me:4369: result: $ac_cv_sys_large_files" >&5
+echo "${ECHO_T}$ac_cv_sys_large_files" >&6
+if test "$ac_cv_sys_large_files" != no; then
+
+cat >>confdefs.h <<EOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+EOF
+
+fi
+rm -f conftest*
+fi
+
+	# Normally we would collect these definitions in the config.h,
+	# but (like _XOPEN_SOURCE), some environments rely on having these
+	# defined before any of the system headers are included.  Another
+	# case comes up with C++, e.g., on AIX the compiler compiles the
+	# header files by themselves before looking at the body files it is
+	# told to compile.  For ncurses, those header files do not include
+	# the config.h
+	test "$ac_cv_sys_large_files"      != no && CPPFLAGS="$CPPFLAGS -D_LARGE_FILES "
+	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
+
+	echo "$as_me:4391: checking whether to use struct dirent64" >&5
+echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
+if test "${cf_cv_struct_dirent64+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+		cat >conftest.$ac_ext <<_ACEOF
+#line 4398 "configure"
+#include "confdefs.h"
+
+#include <sys/types.h>
+#include <dirent.h>
+
+int
+main ()
+{
+
+		/* if transitional largefile support is setup, this is true */
+		extern struct dirent64 * readdir(DIR *);
+		struct dirent64 *x = readdir((DIR *)0);
+		struct dirent *y = readdir((DIR *)0);
+		int z = x - y;
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4419: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4422: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4425: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4428: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_cv_struct_dirent64=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_struct_dirent64=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+fi
+echo "$as_me:4439: result: $cf_cv_struct_dirent64" >&5
+echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+	test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
+#define HAVE_STRUCT_DIRENT64 1
+EOF
+
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:3910: checking for $ac_word" >&5
+echo "$as_me:4448: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3922,7 +4460,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:3925: found $ac_dir/$ac_word" >&5
+echo "$as_me:4463: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3930,10 +4468,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:3933: result: $RANLIB" >&5
+  echo "$as_me:4471: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:3936: result: no" >&5
+  echo "$as_me:4474: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3942,7 +4480,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:3945: checking for $ac_word" >&5
+echo "$as_me:4483: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3957,7 +4495,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:3960: found $ac_dir/$ac_word" >&5
+echo "$as_me:4498: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3966,10 +4504,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:3969: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:4507: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:3972: result: no" >&5
+  echo "$as_me:4510: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3978,13 +4516,13 @@ else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-echo "$as_me:3981: checking for ANSI C header files" >&5
+echo "$as_me:4519: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3987 "configure"
+#line 4525 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3992,13 +4530,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:3995: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4533: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4001: \$? = $ac_status" >&5
+  echo "$as_me:4539: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4020,7 +4558,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 4023 "configure"
+#line 4561 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -4038,7 +4576,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 <<_ACEOF
-#line 4041 "configure"
+#line 4579 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -4059,7 +4597,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4062 "configure"
+#line 4600 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -4085,15 +4623,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4088: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4626: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4091: \$? = $ac_status" >&5
+  echo "$as_me:4629: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4093: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4096: \$? = $ac_status" >&5
+  echo "$as_me:4634: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -4106,7 +4644,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:4109: result: $ac_cv_header_stdc" >&5
+echo "$as_me:4647: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -4116,7 +4654,7 @@ EOF
 
 fi
 
-echo "$as_me:4119: checking for inline" >&5
+echo "$as_me:4657: checking for inline" >&5
 echo $ECHO_N "checking for inline... $ECHO_C" >&6
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4124,7 +4662,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line 4127 "configure"
+#line 4665 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -4133,16 +4671,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4136: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4674: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4139: \$? = $ac_status" >&5
+  echo "$as_me:4677: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4145: \$? = $ac_status" >&5
+  echo "$as_me:4683: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -4153,7 +4691,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:4156: result: $ac_cv_c_inline" >&5
+echo "$as_me:4694: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -4174,28 +4712,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4177: checking for $ac_header" >&5
+echo "$as_me:4715: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4183 "configure"
+#line 4721 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4189: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4727: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4192: \$? = $ac_status" >&5
+  echo "$as_me:4730: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4195: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4198: \$? = $ac_status" >&5
+  echo "$as_me:4736: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -4205,7 +4743,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4208: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4746: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4215,13 +4753,13 @@ EOF
 fi
 done
 
-echo "$as_me:4218: checking for off_t" >&5
+echo "$as_me:4756: checking for off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4224 "configure"
+#line 4762 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4236,16 +4774,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4239: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4777: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4242: \$? = $ac_status" >&5
+  echo "$as_me:4780: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4783: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4248: \$? = $ac_status" >&5
+  echo "$as_me:4786: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -4255,7 +4793,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4258: result: $ac_cv_type_off_t" >&5
+echo "$as_me:4796: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 if test $ac_cv_type_off_t = yes; then
   :
@@ -4267,13 +4805,13 @@ EOF
 
 fi
 
-echo "$as_me:4270: checking for size_t" >&5
+echo "$as_me:4808: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4276 "configure"
+#line 4814 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4288,16 +4826,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4291: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4829: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4294: \$? = $ac_status" >&5
+  echo "$as_me:4832: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4835: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4300: \$? = $ac_status" >&5
+  echo "$as_me:4838: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -4307,7 +4845,7 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4310: result: $ac_cv_type_size_t" >&5
+echo "$as_me:4848: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test $ac_cv_type_size_t = yes; then
   :
@@ -4321,13 +4859,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:4324: checking for working alloca.h" >&5
+echo "$as_me:4862: checking for working alloca.h" >&5
 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
 if test "${ac_cv_working_alloca_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4330 "configure"
+#line 4868 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -4339,16 +4877,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4342: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4345: \$? = $ac_status" >&5
+  echo "$as_me:4883: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4351: \$? = $ac_status" >&5
+  echo "$as_me:4889: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -4358,7 +4896,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4361: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:4899: result: $ac_cv_working_alloca_h" >&5
 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
 if test $ac_cv_working_alloca_h = yes; then
 
@@ -4368,13 +4906,13 @@ EOF
 
 fi
 
-echo "$as_me:4371: checking for alloca" >&5
+echo "$as_me:4909: checking for alloca" >&5
 echo $ECHO_N "checking for alloca... $ECHO_C" >&6
 if test "${ac_cv_func_alloca_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4377 "configure"
+#line 4915 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -4406,16 +4944,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4409: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4947: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4412: \$? = $ac_status" >&5
+  echo "$as_me:4950: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4415: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4953: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4418: \$? = $ac_status" >&5
+  echo "$as_me:4956: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -4425,7 +4963,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4428: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:4966: result: $ac_cv_func_alloca_works" >&5
 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
 
 if test $ac_cv_func_alloca_works = yes; then
@@ -4446,13 +4984,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:4449: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:4987: checking whether \`alloca.c' needs Cray hooks" >&5
 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
 if test "${ac_cv_os_cray+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4455 "configure"
+#line 4993 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -4470,18 +5008,18 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:4473: result: $ac_cv_os_cray" >&5
+echo "$as_me:5011: result: $ac_cv_os_cray" >&5
 echo "${ECHO_T}$ac_cv_os_cray" >&6
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4478: checking for $ac_func" >&5
+echo "$as_me:5016: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4484 "configure"
+#line 5022 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -4512,16 +5050,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4515: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5053: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4518: \$? = $ac_status" >&5
+  echo "$as_me:5056: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4521: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4524: \$? = $ac_status" >&5
+  echo "$as_me:5062: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -4531,7 +5069,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4534: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5072: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
 
@@ -4545,7 +5083,7 @@ fi
   done
 fi
 
-echo "$as_me:4548: checking stack direction for C alloca" >&5
+echo "$as_me:5086: checking stack direction for C alloca" >&5
 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
 if test "${ac_cv_c_stack_direction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4554,7 +5092,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4557 "configure"
+#line 5095 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -4577,15 +5115,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4580: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5118: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4583: \$? = $ac_status" >&5
+  echo "$as_me:5121: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4585: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5123: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4588: \$? = $ac_status" >&5
+  echo "$as_me:5126: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -4597,7 +5135,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:4600: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:5138: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -4609,23 +5147,23 @@ fi
 for ac_header in stdlib.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4612: checking for $ac_header" >&5
+echo "$as_me:5150: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4618 "configure"
+#line 5156 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4622: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5160: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4628: \$? = $ac_status" >&5
+  echo "$as_me:5166: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4644,7 +5182,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4647: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5185: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4657,13 +5195,13 @@ done
 for ac_func in getpagesize
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4660: checking for $ac_func" >&5
+echo "$as_me:5198: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4666 "configure"
+#line 5204 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -4694,16 +5232,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4697: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5235: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4700: \$? = $ac_status" >&5
+  echo "$as_me:5238: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4703: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4706: \$? = $ac_status" >&5
+  echo "$as_me:5244: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -4713,7 +5251,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4716: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5254: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4723,7 +5261,7 @@ EOF
 fi
 done
 
-echo "$as_me:4726: checking for working mmap" >&5
+echo "$as_me:5264: checking for working mmap" >&5
 echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4732,7 +5270,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4735 "configure"
+#line 5273 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -4859,15 +5397,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4862: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5400: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4865: \$? = $ac_status" >&5
+  echo "$as_me:5403: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4867: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4870: \$? = $ac_status" >&5
+  echo "$as_me:5408: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -4879,7 +5417,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:4882: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:5420: result: $ac_cv_func_mmap_fixed_mapped" >&5
 echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
 
@@ -4890,13 +5428,13 @@ EOF
 fi
 rm -f conftest.mmap
 
-    echo "$as_me:4893: checking whether we are using the GNU C Library 2.1 or newer" >&5
+    echo "$as_me:5431: checking whether we are using the GNU C Library 2.1 or newer" >&5
 echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
 if test "${ac_cv_gnu_library_2_1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4899 "configure"
+#line 5437 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -4916,7 +5454,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:4919: result: $ac_cv_gnu_library_2_1" >&5
+echo "$as_me:5457: result: $ac_cv_gnu_library_2_1" >&5
 echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
 
     GLIBC21="$ac_cv_gnu_library_2_1"
@@ -4945,23 +5483,23 @@ for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4948: checking for $ac_header" >&5
+echo "$as_me:5486: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4954 "configure"
+#line 5492 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4958: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5496: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4964: \$? = $ac_status" >&5
+  echo "$as_me:5502: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4980,7 +5518,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4983: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5521: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4995,13 +5533,13 @@ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
 strdup strtoul tsearch __argz_count __argz_stringify __argz_next
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4998: checking for $ac_func" >&5
+echo "$as_me:5536: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5004 "configure"
+#line 5542 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -5032,16 +5570,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5035: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5573: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5038: \$? = $ac_status" >&5
+  echo "$as_me:5576: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5041: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5044: \$? = $ac_status" >&5
+  echo "$as_me:5582: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -5051,7 +5589,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5054: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5592: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -5072,7 +5610,7 @@ if test "${with_libiconv_prefix+set}" = set; then
 
 fi;
 
-  echo "$as_me:5075: checking for iconv" >&5
+  echo "$as_me:5613: checking for iconv" >&5
 echo $ECHO_N "checking for iconv... $ECHO_C" >&6
 if test "${am_cv_func_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5081,7 +5619,7 @@ else
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 5084 "configure"
+#line 5622 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -5096,16 +5634,16 @@ iconv_t cd = iconv_open("","");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5099: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5637: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5102: \$? = $ac_status" >&5
+  echo "$as_me:5640: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5105: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5643: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5108: \$? = $ac_status" >&5
+  echo "$as_me:5646: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_func_iconv=yes
 else
@@ -5117,7 +5655,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       am_save_LIBS="$LIBS"
       LIBS="$LIBS -liconv"
       cat >conftest.$ac_ext <<_ACEOF
-#line 5120 "configure"
+#line 5658 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -5132,16 +5670,16 @@ iconv_t cd = iconv_open("","");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5135: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5673: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5138: \$? = $ac_status" >&5
+  echo "$as_me:5676: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5679: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5144: \$? = $ac_status" >&5
+  echo "$as_me:5682: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
@@ -5154,7 +5692,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     fi
 
 fi
-echo "$as_me:5157: result: $am_cv_func_iconv" >&5
+echo "$as_me:5695: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
   if test "$am_cv_func_iconv" = yes; then
 
@@ -5162,14 +5700,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:5165: checking for iconv declaration" >&5
+    echo "$as_me:5703: checking for iconv declaration" >&5
 echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6
     if test "${am_cv_proto_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
       cat >conftest.$ac_ext <<_ACEOF
-#line 5172 "configure"
+#line 5710 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -5193,16 +5731,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5196: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5734: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5199: \$? = $ac_status" >&5
+  echo "$as_me:5737: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5740: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5205: \$? = $ac_status" >&5
+  echo "$as_me:5743: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_arg1=""
 else
@@ -5215,7 +5753,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
     am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    echo "$as_me:5218: result: ${ac_t:-
+    echo "$as_me:5756: result: ${ac_t:-
          }$am_cv_proto_iconv" >&5
 echo "${ECHO_T}${ac_t:-
          }$am_cv_proto_iconv" >&6
@@ -5230,13 +5768,13 @@ EOF
     LIBICONV="-liconv"
   fi
 
-  echo "$as_me:5233: checking for nl_langinfo and CODESET" >&5
+  echo "$as_me:5771: checking for nl_langinfo and CODESET" >&5
 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
 if test "${am_cv_langinfo_codeset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5239 "configure"
+#line 5777 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -5248,16 +5786,16 @@ char* cs = nl_langinfo(CODESET);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5251: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5789: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5254: \$? = $ac_status" >&5
+  echo "$as_me:5792: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5257: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5795: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5260: \$? = $ac_status" >&5
+  echo "$as_me:5798: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -5268,7 +5806,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:5271: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:5809: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
   if test $am_cv_langinfo_codeset = yes; then
 
@@ -5279,13 +5817,13 @@ EOF
   fi
 
    if test $ac_cv_header_locale_h = yes; then
-    echo "$as_me:5282: checking for LC_MESSAGES" >&5
+    echo "$as_me:5820: checking for LC_MESSAGES" >&5
 echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
 if test "${am_cv_val_LC_MESSAGES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5288 "configure"
+#line 5826 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -5297,16 +5835,16 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5300: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5838: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5303: \$? = $ac_status" >&5
+  echo "$as_me:5841: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5306: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5844: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5309: \$? = $ac_status" >&5
+  echo "$as_me:5847: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
@@ -5316,7 +5854,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5319: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:5857: result: $am_cv_val_LC_MESSAGES" >&5
 echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
     if test $am_cv_val_LC_MESSAGES = yes; then
 
@@ -5326,7 +5864,7 @@ EOF
 
     fi
   fi
-   echo "$as_me:5329: checking whether NLS is requested" >&5
+   echo "$as_me:5867: checking whether NLS is requested" >&5
 echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
 
 # Check whether --enable-nls or --disable-nls was given.
@@ -5336,7 +5874,7 @@ if test "${enable_nls+set}" = set; then
 else
   USE_NLS=no
 fi;
-    echo "$as_me:5339: result: $USE_NLS" >&5
+    echo "$as_me:5877: result: $USE_NLS" >&5
 echo "${ECHO_T}$USE_NLS" >&6
 
     BUILD_INCLUDED_LIBINTL=no
@@ -5349,7 +5887,7 @@ cat >>confdefs.h <<\EOF
 #define ENABLE_NLS 1
 EOF
 
-      echo "$as_me:5352: checking whether included gettext is requested" >&5
+      echo "$as_me:5890: checking whether included gettext is requested" >&5
 echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
 
 # Check whether --with-included-gettext or --without-included-gettext was given.
@@ -5359,30 +5897,30 @@ if test "${with_included_gettext+set}" = set; then
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
-      echo "$as_me:5362: result: $nls_cv_force_use_gnu_gettext" >&5
+      echo "$as_me:5900: result: $nls_cv_force_use_gnu_gettext" >&5
 echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
 
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
                         	CATOBJEXT=NONE
 
-	echo "$as_me:5369: checking for libintl.h" >&5
+	echo "$as_me:5907: checking for libintl.h" >&5
 echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
 if test "${ac_cv_header_libintl_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5375 "configure"
+#line 5913 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 _ACEOF
-if { (eval echo "$as_me:5379: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5917: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5385: \$? = $ac_status" >&5
+  echo "$as_me:5923: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5401,16 +5939,16 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5404: result: $ac_cv_header_libintl_h" >&5
+echo "$as_me:5942: result: $ac_cv_header_libintl_h" >&5
 echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
 if test $ac_cv_header_libintl_h = yes; then
-  echo "$as_me:5407: checking for GNU gettext in libc" >&5
+  echo "$as_me:5945: checking for GNU gettext in libc" >&5
 echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6
 if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5413 "configure"
+#line 5951 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -5424,16 +5962,16 @@ return (int) gettext ("") + _nl_msg_cat_cntr
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5427: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5965: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5430: \$? = $ac_status" >&5
+  echo "$as_me:5968: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5971: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5436: \$? = $ac_status" >&5
+  echo "$as_me:5974: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_func_gnugettext1_libc=yes
 else
@@ -5443,11 +5981,11 @@ gt_cv_func_gnugettext1_libc=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5446: result: $gt_cv_func_gnugettext1_libc" >&5
+echo "$as_me:5984: result: $gt_cv_func_gnugettext1_libc" >&5
 echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6
 
 	   if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
-	     echo "$as_me:5450: checking for GNU gettext in libintl" >&5
+	     echo "$as_me:5988: checking for GNU gettext in libintl" >&5
 echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6
 if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5455,7 +5993,7 @@ else
   gt_save_LIBS="$LIBS"
 		LIBS="$LIBS -lintl $LIBICONV"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 5458 "configure"
+#line 5996 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -5469,16 +6007,16 @@ return (int) gettext ("") + _nl_msg_cat_cntr
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5472: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6010: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5475: \$? = $ac_status" >&5
+  echo "$as_me:6013: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5478: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5481: \$? = $ac_status" >&5
+  echo "$as_me:6019: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_func_gnugettext1_libintl=yes
 else
@@ -5489,7 +6027,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 		LIBS="$gt_save_LIBS"
 fi
-echo "$as_me:5492: result: $gt_cv_func_gnugettext1_libintl" >&5
+echo "$as_me:6030: result: $gt_cv_func_gnugettext1_libintl" >&5
 echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6
 	   fi
 
@@ -5511,13 +6049,13 @@ EOF
 for ac_func in dcgettext
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5514: checking for $ac_func" >&5
+echo "$as_me:6052: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5520 "configure"
+#line 6058 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -5548,16 +6086,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5551: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6089: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5554: \$? = $ac_status" >&5
+  echo "$as_me:6092: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6095: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5560: \$? = $ac_status" >&5
+  echo "$as_me:6098: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -5567,7 +6105,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5570: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6108: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -5582,7 +6120,7 @@ done
 	     	     # Extract the first word of "msgfmt", so it can be a program name with args.
 
 set dummy msgfmt; ac_word=$2
-echo "$as_me:5585: checking for $ac_word" >&5
+echo "$as_me:6123: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5609,16 +6147,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:5612: result: $MSGFMT" >&5
+  echo "$as_me:6150: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:5615: result: no" >&5
+  echo "$as_me:6153: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	     # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:5621: checking for $ac_word" >&5
+echo "$as_me:6159: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5635,7 +6173,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-   echo "$as_me:5638: found $ac_dir/$ac_word" >&5
+   echo "$as_me:6176: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -5647,17 +6185,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:5650: result: $GMSGFMT" >&5
+  echo "$as_me:6188: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:5653: result: no" >&5
+  echo "$as_me:6191: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	     	     # Extract the first word of "xgettext", so it can be a program name with args.
 
 set dummy xgettext; ac_word=$2
-echo "$as_me:5660: checking for $ac_word" >&5
+echo "$as_me:6198: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5684,10 +6222,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:5687: result: $XGETTEXT" >&5
+  echo "$as_me:6225: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:5690: result: no" >&5
+  echo "$as_me:6228: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5703,7 +6241,7 @@ fi
 
       if test "$nls_cv_use_gnu_gettext" = "yes"; then
         if test ! -d $srcdir/intl ; then
-	  { { echo "$as_me:5706: error: no NLS library is packaged with this application" >&5
+	  { { echo "$as_me:6244: error: no NLS library is packaged with this application" >&5
 echo "$as_me: error: no NLS library is packaged with this application" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -5711,7 +6249,7 @@ echo "$as_me: error: no NLS library is packaged with this application" >&2;}
         # Extract the first word of "msgfmt", so it can be a program name with args.
 
 set dummy msgfmt; ac_word=$2
-echo "$as_me:5714: checking for $ac_word" >&5
+echo "$as_me:6252: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5738,16 +6276,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:5741: result: $MSGFMT" >&5
+  echo "$as_me:6279: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:5744: result: no" >&5
+  echo "$as_me:6282: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:5750: checking for $ac_word" >&5
+echo "$as_me:6288: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5764,7 +6302,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-   echo "$as_me:5767: found $ac_dir/$ac_word" >&5
+   echo "$as_me:6305: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -5776,17 +6314,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:5779: result: $GMSGFMT" >&5
+  echo "$as_me:6317: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:5782: result: no" >&5
+  echo "$as_me:6320: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
         # Extract the first word of "xgettext", so it can be a program name with args.
 
 set dummy xgettext; ac_word=$2
-echo "$as_me:5789: checking for $ac_word" >&5
+echo "$as_me:6327: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5813,10 +6351,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:5816: result: $XGETTEXT" >&5
+  echo "$as_me:6354: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:5819: result: no" >&5
+  echo "$as_me:6357: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5831,7 +6369,7 @@ fi
 			if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
 	  : ;
 	else
-	  echo "$as_me:5834: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+	  echo "$as_me:6372: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
 echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
 	  GMSGFMT=":"
 	fi
@@ -5841,7 +6379,7 @@ echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
 			if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
 	  : ;
 	else
-	  echo "$as_me:5844: result: found xgettext program is not GNU xgettext; ignore it" >&5
+	  echo "$as_me:6382: result: found xgettext program is not GNU xgettext; ignore it" >&5
 echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
 	  XGETTEXT=":"
 	fi
@@ -5861,7 +6399,7 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5864: checking for $ac_word" >&5
+echo "$as_me:6402: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INTLBISON+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5876,7 +6414,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INTLBISON="$ac_prog"
-echo "$as_me:5879: found $ac_dir/$ac_word" >&5
+echo "$as_me:6417: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5884,10 +6422,10 @@ fi
 fi
 INTLBISON=$ac_cv_prog_INTLBISON
 if test -n "$INTLBISON"; then
-  echo "$as_me:5887: result: $INTLBISON" >&5
+  echo "$as_me:6425: result: $INTLBISON" >&5
 echo "${ECHO_T}$INTLBISON" >&6
 else
-  echo "$as_me:5890: result: no" >&5
+  echo "$as_me:6428: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5897,7 +6435,7 @@ done
     if test -z "$INTLBISON"; then
       ac_verc_fail=yes
     else
-            echo "$as_me:5900: checking version of bison" >&5
+            echo "$as_me:6438: checking version of bison" >&5
 echo $ECHO_N "checking version of bison... $ECHO_C" >&6
       ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
       case $ac_prog_version in
@@ -5906,7 +6444,7 @@ echo $ECHO_N "checking version of bison... $ECHO_C" >&6
            ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
         *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
       esac
-      echo "$as_me:5909: result: $ac_prog_version" >&5
+      echo "$as_me:6447: result: $ac_prog_version" >&5
 echo "${ECHO_T}$ac_prog_version" >&6
     fi
     if test $ac_verc_fail = yes; then
@@ -5932,7 +6470,7 @@ echo "${ECHO_T}$ac_prog_version" >&6
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       echo "$as_me:5935: checking for catalogs to be installed" >&5
+       echo "$as_me:6473: checking for catalogs to be installed" >&5
 echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
        NEW_LINGUAS=
        for presentlang in $ALL_LINGUAS; do
@@ -5952,7 +6490,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       echo "$as_me:5955: result: $LINGUAS" >&5
+       echo "$as_me:6493: result: $LINGUAS" >&5
 echo "${ECHO_T}$LINGUAS" >&6
      fi
 
@@ -5985,7 +6523,7 @@ cf_makefile=makefile
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d $srcdir/po ; then
-echo "$as_me:5988: checking if we should use included message-library" >&5
+echo "$as_me:6526: checking if we should use included message-library" >&5
 echo $ECHO_N "checking if we should use included message-library... $ECHO_C" >&6
 
 # Check whether --enable-included-msgs or --disable-included-msgs was given.
@@ -5996,7 +6534,7 @@ else
   use_our_messages=yes
 fi;
 fi
-echo "$as_me:5999: result: $use_our_messages" >&5
+echo "$as_me:6537: result: $use_our_messages" >&5
 echo "${ECHO_T}$use_our_messages" >&6
 fi
 
@@ -6025,7 +6563,7 @@ EOF
 			$srcdir/intl/makefile.in
 		do
 			if test -f "$cf_makefile" ; then
-				SUB_MAKEFILE="$SUB_MAKEFILE `echo ${cf_makefile}|sed -e ',^'$srcdir',,' -e 's/\.in$//'`:${cf_makefile}"
+				SUB_MAKEFILE="$SUB_MAKEFILE `echo \"${cf_makefile}\"|sed -e 's,^'$srcdir/',,' -e 's/\.in$//'`:${cf_makefile}"
 				break
 			fi
 		done
@@ -6037,23 +6575,23 @@ else
 for ac_header in libintl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6040: checking for $ac_header" >&5
+echo "$as_me:6578: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6046 "configure"
+#line 6584 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6050: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6588: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6056: \$? = $ac_status" >&5
+  echo "$as_me:6594: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6072,7 +6610,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:6075: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:6613: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -6148,7 +6686,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%`
   ;;
 *)
-  { { echo "$as_me:6151: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:6689: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -6156,7 +6694,7 @@ esac
 
 eval NLS_DATADIR="$withval"
 
-echo "$as_me:6159: checking if you want full utility pathnames" >&5
+echo "$as_me:6697: checking if you want full utility pathnames" >&5
 echo $ECHO_N "checking if you want full utility pathnames... $ECHO_C" >&6
 
 # Check whether --enable-full-paths or --disable-full-paths was given.
@@ -6173,13 +6711,13 @@ else
   with_full_paths=yes
 
 fi;
-echo "$as_me:6176: result: $with_full_paths" >&5
+echo "$as_me:6714: result: $with_full_paths" >&5
 echo "${ECHO_T}$with_full_paths" >&6
 test $with_full_paths = no && cat >>confdefs.h <<\EOF
 #define USE_EXECVP 1
 EOF
 
-echo "$as_me:6182: checking for system mailer" >&5
+echo "$as_me:6720: checking for system mailer" >&5
 echo $ECHO_N "checking for system mailer... $ECHO_C" >&6
 if test "${cf_cv_SYSTEM_MAIL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6199,13 +6737,13 @@ else
 
 fi
 
-echo "$as_me:6202: result: $cf_cv_SYSTEM_MAIL" >&5
+echo "$as_me:6740: result: $cf_cv_SYSTEM_MAIL" >&5
 echo "${ECHO_T}$cf_cv_SYSTEM_MAIL" >&6
 cat >>confdefs.h <<EOF
 #define SYSTEM_MAIL "$cf_cv_SYSTEM_MAIL"
 EOF
 
-echo "$as_me:6208: checking system mail flags" >&5
+echo "$as_me:6746: checking system mail flags" >&5
 echo $ECHO_N "checking system mail flags... $ECHO_C" >&6
 if test "${cf_cv_system_mail_flags+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6221,7 +6759,7 @@ else
 
 fi
 
-echo "$as_me:6224: result: $cf_cv_system_mail_flags" >&5
+echo "$as_me:6762: result: $cf_cv_system_mail_flags" >&5
 echo "${ECHO_T}$cf_cv_system_mail_flags" >&6
 cat >>confdefs.h <<EOF
 #define SYSTEM_MAIL_FLAGS "$cf_cv_system_mail_flags"
@@ -6233,10 +6771,67 @@ if test $with_full_paths = no ; then
 fi
 fi
 
+echo "$as_me:6774: checking if $CC -U and -D options work together" >&5
+echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
+if test "${cf_cv_cc_u_d_options+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+	cf_save_CPPFLAGS="$CPPFLAGS"
+	CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
+	cat >conftest.$ac_ext <<_ACEOF
+#line 6783 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+#ifndef U_D_OPTIONS
+make an undefined-error
+#endif
+#ifdef  D_U_OPTIONS
+make a defined-error
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:6802: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:6805: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:6808: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6811: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+	cf_cv_cc_u_d_options=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+	cf_cv_cc_u_d_options=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+	CPPFLAGS="$cf_save_CPPFLAGS"
+
+fi
+echo "$as_me:6825: result: $cf_cv_cc_u_d_options" >&5
+echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
+
 cf_XOPEN_SOURCE=600
 cf_POSIX_C_SOURCE=199506L
 
 case $host_os in #(vi
+aix[45]*) #(vi
+	CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
+	;;
 freebsd*) #(vi
 	# 5.x headers associate
 	#	_XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
@@ -6253,15 +6848,14 @@ irix[56].*) #(vi
 	;;
 linux*|gnu*) #(vi
 
-if test "$INTEL_COMPILER" = no ; then
-echo "$as_me:6257: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:6851: checking if we must define _GNU_SOURCE" >&5
 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 6264 "configure"
+#line 6858 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -6276,16 +6870,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6279: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6873: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6282: \$? = $ac_status" >&5
+  echo "$as_me:6876: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6285: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6879: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6288: \$? = $ac_status" >&5
+  echo "$as_me:6882: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -6294,7 +6888,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 6297 "configure"
+#line 6891 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -6309,16 +6903,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6312: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6906: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6315: \$? = $ac_status" >&5
+  echo "$as_me:6909: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6321: \$? = $ac_status" >&5
+  echo "$as_me:6915: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -6333,10 +6927,9 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6336: result: $cf_cv_gnu_source" >&5
+echo "$as_me:6930: result: $cf_cv_gnu_source" >&5
 echo "${ECHO_T}$cf_cv_gnu_source" >&6
 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-fi
 
 	;;
 mirbsd*) #(vi
@@ -6351,6 +6944,9 @@ openbsd*) #(vi
 osf[45]*) #(vi
 	CPPFLAGS="$CPPFLAGS -D_OSF_SOURCE"
 	;;
+nto-qnx*) #(vi
+	CPPFLAGS="$CPPFLAGS -D_QNX_SOURCE"
+	;;
 sco*) #(vi
 	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
 	;;
@@ -6358,14 +6954,14 @@ solaris*) #(vi
 	CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
 	;;
 *)
-	echo "$as_me:6361: checking if we should define _XOPEN_SOURCE" >&5
+	echo "$as_me:6957: checking if we should define _XOPEN_SOURCE" >&5
 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_xopen_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 6368 "configure"
+#line 6964 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -6380,16 +6976,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6383: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6979: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6386: \$? = $ac_status" >&5
+  echo "$as_me:6982: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6389: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6392: \$? = $ac_status" >&5
+  echo "$as_me:6988: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -6398,7 +6994,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 6401 "configure"
+#line 6997 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -6413,16 +7009,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6416: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7012: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6419: \$? = $ac_status" >&5
+  echo "$as_me:7015: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6425: \$? = $ac_status" >&5
+  echo "$as_me:7021: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -6437,21 +7033,50 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6440: result: $cf_cv_xopen_source" >&5
+echo "$as_me:7036: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
-test "$cf_cv_xopen_source" != no && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_cv_xopen_source"
+	if test "$cf_cv_xopen_source" != no ; then
+
+# remove _XOPEN_SOURCE symbol from $CFLAGS
+CFLAGS=`echo "$CFLAGS" | \
+	sed	-e 's/-[UD]_XOPEN_SOURCE\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]_XOPEN_SOURCE\(=[^ 	]*\)\?$//g'`
+
+# remove _XOPEN_SOURCE symbol from $CPPFLAGS
+CPPFLAGS=`echo "$CPPFLAGS" | \
+	sed	-e 's/-[UD]_XOPEN_SOURCE\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]_XOPEN_SOURCE\(=[^ 	]*\)\?$//g'`
+
+		test "$cf_cv_cc_u_d_options" = yes && \
+			CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE"
+		CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_cv_xopen_source"
+	fi
 
 cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
-echo "$as_me:6445: checking if we should define _POSIX_C_SOURCE" >&5
+
+cf_save_CFLAGS="$CFLAGS"
+cf_save_CPPFLAGS="$CPPFLAGS"
+
+# remove _POSIX_C_SOURCE symbol from $cf_save_CFLAGS
+cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \
+	sed	-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?$//g'`
+
+# remove _POSIX_C_SOURCE symbol from $cf_save_CPPFLAGS
+cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
+	sed	-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?$//g'`
+
+echo "$as_me:7070: checking if we should define _POSIX_C_SOURCE" >&5
 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_posix_c_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "(line 6451) testing if the symbol is already defined go no further ..." 1>&5
+echo "(line 7076) testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 6454 "configure"
+#line 7079 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -6466,42 +7091,80 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6469: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7094: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6472: \$? = $ac_status" >&5
+  echo "$as_me:7097: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7100: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6478: \$? = $ac_status" >&5
+  echo "$as_me:7103: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-case .$cf_POSIX_C_SOURCE in
-	 .[12]??*)
+cf_want_posix_source=no
+	 case .$cf_POSIX_C_SOURCE in #(vi
+	 .[12]??*) #(vi
 		cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
 		;;
-	 .2)
-		cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_POSIX_SOURCE"
+	 .2) #(vi
+		cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
+		cf_want_posix_source=yes
 		;;
 	 .*)
-		cf_cv_posix_c_source="-D_POSIX_SOURCE"
+		cf_want_posix_source=yes
 		;;
 	 esac
+	 if test "$cf_want_posix_source" = yes ; then
+		cat >conftest.$ac_ext <<_ACEOF
+#line 7124 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+int
+main ()
+{
+
+#ifdef _POSIX_SOURCE
+make an error
+#endif
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:7139: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:7142: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:7145: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7148: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+	 fi
 
-echo "(line 6496) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "(line 7159) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
-	 cf_save="$CPPFLAGS"
-	 CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source"
+	 CFLAGS="$cf_trim_CFLAGS"
+	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 
-echo "(line 6501) testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "(line 7164) testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 6504 "configure"
+#line 7167 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -6516,16 +7179,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6519: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6522: \$? = $ac_status" >&5
+  echo "$as_me:7185: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6528: \$? = $ac_status" >&5
+  echo "$as_me:7191: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -6534,15 +7197,26 @@ cat conftest.$ac_ext >&5
 cf_cv_posix_c_source=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	CPPFLAGS="$cf_save"
+	 CFLAGS="$cf_save_CFLAGS"
+	 CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6543: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:7207: result: $cf_cv_posix_c_source" >&5
 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
-test "$cf_cv_posix_c_source" != no && CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source"
+
+if test "$cf_cv_posix_c_source" != no ; then
+	CFLAGS="$cf_trim_CFLAGS"
+	CPPFLAGS="$cf_trim_CPPFLAGS"
+	if test "$cf_cv_cc_u_d_options" = yes ; then
+		cf_temp_posix_c_source=`echo "$cf_cv_posix_c_source" | \
+				sed -e 's/-D/-U/g' -e 's/=[^ 	]*//g'`
+		CPPFLAGS="$CPPFLAGS $cf_temp_posix_c_source"
+	fi
+	CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source"
+fi
 
 	;;
 esac
@@ -6627,7 +7301,7 @@ fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 6630 "configure"
+#line 7304 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6639,16 +7313,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6642: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7316: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6645: \$? = $ac_status" >&5
+  echo "$as_me:7319: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6648: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7322: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6651: \$? = $ac_status" >&5
+  echo "$as_me:7325: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -6669,7 +7343,7 @@ fi
 
 ### Look for network libraries first, since some functions (such as gethostname)
 ### are used in a lot of places.
-echo "$as_me:6672: checking if you want ssl library" >&5
+echo "$as_me:7346: checking if you want ssl library" >&5
 echo $ECHO_N "checking if you want ssl library... $ECHO_C" >&6
 if test "${cf_cv_use_libssl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6684,11 +7358,11 @@ else
 fi;
 
 fi
-echo "$as_me:6687: result: $cf_cv_use_libssl" >&5
+echo "$as_me:7361: result: $cf_cv_use_libssl" >&5
 echo "${ECHO_T}$cf_cv_use_libssl" >&6
 
 if test "x$cf_cv_use_libssl" = "xno" ; then
-echo "$as_me:6691: checking if you want experimental gnutls support" >&5
+echo "$as_me:7365: checking if you want experimental gnutls support" >&5
 echo $ECHO_N "checking if you want experimental gnutls support... $ECHO_C" >&6
 if test "${cf_cv_use_libgnutls+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6703,11 +7377,11 @@ else
 fi;
 
 fi
-echo "$as_me:6706: result: $cf_cv_use_libgnutls" >&5
+echo "$as_me:7380: result: $cf_cv_use_libgnutls" >&5
 echo "${ECHO_T}$cf_cv_use_libgnutls" >&6
 fi
 
-echo "$as_me:6710: checking if you want socks library" >&5
+echo "$as_me:7384: checking if you want socks library" >&5
 echo $ECHO_N "checking if you want socks library... $ECHO_C" >&6
 if test "${cf_cv_use_libsocks+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6722,10 +7396,10 @@ else
 fi;
 
 fi
-echo "$as_me:6725: result: $cf_cv_use_libsocks" >&5
+echo "$as_me:7399: result: $cf_cv_use_libsocks" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks" >&6
 
-echo "$as_me:6728: checking if you want socks5 library" >&5
+echo "$as_me:7402: checking if you want socks5 library" >&5
 echo $ECHO_N "checking if you want socks5 library... $ECHO_C" >&6
 if test "${cf_cv_use_libsocks5+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6740,7 +7414,7 @@ else
 fi;
 
 fi
-echo "$as_me:6743: result: $cf_cv_use_libsocks5" >&5
+echo "$as_me:7417: result: $cf_cv_use_libsocks5" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks5" >&6
 
 if test "x$cf_cv_use_libsocks" != xno ; then
@@ -6758,7 +7432,7 @@ no|yes) #(vi
       test -d $cf_cv_use_libsocks/../include && CPPFLAGS="$CPPFLAGS -I$cf_cv_use_libsocks/../include"
     fi
   else
-    { echo "$as_me:6761: WARNING: expected a directory: $cf_cv_use_libsocks" >&5
+    { echo "$as_me:7435: WARNING: expected a directory: $cf_cv_use_libsocks" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libsocks" >&2;}
   fi
   ;;
@@ -6801,7 +7475,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 6804 "configure"
+#line 7478 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -6815,22 +7489,22 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6818: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7492: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6821: \$? = $ac_status" >&5
+  echo "$as_me:7495: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6827: \$? = $ac_status" >&5
+  echo "$as_me:7501: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:6833: error: Cannot link with socks library" >&5
+{ { echo "$as_me:7507: error: Cannot link with socks library" >&5
 echo "$as_me: error: Cannot link with socks library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -6851,7 +7525,7 @@ no|yes) #(vi
       test -d $cf_cv_use_libsocks5/../include && CPPFLAGS="$CPPFLAGS -I$cf_cv_use_libsocks5/../include"
     fi
   else
-    { echo "$as_me:6854: WARNING: expected a directory: $cf_cv_use_libsocks5" >&5
+    { echo "$as_me:7528: WARNING: expected a directory: $cf_cv_use_libsocks5" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libsocks5" >&2;}
   fi
   ;;
@@ -6865,11 +7539,11 @@ cat >>confdefs.h <<\EOF
 #define SOCKS 1
 EOF
 
-echo "$as_me:6868: checking if the socks library uses socks4 prefix" >&5
+echo "$as_me:7542: checking if the socks library uses socks4 prefix" >&5
 echo $ECHO_N "checking if the socks library uses socks4 prefix... $ECHO_C" >&6
 cf_use_socks4=error
 cat >conftest.$ac_ext <<_ACEOF
-#line 6872 "configure"
+#line 7546 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
@@ -6883,16 +7557,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6886: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7560: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6889: \$? = $ac_status" >&5
+  echo "$as_me:7563: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6892: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6895: \$? = $ac_status" >&5
+  echo "$as_me:7569: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >>confdefs.h <<\EOF
 #define USE_SOCKS4_PREFIX 1
@@ -6903,7 +7577,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 6906 "configure"
+#line 7580 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int
@@ -6915,29 +7589,29 @@ SOCKSinit((char *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6918: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7592: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6921: \$? = $ac_status" >&5
+  echo "$as_me:7595: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7598: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6927: \$? = $ac_status" >&5
+  echo "$as_me:7601: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_use_socks4=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:6933: error: Cannot link with socks5 library" >&5
+{ { echo "$as_me:7607: error: Cannot link with socks5 library" >&5
 echo "$as_me: error: Cannot link with socks5 library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:6940: result: $cf_use_socks4" >&5
+echo "$as_me:7614: result: $cf_use_socks4" >&5
 echo "${ECHO_T}$cf_use_socks4" >&6
 if test "$cf_use_socks4" = "yes" ; then
 	cat >>confdefs.h <<\EOF
@@ -6990,10 +7664,10 @@ EOF
 EOF
 
 fi
-echo "$as_me:6993: checking if socks5p.h is available" >&5
+echo "$as_me:7667: checking if socks5p.h is available" >&5
 echo $ECHO_N "checking if socks5p.h is available... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 6996 "configure"
+#line 7670 "configure"
 #include "confdefs.h"
 
 #define INCLUDE_PROTOTYPES
@@ -7008,16 +7682,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7011: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7685: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7014: \$? = $ac_status" >&5
+  echo "$as_me:7688: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7691: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7020: \$? = $ac_status" >&5
+  echo "$as_me:7694: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_use_socks5p_h=yes
 else
@@ -7026,7 +7700,7 @@ cat conftest.$ac_ext >&5
 cf_use_socks5p_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:7029: result: $cf_use_socks5p_h" >&5
+echo "$as_me:7703: result: $cf_use_socks5p_h" >&5
 echo "${ECHO_T}$cf_use_socks5p_h" >&6
 test "$cf_use_socks5p_h" = yes && cat >>confdefs.h <<\EOF
 #define INCLUDE_PROTOTYPES 1
@@ -7035,13 +7709,13 @@ EOF
 else
 
 cf_test_netlibs=no
-echo "$as_me:7038: checking for network libraries" >&5
+echo "$as_me:7712: checking for network libraries" >&5
 echo $ECHO_N "checking for network libraries... $ECHO_C" >&6
 if test "${cf_cv_netlibs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "$as_me:7044: result: working..." >&5
+echo "$as_me:7718: result: working..." >&5
 echo "${ECHO_T}working..." >&6
 cf_cv_netlibs=""
 cf_test_netlibs=yes
@@ -7049,13 +7723,13 @@ cf_test_netlibs=yes
 for ac_func in gethostname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7052: checking for $ac_func" >&5
+echo "$as_me:7726: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7058 "configure"
+#line 7732 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7086,16 +7760,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7089: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7763: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7092: \$? = $ac_status" >&5
+  echo "$as_me:7766: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7095: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7769: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7098: \$? = $ac_status" >&5
+  echo "$as_me:7772: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -7105,7 +7779,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7108: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7782: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -7114,7 +7788,7 @@ EOF
 
 else
 
-echo "$as_me:7117: checking for gethostname in -lnsl" >&5
+echo "$as_me:7791: checking for gethostname in -lnsl" >&5
 echo $ECHO_N "checking for gethostname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7122,7 +7796,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7125 "configure"
+#line 7799 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7141,16 +7815,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7144: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7818: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7147: \$? = $ac_status" >&5
+  echo "$as_me:7821: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7824: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7153: \$? = $ac_status" >&5
+  echo "$as_me:7827: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostname=yes
 else
@@ -7161,7 +7835,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7164: result: $ac_cv_lib_nsl_gethostname" >&5
+echo "$as_me:7838: result: $ac_cv_lib_nsl_gethostname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostname" >&6
 if test $ac_cv_lib_nsl_gethostname = yes; then
 
@@ -7178,7 +7852,7 @@ else
 	ac_cv_func_gethostname=unknown
 	unset ac_cv_func_gethostname 2>/dev/null
 
-echo "$as_me:7181: checking for gethostname in -lsocket" >&5
+echo "$as_me:7855: checking for gethostname in -lsocket" >&5
 echo $ECHO_N "checking for gethostname in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_gethostname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7186,7 +7860,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7189 "configure"
+#line 7863 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7205,16 +7879,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7208: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7882: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7211: \$? = $ac_status" >&5
+  echo "$as_me:7885: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7888: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7217: \$? = $ac_status" >&5
+  echo "$as_me:7891: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_gethostname=yes
 else
@@ -7225,7 +7899,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7228: result: $ac_cv_lib_socket_gethostname" >&5
+echo "$as_me:7902: result: $ac_cv_lib_socket_gethostname" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_gethostname" >&6
 if test $ac_cv_lib_socket_gethostname = yes; then
 
@@ -7253,7 +7927,7 @@ done
 # FIXME:  sequent needs this library (i.e., -lsocket -linet -lnsl), but
 # I don't know the entrypoints - 97/7/22 TD
 # AC_HAVE_LIBRARY(inet,cf_cv_netlibs="-linet $cf_cv_netlibs")
-echo "$as_me:7256: checking for main in -linet" >&5
+echo "$as_me:7930: checking for main in -linet" >&5
 echo $ECHO_N "checking for main in -linet... $ECHO_C" >&6
 if test "${ac_cv_lib_inet_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7261,7 +7935,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7264 "configure"
+#line 7938 "configure"
 #include "confdefs.h"
 
 int
@@ -7273,16 +7947,16 @@ main ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7276: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7950: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7279: \$? = $ac_status" >&5
+  echo "$as_me:7953: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7956: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7285: \$? = $ac_status" >&5
+  echo "$as_me:7959: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_inet_main=yes
 else
@@ -7293,7 +7967,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7296: result: $ac_cv_lib_inet_main" >&5
+echo "$as_me:7970: result: $ac_cv_lib_inet_main" >&5
 echo "${ECHO_T}$ac_cv_lib_inet_main" >&6
 if test $ac_cv_lib_inet_main = yes; then
   cf_cv_netlibs="-linet $cf_cv_netlibs"
@@ -7305,13 +7979,13 @@ if test "$ac_cv_func_lsocket" != no ; then
 for ac_func in socket
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7308: checking for $ac_func" >&5
+echo "$as_me:7982: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7314 "configure"
+#line 7988 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7342,16 +8016,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7345: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8019: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7348: \$? = $ac_status" >&5
+  echo "$as_me:8022: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7354: \$? = $ac_status" >&5
+  echo "$as_me:8028: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -7361,7 +8035,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7364: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8038: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -7370,7 +8044,7 @@ EOF
 
 else
 
-echo "$as_me:7373: checking for socket in -lsocket" >&5
+echo "$as_me:8047: checking for socket in -lsocket" >&5
 echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7378,7 +8052,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7381 "configure"
+#line 8055 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7397,16 +8071,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7400: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8074: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7403: \$? = $ac_status" >&5
+  echo "$as_me:8077: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7409: \$? = $ac_status" >&5
+  echo "$as_me:8083: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_socket=yes
 else
@@ -7417,7 +8091,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7420: result: $ac_cv_lib_socket_socket" >&5
+echo "$as_me:8094: result: $ac_cv_lib_socket_socket" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
 if test $ac_cv_lib_socket_socket = yes; then
 
@@ -7434,7 +8108,7 @@ else
 	ac_cv_func_socket=unknown
 	unset ac_cv_func_socket 2>/dev/null
 
-echo "$as_me:7437: checking for socket in -lbsd" >&5
+echo "$as_me:8111: checking for socket in -lbsd" >&5
 echo $ECHO_N "checking for socket in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7442,7 +8116,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7445 "configure"
+#line 8119 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7461,16 +8135,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7464: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8138: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7467: \$? = $ac_status" >&5
+  echo "$as_me:8141: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7473: \$? = $ac_status" >&5
+  echo "$as_me:8147: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_socket=yes
 else
@@ -7481,7 +8155,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7484: result: $ac_cv_lib_bsd_socket" >&5
+echo "$as_me:8158: result: $ac_cv_lib_bsd_socket" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_socket" >&6
 if test $ac_cv_lib_bsd_socket = yes; then
 
@@ -7511,13 +8185,13 @@ fi
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7514: checking for $ac_func" >&5
+echo "$as_me:8188: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7520 "configure"
+#line 8194 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7548,16 +8222,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7551: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8225: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7554: \$? = $ac_status" >&5
+  echo "$as_me:8228: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8231: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7560: \$? = $ac_status" >&5
+  echo "$as_me:8234: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -7567,7 +8241,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7570: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8244: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -7576,7 +8250,7 @@ EOF
 
 else
 
-echo "$as_me:7579: checking for gethostbyname in -lnsl" >&5
+echo "$as_me:8253: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7584,7 +8258,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7587 "configure"
+#line 8261 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7603,16 +8277,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7606: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8280: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7609: \$? = $ac_status" >&5
+  echo "$as_me:8283: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8286: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7615: \$? = $ac_status" >&5
+  echo "$as_me:8289: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -7623,7 +8297,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7626: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:8300: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
 
@@ -7650,13 +8324,13 @@ done
 for ac_func in strcasecmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7653: checking for $ac_func" >&5
+echo "$as_me:8327: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7659 "configure"
+#line 8333 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7687,16 +8361,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7690: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8364: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7693: \$? = $ac_status" >&5
+  echo "$as_me:8367: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7696: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7699: \$? = $ac_status" >&5
+  echo "$as_me:8373: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -7706,7 +8380,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7709: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8383: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -7715,7 +8389,7 @@ EOF
 
 else
 
-echo "$as_me:7718: checking for strcasecmp in -lresolv" >&5
+echo "$as_me:8392: checking for strcasecmp in -lresolv" >&5
 echo $ECHO_N "checking for strcasecmp in -lresolv... $ECHO_C" >&6
 if test "${ac_cv_lib_resolv_strcasecmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7723,7 +8397,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7726 "configure"
+#line 8400 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7742,16 +8416,16 @@ strcasecmp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7745: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8419: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7748: \$? = $ac_status" >&5
+  echo "$as_me:8422: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8425: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7754: \$? = $ac_status" >&5
+  echo "$as_me:8428: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_resolv_strcasecmp=yes
 else
@@ -7762,7 +8436,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7765: result: $ac_cv_lib_resolv_strcasecmp" >&5
+echo "$as_me:8439: result: $ac_cv_lib_resolv_strcasecmp" >&5
 echo "${ECHO_T}$ac_cv_lib_resolv_strcasecmp" >&6
 if test $ac_cv_lib_resolv_strcasecmp = yes; then
 
@@ -7791,14 +8465,14 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6
 
 fi
 
-echo "$as_me:7794: checking for inet_aton function" >&5
+echo "$as_me:8468: checking for inet_aton function" >&5
 echo $ECHO_N "checking for inet_aton function... $ECHO_C" >&6
 if test "${cf_cv_have_inet_aton+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7801 "configure"
+#line 8475 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -7814,16 +8488,16 @@ inet_aton(0, (struct in_addr *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7817: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8491: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7820: \$? = $ac_status" >&5
+  echo "$as_me:8494: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7823: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8497: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7826: \$? = $ac_status" >&5
+  echo "$as_me:8500: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_aton=yes
 else
@@ -7833,7 +8507,7 @@ cf_cv_have_inet_aton=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7836: result: $cf_cv_have_inet_aton" >&5
+echo "$as_me:8510: result: $cf_cv_have_inet_aton" >&5
 echo "${ECHO_T}$cf_cv_have_inet_aton" >&6
 if test "$cf_cv_have_inet_aton" = yes ; then
     cat >>confdefs.h <<\EOF
@@ -7841,14 +8515,14 @@ if test "$cf_cv_have_inet_aton" = yes ; then
 EOF
 
 else
-    echo "$as_me:7844: checking for inet_addr function" >&5
+    echo "$as_me:8518: checking for inet_addr function" >&5
 echo $ECHO_N "checking for inet_addr function... $ECHO_C" >&6
 if test "${cf_cv_have_inet_addr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 7851 "configure"
+#line 8525 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -7864,16 +8538,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7867: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8541: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7870: \$? = $ac_status" >&5
+  echo "$as_me:8544: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7873: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8547: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7876: \$? = $ac_status" >&5
+  echo "$as_me:8550: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_addr=yes
 else
@@ -7883,10 +8557,10 @@ cf_cv_have_inet_addr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7886: result: $cf_cv_have_inet_addr" >&5
+echo "$as_me:8560: result: $cf_cv_have_inet_addr" >&5
 echo "${ECHO_T}$cf_cv_have_inet_addr" >&6
     if test "$cf_cv_have_inet_addr" = no ; then
-	echo "$as_me:7889: checking for library with inet_addr" >&5
+	echo "$as_me:8563: checking for library with inet_addr" >&5
 echo $ECHO_N "checking for library with inet_addr... $ECHO_C" >&6
 if test "${cf_cv_lib_inet_addr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7897,7 +8571,7 @@ else
 	    do
 		LIBS="$cf_save_LIBS $cf_inetlib"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 7900 "configure"
+#line 8574 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -7913,16 +8587,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7916: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8590: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7919: \$? = $ac_status" >&5
+  echo "$as_me:8593: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8596: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7925: \$? = $ac_status" >&5
+  echo "$as_me:8599: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_inet_addr=$cf_inetlib
 else
@@ -7936,12 +8610,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	    done
 
 fi
-echo "$as_me:7939: result: $cf_cv_lib_inet_addr" >&5
+echo "$as_me:8613: result: $cf_cv_lib_inet_addr" >&5
 echo "${ECHO_T}$cf_cv_lib_inet_addr" >&6
 	if test "$cf_cv_lib_inet_addr" != no ; then
 	    LIBS="$LIBS $cf_cv_lib_inet_addr"
 	else
-	    { echo "$as_me:7944: WARNING: Unable to find library for inet_addr function" >&5
+	    { echo "$as_me:8618: WARNING: Unable to find library for inet_addr function" >&5
 echo "$as_me: WARNING: Unable to find library for inet_addr function" >&2;}
 	fi
     fi
@@ -7956,7 +8630,7 @@ no) #(vi
 	;;
 yes) #(vi
 
-echo "$as_me:7959: checking for SSL_get_version in -lssl" >&5
+echo "$as_me:8633: checking for SSL_get_version in -lssl" >&5
 echo $ECHO_N "checking for SSL_get_version in -lssl... $ECHO_C" >&6
 if test "${ac_cv_lib_ssl_SSL_get_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7964,7 +8638,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lssl -lcrypto $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7967 "configure"
+#line 8641 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7983,16 +8657,16 @@ SSL_get_version ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7986: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8660: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7989: \$? = $ac_status" >&5
+  echo "$as_me:8663: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7992: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8666: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7995: \$? = $ac_status" >&5
+  echo "$as_me:8669: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ssl_SSL_get_version=yes
 else
@@ -8003,7 +8677,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8006: result: $ac_cv_lib_ssl_SSL_get_version" >&5
+echo "$as_me:8680: result: $ac_cv_lib_ssl_SSL_get_version" >&5
 echo "${ECHO_T}$ac_cv_lib_ssl_SSL_get_version" >&6
 if test $ac_cv_lib_ssl_SSL_get_version = yes; then
   cat >>confdefs.h <<EOF
@@ -8020,7 +8694,7 @@ else
 
 			cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
 		else
-			{ { echo "$as_me:8023: error: cannot find ssl library" >&5
+			{ { echo "$as_me:8697: error: cannot find ssl library" >&5
 echo "$as_me: error: cannot find ssl library" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -8035,13 +8709,13 @@ fi
 		elif test -d $cf_cv_use_libssl/../include ; then
 			cf_ssl_root=$cf_cv_use_libssl/..
 		else
-			{ { echo "$as_me:8038: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+			{ { echo "$as_me:8712: error: cannot find ssl library under $cf_cv_use_libssl" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libssl" >&2;}
    { (exit 1); exit 1; }; }
 		fi
 		cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
 	else
-		{ echo "$as_me:8044: WARNING: expected a directory: $cf_cv_use_libssl" >&5
+		{ echo "$as_me:8718: WARNING: expected a directory: $cf_cv_use_libssl" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libssl" >&2;}
 	fi
 	;;
@@ -8125,10 +8799,10 @@ fi
 fi
 
 if test "$cf_ssl_subincs" = yes ; then
-echo "$as_me:8128: checking for openssl include directory" >&5
+echo "$as_me:8802: checking for openssl include directory" >&5
 echo $ECHO_N "checking for openssl include directory... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 8131 "configure"
+#line 8805 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -8142,16 +8816,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8145: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8819: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8148: \$? = $ac_status" >&5
+  echo "$as_me:8822: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8825: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8154: \$? = $ac_status" >&5
+  echo "$as_me:8828: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_openssl_incl=yes
 else
@@ -8160,7 +8834,7 @@ cat conftest.$ac_ext >&5
 cf_openssl_incl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:8163: result: $cf_openssl_incl" >&5
+echo "$as_me:8837: result: $cf_openssl_incl" >&5
 echo "${ECHO_T}$cf_openssl_incl" >&6
 test "$cf_openssl_incl" = yes && cat >>confdefs.h <<\EOF
 #define USE_OPENSSL_INCL 1
@@ -8168,10 +8842,10 @@ EOF
 
 fi
 
-echo "$as_me:8171: checking if we can link to ssl library" >&5
+echo "$as_me:8845: checking if we can link to ssl library" >&5
 echo $ECHO_N "checking if we can link to ssl library... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 8174 "configure"
+#line 8848 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -8190,16 +8864,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8193: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8867: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8196: \$? = $ac_status" >&5
+  echo "$as_me:8870: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8199: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8202: \$? = $ac_status" >&5
+  echo "$as_me:8876: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_library=yes
 else
@@ -8208,7 +8882,7 @@ cat conftest.$ac_ext >&5
 cf_ssl_library=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:8211: result: $cf_ssl_library" >&5
+echo "$as_me:8885: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -8220,7 +8894,7 @@ EOF
 EOF
 
 else
-	{ { echo "$as_me:8223: error: Cannot link with ssl library" >&5
+	{ { echo "$as_me:8897: error: Cannot link with ssl library" >&5
 echo "$as_me: error: Cannot link with ssl library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8228,7 +8902,7 @@ fi
 elif test "x$cf_cv_use_libgnutls" != xno ; then
 
 cf_ssl_library="-lgnutls -lcrypt"
-echo "$as_me:8231: checking if we know what directory gnutls is in" >&5
+echo "$as_me:8905: checking if we know what directory gnutls is in" >&5
 echo $ECHO_N "checking if we know what directory gnutls is in... $ECHO_C" >&6
 case "$cf_cv_use_libgnutls" in #(vi
 no) #(vi
@@ -8236,7 +8910,7 @@ no) #(vi
 	;;
 yes) #(vi
 
-echo "$as_me:8239: checking for gnutls_init in -lgnutls" >&5
+echo "$as_me:8913: checking for gnutls_init in -lgnutls" >&5
 echo $ECHO_N "checking for gnutls_init in -lgnutls... $ECHO_C" >&6
 if test "${ac_cv_lib_gnutls_gnutls_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8244,7 +8918,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls -lgnutls-extra -lgnutls -lcrypt $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8247 "configure"
+#line 8921 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8263,16 +8937,16 @@ gnutls_init ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8266: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8940: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8269: \$? = $ac_status" >&5
+  echo "$as_me:8943: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8272: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8946: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8275: \$? = $ac_status" >&5
+  echo "$as_me:8949: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_gnutls_init=yes
 else
@@ -8283,7 +8957,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8286: result: $ac_cv_lib_gnutls_gnutls_init" >&5
+echo "$as_me:8960: result: $ac_cv_lib_gnutls_gnutls_init" >&5
 echo "${ECHO_T}$ac_cv_lib_gnutls_gnutls_init" >&6
 if test $ac_cv_lib_gnutls_gnutls_init = yes; then
   cat >>confdefs.h <<EOF
@@ -8299,7 +8973,7 @@ else
 			test -n "$verbose" && echo "	assume it is in $cf_ssl_root" 1>&6
 
 		else
-			{ { echo "$as_me:8302: error: cannot find gnutls library" >&5
+			{ { echo "$as_me:8976: error: cannot find gnutls library" >&5
 echo "$as_me: error: cannot find gnutls library" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -8314,17 +8988,17 @@ fi
 		elif test -d $cf_cv_use_libgnutls/../include ; then
 			cf_ssl_root=$cf_cv_use_libgnutls/..
 		else
-			{ { echo "$as_me:8317: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+			{ { echo "$as_me:8991: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
    { (exit 1); exit 1; }; }
 		fi
 	else
-		{ echo "$as_me:8322: WARNING: expected a directory: $cf_cv_use_libgnutls" >&5
+		{ echo "$as_me:8996: WARNING: expected a directory: $cf_cv_use_libgnutls" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libgnutls" >&2;}
 	fi
 	;;
 esac
-echo "$as_me:8327: result: $cf_ssl_root" >&5
+echo "$as_me:9001: result: $cf_ssl_root" >&5
 echo "${ECHO_T}$cf_ssl_root" >&6
 LIBS="$cf_ssl_library $LIBS"
 
@@ -8405,7 +9079,7 @@ fi
 	fi
 fi
 
-echo "$as_me:8408: checking for SSL_connect in -lgnutls-openssl" >&5
+echo "$as_me:9082: checking for SSL_connect in -lgnutls-openssl" >&5
 echo $ECHO_N "checking for SSL_connect in -lgnutls-openssl... $ECHO_C" >&6
 if test "${ac_cv_lib_gnutls_openssl_SSL_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8413,7 +9087,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-openssl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8416 "configure"
+#line 9090 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8432,16 +9106,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8435: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9109: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8438: \$? = $ac_status" >&5
+  echo "$as_me:9112: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8441: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8444: \$? = $ac_status" >&5
+  echo "$as_me:9118: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_openssl_SSL_connect=yes
 else
@@ -8452,12 +9126,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8455: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "$as_me:9129: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_gnutls_openssl_SSL_connect" >&6
 if test $ac_cv_lib_gnutls_openssl_SSL_connect = yes; then
   LIBS="-lgnutls-openssl $LIBS"
 else
-  echo "$as_me:8460: checking for SSL_connect in -lgnutls-extra" >&5
+  echo "$as_me:9134: checking for SSL_connect in -lgnutls-extra" >&5
 echo $ECHO_N "checking for SSL_connect in -lgnutls-extra... $ECHO_C" >&6
 if test "${ac_cv_lib_gnutls_extra_SSL_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8465,7 +9139,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-extra  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8468 "configure"
+#line 9142 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8484,16 +9158,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8487: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9161: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8490: \$? = $ac_status" >&5
+  echo "$as_me:9164: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8493: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9167: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8496: \$? = $ac_status" >&5
+  echo "$as_me:9170: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_extra_SSL_connect=yes
 else
@@ -8504,12 +9178,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8507: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "$as_me:9181: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_gnutls_extra_SSL_connect" >&6
 if test $ac_cv_lib_gnutls_extra_SSL_connect = yes; then
   LIBS="-lgnutls-extra $LIBS"
 else
-  { { echo "$as_me:8512: error: cannot find gnutls openssl functions" >&5
+  { { echo "$as_me:9186: error: cannot find gnutls openssl functions" >&5
 echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8517,10 +9191,10 @@ fi
 fi
 
 if test "$cf_ssl_subincs" = yes ; then
-echo "$as_me:8520: checking for gnutls include directory" >&5
+echo "$as_me:9194: checking for gnutls include directory" >&5
 echo $ECHO_N "checking for gnutls include directory... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 8523 "configure"
+#line 9197 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -8534,16 +9208,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8537: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9211: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8540: \$? = $ac_status" >&5
+  echo "$as_me:9214: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9217: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8546: \$? = $ac_status" >&5
+  echo "$as_me:9220: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_openssl_incl=yes
 else
@@ -8552,7 +9226,7 @@ cat conftest.$ac_ext >&5
 cf_openssl_incl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:8555: result: $cf_openssl_incl" >&5
+echo "$as_me:9229: result: $cf_openssl_incl" >&5
 echo "${ECHO_T}$cf_openssl_incl" >&6
 test "$cf_openssl_incl" = yes && cat >>confdefs.h <<\EOF
 #define USE_GNUTLS_INCL 1
@@ -8560,10 +9234,10 @@ EOF
 
 fi
 
-echo "$as_me:8563: checking if we can link to gnutls library" >&5
+echo "$as_me:9237: checking if we can link to gnutls library" >&5
 echo $ECHO_N "checking if we can link to gnutls library... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 8566 "configure"
+#line 9240 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -8582,16 +9256,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8585: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9259: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8588: \$? = $ac_status" >&5
+  echo "$as_me:9262: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8591: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8594: \$? = $ac_status" >&5
+  echo "$as_me:9268: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_library=yes
 else
@@ -8600,7 +9274,7 @@ cat conftest.$ac_ext >&5
 cf_ssl_library=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:8603: result: $cf_ssl_library" >&5
+echo "$as_me:9277: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -8608,15 +9282,15 @@ if test "$cf_ssl_library" = yes ; then
 EOF
 
 else
-	{ { echo "$as_me:8611: error: Cannot link with gnutls library" >&5
+	{ { echo "$as_me:9285: error: Cannot link with gnutls library" >&5
 echo "$as_me: error: Cannot link with gnutls library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:8616: checking for X509 support" >&5
+echo "$as_me:9290: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 8619 "configure"
+#line 9293 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -8636,16 +9310,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(X509_STORE_CTX *0));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8639: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9313: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8642: \$? = $ac_status" >&5
+  echo "$as_me:9316: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8645: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9319: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8648: \$? = $ac_status" >&5
+  echo "$as_me:9322: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=no
 else
@@ -8653,7 +9327,7 @@ else
 cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:8656: result: $cf_x509_support" >&5
+echo "$as_me:9330: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 if test "$cf_x509_support" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -8664,7 +9338,7 @@ fi
 
 fi
 
-echo "$as_me:8667: checking for screen type" >&5
+echo "$as_me:9341: checking for screen type" >&5
 echo $ECHO_N "checking for screen type... $ECHO_C" >&6
 if test "${cf_cv_screen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8678,7 +9352,7 @@ case $withval in
 curses|ncurses|ncursesw|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
-*)	{ { echo "$as_me:8681: error: Unexpected value" >&5
+*)	{ { echo "$as_me:9355: error: Unexpected value" >&5
 echo "$as_me: error: Unexpected value" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -8687,7 +9361,7 @@ else
   cf_cv_screen=curses
 fi;
 fi
-echo "$as_me:8690: result: $cf_cv_screen" >&5
+echo "$as_me:9364: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
@@ -8716,7 +9390,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%`
   ;;
 *)
-  { { echo "$as_me:8719: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:9393: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -8733,7 +9407,7 @@ esac
 case $cf_cv_screen in
 curses)
 
-echo "$as_me:8736: checking for extra include directories" >&5
+echo "$as_me:9410: checking for extra include directories" >&5
 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
 if test "${cf_cv_curses_incdir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8753,11 +9427,11 @@ sunos3*|sunos4*)
 esac
 
 fi
-echo "$as_me:8756: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:9430: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS"
 
-echo "$as_me:8760: checking if we have identified curses headers" >&5
+echo "$as_me:9434: checking if we have identified curses headers" >&5
 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8771,7 +9445,7 @@ for cf_header in \
 	ncurses/ncurses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 8774 "configure"
+#line 9448 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -8783,16 +9457,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8786: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9460: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8789: \$? = $ac_status" >&5
+  echo "$as_me:9463: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9466: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8795: \$? = $ac_status" >&5
+  echo "$as_me:9469: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -8803,11 +9477,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:8806: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:9480: result: $cf_cv_ncurses_header" >&5
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
-	{ { echo "$as_me:8810: error: No curses header-files found" >&5
+	{ { echo "$as_me:9484: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8817,23 +9491,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8820: checking for $ac_header" >&5
+echo "$as_me:9494: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8826 "configure"
+#line 9500 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8830: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9504: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8836: \$? = $ac_status" >&5
+  echo "$as_me:9510: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8852,7 +9526,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8855: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9529: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8862,7 +9536,7 @@ EOF
 fi
 done
 
-echo "$as_me:8865: checking for ncurses version" >&5
+echo "$as_me:9539: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8888,10 +9562,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:8891: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:9565: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:8894: \$? = $ac_status" >&5
+  echo "$as_me:9568: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -8901,7 +9575,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8904 "configure"
+#line 9578 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -8926,15 +9600,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8929: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9603: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8932: \$? = $ac_status" >&5
+  echo "$as_me:9606: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9608: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8937: \$? = $ac_status" >&5
+  echo "$as_me:9611: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -8948,16 +9622,16 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:8951: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:9625: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:8957: checking if we have identified curses libraries" >&5
+echo "$as_me:9631: checking if we have identified curses libraries" >&5
 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 8960 "configure"
+#line 9634 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -8969,16 +9643,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8972: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9646: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8975: \$? = $ac_status" >&5
+  echo "$as_me:9649: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8981: \$? = $ac_status" >&5
+  echo "$as_me:9655: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -8987,13 +9661,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:8990: result: $cf_result" >&5
+echo "$as_me:9664: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case $host_os in #(vi
 freebsd*) #(vi
-	echo "$as_me:8996: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:9670: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9001,7 +9675,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9004 "configure"
+#line 9678 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9020,16 +9694,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9023: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9697: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9026: \$? = $ac_status" >&5
+  echo "$as_me:9700: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9703: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9032: \$? = $ac_status" >&5
+  echo "$as_me:9706: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -9040,7 +9714,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9043: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:9717: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   LIBS="-lmytinfo $LIBS"
@@ -9048,7 +9722,7 @@ fi
 
 	;;
 hpux10.*|hpux11.*) #(vi
-	echo "$as_me:9051: checking for initscr in -lcur_colr" >&5
+	echo "$as_me:9725: checking for initscr in -lcur_colr" >&5
 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9056,7 +9730,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9059 "configure"
+#line 9733 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9075,16 +9749,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9078: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9752: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9081: \$? = $ac_status" >&5
+  echo "$as_me:9755: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9087: \$? = $ac_status" >&5
+  echo "$as_me:9761: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -9095,7 +9769,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9098: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:9772: result: $ac_cv_lib_cur_colr_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
 if test $ac_cv_lib_cur_colr_initscr = yes; then
 
@@ -9104,7 +9778,7 @@ if test $ac_cv_lib_cur_colr_initscr = yes; then
 
 else
 
-	echo "$as_me:9107: checking for initscr in -lHcurses" >&5
+	echo "$as_me:9781: checking for initscr in -lHcurses" >&5
 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9112,7 +9786,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9115 "configure"
+#line 9789 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9131,16 +9805,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9134: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9808: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9137: \$? = $ac_status" >&5
+  echo "$as_me:9811: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9143: \$? = $ac_status" >&5
+  echo "$as_me:9817: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -9151,7 +9825,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9154: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:9828: result: $ac_cv_lib_Hcurses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
 if test $ac_cv_lib_Hcurses_initscr = yes; then
 
@@ -9189,13 +9863,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 
 	# Check for library containing tgoto.  Do this before curses library
 	# because it may be needed to link the test-case for initscr.
-	echo "$as_me:9192: checking for tgoto" >&5
+	echo "$as_me:9866: checking for tgoto" >&5
 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
 if test "${ac_cv_func_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9198 "configure"
+#line 9872 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -9226,16 +9900,16 @@ f = tgoto;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9229: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9903: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9232: \$? = $ac_status" >&5
+  echo "$as_me:9906: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9235: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9909: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9238: \$? = $ac_status" >&5
+  echo "$as_me:9912: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -9245,7 +9919,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9248: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:9922: result: $ac_cv_func_tgoto" >&5
 echo "${ECHO_T}$ac_cv_func_tgoto" >&6
 if test $ac_cv_func_tgoto = yes; then
   cf_term_lib=predefined
@@ -9254,7 +9928,7 @@ else
 		for cf_term_lib in $cf_check_list termcap termlib unknown
 		do
 			as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:9257: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:9931: checking for tgoto in -l$cf_term_lib" >&5
 echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9262,7 +9936,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9265 "configure"
+#line 9939 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9281,16 +9955,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9284: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9958: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9287: \$? = $ac_status" >&5
+  echo "$as_me:9961: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9293: \$? = $ac_status" >&5
+  echo "$as_me:9967: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -9301,7 +9975,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9304: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:9978: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   break
@@ -9316,7 +9990,7 @@ fi
 	for cf_curs_lib in $cf_check_list xcurses jcurses unknown
 	do
 		as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
-echo "$as_me:9319: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:9993: checking for initscr in -l$cf_curs_lib" >&5
 echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9324,7 +9998,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9327 "configure"
+#line 10001 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9343,16 +10017,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9346: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10020: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9349: \$? = $ac_status" >&5
+  echo "$as_me:10023: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9352: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9355: \$? = $ac_status" >&5
+  echo "$as_me:10029: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -9363,23 +10037,23 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9366: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:10040: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   break
 fi
 
 	done
-	test $cf_curs_lib = unknown && { { echo "$as_me:9373: error: no curses library found" >&5
+	test $cf_curs_lib = unknown && { { echo "$as_me:10047: error: no curses library found" >&5
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 
 	LIBS="-l$cf_curs_lib $cf_save_LIBS"
 	if test "$cf_term_lib" = unknown ; then
-		echo "$as_me:9379: checking if we can link with $cf_curs_lib library" >&5
+		echo "$as_me:10053: checking if we can link with $cf_curs_lib library" >&5
 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9382 "configure"
+#line 10056 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -9391,16 +10065,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9394: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10068: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9397: \$? = $ac_status" >&5
+  echo "$as_me:10071: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9403: \$? = $ac_status" >&5
+  echo "$as_me:10077: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -9409,18 +10083,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:9412: result: $cf_result" >&5
+		echo "$as_me:10086: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-		test $cf_result = no && { { echo "$as_me:9414: error: Cannot link curses library" >&5
+		test $cf_result = no && { { echo "$as_me:10088: error: Cannot link curses library" >&5
 echo "$as_me: error: Cannot link curses library" >&2;}
    { (exit 1); exit 1; }; }
 	elif test "$cf_curs_lib" = "$cf_term_lib" ; then
 		:
 	elif test "$cf_term_lib" != predefined ; then
-		echo "$as_me:9420: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+		echo "$as_me:10094: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9423 "configure"
+#line 10097 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -9432,16 +10106,16 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9435: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10109: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9438: \$? = $ac_status" >&5
+  echo "$as_me:10112: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9441: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9444: \$? = $ac_status" >&5
+  echo "$as_me:10118: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -9450,7 +10124,7 @@ cat conftest.$ac_ext >&5
 
 			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 9453 "configure"
+#line 10127 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -9462,16 +10136,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9465: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10139: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9468: \$? = $ac_status" >&5
+  echo "$as_me:10142: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10145: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9474: \$? = $ac_status" >&5
+  echo "$as_me:10148: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -9483,13 +10157,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:9486: result: $cf_result" >&5
+		echo "$as_me:10160: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	fi
 fi
 fi
 
-echo "$as_me:9492: checking for curses performance tradeoff" >&5
+echo "$as_me:10166: checking for curses performance tradeoff" >&5
 echo $ECHO_N "checking for curses performance tradeoff... $ECHO_C" >&6
 if test "${cf_cv_curs_performance+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9497,7 +10171,7 @@ else
 
     cf_cv_curs_performance=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 9500 "configure"
+#line 10174 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -9516,20 +10190,20 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9519: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10193: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9522: \$? = $ac_status" >&5
+  echo "$as_me:10196: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10199: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9528: \$? = $ac_status" >&5
+  echo "$as_me:10202: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9532 "configure"
+#line 10206 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -9549,16 +10223,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9552: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10226: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9555: \$? = $ac_status" >&5
+  echo "$as_me:10229: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10232: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9561: \$? = $ac_status" >&5
+  echo "$as_me:10235: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -9573,20 +10247,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:9576: result: $cf_cv_curs_performance" >&5
+echo "$as_me:10250: result: $cf_cv_curs_performance" >&5
 echo "${ECHO_T}$cf_cv_curs_performance" >&6
 test $cf_cv_curs_performance = yes && cat >>confdefs.h <<\EOF
 #define CURS_PERFORMANCE 1
 EOF
 
-echo "$as_me:9582: checking for curses touchline function" >&5
+echo "$as_me:10256: checking for curses touchline function" >&5
 echo $ECHO_N "checking for curses touchline function... $ECHO_C" >&6
 if test "${cf_cv_curs_touchline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9589 "configure"
+#line 10263 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -9599,23 +10273,23 @@ touchline(stdscr, 1,2,3);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9602: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10276: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9605: \$? = $ac_status" >&5
+  echo "$as_me:10279: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9608: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10282: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9611: \$? = $ac_status" >&5
+  echo "$as_me:10285: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=bsd
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 9618 "configure"
+#line 10292 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -9628,16 +10302,16 @@ touchline(stdscr, 1,2);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9631: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10305: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9634: \$? = $ac_status" >&5
+  echo "$as_me:10308: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9637: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9640: \$? = $ac_status" >&5
+  echo "$as_me:10314: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -9649,7 +10323,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9652: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:10326: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in #(vi
 bsd) #(vi
@@ -9675,7 +10349,7 @@ test -n "$cf_cv_curses_dir" && \
 test "$cf_cv_curses_dir" != "no" && \
 CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
 
-echo "$as_me:9678: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:10352: checking for $cf_ncuhdr_root header in include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9687,7 +10361,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9690 "configure"
+#line 10364 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9711,16 +10385,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9714: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10388: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9717: \$? = $ac_status" >&5
+  echo "$as_me:10391: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9723: \$? = $ac_status" >&5
+  echo "$as_me:10397: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -9735,13 +10409,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:9738: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:10412: result: $cf_cv_ncurses_h" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 
 if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
-echo "$as_me:9744: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:10418: checking for $cf_ncuhdr_root include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9836,7 +10510,7 @@ do
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 9839 "configure"
+#line 10513 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9848,16 +10522,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9851: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10525: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9854: \$? = $ac_status" >&5
+  echo "$as_me:10528: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10531: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9860: \$? = $ac_status" >&5
+  echo "$as_me:10534: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9884,7 +10558,7 @@ done
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9887 "configure"
+#line 10561 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9908,16 +10582,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9911: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10585: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9914: \$? = $ac_status" >&5
+  echo "$as_me:10588: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9917: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10591: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9920: \$? = $ac_status" >&5
+  echo "$as_me:10594: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -9938,12 +10612,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9941: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10615: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:9946: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:10620: result: $cf_cv_ncurses_h2" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
@@ -9965,7 +10639,7 @@ do
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 9968 "configure"
+#line 10642 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9977,16 +10651,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9980: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10654: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9983: \$? = $ac_status" >&5
+  echo "$as_me:10657: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10660: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9989: \$? = $ac_status" >&5
+  echo "$as_me:10663: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10037,7 +10711,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:10040: checking for ncurses version" >&5
+echo "$as_me:10714: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10063,10 +10737,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:10066: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:10740: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:10069: \$? = $ac_status" >&5
+  echo "$as_me:10743: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -10076,7 +10750,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10079 "configure"
+#line 10753 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10101,15 +10775,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10104: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10778: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10107: \$? = $ac_status" >&5
+  echo "$as_me:10781: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10783: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10112: \$? = $ac_status" >&5
+  echo "$as_me:10786: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10123,7 +10797,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:10126: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10800: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
@@ -10135,7 +10809,7 @@ cf_nculib_root=ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:10138: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:10812: checking for Gpm_Open in -lgpm" >&5
 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10143,7 +10817,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10146 "configure"
+#line 10820 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10162,16 +10836,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10165: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10839: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10168: \$? = $ac_status" >&5
+  echo "$as_me:10842: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10171: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10174: \$? = $ac_status" >&5
+  echo "$as_me:10848: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -10182,10 +10856,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10185: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:10859: result: $ac_cv_lib_gpm_Gpm_Open" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:10188: checking for initscr in -lgpm" >&5
+  echo "$as_me:10862: checking for initscr in -lgpm" >&5
 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10193,7 +10867,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10196 "configure"
+#line 10870 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10212,16 +10886,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10215: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10889: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10218: \$? = $ac_status" >&5
+  echo "$as_me:10892: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10221: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10224: \$? = $ac_status" >&5
+  echo "$as_me:10898: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -10232,7 +10906,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10235: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:10909: result: $ac_cv_lib_gpm_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
@@ -10247,7 +10921,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).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:10250: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:10924: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10255,7 +10929,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10258 "configure"
+#line 10932 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10274,16 +10948,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10277: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10951: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10280: \$? = $ac_status" >&5
+  echo "$as_me:10954: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10283: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10957: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10286: \$? = $ac_status" >&5
+  echo "$as_me:10960: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -10294,7 +10968,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10297: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:10971: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
@@ -10313,13 +10987,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:10316: checking for initscr" >&5
+	echo "$as_me:10990: checking for initscr" >&5
 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 if test "${ac_cv_func_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10322 "configure"
+#line 10996 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -10350,16 +11024,16 @@ f = initscr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10353: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11027: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10356: \$? = $ac_status" >&5
+  echo "$as_me:11030: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11033: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10362: \$? = $ac_status" >&5
+  echo "$as_me:11036: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -10369,18 +11043,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10372: result: $ac_cv_func_initscr" >&5
+echo "$as_me:11046: result: $ac_cv_func_initscr" >&5
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:10379: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:11053: checking for initscr in -l$cf_nculib_root" >&5
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
 		LIBS="-l$cf_nculib_root $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 10383 "configure"
+#line 11057 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10392,25 +11066,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10395: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11069: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10398: \$? = $ac_status" >&5
+  echo "$as_me:11072: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10401: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10404: \$? = $ac_status" >&5
+  echo "$as_me:11078: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:10406: result: yes" >&5
+  echo "$as_me:11080: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:10413: result: no" >&5
+echo "$as_me:11087: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -10470,11 +11144,11 @@ test -d /usr && {
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:10473: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:11147: checking for -l$cf_nculib_root in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 10477 "configure"
+#line 11151 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10486,25 +11160,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11163: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10492: \$? = $ac_status" >&5
+  echo "$as_me:11166: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11169: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10498: \$? = $ac_status" >&5
+  echo "$as_me:11172: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:10500: result: yes" >&5
+  echo "$as_me:11174: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:10507: result: no" >&5
+echo "$as_me:11181: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -10519,7 +11193,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:10522: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:11196: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10527,7 +11201,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:10530: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:11204: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
@@ -10537,7 +11211,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10540 "configure"
+#line 11214 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10549,23 +11223,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10552: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11226: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10555: \$? = $ac_status" >&5
+  echo "$as_me:11229: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11232: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10561: \$? = $ac_status" >&5
+  echo "$as_me:11235: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:10563: result: yes" >&5
+  echo "$as_me:11237: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:10568: result: no" >&5
+echo "$as_me:11242: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -10578,7 +11252,7 @@ cat >>confdefs.h <<EOF
 #define $cf_nculib_ROOT 1
 EOF
 
-echo "$as_me:10581: checking for ncurses version" >&5
+echo "$as_me:11255: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10604,10 +11278,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:10607: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:11281: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:10610: \$? = $ac_status" >&5
+  echo "$as_me:11284: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -10617,7 +11291,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10620 "configure"
+#line 11294 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10642,15 +11316,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10645: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11319: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10648: \$? = $ac_status" >&5
+  echo "$as_me:11322: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10650: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10653: \$? = $ac_status" >&5
+  echo "$as_me:11327: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10664,7 +11338,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:10667: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:11341: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
@@ -10673,7 +11347,7 @@ EOF
 	;;
 ncursesw)
 
-echo "$as_me:10676: checking for multibyte character support" >&5
+echo "$as_me:11350: checking for multibyte character support" >&5
 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
 if test "${cf_cv_utf8_lib+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10681,7 +11355,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10684 "configure"
+#line 11358 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10694,16 +11368,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10697: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11371: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10700: \$? = $ac_status" >&5
+  echo "$as_me:11374: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10703: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10706: \$? = $ac_status" >&5
+  echo "$as_me:11380: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -10711,7 +11385,7 @@ else
 cat conftest.$ac_ext >&5
 LIBS="-lutf8 $LIBS"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 10714 "configure"
+#line 11388 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -10724,16 +11398,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10727: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11401: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10730: \$? = $ac_status" >&5
+  echo "$as_me:11404: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11407: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10736: \$? = $ac_status" >&5
+  echo "$as_me:11410: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=add-on
 else
@@ -10747,7 +11421,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10750: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:11424: result: $cf_cv_utf8_lib" >&5
 echo "${ECHO_T}$cf_cv_utf8_lib" >&6
 
 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
@@ -10766,7 +11440,7 @@ test -n "$cf_cv_curses_dir" && \
 test "$cf_cv_curses_dir" != "no" && \
 CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
 
-echo "$as_me:10769: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:11443: checking for $cf_ncuhdr_root header in include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10778,7 +11452,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10781 "configure"
+#line 11455 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -10810,16 +11484,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10813: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11487: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10816: \$? = $ac_status" >&5
+  echo "$as_me:11490: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11493: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10822: \$? = $ac_status" >&5
+  echo "$as_me:11496: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -10834,13 +11508,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:10837: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:11511: result: $cf_cv_ncurses_h" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 
 if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
-echo "$as_me:10843: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:11517: checking for $cf_ncuhdr_root include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10935,7 +11609,7 @@ do
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 10938 "configure"
+#line 11612 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10947,16 +11621,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10950: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11624: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10953: \$? = $ac_status" >&5
+  echo "$as_me:11627: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10956: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10959: \$? = $ac_status" >&5
+  echo "$as_me:11633: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10983,7 +11657,7 @@ done
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10986 "configure"
+#line 11660 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -11015,16 +11689,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11018: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11692: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11021: \$? = $ac_status" >&5
+  echo "$as_me:11695: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11698: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11027: \$? = $ac_status" >&5
+  echo "$as_me:11701: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -11045,12 +11719,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11048: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11722: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:11053: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:11727: result: $cf_cv_ncurses_h2" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
@@ -11072,7 +11746,7 @@ do
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 11075 "configure"
+#line 11749 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11084,16 +11758,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11087: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11761: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11090: \$? = $ac_status" >&5
+  echo "$as_me:11764: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11093: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11767: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11096: \$? = $ac_status" >&5
+  echo "$as_me:11770: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11144,7 +11818,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:11147: checking for ncurses version" >&5
+echo "$as_me:11821: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11170,10 +11844,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:11173: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:11847: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:11176: \$? = $ac_status" >&5
+  echo "$as_me:11850: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -11183,7 +11857,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11186 "configure"
+#line 11860 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -11208,15 +11882,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11211: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11885: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11214: \$? = $ac_status" >&5
+  echo "$as_me:11888: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11216: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11219: \$? = $ac_status" >&5
+  echo "$as_me:11893: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -11230,7 +11904,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:11233: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:11907: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
@@ -11242,7 +11916,7 @@ cf_nculib_root=ncursesw
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:11245: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:11919: checking for Gpm_Open in -lgpm" >&5
 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11250,7 +11924,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11253 "configure"
+#line 11927 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11269,16 +11943,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11272: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11946: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11275: \$? = $ac_status" >&5
+  echo "$as_me:11949: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11952: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11281: \$? = $ac_status" >&5
+  echo "$as_me:11955: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -11289,10 +11963,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11292: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:11966: result: $ac_cv_lib_gpm_Gpm_Open" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:11295: checking for initscr in -lgpm" >&5
+  echo "$as_me:11969: checking for initscr in -lgpm" >&5
 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11300,7 +11974,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11303 "configure"
+#line 11977 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11319,16 +11993,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11322: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11996: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11325: \$? = $ac_status" >&5
+  echo "$as_me:11999: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11331: \$? = $ac_status" >&5
+  echo "$as_me:12005: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -11339,7 +12013,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11342: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:12016: result: $ac_cv_lib_gpm_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
@@ -11354,7 +12028,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).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:11357: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:12031: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11362,7 +12036,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11365 "configure"
+#line 12039 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11381,16 +12055,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11384: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12058: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11387: \$? = $ac_status" >&5
+  echo "$as_me:12061: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11393: \$? = $ac_status" >&5
+  echo "$as_me:12067: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -11401,7 +12075,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11404: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:12078: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
@@ -11420,13 +12094,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:11423: checking for initscr" >&5
+	echo "$as_me:12097: checking for initscr" >&5
 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 if test "${ac_cv_func_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11429 "configure"
+#line 12103 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -11457,16 +12131,16 @@ f = initscr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11460: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12134: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11463: \$? = $ac_status" >&5
+  echo "$as_me:12137: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11466: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11469: \$? = $ac_status" >&5
+  echo "$as_me:12143: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -11476,18 +12150,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11479: result: $ac_cv_func_initscr" >&5
+echo "$as_me:12153: result: $ac_cv_func_initscr" >&5
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:11486: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:12160: checking for initscr in -l$cf_nculib_root" >&5
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
 		LIBS="-l$cf_nculib_root $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 11490 "configure"
+#line 12164 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -11499,25 +12173,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11502: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12176: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11505: \$? = $ac_status" >&5
+  echo "$as_me:12179: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11508: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12182: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11511: \$? = $ac_status" >&5
+  echo "$as_me:12185: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:11513: result: yes" >&5
+  echo "$as_me:12187: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:11520: result: no" >&5
+echo "$as_me:12194: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -11577,11 +12251,11 @@ test -d /usr && {
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:11580: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:12254: checking for -l$cf_nculib_root in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 11584 "configure"
+#line 12258 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -11593,25 +12267,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11596: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12270: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11599: \$? = $ac_status" >&5
+  echo "$as_me:12273: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11605: \$? = $ac_status" >&5
+  echo "$as_me:12279: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:11607: result: yes" >&5
+  echo "$as_me:12281: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:11614: result: no" >&5
+echo "$as_me:12288: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -11626,7 +12300,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:11629: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:12303: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11634,7 +12308,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:11637: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:12311: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
@@ -11644,7 +12318,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11647 "configure"
+#line 12321 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -11656,23 +12330,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11659: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12333: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11662: \$? = $ac_status" >&5
+  echo "$as_me:12336: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11665: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11668: \$? = $ac_status" >&5
+  echo "$as_me:12342: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:11670: result: yes" >&5
+  echo "$as_me:12344: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:11675: result: no" >&5
+echo "$as_me:12349: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -11685,7 +12359,7 @@ cat >>confdefs.h <<EOF
 #define $cf_nculib_ROOT 1
 EOF
 
-echo "$as_me:11688: checking for ncurses version" >&5
+echo "$as_me:12362: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11711,10 +12385,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:11714: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:12388: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:11717: \$? = $ac_status" >&5
+  echo "$as_me:12391: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -11724,7 +12398,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11727 "configure"
+#line 12401 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -11749,15 +12423,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11752: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12426: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11755: \$? = $ac_status" >&5
+  echo "$as_me:12429: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12431: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11760: \$? = $ac_status" >&5
+  echo "$as_me:12434: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -11771,7 +12445,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:11774: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:12448: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
@@ -11784,14 +12458,14 @@ pdcurses)
 	;;
 slang)
 
-echo "$as_me:11787: checking for slang header file" >&5
+echo "$as_me:12461: checking for slang header file" >&5
 echo $ECHO_N "checking for slang header file... $ECHO_C" >&6
 if test "${cf_cv_slang_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11794 "configure"
+#line 12468 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -11803,16 +12477,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11806: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12480: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11809: \$? = $ac_status" >&5
+  echo "$as_me:12483: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12486: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11815: \$? = $ac_status" >&5
+  echo "$as_me:12489: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -11902,14 +12576,14 @@ test -d "$oldincludedir" && {
 		done
 		test -n "$cf_cv_slang_header" && break
 	done
-	test -z "$cf_cv_slang_header" && { { echo "$as_me:11905: error: not found" >&5
+	test -z "$cf_cv_slang_header" && { { echo "$as_me:12579: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11912: result: $cf_cv_slang_header" >&5
+echo "$as_me:12586: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 cat >>confdefs.h <<\EOF
 #define USE_SLANG 1
@@ -11935,7 +12609,7 @@ do
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 11938 "configure"
+#line 12612 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11947,16 +12621,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11950: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12624: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11953: \$? = $ac_status" >&5
+  echo "$as_me:12627: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11956: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11959: \$? = $ac_status" >&5
+  echo "$as_me:12633: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11982,14 +12656,14 @@ esac
 
 # There's an unofficial set of patches for slang that gives it some limited
 # UTF8 capability.  Unfortunately it won't compile unless one defines UTF8.
-echo "$as_me:11985: checking if we must define UTF8" >&5
+echo "$as_me:12659: checking if we must define UTF8" >&5
 echo $ECHO_N "checking if we must define UTF8... $ECHO_C" >&6
 if test "${cf_cv_slang_utf8+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11992 "configure"
+#line 12666 "configure"
 #include "confdefs.h"
 
 #include <slang.h>
@@ -12002,16 +12676,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12005: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12679: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12008: \$? = $ac_status" >&5
+  echo "$as_me:12682: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12011: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12685: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12014: \$? = $ac_status" >&5
+  echo "$as_me:12688: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -12019,7 +12693,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12022 "configure"
+#line 12696 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -12033,16 +12707,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12036: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12710: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12039: \$? = $ac_status" >&5
+  echo "$as_me:12713: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12716: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12045: \$? = $ac_status" >&5
+  echo "$as_me:12719: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -12055,7 +12729,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:12058: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:12732: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -12073,7 +12747,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 12076 "configure"
+#line 12750 "configure"
 #include "confdefs.h"
 
 int
@@ -12085,19 +12759,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12088: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12762: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12091: \$? = $ac_status" >&5
+  echo "$as_me:12765: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12094: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12097: \$? = $ac_status" >&5
+  echo "$as_me:12771: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 12100 "configure"
+#line 12774 "configure"
 #include "confdefs.h"
 
 int
@@ -12109,16 +12783,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12112: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12786: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12115: \$? = $ac_status" >&5
+  echo "$as_me:12789: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12118: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12121: \$? = $ac_status" >&5
+  echo "$as_me:12795: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -12142,10 +12816,10 @@ if test "$cf_cv_termlib" = none; then
 	LIBS="-l$cf_lib $cf_save_LIBS"
 	for cf_func in tigetstr tgetstr
 	do
-		echo "$as_me:12145: checking for $cf_func in -l$cf_lib" >&5
+		echo "$as_me:12819: checking for $cf_func in -l$cf_lib" >&5
 echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 12148 "configure"
+#line 12822 "configure"
 #include "confdefs.h"
 
 int
@@ -12157,16 +12831,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12160: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12834: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12163: \$? = $ac_status" >&5
+  echo "$as_me:12837: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12169: \$? = $ac_status" >&5
+  echo "$as_me:12843: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -12175,7 +12849,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:12178: result: $cf_result" >&5
+		echo "$as_me:12852: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			if test "$cf_func" = tigetstr ; then
@@ -12192,7 +12866,7 @@ echo "${ECHO_T}$cf_result" >&6
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:12195: checking for initscr in -lcurses" >&5
+	echo "$as_me:12869: checking for initscr in -lcurses" >&5
 echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_curses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12200,7 +12874,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12203 "configure"
+#line 12877 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12219,16 +12893,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12222: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12896: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12225: \$? = $ac_status" >&5
+  echo "$as_me:12899: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12228: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12231: \$? = $ac_status" >&5
+  echo "$as_me:12905: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -12239,13 +12913,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12242: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:12916: result: $ac_cv_lib_curses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6
 if test $ac_cv_lib_curses_initscr = yes; then
   LIBS="$LIBS -lcurses" cf_cv_termlib=termcap
 fi
 
-	echo "$as_me:12248: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:12922: checking for tgoto in -ltermcap" >&5
 echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6
 if test "${ac_cv_lib_termcap_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12253,7 +12927,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12256 "configure"
+#line 12930 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12272,16 +12946,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12275: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12949: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12278: \$? = $ac_status" >&5
+  echo "$as_me:12952: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12955: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12284: \$? = $ac_status" >&5
+  echo "$as_me:12958: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -12292,7 +12966,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12295: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:12969: result: $ac_cv_lib_termcap_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6
 if test $ac_cv_lib_termcap_tgoto = yes; then
   LIBS="$LIBS -ltermcap" cf_cv_termlib=termcap
@@ -12303,20 +12977,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:12306: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:12980: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
 fi
 
 fi
 
 cf_slang_LIBS2="$LIBS"
-echo "$as_me:12313: checking for acos" >&5
+echo "$as_me:12987: checking for acos" >&5
 echo $ECHO_N "checking for acos... $ECHO_C" >&6
 if test "${ac_cv_func_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12319 "configure"
+#line 12993 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -12347,16 +13021,16 @@ f = acos;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12350: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13024: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12353: \$? = $ac_status" >&5
+  echo "$as_me:13027: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12356: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12359: \$? = $ac_status" >&5
+  echo "$as_me:13033: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -12366,13 +13040,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12369: result: $ac_cv_func_acos" >&5
+echo "$as_me:13043: result: $ac_cv_func_acos" >&5
 echo "${ECHO_T}$ac_cv_func_acos" >&6
 if test $ac_cv_func_acos = yes; then
   :
 else
 
-echo "$as_me:12375: checking for acos in -lm" >&5
+echo "$as_me:13049: checking for acos in -lm" >&5
 echo $ECHO_N "checking for acos in -lm... $ECHO_C" >&6
 if test "${ac_cv_lib_m_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12380,7 +13054,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12383 "configure"
+#line 13057 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12399,16 +13073,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12402: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13076: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12405: \$? = $ac_status" >&5
+  echo "$as_me:13079: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13082: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12411: \$? = $ac_status" >&5
+  echo "$as_me:13085: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -12419,7 +13093,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12422: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:13096: result: $ac_cv_lib_m_acos" >&5
 echo "${ECHO_T}$ac_cv_lib_m_acos" >&6
 if test $ac_cv_lib_m_acos = yes; then
 
@@ -12445,13 +13119,13 @@ os2*)
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:12448: checking for v_init" >&5
+	echo "$as_me:13122: checking for v_init" >&5
 echo $ECHO_N "checking for v_init... $ECHO_C" >&6
 if test "${ac_cv_func_v_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12454 "configure"
+#line 13128 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -12482,16 +13156,16 @@ f = v_init;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12485: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13159: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12488: \$? = $ac_status" >&5
+  echo "$as_me:13162: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13165: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12494: \$? = $ac_status" >&5
+  echo "$as_me:13168: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -12501,18 +13175,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12504: result: $ac_cv_func_v_init" >&5
+echo "$as_me:13178: result: $ac_cv_func_v_init" >&5
 echo "${ECHO_T}$ac_cv_func_v_init" >&6
 if test $ac_cv_func_v_init = yes; then
   eval 'cf_cv_have_lib_'video'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:12511: checking for v_init in -lvideo" >&5
+		echo "$as_me:13185: checking for v_init in -lvideo" >&5
 echo $ECHO_N "checking for v_init in -lvideo... $ECHO_C" >&6
 		LIBS="-lvideo $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 12515 "configure"
+#line 13189 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -12524,25 +13198,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12527: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13201: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12530: \$? = $ac_status" >&5
+  echo "$as_me:13204: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12533: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13207: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12536: \$? = $ac_status" >&5
+  echo "$as_me:13210: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:12538: result: yes" >&5
+  echo "$as_me:13212: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'video'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:12545: result: no" >&5
+echo "$as_me:13219: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -12602,11 +13276,11 @@ test -d /usr && {
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:12605: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:13279: checking for -lvideo in $cf_libdir" >&5
 echo $ECHO_N "checking for -lvideo in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lvideo $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 12609 "configure"
+#line 13283 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -12618,25 +13292,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12621: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13295: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12624: \$? = $ac_status" >&5
+  echo "$as_me:13298: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13301: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12630: \$? = $ac_status" >&5
+  echo "$as_me:13304: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:12632: result: yes" >&5
+  echo "$as_me:13306: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'video'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:12639: result: no" >&5
+echo "$as_me:13313: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -12651,7 +13325,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:12654: error: Cannot link video library" >&5
+	{ { echo "$as_me:13328: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -12661,13 +13335,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang'=no'
 	cf_libdir=""
-	echo "$as_me:12664: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:13338: checking for SLtt_get_screen_size" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size... $ECHO_C" >&6
 if test "${ac_cv_func_SLtt_get_screen_size+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12670 "configure"
+#line 13344 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -12698,16 +13372,16 @@ f = SLtt_get_screen_size;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12701: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13375: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12704: \$? = $ac_status" >&5
+  echo "$as_me:13378: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12707: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13381: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12710: \$? = $ac_status" >&5
+  echo "$as_me:13384: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -12717,18 +13391,18 @@ ac_cv_func_SLtt_get_screen_size=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12720: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:13394: result: $ac_cv_func_SLtt_get_screen_size" >&5
 echo "${ECHO_T}$ac_cv_func_SLtt_get_screen_size" >&6
 if test $ac_cv_func_SLtt_get_screen_size = yes; then
   eval 'cf_cv_have_lib_'slang'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:12727: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:13401: checking for SLtt_get_screen_size in -lslang" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size in -lslang... $ECHO_C" >&6
 		LIBS="-lslang $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 12731 "configure"
+#line 13405 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -12740,25 +13414,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12743: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13417: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12746: \$? = $ac_status" >&5
+  echo "$as_me:13420: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12752: \$? = $ac_status" >&5
+  echo "$as_me:13426: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:12754: result: yes" >&5
+  echo "$as_me:13428: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'slang'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:12761: result: no" >&5
+echo "$as_me:13435: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -12818,11 +13492,11 @@ test -d /usr && {
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:12821: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:13495: checking for -lslang in $cf_libdir" >&5
 echo $ECHO_N "checking for -lslang in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lslang $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 12825 "configure"
+#line 13499 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -12834,25 +13508,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12837: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13511: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12840: \$? = $ac_status" >&5
+  echo "$as_me:13514: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13517: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12846: \$? = $ac_status" >&5
+  echo "$as_me:13520: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:12848: result: yes" >&5
+  echo "$as_me:13522: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'slang'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:12855: result: no" >&5
+echo "$as_me:13529: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -12867,13 +13541,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:12870: error: Cannot link slang library" >&5
+	{ { echo "$as_me:13544: error: Cannot link slang library" >&5
 echo "$as_me: error: Cannot link slang library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 cf_slang_LIBS3="$LIBS"
-echo "$as_me:12876: checking if we can link slang without termcap" >&5
+echo "$as_me:13550: checking if we can link slang without termcap" >&5
 echo $ECHO_N "checking if we can link slang without termcap... $ECHO_C" >&6
 if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then
 	cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s%$cf_slang_LIBS1%%" -e 's%^.%%'`
@@ -12882,7 +13556,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 12885 "configure"
+#line 13559 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -12894,16 +13568,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12897: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13571: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12900: \$? = $ac_status" >&5
+  echo "$as_me:13574: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12906: \$? = $ac_status" >&5
+  echo "$as_me:13580: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -12912,18 +13586,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:12915: result: $cf_result" >&5
+echo "$as_me:13589: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
-echo "$as_me:12919: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:13593: checking if we must tell slang this is UNIX" >&5
 echo $ECHO_N "checking if we must tell slang this is UNIX... $ECHO_C" >&6
 if test "${cf_cv_slang_unix+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 12926 "configure"
+#line 13600 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -12942,16 +13616,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12945: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13619: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12948: \$? = $ac_status" >&5
+  echo "$as_me:13622: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12954: \$? = $ac_status" >&5
+  echo "$as_me:13628: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -12962,7 +13636,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:12965: result: $cf_cv_slang_unix" >&5
+echo "$as_me:13639: result: $cf_cv_slang_unix" >&5
 echo "${ECHO_T}$cf_cv_slang_unix" >&6
 test $cf_cv_slang_unix = yes && cat >>confdefs.h <<\EOF
 #define REAL_UNIX_SYSTEM 1
@@ -12974,19 +13648,19 @@ esac
 eval cf_libdir=$libdir
 cf_libdir=`echo $cf_libdir | sed -e s%'^NONE/'%$prefix/% -e s%'^NONE/'%$ac_default_prefix/%`
 
-echo "$as_me:12977: checking for location of config-file" >&5
+echo "$as_me:13651: checking for location of config-file" >&5
 echo $ECHO_N "checking for location of config-file... $ECHO_C" >&6
 LYNX_CFG_FILE=$cf_libdir/lynx.cfg
 cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:12984: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:13658: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 CHARSET_DEFS=
 
-echo "$as_me:12989: checking if you want only a few charsets" >&5
+echo "$as_me:13663: checking if you want only a few charsets" >&5
 echo $ECHO_N "checking if you want only a few charsets... $ECHO_C" >&6
 
 # Check whether --with-charsets or --without-charsets was given.
@@ -12998,7 +13672,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:13001: result: yes" >&5
+	echo "$as_me:13675: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	cat >>confdefs.h <<\EOF
 #define ALL_CHARSETS 0
@@ -13043,17 +13717,17 @@ EOF
 		fi
 	done
 else
-	echo "$as_me:13046: result: no" >&5
+	echo "$as_me:13720: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13050: checking for ANSI C header files" >&5
+echo "$as_me:13724: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13056 "configure"
+#line 13730 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -13061,13 +13735,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:13064: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13738: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13070: \$? = $ac_status" >&5
+  echo "$as_me:13744: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13089,7 +13763,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 13092 "configure"
+#line 13766 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -13107,7 +13781,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 <<_ACEOF
-#line 13110 "configure"
+#line 13784 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -13128,7 +13802,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13131 "configure"
+#line 13805 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -13154,15 +13828,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13157: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13831: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13160: \$? = $ac_status" >&5
+  echo "$as_me:13834: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:13162: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13836: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13165: \$? = $ac_status" >&5
+  echo "$as_me:13839: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13175,7 +13849,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:13178: result: $ac_cv_header_stdc" >&5
+echo "$as_me:13852: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -13185,13 +13859,13 @@ EOF
 
 fi
 
-echo "$as_me:13188: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:13862: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13194 "configure"
+#line 13868 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -13207,16 +13881,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13210: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13884: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13213: \$? = $ac_status" >&5
+  echo "$as_me:13887: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13216: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13219: \$? = $ac_status" >&5
+  echo "$as_me:13893: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -13226,7 +13900,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13229: result: $ac_cv_header_time" >&5
+echo "$as_me:13903: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -13239,13 +13913,13 @@ fi
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:13242: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:13916: checking for $ac_hdr that defines DIR" >&5
 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13248 "configure"
+#line 13922 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -13260,16 +13934,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13263: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13937: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13266: \$? = $ac_status" >&5
+  echo "$as_me:13940: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13943: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13272: \$? = $ac_status" >&5
+  echo "$as_me:13946: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -13279,7 +13953,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13282: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13956: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13292,7 +13966,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:13295: checking for opendir in -ldir" >&5
+  echo "$as_me:13969: checking for opendir in -ldir" >&5
 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
 if test "${ac_cv_lib_dir_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13300,7 +13974,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13303 "configure"
+#line 13977 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13319,16 +13993,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13322: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13996: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13325: \$? = $ac_status" >&5
+  echo "$as_me:13999: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13331: \$? = $ac_status" >&5
+  echo "$as_me:14005: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -13339,14 +14013,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13342: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:14016: result: $ac_cv_lib_dir_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
 if test $ac_cv_lib_dir_opendir = yes; then
   LIBS="$LIBS -ldir"
 fi
 
 else
-  echo "$as_me:13349: checking for opendir in -lx" >&5
+  echo "$as_me:14023: checking for opendir in -lx" >&5
 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
 if test "${ac_cv_lib_x_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13354,7 +14028,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13357 "configure"
+#line 14031 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13373,16 +14047,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13376: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14050: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13379: \$? = $ac_status" >&5
+  echo "$as_me:14053: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13382: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14056: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13385: \$? = $ac_status" >&5
+  echo "$as_me:14059: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -13393,7 +14067,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13396: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:14070: result: $ac_cv_lib_x_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 if test $ac_cv_lib_x_opendir = yes; then
   LIBS="$LIBS -lx"
@@ -13421,23 +14095,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13424: checking for $ac_header" >&5
+echo "$as_me:14098: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13430 "configure"
+#line 14104 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13434: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14108: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13440: \$? = $ac_status" >&5
+  echo "$as_me:14114: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13456,7 +14130,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:13459: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:14133: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13466,14 +14140,14 @@ EOF
 fi
 done
 
-echo "$as_me:13469: checking termio.h and termios.h" >&5
+echo "$as_me:14143: checking termio.h and termios.h" >&5
 echo $ECHO_N "checking termio.h and termios.h... $ECHO_C" >&6
 if test "${cf_cv_termio_and_termios+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 13476 "configure"
+#line 14150 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -13491,16 +14165,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13494: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14168: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13497: \$? = $ac_status" >&5
+  echo "$as_me:14171: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14174: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13503: \$? = $ac_status" >&5
+  echo "$as_me:14177: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -13511,20 +14185,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:13514: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:14188: result: $cf_cv_termio_and_termios" >&5
 echo "${ECHO_T}$cf_cv_termio_and_termios" >&6
 test $cf_cv_termio_and_termios = no && cat >>confdefs.h <<\EOF
 #define TERMIO_AND_TERMIOS 1
 EOF
 
-echo "$as_me:13520: checking for sigaction and structs" >&5
+echo "$as_me:14194: checking for sigaction and structs" >&5
 echo $ECHO_N "checking for sigaction and structs... $ECHO_C" >&6
 if test "${cf_cv_func_sigaction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 13527 "configure"
+#line 14201 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13544,16 +14218,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13547: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14221: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13550: \$? = $ac_status" >&5
+  echo "$as_me:14224: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14227: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13556: \$? = $ac_status" >&5
+  echo "$as_me:14230: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -13564,7 +14238,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:13567: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:14241: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_SIGACTION 1
@@ -13573,23 +14247,23 @@ EOF
 for ac_header in sys/wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13576: checking for $ac_header" >&5
+echo "$as_me:14250: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13582 "configure"
+#line 14256 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13586: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14260: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13592: \$? = $ac_status" >&5
+  echo "$as_me:14266: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13608,7 +14282,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:13611: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:14285: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13629,23 +14303,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13632: checking for $ac_header" >&5
+echo "$as_me:14306: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13638 "configure"
+#line 14312 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13642: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14316: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13648: \$? = $ac_status" >&5
+  echo "$as_me:14322: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13664,7 +14338,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:13667: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:14341: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13677,23 +14351,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13680: checking for $ac_header" >&5
+echo "$as_me:14354: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13686 "configure"
+#line 14360 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13690: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14364: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13696: \$? = $ac_status" >&5
+  echo "$as_me:14370: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13712,7 +14386,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:13715: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:14389: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13734,14 +14408,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:13737: checking for union wait" >&5
+echo "$as_me:14411: checking for union wait" >&5
 echo $ECHO_N "checking for union wait... $ECHO_C" >&6
 if test "${cf_cv_type_unionwait+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13744 "configure"
+#line 14418 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -13757,16 +14431,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13760: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14434: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13763: \$? = $ac_status" >&5
+  echo "$as_me:14437: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14440: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13769: \$? = $ac_status" >&5
+  echo "$as_me:14443: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -13776,7 +14450,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13779 "configure"
+#line 14453 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -13796,16 +14470,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13799: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14473: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13802: \$? = $ac_status" >&5
+  echo "$as_me:14476: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13805: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13808: \$? = $ac_status" >&5
+  echo "$as_me:14482: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -13820,7 +14494,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:13823: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:14497: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test $cf_cv_type_unionwait = yes && cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_UNIONWAIT 1
@@ -13828,14 +14502,14 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:13831: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:14505: checking if union wait can be used as wait-arg" >&5
 echo $ECHO_N "checking if union wait can be used as wait-arg... $ECHO_C" >&6
 	if test "${cf_cv_arg_union_wait+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13838 "configure"
+#line 14512 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -13847,16 +14521,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13850: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14524: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13853: \$? = $ac_status" >&5
+  echo "$as_me:14527: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13856: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13859: \$? = $ac_status" >&5
+  echo "$as_me:14533: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -13868,20 +14542,20 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:13871: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:14545: result: $cf_cv_arg_union_wait" >&5
 echo "${ECHO_T}$cf_cv_arg_union_wait" >&6
 	test $cf_cv_arg_union_wait = yes && cat >>confdefs.h <<\EOF
 #define WAIT_USES_UNION 1
 EOF
 
-	echo "$as_me:13877: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:14551: checking if union wait can be used as waitpid-arg" >&5
 echo $ECHO_N "checking if union wait can be used as waitpid-arg... $ECHO_C" >&6
 	if test "${cf_cv_arg_union_waitpid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13884 "configure"
+#line 14558 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -13893,16 +14567,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13896: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14570: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13899: \$? = $ac_status" >&5
+  echo "$as_me:14573: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14576: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13905: \$? = $ac_status" >&5
+  echo "$as_me:14579: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -13914,7 +14588,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:13917: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:14591: result: $cf_cv_arg_union_waitpid" >&5
 echo "${ECHO_T}$cf_cv_arg_union_waitpid" >&6
 	test $cf_cv_arg_union_waitpid = yes && cat >>confdefs.h <<\EOF
 #define WAITPID_USES_UNION 1
@@ -13925,23 +14599,23 @@ fi
 for ac_header in stdarg.h varargs.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13928: checking for $ac_header" >&5
+echo "$as_me:14602: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13934 "configure"
+#line 14608 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13938: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14612: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13944: \$? = $ac_status" >&5
+  echo "$as_me:14618: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13960,7 +14634,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:13963: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:14637: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13970,14 +14644,14 @@ EOF
 fi
 done
 
-echo "$as_me:13973: checking for standard varargs" >&5
+echo "$as_me:14647: checking for standard varargs" >&5
 echo $ECHO_N "checking for standard varargs... $ECHO_C" >&6
 if test "${cf_cv_ansi_varargs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13980 "configure"
+#line 14654 "configure"
 #include "confdefs.h"
 
 #if HAVE_STDARG_H
@@ -13997,16 +14671,16 @@ return 0;} int foo(char *fmt,...){va_list args;va_start(args,fmt);va_end(args)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14000: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14674: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14003: \$? = $ac_status" >&5
+  echo "$as_me:14677: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14006: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14009: \$? = $ac_status" >&5
+  echo "$as_me:14683: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ansi_varargs=yes
 else
@@ -14018,19 +14692,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:14021: result: $cf_cv_ansi_varargs" >&5
+echo "$as_me:14695: result: $cf_cv_ansi_varargs" >&5
 echo "${ECHO_T}$cf_cv_ansi_varargs" >&6
 test $cf_cv_ansi_varargs = yes && cat >>confdefs.h <<\EOF
 #define ANSI_VARARGS 1
 EOF
 
-echo "$as_me:14027: checking for uid_t in sys/types.h" >&5
+echo "$as_me:14701: checking for uid_t in sys/types.h" >&5
 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14033 "configure"
+#line 14707 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -14044,7 +14718,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:14047: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:14721: result: $ac_cv_type_uid_t" >&5
 echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
 
@@ -14058,7 +14732,7 @@ EOF
 
 fi
 
-echo "$as_me:14061: checking type of array argument to getgroups" >&5
+echo "$as_me:14735: checking type of array argument to getgroups" >&5
 echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6
 if test "${ac_cv_type_getgroups+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14067,7 +14741,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14070 "configure"
+#line 14744 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -14093,15 +14767,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14096: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14770: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14099: \$? = $ac_status" >&5
+  echo "$as_me:14773: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14101: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14775: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14104: \$? = $ac_status" >&5
+  echo "$as_me:14778: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -14114,7 +14788,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 if test $ac_cv_type_getgroups = cross; then
         cat >conftest.$ac_ext <<_ACEOF
-#line 14117 "configure"
+#line 14791 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -14129,20 +14803,20 @@ rm -f conftest*
 
 fi
 fi
-echo "$as_me:14132: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:14806: result: $ac_cv_type_getgroups" >&5
 echo "${ECHO_T}$ac_cv_type_getgroups" >&6
 
 cat >>confdefs.h <<EOF
 #define GETGROUPS_T $ac_cv_type_getgroups
 EOF
 
-echo "$as_me:14139: checking for pid_t" >&5
+echo "$as_me:14813: checking for pid_t" >&5
 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14145 "configure"
+#line 14819 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14157,16 +14831,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14160: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14834: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14163: \$? = $ac_status" >&5
+  echo "$as_me:14837: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14169: \$? = $ac_status" >&5
+  echo "$as_me:14843: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -14176,7 +14850,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:14179: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:14853: result: $ac_cv_type_pid_t" >&5
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 if test $ac_cv_type_pid_t = yes; then
   :
@@ -14188,13 +14862,13 @@ EOF
 
 fi
 
-echo "$as_me:14191: checking for uid_t in sys/types.h" >&5
+echo "$as_me:14865: checking for uid_t in sys/types.h" >&5
 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14197 "configure"
+#line 14871 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -14208,7 +14882,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:14211: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:14885: result: $ac_cv_type_uid_t" >&5
 echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
 
@@ -14222,13 +14896,13 @@ EOF
 
 fi
 
-echo "$as_me:14225: checking for mode_t" >&5
+echo "$as_me:14899: checking for mode_t" >&5
 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
 if test "${ac_cv_type_mode_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14231 "configure"
+#line 14905 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14243,16 +14917,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14246: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14920: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14249: \$? = $ac_status" >&5
+  echo "$as_me:14923: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14255: \$? = $ac_status" >&5
+  echo "$as_me:14929: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -14262,7 +14936,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:14265: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:14939: result: $ac_cv_type_mode_t" >&5
 echo "${ECHO_T}$ac_cv_type_mode_t" >&6
 if test $ac_cv_type_mode_t = yes; then
   :
@@ -14274,13 +14948,13 @@ EOF
 
 fi
 
-	echo "$as_me:14277: checking for socklen_t" >&5
+	echo "$as_me:14951: checking for socklen_t" >&5
 echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
 if test "${ac_cv_type_socklen_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14283 "configure"
+#line 14957 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 
@@ -14296,16 +14970,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14299: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14973: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14302: \$? = $ac_status" >&5
+  echo "$as_me:14976: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14305: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14979: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14308: \$? = $ac_status" >&5
+  echo "$as_me:14982: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -14315,7 +14989,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:14318: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:14992: result: $ac_cv_type_socklen_t" >&5
 echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
 if test $ac_cv_type_socklen_t = yes; then
   ac_cv_type_socklen_t=yes
@@ -14332,13 +15006,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:14335: checking for working alloca.h" >&5
+echo "$as_me:15009: checking for working alloca.h" >&5
 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
 if test "${ac_cv_working_alloca_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14341 "configure"
+#line 15015 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -14350,16 +15024,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14353: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15027: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14356: \$? = $ac_status" >&5
+  echo "$as_me:15030: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15033: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14362: \$? = $ac_status" >&5
+  echo "$as_me:15036: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -14369,7 +15043,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14372: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:15046: result: $ac_cv_working_alloca_h" >&5
 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
 if test $ac_cv_working_alloca_h = yes; then
 
@@ -14379,13 +15053,13 @@ EOF
 
 fi
 
-echo "$as_me:14382: checking for alloca" >&5
+echo "$as_me:15056: checking for alloca" >&5
 echo $ECHO_N "checking for alloca... $ECHO_C" >&6
 if test "${ac_cv_func_alloca_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14388 "configure"
+#line 15062 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -14417,16 +15091,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14420: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15094: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14423: \$? = $ac_status" >&5
+  echo "$as_me:15097: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14426: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15100: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14429: \$? = $ac_status" >&5
+  echo "$as_me:15103: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -14436,7 +15110,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14439: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:15113: result: $ac_cv_func_alloca_works" >&5
 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
 
 if test $ac_cv_func_alloca_works = yes; then
@@ -14457,13 +15131,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:14460: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:15134: checking whether \`alloca.c' needs Cray hooks" >&5
 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
 if test "${ac_cv_os_cray+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14466 "configure"
+#line 15140 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -14481,18 +15155,18 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:14484: result: $ac_cv_os_cray" >&5
+echo "$as_me:15158: result: $ac_cv_os_cray" >&5
 echo "${ECHO_T}$ac_cv_os_cray" >&6
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:14489: checking for $ac_func" >&5
+echo "$as_me:15163: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14495 "configure"
+#line 15169 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -14523,16 +15197,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14526: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15200: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14529: \$? = $ac_status" >&5
+  echo "$as_me:15203: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14535: \$? = $ac_status" >&5
+  echo "$as_me:15209: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -14542,7 +15216,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14545: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:15219: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
 
@@ -14556,7 +15230,7 @@ fi
   done
 fi
 
-echo "$as_me:14559: checking stack direction for C alloca" >&5
+echo "$as_me:15233: checking stack direction for C alloca" >&5
 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
 if test "${ac_cv_c_stack_direction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14565,7 +15239,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14568 "configure"
+#line 15242 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -14588,15 +15262,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14591: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15265: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14594: \$? = $ac_status" >&5
+  echo "$as_me:15268: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14596: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14599: \$? = $ac_status" >&5
+  echo "$as_me:15273: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -14608,7 +15282,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:14611: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:15285: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -14620,23 +15294,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:14623: checking for $ac_header" >&5
+echo "$as_me:15297: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14629 "configure"
+#line 15303 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:14633: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15307: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:14639: \$? = $ac_status" >&5
+  echo "$as_me:15313: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14655,7 +15329,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:14658: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15332: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -14668,13 +15342,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:14671: checking for $ac_func" >&5
+echo "$as_me:15345: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14677 "configure"
+#line 15351 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -14705,16 +15379,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14708: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15382: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14711: \$? = $ac_status" >&5
+  echo "$as_me:15385: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14714: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14717: \$? = $ac_status" >&5
+  echo "$as_me:15391: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -14724,7 +15398,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14727: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:15401: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -14736,7 +15410,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:14739: checking for working fork" >&5
+  echo "$as_me:15413: checking for working fork" >&5
 echo $ECHO_N "checking for working fork... $ECHO_C" >&6
 if test "${ac_cv_func_fork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14759,15 +15433,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14762: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15436: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14765: \$? = $ac_status" >&5
+  echo "$as_me:15439: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14767: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15441: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14770: \$? = $ac_status" >&5
+  echo "$as_me:15444: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -14779,7 +15453,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:14782: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:15456: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -14793,12 +15467,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:14796: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:15470: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
 fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 if test "x$ac_cv_func_vfork" = xyes; then
-  echo "$as_me:14801: checking for working vfork" >&5
+  echo "$as_me:15475: checking for working vfork" >&5
 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
 if test "${ac_cv_func_vfork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14807,7 +15481,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14810 "configure"
+#line 15484 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -14904,15 +15578,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14907: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15581: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14910: \$? = $ac_status" >&5
+  echo "$as_me:15584: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14915: \$? = $ac_status" >&5
+  echo "$as_me:15589: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -14924,13 +15598,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:14927: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:15601: result: $ac_cv_func_vfork_works" >&5
 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
 
 fi;
 if test "x$ac_cv_func_fork_works" = xcross; then
   ac_cv_func_vfork_works=ac_cv_func_vfork
-  { echo "$as_me:14933: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:15607: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
 fi
 
@@ -14955,14 +15629,14 @@ EOF
 
 fi
 
-echo "$as_me:14958: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:15632: checking if we should use fcntl or ioctl" >&5
 echo $ECHO_N "checking if we should use fcntl or ioctl... $ECHO_C" >&6
 if test "${cf_cv_fionbio+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 14965 "configure"
+#line 15639 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14979,16 +15653,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14982: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15656: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14985: \$? = $ac_status" >&5
+  echo "$as_me:15659: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14988: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14991: \$? = $ac_status" >&5
+  echo "$as_me:15665: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -14996,7 +15670,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 14999 "configure"
+#line 15673 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -15018,16 +15692,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15021: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15695: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15024: \$? = $ac_status" >&5
+  echo "$as_me:15698: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15030: \$? = $ac_status" >&5
+  echo "$as_me:15704: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -15040,20 +15714,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:15043: result: $cf_cv_fionbio" >&5
+echo "$as_me:15717: result: $cf_cv_fionbio" >&5
 echo "${ECHO_T}$cf_cv_fionbio" >&6
 test "$cf_cv_fionbio" = "fcntl" && cat >>confdefs.h <<\EOF
 #define USE_FCNTL 1
 EOF
 
-echo "$as_me:15049: checking for broken/missing definition of remove" >&5
+echo "$as_me:15723: checking for broken/missing definition of remove" >&5
 echo $ECHO_N "checking for broken/missing definition of remove... $ECHO_C" >&6
 if test "${cf_cv_baddef_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15056 "configure"
+#line 15730 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15065,23 +15739,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15068: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15742: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15071: \$? = $ac_status" >&5
+  echo "$as_me:15745: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15748: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15077: \$? = $ac_status" >&5
+  echo "$as_me:15751: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 15084 "configure"
+#line 15758 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -15094,16 +15768,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15097: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15771: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15100: \$? = $ac_status" >&5
+  echo "$as_me:15774: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15106: \$? = $ac_status" >&5
+  echo "$as_me:15780: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -15118,20 +15792,20 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:15121: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:15795: result: $cf_cv_baddef_remove" >&5
 echo "${ECHO_T}$cf_cv_baddef_remove" >&6
 test "$cf_cv_baddef_remove" != no && cat >>confdefs.h <<\EOF
 #define NEED_REMOVE 1
 EOF
 
-echo "$as_me:15127: checking for lstat" >&5
+echo "$as_me:15801: checking for lstat" >&5
 echo $ECHO_N "checking for lstat... $ECHO_C" >&6
 if test "${ac_cv_func_lstat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15134 "configure"
+#line 15808 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -15145,16 +15819,16 @@ lstat(".", (struct stat *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15148: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15822: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15151: \$? = $ac_status" >&5
+  echo "$as_me:15825: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15157: \$? = $ac_status" >&5
+  echo "$as_me:15831: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -15166,7 +15840,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:15169: result: $ac_cv_func_lstat " >&5
+echo "$as_me:15843: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test $ac_cv_func_lstat = yes; then
 	cat >>confdefs.h <<\EOF
@@ -15198,13 +15872,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15201: checking for $ac_func" >&5
+echo "$as_me:15875: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15207 "configure"
+#line 15881 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -15235,16 +15909,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15238: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15912: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15241: \$? = $ac_status" >&5
+  echo "$as_me:15915: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15918: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15247: \$? = $ac_status" >&5
+  echo "$as_me:15921: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15254,7 +15928,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15257: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:15931: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -15270,13 +15944,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15273: checking for $ac_func" >&5
+echo "$as_me:15947: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15279 "configure"
+#line 15953 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -15307,16 +15981,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15310: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15984: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15313: \$? = $ac_status" >&5
+  echo "$as_me:15987: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15319: \$? = $ac_status" >&5
+  echo "$as_me:15993: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15326,7 +16000,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15329: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:16003: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -15338,7 +16012,7 @@ else
 fi
 done
 
-echo "$as_me:15341: checking for random-integer functions" >&5
+echo "$as_me:16015: checking for random-integer functions" >&5
 echo $ECHO_N "checking for random-integer functions... $ECHO_C" >&6
 if test "${cf_cv_srand_func+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15350,7 +16024,7 @@ do
 	cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'`
 	cf_rand_func=`echo  $cf_func | sed -e 's%.*/%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 15353 "configure"
+#line 16027 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -15369,16 +16043,16 @@ long seed = 1; $cf_srand_func(seed); seed = $cf_rand_func()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15372: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16046: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15375: \$? = $ac_status" >&5
+  echo "$as_me:16049: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15378: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15381: \$? = $ac_status" >&5
+  echo "$as_me:16055: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -15390,10 +16064,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:15393: result: $cf_cv_srand_func" >&5
+echo "$as_me:16067: result: $cf_cv_srand_func" >&5
 echo "${ECHO_T}$cf_cv_srand_func" >&6
 if test "$cf_cv_srand_func" != unknown ; then
-	echo "$as_me:15396: checking for range of random-integers" >&5
+	echo "$as_me:16070: checking for range of random-integers" >&5
 echo $ECHO_N "checking for range of random-integers... $ECHO_C" >&6
 if test "${cf_cv_rand_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15414,7 +16088,7 @@ else
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 15417 "configure"
+#line 16091 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -15433,16 +16107,16 @@ long x = $cf_cv_rand_max
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15436: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16110: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15439: \$? = $ac_status" >&5
+  echo "$as_me:16113: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15445: \$? = $ac_status" >&5
+  echo "$as_me:16119: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15453,7 +16127,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:15456: result: $cf_cv_rand_max" >&5
+echo "$as_me:16130: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 	cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'`
 	cf_rand_func=`echo  $cf_func | sed -e 's%.*/%%'`
@@ -15477,13 +16151,13 @@ fi
 for ac_func in strstr
 do
 
-echo "$as_me:15480: checking for $ac_func declaration" >&5
+echo "$as_me:16154: checking for $ac_func declaration" >&5
 echo $ECHO_N "checking for $ac_func declaration... $ECHO_C" >&6
 if eval "test \"\${ac_cv_func_decl_$ac_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15486 "configure"
+#line 16160 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -15497,20 +16171,20 @@ extern	int	${ac_func}();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15500: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16174: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15503: \$? = $ac_status" >&5
+  echo "$as_me:16177: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16180: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15509: \$? = $ac_status" >&5
+  echo "$as_me:16183: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15513 "configure"
+#line 16187 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -15524,16 +16198,16 @@ int	(*p)() = ${ac_func};
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15527: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16201: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15530: \$? = $ac_status" >&5
+  echo "$as_me:16204: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15533: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16207: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15536: \$? = $ac_status" >&5
+  echo "$as_me:16210: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -15554,11 +16228,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
 if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
-  echo "$as_me:15557: result: yes" >&5
+  echo "$as_me:16231: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:15561: result: no" >&5
+  echo "$as_me:16235: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -15573,13 +16247,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:15576: checking for $ac_func declaration" >&5
+echo "$as_me:16250: checking for $ac_func declaration" >&5
 echo $ECHO_N "checking for $ac_func declaration... $ECHO_C" >&6
 if eval "test \"\${ac_cv_func_decl_$ac_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15582 "configure"
+#line 16256 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15595,20 +16269,20 @@ extern	int	${ac_func}();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15598: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16272: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15601: \$? = $ac_status" >&5
+  echo "$as_me:16275: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15604: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16278: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15607: \$? = $ac_status" >&5
+  echo "$as_me:16281: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15611 "configure"
+#line 16285 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15624,16 +16298,16 @@ int	(*p)() = ${ac_func};
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15627: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16301: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15630: \$? = $ac_status" >&5
+  echo "$as_me:16304: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15633: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16307: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15636: \$? = $ac_status" >&5
+  echo "$as_me:16310: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -15654,11 +16328,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
 if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
-  echo "$as_me:15657: result: yes" >&5
+  echo "$as_me:16331: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:15661: result: no" >&5
+  echo "$as_me:16335: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -15670,14 +16344,14 @@ EOF
 fi
 done
 
-echo "$as_me:15673: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:16347: checking if TRUE/FALSE are defined" >&5
 echo $ECHO_N "checking if TRUE/FALSE are defined... $ECHO_C" >&6
 if test "${cf_cv_bool_defs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15680 "configure"
+#line 16354 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -15691,16 +16365,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15694: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16368: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15697: \$? = $ac_status" >&5
+  echo "$as_me:16371: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15700: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16374: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15703: \$? = $ac_status" >&5
+  echo "$as_me:16377: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -15711,7 +16385,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:15714: result: $cf_cv_bool_defs" >&5
+echo "$as_me:16388: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 	cat >>confdefs.h <<\EOF
@@ -15724,14 +16398,14 @@ EOF
 
 fi
 
-echo "$as_me:15727: checking if external errno is declared" >&5
+echo "$as_me:16401: checking if external errno is declared" >&5
 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 15734 "configure"
+#line 16408 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -15749,16 +16423,16 @@ long x = (long) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15752: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15755: \$? = $ac_status" >&5
+  echo "$as_me:16429: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15761: \$? = $ac_status" >&5
+  echo "$as_me:16435: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -15769,7 +16443,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:15772: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:16446: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -15784,14 +16458,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:15787: checking if external errno exists" >&5
+echo "$as_me:16461: checking if external errno exists" >&5
 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
 if test "${cf_cv_have_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 15794 "configure"
+#line 16468 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -15806,16 +16480,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15809: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16483: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15812: \$? = $ac_status" >&5
+  echo "$as_me:16486: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15815: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15818: \$? = $ac_status" >&5
+  echo "$as_me:16492: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -15826,7 +16500,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:15829: result: $cf_cv_have_errno" >&5
+echo "$as_me:16503: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -15839,7 +16513,7 @@ EOF
 
 fi
 
-echo "$as_me:15842: checking if we can set errno" >&5
+echo "$as_me:16516: checking if we can set errno" >&5
 echo $ECHO_N "checking if we can set errno... $ECHO_C" >&6
 if test "${cf_cv_set_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15847,7 +16521,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 15850 "configure"
+#line 16524 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -15859,16 +16533,16 @@ errno = 255
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15862: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16536: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15865: \$? = $ac_status" >&5
+  echo "$as_me:16539: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16542: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15871: \$? = $ac_status" >&5
+  echo "$as_me:16545: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -15879,7 +16553,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15882 "configure"
+#line 16556 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -15890,15 +16564,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15893: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16567: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15896: \$? = $ac_status" >&5
+  echo "$as_me:16570: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15898: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16572: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15901: \$? = $ac_status" >&5
+  echo "$as_me:16575: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -15911,20 +16585,20 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:15914: result: $cf_cv_set_errno" >&5
+echo "$as_me:16588: result: $cf_cv_set_errno" >&5
 echo "${ECHO_T}$cf_cv_set_errno" >&6
 test "$cf_cv_set_errno" != no && cat >>confdefs.h <<\EOF
 #define CAN_SET_ERRNO 1
 EOF
 
-echo "$as_me:15920: checking for setlocale()" >&5
+echo "$as_me:16594: checking for setlocale()" >&5
 echo $ECHO_N "checking for setlocale()... $ECHO_C" >&6
 if test "${cf_cv_locale+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15927 "configure"
+#line 16601 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -15936,16 +16610,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15939: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16613: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15942: \$? = $ac_status" >&5
+  echo "$as_me:16616: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16619: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15948: \$? = $ac_status" >&5
+  echo "$as_me:16622: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -15957,21 +16631,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:15960: result: $cf_cv_locale" >&5
+echo "$as_me:16634: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test $cf_cv_locale = yes && { cat >>confdefs.h <<\EOF
 #define LOCALE 1
 EOF
  }
 
-echo "$as_me:15967: checking if NGROUPS is defined" >&5
+echo "$as_me:16641: checking if NGROUPS is defined" >&5
 echo $ECHO_N "checking if NGROUPS is defined... $ECHO_C" >&6
 if test "${cf_cv_ngroups+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15974 "configure"
+#line 16648 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -15990,23 +16664,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15993: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16667: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15996: \$? = $ac_status" >&5
+  echo "$as_me:16670: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16673: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16002: \$? = $ac_status" >&5
+  echo "$as_me:16676: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 16009 "configure"
+#line 16683 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -16025,16 +16699,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16028: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16702: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16031: \$? = $ac_status" >&5
+  echo "$as_me:16705: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16037: \$? = $ac_status" >&5
+  echo "$as_me:16711: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -16046,7 +16720,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:16049: result: $cf_cv_ngroups" >&5
+echo "$as_me:16723: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -16063,14 +16737,14 @@ EOF
 
 fi
 
-echo "$as_me:16066: checking if external sys_nerr is declared" >&5
+echo "$as_me:16740: checking if external sys_nerr is declared" >&5
 echo $ECHO_N "checking if external sys_nerr is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_sys_nerr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 16073 "configure"
+#line 16747 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -16088,16 +16762,16 @@ long x = (long) sys_nerr
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16091: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16765: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16094: \$? = $ac_status" >&5
+  echo "$as_me:16768: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16097: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16771: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16100: \$? = $ac_status" >&5
+  echo "$as_me:16774: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -16108,7 +16782,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:16111: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:16785: result: $cf_cv_dcl_sys_nerr" >&5
 echo "${ECHO_T}$cf_cv_dcl_sys_nerr" >&6
 
 if test "$cf_cv_dcl_sys_nerr" = no ; then
@@ -16123,14 +16797,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:16126: checking if external sys_nerr exists" >&5
+echo "$as_me:16800: checking if external sys_nerr exists" >&5
 echo $ECHO_N "checking if external sys_nerr exists... $ECHO_C" >&6
 if test "${cf_cv_have_sys_nerr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 16133 "configure"
+#line 16807 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -16145,16 +16819,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16148: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16822: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16151: \$? = $ac_status" >&5
+  echo "$as_me:16825: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16157: \$? = $ac_status" >&5
+  echo "$as_me:16831: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -16165,7 +16839,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:16168: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:16842: result: $cf_cv_have_sys_nerr" >&5
 echo "${ECHO_T}$cf_cv_have_sys_nerr" >&6
 
 if test "$cf_cv_have_sys_nerr" = yes ; then
@@ -16178,14 +16852,14 @@ EOF
 
 fi
 
-echo "$as_me:16181: checking if external sys_errlist is declared" >&5
+echo "$as_me:16855: checking if external sys_errlist is declared" >&5
 echo $ECHO_N "checking if external sys_errlist is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_sys_errlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 16188 "configure"
+#line 16862 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -16203,16 +16877,16 @@ long x = (long) sys_errlist
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16206: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16880: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16209: \$? = $ac_status" >&5
+  echo "$as_me:16883: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16212: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16215: \$? = $ac_status" >&5
+  echo "$as_me:16889: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -16223,7 +16897,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:16226: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:16900: result: $cf_cv_dcl_sys_errlist" >&5
 echo "${ECHO_T}$cf_cv_dcl_sys_errlist" >&6
 
 if test "$cf_cv_dcl_sys_errlist" = no ; then
@@ -16238,14 +16912,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:16241: checking if external sys_errlist exists" >&5
+echo "$as_me:16915: checking if external sys_errlist exists" >&5
 echo $ECHO_N "checking if external sys_errlist exists... $ECHO_C" >&6
 if test "${cf_cv_have_sys_errlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 16248 "configure"
+#line 16922 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -16260,16 +16934,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16263: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16937: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16266: \$? = $ac_status" >&5
+  echo "$as_me:16940: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16943: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16272: \$? = $ac_status" >&5
+  echo "$as_me:16946: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -16280,7 +16954,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:16283: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:16957: result: $cf_cv_have_sys_errlist" >&5
 echo "${ECHO_T}$cf_cv_have_sys_errlist" >&6
 
 if test "$cf_cv_have_sys_errlist" = yes ; then
@@ -16296,23 +16970,23 @@ fi
 for ac_header in lastlog.h paths.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:16299: checking for $ac_header" >&5
+echo "$as_me:16973: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16305 "configure"
+#line 16979 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:16309: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16983: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16315: \$? = $ac_status" >&5
+  echo "$as_me:16989: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16331,7 +17005,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:16334: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:17008: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -16341,14 +17015,14 @@ EOF
 fi
 done
 
-echo "$as_me:16344: checking for lastlog path" >&5
+echo "$as_me:17018: checking for lastlog path" >&5
 echo $ECHO_N "checking for lastlog path... $ECHO_C" >&6
 if test "${cf_cv_path_lastlog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 16351 "configure"
+#line 17025 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16368,16 +17042,16 @@ char *path = _PATH_LASTLOG
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16371: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17045: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16374: \$? = $ac_status" >&5
+  echo "$as_me:17048: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17051: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16380: \$? = $ac_status" >&5
+  echo "$as_me:17054: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -16392,13 +17066,13 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:16395: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:17069: result: $cf_cv_path_lastlog" >&5
 echo "${ECHO_T}$cf_cv_path_lastlog" >&6
 test $cf_cv_path_lastlog != no && cat >>confdefs.h <<\EOF
 #define USE_LASTLOG 1
 EOF
 
-echo "$as_me:16401: checking for utmp implementation" >&5
+echo "$as_me:17075: checking for utmp implementation" >&5
 echo $ECHO_N "checking for utmp implementation... $ECHO_C" >&6
 if test "${cf_cv_have_utmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16415,7 +17089,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16418 "configure"
+#line 17092 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -16429,16 +17103,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16432: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17106: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16435: \$? = $ac_status" >&5
+  echo "$as_me:17109: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17112: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16441: \$? = $ac_status" >&5
+  echo "$as_me:17115: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -16447,7 +17121,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16450 "configure"
+#line 17124 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -16461,16 +17135,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16464: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17138: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16467: \$? = $ac_status" >&5
+  echo "$as_me:17141: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16473: \$? = $ac_status" >&5
+  echo "$as_me:17147: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -16485,7 +17159,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:16488: result: $cf_cv_have_utmp" >&5
+echo "$as_me:17162: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -16498,14 +17172,14 @@ EOF
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:16501: checking if utmp.ut_host is declared" >&5
+echo "$as_me:17175: checking if utmp.ut_host is declared" >&5
 echo $ECHO_N "checking if utmp.ut_host is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16508 "configure"
+#line 17182 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16519,16 +17193,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16522: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17196: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16525: \$? = $ac_status" >&5
+  echo "$as_me:17199: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16531: \$? = $ac_status" >&5
+  echo "$as_me:17205: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -16540,7 +17214,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:16543: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:17217: result: $cf_cv_have_utmp_ut_host" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_host" >&6
 test $cf_cv_have_utmp_ut_host != no && cat >>confdefs.h <<\EOF
 #define HAVE_UTMP_UT_HOST 1
@@ -16549,7 +17223,7 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:16552: checking if utmp.ut_name is declared" >&5
+echo "$as_me:17226: checking if utmp.ut_name is declared" >&5
 echo $ECHO_N "checking if utmp.ut_name is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_name+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16566,7 +17240,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16569 "configure"
+#line 17243 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -16580,16 +17254,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16583: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17257: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16586: \$? = $ac_status" >&5
+  echo "$as_me:17260: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16589: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16592: \$? = $ac_status" >&5
+  echo "$as_me:17266: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -16601,12 +17275,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:16604: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:17278: result: $cf_cv_have_utmp_ut_name" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6
 
 case $cf_cv_have_utmp_ut_name in #(vi
 no) #(vi
-	{ { echo "$as_me:16609: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:17283: error: Cannot find declaration for ut.ut_name" >&5
 echo "$as_me: error: Cannot find declaration for ut.ut_name" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -16620,7 +17294,7 @@ esac
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:16623: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:17297: checking for exit-status in $cf_cv_have_utmp" >&5
 echo $ECHO_N "checking for exit-status in $cf_cv_have_utmp... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_xstatus+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16633,7 +17307,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 16636 "configure"
+#line 17310 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16647,16 +17321,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16650: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17324: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16653: \$? = $ac_status" >&5
+  echo "$as_me:17327: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16659: \$? = $ac_status" >&5
+  echo "$as_me:17333: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -16669,7 +17343,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:16672: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:17346: result: $cf_cv_have_utmp_ut_xstatus" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xstatus" >&6
 if test $cf_cv_have_utmp_ut_xstatus != no ; then
 	cat >>confdefs.h <<\EOF
@@ -16684,14 +17358,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:16687: checking if utmp.ut_xtime is declared" >&5
+echo "$as_me:17361: checking if utmp.ut_xtime is declared" >&5
 echo $ECHO_N "checking if utmp.ut_xtime is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_xtime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16694 "configure"
+#line 17368 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16705,23 +17379,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16708: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17382: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16711: \$? = $ac_status" >&5
+  echo "$as_me:17385: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16714: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16717: \$? = $ac_status" >&5
+  echo "$as_me:17391: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 16724 "configure"
+#line 17398 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16735,16 +17409,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16738: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17412: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16741: \$? = $ac_status" >&5
+  echo "$as_me:17415: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16744: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16747: \$? = $ac_status" >&5
+  echo "$as_me:17421: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -16758,7 +17432,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:16761: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:17435: result: $cf_cv_have_utmp_ut_xtime" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xtime" >&6
 if test $cf_cv_have_utmp_ut_xtime != no ; then
 	cat >>confdefs.h <<\EOF
@@ -16775,14 +17449,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:16778: checking if utmp.ut_session is declared" >&5
+echo "$as_me:17452: checking if utmp.ut_session is declared" >&5
 echo $ECHO_N "checking if utmp.ut_session is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_session+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16785 "configure"
+#line 17459 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16796,16 +17470,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16799: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17473: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16802: \$? = $ac_status" >&5
+  echo "$as_me:17476: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16805: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16808: \$? = $ac_status" >&5
+  echo "$as_me:17482: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -16816,7 +17490,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:16819: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:17493: result: $cf_cv_have_utmp_ut_session" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_session" >&6
 if test $cf_cv_have_utmp_ut_session != no ; then
 	cat >>confdefs.h <<\EOF
@@ -16826,7 +17500,7 @@ EOF
 fi
 fi
 
-echo "$as_me:16829: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:17503: checking if $cf_cv_have_utmp is SYSV flavor" >&5
 echo $ECHO_N "checking if $cf_cv_have_utmp is SYSV flavor... $ECHO_C" >&6
 if test "${cf_cv_sysv_utmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16834,7 +17508,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16837 "configure"
+#line 17511 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16853,16 +17527,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16856: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17530: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16859: \$? = $ac_status" >&5
+  echo "$as_me:17533: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16865: \$? = $ac_status" >&5
+  echo "$as_me:17539: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -16873,7 +17547,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:16876: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:17550: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test $cf_cv_sysv_utmp = yes && cat >>confdefs.h <<\EOF
 #define USE_SYSV_UTMP 1
@@ -16881,14 +17555,14 @@ EOF
 
 fi
 
-echo "$as_me:16884: checking if external h_errno exists" >&5
+echo "$as_me:17558: checking if external h_errno exists" >&5
 echo $ECHO_N "checking if external h_errno exists... $ECHO_C" >&6
 if test "${cf_cv_have_h_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 16891 "configure"
+#line 17565 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -16903,16 +17577,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16906: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17580: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16909: \$? = $ac_status" >&5
+  echo "$as_me:17583: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16915: \$? = $ac_status" >&5
+  echo "$as_me:17589: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -16923,7 +17597,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:16926: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:17600: result: $cf_cv_have_h_errno" >&5
 echo "${ECHO_T}$cf_cv_have_h_errno" >&6
 
 if test "$cf_cv_have_h_errno" = yes ; then
@@ -16936,7 +17610,7 @@ EOF
 
 fi
 
-echo "$as_me:16939: checking if bibp: URLs should be supported" >&5
+echo "$as_me:17613: checking if bibp: URLs should be supported" >&5
 echo $ECHO_N "checking if bibp: URLs should be supported... $ECHO_C" >&6
 
 # Check whether --enable-bibp-urls or --disable-bibp-urls was given.
@@ -16953,13 +17627,13 @@ else
   use_bibp_urls=yes
 
 fi;
-echo "$as_me:16956: result: $use_bibp_urls" >&5
+echo "$as_me:17630: result: $use_bibp_urls" >&5
 echo "${ECHO_T}$use_bibp_urls" >&6
 test $use_bibp_urls = no && cat >>confdefs.h <<\EOF
 #define DISABLE_BIBP 1
 EOF
 
-echo "$as_me:16962: checking if configuration info should be browsable" >&5
+echo "$as_me:17636: checking if configuration info should be browsable" >&5
 echo $ECHO_N "checking if configuration info should be browsable... $ECHO_C" >&6
 
 # Check whether --enable-config-info or --disable-config-info was given.
@@ -16976,13 +17650,13 @@ else
   use_config_info=yes
 
 fi;
-echo "$as_me:16979: result: $use_config_info" >&5
+echo "$as_me:17653: result: $use_config_info" >&5
 echo "${ECHO_T}$use_config_info" >&6
 test $use_config_info = no && cat >>confdefs.h <<\EOF
 #define NO_CONFIG_INFO 1
 EOF
 
-echo "$as_me:16985: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:17659: checking if new-style forms-based options screen should be used" >&5
 echo $ECHO_N "checking if new-style forms-based options screen should be used... $ECHO_C" >&6
 
 # Check whether --enable-forms-options or --disable-forms-options was given.
@@ -16999,13 +17673,13 @@ else
   use_forms_options=yes
 
 fi;
-echo "$as_me:17002: result: $use_forms_options" >&5
+echo "$as_me:17676: result: $use_forms_options" >&5
 echo "${ECHO_T}$use_forms_options" >&6
 test $use_forms_options = no && cat >>confdefs.h <<\EOF
 #define NO_OPTION_FORMS 1
 EOF
 
-echo "$as_me:17008: checking if old-style options menu should be used" >&5
+echo "$as_me:17682: checking if old-style options menu should be used" >&5
 echo $ECHO_N "checking if old-style options menu should be used... $ECHO_C" >&6
 
 # Check whether --enable-menu-options or --disable-menu-options was given.
@@ -17022,13 +17696,13 @@ else
   use_menu_options=yes
 
 fi;
-echo "$as_me:17025: result: $use_menu_options" >&5
+echo "$as_me:17699: result: $use_menu_options" >&5
 echo "${ECHO_T}$use_menu_options" >&6
 test $use_menu_options = no && cat >>confdefs.h <<\EOF
 #define NO_OPTION_MENU 1
 EOF
 
-echo "$as_me:17031: checking if experimental address-list page should be used" >&5
+echo "$as_me:17705: checking if experimental address-list page should be used" >&5
 echo $ECHO_N "checking if experimental address-list page should be used... $ECHO_C" >&6
 
 # Check whether --enable-addrlist-page or --disable-addrlist-page was given.
@@ -17045,13 +17719,13 @@ else
   use_addrlist_page=no
 
 fi;
-echo "$as_me:17048: result: $use_addrlist_page" >&5
+echo "$as_me:17722: result: $use_addrlist_page" >&5
 echo "${ECHO_T}$use_addrlist_page" >&6
 test $use_addrlist_page != no && cat >>confdefs.h <<\EOF
 #define EXP_ADDRLIST_PAGE 1
 EOF
 
-echo "$as_me:17054: checking if experimental charset-selection logic should be used" >&5
+echo "$as_me:17728: checking if experimental charset-selection logic should be used" >&5
 echo $ECHO_N "checking if experimental charset-selection logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-charset-choice or --disable-charset-choice was given.
@@ -17068,13 +17742,13 @@ else
   use_charset_choice=no
 
 fi;
-echo "$as_me:17071: result: $use_charset_choice" >&5
+echo "$as_me:17745: result: $use_charset_choice" >&5
 echo "${ECHO_T}$use_charset_choice" >&6
 test $use_charset_choice != no && cat >>confdefs.h <<\EOF
 #define EXP_CHARSET_CHOICE 1
 EOF
 
-echo "$as_me:17077: checking if experimental CJK logic should be used" >&5
+echo "$as_me:17751: checking if experimental CJK logic should be used" >&5
 echo $ECHO_N "checking if experimental CJK logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-cjk or --disable-cjk was given.
@@ -17091,13 +17765,13 @@ else
   use_cjk=no
 
 fi;
-echo "$as_me:17094: result: $use_cjk" >&5
+echo "$as_me:17768: result: $use_cjk" >&5
 echo "${ECHO_T}$use_cjk" >&6
 test $use_cjk != no && cat >>confdefs.h <<\EOF
 #define CJK_EX 1
 EOF
 
-echo "$as_me:17100: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:17774: checking if experimental Japanese UTF-8 logic should be used" >&5
 echo $ECHO_N "checking if experimental Japanese UTF-8 logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-japanese-utf8 or --disable-japanese-utf8 was given.
@@ -17114,14 +17788,14 @@ else
   use_ja_utf8=no
 
 fi;
-echo "$as_me:17117: result: $use_ja_utf8" >&5
+echo "$as_me:17791: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test $use_ja_utf8 != no ; then
 	cat >>confdefs.h <<\EOF
 #define EXP_JAPANESEUTF8_SUPPORT 1
 EOF
 
-echo "$as_me:17124: checking for libiconv_open in -liconv" >&5
+echo "$as_me:17798: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17129,7 +17803,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17132 "configure"
+#line 17806 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17148,16 +17822,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17151: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17825: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17154: \$? = $ac_status" >&5
+  echo "$as_me:17828: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17831: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17160: \$? = $ac_status" >&5
+  echo "$as_me:17834: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -17168,7 +17842,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17171: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:17845: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test $ac_cv_lib_iconv_libiconv_open = yes; then
   cat >>confdefs.h <<EOF
@@ -17181,7 +17855,7 @@ fi
 
 fi
 
-echo "$as_me:17184: checking if color-style code should be used" >&5
+echo "$as_me:17858: checking if color-style code should be used" >&5
 echo $ECHO_N "checking if color-style code should be used... $ECHO_C" >&6
 
 # Check whether --enable-color-style or --disable-color-style was given.
@@ -17201,7 +17875,7 @@ fi;
 
 case $use_color_style in
 no)
-	echo "$as_me:17204: result: no" >&5
+	echo "$as_me:17878: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -17210,17 +17884,17 @@ echo "${ECHO_T}no" >&6
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:17213: result: yes" >&5
+	echo "$as_me:17887: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:17216: checking for location of style-sheet file" >&5
+	echo "$as_me:17890: checking for location of style-sheet file" >&5
 echo $ECHO_N "checking for location of style-sheet file... $ECHO_C" >&6
 	LYNX_LSS_FILE=$cf_libdir/lynx.lss
 	cat >>confdefs.h <<EOF
 #define LYNX_LSS_FILE "$LYNX_LSS_FILE"
 EOF
 
-	echo "$as_me:17223: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:17897: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 	INSTALL_LSS=install-lss
 	;;
@@ -17234,7 +17908,7 @@ curses|slang|ncurses*)
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:17237: checking if you want to use default-colors" >&5
+echo "$as_me:17911: checking if you want to use default-colors" >&5
 echo $ECHO_N "checking if you want to use default-colors... $ECHO_C" >&6
 
 # Check whether --enable-default-colors or --disable-default-colors was given.
@@ -17251,7 +17925,7 @@ else
   use_dft_colors=no
 
 fi;
-echo "$as_me:17254: result: $use_dft_colors" >&5
+echo "$as_me:17928: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test $use_dft_colors = "yes" && cat >>confdefs.h <<\EOF
 #define USE_DEFAULT_COLORS 1
@@ -17259,7 +17933,7 @@ EOF
 
 fi
 
-echo "$as_me:17262: checking if experimental htmlized lynx.cfg should be built" >&5
+echo "$as_me:17936: checking if experimental htmlized lynx.cfg should be built" >&5
 echo $ECHO_N "checking if experimental htmlized lynx.cfg should be built... $ECHO_C" >&6
 
 # Check whether --enable-htmlized-cfg or --disable-htmlized-cfg was given.
@@ -17276,7 +17950,7 @@ else
   use_exp_htmlized_cfg=no
 
 fi;
-echo "$as_me:17279: result: $use_exp_htmlized_cfg" >&5
+echo "$as_me:17953: result: $use_exp_htmlized_cfg" >&5
 echo "${ECHO_T}$use_exp_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -17287,7 +17961,7 @@ if test $use_exp_htmlized_cfg = no ; then
 fi
 
 ### check for ipv6 support
-echo "$as_me:17290: checking whether to enable ipv6" >&5
+echo "$as_me:17964: checking whether to enable ipv6" >&5
 echo $ECHO_N "checking whether to enable ipv6... $ECHO_C" >&6
 
 # Check whether --enable-ipv6 or --disable-ipv6 was given.
@@ -17303,11 +17977,11 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:17306: result: $enableval" >&5
+echo "$as_me:17980: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" = "yes"; then
 
-echo "$as_me:17310: checking ipv6 stack type" >&5
+echo "$as_me:17984: checking ipv6 stack type" >&5
 echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6
 if test "${cf_cv_ipv6type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17328,7 +18002,7 @@ do
 		;;
 	inria) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17331 "configure"
+#line 18005 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -17345,7 +18019,7 @@ rm -f conftest*
 		;;
 	kame) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17348 "configure"
+#line 18022 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -17362,7 +18036,7 @@ rm -f conftest*
 		;;
 	linux-glibc) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17365 "configure"
+#line 18039 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -17388,7 +18062,7 @@ rm -f conftest*
 		;;
 	toshiba) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17391 "configure"
+#line 18065 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -17405,7 +18079,7 @@ rm -f conftest*
 		;;
 	v6d) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17408 "configure"
+#line 18082 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -17422,7 +18096,7 @@ rm -f conftest*
 		;;
 	zeta)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17425 "configure"
+#line 18099 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -17444,13 +18118,13 @@ rm -f conftest*
 done
 
 fi
-echo "$as_me:17447: result: $cf_cv_ipv6type" >&5
+echo "$as_me:18121: result: $cf_cv_ipv6type" >&5
 echo "${ECHO_T}$cf_cv_ipv6type" >&6
 
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo "$as_me:17453: checking for IPv6 library if required" >&5
+echo "$as_me:18127: checking for IPv6 library if required" >&5
 echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6
 case $cf_cv_ipv6type in #(vi
 solaris) #(vi
@@ -17480,13 +18154,13 @@ zeta)
 	cf_ipv6dir=v6
 	;;
 esac
-echo "$as_me:17483: result: $cf_ipv6lib" >&5
+echo "$as_me:18157: result: $cf_ipv6lib" >&5
 echo "${ECHO_T}$cf_ipv6lib" >&6
 
 if test "$cf_ipv6lib" != "none"; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17489 "configure"
+#line 18163 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17502,16 +18176,16 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17505: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18179: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17508: \$? = $ac_status" >&5
+  echo "$as_me:18182: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17511: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17514: \$? = $ac_status" >&5
+  echo "$as_me:18188: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17605,13 +18279,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 	eval 'cf_cv_have_lib_'$cf_ipv6lib'=no'
 	cf_libdir=""
-	echo "$as_me:17608: checking for getaddrinfo" >&5
+	echo "$as_me:18282: checking for getaddrinfo" >&5
 echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6
 if test "${ac_cv_func_getaddrinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17614 "configure"
+#line 18288 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getaddrinfo (); below.  */
@@ -17642,16 +18316,16 @@ f = getaddrinfo;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17645: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18319: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17648: \$? = $ac_status" >&5
+  echo "$as_me:18322: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17654: \$? = $ac_status" >&5
+  echo "$as_me:18328: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getaddrinfo=yes
 else
@@ -17661,18 +18335,18 @@ ac_cv_func_getaddrinfo=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17664: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:18338: result: $ac_cv_func_getaddrinfo" >&5
 echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6
 if test $ac_cv_func_getaddrinfo = yes; then
   eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:17671: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+		echo "$as_me:18345: checking for getaddrinfo in -l$cf_ipv6lib" >&5
 echo $ECHO_N "checking for getaddrinfo in -l$cf_ipv6lib... $ECHO_C" >&6
 		LIBS="-l$cf_ipv6lib $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17675 "configure"
+#line 18349 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17688,25 +18362,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17691: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18365: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17694: \$? = $ac_status" >&5
+  echo "$as_me:18368: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18371: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17700: \$? = $ac_status" >&5
+  echo "$as_me:18374: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:17702: result: yes" >&5
+  echo "$as_me:18376: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:17709: result: no" >&5
+echo "$as_me:18383: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -17766,11 +18440,11 @@ test -d /usr && {
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:17769: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+				echo "$as_me:18443: checking for -l$cf_ipv6lib in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_ipv6lib in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17773 "configure"
+#line 18447 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17786,25 +18460,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18463: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17792: \$? = $ac_status" >&5
+  echo "$as_me:18466: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18469: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17798: \$? = $ac_status" >&5
+  echo "$as_me:18472: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:17800: result: yes" >&5
+  echo "$as_me:18474: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:17807: result: no" >&5
+echo "$as_me:18481: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -17819,7 +18493,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib
 
 	if test $cf_found_library = no ; then
-		{ { echo "$as_me:17822: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
+		{ { echo "$as_me:18496: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
 from an appropriate IPv6 kit and compile beforehand." >&5
 echo "$as_me: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
 from an appropriate IPv6 kit and compile beforehand." >&2;}
@@ -17827,7 +18501,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;}
 	fi
 fi
 
-echo "$as_me:17830: checking working getaddrinfo" >&5
+echo "$as_me:18504: checking working getaddrinfo" >&5
 echo $ECHO_N "checking working getaddrinfo... $ECHO_C" >&6
 if test "${cf_cv_getaddrinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17837,7 +18511,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17840 "configure"
+#line 18514 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17917,15 +18591,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:17920: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18594: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17923: \$? = $ac_status" >&5
+  echo "$as_me:18597: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:17925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18599: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17928: \$? = $ac_status" >&5
+  echo "$as_me:18602: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_getaddrinfo=yes
 else
@@ -17938,7 +18612,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:17941: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:18615: result: $cf_cv_getaddrinfo" >&5
 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
 if test "$cf_cv_getaddrinfo" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -17953,12 +18627,12 @@ fi
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "$as_me:17956: WARNING: You must get working getaddrinfo() function,
+		{ echo "$as_me:18630: WARNING: You must get working getaddrinfo() function,
 or you can specify \"--disable-ipv6\"" >&5
 echo "$as_me: WARNING: You must get working getaddrinfo() function,
 or you can specify \"--disable-ipv6\"" >&2;}
 	else
-		{ echo "$as_me:17961: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+		{ echo "$as_me:18635: WARNING: The getaddrinfo() implementation on your system seems be buggy.
 You should upgrade your system library to the newest version
 of GNU C library (aka glibc)." >&5
 echo "$as_me: WARNING: The getaddrinfo() implementation on your system seems be buggy.
@@ -17969,7 +18643,7 @@ fi
 
 fi
 
-echo "$as_me:17972: checking if experimental element-justification logic should be used" >&5
+echo "$as_me:18646: checking if experimental element-justification logic should be used" >&5
 echo $ECHO_N "checking if experimental element-justification logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-justify-elts or --disable-justify-elts was given.
@@ -17986,13 +18660,13 @@ else
   use_exp_justify_elts=no
 
 fi;
-echo "$as_me:17989: result: $use_exp_justify_elts" >&5
+echo "$as_me:18663: result: $use_exp_justify_elts" >&5
 echo "${ECHO_T}$use_exp_justify_elts" >&6
 test $use_exp_justify_elts != no && cat >>confdefs.h <<\EOF
 #define EXP_JUSTIFY_ELTS 1
 EOF
 
-echo "$as_me:17995: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:18669: checking if experimental keyboard-layout logic should be used" >&5
 echo $ECHO_N "checking if experimental keyboard-layout logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-kbd-layout or --disable-kbd-layout was given.
@@ -18009,13 +18683,13 @@ else
   use_kbd_layout=no
 
 fi;
-echo "$as_me:18012: result: $use_kbd_layout" >&5
+echo "$as_me:18686: result: $use_kbd_layout" >&5
 echo "${ECHO_T}$use_kbd_layout" >&6
 test $use_kbd_layout != no && cat >>confdefs.h <<\EOF
 #define EXP_KEYBOARD_LAYOUT 1
 EOF
 
-echo "$as_me:18018: checking if experimental locale-charset selection logic should be used" >&5
+echo "$as_me:18692: checking if experimental locale-charset selection logic should be used" >&5
 echo $ECHO_N "checking if experimental locale-charset selection logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-locale-charset or --disable-locale-charset was given.
@@ -18032,13 +18706,13 @@ else
   use_locale_charset=yes
 
 fi;
-echo "$as_me:18035: result: $use_locale_charset" >&5
+echo "$as_me:18709: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test $use_locale_charset != no && cat >>confdefs.h <<\EOF
 #define EXP_LOCALE_CHARSET 1
 EOF
 
-echo "$as_me:18041: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:18715: checking if experimental nested-table logic should be used" >&5
 echo $ECHO_N "checking if experimental nested-table logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-nested-tables or --disable-nested-tables was given.
@@ -18055,13 +18729,13 @@ else
   use_nested_tables=no
 
 fi;
-echo "$as_me:18058: result: $use_nested_tables" >&5
+echo "$as_me:18732: result: $use_nested_tables" >&5
 echo "${ECHO_T}$use_nested_tables" >&6
 test $use_nested_tables != no && cat >>confdefs.h <<\EOF
 #define EXP_NESTED_TABLES 1
 EOF
 
-echo "$as_me:18064: checking if scrollbar code should be used" >&5
+echo "$as_me:18738: checking if scrollbar code should be used" >&5
 echo $ECHO_N "checking if scrollbar code should be used... $ECHO_C" >&6
 
 # Check whether --enable-scrollbar or --disable-scrollbar was given.
@@ -18078,10 +18752,10 @@ else
   use_scrollbar=no
 
 fi;
-echo "$as_me:18081: result: $use_scrollbar" >&5
+echo "$as_me:18755: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:18084: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:18758: checking if alternative line-edit bindings should be used" >&5
 echo $ECHO_N "checking if alternative line-edit bindings should be used... $ECHO_C" >&6
 
 # Check whether --enable-alt-bindings or --disable-alt-bindings was given.
@@ -18098,13 +18772,13 @@ else
   use_alt_bindings=yes
 
 fi;
-echo "$as_me:18101: result: $use_alt_bindings" >&5
+echo "$as_me:18775: result: $use_alt_bindings" >&5
 echo "${ECHO_T}$use_alt_bindings" >&6
 test $use_alt_bindings != no && cat >>confdefs.h <<\EOF
 #define EXP_ALT_BINDINGS 1
 EOF
 
-echo "$as_me:18107: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:18781: checking if you want to use extended HTML DTD logic" >&5
 echo $ECHO_N "checking if you want to use extended HTML DTD logic... $ECHO_C" >&6
 
 # Check whether --enable-extended-dtd or --disable-extended-dtd was given.
@@ -18121,13 +18795,13 @@ else
   use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:18124: result: $use_ext_htmldtd" >&5
+echo "$as_me:18798: result: $use_ext_htmldtd" >&5
 echo "${ECHO_T}$use_ext_htmldtd" >&6
 test $use_ext_htmldtd = "no" && cat >>confdefs.h <<\EOF
 #define NO_EXTENDED_HTMLDTD 1
 EOF
 
-echo "$as_me:18130: checking if file-upload logic should be used" >&5
+echo "$as_me:18804: checking if file-upload logic should be used" >&5
 echo $ECHO_N "checking if file-upload logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-file-upload or --disable-file-upload was given.
@@ -18144,13 +18818,13 @@ else
   use_file_upload=yes
 
 fi;
-echo "$as_me:18147: result: $use_file_upload" >&5
+echo "$as_me:18821: result: $use_file_upload" >&5
 echo "${ECHO_T}$use_file_upload" >&6
 test $use_file_upload != no && cat >>confdefs.h <<\EOF
 #define USE_FILE_UPLOAD 1
 EOF
 
-echo "$as_me:18153: checking if partial-display should be used" >&5
+echo "$as_me:18827: checking if partial-display should be used" >&5
 echo $ECHO_N "checking if partial-display should be used... $ECHO_C" >&6
 
 # Check whether --enable-partial or --disable-partial was given.
@@ -18167,13 +18841,13 @@ else
   use_partial_display=yes
 
 fi;
-echo "$as_me:18170: result: $use_partial_display" >&5
+echo "$as_me:18844: result: $use_partial_display" >&5
 echo "${ECHO_T}$use_partial_display" >&6
 test $use_partial_display != no && cat >>confdefs.h <<\EOF
 #define DISP_PARTIAL 1
 EOF
 
-echo "$as_me:18176: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:18850: checking if persistent-cookie logic should be used" >&5
 echo $ECHO_N "checking if persistent-cookie logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-persistent-cookies or --disable-persistent-cookies was given.
@@ -18190,13 +18864,13 @@ else
   use_filed_cookies=yes
 
 fi;
-echo "$as_me:18193: result: $use_filed_cookies" >&5
+echo "$as_me:18867: result: $use_filed_cookies" >&5
 echo "${ECHO_T}$use_filed_cookies" >&6
 test $use_filed_cookies != no && cat >>confdefs.h <<\EOF
 #define USE_PERSISTENT_COOKIES 1
 EOF
 
-echo "$as_me:18199: checking if html source should be colorized" >&5
+echo "$as_me:18873: checking if html source should be colorized" >&5
 echo $ECHO_N "checking if html source should be colorized... $ECHO_C" >&6
 
 # Check whether --enable-prettysrc or --disable-prettysrc was given.
@@ -18213,13 +18887,13 @@ else
   use_prettysrc=yes
 
 fi;
-echo "$as_me:18216: result: $use_prettysrc" >&5
+echo "$as_me:18890: result: $use_prettysrc" >&5
 echo "${ECHO_T}$use_prettysrc" >&6
 test $use_prettysrc != no && cat >>confdefs.h <<\EOF
 #define USE_PRETTYSRC 1
 EOF
 
-echo "$as_me:18222: checking if read-progress message should show ETA" >&5
+echo "$as_me:18896: checking if read-progress message should show ETA" >&5
 echo $ECHO_N "checking if read-progress message should show ETA... $ECHO_C" >&6
 
 # Check whether --enable-read-eta or --disable-read-eta was given.
@@ -18236,13 +18910,13 @@ else
   use_read_eta=yes
 
 fi;
-echo "$as_me:18239: result: $use_read_eta" >&5
+echo "$as_me:18913: result: $use_read_eta" >&5
 echo "${ECHO_T}$use_read_eta" >&6
 test $use_read_eta != no && cat >>confdefs.h <<\EOF
 #define USE_READPROGRESS 1
 EOF
 
-echo "$as_me:18245: checking if source caching should be used" >&5
+echo "$as_me:18919: checking if source caching should be used" >&5
 echo $ECHO_N "checking if source caching should be used... $ECHO_C" >&6
 
 # Check whether --enable-source-cache or --disable-source-cache was given.
@@ -18259,13 +18933,13 @@ else
   use_source_cache=yes
 
 fi;
-echo "$as_me:18262: result: $use_source_cache" >&5
+echo "$as_me:18936: result: $use_source_cache" >&5
 echo "${ECHO_T}$use_source_cache" >&6
 test $use_source_cache != no && cat >>confdefs.h <<\EOF
 #define USE_SOURCE_CACHE 1
 EOF
 
-echo "$as_me:18268: checking if you want to use external commands" >&5
+echo "$as_me:18942: checking if you want to use external commands" >&5
 echo $ECHO_N "checking if you want to use external commands... $ECHO_C" >&6
 
 # Check whether --enable-externs or --disable-externs was given.
@@ -18282,7 +18956,7 @@ else
   use_externs=no
 
 fi;
-echo "$as_me:18285: result: $use_externs" >&5
+echo "$as_me:18959: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
 	cat >>confdefs.h <<\EOF
@@ -18292,7 +18966,7 @@ EOF
 	LIBOBJS="$LIBOBJS LYExtern\$o"
 fi
 
-echo "$as_me:18295: checking if you want to use setfont support" >&5
+echo "$as_me:18969: checking if you want to use setfont support" >&5
 echo $ECHO_N "checking if you want to use setfont support... $ECHO_C" >&6
 
 # Check whether --enable-font-switch or --disable-font-switch was given.
@@ -18309,13 +18983,13 @@ else
   use_setfont=no
 
 fi;
-echo "$as_me:18312: result: $use_setfont" >&5
+echo "$as_me:18986: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 test $use_setfont = yes && cat >>confdefs.h <<\EOF
 #define EXP_CHARTRANS_AUTOSWITCH 1
 EOF
 
-echo "$as_me:18318: checking if you want cgi-link support" >&5
+echo "$as_me:18992: checking if you want cgi-link support" >&5
 echo $ECHO_N "checking if you want cgi-link support... $ECHO_C" >&6
 
 # Check whether --enable-cgi-links or --disable-cgi-links was given.
@@ -18331,10 +19005,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:18334: result: $enableval" >&5
+echo "$as_me:19008: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:18337: checking if you want change-exec support" >&5
+echo "$as_me:19011: checking if you want change-exec support" >&5
 echo $ECHO_N "checking if you want change-exec support... $ECHO_C" >&6
 
 # Check whether --enable-change-exec or --disable-change-exec was given.
@@ -18351,13 +19025,13 @@ else
   use_change_exec=no
 
 fi;
-echo "$as_me:18354: result: $use_change_exec" >&5
+echo "$as_me:19028: result: $use_change_exec" >&5
 echo "${ECHO_T}$use_change_exec" >&6
 test $use_change_exec = yes && cat >>confdefs.h <<\EOF
 #define ENABLE_OPTS_CHANGE_EXEC 1
 EOF
 
-echo "$as_me:18360: checking if you want exec-links support" >&5
+echo "$as_me:19034: checking if you want exec-links support" >&5
 echo $ECHO_N "checking if you want exec-links support... $ECHO_C" >&6
 
 # Check whether --enable-exec-links or --disable-exec-links was given.
@@ -18374,13 +19048,13 @@ else
   use_exec_links=$enableval
 
 fi;
-echo "$as_me:18377: result: $use_exec_links" >&5
+echo "$as_me:19051: result: $use_exec_links" >&5
 echo "${ECHO_T}$use_exec_links" >&6
 test $use_exec_links = yes && cat >>confdefs.h <<\EOF
 #define EXEC_LINKS 1
 EOF
 
-echo "$as_me:18383: checking if you want exec-scripts support" >&5
+echo "$as_me:19057: checking if you want exec-scripts support" >&5
 echo $ECHO_N "checking if you want exec-scripts support... $ECHO_C" >&6
 
 # Check whether --enable-exec-scripts or --disable-exec-scripts was given.
@@ -18397,13 +19071,13 @@ else
   use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:18400: result: $use_exec_scripts" >&5
+echo "$as_me:19074: result: $use_exec_scripts" >&5
 echo "${ECHO_T}$use_exec_scripts" >&6
 test $use_exec_scripts = yes && cat >>confdefs.h <<\EOF
 #define EXEC_SCRIPTS 1
 EOF
 
-echo "$as_me:18406: checking if you want internal-links feature" >&5
+echo "$as_me:19080: checking if you want internal-links feature" >&5
 echo $ECHO_N "checking if you want internal-links feature... $ECHO_C" >&6
 
 # Check whether --enable-internal-links or --disable-internal-links was given.
@@ -18420,13 +19094,13 @@ else
   use_internal_links=no
 
 fi;
-echo "$as_me:18423: result: $use_internal_links" >&5
+echo "$as_me:19097: result: $use_internal_links" >&5
 echo "${ECHO_T}$use_internal_links" >&6
 test $use_internal_links = no && cat >>confdefs.h <<\EOF
 #define DONT_TRACK_INTERNAL_LINKS 1
 EOF
 
-echo "$as_me:18429: checking if you want to fork NSL requests" >&5
+echo "$as_me:19103: checking if you want to fork NSL requests" >&5
 echo $ECHO_N "checking if you want to fork NSL requests... $ECHO_C" >&6
 
 # Check whether --enable-nsl-fork or --disable-nsl-fork was given.
@@ -18443,13 +19117,13 @@ else
   use_nsl_fork=no
 
 fi;
-echo "$as_me:18446: result: $use_nsl_fork" >&5
+echo "$as_me:19120: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 test $use_nsl_fork = yes && cat >>confdefs.h <<\EOF
 #define NSL_FORK 1
 EOF
 
-echo "$as_me:18452: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:19126: checking if you want to log URL requests via syslog" >&5
 echo $ECHO_N "checking if you want to log URL requests via syslog... $ECHO_C" >&6
 
 # Check whether --enable-syslog or --disable-syslog was given.
@@ -18466,13 +19140,13 @@ else
   use_syslog=no
 
 fi;
-echo "$as_me:18469: result: $use_syslog" >&5
+echo "$as_me:19143: result: $use_syslog" >&5
 echo "${ECHO_T}$use_syslog" >&6
 test $use_syslog = yes && cat >>confdefs.h <<\EOF
 #define SYSLOG_REQUESTED_URLS 1
 EOF
 
-echo "$as_me:18475: checking if you want to underline links" >&5
+echo "$as_me:19149: checking if you want to underline links" >&5
 echo $ECHO_N "checking if you want to underline links... $ECHO_C" >&6
 
 # Check whether --enable-underlines or --disable-underlines was given.
@@ -18489,7 +19163,7 @@ else
   use_underline=no
 
 fi;
-echo "$as_me:18492: result: $use_underline" >&5
+echo "$as_me:19166: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test $use_underline = yes && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 1
@@ -18499,7 +19173,7 @@ test $use_underline = no  && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:18502: checking if help files should be gzip'ed" >&5
+echo "$as_me:19176: checking if help files should be gzip'ed" >&5
 echo $ECHO_N "checking if help files should be gzip'ed... $ECHO_C" >&6
 
 # Check whether --enable-gzip-help or --disable-gzip-help was given.
@@ -18516,10 +19190,10 @@ else
   use_gzip_help=no
 
 fi;
-echo "$as_me:18519: result: $use_gzip_help" >&5
+echo "$as_me:19193: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:18522: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:19196: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
 echo $ECHO_N "checking if you want to use libbz2 for decompression of some bzip2 files... $ECHO_C" >&6
 
 # Check whether --with-bzlib or --without-bzlib was given.
@@ -18529,15 +19203,15 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:18532: result: $use_bzlib" >&5
+echo "$as_me:19206: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
 
-echo "$as_me:18537: checking if we need to add -I option to get bzlib.h" >&5
+echo "$as_me:19211: checking if we need to add -I option to get bzlib.h" >&5
 echo $ECHO_N "checking if we need to add -I option to get bzlib.h... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 18540 "configure"
+#line 19214 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 int
@@ -18549,24 +19223,24 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18552: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19226: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18555: \$? = $ac_status" >&5
+  echo "$as_me:19229: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19232: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18561: \$? = $ac_status" >&5
+  echo "$as_me:19235: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18563: result: no" >&5
+  echo "$as_me:19237: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-echo "$as_me:18569: result: yes" >&5
+echo "$as_me:19243: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 cf_search=""
 
@@ -18723,13 +19397,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	eval 'cf_cv_have_lib_'bz2'=no'
 	cf_libdir=""
-	echo "$as_me:18726: checking for BZ2_bzopen" >&5
+	echo "$as_me:19400: checking for BZ2_bzopen" >&5
 echo $ECHO_N "checking for BZ2_bzopen... $ECHO_C" >&6
 if test "${ac_cv_func_BZ2_bzopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18732 "configure"
+#line 19406 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char BZ2_bzopen (); below.  */
@@ -18760,16 +19434,16 @@ f = BZ2_bzopen;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18763: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19437: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18766: \$? = $ac_status" >&5
+  echo "$as_me:19440: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19443: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18772: \$? = $ac_status" >&5
+  echo "$as_me:19446: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_BZ2_bzopen=yes
 else
@@ -18779,18 +19453,18 @@ ac_cv_func_BZ2_bzopen=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18782: result: $ac_cv_func_BZ2_bzopen" >&5
+echo "$as_me:19456: result: $ac_cv_func_BZ2_bzopen" >&5
 echo "${ECHO_T}$ac_cv_func_BZ2_bzopen" >&6
 if test $ac_cv_func_BZ2_bzopen = yes; then
   eval 'cf_cv_have_lib_'bz2'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:18789: checking for BZ2_bzopen in -lbz2" >&5
+		echo "$as_me:19463: checking for BZ2_bzopen in -lbz2" >&5
 echo $ECHO_N "checking for BZ2_bzopen in -lbz2... $ECHO_C" >&6
 		LIBS="-lbz2 $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 18793 "configure"
+#line 19467 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18804,25 +19478,25 @@ BZ2_bzopen("name","mode")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18807: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19481: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18810: \$? = $ac_status" >&5
+  echo "$as_me:19484: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18813: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18816: \$? = $ac_status" >&5
+  echo "$as_me:19490: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18818: result: yes" >&5
+  echo "$as_me:19492: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'bz2'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:18825: result: no" >&5
+echo "$as_me:19499: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -18882,11 +19556,11 @@ test -d /usr && {
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:18885: checking for -lbz2 in $cf_libdir" >&5
+				echo "$as_me:19559: checking for -lbz2 in $cf_libdir" >&5
 echo $ECHO_N "checking for -lbz2 in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lbz2 $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 18889 "configure"
+#line 19563 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18900,25 +19574,25 @@ BZ2_bzopen("name","mode")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18903: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19577: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18906: \$? = $ac_status" >&5
+  echo "$as_me:19580: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19583: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18912: \$? = $ac_status" >&5
+  echo "$as_me:19586: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18914: result: yes" >&5
+  echo "$as_me:19588: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'bz2'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:18921: result: no" >&5
+echo "$as_me:19595: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -18933,7 +19607,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'bz2
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:18936: error: Cannot link bz2 library" >&5
+	{ { echo "$as_me:19610: error: Cannot link bz2 library" >&5
 echo "$as_me: error: Cannot link bz2 library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -18944,7 +19618,7 @@ EOF
 
 fi
 
-echo "$as_me:18947: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:19621: checking if you want to use zlib for decompression of some gzip files" >&5
 echo $ECHO_N "checking if you want to use zlib for decompression of some gzip files... $ECHO_C" >&6
 
 # Check whether --with-zlib or --without-zlib was given.
@@ -18954,15 +19628,15 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:18957: result: $use_zlib" >&5
+echo "$as_me:19631: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
 
-echo "$as_me:18962: checking if we need to add -I option to get zlib.h" >&5
+echo "$as_me:19636: checking if we need to add -I option to get zlib.h" >&5
 echo $ECHO_N "checking if we need to add -I option to get zlib.h... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 18965 "configure"
+#line 19639 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 int
@@ -18974,24 +19648,24 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18977: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19651: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18980: \$? = $ac_status" >&5
+  echo "$as_me:19654: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19657: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18986: \$? = $ac_status" >&5
+  echo "$as_me:19660: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18988: result: no" >&5
+  echo "$as_me:19662: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-echo "$as_me:18994: result: yes" >&5
+echo "$as_me:19668: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 cf_search=""
 
@@ -19148,13 +19822,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	eval 'cf_cv_have_lib_'z'=no'
 	cf_libdir=""
-	echo "$as_me:19151: checking for gzopen" >&5
+	echo "$as_me:19825: checking for gzopen" >&5
 echo $ECHO_N "checking for gzopen... $ECHO_C" >&6
 if test "${ac_cv_func_gzopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19157 "configure"
+#line 19831 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gzopen (); below.  */
@@ -19185,16 +19859,16 @@ f = gzopen;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19188: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19862: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19191: \$? = $ac_status" >&5
+  echo "$as_me:19865: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19868: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19197: \$? = $ac_status" >&5
+  echo "$as_me:19871: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gzopen=yes
 else
@@ -19204,18 +19878,18 @@ ac_cv_func_gzopen=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19207: result: $ac_cv_func_gzopen" >&5
+echo "$as_me:19881: result: $ac_cv_func_gzopen" >&5
 echo "${ECHO_T}$ac_cv_func_gzopen" >&6
 if test $ac_cv_func_gzopen = yes; then
   eval 'cf_cv_have_lib_'z'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:19214: checking for gzopen in -lz" >&5
+		echo "$as_me:19888: checking for gzopen in -lz" >&5
 echo $ECHO_N "checking for gzopen in -lz... $ECHO_C" >&6
 		LIBS="-lz $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 19218 "configure"
+#line 19892 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 int
@@ -19227,25 +19901,25 @@ gzopen("name","mode")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19230: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19904: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19233: \$? = $ac_status" >&5
+  echo "$as_me:19907: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19236: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19910: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19239: \$? = $ac_status" >&5
+  echo "$as_me:19913: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:19241: result: yes" >&5
+  echo "$as_me:19915: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'z'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:19248: result: no" >&5
+echo "$as_me:19922: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -19305,11 +19979,11 @@ test -d /usr && {
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:19308: checking for -lz in $cf_libdir" >&5
+				echo "$as_me:19982: checking for -lz in $cf_libdir" >&5
 echo $ECHO_N "checking for -lz in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lz $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 19312 "configure"
+#line 19986 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 int
@@ -19321,25 +19995,25 @@ gzopen("name","mode")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19324: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19998: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19327: \$? = $ac_status" >&5
+  echo "$as_me:20001: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19333: \$? = $ac_status" >&5
+  echo "$as_me:20007: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:19335: result: yes" >&5
+  echo "$as_me:20009: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'z'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:19342: result: no" >&5
+echo "$as_me:20016: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -19354,7 +20028,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'z
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:19357: error: Cannot link z library" >&5
+	{ { echo "$as_me:20031: error: Cannot link z library" >&5
 echo "$as_me: error: Cannot link z library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -19365,7 +20039,7 @@ EOF
 
 fi
 
-echo "$as_me:19368: checking if you want to exclude FINGER code" >&5
+echo "$as_me:20042: checking if you want to exclude FINGER code" >&5
 echo $ECHO_N "checking if you want to exclude FINGER code... $ECHO_C" >&6
 
 # Check whether --enable-finger or --disable-finger was given.
@@ -19382,13 +20056,13 @@ else
   use_finger=no
 
 fi;
-echo "$as_me:19385: result: $use_finger" >&5
+echo "$as_me:20059: result: $use_finger" >&5
 echo "${ECHO_T}$use_finger" >&6
 test $use_finger != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_FINGER 1
 EOF
 
-echo "$as_me:19391: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:20065: checking if you want to exclude GOPHER code" >&5
 echo $ECHO_N "checking if you want to exclude GOPHER code... $ECHO_C" >&6
 
 # Check whether --enable-gopher or --disable-gopher was given.
@@ -19405,13 +20079,13 @@ else
   use_gopher=no
 
 fi;
-echo "$as_me:19408: result: $use_gopher" >&5
+echo "$as_me:20082: result: $use_gopher" >&5
 echo "${ECHO_T}$use_gopher" >&6
 test $use_gopher != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_GOPHER 1
 EOF
 
-echo "$as_me:19414: checking if you want to exclude NEWS code" >&5
+echo "$as_me:20088: checking if you want to exclude NEWS code" >&5
 echo $ECHO_N "checking if you want to exclude NEWS code... $ECHO_C" >&6
 
 # Check whether --enable-news or --disable-news was given.
@@ -19428,13 +20102,13 @@ else
   use_news=no
 
 fi;
-echo "$as_me:19431: result: $use_news" >&5
+echo "$as_me:20105: result: $use_news" >&5
 echo "${ECHO_T}$use_news" >&6
 test $use_news != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_NEWS 1
 EOF
 
-echo "$as_me:19437: checking if you want to exclude FTP code" >&5
+echo "$as_me:20111: checking if you want to exclude FTP code" >&5
 echo $ECHO_N "checking if you want to exclude FTP code... $ECHO_C" >&6
 
 # Check whether --enable-ftp or --disable-ftp was given.
@@ -19451,7 +20125,7 @@ else
   use_ftp=no
 
 fi;
-echo "$as_me:19454: result: $use_ftp" >&5
+echo "$as_me:20128: result: $use_ftp" >&5
 echo "${ECHO_T}$use_ftp" >&6
 test $use_ftp != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_FTP 1
@@ -19459,7 +20133,7 @@ EOF
 
 # All DirEd functions that were enabled on compilation can be disabled
 # or modified at run time via DIRED_MENU symbols in lynx.cfg.
-echo "$as_me:19462: checking if directory-editor code should be used" >&5
+echo "$as_me:20136: checking if directory-editor code should be used" >&5
 echo $ECHO_N "checking if directory-editor code should be used... $ECHO_C" >&6
 
 # Check whether --enable-dired or --disable-dired was given.
@@ -19476,7 +20150,7 @@ else
   use_dired=yes
 
 fi;
-echo "$as_me:19479: result: $use_dired" >&5
+echo "$as_me:20153: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -19485,7 +20159,7 @@ if test ".$use_dired" != ".no" ; then
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:19488: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:20162: checking if you wish to allow extracting from archives via DirEd" >&5
 echo $ECHO_N "checking if you wish to allow extracting from archives via DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-dearchive or --disable-dired-dearchive was given.
@@ -19501,10 +20175,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:19504: result: $enableval" >&5
+	echo "$as_me:20178: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:19507: checking if DirEd mode should override keys" >&5
+	echo "$as_me:20181: checking if DirEd mode should override keys" >&5
 echo $ECHO_N "checking if DirEd mode should override keys... $ECHO_C" >&6
 
 # Check whether --enable-dired-override or --disable-dired-override was given.
@@ -19526,10 +20200,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:19529: result: $enableval" >&5
+	echo "$as_me:20203: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:19532: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:20206: checking if you wish to allow permissions commands via DirEd" >&5
 echo $ECHO_N "checking if you wish to allow permissions commands via DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-permit or --disable-dired-permit was given.
@@ -19551,10 +20225,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:19554: result: $enableval" >&5
+	echo "$as_me:20228: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:19557: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:20231: checking if you wish to allow executable-permission commands via DirEd" >&5
 echo $ECHO_N "checking if you wish to allow executable-permission commands via DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-xpermit or --disable-dired-xpermit was given.
@@ -19570,10 +20244,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:19573: result: $enableval" >&5
+	echo "$as_me:20247: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:19576: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:20250: checking if you wish to allow \"tar\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"tar\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-tar or --disable-dired-tar was given.
@@ -19595,10 +20269,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:19598: result: $enableval" >&5
+	echo "$as_me:20272: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:19601: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:20275: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"uudecode\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-uudecode or --disable-dired-uudecode was given.
@@ -19620,10 +20294,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:19623: result: $enableval" >&5
+	echo "$as_me:20297: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:19626: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:20300: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-zip or --disable-dired-zip was given.
@@ -19645,10 +20319,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:19648: result: $enableval" >&5
+	echo "$as_me:20322: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:19651: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:20325: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-gzip or --disable-dired-gzip was given.
@@ -19670,11 +20344,11 @@ else
 EOF
 
 fi;
-	echo "$as_me:19673: result: $enableval" >&5
+	echo "$as_me:20347: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:19677: checking if you want long-directory listings" >&5
+echo "$as_me:20351: checking if you want long-directory listings" >&5
 echo $ECHO_N "checking if you want long-directory listings... $ECHO_C" >&6
 
 # Check whether --enable-long-list or --disable-long-list was given.
@@ -19696,10 +20370,10 @@ else
 EOF
 
 fi;
-echo "$as_me:19699: result: $enableval" >&5
+echo "$as_me:20373: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:19702: checking if parent-directory references are permitted" >&5
+echo "$as_me:20376: checking if parent-directory references are permitted" >&5
 echo $ECHO_N "checking if parent-directory references are permitted... $ECHO_C" >&6
 
 # Check whether --enable-parent-dir-refs or --disable-parent-dir-refs was given.
@@ -19715,7 +20389,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:19718: result: $enableval" >&5
+echo "$as_me:20392: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -19723,7 +20397,7 @@ for ac_prog in $TELNET telnet
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:19726: checking for $ac_word" >&5
+echo "$as_me:20400: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TELNET+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19740,7 +20414,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TELNET="$ac_dir/$ac_word"
-   echo "$as_me:19743: found $ac_dir/$ac_word" >&5
+   echo "$as_me:20417: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -19751,10 +20425,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:19754: result: $TELNET" >&5
+  echo "$as_me:20428: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:19757: result: no" >&5
+  echo "$as_me:20431: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19816,7 +20490,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 19819) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 20493) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -19833,7 +20507,7 @@ for ac_prog in $TN3270 tn3270
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:19836: checking for $ac_word" >&5
+echo "$as_me:20510: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TN3270+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19850,7 +20524,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TN3270="$ac_dir/$ac_word"
-   echo "$as_me:19853: found $ac_dir/$ac_word" >&5
+   echo "$as_me:20527: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -19861,10 +20535,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:19864: result: $TN3270" >&5
+  echo "$as_me:20538: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:19867: result: no" >&5
+  echo "$as_me:20541: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19926,7 +20600,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 19929) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 20603) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -19943,7 +20617,7 @@ for ac_prog in $RLOGIN rlogin
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:19946: checking for $ac_word" >&5
+echo "$as_me:20620: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_RLOGIN+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19960,7 +20634,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_RLOGIN="$ac_dir/$ac_word"
-   echo "$as_me:19963: found $ac_dir/$ac_word" >&5
+   echo "$as_me:20637: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -19971,10 +20645,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:19974: result: $RLOGIN" >&5
+  echo "$as_me:20648: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:19977: result: no" >&5
+  echo "$as_me:20651: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20036,7 +20710,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 20039) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 20713) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -20053,7 +20727,7 @@ for ac_prog in $MV mv
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:20056: checking for $ac_word" >&5
+echo "$as_me:20730: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MV+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20070,7 +20744,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_MV="$ac_dir/$ac_word"
-   echo "$as_me:20073: found $ac_dir/$ac_word" >&5
+   echo "$as_me:20747: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -20081,10 +20755,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:20084: result: $MV" >&5
+  echo "$as_me:20758: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:20087: result: no" >&5
+  echo "$as_me:20761: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20146,7 +20820,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 20149) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 20823) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -20163,7 +20837,7 @@ for ac_prog in $GZIP gzip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:20166: checking for $ac_word" >&5
+echo "$as_me:20840: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20180,7 +20854,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GZIP="$ac_dir/$ac_word"
-   echo "$as_me:20183: found $ac_dir/$ac_word" >&5
+   echo "$as_me:20857: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -20191,10 +20865,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:20194: result: $GZIP" >&5
+  echo "$as_me:20868: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:20197: result: no" >&5
+  echo "$as_me:20871: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20256,7 +20930,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 20259) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 20933) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -20273,7 +20947,7 @@ for ac_prog in $UNCOMPRESS gunzip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:20276: checking for $ac_word" >&5
+echo "$as_me:20950: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_UNCOMPRESS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20290,7 +20964,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_UNCOMPRESS="$ac_dir/$ac_word"
-   echo "$as_me:20293: found $ac_dir/$ac_word" >&5
+   echo "$as_me:20967: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -20301,10 +20975,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:20304: result: $UNCOMPRESS" >&5
+  echo "$as_me:20978: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:20307: result: no" >&5
+  echo "$as_me:20981: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20366,7 +21040,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 20369) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 21043) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -20383,7 +21057,7 @@ for ac_prog in $UNZIP unzip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:20386: checking for $ac_word" >&5
+echo "$as_me:21060: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_UNZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20400,7 +21074,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_UNZIP="$ac_dir/$ac_word"
-   echo "$as_me:20403: found $ac_dir/$ac_word" >&5
+   echo "$as_me:21077: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -20411,10 +21085,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:20414: result: $UNZIP" >&5
+  echo "$as_me:21088: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:20417: result: no" >&5
+  echo "$as_me:21091: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20476,7 +21150,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 20479) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 21153) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -20493,7 +21167,7 @@ for ac_prog in $BZIP2 bzip2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:20496: checking for $ac_word" >&5
+echo "$as_me:21170: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_BZIP2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20510,7 +21184,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_BZIP2="$ac_dir/$ac_word"
-   echo "$as_me:20513: found $ac_dir/$ac_word" >&5
+   echo "$as_me:21187: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -20521,10 +21195,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:20524: result: $BZIP2" >&5
+  echo "$as_me:21198: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:20527: result: no" >&5
+  echo "$as_me:21201: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20586,7 +21260,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 20589) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 21263) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -20603,7 +21277,7 @@ for ac_prog in $TAR tar pax gtar gnutar bsdtar star
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:20606: checking for $ac_word" >&5
+echo "$as_me:21280: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TAR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20620,7 +21294,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TAR="$ac_dir/$ac_word"
-   echo "$as_me:20623: found $ac_dir/$ac_word" >&5
+   echo "$as_me:21297: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -20631,10 +21305,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:20634: result: $TAR" >&5
+  echo "$as_me:21308: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:20637: result: no" >&5
+  echo "$as_me:21311: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20696,7 +21370,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 20699) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 21373) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -20709,19 +21383,19 @@ EOF
 fi
 
 case $TAR in
-*pax)
+*pax|*pax$EXEEXT)
 	TAR_UP_OPTIONS="-w"
 	TAR_DOWN_OPTIONS="-r"
 	TAR_PIPE_OPTIONS=""
 	TAR_FILE_OPTIONS="-f"
 	;;
-*star)
+*star|*star$EXEEXT)
 	TAR_UP_OPTIONS="-c -f"
 	TAR_DOWN_OPTIONS="-x -U -f"
 	TAR_PIPE_OPTIONS="-"
 	TAR_FILE_OPTIONS=""
 	;;
-*tar)
+*tar|*tar$EXEEXT)
 	# FIXME: some versions of tar require, some don't allow the "-"
 	TAR_UP_OPTIONS="-cf"
 	TAR_DOWN_OPTIONS="-xf"
@@ -20753,7 +21427,7 @@ for ac_prog in $COMPRESS compress
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:20756: checking for $ac_word" >&5
+echo "$as_me:21430: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_COMPRESS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20770,7 +21444,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_COMPRESS="$ac_dir/$ac_word"
-   echo "$as_me:20773: found $ac_dir/$ac_word" >&5
+   echo "$as_me:21447: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -20781,10 +21455,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:20784: result: $COMPRESS" >&5
+  echo "$as_me:21458: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:20787: result: no" >&5
+  echo "$as_me:21461: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20846,7 +21520,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 20849) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 21523) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -20863,7 +21537,7 @@ for ac_prog in $RM rm
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:20866: checking for $ac_word" >&5
+echo "$as_me:21540: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_RM+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20880,7 +21554,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_RM="$ac_dir/$ac_word"
-   echo "$as_me:20883: found $ac_dir/$ac_word" >&5
+   echo "$as_me:21557: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -20891,10 +21565,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:20894: result: $RM" >&5
+  echo "$as_me:21568: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:20897: result: no" >&5
+  echo "$as_me:21571: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20956,7 +21630,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 20959) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 21633) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -20973,7 +21647,7 @@ for ac_prog in $UUDECODE uudecode
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:20976: checking for $ac_word" >&5
+echo "$as_me:21650: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_UUDECODE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20990,7 +21664,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_UUDECODE="$ac_dir/$ac_word"
-   echo "$as_me:20993: found $ac_dir/$ac_word" >&5
+   echo "$as_me:21667: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -21001,10 +21675,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:21004: result: $UUDECODE" >&5
+  echo "$as_me:21678: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:21007: result: no" >&5
+  echo "$as_me:21681: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -21066,7 +21740,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 21069) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 21743) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -21083,7 +21757,7 @@ for ac_prog in $ZCAT zcat
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:21086: checking for $ac_word" >&5
+echo "$as_me:21760: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ZCAT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21100,7 +21774,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ZCAT="$ac_dir/$ac_word"
-   echo "$as_me:21103: found $ac_dir/$ac_word" >&5
+   echo "$as_me:21777: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -21111,10 +21785,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:21114: result: $ZCAT" >&5
+  echo "$as_me:21788: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:21117: result: no" >&5
+  echo "$as_me:21791: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -21176,7 +21850,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 21179) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 21853) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -21193,7 +21867,7 @@ for ac_prog in $ZIP zip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:21196: checking for $ac_word" >&5
+echo "$as_me:21870: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21210,7 +21884,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ZIP="$ac_dir/$ac_word"
-   echo "$as_me:21213: found $ac_dir/$ac_word" >&5
+   echo "$as_me:21887: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -21221,10 +21895,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:21224: result: $ZIP" >&5
+  echo "$as_me:21898: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:21227: result: no" >&5
+  echo "$as_me:21901: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -21286,7 +21960,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 21289) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 21963) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -21313,7 +21987,7 @@ for ac_prog in $INSTALL install
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:21316: checking for $ac_word" >&5
+echo "$as_me:21990: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_INSTALL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21330,7 +22004,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INSTALL="$ac_dir/$ac_word"
-   echo "$as_me:21333: found $ac_dir/$ac_word" >&5
+   echo "$as_me:22007: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -21341,10 +22015,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:21344: result: $INSTALL" >&5
+  echo "$as_me:22018: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:21347: result: no" >&5
+  echo "$as_me:22021: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -21406,7 +22080,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 21409) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 22083) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -21432,7 +22106,7 @@ fi
 
 if test $cf_cv_screen = pdcurses ; then
 
-	echo "$as_me:21435: checking for X" >&5
+	echo "$as_me:22109: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -21529,17 +22203,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
-#line 21532 "configure"
+#line 22206 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:21536: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:22210: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:21542: \$? = $ac_status" >&5
+  echo "$as_me:22216: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21572,7 +22246,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 21575 "configure"
+#line 22249 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -21584,16 +22258,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21587: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22261: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21590: \$? = $ac_status" >&5
+  echo "$as_me:22264: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21593: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21596: \$? = $ac_status" >&5
+  echo "$as_me:22270: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -21631,7 +22305,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:21634: result: $have_x" >&5
+  echo "$as_me:22308: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -21641,7 +22315,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:21644: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:22318: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -21665,11 +22339,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:21668: checking whether -R must be followed by a space" >&5
+      echo "$as_me:22342: checking whether -R must be followed by a space" >&5
 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
       cat >conftest.$ac_ext <<_ACEOF
-#line 21672 "configure"
+#line 22346 "configure"
 #include "confdefs.h"
 
 int
@@ -21681,16 +22355,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21684: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22358: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21687: \$? = $ac_status" >&5
+  echo "$as_me:22361: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22364: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21693: \$? = $ac_status" >&5
+  echo "$as_me:22367: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -21700,13 +22374,13 @@ ac_R_nospace=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       if test $ac_R_nospace = yes; then
-	echo "$as_me:21703: result: no" >&5
+	echo "$as_me:22377: result: no" >&5
 echo "${ECHO_T}no" >&6
 	X_LIBS="$X_LIBS -R$x_libraries"
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21709 "configure"
+#line 22383 "configure"
 #include "confdefs.h"
 
 int
@@ -21718,16 +22392,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21721: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22395: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21724: \$? = $ac_status" >&5
+  echo "$as_me:22398: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21727: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22401: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21730: \$? = $ac_status" >&5
+  echo "$as_me:22404: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -21737,11 +22411,11 @@ ac_R_space=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	if test $ac_R_space = yes; then
-	  echo "$as_me:21740: result: yes" >&5
+	  echo "$as_me:22414: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:21744: result: neither works" >&5
+	  echo "$as_me:22418: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -21761,7 +22435,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >conftest.$ac_ext <<_ACEOF
-#line 21764 "configure"
+#line 22438 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21780,22 +22454,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21783: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22457: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21786: \$? = $ac_status" >&5
+  echo "$as_me:22460: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21789: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22463: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21792: \$? = $ac_status" >&5
+  echo "$as_me:22466: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:21798: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:22472: checking for dnet_ntoa in -ldnet" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21803,7 +22477,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21806 "configure"
+#line 22480 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21822,16 +22496,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21825: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22499: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21828: \$? = $ac_status" >&5
+  echo "$as_me:22502: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22505: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21834: \$? = $ac_status" >&5
+  echo "$as_me:22508: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -21842,14 +22516,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21845: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:22519: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo "$as_me:21852: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:22526: checking for dnet_ntoa in -ldnet_stub" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21857,7 +22531,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21860 "configure"
+#line 22534 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21876,16 +22550,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21879: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22553: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21882: \$? = $ac_status" >&5
+  echo "$as_me:22556: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21888: \$? = $ac_status" >&5
+  echo "$as_me:22562: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -21896,7 +22570,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21899: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:22573: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
@@ -21915,13 +22589,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:21918: checking for gethostbyname" >&5
+    echo "$as_me:22592: checking for gethostbyname" >&5
 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21924 "configure"
+#line 22598 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -21952,16 +22626,16 @@ f = gethostbyname;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21955: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22629: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21958: \$? = $ac_status" >&5
+  echo "$as_me:22632: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21964: \$? = $ac_status" >&5
+  echo "$as_me:22638: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -21971,11 +22645,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21974: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:22648: result: $ac_cv_func_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then
-      echo "$as_me:21978: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:22652: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21983,7 +22657,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21986 "configure"
+#line 22660 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22002,16 +22676,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22005: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22679: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22008: \$? = $ac_status" >&5
+  echo "$as_me:22682: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22011: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22685: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22014: \$? = $ac_status" >&5
+  echo "$as_me:22688: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -22022,14 +22696,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22025: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:22699: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-        echo "$as_me:22032: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:22706: checking for gethostbyname in -lbsd" >&5
 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22037,7 +22711,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22040 "configure"
+#line 22714 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22056,16 +22730,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22059: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22733: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22062: \$? = $ac_status" >&5
+  echo "$as_me:22736: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22739: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22068: \$? = $ac_status" >&5
+  echo "$as_me:22742: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -22076,7 +22750,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22079: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:22753: result: $ac_cv_lib_bsd_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
 if test $ac_cv_lib_bsd_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
@@ -22092,13 +22766,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:22095: checking for connect" >&5
+    echo "$as_me:22769: checking for connect" >&5
 echo $ECHO_N "checking for connect... $ECHO_C" >&6
 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22101 "configure"
+#line 22775 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -22129,16 +22803,16 @@ f = connect;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22132: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22806: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22135: \$? = $ac_status" >&5
+  echo "$as_me:22809: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22138: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22141: \$? = $ac_status" >&5
+  echo "$as_me:22815: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -22148,11 +22822,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22151: result: $ac_cv_func_connect" >&5
+echo "$as_me:22825: result: $ac_cv_func_connect" >&5
 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then
-      echo "$as_me:22155: checking for connect in -lsocket" >&5
+      echo "$as_me:22829: checking for connect in -lsocket" >&5
 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22160,7 +22834,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22163 "configure"
+#line 22837 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22179,16 +22853,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22182: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22856: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22185: \$? = $ac_status" >&5
+  echo "$as_me:22859: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22188: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22862: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22191: \$? = $ac_status" >&5
+  echo "$as_me:22865: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -22199,7 +22873,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22202: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:22876: result: $ac_cv_lib_socket_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 if test $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
@@ -22208,13 +22882,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:22211: checking for remove" >&5
+    echo "$as_me:22885: checking for remove" >&5
 echo $ECHO_N "checking for remove... $ECHO_C" >&6
 if test "${ac_cv_func_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22217 "configure"
+#line 22891 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -22245,16 +22919,16 @@ f = remove;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22248: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22922: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22251: \$? = $ac_status" >&5
+  echo "$as_me:22925: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22257: \$? = $ac_status" >&5
+  echo "$as_me:22931: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -22264,11 +22938,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22267: result: $ac_cv_func_remove" >&5
+echo "$as_me:22941: result: $ac_cv_func_remove" >&5
 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then
-      echo "$as_me:22271: checking for remove in -lposix" >&5
+      echo "$as_me:22945: checking for remove in -lposix" >&5
 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
 if test "${ac_cv_lib_posix_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22276,7 +22950,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22279 "configure"
+#line 22953 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22295,16 +22969,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22298: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22972: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22301: \$? = $ac_status" >&5
+  echo "$as_me:22975: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22978: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22307: \$? = $ac_status" >&5
+  echo "$as_me:22981: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -22315,7 +22989,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22318: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:22992: result: $ac_cv_lib_posix_remove" >&5
 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
 if test $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
@@ -22324,13 +22998,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:22327: checking for shmat" >&5
+    echo "$as_me:23001: checking for shmat" >&5
 echo $ECHO_N "checking for shmat... $ECHO_C" >&6
 if test "${ac_cv_func_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22333 "configure"
+#line 23007 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -22361,16 +23035,16 @@ f = shmat;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22364: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23038: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22367: \$? = $ac_status" >&5
+  echo "$as_me:23041: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23044: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22373: \$? = $ac_status" >&5
+  echo "$as_me:23047: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -22380,11 +23054,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22383: result: $ac_cv_func_shmat" >&5
+echo "$as_me:23057: result: $ac_cv_func_shmat" >&5
 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then
-      echo "$as_me:22387: checking for shmat in -lipc" >&5
+      echo "$as_me:23061: checking for shmat in -lipc" >&5
 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22392,7 +23066,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22395 "configure"
+#line 23069 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22411,16 +23085,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22414: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23088: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22417: \$? = $ac_status" >&5
+  echo "$as_me:23091: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22420: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23094: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22423: \$? = $ac_status" >&5
+  echo "$as_me:23097: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -22431,7 +23105,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22434: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:23108: result: $ac_cv_lib_ipc_shmat" >&5
 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
 if test $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
@@ -22449,7 +23123,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:22452: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:23126: checking for IceConnectionNumber in -lICE" >&5
 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22457,7 +23131,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22460 "configure"
+#line 23134 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22476,16 +23150,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22479: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23153: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22482: \$? = $ac_status" >&5
+  echo "$as_me:23156: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22485: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23159: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22488: \$? = $ac_status" >&5
+  echo "$as_me:23162: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -22496,7 +23170,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22499: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:23173: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
@@ -22590,7 +23264,7 @@ fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 22593 "configure"
+#line 23267 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22602,16 +23276,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22605: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23279: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22608: \$? = $ac_status" >&5
+  echo "$as_me:23282: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22614: \$? = $ac_status" >&5
+  echo "$as_me:23288: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22628,13 +23302,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:22631: checking for XOpenDisplay" >&5
+echo "$as_me:23305: checking for XOpenDisplay" >&5
 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
 if test "${ac_cv_func_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22637 "configure"
+#line 23311 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -22665,16 +23339,16 @@ f = XOpenDisplay;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22668: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23342: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22671: \$? = $ac_status" >&5
+  echo "$as_me:23345: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22674: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22677: \$? = $ac_status" >&5
+  echo "$as_me:23351: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -22684,13 +23358,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22687: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:23361: result: $ac_cv_func_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
 if test $ac_cv_func_XOpenDisplay = yes; then
   :
 else
 
-echo "$as_me:22693: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:23367: checking for XOpenDisplay in -lX11" >&5
 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22698,7 +23372,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22701 "configure"
+#line 23375 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22717,16 +23391,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22720: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23394: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22723: \$? = $ac_status" >&5
+  echo "$as_me:23397: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23400: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22729: \$? = $ac_status" >&5
+  echo "$as_me:23403: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -22737,7 +23411,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22740: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:23414: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   LIBS="-lX11 $LIBS"
@@ -22745,13 +23419,13 @@ fi
 
 fi
 
-echo "$as_me:22748: checking for XtAppInitialize" >&5
+echo "$as_me:23422: checking for XtAppInitialize" >&5
 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
 if test "${ac_cv_func_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22754 "configure"
+#line 23428 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -22782,16 +23456,16 @@ f = XtAppInitialize;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22785: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23459: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22788: \$? = $ac_status" >&5
+  echo "$as_me:23462: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22791: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23465: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22794: \$? = $ac_status" >&5
+  echo "$as_me:23468: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -22801,13 +23475,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22804: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:23478: result: $ac_cv_func_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
 if test $ac_cv_func_XtAppInitialize = yes; then
   :
 else
 
-echo "$as_me:22810: checking for XtAppInitialize in -lXt" >&5
+echo "$as_me:23484: checking for XtAppInitialize in -lXt" >&5
 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22815,7 +23489,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22818 "configure"
+#line 23492 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22834,16 +23508,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22837: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23511: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22840: \$? = $ac_status" >&5
+  echo "$as_me:23514: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23517: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22846: \$? = $ac_status" >&5
+  echo "$as_me:23520: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -22854,7 +23528,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22857: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:23531: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
 if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
   cat >>confdefs.h <<\EOF
@@ -22868,7 +23542,7 @@ fi
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:22871: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:23545: WARNING: Unable to successfully link X Toolkit library (-lXt) with
 test program.  You will have to check and add the proper libraries by hand
 to makefile." >&5
 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
@@ -22878,7 +23552,7 @@ fi
 
 cf_x_athena=${cf_x_athena-Xaw}
 
-echo "$as_me:22881: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:23555: checking if you want to link with Xaw 3d library" >&5
 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
 withval=
 
@@ -22889,14 +23563,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:22892: result: yes" >&5
+	echo "$as_me:23566: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:22895: result: no" >&5
+	echo "$as_me:23569: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:22899: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:23573: checking if you want to link with neXT Athena library" >&5
 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
 withval=
 
@@ -22907,14 +23581,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:22910: result: yes" >&5
+	echo "$as_me:23584: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:22913: result: no" >&5
+	echo "$as_me:23587: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:22917: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:23591: checking if you want to link with Athena-Plus library" >&5
 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
 withval=
 
@@ -22925,14 +23599,14 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:22928: result: yes" >&5
+	echo "$as_me:23602: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:22931: result: no" >&5
+	echo "$as_me:23605: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:22935: checking for XextCreateExtension in -lXext" >&5
+echo "$as_me:23609: checking for XextCreateExtension in -lXext" >&5
 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22940,7 +23614,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22943 "configure"
+#line 23617 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22959,16 +23633,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22962: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23636: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22965: \$? = $ac_status" >&5
+  echo "$as_me:23639: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22971: \$? = $ac_status" >&5
+  echo "$as_me:23645: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -22979,7 +23653,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22982: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:23656: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
   LIBS="-lXext $LIBS"
@@ -23001,14 +23675,14 @@ do
 		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
 		if test $cf_path != default ; then
 			CPPFLAGS="-I$cf_path/include $cf_save"
-			echo "$as_me:23004: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:23678: checking for $cf_test in $cf_path" >&5
 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
 		else
-			echo "$as_me:23007: checking for $cf_test" >&5
+			echo "$as_me:23681: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 23011 "configure"
+#line 23685 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -23022,16 +23696,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23025: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23699: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23028: \$? = $ac_status" >&5
+  echo "$as_me:23702: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23705: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23034: \$? = $ac_status" >&5
+  echo "$as_me:23708: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -23040,7 +23714,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:23043: result: $cf_result" >&5
+		echo "$as_me:23717: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_include=$cf_path
@@ -23052,7 +23726,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_include" ; then
-	{ echo "$as_me:23055: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:23729: WARNING: Unable to successfully find Athena header files with test program" >&5
 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
 elif test "$cf_x_athena_include" != default ; then
 	CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include"
@@ -23077,17 +23751,17 @@ do
 			cf_test=XawSimpleMenuAddGlobalActions
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
-				echo "$as_me:23080: checking for $cf_lib in $cf_path" >&5
+				echo "$as_me:23754: checking for $cf_lib in $cf_path" >&5
 echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6
 			else
 				LIBS="$cf_lib $LIBS"
-				echo "$as_me:23084: checking for $cf_test in $cf_lib" >&5
+				echo "$as_me:23758: checking for $cf_test in $cf_lib" >&5
 echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6
 			fi
 			cf_SAVE="$LIBS"
 			LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 23090 "configure"
+#line 23764 "configure"
 #include "confdefs.h"
 
 int
@@ -23099,16 +23773,16 @@ $cf_test()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23102: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23776: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23105: \$? = $ac_status" >&5
+  echo "$as_me:23779: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23108: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23111: \$? = $ac_status" >&5
+  echo "$as_me:23785: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -23117,7 +23791,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:23120: result: $cf_result" >&5
+			echo "$as_me:23794: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_lib"
@@ -23131,7 +23805,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:23134: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:23808: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -23222,7 +23896,7 @@ fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 23225 "configure"
+#line 23899 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23234,16 +23908,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23237: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23911: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23240: \$? = $ac_status" >&5
+  echo "$as_me:23914: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23917: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23246: \$? = $ac_status" >&5
+  echo "$as_me:23920: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -23260,7 +23934,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:23263: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:23937: checking for XOpenDisplay in -lX11" >&5
 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23268,7 +23942,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23271 "configure"
+#line 23945 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23287,16 +23961,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23290: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23964: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23293: \$? = $ac_status" >&5
+  echo "$as_me:23967: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23296: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23299: \$? = $ac_status" >&5
+  echo "$as_me:23973: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -23307,13 +23981,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23310: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:23984: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   LIBS="-lX11 $LIBS"
 fi
 
-echo "$as_me:23316: checking for XCurses library" >&5
+echo "$as_me:23990: checking for XCurses library" >&5
 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
 if test "${cf_cv_lib_XCurses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23321,7 +23995,7 @@ else
 
 LIBS="-lXCurses $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23324 "configure"
+#line 23998 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -23336,16 +24010,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23339: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24013: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23342: \$? = $ac_status" >&5
+  echo "$as_me:24016: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23345: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24019: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23348: \$? = $ac_status" >&5
+  echo "$as_me:24022: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -23356,7 +24030,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:23359: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:24033: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 if test $cf_cv_lib_XCurses = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -23372,14 +24046,14 @@ EOF
 EOF
 
 else
-	{ { echo "$as_me:23375: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:24049: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 else
 
-echo "$as_me:23382: checking if we can include termio.h with curses" >&5
+echo "$as_me:24056: checking if we can include termio.h with curses" >&5
 echo $ECHO_N "checking if we can include termio.h with curses... $ECHO_C" >&6
 if test "${cf_cv_termio_and_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23389,7 +24063,7 @@ else
     CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H -I. -I${srcdir-.} -I${srcdir-.}/src -I${srcdir-.}/WWW/Library/Implementation"
     touch lynx_cfg.h
     cat >conftest.$ac_ext <<_ACEOF
-#line 23392 "configure"
+#line 24066 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -23403,16 +24077,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23406: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24080: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23409: \$? = $ac_status" >&5
+  echo "$as_me:24083: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23415: \$? = $ac_status" >&5
+  echo "$as_me:24089: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -23425,7 +24099,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:23428: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:24102: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test $cf_cv_termio_and_curses = yes && cat >>confdefs.h <<\EOF
@@ -23440,23 +24114,23 @@ if test $cf_cv_screen != slang ; then
 for ac_header in $cf_cv_screen/term.h term.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23443: checking for $ac_header" >&5
+echo "$as_me:24117: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23449 "configure"
+#line 24123 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23453: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:24127: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23459: \$? = $ac_status" >&5
+  echo "$as_me:24133: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23475,7 +24149,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:23478: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:24152: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -23485,7 +24159,7 @@ EOF
 fi
 done
 
-echo "$as_me:23488: checking if curses supports alternate-character set" >&5
+echo "$as_me:24162: checking if curses supports alternate-character set" >&5
 echo $ECHO_N "checking if curses supports alternate-character set... $ECHO_C" >&6
 if test "${cf_cv_alt_char_set+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23494,7 +24168,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23497 "configure"
+#line 24171 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -23508,16 +24182,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23511: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24185: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23514: \$? = $ac_status" >&5
+  echo "$as_me:24188: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24191: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23520: \$? = $ac_status" >&5
+  echo "$as_me:24194: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -23531,20 +24205,20 @@ done
 
 fi
 
-echo "$as_me:23534: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:24208: result: $cf_cv_alt_char_set" >&5
 echo "${ECHO_T}$cf_cv_alt_char_set" >&6
 test $cf_cv_alt_char_set != no && cat >>confdefs.h <<EOF
 #define ALT_CHAR_SET $cf_cv_alt_char_set
 EOF
 
-echo "$as_me:23540: checking if curses supports fancy attributes" >&5
+echo "$as_me:24214: checking if curses supports fancy attributes" >&5
 echo $ECHO_N "checking if curses supports fancy attributes... $ECHO_C" >&6
 if test "${cf_cv_fancy_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23547 "configure"
+#line 24221 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -23562,16 +24236,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23565: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24239: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23568: \$? = $ac_status" >&5
+  echo "$as_me:24242: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23571: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23574: \$? = $ac_status" >&5
+  echo "$as_me:24248: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -23583,13 +24257,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:23586: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:24260: result: $cf_cv_fancy_curses" >&5
 echo "${ECHO_T}$cf_cv_fancy_curses" >&6
 test $cf_cv_fancy_curses = yes && cat >>confdefs.h <<\EOF
 #define FANCY_CURSES 1
 EOF
 
-echo "$as_me:23592: checking for function curses_version" >&5
+echo "$as_me:24266: checking for function curses_version" >&5
 echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
 if test "${cf_cv_func_curses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23599,7 +24273,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23602 "configure"
+#line 24276 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -23612,15 +24286,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:23615: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24289: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23618: \$? = $ac_status" >&5
+  echo "$as_me:24292: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:23620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24294: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23623: \$? = $ac_status" >&5
+  echo "$as_me:24297: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -23635,21 +24309,21 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
-echo "$as_me:23638: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:24312: result: $cf_cv_func_curses_version" >&5
 echo "${ECHO_T}$cf_cv_func_curses_version" >&6
 test "$cf_cv_func_curses_version" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_CURSES_VERSION 1
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:23645: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:24319: checking for obsolete/broken version of ncurses" >&5
 echo $ECHO_N "checking for obsolete/broken version of ncurses... $ECHO_C" >&6
 if test "${cf_cv_ncurses_broken+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 23652 "configure"
+#line 24326 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -23668,16 +24342,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23671: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24345: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23674: \$? = $ac_status" >&5
+  echo "$as_me:24348: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23677: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23680: \$? = $ac_status" >&5
+  echo "$as_me:24354: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -23689,10 +24363,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:23692: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:24366: result: $cf_cv_ncurses_broken" >&5
 echo "${ECHO_T}$cf_cv_ncurses_broken" >&6
 if test "$cf_cv_ncurses_broken" = yes ; then
-	{ echo "$as_me:23695: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:24369: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
 echo "$as_me: WARNING: hmm... you should get an up-to-date version of ncurses" >&2;}
 	cat >>confdefs.h <<\EOF
 #define NCURSES_BROKEN 1
@@ -23701,14 +24375,14 @@ EOF
 fi
 fi
 
-echo "$as_me:23704: checking if curses supports color attributes" >&5
+echo "$as_me:24378: checking if curses supports color attributes" >&5
 echo $ECHO_N "checking if curses supports color attributes... $ECHO_C" >&6
 if test "${cf_cv_color_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23711 "configure"
+#line 24385 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -23728,16 +24402,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23731: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24405: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23734: \$? = $ac_status" >&5
+  echo "$as_me:24408: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23737: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23740: \$? = $ac_status" >&5
+  echo "$as_me:24414: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -23749,7 +24423,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:23752: result: $cf_cv_color_curses" >&5
+echo "$as_me:24426: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test $cf_cv_color_curses = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -23769,23 +24443,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23772: checking for $ac_header" >&5
+echo "$as_me:24446: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23778 "configure"
+#line 24452 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23782: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:24456: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23788: \$? = $ac_status" >&5
+  echo "$as_me:24462: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23804,7 +24478,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:23807: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:24481: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -23819,23 +24493,23 @@ if test "$ISC" = yes ; then
 for ac_header in sys/termio.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23822: checking for $ac_header" >&5
+echo "$as_me:24496: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23828 "configure"
+#line 24502 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23832: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:24506: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23838: \$? = $ac_status" >&5
+  echo "$as_me:24512: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23854,7 +24528,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:23857: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:24531: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -23872,10 +24546,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:23875: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:24549: checking whether termios.h needs _POSIX_SOURCE" >&5
 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23878 "configure"
+#line 24552 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -23887,16 +24561,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23890: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24564: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23893: \$? = $ac_status" >&5
+  echo "$as_me:24567: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23899: \$? = $ac_status" >&5
+  echo "$as_me:24573: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -23904,7 +24578,7 @@ else
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 23907 "configure"
+#line 24581 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -23918,16 +24592,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23921: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24595: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23924: \$? = $ac_status" >&5
+  echo "$as_me:24598: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23927: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24601: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23930: \$? = $ac_status" >&5
+  echo "$as_me:24604: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -23942,12 +24616,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:23945: result: $termios_bad" >&5
+	echo "$as_me:24619: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:23950: checking declaration of size-change" >&5
+echo "$as_me:24624: checking declaration of size-change" >&5
 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
 if test "${cf_cv_sizechange+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23962,7 +24636,7 @@ do
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat >conftest.$ac_ext <<_ACEOF
-#line 23965 "configure"
+#line 24639 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -24006,16 +24680,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24009: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24683: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24012: \$? = $ac_status" >&5
+  echo "$as_me:24686: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24015: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24018: \$? = $ac_status" >&5
+  echo "$as_me:24692: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -24034,7 +24708,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:24037: result: $cf_cv_sizechange" >&5
+echo "$as_me:24711: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 	cat >>confdefs.h <<\EOF
@@ -24051,14 +24725,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:24054: checking if ttytype is declared in curses library" >&5
+echo "$as_me:24728: checking if ttytype is declared in curses library" >&5
 echo $ECHO_N "checking if ttytype is declared in curses library... $ECHO_C" >&6
 if test "${cf_cv_have_ttytype+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 24061 "configure"
+#line 24735 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -24070,16 +24744,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24073: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24747: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24076: \$? = $ac_status" >&5
+  echo "$as_me:24750: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24753: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24082: \$? = $ac_status" >&5
+  echo "$as_me:24756: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -24091,20 +24765,20 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:24094: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:24768: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test $cf_cv_have_ttytype = yes && cat >>confdefs.h <<\EOF
 #define HAVE_TTYTYPE 1
 EOF
 
-echo "$as_me:24100: checking if curses supports wide characters" >&5
+echo "$as_me:24774: checking if curses supports wide characters" >&5
 echo $ECHO_N "checking if curses supports wide characters... $ECHO_C" >&6
 if test "${cf_cv_widec_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 24107 "configure"
+#line 24781 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -24123,16 +24797,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24126: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24800: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24129: \$? = $ac_status" >&5
+  echo "$as_me:24803: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24806: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24135: \$? = $ac_status" >&5
+  echo "$as_me:24809: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -24143,7 +24817,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:24146: result: $cf_cv_widec_curses" >&5
+echo "$as_me:24820: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -24152,14 +24826,14 @@ if test "$cf_cv_widec_curses" = yes ; then
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:24155: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:24829: checking if we must include wchar.h to declare mbstate_t" >&5
 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
 if test "${cf_cv_widec_mbstate+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 24162 "configure"
+#line 24836 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -24173,23 +24847,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24176: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24850: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24179: \$? = $ac_status" >&5
+  echo "$as_me:24853: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24856: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24185: \$? = $ac_status" >&5
+  echo "$as_me:24859: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 24192 "configure"
+#line 24866 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -24204,16 +24878,16 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24207: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24881: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24210: \$? = $ac_status" >&5
+  echo "$as_me:24884: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24216: \$? = $ac_status" >&5
+  echo "$as_me:24890: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -24225,7 +24899,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24228: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:24902: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -24244,14 +24918,14 @@ fi
 
 fi
 
-echo "$as_me:24247: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:24921: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
 if test "${cf_cv_need_xopen_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 24254 "configure"
+#line 24928 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -24268,23 +24942,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24271: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24945: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24274: \$? = $ac_status" >&5
+  echo "$as_me:24948: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24277: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24951: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24280: \$? = $ac_status" >&5
+  echo "$as_me:24954: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 24287 "configure"
+#line 24961 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -24302,16 +24976,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24305: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24979: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24308: \$? = $ac_status" >&5
+  echo "$as_me:24982: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24314: \$? = $ac_status" >&5
+  echo "$as_me:24988: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
@@ -24323,11 +24997,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24326: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:25000: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 
-echo "$as_me:24330: checking for term.h" >&5
+echo "$as_me:25004: checking for term.h" >&5
 echo $ECHO_N "checking for term.h... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24340,7 +25014,7 @@ for cf_header in \
 	term.h
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 24343 "configure"
+#line 25017 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -24354,16 +25028,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24357: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25031: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24360: \$? = $ac_status" >&5
+  echo "$as_me:25034: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25037: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24366: \$? = $ac_status" >&5
+  echo "$as_me:25040: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -24376,7 +25050,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:24379: result: $cf_cv_term_header" >&5
+echo "$as_me:25053: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
@@ -24426,10 +25100,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:24429: checking for ${cf_func}" >&5
+	echo "$as_me:25103: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "(line 24432) testing ${cf_func} ..." 1>&5
+echo "(line 25106) testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24438,7 +25112,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 24441 "configure"
+#line 25115 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -24472,16 +25146,16 @@ exit(foo == 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24475: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25149: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24478: \$? = $ac_status" >&5
+  echo "$as_me:25152: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25155: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24484: \$? = $ac_status" >&5
+  echo "$as_me:25158: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -24497,7 +25171,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:24500: result: $cf_result" >&5
+	echo "$as_me:25174: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -24511,12 +25185,12 @@ fi
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:24514: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:25188: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 	if test $cf_cv_screen = slang ; then
-		{ { echo "$as_me:24519: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:25193: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -24524,7 +25198,7 @@ fi
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:24527: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:25201: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 		cat >>confdefs.h <<\EOF
@@ -24629,7 +25303,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:24632: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:25306: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -24805,7 +25479,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:24808: error: ambiguous option: $1
+    { { echo "$as_me:25482: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -24824,7 +25498,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:24827: error: unrecognized option: $1
+  -*) { { echo "$as_me:25501: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -24877,7 +25551,7 @@ do
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "$CONFIG_H" ) CONFIG_HEADERS="$CONFIG_HEADERS $CONFIG_H:config.hin" ;;
-  *) { { echo "$as_me:24880: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:25554: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -25187,7 +25861,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:25190: creating $ac_file" >&5
+    { echo "$as_me:25864: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -25205,7 +25879,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:25208: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:25882: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -25218,7 +25892,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:25221: error: cannot find input file: $f" >&5
+           { { echo "$as_me:25895: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -25284,7 +25958,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:25287: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:25961: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -25295,7 +25969,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:25298: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:25972: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -25308,7 +25982,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:25311: error: cannot find input file: $f" >&5
+           { { echo "$as_me:25985: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -25426,7 +26100,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:25429: $ac_file is unchanged" >&5
+      { echo "$as_me:26103: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/configure.in b/configure.in
index 22152be2..b48723d1 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
 dnl
 dnl ask PRCS to plug-in the project-version for the configure-script.
 dnl $Format: "AC_REVISION($ProjectVersion$)"$
-AC_REVISION(2.8.6dev.13)
+AC_REVISION(2.8.6dev.14)
 
 # Save the original $CFLAGS so we can distinguish whether the user set those
 # in the environment, or whether autoconf added -O and -g options:
@@ -37,7 +37,7 @@ AC_ARG_WITH(system-type,
 PACKAGE=lynx
 dnl ask PRCS to plug-in the project-version for the packages.
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.6dev.13
+VERSION=2.8.6dev.14
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 AC_SUBST(DESTDIR)
@@ -318,6 +318,8 @@ dnl --------------------------------------------------------------------------
 CF_HELP_MESSAGE(
 Basic Configuration Options:)
 
+CF_LARGEFILE
+
 dnl internationalization macros
 CF_BUNDLED_INTL(makefile,disable)
 
@@ -369,7 +371,7 @@ dnl --------------------------------------------------------------------------
 ### are used in a lot of places.
 AC_CACHE_CHECK(if you want ssl library,cf_cv_use_libssl,[
 AC_ARG_WITH(ssl,
-	[  --with-ssl[=path]       link with ssl library if available],
+	[  --with-ssl{=path}       link with ssl library if available],
 	[cf_cv_use_libssl=$withval],
 	[cf_cv_use_libssl=no])
 ])
@@ -377,7 +379,7 @@ AC_ARG_WITH(ssl,
 if test "x$cf_cv_use_libssl" = "xno" ; then
 AC_CACHE_CHECK(if you want experimental gnutls support,cf_cv_use_libgnutls,[
 AC_ARG_WITH(gnutls,
-	[  --with-gnutls[=path]    link with experimental gnutls support],
+	[  --with-gnutls{=path}    link with experimental gnutls support],
 	[cf_cv_use_libgnutls=$withval],
 	[cf_cv_use_libgnutls=no])
 ])
@@ -385,14 +387,14 @@ fi
 
 AC_CACHE_CHECK(if you want socks library,cf_cv_use_libsocks,[
 AC_ARG_WITH(socks,
-	[  --with-socks[=path]     link with socks library if available],
+	[  --with-socks{=path}     link with socks library if available],
 	[cf_cv_use_libsocks=$withval],
 	[cf_cv_use_libsocks=no])
 ])
 
 AC_CACHE_CHECK(if you want socks5 library,cf_cv_use_libsocks5,[
 AC_ARG_WITH(socks5,
-	[  --with-socks5[=path]    link with socks5 library if available],
+	[  --with-socks5{=path}    link with socks5 library if available],
 	[cf_cv_use_libsocks5=$withval],
 	[cf_cv_use_libsocks5=no])
 ])
diff --git a/docs/CMU.announce b/docs/CMU.announce
deleted file mode 100644
index a4cc6ead..00000000
--- a/docs/CMU.announce
+++ /dev/null
@@ -1,31 +0,0 @@
-This document describes the required steps to install Lynx on VMS systems
-which use the CMU TCP/IP package.
-
-The interface to CMU is implemented via Mike O'Malley's excellent LIBCMU socket
-library for VMS.  It is not included in the Lynx distribution as it is quite
-large and freely available from:
-	ftp://kermit.columbia.edu/vms-libcmu/ckvlcmu.hex
-
-This is a hexified version of the LIBCMU.BCK saveset.
-
-All LIBCMU files (library and include files) are assumed to be in the
-CMUIP_ROOT:[SYSLIB] directory.  Ensure the following LIBCMU files are
-placed appropriately on your system:
-
-	cmuip_root:[syslib]ioctl.h
-	cmuip_root:[syslib]libcmu.olb
-
-Beyond this, follow the same INSTALLATION procedures that you would for any
-VMS Lynx compilation.
-
-REMAINING PROBLEMS:
-	At this time, the FTP Lynx code does not appear to work; it is believed
-	that this problem is due to an as of yet unresolved problem with the
-	LIBCMU 1.2 library.  The getsockname routine returns all zeros for the
-	local address portion and results in the system sending an invalid
-	PORT command to the remote end.
-
-	Telnet, tn3270 and rlogin support are not yet implemented.
-
-Andy Harper
-A.Harper@bay.cc.kcl.ac.uk
diff --git a/install.sh b/install.sh
index 9f59f0be..462fa9c3 100755
--- a/install.sh
+++ b/install.sh
@@ -1,19 +1,37 @@
 #! /bin/sh
 #
 # install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
 #
-# Copyright 1991 by the Massachusetts Institute of Technology
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
 #
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it
@@ -56,7 +74,7 @@ dir_arg=""
 
 while [ x"$1" != x ]; do
     case $1 in
-	-c) instcmd="$cpprog"
+	-c) instcmd=$cpprog
 	    shift
 	    continue;;
 
@@ -79,7 +97,7 @@ while [ x"$1" != x ]; do
 	    shift
 	    continue;;
 
-	-s) stripcmd="$stripprog"
+	-s) stripcmd=$stripprog
 	    shift
 	    continue;;
 
@@ -106,7 +124,7 @@ done
 
 if [ x"$src" = x ]
 then
-	echo "install:	no input file specified"
+	echo "$0: no input file specified" >&2
 	exit 1
 else
 	:
@@ -116,7 +134,7 @@ if [ x"$dir_arg" != x ]; then
 	dst=$src
 	src=""
 
-	if [ -d $dst ]; then
+	if [ -d "$dst" ]; then
 		instcmd=:
 		chmodcmd=""
 	else
@@ -128,17 +146,17 @@ else
 # might cause directories to be created, which would be especially bad
 # if $src (and thus $dsttmp) contains '*'.
 
-	if [ -f $src -o -d $src ]
+	if [ -f "$src" ] || [ -d "$src" ]
 	then
 		:
 	else
-		echo "install:  $src does not exist"
+		echo "$0: $src does not exist" >&2
 		exit 1
 	fi
 
 	if [ x"$dst" = x ]
 	then
-		echo "install:	no destination specified"
+		echo "$0: no destination specified" >&2
 		exit 1
 	else
 		:
@@ -147,16 +165,16 @@ else
 # If destination is a directory, append the input filename; if your system
 # does not like double slashes in filenames, you may need to add some logic
 
-	if [ -d $dst ]
+	if [ -d "$dst" ]
 	then
-		dst="$dst"/`basename $src`
+		dst=$dst/`basename "$src"`
 	else
 		:
 	fi
 fi
 
 ## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 
 # Make sure that the destination directory exists.
 #  this part is taken from Noah Friedman's mkinstalldirs script
@@ -165,48 +183,48 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 if [ ! -d "$dstdir" ]; then
 defaultIFS='
 	'
-IFS="${IFS-${defaultIFS}}"
+IFS="${IFS-$defaultIFS}"
 
-oIFS="${IFS}"
+oIFS=$IFS
 # Some sh's can't handle IFS=/ for some reason.
 IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
+set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS=$oIFS
 
 pathcomp=''
 
 while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
+	pathcomp=$pathcomp$1
 	shift
 
-	if [ ! -d "${pathcomp}" ] ;
+	if [ ! -d "$pathcomp" ] ;
         then
-		$mkdirprog "${pathcomp}"
+		$mkdirprog "$pathcomp"
 	else
 		:
 	fi
 
-	pathcomp="${pathcomp}/"
+	pathcomp=$pathcomp/
 done
 fi
 
 if [ x"$dir_arg" != x ]
 then
-	$doit $instcmd $dst &&
+	$doit $instcmd "$dst" &&
 
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
 else
 
 # If we're going to rename the final executable, determine the name now.
 
 	if [ x"$transformarg" = x ]
 	then
-		dstfile=`basename $dst`
+		dstfile=`basename "$dst"`
 	else
-		dstfile=`basename $dst $transformbasename |
+		dstfile=`basename "$dst" $transformbasename |
 			sed $transformarg`$transformbasename
 	fi
 
@@ -214,20 +232,24 @@ else
 
 	if [ x"$dstfile" = x ]
 	then
-		dstfile=`basename $dst`
+		dstfile=`basename "$dst"`
 	else
 		:
 	fi
 
-# Make a temp file name in the proper directory.
+# Make a couple of temp file names in the proper directory.
 
 	dsttmp=$dstdir/#inst.$$#
+	rmtmp=$dstdir/#rm.$$#
 
-# Move or copy the file name to the temp name
+# Trap to clean up temp files at exit.
 
-	$doit $instcmd $src $dsttmp &&
+	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+	trap '(exit $?); exit' 1 2 13 15
 
-	trap "rm -f ${dsttmp}" 0 &&
+# Move or copy the file name to the temp name
+
+	$doit $instcmd "$src" "$dsttmp" &&
 
 # and set any options; do chmod last to preserve setuid bits
 
@@ -235,17 +257,38 @@ else
 # ignore errors from any of these, just make sure not to ignore
 # errors from the above "$doit $instcmd $src $dsttmp" command.
 
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
+
+# Now remove or move aside any old file at destination location.  We try this
+# two ways since rm can't unlink itself on some systems and the destination
+# file might be busy for other reasons.  In this case, the final cleanup
+# might fail but the new file should still install successfully.
+
+{
+	if [ -f "$dstdir/$dstfile" ]
+	then
+		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
+		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
+		{
+		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		  (exit 1); exit
+		}
+	else
+		:
+	fi
+} &&
 
 # Now rename the file to the real destination.
 
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile
+	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
 
 fi &&
 
+# The final little trick to "correctly" pass the exit status to the exit trap.
 
-exit 0
+{
+	(exit 0); exit
+}
diff --git a/lynx.cfg b/lynx.cfg
index a8a15ae3..4487c9df 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -3,10 +3,10 @@
 #                                     or Lynx_Dir:lynx.cfg (VMS)
 #
 # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
-#PRCS LYNX_VERSION "2.8.6dev.13"
+#PRCS LYNX_VERSION "2.8.6dev.14"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Tue, 07 Jun 2005 03:45:24 -0700"
+#PRCS LYNX_DATE "Sun, 16 Oct 2005 17:17:20 -0700"
 #
 # Definition pairs are of the form  VARIABLE:DEFINITION
 # NO spaces are allowed between the pair items.
@@ -3374,10 +3374,22 @@ COLOR:6:brightred:black
 #FORCE_COOKIE_PROMPT:PROMPT
 
 .h1 Appearance
+
+.h2 SCREEN_SIZE
 # For win32, allow the console window to be resized to the given values.  This
 # requires PDCurses 2.5.  The values given are width,height.
 #SCREEN_SIZE:80,24
 
+.h2 NO_MARGINS
+# Disable left/right margins in the default style sheet.
+# This is the same as the command-line "-nomargins" option.
+#NO_MARGINS:FALSE
+
+.h2 NO_TITLE
+# Disable title and blank line from top of page.
+# This is the same as the command-line "-notitle" option.
+#NO_TITLE:FALSE
+
 .h1 External Programs
 
 .h2 SYSLOG_REQUESTED_URLS
diff --git a/lynx.rsp b/lynx.rsp
index 321ce059..d8374e24 100644
--- a/lynx.rsp
+++ b/lynx.rsp
@@ -80,3 +80,4 @@
 ../obj/xsystem.obj
 ../curses/PDCURSES.LIB
 ../curses/ZLIB.LIB
+../curses/iconv.lib
diff --git a/makefile.bcb b/makefile.bcb
index ede4d7b9..3b010214 100644
--- a/makefile.bcb
+++ b/makefile.bcb
@@ -77,7 +77,8 @@ CC_FLAGS = $(DEBUG) $(CS_DEFS) $(SOCK_DEFS) \
 -DVC="2.14FM" \
 -DWIN_EX \
 -D_WINDOWS \
--D_WIN_CC=1
+-D_WIN_CC=1 \
+-DEXP_JAPANESEUTF8_SUPPORT
 
 #
 # Dependency List
@@ -97,6 +98,7 @@ clean :
 Dep_lynxdexe = \
    $(ETC_LIB)/zlib.lib\
    $(ETC_LIB)/pdcurses.lib\
+   $(ETC_LIB)/iconv.lib\
    $(OBJ)/DefaultStyle.obj\
    $(OBJ)/GridText.obj\
    $(OBJ)/HTAABrow.obj\
diff --git a/mkdirs.sh b/mkdirs.sh
index 8f0503e0..ffe7494c 100755
--- a/mkdirs.sh
+++ b/mkdirs.sh
@@ -23,7 +23,8 @@ for file in ${1+"$@"} ; do
      if test ! -d "$pathcomp"; then
         echo "mkdir $pathcomp" 1>&2
         case "$pathcomp" in
-          [a-zA-Z]: )  ;;               # DOSISH systems
+          [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]: )
+                ;;               # DOSISH systems
           * )          mkdir "$pathcomp" || errstatus=$? ;;
         esac
      fi
diff --git a/po/ChangeLog b/po/ChangeLog
deleted file mode 100644
index 81690d02..00000000
--- a/po/ChangeLog
+++ /dev/null
@@ -1,99 +0,0 @@
-1998-02-14  Karl Eichwalder  <ke@suse.de>
-
-	* no.po: Update.
-
-Sun May 25 19:19:51 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* de.po: Update.
-
-Mon Apr 28 17:38:54 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* es.po: Update.
-
-Wed Mar 26 09:58:18 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* de.po: Update.
-
-Sun Mar 23 18:28:18 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* sv.po: Update.
-
-Fri Feb 14 08:24:07 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* pl.po: Update.
-
-Sun Feb  2 18:42:04 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* de.po es.po fr.po sv.po: Update.
-
-Sat Jan 11 16:51:45 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* nl.po: Update.
-
-Fri Jan 10 13:09:59 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* fr.po: Update.
-
-Wed Jan  8 08:53:41 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* no.po: Update.
-
-Tue Jan  7 18:34:57 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* es.po: Update.
-
-Sun Jan  5 09:58:47 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* de.po fr.po: Updates.
-
-Sat Jan  4 17:49:59 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* es.po: Update.
-
-Thu Dec 12 18:58:01 1996  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* it.po: Remove.
-
-Wed Dec 11 20:05:00 1996  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* mailshar gnu-translation@prep.ai.mit.edu
-	hello-1.3.6/po/hello.pot.
-
-	* POTFILES.in: remove `src/getopt1.c'.
-
-	* de.po es.po fr.po ko.po nl.po no.po pl.po pt.po sl.po sv.po: new
- 	files from alpha.gnu.ai.mit.edu:/gnu/po/maint/hello.
-
-Fri Mar 15 12:43:14 1996  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* fr.po: New (version 1.3.2).
-
-Tue Mar 12 10:15:26 1996  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* mailshar gnu-translation@prep.ai.mit.edu
-	hello-1.3.4/po/hello.pot.
-
-Fri Mar  8 20:40:50 1996  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* de.po: New.
-
-Tue Mar  5 09:58:14 1996  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* de.po: New.  Reflect current version 1.3.2; now 1.3.3.
-
-Sun Mar  3 21:06:15 1996  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* Makefile.in.in ($(PACKAGE).pot): Add POTFILES.
-
-	* POTFILES.in: remove `src/version.c'.
-
-Tue Dec 19 10:16:39 1995  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* POTFILES.in: Reflect, that source files now in ../src/.
-
-Fri Dec 15 11:59:51 1995  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* POTFILES.in: New file.  Lists `getopt.c', `getopt1.c',
- 	`hello.c', and `version.c'.
-	
-
diff --git a/po/ca.po b/po/ca.po
index 7fceea5d..c87c78be 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.5pre15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-30 18:03-0400\n"
+"POT-Creation-Date: 2005-10-16 19:03-0400\n"
 "PO-Revision-Date: 2003-07-06 18:12+0200\n"
 "Last-Translator: Carles Sadurn Anguita <isard@ctv.es>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -2248,7 +2248,7 @@ msgstr "(Sense nom)"
 msgid "(No value.)"
 msgstr "(Sense valor)"
 
-#: LYMessages.c:713 src/LYOptions.c:2382
+#: LYMessages.c:713 src/LYOptions.c:2385
 msgid "None"
 msgstr ""
 
@@ -2791,7 +2791,7 @@ msgstr "El document amb contingut POST no s'ha trobat en la mem犡ia cau. Reenvia
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8508
+#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8515
 msgid "Loading incomplete."
 msgstr "C跫rega incompleta."
 
@@ -2906,12 +2906,12 @@ msgstr "Contrasenya per al servidor de not獳ies '%s':"
 msgid "Change password?"
 msgstr "Canviar contrasenya?"
 
-#: WWW/Library/Implementation/HTNews.c:1736
+#: WWW/Library/Implementation/HTNews.c:1706
 #, c-format
 msgid "No matches for: %s"
 msgstr "Cap coincid鋝cia amb: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1789
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2919,7 +2919,7 @@ msgstr ""
 "\n"
 "No hi ha articles en aquest f犡um.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1801
+#: WWW/Library/Implementation/HTNews.c:1768
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2930,16 +2930,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1814
+#: WWW/Library/Implementation/HTNews.c:1781
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  articles %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1837
+#: WWW/Library/Implementation/HTNews.c:1804
 msgid "Earlier articles"
 msgstr "Articles anteriors"
 
-#: WWW/Library/Implementation/HTNews.c:1850
+#: WWW/Library/Implementation/HTNews.c:1817
 #, c-format
 msgid ""
 "\n"
@@ -2949,41 +2949,41 @@ msgstr ""
 "\n"
 "Hi ha %d articles disponibles actualment en %s, \n"
 
-#: WWW/Library/Implementation/HTNews.c:1912
+#: WWW/Library/Implementation/HTNews.c:1879
 msgid "All available articles in "
 msgstr "Tots els articles disponibles en "
 
-#: WWW/Library/Implementation/HTNews.c:2133
+#: WWW/Library/Implementation/HTNews.c:2093
 msgid "Later articles"
 msgstr "Articles recents"
 
-#: WWW/Library/Implementation/HTNews.c:2156
+#: WWW/Library/Implementation/HTNews.c:2116
 msgid "Post to "
 msgstr "Enviar a "
 
-#: WWW/Library/Implementation/HTNews.c:2377
+#: WWW/Library/Implementation/HTNews.c:2337
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Aquest client no t suport per a URLs de SNEWS."
 
-#: WWW/Library/Implementation/HTNews.c:2585
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2616
+#: WWW/Library/Implementation/HTNews.c:2576
 msgid "Connecting to NewsHost ..."
 msgstr "Connectant amb el servidor ..."
 
-#: WWW/Library/Implementation/HTNews.c:2668
+#: WWW/Library/Implementation/HTNews.c:2628
 #, c-format
 msgid "Could not access %s."
 msgstr "No ha estat possible accedir a %s."
 
-#: WWW/Library/Implementation/HTNews.c:2774
+#: WWW/Library/Implementation/HTNews.c:2734
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "No s'ha pogut llegir la news info. El servidor %.20s ha respost: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2778
+#: WWW/Library/Implementation/HTNews.c:2738
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "No s'ha pogut llegir la news info, resposta buida del servidor %s"
@@ -2991,22 +2991,22 @@ msgstr "No s'ha pogut llegir la news info, resposta buida del servidor %s"
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2982
+#: WWW/Library/Implementation/HTNews.c:2942
 msgid "Reading list of available newsgroups."
 msgstr "Llegint la llista dels f犡ums disponibles."
 
-#: WWW/Library/Implementation/HTNews.c:3003
+#: WWW/Library/Implementation/HTNews.c:2963
 msgid "Reading list of articles in newsgroup."
 msgstr "Llegint la llista d'articles del f犡um."
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:3009
+#: WWW/Library/Implementation/HTNews.c:2969
 msgid "Reading news article."
 msgstr "Llegint article."
 
-#: WWW/Library/Implementation/HTNews.c:3039
+#: WWW/Library/Implementation/HTNews.c:2999
 msgid "Sorry, could not load requested news."
 msgstr "No ha estat possible carregar els missatges sol損icitats."
 
@@ -3014,11 +3014,11 @@ msgstr "No ha estat possible carregar els missatges sol損icitats."
 msgid "Address has invalid port"
 msgstr "L'adre蓷 cont un port que no 廥 v跐id"
 
-#: WWW/Library/Implementation/HTTCP.c:1320
+#: WWW/Library/Implementation/HTTCP.c:1308
 msgid "Address length looks invalid"
 msgstr "La longitud de l'adre蓷 sembla inv跐ida"
 
-#: WWW/Library/Implementation/HTTCP.c:1552 WWW/Library/Implementation/HTTCP.c:1570
+#: WWW/Library/Implementation/HTTCP.c:1539 WWW/Library/Implementation/HTTCP.c:1557
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Ha estat impossible trobar el servidor %s."
@@ -3027,38 +3027,38 @@ msgstr "Ha estat impossible trobar el servidor %s."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1567 WWW/Library/Implementation/HTTelnet.c:108
+#: WWW/Library/Implementation/HTTCP.c:1554 WWW/Library/Implementation/HTTelnet.c:108
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Servidor %s no v跐id"
 
-#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1568
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Establint una connexi %s amb %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1579
 msgid "socket failed."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1605
+#: WWW/Library/Implementation/HTTCP.c:1592
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1629
+#: WWW/Library/Implementation/HTTCP.c:1616
 msgid "Could not make connection non-blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1697
+#: WWW/Library/Implementation/HTTCP.c:1684
 msgid "Connection failed (too many retries)."
 msgstr "La connexi ha fallat (massa reintents)."
 
-#: WWW/Library/Implementation/HTTCP.c:1896
+#: WWW/Library/Implementation/HTTCP.c:1883
 msgid "Could not restore socket to blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1962
+#: WWW/Library/Implementation/HTTCP.c:1949
 msgid "Socket read failed for 180,000 tries."
 msgstr ""
 
@@ -3354,98 +3354,98 @@ msgstr "Mem犡ia exhaurida, visualitzaci interrompuda!"
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Mem犡ia exhaurida, la transfer鋝cia s'interrompr!"
 
-#: src/GridText.c:3594
+#: src/GridText.c:3601
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** MEM偋IA EXHAURIDA ***"
 
-#: src/GridText.c:6013 src/GridText.c:6020 src/LYList.c:248
+#: src/GridText.c:6020 src/GridText.c:6027 src/LYList.c:248
 msgid "unknown field or link"
 msgstr "camp o enlla desconegut"
 
-#: src/GridText.c:6029
+#: src/GridText.c:6036
 msgid "text entry field"
 msgstr "camp de text"
 
-#: src/GridText.c:6032
+#: src/GridText.c:6039
 msgid "password entry field"
 msgstr "camp de contrasenya"
 
-#: src/GridText.c:6035
+#: src/GridText.c:6042
 msgid "checkbox"
 msgstr "quadre de verificaci"
 
-#: src/GridText.c:6038
+#: src/GridText.c:6045
 msgid "radio button"
 msgstr "bot de grup"
 
-#: src/GridText.c:6041
+#: src/GridText.c:6048
 msgid "submit button"
 msgstr "bot d'enviament"
 
-#: src/GridText.c:6044
+#: src/GridText.c:6051
 msgid "reset button"
 msgstr "bot de reinici"
 
-#: src/GridText.c:6047
+#: src/GridText.c:6054
 msgid "popup menu"
 msgstr "men emergent"
 
-#: src/GridText.c:6050
+#: src/GridText.c:6057
 msgid "hidden form field"
 msgstr "camp de formulari ocult"
 
-#: src/GridText.c:6053
+#: src/GridText.c:6060
 msgid "text entry area"
 msgstr "跫ea de text"
 
-#: src/GridText.c:6056
+#: src/GridText.c:6063
 msgid "range entry field"
 msgstr "camp d'entrada d'interval"
 
-#: src/GridText.c:6059
+#: src/GridText.c:6066
 msgid "file entry field"
 msgstr "camp de fitxer"
 
-#: src/GridText.c:6062
+#: src/GridText.c:6069
 msgid "text-submit field"
 msgstr "camp d'enviament de text"
 
-#: src/GridText.c:6065
+#: src/GridText.c:6072
 msgid "image-submit button"
 msgstr "bot d'enviament d'imatges"
 
-#: src/GridText.c:6068
+#: src/GridText.c:6075
 msgid "keygen field"
 msgstr ""
 
-#: src/GridText.c:6071
+#: src/GridText.c:6078
 msgid "unknown form field"
 msgstr "camp de formulari desconegut"
 
-#: src/GridText.c:10231
+#: src/GridText.c:10244
 msgid "Can't open file for uploading"
 msgstr "No ha estat possible obrir el fitxer que voleu carregar."
 
-#: src/GridText.c:11384
+#: src/GridText.c:11397
 #, c-format
 msgid "Submitting %s"
 msgstr "Enviant %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12533
+#: src/GridText.c:12546
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12738
+#: src/GridText.c:12751
 msgid "Wrap lines to fit displayed area?"
 msgstr "Trencar les l璯ies per a ajustar a l'espai disponible?"
 
-#: src/GridText.c:12790
+#: src/GridText.c:12803
 msgid "Very long lines have been wrapped!"
 msgstr "Les l璯ies molt llargues han estat tallades!"
 
-#: src/GridText.c:13232
+#: src/GridText.c:13245
 msgid "Very long lines have been truncated!"
 msgstr "Les l璯ies molt llargues han estat truncades!"
 
@@ -3551,15 +3551,15 @@ msgstr "Cam:"
 msgid "(unknown)"
 msgstr "(desconegut)"
 
-#: src/HTML.c:7374
+#: src/HTML.c:7375
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "El document nom廥 cont enlla蔞s ocults. Useu el comand L)ist."
 
-#: src/HTML.c:7873
+#: src/HTML.c:7874
 msgid "Source cache error - disk full?"
 msgstr "Source cache error: disc ple?"
 
-#: src/HTML.c:7886
+#: src/HTML.c:7887
 msgid "Source cache error - not enough memory!"
 msgstr "Source cache error: no hi ha prou mem犡ia!"
 
@@ -3664,31 +3664,31 @@ msgstr ""
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr ""
 
-#: src/LYCurses.c:1017
+#: src/LYCurses.c:1034
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Ha fallat la inicialitzaci del terminal: potser 廥 un tipus de terminal desconegut."
 
-#: src/LYCurses.c:1442
+#: src/LYCurses.c:1459
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1446
+#: src/LYCurses.c:1463
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Heu d'usar un terminal vt100, 300, etc. amb aquest programa."
 
-#: src/LYCurses.c:1495
+#: src/LYCurses.c:1512
 msgid "Your Terminal type is unknown!"
 msgstr "El terminal especificat 廥 desconegut!"
 
-#: src/LYCurses.c:1496
+#: src/LYCurses.c:1513
 msgid "Enter a terminal type:"
 msgstr "Introdu鮯 un tipus de terminal:"
 
-#: src/LYCurses.c:1510
+#: src/LYCurses.c:1527
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "EL TIPUS DE TERMINAL EST FIXAT A"
 
-#: src/LYCurses.c:2007
+#: src/LYCurses.c:2031
 #, c-format
 msgid ""
 "\n"
@@ -3697,7 +3697,7 @@ msgstr ""
 "\n"
 "S'ha produ鮠 un error fatal en %s Ver. %s\n"
 
-#: src/LYCurses.c:2010
+#: src/LYCurses.c:2034
 #, c-format
 msgid ""
 "\n"
@@ -4226,54 +4226,54 @@ msgstr ""
 "El fitxer %s no est disponible.\n"
 "\n"
 
-#: src/LYMain.c:1763
+#: src/LYMain.c:1750
 msgid "Warning:"
 msgstr "Alerta:"
 
-#: src/LYMain.c:2328
+#: src/LYMain.c:2315
 msgid "persistent cookies state will be changed in next session only."
 msgstr "l'estat de les cookies persistents no es canviar fins la segent sessi"
 
-#: src/LYMain.c:2565 src/LYMain.c:2610
+#: src/LYMain.c:2552 src/LYMain.c:2597
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: joc de car趓ters %s no reconegut. S'ignorar.\n"
 
-#: src/LYMain.c:3121
+#: src/LYMain.c:3108
 #, fuzzy, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Versi %s (%s)\n"
 
-#: src/LYMain.c:3156
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Compilat per a %s el %s a les %s\n"
 
-#: src/LYMain.c:3178
+#: src/LYMain.c:3165
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors."
 msgstr ""
 "Els drets de c犤ia pertanyen a la Universitat de Kansas, el CERN i altres\n"
 "contribu骾ors."
 
-#: src/LYMain.c:3179
+#: src/LYMain.c:3166
 msgid "Distributed under the GNU General Public License."
 msgstr "Distribu鮠 sota la Llic鋝cia Pblica General."
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3167
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Vegeu http://lynx.isc.org/ i l'ajuda en l璯ia per a m廥 informaci."
 
-#: src/LYMain.c:3952
+#: src/LYMain.c:3939
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "UTILITZACI: %s [opcions] [arxiu]\n"
 
-#: src/LYMain.c:3953
+#: src/LYMain.c:3940
 #, c-format
 msgid "Options are:\n"
 msgstr "Les opcions s鏮:\n"
 
-#: src/LYMain.c:4252
+#: src/LYMain.c:4239
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: l'opci no 廥 v跐ida: %s\n"
@@ -4347,7 +4347,7 @@ msgstr ""
 msgid "Current URL is empty."
 msgstr "La URL actual 廥 buida."
 
-#: src/LYMainLoop.c:6935 src/LYUtils.c:1714
+#: src/LYMainLoop.c:6935 src/LYUtils.c:1775
 msgid "Copy to clipboard failed."
 msgstr "No s'ha pogut copiar al porta-retalls."
 
@@ -4443,353 +4443,353 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "El missatge no cont text original!"
 
-#: src/LYOptions.c:758
+#: src/LYOptions.c:761
 msgid "review/edit B)ookmarks files"
 msgstr "B revisar/editar fixers de favorits"
 
-#: src/LYOptions.c:760
+#: src/LYOptions.c:763
 msgid "B)ookmark file: "
 msgstr "B fitxer de favorits:"
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2126 src/LYOptions.c:2133
 msgid "ON"
 msgstr ""
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2277 src/LYOptions.c:2288
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280 src/LYOptions.c:2291
 msgid "OFF"
 msgstr ""
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2128
 msgid "NEVER"
 msgstr ""
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2129
 msgid "ALWAYS"
 msgstr ""
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2269
+#: src/LYOptions.c:2145 src/LYOptions.c:2272
 msgid "ignore"
 msgstr ""
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2146
 msgid "ask user"
 msgstr ""
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2147
 msgid "accept all"
 msgstr ""
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS OFF"
 msgstr ""
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2160
 msgid "FOR LOCAL FILES ONLY"
 msgstr ""
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2162
 msgid "ALWAYS ON"
 msgstr ""
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2174
 msgid "Numbers act as arrows"
 msgstr ""
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Links and form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2182
 msgid "Form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2189
+#: src/LYOptions.c:2192
 msgid "Case insensitive"
 msgstr ""
 
-#: src/LYOptions.c:2190
+#: src/LYOptions.c:2193
 msgid "Case sensitive"
 msgstr ""
 
-#: src/LYOptions.c:2214
+#: src/LYOptions.c:2217
 msgid "prompt normally"
 msgstr ""
 
-#: src/LYOptions.c:2215
+#: src/LYOptions.c:2218
 msgid "force yes-response"
 msgstr ""
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2219
 msgid "force no-response"
 msgstr ""
 
-#: src/LYOptions.c:2234
+#: src/LYOptions.c:2237
 msgid "Novice"
 msgstr ""
 
-#: src/LYOptions.c:2235
+#: src/LYOptions.c:2238
 msgid "Intermediate"
 msgstr ""
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2239
 msgid "Advanced"
 msgstr ""
 
-#: src/LYOptions.c:2245
+#: src/LYOptions.c:2248
 msgid "By First Visit"
 msgstr ""
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2250
 msgid "By First Visit Reversed"
 msgstr ""
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2251
 msgid "As Visit Tree"
 msgstr ""
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2252
 msgid "By Last Visit"
 msgstr ""
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2254
 msgid "By Last Visit Reversed"
 msgstr ""
 
 #. Old_DTD variable
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2265
 msgid "relaxed (TagSoup mode)"
 msgstr ""
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2266
 msgid "strict (SortaSGML mode)"
 msgstr ""
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2273
 msgid "as labels"
 msgstr ""
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2274
 #, fuzzy
 msgid "as links"
 msgstr "ac"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2281
 #, fuzzy
 msgid "show filename"
 msgstr " (nom de fitxer incorrecte)"
 
-#: src/LYOptions.c:2289
+#: src/LYOptions.c:2292
 msgid "STANDARD"
 msgstr ""
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2293
 msgid "ADVANCED"
 msgstr ""
 
-#: src/LYOptions.c:2316
+#: src/LYOptions.c:2319
 #, fuzzy
 msgid "Directories first"
 msgstr "Subdirectoris:"
 
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2320
 #, fuzzy
 msgid "Files first"
 msgstr " primer"
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2321
 msgid "Mixed style"
 msgstr ""
 
-#: src/LYOptions.c:2326 src/LYOptions.c:2343
+#: src/LYOptions.c:2329 src/LYOptions.c:2346
 #, fuzzy
 msgid "By Name"
 msgstr "Nom:"
 
-#: src/LYOptions.c:2327 src/LYOptions.c:2344
+#: src/LYOptions.c:2330 src/LYOptions.c:2347
 msgid "By Type"
 msgstr ""
 
-#: src/LYOptions.c:2328 src/LYOptions.c:2345
+#: src/LYOptions.c:2331 src/LYOptions.c:2348
 msgid "By Size"
 msgstr ""
 
-#: src/LYOptions.c:2329 src/LYOptions.c:2346
+#: src/LYOptions.c:2332 src/LYOptions.c:2349
 #, fuzzy
 msgid "By Date"
 msgstr "Data:"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2333
 msgid "By Mode"
 msgstr ""
 
-#: src/LYOptions.c:2332
+#: src/LYOptions.c:2335
 msgid "By User"
 msgstr ""
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 #, fuzzy
 msgid "By Group"
 msgstr "Grup"
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2357
 msgid "Do not show rate"
 msgstr ""
 
-#: src/LYOptions.c:2355 src/LYOptions.c:2356
+#: src/LYOptions.c:2358 src/LYOptions.c:2359
 #, fuzzy, c-format
 msgid "Show %s/sec rate"
 msgstr "Mostrar taxa de transfer鋝cia"
 
-#: src/LYOptions.c:2358 src/LYOptions.c:2359
+#: src/LYOptions.c:2361 src/LYOptions.c:2362
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr ""
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2374
 msgid "Accept lynx's internal types"
 msgstr ""
 
-#: src/LYOptions.c:2372
+#: src/LYOptions.c:2375
 msgid "Also accept lynx.cfg's types"
 msgstr ""
 
-#: src/LYOptions.c:2373
+#: src/LYOptions.c:2376
 msgid "Also accept user's types"
 msgstr ""
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "Also accept system's types"
 msgstr ""
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 #, fuzzy
 msgid "Accept all types"
 msgstr "Acceptar els canvis"
 
-#: src/LYOptions.c:2384
+#: src/LYOptions.c:2387
 msgid "gzip"
 msgstr ""
 
-#: src/LYOptions.c:2385
+#: src/LYOptions.c:2388
 msgid "deflate"
 msgstr ""
 
-#: src/LYOptions.c:2388
+#: src/LYOptions.c:2391
 msgid "compress"
 msgstr ""
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2394
 msgid "bzip2"
 msgstr ""
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2396
 msgid "All"
 msgstr ""
 
-#: src/LYOptions.c:2658 src/LYOptions.c:2682
+#: src/LYOptions.c:2664 src/LYOptions.c:2688
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Useu %s per a invocar el men d'opcions"
 
-#: src/LYOptions.c:3429
+#: src/LYOptions.c:3438
 msgid "(options marked with (!) will not be saved)"
 msgstr "(les opcions marcades amb (!) no es desen)"
 
-#: src/LYOptions.c:3437
+#: src/LYOptions.c:3446
 msgid "General Preferences"
 msgstr "Prefer鋝cies generals"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3450
 msgid "User mode"
 msgstr "Tipus d'usuari"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3447
+#: src/LYOptions.c:3456
 msgid "Editor"
 msgstr "Editor"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3461
 msgid "Type of Search"
 msgstr "Tipus de recerca"
 
-#: src/LYOptions.c:3457
+#: src/LYOptions.c:3466
 msgid "Security and Privacy"
 msgstr ""
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3461
+#: src/LYOptions.c:3470
 msgid "Cookies"
 msgstr "Cookies"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3475
+#: src/LYOptions.c:3484
 msgid "Invalid-Cookie Prompting"
 msgstr ""
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3482
+#: src/LYOptions.c:3491
 msgid "SSL Prompting"
 msgstr ""
 
-#: src/LYOptions.c:3488
+#: src/LYOptions.c:3497
 msgid "Keyboard Input"
 msgstr "Teclat"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3492
+#: src/LYOptions.c:3501
 msgid "Keypad mode"
 msgstr "Mode del teclat"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3498
+#: src/LYOptions.c:3507
 msgid "Emacs keys"
 msgstr "Tecles d'emacs"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3513
 msgid "VI keys"
 msgstr "Tecles de VI"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3511
+#: src/LYOptions.c:3520
 msgid "Line edit style"
 msgstr ""
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3532
 msgid "Keyboard layout"
 msgstr "Configuraci del teclat"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3537
+#: src/LYOptions.c:3546
 msgid "Display and Character Set"
 msgstr "Pantalla i joc de car趓ters"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3542
+#: src/LYOptions.c:3551
 #, fuzzy
 msgid "Use locale-based character set"
 msgstr "Joc de car趓ters predeterminat"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3551
+#: src/LYOptions.c:3560
 msgid "Display character set"
 msgstr "Joc de car趓ters"
 
-#: src/LYOptions.c:3582
+#: src/LYOptions.c:3591
 msgid "Assumed document character set"
 msgstr "Joc de car趓ters predeterminat"
 
@@ -4798,174 +4798,177 @@ msgstr "Joc de car趓ters predeterminat"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3602
+#: src/LYOptions.c:3611
 msgid "CJK mode"
 msgstr "mode CJK"
 
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3613
 msgid "Raw 8-bit"
 msgstr "8-bits cru"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3612
+#: src/LYOptions.c:3621
 msgid "X Display"
 msgstr ""
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3618
+#: src/LYOptions.c:3627
 msgid "Document Appearance"
 msgstr "Apari鋝cia dels documents"
 
-#: src/LYOptions.c:3624
+#: src/LYOptions.c:3633
 msgid "Show color"
 msgstr "En color"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3648
+#: src/LYOptions.c:3657
 msgid "Show cursor"
 msgstr "Mostrar cursor"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3663
 #, fuzzy
 msgid "Underline links"
 msgstr "Enlla蔞s ocults:"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3670
 msgid "Show scrollbar"
 msgstr "Mostrar la barra de despla蓷ment"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3668
+#: src/LYOptions.c:3677
 msgid "Popups for select fields"
 msgstr ""
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3674
+#: src/LYOptions.c:3683
 msgid "HTML error recovery"
 msgstr "Recuperaci d'errors de HTML"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3680
+#: src/LYOptions.c:3689
 msgid "Show images"
 msgstr "Mostrar imatges"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3694
+#: src/LYOptions.c:3703
 msgid "Verbose images"
 msgstr "Detalls sobre imatges"
 
-#: src/LYOptions.c:3703
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3711
 msgid "Headers Transferred to Remote Servers"
 msgstr "Cap蓷leres que es transmeten als servidors remots"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3715
 msgid "Personal mail address"
 msgstr "Adre蓷 electr犥ica personal"
 
 #. Mail Address: INPUT
-#: src/LYOptions.c:3712
+#: src/LYOptions.c:3720
 #, fuzzy
 msgid "Password for anonymous ftp"
 msgstr "Contrasenya per al servidor de not獳ies '%s':"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3717
+#: src/LYOptions.c:3725
 #, fuzzy
 msgid "Preferred media type"
 msgstr "%d bytes transferits"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3723
+#: src/LYOptions.c:3731
 #, fuzzy
 msgid "Preferred encoding"
 msgstr "Idioma preferit"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3729
+#: src/LYOptions.c:3737
 msgid "Preferred document character set"
 msgstr "Joc de car趓ters preferit"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3742
 msgid "Preferred document language"
 msgstr "Idioma preferit"
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3748
 msgid "User-Agent header"
 msgstr "Identificaci del navegador"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3748
+#: src/LYOptions.c:3756
 msgid "Listing and Accessing Files"
 msgstr "Fitxers: llistat i acc廥"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3752
+#: src/LYOptions.c:3760
 msgid "FTP sort criteria"
 msgstr "Criteri d'ordenaci per a FTP"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3759
+#: src/LYOptions.c:3767
 msgid "Local directory sort criteria"
 msgstr "Criteri d'ordenaci local"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3773
 #, fuzzy
 msgid "Local directory sort order"
 msgstr "Criteri d'ordenaci local"
 
-#: src/LYOptions.c:3774
+#: src/LYOptions.c:3782
 msgid "Show dot files"
 msgstr "Mostrar fitxers .*"
 
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3790
 msgid "Execution links"
 msgstr "Enlla蔞s d'execuci"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3810
 msgid "Show transfer rate"
 msgstr "Mostrar taxa de transfer鋝cia"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3830
 msgid "Special Files and Screens"
 msgstr "Fitxers i pantalles especials"
 
-#: src/LYOptions.c:3827
+#: src/LYOptions.c:3835
 msgid "Multi-bookmarks"
 msgstr ""
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3843
 msgid "Review/edit Bookmarks files"
 msgstr "Editar fitxers de favorits"
 
-#: src/LYOptions.c:3837
+#: src/LYOptions.c:3845
 msgid "Goto multi-bookmark menu"
 msgstr "Veure el men de mltiples fitxers d'adreces"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3847
 msgid "Bookmarks file"
 msgstr "Fitxer de favorits"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3845
+#: src/LYOptions.c:3853
 msgid "Visited Pages"
 msgstr "P跰ines visitades"
 
-#: src/LYOptions.c:3850
+#: src/LYOptions.c:3858
 msgid "View the file "
 msgstr "Veure el fitxer"
 
@@ -5086,38 +5089,38 @@ msgstr "Lynx: impossible iniciar, el fitxer de regles del CERN %s no est趔isponi
 msgid "(no name)"
 msgstr "(sense nom)"
 
-#: src/LYReadCFG.c:1782
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "M廥 de %d includes imbricats en lynx.cfg: potser hi ha un bucle?\n"
 
-#: src/LYReadCFG.c:1784
+#: src/LYReadCFG.c:1786
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "L'ltim include ha estat \"%s\", \n"
 
-#: src/LYReadCFG.c:1785
+#: src/LYReadCFG.c:1787
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "incl鏀 des de \"%s\".\n"
 
-#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263
+#: src/LYReadCFG.c:2194 src/LYReadCFG.c:2207 src/LYReadCFG.c:2265
 msgid "The following is read from your lynx.cfg file."
 msgstr "Les dades segents s'han llegit del vostre fitxer lynx.cfg."
 
-#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206
+#: src/LYReadCFG.c:2195 src/LYReadCFG.c:2208
 msgid "Please read the distribution"
 msgstr "Per favor, llegiu "
 
-#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209
+#: src/LYReadCFG.c:2201 src/LYReadCFG.c:2211
 msgid "for more comments."
 msgstr "si necessiteu m廥 informaci."
 
-#: src/LYReadCFG.c:2245
+#: src/LYReadCFG.c:2247
 msgid "RELOAD THE CHANGES"
 msgstr "RECARREGAR ELS CANVIS"
 
-#: src/LYReadCFG.c:2253
+#: src/LYReadCFG.c:2255
 msgid "Your primary configuration"
 msgstr "Configuraci prim跫ia"
 
@@ -5384,33 +5387,33 @@ msgstr "Carregar a:"
 msgid "Upload options:"
 msgstr "Opcions de c跫rega:"
 
-#: src/LYUtils.c:1716
+#: src/LYUtils.c:1777
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2493
+#: src/LYUtils.c:2554
 msgid "Unexpected access protocol for this URL scheme."
 msgstr ""
 
-#: src/LYUtils.c:3301
+#: src/LYUtils.c:3362
 msgid "Too many tempfiles"
 msgstr "Massa fitxers temporals"
 
-#: src/LYUtils.c:3605
+#: src/LYUtils.c:3666
 msgid "unknown restriction"
 msgstr "restricci desconeguda"
 
-#: src/LYUtils.c:3635
+#: src/LYUtils.c:3696
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "No s'hi han establert restriccions.\n"
 
-#: src/LYUtils.c:3638
+#: src/LYUtils.c:3699
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Restriccions:\n"
 
-#: src/LYUtils.c:5022
+#: src/LYUtils.c:5077
 msgid "Cannot find HOME directory"
 msgstr "No s'ha trobat el directori d'inici (HOME)"
 
diff --git a/po/cs.po b/po/cs.po
index c99adffe..d55315d8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-30 18:03-0400\n"
+"POT-Creation-Date: 2005-10-16 19:03-0400\n"
 "PO-Revision-Date: 1999-12-11 12:55+0100\n"
 "Last-Translator: Ji齶 Pavlovsk  <pavlovsk@ff.cuni.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -2242,7 +2242,7 @@ msgstr "(桑dn jm幯o)"
 msgid "(No value.)"
 msgstr "(桑dn hodnota)"
 
-#: LYMessages.c:713 src/LYOptions.c:2382
+#: LYMessages.c:713 src/LYOptions.c:2385
 msgid "None"
 msgstr "Nic"
 
@@ -2793,7 +2793,7 @@ msgstr "Dokument s POST obsahem nenalezen v cache. Odeslat znovu?"
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8508
+#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8515
 msgid "Loading incomplete."
 msgstr "Nahr嫛嫕 dokon鋀no."
 
@@ -2908,12 +2908,12 @@ msgstr "Heslo na news serveru '%s':"
 msgid "Change password?"
 msgstr "Zm髶it heslo?"
 
-#: WWW/Library/Implementation/HTNews.c:1736
+#: WWW/Library/Implementation/HTNews.c:1706
 #, c-format
 msgid "No matches for: %s"
 msgstr "%s nic nevyhovuje"
 
-#: WWW/Library/Implementation/HTNews.c:1789
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2921,7 +2921,7 @@ msgstr ""
 "\n"
 "Tato skupina neobsahuje 擔dn p齶sp魼ky.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1801
+#: WWW/Library/Implementation/HTNews.c:1768
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2932,16 +2932,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1814
+#: WWW/Library/Implementation/HTNews.c:1781
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  l嫕ky %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1837
+#: WWW/Library/Implementation/HTNews.c:1804
 msgid "Earlier articles"
 msgstr "P鷫dchoz p齶sp魼ky"
 
-#: WWW/Library/Implementation/HTNews.c:1850
+#: WWW/Library/Implementation/HTNews.c:1817
 #, c-format
 msgid ""
 "\n"
@@ -2952,41 +2952,41 @@ msgstr ""
 "Po鋀t 鋩嫕k v %2$s: %1$d. ID jsou n嫳leduj獳:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1912
+#: WWW/Library/Implementation/HTNews.c:1879
 msgid "All available articles in "
 msgstr "V鈹chny dostupn p齶sp魼ky v "
 
-#: WWW/Library/Implementation/HTNews.c:2133
+#: WWW/Library/Implementation/HTNews.c:2093
 msgid "Later articles"
 msgstr "Pozd骹寤 p齶sp魼ky"
 
-#: WWW/Library/Implementation/HTNews.c:2156
+#: WWW/Library/Implementation/HTNews.c:2116
 msgid "Post to "
 msgstr "Poslat do"
 
-#: WWW/Library/Implementation/HTNews.c:2377
+#: WWW/Library/Implementation/HTNews.c:2337
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Tento klient nepodporuje SNEWS URL."
 
-#: WWW/Library/Implementation/HTNews.c:2585
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr "桑dn c璱 pro prost text!"
 
-#: WWW/Library/Implementation/HTNews.c:2616
+#: WWW/Library/Implementation/HTNews.c:2576
 msgid "Connecting to NewsHost ..."
 msgstr "Navazuji spojen s news serverem..."
 
-#: WWW/Library/Implementation/HTNews.c:2668
+#: WWW/Library/Implementation/HTNews.c:2628
 #, c-format
 msgid "Could not access %s."
 msgstr "S %s nelze nav嫙at spojen."
 
-#: WWW/Library/Implementation/HTNews.c:2774
+#: WWW/Library/Implementation/HTNews.c:2734
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "Informace o diskuzn獳h skupin塶h nelze z疄kat. News server %.20s odpov駤骴 %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2778
+#: WWW/Library/Implementation/HTNews.c:2738
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Informace o diskuzn獳h skupin塶h nelze z疄kat. News server odpov駤骴 %s"
@@ -2994,22 +2994,22 @@ msgstr "Informace o diskuzn獳h skupin塶h nelze z疄kat. News server odpov駤骴 %s"
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2982
+#: WWW/Library/Implementation/HTNews.c:2942
 msgid "Reading list of available newsgroups."
 msgstr "tu seznam dostupnch diskuzn獳h skupin."
 
-#: WWW/Library/Implementation/HTNews.c:3003
+#: WWW/Library/Implementation/HTNews.c:2963
 msgid "Reading list of articles in newsgroup."
 msgstr "tu seznam 鋩嫕k v diskuzn skupin."
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:3009
+#: WWW/Library/Implementation/HTNews.c:2969
 msgid "Reading news article."
 msgstr "tu p齶sp魼ek z diskuzn skupiny."
 
-#: WWW/Library/Implementation/HTNews.c:3039
+#: WWW/Library/Implementation/HTNews.c:2999
 msgid "Sorry, could not load requested news."
 msgstr ""
 
@@ -3017,11 +3017,11 @@ msgstr ""
 msgid "Address has invalid port"
 msgstr "D幨ka adresy se zd bt chybnou."
 
-#: WWW/Library/Implementation/HTTCP.c:1320
+#: WWW/Library/Implementation/HTTCP.c:1308
 msgid "Address length looks invalid"
 msgstr "D幨ka adresy se zd bt chybnou."
 
-#: WWW/Library/Implementation/HTTCP.c:1552 WWW/Library/Implementation/HTTCP.c:1570
+#: WWW/Library/Implementation/HTTCP.c:1539 WWW/Library/Implementation/HTTCP.c:1557
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Adresu po鴈ta鋀 %s nelze zjistit."
@@ -3030,38 +3030,38 @@ msgstr "Adresu po鴈ta鋀 %s nelze zjistit."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1567 WWW/Library/Implementation/HTTelnet.c:108
+#: WWW/Library/Implementation/HTTCP.c:1554 WWW/Library/Implementation/HTTelnet.c:108
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Jm幯o po鴈ta鋀 %s je chybn"
 
-#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1568
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Navazuji %s spojen s %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1579
 msgid "socket failed."
 msgstr "chyba soketu."
 
-#: WWW/Library/Implementation/HTTCP.c:1605
+#: WWW/Library/Implementation/HTTCP.c:1592
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1629
+#: WWW/Library/Implementation/HTTCP.c:1616
 msgid "Could not make connection non-blocking."
 msgstr "Soket nelze nastavit jako neblokuj獳."
 
-#: WWW/Library/Implementation/HTTCP.c:1697
+#: WWW/Library/Implementation/HTTCP.c:1684
 msgid "Connection failed (too many retries)."
 msgstr "Spojen se nepoda鷡lo nav嫙at na 180 000. pokus."
 
-#: WWW/Library/Implementation/HTTCP.c:1896
+#: WWW/Library/Implementation/HTTCP.c:1883
 msgid "Could not restore socket to blocking."
 msgstr "Soket nelze nastavit jako blokuj獳."
 
-#: WWW/Library/Implementation/HTTCP.c:1962
+#: WWW/Library/Implementation/HTTCP.c:1949
 msgid "Socket read failed for 180,000 tries."
 msgstr "180 000 nesp儦nch pokus 鴈st ze soketu."
 
@@ -3366,99 +3366,99 @@ msgstr "Do雍a pam儢, zobrazen p鷫ru鈹no!"
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Do雍a pam儢, p鷫nos p鷫ru鈹n!"
 
-#: src/GridText.c:3594
+#: src/GridText.c:3601
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** DO呶A PAM怮 ***"
 
-#: src/GridText.c:6013 src/GridText.c:6020 src/LYList.c:248
+#: src/GridText.c:6020 src/GridText.c:6027 src/LYList.c:248
 msgid "unknown field or link"
 msgstr "nezn嫥 pole 鋱 odkaz"
 
-#: src/GridText.c:6029
+#: src/GridText.c:6036
 msgid "text entry field"
 msgstr "textov vstupn pole"
 
-#: src/GridText.c:6032
+#: src/GridText.c:6039
 msgid "password entry field"
 msgstr "vstupn pole pro heslo"
 
-#: src/GridText.c:6035
+#: src/GridText.c:6042
 msgid "checkbox"
 msgstr "za隕rt嫛ac pol膻ko"
 
-#: src/GridText.c:6038
+#: src/GridText.c:6045
 msgid "radio button"
 msgstr "p鷫p璯ac tla鴈tko"
 
-#: src/GridText.c:6041
+#: src/GridText.c:6048
 msgid "submit button"
 msgstr "tla鴈tko pro odesl嫕 dat serveru"
 
-#: src/GridText.c:6044
+#: src/GridText.c:6051
 msgid "reset button"
 msgstr "tla鴈tko pro obnoven implicitn獳h hodnot"
 
-#: src/GridText.c:6047
+#: src/GridText.c:6054
 msgid "popup menu"
 msgstr "vyskakovac menu"
 
-#: src/GridText.c:6050
+#: src/GridText.c:6057
 msgid "hidden form field"
 msgstr "skryt pole formul暟e"
 
-#: src/GridText.c:6053
+#: src/GridText.c:6060
 msgid "text entry area"
 msgstr "textov vstupn oblast"
 
-#: src/GridText.c:6056
+#: src/GridText.c:6063
 msgid "range entry field"
 msgstr "vstupn pole pro interval"
 
-#: src/GridText.c:6059
+#: src/GridText.c:6066
 msgid "file entry field"
 msgstr "pole pro vb鬳 souboru"
 
-#: src/GridText.c:6062
+#: src/GridText.c:6069
 msgid "text-submit field"
 msgstr "tla鴈tko pro odesl嫕 textu"
 
-#: src/GridText.c:6065
+#: src/GridText.c:6072
 msgid "image-submit button"
 msgstr "tla鴈tko pro odesl嫕 obr嫙ku"
 
-#: src/GridText.c:6068
+#: src/GridText.c:6075
 msgid "keygen field"
 msgstr "pole pro vytvo鷫n kl膻e"
 
-#: src/GridText.c:6071
+#: src/GridText.c:6078
 msgid "unknown form field"
 msgstr "nezn嫥 pole formul暟e"
 
-#: src/GridText.c:10231
+#: src/GridText.c:10244
 #, fuzzy
 msgid "Can't open file for uploading"
 msgstr "Soubor pro dekompresi nelze otev齶t!"
 
-#: src/GridText.c:11384
+#: src/GridText.c:11397
 #, c-format
 msgid "Submitting %s"
 msgstr "Odes璱嫥 %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12533
+#: src/GridText.c:12546
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12738
+#: src/GridText.c:12751
 msgid "Wrap lines to fit displayed area?"
 msgstr ""
 
-#: src/GridText.c:12790
+#: src/GridText.c:12803
 msgid "Very long lines have been wrapped!"
 msgstr ""
 
-#: src/GridText.c:13232
+#: src/GridText.c:13245
 msgid "Very long lines have been truncated!"
 msgstr ""
 
@@ -3564,15 +3564,15 @@ msgstr "Cesta:"
 msgid "(unknown)"
 msgstr "(nezn嫥)"
 
-#: src/HTML.c:7374
+#: src/HTML.c:7375
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Dokument obsahuje pouze skryt odkazy. Pou養jte 'l' pro jejich vyps嫕."
 
-#: src/HTML.c:7873
+#: src/HTML.c:7874
 msgid "Source cache error - disk full?"
 msgstr ""
 
-#: src/HTML.c:7886
+#: src/HTML.c:7887
 msgid "Source cache error - not enough memory!"
 msgstr ""
 
@@ -3671,31 +3671,31 @@ msgstr " (vnit鷢)"
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr ""
 
-#: src/LYCurses.c:1017
+#: src/LYCurses.c:1034
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Inicializace termin嫮u se nezda鷡la - nezn嫥 typ termin嫮u?"
 
-#: src/LYCurses.c:1442
+#: src/LYCurses.c:1459
 msgid "Terminal ="
 msgstr "Termin嫮 ="
 
-#: src/LYCurses.c:1446
+#: src/LYCurses.c:1463
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Tento program vy靠duje termin嫮 typu vt100, 200 etc."
 
-#: src/LYCurses.c:1495
+#: src/LYCurses.c:1512
 msgid "Your Terminal type is unknown!"
 msgstr "Typ va鈹ho termin嫮u je nezn嫥!"
 
-#: src/LYCurses.c:1496
+#: src/LYCurses.c:1513
 msgid "Enter a terminal type:"
 msgstr "Zadejte typ termin嫮u:"
 
-#: src/LYCurses.c:1510
+#: src/LYCurses.c:1527
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TYP TERMIN簇U JE NASTAVEN NA"
 
-#: src/LYCurses.c:2007
+#: src/LYCurses.c:2031
 #, c-format
 msgid ""
 "\n"
@@ -3704,7 +3704,7 @@ msgstr ""
 "\n"
 "V programu %s verze %s nastala fat嫮n chyba.\n"
 
-#: src/LYCurses.c:2010
+#: src/LYCurses.c:2034
 #, c-format
 msgid ""
 "\n"
@@ -4240,52 +4240,52 @@ msgstr ""
 "Soubor %s nen dostupn.\n"
 "\n"
 
-#: src/LYMain.c:1763
+#: src/LYMain.c:1750
 msgid "Warning:"
 msgstr ""
 
-#: src/LYMain.c:2328
+#: src/LYMain.c:2315
 msgid "persistent cookies state will be changed in next session only."
 msgstr "Stav trvalch cookies bude zm髶髶 a p鷡 p齶靖璥 sezen."
 
-#: src/LYMain.c:2565 src/LYMain.c:2610
+#: src/LYMain.c:2552 src/LYMain.c:2597
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr ""
 
-#: src/LYMain.c:3121
+#: src/LYMain.c:3108
 #, fuzzy, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s verze %s (%s)\n"
 
-#: src/LYMain.c:3156
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "P鷫lo頡n na %s %s %s\n"
 
-#: src/LYMain.c:3178
+#: src/LYMain.c:3165
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors."
 msgstr "Autorsk pr嫛a pat齶 Kansask univerzit, CERN a ostatn璥 autor籯."
 
-#: src/LYMain.c:3179
+#: src/LYMain.c:3166
 msgid "Distributed under the GNU General Public License."
 msgstr "Roz隘鷬v嫕 podle podm璯ek Obecn ve鷫jn licence GNU."
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3167
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Podrobn骹寤 informace z疄k嫢e na http://lynx.isc.org/ a z n嫚ov駤y k programu."
 
-#: src/LYMain.c:3952
+#: src/LYMain.c:3939
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "Pou養t: %s [p鷫p璯a鋀] [soubor]\n"
 
-#: src/LYMain.c:3953
+#: src/LYMain.c:3940
 #, c-format
 msgid "Options are:\n"
 msgstr "P鷫p璯a鋀:\n"
 
-#: src/LYMain.c:4252
+#: src/LYMain.c:4239
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Chybn p鷫p璯a %s\n"
@@ -4360,7 +4360,7 @@ msgstr ""
 msgid "Current URL is empty."
 msgstr "Aktu嫮n adres暟:"
 
-#: src/LYMainLoop.c:6935 src/LYUtils.c:1714
+#: src/LYMainLoop.c:6935 src/LYUtils.c:1775
 msgid "Copy to clipboard failed."
 msgstr ""
 
@@ -4456,356 +4456,356 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "Zpr嫛a neobsahuje 擔dn p驠odn text!"
 
-#: src/LYOptions.c:758
+#: src/LYOptions.c:761
 msgid "review/edit B)ookmarks files"
 msgstr "zobrazit/editovat soubory se z嫮o餒ami B>"
 
-#: src/LYOptions.c:760
+#: src/LYOptions.c:763
 msgid "B)ookmark file: "
 msgstr "Soubor se z嫮o餒ami B>:"
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2126 src/LYOptions.c:2133
 msgid "ON"
 msgstr ""
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2277 src/LYOptions.c:2288
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280 src/LYOptions.c:2291
 msgid "OFF"
 msgstr ""
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2128
 msgid "NEVER"
 msgstr ""
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2129
 msgid "ALWAYS"
 msgstr ""
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2269
+#: src/LYOptions.c:2145 src/LYOptions.c:2272
 msgid "ignore"
 msgstr ""
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2146
 msgid "ask user"
 msgstr ""
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2147
 msgid "accept all"
 msgstr ""
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS OFF"
 msgstr ""
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2160
 msgid "FOR LOCAL FILES ONLY"
 msgstr ""
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2162
 msgid "ALWAYS ON"
 msgstr ""
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2174
 msgid "Numbers act as arrows"
 msgstr ""
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Links and form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2182
 msgid "Form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2189
+#: src/LYOptions.c:2192
 msgid "Case insensitive"
 msgstr ""
 
-#: src/LYOptions.c:2190
+#: src/LYOptions.c:2193
 msgid "Case sensitive"
 msgstr ""
 
-#: src/LYOptions.c:2214
+#: src/LYOptions.c:2217
 msgid "prompt normally"
 msgstr ""
 
-#: src/LYOptions.c:2215
+#: src/LYOptions.c:2218
 msgid "force yes-response"
 msgstr ""
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2219
 msgid "force no-response"
 msgstr ""
 
-#: src/LYOptions.c:2234
+#: src/LYOptions.c:2237
 #, fuzzy
 msgid "Novice"
 msgstr "Nic"
 
-#: src/LYOptions.c:2235
+#: src/LYOptions.c:2238
 #, fuzzy
 msgid "Intermediate"
 msgstr " (vnit鷢)"
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2239
 msgid "Advanced"
 msgstr ""
 
-#: src/LYOptions.c:2245
+#: src/LYOptions.c:2248
 msgid "By First Visit"
 msgstr ""
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2250
 msgid "By First Visit Reversed"
 msgstr ""
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2251
 msgid "As Visit Tree"
 msgstr ""
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2252
 msgid "By Last Visit"
 msgstr ""
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2254
 msgid "By Last Visit Reversed"
 msgstr ""
 
 #. Old_DTD variable
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2265
 msgid "relaxed (TagSoup mode)"
 msgstr ""
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2266
 msgid "strict (SortaSGML mode)"
 msgstr ""
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2273
 msgid "as labels"
 msgstr ""
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2274
 #, fuzzy
 msgid "as links"
 msgstr "tento odkaz."
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2281
 #, fuzzy
 msgid "show filename"
 msgstr " (chybn jm幯o souboru)"
 
-#: src/LYOptions.c:2289
+#: src/LYOptions.c:2292
 msgid "STANDARD"
 msgstr ""
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2293
 msgid "ADVANCED"
 msgstr ""
 
-#: src/LYOptions.c:2316
+#: src/LYOptions.c:2319
 #, fuzzy
 msgid "Directories first"
 msgstr "Podadres暟e:"
 
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2320
 #, fuzzy
 msgid "Files first"
 msgstr " jako prvn."
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2321
 msgid "Mixed style"
 msgstr ""
 
-#: src/LYOptions.c:2326 src/LYOptions.c:2343
+#: src/LYOptions.c:2329 src/LYOptions.c:2346
 #, fuzzy
 msgid "By Name"
 msgstr "Jm幯o:"
 
-#: src/LYOptions.c:2327 src/LYOptions.c:2344
+#: src/LYOptions.c:2330 src/LYOptions.c:2347
 msgid "By Type"
 msgstr ""
 
-#: src/LYOptions.c:2328 src/LYOptions.c:2345
+#: src/LYOptions.c:2331 src/LYOptions.c:2348
 #, fuzzy
 msgid "By Size"
 msgstr "Velikost v bajtech:"
 
-#: src/LYOptions.c:2329 src/LYOptions.c:2346
+#: src/LYOptions.c:2332 src/LYOptions.c:2349
 #, fuzzy
 msgid "By Date"
 msgstr "Datum:"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2333
 msgid "By Mode"
 msgstr ""
 
-#: src/LYOptions.c:2332
+#: src/LYOptions.c:2335
 msgid "By User"
 msgstr ""
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 #, fuzzy
 msgid "By Group"
 msgstr "Skupina"
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2357
 msgid "Do not show rate"
 msgstr ""
 
-#: src/LYOptions.c:2355 src/LYOptions.c:2356
+#: src/LYOptions.c:2358 src/LYOptions.c:2359
 #, fuzzy, c-format
 msgid "Show %s/sec rate"
 msgstr "P鷫nos dat dokon鋀n"
 
-#: src/LYOptions.c:2358 src/LYOptions.c:2359
+#: src/LYOptions.c:2361 src/LYOptions.c:2362
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr ""
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2374
 msgid "Accept lynx's internal types"
 msgstr ""
 
-#: src/LYOptions.c:2372
+#: src/LYOptions.c:2375
 msgid "Also accept lynx.cfg's types"
 msgstr ""
 
-#: src/LYOptions.c:2373
+#: src/LYOptions.c:2376
 msgid "Also accept user's types"
 msgstr ""
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "Also accept system's types"
 msgstr ""
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 #, fuzzy
 msgid "Accept all types"
 msgstr "P鷡jmout zm髶y"
 
-#: src/LYOptions.c:2384
+#: src/LYOptions.c:2387
 msgid "gzip"
 msgstr ""
 
-#: src/LYOptions.c:2385
+#: src/LYOptions.c:2388
 msgid "deflate"
 msgstr ""
 
-#: src/LYOptions.c:2388
+#: src/LYOptions.c:2391
 msgid "compress"
 msgstr ""
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2394
 msgid "bzip2"
 msgstr ""
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2396
 msgid "All"
 msgstr ""
 
-#: src/LYOptions.c:2658 src/LYOptions.c:2682
+#: src/LYOptions.c:2664 src/LYOptions.c:2688
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr ""
 
-#: src/LYOptions.c:3429
+#: src/LYOptions.c:3438
 msgid "(options marked with (!) will not be saved)"
 msgstr ""
 
-#: src/LYOptions.c:3437
+#: src/LYOptions.c:3446
 msgid "General Preferences"
 msgstr "Osobn nastaven"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3450
 msgid "User mode"
 msgstr "U養vatelsk re養m"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3447
+#: src/LYOptions.c:3456
 msgid "Editor"
 msgstr "Editor"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3461
 msgid "Type of Search"
 msgstr ""
 
-#: src/LYOptions.c:3457
+#: src/LYOptions.c:3466
 msgid "Security and Privacy"
 msgstr ""
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3461
+#: src/LYOptions.c:3470
 msgid "Cookies"
 msgstr "Cookies"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3475
+#: src/LYOptions.c:3484
 msgid "Invalid-Cookie Prompting"
 msgstr ""
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3482
+#: src/LYOptions.c:3491
 msgid "SSL Prompting"
 msgstr ""
 
-#: src/LYOptions.c:3488
+#: src/LYOptions.c:3497
 msgid "Keyboard Input"
 msgstr ""
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3492
+#: src/LYOptions.c:3501
 msgid "Keypad mode"
 msgstr "Re養m numerick kl嫛esnice"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3498
+#: src/LYOptions.c:3507
 msgid "Emacs keys"
 msgstr "Emacs kl嫛esy"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3513
 msgid "VI keys"
 msgstr "VI kl嫛esy"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3511
+#: src/LYOptions.c:3520
 msgid "Line edit style"
 msgstr ""
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3532
 msgid "Keyboard layout"
 msgstr ""
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3537
+#: src/LYOptions.c:3546
 msgid "Display and Character Set"
 msgstr "M疄tn znakov sada"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3542
+#: src/LYOptions.c:3551
 #, fuzzy
 msgid "Use locale-based character set"
 msgstr "P鷫dpokl墂an znakov sada"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3551
+#: src/LYOptions.c:3560
 msgid "Display character set"
 msgstr "M疄tn znakov sada"
 
-#: src/LYOptions.c:3582
+#: src/LYOptions.c:3591
 msgid "Assumed document character set"
 msgstr "P鷫dpokl墂an znakov sada"
 
@@ -4814,175 +4814,178 @@ msgstr "P鷫dpokl墂an znakov sada"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3602
+#: src/LYOptions.c:3611
 msgid "CJK mode"
 msgstr "CJK re養m"
 
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3613
 msgid "Raw 8-bit"
 msgstr "P齶m 8bitov re養m"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3612
+#: src/LYOptions.c:3621
 msgid "X Display"
 msgstr "X Display"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3618
+#: src/LYOptions.c:3627
 msgid "Document Appearance"
 msgstr ""
 
-#: src/LYOptions.c:3624
+#: src/LYOptions.c:3633
 msgid "Show color"
 msgstr "Zobrazovat barvy"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3648
+#: src/LYOptions.c:3657
 msgid "Show cursor"
 msgstr "Zobrazovat kurzor"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3663
 #, fuzzy
 msgid "Underline links"
 msgstr "Skryt odkazy:"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3670
 #, fuzzy
 msgid "Show scrollbar"
 msgstr "Zobrazovat barvy"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3668
+#: src/LYOptions.c:3677
 msgid "Popups for select fields"
 msgstr "Vyskakovac menu pro zvolen pole"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3674
+#: src/LYOptions.c:3683
 msgid "HTML error recovery"
 msgstr "Zotaven po chyb塶h HTML"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3680
+#: src/LYOptions.c:3689
 msgid "Show images"
 msgstr "Zobrazen obr嫙k"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3694
+#: src/LYOptions.c:3703
 msgid "Verbose images"
 msgstr "Doslovn obr嫙ky"
 
-#: src/LYOptions.c:3703
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3711
 msgid "Headers Transferred to Remote Servers"
 msgstr "HTTP hlavi鋘y"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3715
 msgid "Personal mail address"
 msgstr "Osobn adresa elektronick po靖y"
 
 #. Mail Address: INPUT
-#: src/LYOptions.c:3712
+#: src/LYOptions.c:3720
 #, fuzzy
 msgid "Password for anonymous ftp"
 msgstr "Heslo na news serveru '%s':"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3717
+#: src/LYOptions.c:3725
 #, fuzzy
 msgid "Preferred media type"
 msgstr "P鷫neseno bajt: %d"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3723
+#: src/LYOptions.c:3731
 #, fuzzy
 msgid "Preferred encoding"
 msgstr "Up鷫dnost犦van jazyk dokumentu"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3729
+#: src/LYOptions.c:3737
 msgid "Preferred document character set"
 msgstr "Up鷫dnost犦van znakov sada"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3742
 msgid "Preferred document language"
 msgstr "Up鷫dnost犦van jazyk dokumentu"
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3748
 msgid "User-Agent header"
 msgstr "Hlavi鋘a 'User-Agent'"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3748
+#: src/LYOptions.c:3756
 msgid "Listing and Accessing Files"
 msgstr ""
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3752
+#: src/LYOptions.c:3760
 msgid "FTP sort criteria"
 msgstr "凔zen FTP adres暟"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3759
+#: src/LYOptions.c:3767
 msgid "Local directory sort criteria"
 msgstr "凔zen lok嫮n獳h adres暟"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3773
 #, fuzzy
 msgid "Local directory sort order"
 msgstr "凔zen lok嫮n獳h adres暟"
 
-#: src/LYOptions.c:3774
+#: src/LYOptions.c:3782
 msgid "Show dot files"
 msgstr "Zobrazovat te鋘ov soubory"
 
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3790
 msgid "Execution links"
 msgstr "Spustiteln odkazy"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3810
 msgid "Show transfer rate"
 msgstr "P鷫nos dat dokon鋀n"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3830
 msgid "Special Files and Screens"
 msgstr ""
 
-#: src/LYOptions.c:3827
+#: src/LYOptions.c:3835
 msgid "Multi-bookmarks"
 msgstr "D骴en z嫮o餒y"
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3843
 msgid "Review/edit Bookmarks files"
 msgstr "Editace podsoubor se z嫮o餒ami"
 
-#: src/LYOptions.c:3837
+#: src/LYOptions.c:3845
 msgid "Goto multi-bookmark menu"
 msgstr "Menu d骴ench z嫮o頡k"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3847
 msgid "Bookmarks file"
 msgstr "Soubor se z嫮o餒ami"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3845
+#: src/LYOptions.c:3853
 msgid "Visited Pages"
 msgstr "Nav靖癉en odkazy"
 
-#: src/LYOptions.c:3850
+#: src/LYOptions.c:3858
 #, fuzzy
 msgid "View the file "
 msgstr "Poslat soubor po靖ou"
@@ -5101,38 +5104,38 @@ msgstr "Lynx: nelze spustit, soubor %s s pravidly CERN nen dostupn\n"
 msgid "(no name)"
 msgstr "(擔dn jm幯o)"
 
-#: src/LYReadCFG.c:1782
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "V獳e ne %d vno鷫nch vlo頡n z lynx.cfg -- nejedn se o nekone鋝ou smy鋘u?!?\n"
 
-#: src/LYReadCFG.c:1784
+#: src/LYReadCFG.c:1786
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Posledn vlo頡n soubor je '%s'.\n"
 
-#: src/LYReadCFG.c:1785
+#: src/LYReadCFG.c:1787
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "vlo頡n z '%s'.\n"
 
-#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263
+#: src/LYReadCFG.c:2194 src/LYReadCFG.c:2207 src/LYReadCFG.c:2265
 msgid "The following is read from your lynx.cfg file."
 msgstr "N嫳leduj獳 daje jsou 鋈eny z va鈹ho lynx.cfg."
 
-#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206
+#: src/LYReadCFG.c:2195 src/LYReadCFG.c:2208
 msgid "Please read the distribution"
 msgstr "P鷫鋈鮅e si implicitn dod嫛an s distribuc"
 
-#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209
+#: src/LYReadCFG.c:2201 src/LYReadCFG.c:2211
 msgid "for more comments."
 msgstr "pro v獳e informac."
 
-#: src/LYReadCFG.c:2245
+#: src/LYReadCFG.c:2247
 msgid "RELOAD THE CHANGES"
 msgstr "NA炓T ZM姖Y"
 
-#: src/LYReadCFG.c:2253
+#: src/LYReadCFG.c:2255
 msgid "Your primary configuration"
 msgstr "Va鈹 prim嫫n konfigurace"
 
@@ -5406,34 +5409,34 @@ msgstr "Poslat na:"
 msgid "Upload options:"
 msgstr "Menu voleb pos璱嫕:"
 
-#: src/LYUtils.c:1716
+#: src/LYUtils.c:1777
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2493
+#: src/LYUtils.c:2554
 msgid "Unexpected access protocol for this URL scheme."
 msgstr ""
 
-#: src/LYUtils.c:3301
+#: src/LYUtils.c:3362
 msgid "Too many tempfiles"
 msgstr ""
 
-#: src/LYUtils.c:3605
+#: src/LYUtils.c:3666
 #, fuzzy
 msgid "unknown restriction"
 msgstr "nezn嫥 pole 鋱 odkaz"
 
-#: src/LYUtils.c:3635
+#: src/LYUtils.c:3696
 #, c-format
 msgid "No restrictions set.\n"
 msgstr ""
 
-#: src/LYUtils.c:3638
+#: src/LYUtils.c:3699
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Popis:\n"
 
-#: src/LYUtils.c:5022
+#: src/LYUtils.c:5077
 msgid "Cannot find HOME directory"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index 5555d60b..56f45297 100644
--- a/po/da.po
+++ b/po/da.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.6-dev8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-30 18:03-0400\n"
+"POT-Creation-Date: 2005-10-16 19:03-0400\n"
 "PO-Revision-Date: 2004-11-12 17:30+0100\n"
 "Last-Translator: Morten Bo Johansen <mojo@mbjnet.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -2245,7 +2245,7 @@ msgstr "(Ingen navn.)"
 msgid "(No value.)"
 msgstr "(Ingen v熳di.)"
 
-#: LYMessages.c:713 src/LYOptions.c:2382
+#: LYMessages.c:713 src/LYOptions.c:2385
 msgid "None"
 msgstr "Ingen"
 
@@ -2791,7 +2791,7 @@ msgstr "Dokument med 'POST'-indhold ikke fundet i cache. Genindsend?"
 msgid "Loading failed, use a previous copy."
 msgstr "Indl犘ning slog fejl, brug en foreg嶒nde kopi."
 
-#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8508
+#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8515
 msgid "Loading incomplete."
 msgstr "Indl犘ning ikke fuldf鷨t."
 
@@ -2906,12 +2906,12 @@ msgstr "Adgangskode for nyhedsv熳t (news) '%s':"
 msgid "Change password?"
 msgstr "Skift adgangskode?"
 
-#: WWW/Library/Implementation/HTNews.c:1736
+#: WWW/Library/Implementation/HTNews.c:1706
 #, c-format
 msgid "No matches for: %s"
 msgstr "Ingen resultater for: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1789
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2919,7 +2919,7 @@ msgstr ""
 "\n"
 "Ingen artikler i denne gruppe.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1801
+#: WWW/Library/Implementation/HTNews.c:1768
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2930,16 +2930,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1814
+#: WWW/Library/Implementation/HTNews.c:1781
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  Artikler %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1837
+#: WWW/Library/Implementation/HTNews.c:1804
 msgid "Earlier articles"
 msgstr "Tidligere artikler"
 
-#: WWW/Library/Implementation/HTNews.c:1850
+#: WWW/Library/Implementation/HTNews.c:1817
 #, c-format
 msgid ""
 "\n"
@@ -2949,41 +2949,41 @@ msgstr ""
 "\n"
 "Der er i 鷮eblikket ca. %d artikler i %s, ID'er som f鷲ger:\n"
 
-#: WWW/Library/Implementation/HTNews.c:1912
+#: WWW/Library/Implementation/HTNews.c:1879
 msgid "All available articles in "
 msgstr "Alle tilg熡gelige artikler i "
 
-#: WWW/Library/Implementation/HTNews.c:2133
+#: WWW/Library/Implementation/HTNews.c:2093
 msgid "Later articles"
 msgstr "Nyere artikler"
 
-#: WWW/Library/Implementation/HTNews.c:2156
+#: WWW/Library/Implementation/HTNews.c:2116
 msgid "Post to "
 msgstr "Send til "
 
-#: WWW/Library/Implementation/HTNews.c:2377
+#: WWW/Library/Implementation/HTNews.c:2337
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Denne klient kan ikke bruge SNEWS-adresser."
 
-#: WWW/Library/Implementation/HTNews.c:2585
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr "Intet m嶚 for r tekst!"
 
-#: WWW/Library/Implementation/HTNews.c:2616
+#: WWW/Library/Implementation/HTNews.c:2576
 msgid "Connecting to NewsHost ..."
 msgstr "Kontakter nyhedsv熳t ..."
 
-#: WWW/Library/Implementation/HTNews.c:2668
+#: WWW/Library/Implementation/HTNews.c:2628
 #, c-format
 msgid "Could not access %s."
 msgstr "Kunne ikke tilg %s."
 
-#: WWW/Library/Implementation/HTNews.c:2774
+#: WWW/Library/Implementation/HTNews.c:2734
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "Kan ikke l犘e nyhedsinfo. Nyhedsv熳t %.20s svarede: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2778
+#: WWW/Library/Implementation/HTNews.c:2738
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Kan ikke l犘e nyhedsinfo, tomt svar fra v熳t %s"
@@ -2991,22 +2991,22 @@ msgstr "Kan ikke l犘e nyhedsinfo, tomt svar fra v熳t %s"
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2982
+#: WWW/Library/Implementation/HTNews.c:2942
 msgid "Reading list of available newsgroups."
 msgstr "Indl犘er liste over tilg熡gelige nyhedsgrupper.."
 
-#: WWW/Library/Implementation/HTNews.c:3003
+#: WWW/Library/Implementation/HTNews.c:2963
 msgid "Reading list of articles in newsgroup."
 msgstr "Indl犘er liste over artikler i nyhedsgruppe.."
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:3009
+#: WWW/Library/Implementation/HTNews.c:2969
 msgid "Reading news article."
 msgstr "L犘er nyhedsartikel.."
 
-#: WWW/Library/Implementation/HTNews.c:3039
+#: WWW/Library/Implementation/HTNews.c:2999
 msgid "Sorry, could not load requested news."
 msgstr "Beklager, kunne ikke indl犘e artikler."
 
@@ -3014,11 +3014,11 @@ msgstr "Beklager, kunne ikke indl犘e artikler."
 msgid "Address has invalid port"
 msgstr "Adresse har en ugyldig port"
 
-#: WWW/Library/Implementation/HTTCP.c:1320
+#: WWW/Library/Implementation/HTTCP.c:1308
 msgid "Address length looks invalid"
 msgstr "Adressel熡gde forekommer ugyldig"
 
-#: WWW/Library/Implementation/HTTCP.c:1552 WWW/Library/Implementation/HTTCP.c:1570
+#: WWW/Library/Implementation/HTTCP.c:1539 WWW/Library/Implementation/HTTCP.c:1557
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Ude af stand til at finde fremmed v熳t %s."
@@ -3027,38 +3027,38 @@ msgstr "Ude af stand til at finde fremmed v熳t %s."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1567 WWW/Library/Implementation/HTTelnet.c:108
+#: WWW/Library/Implementation/HTTCP.c:1554 WWW/Library/Implementation/HTTelnet.c:108
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Ugyldigt v熳tsnavn %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1568
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Opretter %s-forbindelse til %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1579
 msgid "socket failed."
 msgstr "sokkel fejlede."
 
-#: WWW/Library/Implementation/HTTCP.c:1605
+#: WWW/Library/Implementation/HTTCP.c:1592
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "sokkel fejlede: familie %d adr. %s port %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1629
+#: WWW/Library/Implementation/HTTCP.c:1616
 msgid "Could not make connection non-blocking."
 msgstr "Kunne ikke oprette en ikke-blokerende forbindelse."
 
-#: WWW/Library/Implementation/HTTCP.c:1697
+#: WWW/Library/Implementation/HTTCP.c:1684
 msgid "Connection failed (too many retries)."
 msgstr "Forbindelse opgivet (for mange fors鷤)."
 
-#: WWW/Library/Implementation/HTTCP.c:1896
+#: WWW/Library/Implementation/HTTCP.c:1883
 msgid "Could not restore socket to blocking."
 msgstr "Kunne ikke f sokkel til at blokere."
 
-#: WWW/Library/Implementation/HTTCP.c:1962
+#: WWW/Library/Implementation/HTTCP.c:1949
 msgid "Socket read failed for 180,000 tries."
 msgstr "L犘ning af sokkel slog fejl i 180.000 fors鷤."
 
@@ -3362,98 +3362,98 @@ msgstr "Hukommelse opbrugt, fremvisning afbrudt!"
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Hukommelse opbrugt, vil afbryde overf鷨sel!"
 
-#: src/GridText.c:3594
+#: src/GridText.c:3601
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** HUKOMMELSE OPBRUGT ***"
 
-#: src/GridText.c:6013 src/GridText.c:6020 src/LYList.c:248
+#: src/GridText.c:6020 src/GridText.c:6027 src/LYList.c:248
 msgid "unknown field or link"
 msgstr "ukendt felt eller link"
 
-#: src/GridText.c:6029
+#: src/GridText.c:6036
 msgid "text entry field"
 msgstr "indtast tekst"
 
-#: src/GridText.c:6032
+#: src/GridText.c:6039
 msgid "password entry field"
 msgstr "indtast adgangskode"
 
-#: src/GridText.c:6035
+#: src/GridText.c:6042
 msgid "checkbox"
 msgstr "afkrydsningsboks"
 
-#: src/GridText.c:6038
+#: src/GridText.c:6045
 msgid "radio button"
 msgstr "radioknap"
 
-#: src/GridText.c:6041
+#: src/GridText.c:6048
 msgid "submit button"
 msgstr "indsendelsesknap"
 
-#: src/GridText.c:6044
+#: src/GridText.c:6051
 msgid "reset button"
 msgstr "nulstillingsknap"
 
-#: src/GridText.c:6047
+#: src/GridText.c:6054
 msgid "popup menu"
 msgstr "pop up-menu"
 
-#: src/GridText.c:6050
+#: src/GridText.c:6057
 msgid "hidden form field"
 msgstr "skjult formularfelt"
 
-#: src/GridText.c:6053
+#: src/GridText.c:6060
 msgid "text entry area"
 msgstr "indtast tekst"
 
-#: src/GridText.c:6056
+#: src/GridText.c:6063
 msgid "range entry field"
 msgstr "angiv interval"
 
-#: src/GridText.c:6059
+#: src/GridText.c:6066
 msgid "file entry field"
 msgstr "angiv fil"
 
-#: src/GridText.c:6062
+#: src/GridText.c:6069
 msgid "text-submit field"
 msgstr "tekstindsendelsesfelt"
 
-#: src/GridText.c:6065
+#: src/GridText.c:6072
 msgid "image-submit button"
 msgstr "Billedindsendelsesknap"
 
-#: src/GridText.c:6068
+#: src/GridText.c:6075
 msgid "keygen field"
 msgstr "n鷤legen-felt"
 
-#: src/GridText.c:6071
+#: src/GridText.c:6078
 msgid "unknown form field"
 msgstr "ukendt formularfelt"
 
-#: src/GridText.c:10231
+#: src/GridText.c:10244
 msgid "Can't open file for uploading"
 msgstr "Kan ikke 嶙ne fil til upload"
 
-#: src/GridText.c:11384
+#: src/GridText.c:11397
 #, c-format
 msgid "Submitting %s"
 msgstr "Indsender %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12533
+#: src/GridText.c:12546
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Program h熡ger: TextAnchor-struktur 鷣elagt - det er bedst at afbryde!"
 
 #. don't show previous state
-#: src/GridText.c:12738
+#: src/GridText.c:12751
 msgid "Wrap lines to fit displayed area?"
 msgstr "Ombryd linjer s de passer til det viste omr嶟e?"
 
-#: src/GridText.c:12790
+#: src/GridText.c:12803
 msgid "Very long lines have been wrapped!"
 msgstr "Meget lange linjer er blevet ombrudt!"
 
-#: src/GridText.c:13232
+#: src/GridText.c:13245
 msgid "Very long lines have been truncated!"
 msgstr "Meget lange linjer er blevet afkortet!"
 
@@ -3559,15 +3559,15 @@ msgstr "Filsti:"
 msgid "(unknown)"
 msgstr "(ukendt)"
 
-#: src/HTML.c:7374
+#: src/HTML.c:7375
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Dokument har kun skjulte links. Brug 'l'istekommandoen."
 
-#: src/HTML.c:7873
+#: src/HTML.c:7874
 msgid "Source cache error - disk full?"
 msgstr "Cache-fejl - diskplads opbrugt?"
 
-#: src/HTML.c:7886
+#: src/HTML.c:7887
 msgid "Source cache error - not enough memory!"
 msgstr "Cache-fejl - ikke nok hukommelse!"
 
@@ -3672,31 +3672,31 @@ msgstr "Intern"
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "'cookie_domain_set_flag'-fejl, afbryder program"
 
-#: src/LYCurses.c:1017
+#: src/LYCurses.c:1034
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Klarg鷨ing af terminal slog fejl - ukendt terminaltype?"
 
-#: src/LYCurses.c:1442
+#: src/LYCurses.c:1459
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1446
+#: src/LYCurses.c:1463
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Du skal bruge en vt100, 200, etc. terminal med dette program."
 
-#: src/LYCurses.c:1495
+#: src/LYCurses.c:1512
 msgid "Your Terminal type is unknown!"
 msgstr "Din terminaltype er ukendt!"
 
-#: src/LYCurses.c:1496
+#: src/LYCurses.c:1513
 msgid "Enter a terminal type:"
 msgstr "Anf鷨 en terminaltype:"
 
-#: src/LYCurses.c:1510
+#: src/LYCurses.c:1527
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TERMINAL-TYPE SAT TIL"
 
-#: src/LYCurses.c:2007
+#: src/LYCurses.c:2031
 #, c-format
 msgid ""
 "\n"
@@ -3705,7 +3705,7 @@ msgstr ""
 "\n"
 "En kritisk fejl opstod i %s Ver. %s\n"
 
-#: src/LYCurses.c:2010
+#: src/LYCurses.c:2034
 #, c-format
 msgid ""
 "\n"
@@ -4241,52 +4241,52 @@ msgstr ""
 "Lynx-fil %s er ikke tilg熡gelig.\n"
 "\n"
 
-#: src/LYMain.c:1763
+#: src/LYMain.c:1750
 msgid "Warning:"
 msgstr "Advarsel:"
 
-#: src/LYMain.c:2328
+#: src/LYMain.c:2315
 msgid "persistent cookies state will be changed in next session only."
 msgstr "躪dring for varige cookier vil kun g熞de n犘te session."
 
-#: src/LYMain.c:2565 src/LYMain.c:2610
+#: src/LYMain.c:2552 src/LYMain.c:2597
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: Ignorerer ukendt tegns犚=%s\n"
 
-#: src/LYMain.c:3121
+#: src/LYMain.c:3108
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Version %s (%s)"
 
-#: src/LYMain.c:3156
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Bygget p %s %s %s\n"
 
-#: src/LYMain.c:3178
+#: src/LYMain.c:3165
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors."
 msgstr "Ophavsret indehaves af University of Kansas, CERN og andre bidragydere."
 
-#: src/LYMain.c:3179
+#: src/LYMain.c:3166
 msgid "Distributed under the GNU General Public License."
 msgstr "Distribueret under GNU General Public License."
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3167
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Se http://lynx.isc.org/ og online-hj熞pen for flere oplysninger."
 
-#: src/LYMain.c:3952
+#: src/LYMain.c:3939
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "BRUG: %s [valgmuligheder] [fil]\n"
 
-#: src/LYMain.c:3953
+#: src/LYMain.c:3940
 #, c-format
 msgid "Options are:\n"
 msgstr "Valgmuligheder er:\n"
 
-#: src/LYMain.c:4252
+#: src/LYMain.c:4239
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Ugyldig indstilling: %s\n"
@@ -4360,7 +4360,7 @@ msgstr "TABEL-centrering sl嶒t fra."
 msgid "Current URL is empty."
 msgstr "Aktuelle adresse er tom."
 
-#: src/LYMainLoop.c:6935 src/LYUtils.c:1714
+#: src/LYMainLoop.c:6935 src/LYUtils.c:1775
 msgid "Copy to clipboard failed."
 msgstr "Kopiering til klippebord slog fejl."
 
@@ -4456,345 +4456,345 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "Indl熚 har ingen oprindelig tekst!"
 
-#: src/LYOptions.c:758
+#: src/LYOptions.c:761
 msgid "review/edit B)ookmarks files"
 msgstr "gennemse/rediger B)ogm熳kefiler"
 
-#: src/LYOptions.c:760
+#: src/LYOptions.c:763
 msgid "B)ookmark file: "
 msgstr "B)ogm熳kefil: "
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2126 src/LYOptions.c:2133
 msgid "ON"
 msgstr "SL躋T TIL"
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2277 src/LYOptions.c:2288
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280 src/LYOptions.c:2291
 msgid "OFF"
 msgstr "SL躋T FRA"
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2128
 msgid "NEVER"
 msgstr "ALDRIG"
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2129
 msgid "ALWAYS"
 msgstr "ALTID"
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2269
+#: src/LYOptions.c:2145 src/LYOptions.c:2272
 msgid "ignore"
 msgstr "ignor廨"
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2146
 msgid "ask user"
 msgstr "sp鷨g bruger"
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2147
 msgid "accept all"
 msgstr "godtag alle"
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS OFF"
 msgstr "ALTID SL躋T FRA"
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2160
 msgid "FOR LOCAL FILES ONLY"
 msgstr "KUN FOR LOKALE FILER"
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2162
 msgid "ALWAYS ON"
 msgstr "ALTID SL躋T TIL"
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2174
 msgid "Numbers act as arrows"
 msgstr "Pile p numerisk tastatur aktive"
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links are numbered"
 msgstr "Links er nummererede"
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Links and form fields are numbered"
 msgstr "Links og formularfelter er nummererede"
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2182
 msgid "Form fields are numbered"
 msgstr "Formularfelter er nummererede"
 
-#: src/LYOptions.c:2189
+#: src/LYOptions.c:2192
 msgid "Case insensitive"
 msgstr "Ikke versalf鷲som"
 
-#: src/LYOptions.c:2190
+#: src/LYOptions.c:2193
 msgid "Case sensitive"
 msgstr "Versalf鷲som"
 
-#: src/LYOptions.c:2214
+#: src/LYOptions.c:2217
 msgid "prompt normally"
 msgstr "normal prompt"
 
-#: src/LYOptions.c:2215
+#: src/LYOptions.c:2218
 msgid "force yes-response"
 msgstr "gennemtving bekr熠tende svar"
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2219
 msgid "force no-response"
 msgstr "gennemtving ben熚tende svar"
 
-#: src/LYOptions.c:2234
+#: src/LYOptions.c:2237
 msgid "Novice"
 msgstr "Begynder"
 
-#: src/LYOptions.c:2235
+#: src/LYOptions.c:2238
 msgid "Intermediate"
 msgstr "Videreg嶒nde"
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2239
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: src/LYOptions.c:2245
+#: src/LYOptions.c:2248
 msgid "By First Visit"
 msgstr "Ved f鷨ste bes鷤"
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2250
 msgid "By First Visit Reversed"
 msgstr "Ved f鷨ste bes鷤, i omvendt orden"
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2251
 msgid "As Visit Tree"
 msgstr "Som tr犘truktur over bes鷤"
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2252
 msgid "By Last Visit"
 msgstr "Efter sidste bes鷤"
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2254
 msgid "By Last Visit Reversed"
 msgstr "Efter sidste bes鷤, i omvendt orden"
 
 #. Old_DTD variable
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2265
 msgid "relaxed (TagSoup mode)"
 msgstr "afslappet (TagSoup-tilstand)"
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2266
 msgid "strict (SortaSGML mode)"
 msgstr "striks (SortaSGML-tilstand)"
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2273
 msgid "as labels"
 msgstr "som etiketter"
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2274
 msgid "as links"
 msgstr "som links"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2281
 msgid "show filename"
 msgstr "vis filnavn"
 
-#: src/LYOptions.c:2289
+#: src/LYOptions.c:2292
 msgid "STANDARD"
 msgstr "STANDARD"
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2293
 msgid "ADVANCED"
 msgstr "AVANCERET"
 
-#: src/LYOptions.c:2316
+#: src/LYOptions.c:2319
 msgid "Directories first"
 msgstr "Filkataloger f鷨st"
 
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2320
 msgid "Files first"
 msgstr "Filer f鷨st"
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2321
 msgid "Mixed style"
 msgstr "Blandet stil"
 
-#: src/LYOptions.c:2326 src/LYOptions.c:2343
+#: src/LYOptions.c:2329 src/LYOptions.c:2346
 msgid "By Name"
 msgstr "Efter navn"
 
-#: src/LYOptions.c:2327 src/LYOptions.c:2344
+#: src/LYOptions.c:2330 src/LYOptions.c:2347
 msgid "By Type"
 msgstr "Efter type"
 
-#: src/LYOptions.c:2328 src/LYOptions.c:2345
+#: src/LYOptions.c:2331 src/LYOptions.c:2348
 msgid "By Size"
 msgstr "Efter st鷨relse"
 
-#: src/LYOptions.c:2329 src/LYOptions.c:2346
+#: src/LYOptions.c:2332 src/LYOptions.c:2349
 msgid "By Date"
 msgstr "Efter dato"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2333
 msgid "By Mode"
 msgstr "Efter tilstand"
 
-#: src/LYOptions.c:2332
+#: src/LYOptions.c:2335
 msgid "By User"
 msgstr "Efter bruger"
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 msgid "By Group"
 msgstr "Efter gruppe"
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2357
 msgid "Do not show rate"
 msgstr "Vis ikke overf鷨selshastighed"
 
-#: src/LYOptions.c:2355 src/LYOptions.c:2356
+#: src/LYOptions.c:2358 src/LYOptions.c:2359
 #, c-format
 msgid "Show %s/sec rate"
 msgstr "Vis hastighed i %s/sek "
 
-#: src/LYOptions.c:2358 src/LYOptions.c:2359
+#: src/LYOptions.c:2361 src/LYOptions.c:2362
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr "Vis %s/sek, ETA"
 
 # types = mime-types
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2374
 msgid "Accept lynx's internal types"
 msgstr "Godtag Lynx' indbyggede MIME-typer"
 
-#: src/LYOptions.c:2372
+#: src/LYOptions.c:2375
 msgid "Also accept lynx.cfg's types"
 msgstr "Godtag ogs MIME-typer i lynx.cfg"
 
-#: src/LYOptions.c:2373
+#: src/LYOptions.c:2376
 msgid "Also accept user's types"
 msgstr "Godtag ogs brugerens MIME-typer"
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "Also accept system's types"
 msgstr "Godtag ogs systemets MIME-typer"
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 msgid "Accept all types"
 msgstr "Godtag alle MIME-typer"
 
-#: src/LYOptions.c:2384
+#: src/LYOptions.c:2387
 msgid "gzip"
 msgstr "gzip"
 
-#: src/LYOptions.c:2385
+#: src/LYOptions.c:2388
 msgid "deflate"
 msgstr "deflate"
 
-#: src/LYOptions.c:2388
+#: src/LYOptions.c:2391
 msgid "compress"
 msgstr "compress"
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2394
 msgid "bzip2"
 msgstr "bzip2"
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2396
 msgid "All"
 msgstr "Alle"
 
-#: src/LYOptions.c:2658 src/LYOptions.c:2682
+#: src/LYOptions.c:2664 src/LYOptions.c:2688
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Brug %s for at aktivere menu over valgmuligheder!"
 
-#: src/LYOptions.c:3429
+#: src/LYOptions.c:3438
 msgid "(options marked with (!) will not be saved)"
 msgstr "(indstillinger markeret med (!) vil ikke blive gemt)"
 
-#: src/LYOptions.c:3437
+#: src/LYOptions.c:3446
 msgid "General Preferences"
 msgstr "Generelle indstillinger"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3450
 msgid "User mode"
 msgstr "Brugertilstand"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3447
+#: src/LYOptions.c:3456
 msgid "Editor"
 msgstr "Editor"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3461
 msgid "Type of Search"
 msgstr "S鷤ningstype"
 
-#: src/LYOptions.c:3457
+#: src/LYOptions.c:3466
 msgid "Security and Privacy"
 msgstr "Sikkerhed og beskyttelse af persondata"
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3461
+#: src/LYOptions.c:3470
 msgid "Cookies"
 msgstr "Cookier"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3475
+#: src/LYOptions.c:3484
 msgid "Invalid-Cookie Prompting"
 msgstr "Prompt ved ugyldig cookie"
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3482
+#: src/LYOptions.c:3491
 msgid "SSL Prompting"
 msgstr "Prompt ved SSL"
 
-#: src/LYOptions.c:3488
+#: src/LYOptions.c:3497
 msgid "Keyboard Input"
 msgstr "Tastatur-inddata"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3492
+#: src/LYOptions.c:3501
 msgid "Keypad mode"
 msgstr "Numerisk tastaturtilstand"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3498
+#: src/LYOptions.c:3507
 msgid "Emacs keys"
 msgstr "Emacs-taster"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3513
 msgid "VI keys"
 msgstr "VI-taster"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3511
+#: src/LYOptions.c:3520
 msgid "Line edit style"
 msgstr "Linjeredigeringsstil"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3532
 msgid "Keyboard layout"
 msgstr "Tastaturudl熚ning"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3537
+#: src/LYOptions.c:3546
 msgid "Display and Character Set"
 msgstr "Sk熳m og tegns犚"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3542
+#: src/LYOptions.c:3551
 msgid "Use locale-based character set"
 msgstr "Brug tegns犚 baseret p lokaliseringsindstillinger"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3551
+#: src/LYOptions.c:3560
 msgid "Display character set"
 msgstr "Sk熳mtegns犚"
 
-#: src/LYOptions.c:3582
+#: src/LYOptions.c:3591
 msgid "Assumed document character set"
 msgstr "Formodet dokumenttegns犚"
 
@@ -4803,171 +4803,174 @@ msgstr "Formodet dokumenttegns犚"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3602
+#: src/LYOptions.c:3611
 msgid "CJK mode"
 msgstr "CJK-tilstand"
 
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3613
 msgid "Raw 8-bit"
 msgstr "R 8-bit"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3612
+#: src/LYOptions.c:3621
 msgid "X Display"
 msgstr "X-sk熳m"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3618
+#: src/LYOptions.c:3627
 msgid "Document Appearance"
 msgstr "Udseende af dokument"
 
-#: src/LYOptions.c:3624
+#: src/LYOptions.c:3633
 msgid "Show color"
 msgstr "Vis farver"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3648
+#: src/LYOptions.c:3657
 msgid "Show cursor"
 msgstr "Vis mark鷨"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3663
 msgid "Underline links"
 msgstr "Understreg links"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3670
 msgid "Show scrollbar"
 msgstr "Vis rullebj熞ke"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3668
+#: src/LYOptions.c:3677
 msgid "Popups for select fields"
 msgstr "Pop op-vinduer for valgte felter"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3674
+#: src/LYOptions.c:3683
 msgid "HTML error recovery"
 msgstr "HTML-fejlgenopretning"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3680
+#: src/LYOptions.c:3689
 msgid "Show images"
 msgstr "Vis billeder"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3694
+#: src/LYOptions.c:3703
 msgid "Verbose images"
 msgstr "Billedtekst"
 
-#: src/LYOptions.c:3703
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3711
 msgid "Headers Transferred to Remote Servers"
 msgstr "Information til fremmede servere"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3715
 msgid "Personal mail address"
 msgstr "Personlig e-post-adresse"
 
 #. Mail Address: INPUT
-#: src/LYOptions.c:3712
+#: src/LYOptions.c:3720
 #, fuzzy
 msgid "Password for anonymous ftp"
 msgstr "Adgangskode for nyhedsv熳t (news) '%s':"
 
 # media type refererer til content-type headeren, eks: image/xyz
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3717
+#: src/LYOptions.c:3725
 msgid "Preferred media type"
 msgstr "Foretrukket medietype"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3723
+#: src/LYOptions.c:3731
 msgid "Preferred encoding"
 msgstr "Foretrukket kodning"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3729
+#: src/LYOptions.c:3737
 msgid "Preferred document character set"
 msgstr "Foretrukket dokumenttegns犚"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3742
 msgid "Preferred document language"
 msgstr "Foretrukket dokumentsprog"
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3748
 msgid "User-Agent header"
 msgstr "User-Agent-linje"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3748
+#: src/LYOptions.c:3756
 msgid "Listing and Accessing Files"
 msgstr "Filoversigt og Filadgang"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3752
+#: src/LYOptions.c:3760
 msgid "FTP sort criteria"
 msgstr "FTP-sorteringskriterie"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3759
+#: src/LYOptions.c:3767
 msgid "Local directory sort criteria"
 msgstr "Sortering af lokale filkataloger"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3773
 msgid "Local directory sort order"
 msgstr "Sortering af lokale filkataloger"
 
-#: src/LYOptions.c:3774
+#: src/LYOptions.c:3782
 msgid "Show dot files"
 msgstr "Vis punktumfiler"
 
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3790
 msgid "Execution links"
 msgstr "Links til programafvikling"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3810
 msgid "Show transfer rate"
 msgstr "Vis overf鷨selshastighed"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3830
 msgid "Special Files and Screens"
 msgstr "S熳lige filer og sk熳mbilleder"
 
-#: src/LYOptions.c:3827
+#: src/LYOptions.c:3835
 msgid "Multi-bookmarks"
 msgstr "Multi-bogm熳ker"
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3843
 msgid "Review/edit Bookmarks files"
 msgstr "Gennemse/ret bogm熳kefiler"
 
-#: src/LYOptions.c:3837
+#: src/LYOptions.c:3845
 msgid "Goto multi-bookmark menu"
 msgstr "G til multi-bogm熳kemenu"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3847
 msgid "Bookmarks file"
 msgstr "Bogm熳kefil"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3845
+#: src/LYOptions.c:3853
 msgid "Visited Pages"
 msgstr "Bes鷤te sider"
 
-#: src/LYOptions.c:3850
+#: src/LYOptions.c:3858
 msgid "View the file "
 msgstr "Vis filen "
 
@@ -5087,38 +5090,38 @@ msgstr "Lynx: Kan ikke starte op, CERN-regelfil %s findes ikke\n"
 msgid "(no name)"
 msgstr "(intet navn)"
 
-#: src/LYReadCFG.c:1782
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Flere end %d inkluderingsfiler i lynx.cfg - m廛ke en sl鷮fe!?\n"
 
-#: src/LYReadCFG.c:1784
+#: src/LYReadCFG.c:1786
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Sidste inkluderingsfil der fors鷤tes indl犘t var '%s',\n"
 
-#: src/LYReadCFG.c:1785
+#: src/LYReadCFG.c:1787
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "inkluderet fra '%s'.\n"
 
-#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263
+#: src/LYReadCFG.c:2194 src/LYReadCFG.c:2207 src/LYReadCFG.c:2265
 msgid "The following is read from your lynx.cfg file."
 msgstr "F鷲gende er l犘t fra din lynx.cfg-fil."
 
-#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206
+#: src/LYReadCFG.c:2195 src/LYReadCFG.c:2208
 msgid "Please read the distribution"
 msgstr "L犘 venligst distributionen"
 
-#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209
+#: src/LYReadCFG.c:2201 src/LYReadCFG.c:2211
 msgid "for more comments."
 msgstr "for flere kommentarer."
 
-#: src/LYReadCFG.c:2245
+#: src/LYReadCFG.c:2247
 msgid "RELOAD THE CHANGES"
 msgstr "GENINDL齷 鷹DRINGERNE"
 
-#: src/LYReadCFG.c:2253
+#: src/LYReadCFG.c:2255
 msgid "Your primary configuration"
 msgstr "Din prim熳e ops犚ning"
 
@@ -5387,33 +5390,33 @@ msgstr "Upload til:"
 msgid "Upload options:"
 msgstr "Valgmuligheder for uploads:"
 
-#: src/LYUtils.c:1716
+#: src/LYUtils.c:1777
 msgid "Download document URL put to clipboard."
 msgstr "Hjemtag dokument fra adressen p klippebord."
 
-#: src/LYUtils.c:2493
+#: src/LYUtils.c:2554
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Uventet adgangsprotokol for denne adressetype."
 
-#: src/LYUtils.c:3301
+#: src/LYUtils.c:3362
 msgid "Too many tempfiles"
 msgstr "For mange tempfiler"
 
-#: src/LYUtils.c:3605
+#: src/LYUtils.c:3666
 msgid "unknown restriction"
 msgstr "ukendt begr熡sning"
 
-#: src/LYUtils.c:3635
+#: src/LYUtils.c:3696
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Ingen begr熡sninger sat.\n"
 
-#: src/LYUtils.c:3638
+#: src/LYUtils.c:3699
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Begr熡sninger sat:\n"
 
-#: src/LYUtils.c:5022
+#: src/LYUtils.c:5077
 msgid "Cannot find HOME directory"
 msgstr "Kan ikke finde HOME-katalog"
 
diff --git a/po/de.po b/po/de.po
index ada3848e..0df4dbd2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.6-dev6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-30 18:03-0400\n"
+"POT-Creation-Date: 2005-10-16 19:03-0400\n"
 "PO-Revision-Date: 2004-10-14 09:10+0200\n"
 "Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -2272,7 +2272,7 @@ msgstr "(kein Name.)"
 msgid "(No value.)"
 msgstr "(kein Wert.)"
 
-#: LYMessages.c:713 src/LYOptions.c:2382
+#: LYMessages.c:713 src/LYOptions.c:2385
 msgid "None"
 msgstr "keine"
 
@@ -2822,7 +2822,7 @@ msgstr "Dokument mit POST-Daten nicht im Seitencache gefunden. POST wiederholen?
 msgid "Loading failed, use a previous copy."
 msgstr "Laden fehlgeschalten, die vorherige Kopie wird verwendet."
 
-#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8508
+#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8515
 msgid "Loading incomplete."
 msgstr "Unvollst瓣ndig geladen."
 
@@ -2939,12 +2939,12 @@ msgstr "Password f羹r den News-Host '%s':"
 msgid "Change password?"
 msgstr "Password 瓣ndern?"
 
-#: WWW/Library/Implementation/HTNews.c:1736
+#: WWW/Library/Implementation/HTNews.c:1706
 #, c-format
 msgid "No matches for: %s"
 msgstr "Keine passenden Newsgroups f羹r: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1789
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2952,7 +2952,7 @@ msgstr ""
 "\n"
 "Keine Messages in dieser Newsgroup.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1801
+#: WWW/Library/Implementation/HTNews.c:1768
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2963,16 +2963,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1814
+#: WWW/Library/Implementation/HTNews.c:1781
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  Messages %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1837
+#: WWW/Library/Implementation/HTNews.c:1804
 msgid "Earlier articles"
 msgstr "Fr羹here Messsages"
 
-#: WWW/Library/Implementation/HTNews.c:1850
+#: WWW/Library/Implementation/HTNews.c:1817
 #, c-format
 msgid ""
 "\n"
@@ -2983,41 +2983,41 @@ msgstr ""
 "Ungef瓣hr %d Messages zur Zeit vorhanden in %s, IDs wie folgt:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1912
+#: WWW/Library/Implementation/HTNews.c:1879
 msgid "All available articles in "
 msgstr "Alle zug瓣nglichen Messages in "
 
-#: WWW/Library/Implementation/HTNews.c:2133
+#: WWW/Library/Implementation/HTNews.c:2093
 msgid "Later articles"
 msgstr "Sp瓣tere Messages"
 
-#: WWW/Library/Implementation/HTNews.c:2156
+#: WWW/Library/Implementation/HTNews.c:2116
 msgid "Post to "
 msgstr "Message hinterlassen (Post) in "
 
-#: WWW/Library/Implementation/HTNews.c:2377
+#: WWW/Library/Implementation/HTNews.c:2337
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Dieses Programm hat keine Unterst羹tzung f羹r SNEWS URLs."
 
-#: WWW/Library/Implementation/HTNews.c:2585
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr "Kein target f羹r rohen Text!"
 
-#: WWW/Library/Implementation/HTNews.c:2616
+#: WWW/Library/Implementation/HTNews.c:2576
 msgid "Connecting to NewsHost ..."
 msgstr "Verbindungserstellung zum News-Host ..."
 
-#: WWW/Library/Implementation/HTNews.c:2668
+#: WWW/Library/Implementation/HTNews.c:2628
 #, c-format
 msgid "Could not access %s."
 msgstr "Kein Zugang zu %s."
 
-#: WWW/Library/Implementation/HTNews.c:2774
+#: WWW/Library/Implementation/HTNews.c:2734
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "News-Info kann nicht gelesen werden. Server %.20s antwortet: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2778
+#: WWW/Library/Implementation/HTNews.c:2738
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "News-Info kann nicht gelesen werden. Leere Antwort von Server %s"
@@ -3025,22 +3025,22 @@ msgstr "News-Info kann nicht gelesen werden. Leere Antwort von Server %s"
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2982
+#: WWW/Library/Implementation/HTNews.c:2942
 msgid "Reading list of available newsgroups."
 msgstr "Liste vorhandener Newsgroups wird geladen."
 
-#: WWW/Library/Implementation/HTNews.c:3003
+#: WWW/Library/Implementation/HTNews.c:2963
 msgid "Reading list of articles in newsgroup."
 msgstr "Liste der vorhandenen Messages wird geladen."
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:3009
+#: WWW/Library/Implementation/HTNews.c:2969
 msgid "Reading news article."
 msgstr "News-Message wird geladen."
 
-#: WWW/Library/Implementation/HTNews.c:3039
+#: WWW/Library/Implementation/HTNews.c:2999
 msgid "Sorry, could not load requested news."
 msgstr "Entschuldigung: konnte die angeforderten News nich laden."
 
@@ -3048,11 +3048,11 @@ msgstr "Entschuldigung: konnte die angeforderten News nich laden."
 msgid "Address has invalid port"
 msgstr "Adressl瓣nge hat einen ung羹ltigen port"
 
-#: WWW/Library/Implementation/HTTCP.c:1320
+#: WWW/Library/Implementation/HTTCP.c:1308
 msgid "Address length looks invalid"
 msgstr "Adressl瓣nge scheint ung羹ltig zu sein"
 
-#: WWW/Library/Implementation/HTTCP.c:1552 WWW/Library/Implementation/HTTCP.c:1570
+#: WWW/Library/Implementation/HTTCP.c:1539 WWW/Library/Implementation/HTTCP.c:1557
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Remote Host %s nicht gefunden."
@@ -3061,38 +3061,38 @@ msgstr "Remote Host %s nicht gefunden."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1567 WWW/Library/Implementation/HTTelnet.c:108
+#: WWW/Library/Implementation/HTTCP.c:1554 WWW/Library/Implementation/HTTelnet.c:108
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Hostname ist ung羹ltig: %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1568
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "%s-Verbindung zu %s wird aufgebaut."
 
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1579
 msgid "socket failed."
 msgstr "Socket-Fehler."
 
-#: WWW/Library/Implementation/HTTCP.c:1605
+#: WWW/Library/Implementation/HTTCP.c:1592
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "Socketfehler: family %d addr %s port %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1629
+#: WWW/Library/Implementation/HTTCP.c:1616
 msgid "Could not make connection non-blocking."
 msgstr "Veerbindung konnte nicht non-blocking gemacht werden."
 
-#: WWW/Library/Implementation/HTTCP.c:1697
+#: WWW/Library/Implementation/HTTCP.c:1684
 msgid "Connection failed (too many retries)."
 msgstr "Verbindungsfehler (zu viele Versuche)."
 
-#: WWW/Library/Implementation/HTTCP.c:1896
+#: WWW/Library/Implementation/HTTCP.c:1883
 msgid "Could not restore socket to blocking."
 msgstr "Socket konnte nicht wieder blocking gemacht werden."
 
-#: WWW/Library/Implementation/HTTCP.c:1962
+#: WWW/Library/Implementation/HTTCP.c:1949
 msgid "Socket read failed for 180,000 tries."
 msgstr "Lesefehler nach 180.000 Versuchen."
 
@@ -3396,98 +3396,98 @@ msgstr "zu wenig Hauptspeicher, Anzeige abgebrochen!"
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "zu wenig Hauptspeicher, bertragung wird abgebrochen!"
 
-#: src/GridText.c:3594
+#: src/GridText.c:3601
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** MEMORY ERSCHPFT ***"
 
-#: src/GridText.c:6013 src/GridText.c:6020 src/LYList.c:248
+#: src/GridText.c:6020 src/GridText.c:6027 src/LYList.c:248
 msgid "unknown field or link"
 msgstr "unbekanntes Feld oder Link"
 
-#: src/GridText.c:6029
+#: src/GridText.c:6036
 msgid "text entry field"
 msgstr "Texteingabefeld"
 
-#: src/GridText.c:6032
+#: src/GridText.c:6039
 msgid "password entry field"
 msgstr "Password-Eingabefeld"
 
-#: src/GridText.c:6035
+#: src/GridText.c:6042
 msgid "checkbox"
 msgstr "Checkbox"
 
-#: src/GridText.c:6038
+#: src/GridText.c:6045
 msgid "radio button"
 msgstr "Radiobutton"
 
-#: src/GridText.c:6041
+#: src/GridText.c:6048
 msgid "submit button"
 msgstr "Submit-Button"
 
-#: src/GridText.c:6044
+#: src/GridText.c:6051
 msgid "reset button"
 msgstr "Reset-Button"
 
-#: src/GridText.c:6047
+#: src/GridText.c:6054
 msgid "popup menu"
 msgstr "Popup-Men羹"
 
-#: src/GridText.c:6050
+#: src/GridText.c:6057
 msgid "hidden form field"
 msgstr "verstecktes Formfeld"
 
-#: src/GridText.c:6053
+#: src/GridText.c:6060
 msgid "text entry area"
 msgstr "Texteingaberegion"
 
-#: src/GridText.c:6056
+#: src/GridText.c:6063
 msgid "range entry field"
 msgstr "Bereichseingabefeld"
 
-#: src/GridText.c:6059
+#: src/GridText.c:6066
 msgid "file entry field"
 msgstr "Dateieingabefeld"
 
-#: src/GridText.c:6062
+#: src/GridText.c:6069
 msgid "text-submit field"
 msgstr "Textsendefeld"
 
-#: src/GridText.c:6065
+#: src/GridText.c:6072
 msgid "image-submit button"
 msgstr "Image-Sendefeld"
 
-#: src/GridText.c:6068
+#: src/GridText.c:6075
 msgid "keygen field"
 msgstr "\"Keygen\"-Feld"
 
-#: src/GridText.c:6071
+#: src/GridText.c:6078
 msgid "unknown form field"
 msgstr "unbekanntes Formfeld"
 
-#: src/GridText.c:10231
+#: src/GridText.c:10244
 msgid "Can't open file for uploading"
 msgstr "Datei konnte nicht zum Upload ge繹ffnet werden!"
 
-#: src/GridText.c:11384
+#: src/GridText.c:11397
 #, c-format
 msgid "Submitting %s"
 msgstr "%s wird gesandt"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12533
+#: src/GridText.c:12546
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "H瓣nger festgestellt: TextAnchor-Konstruktion ist schadhaft - am besten abbrechen!"
 
 #. don't show previous state
-#: src/GridText.c:12738
+#: src/GridText.c:12751
 msgid "Wrap lines to fit displayed area?"
 msgstr "Zeilen umbrechen, um in den sichtbaren Bereich einzupassen?"
 
-#: src/GridText.c:12790
+#: src/GridText.c:12803
 msgid "Very long lines have been wrapped!"
 msgstr "Sehr lange Zeilen wurden umbrochen!"
 
-#: src/GridText.c:13232
+#: src/GridText.c:13245
 msgid "Very long lines have been truncated!"
 msgstr "Sehr lange Zeilen wurden abgeschnitten!"
 
@@ -3593,15 +3593,15 @@ msgstr "Dateipfad:"
 msgid "(unknown)"
 msgstr "(unbekannt)"
 
-#: src/HTML.c:7374
+#: src/HTML.c:7375
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Dokument hat nur versteckte Links. Tastenbefehl 'L' f羹r Liste."
 
-#: src/HTML.c:7873
+#: src/HTML.c:7874
 msgid "Source cache error - disk full?"
 msgstr "Source Cache Fehler - Festplatte voll?"
 
-#: src/HTML.c:7886
+#: src/HTML.c:7887
 msgid "Source cache error - not enough memory!"
 msgstr "Source Cache Fehler - nicht genug Speicher!"
 
@@ -3707,31 +3707,31 @@ msgstr "Intern"
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "cookie_domain_flag_set-Fehler, beende das Programm"
 
-#: src/LYCurses.c:1017
+#: src/LYCurses.c:1034
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Terminalinitialisierung fehlgeschlagen - unbekannter Terminaltyp?"
 
-#: src/LYCurses.c:1442
+#: src/LYCurses.c:1459
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1446
+#: src/LYCurses.c:1463
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Ein Textterminal wie VT100, VT200 usw. ist f羹r dieses Programm notwendig."
 
-#: src/LYCurses.c:1495
+#: src/LYCurses.c:1512
 msgid "Your Terminal type is unknown!"
 msgstr "Terminaltyp ist unbekannt!"
 
-#: src/LYCurses.c:1496
+#: src/LYCurses.c:1513
 msgid "Enter a terminal type:"
 msgstr "Terminaltyp eingeben:"
 
-#: src/LYCurses.c:1510
+#: src/LYCurses.c:1527
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TERMINAL TYPE IS SET TO"
 
-#: src/LYCurses.c:2007
+#: src/LYCurses.c:2031
 #, c-format
 msgid ""
 "\n"
@@ -3741,7 +3741,7 @@ msgstr ""
 " Ein fataler Fehler passierte in %s Ver. %s\n"
 
 # Yes, this is incomplete... - kw
-#: src/LYCurses.c:2010
+#: src/LYCurses.c:2034
 #, c-format
 msgid ""
 "\n"
@@ -4281,55 +4281,55 @@ msgstr ""
 "Lynx-Datei %s ist nicht verf羹gbar.\n"
 "\n"
 
-#: src/LYMain.c:1763
+#: src/LYMain.c:1750
 msgid "Warning:"
 msgstr "Warnung:"
 
 # No idea what this means.  Seems highly experimental anyway. - kw
-#: src/LYMain.c:2328
+#: src/LYMain.c:2315
 msgid "persistent cookies state will be changed in next session only."
 msgstr "Best瓣ndige Kekse werden erst beim n瓣chsten Programmaufruf ge瓣ndert."
 
-#: src/LYMain.c:2565 src/LYMain.c:2610
+#: src/LYMain.c:2552 src/LYMain.c:2597
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: ignoriere unbekannte Codierung (charset)=%s\n"
 
-#: src/LYMain.c:3121
+#: src/LYMain.c:3108
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Version %s (%s)"
 
-#: src/LYMain.c:3156
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Kompiliert auf %s, %s %s\n"
 
-#: src/LYMain.c:3178
+#: src/LYMain.c:3165
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors."
 msgstr ""
 "Copyrights gehalten von der University of Kansas, dem CERN und anderen\n"
 "Beitr瓣gern."
 
-#: src/LYMain.c:3179
+#: src/LYMain.c:3166
 msgid "Distributed under the GNU General Public License."
 msgstr "Verbreitet unter den Bedingungen der GNU General Public License."
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3167
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Weitere Informationen: http://lynx.isc.org/ und die Online-Hilfe."
 
-#: src/LYMain.c:3952
+#: src/LYMain.c:3939
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "AUFRUF: %s [optionen] [datei oder URL]\n"
 
-#: src/LYMain.c:3953
+#: src/LYMain.c:3940
 #, c-format
 msgid "Options are:\n"
 msgstr "Optionen sind:\n"
 
-#: src/LYMain.c:4252
+#: src/LYMain.c:4239
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Ung羹ltige Option: %s\n"
@@ -4404,7 +4404,7 @@ msgstr "TABLE-Zentrierung ausschalten."
 msgid "Current URL is empty."
 msgstr "Aktueller URL ist leer."
 
-#: src/LYMainLoop.c:6935 src/LYUtils.c:1714
+#: src/LYMainLoop.c:6935 src/LYUtils.c:1775
 msgid "Copy to clipboard failed."
 msgstr "Kopieren in das Clipboard fehlgeschlagen."
 
@@ -4500,344 +4500,344 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "Die Message hat keinen neuen Text!"
 
-#: src/LYOptions.c:758
+#: src/LYOptions.c:761
 msgid "review/edit B)ookmarks files"
 msgstr "Lesezeichendateien ((B)ookmark files) ansehen/瓣ndern"
 
-#: src/LYOptions.c:760
+#: src/LYOptions.c:763
 msgid "B)ookmark file: "
 msgstr "Lesezeichendatei/(B)ookmark file: "
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2126 src/LYOptions.c:2133
 msgid "ON"
 msgstr "AN"
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2277 src/LYOptions.c:2288
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280 src/LYOptions.c:2291
 msgid "OFF"
 msgstr "AUS"
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2128
 msgid "NEVER"
 msgstr "NIE"
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2129
 msgid "ALWAYS"
 msgstr "IMMER"
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2269
+#: src/LYOptions.c:2145 src/LYOptions.c:2272
 msgid "ignore"
 msgstr "ignorieren"
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2146
 msgid "ask user"
 msgstr "Benutzer fragen"
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2147
 msgid "accept all"
 msgstr "alle akzeptieren"
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS OFF"
 msgstr "IMMER AUS"
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2160
 msgid "FOR LOCAL FILES ONLY"
 msgstr "NUR FR LOKALE DATEIEN"
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2162
 msgid "ALWAYS ON"
 msgstr "IMMER AN"
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2174
 msgid "Numbers act as arrows"
 msgstr "Zahlen als Pfeiltasten"
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links are numbered"
 msgstr "Numerierte Links"
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Links and form fields are numbered"
 msgstr "Links und Formularfelder numerieren"
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2182
 msgid "Form fields are numbered"
 msgstr "Numerierte Formularfelder"
 
-#: src/LYOptions.c:2189
+#: src/LYOptions.c:2192
 msgid "Case insensitive"
 msgstr "Gro/klein nicht unterscheiden"
 
-#: src/LYOptions.c:2190
+#: src/LYOptions.c:2193
 msgid "Case sensitive"
 msgstr "Gro/klein unterscheiden<"
 
-#: src/LYOptions.c:2214
+#: src/LYOptions.c:2217
 msgid "prompt normally"
 msgstr "normal auffordern"
 
-#: src/LYOptions.c:2215
+#: src/LYOptions.c:2218
 msgid "force yes-response"
 msgstr "Ja-Antwort erzwingen"
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2219
 msgid "force no-response"
 msgstr "Nein-Antwort erzwingen"
 
-#: src/LYOptions.c:2234
+#: src/LYOptions.c:2237
 msgid "Novice"
 msgstr "Neuling"
 
-#: src/LYOptions.c:2235
+#: src/LYOptions.c:2238
 msgid "Intermediate"
 msgstr "M瓣ig Ge羹bter"
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2239
 msgid "Advanced"
 msgstr "Fortgeschrittener"
 
-#: src/LYOptions.c:2245
+#: src/LYOptions.c:2248
 msgid "By First Visit"
 msgstr "Nach erstem Besuch"
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2250
 msgid "By First Visit Reversed"
 msgstr "Nach erstem Besuch (r羹ckl瓣ufig)"
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2251
 msgid "As Visit Tree"
 msgstr "Als Besuchsbaum"
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2252
 msgid "By Last Visit"
 msgstr "Nach letztem Besuch"
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2254
 msgid "By Last Visit Reversed"
 msgstr "Nach letztem Besuch (r羹ckl瓣ufig)"
 
 #. Old_DTD variable
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2265
 msgid "relaxed (TagSoup mode)"
 msgstr "l瓣ssig (TagSoup-Modus)"
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2266
 msgid "strict (SortaSGML mode)"
 msgstr "strikt (SortaSGML-Modus)"
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2273
 msgid "as labels"
 msgstr "als Label"
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2274
 msgid "as links"
 msgstr "als Links"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2281
 msgid "show filename"
 msgstr "Dateiname anzeigen"
 
-#: src/LYOptions.c:2289
+#: src/LYOptions.c:2292
 msgid "STANDARD"
 msgstr "STANDARD"
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2293
 msgid "ADVANCED"
 msgstr "FORTGESCHRITTEN"
 
-#: src/LYOptions.c:2316
+#: src/LYOptions.c:2319
 msgid "Directories first"
 msgstr "Verzeichnisse zuerst"
 
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2320
 msgid "Files first"
 msgstr "Dateien zuerst"
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2321
 msgid "Mixed style"
 msgstr "Gemischter Stil"
 
-#: src/LYOptions.c:2326 src/LYOptions.c:2343
+#: src/LYOptions.c:2329 src/LYOptions.c:2346
 msgid "By Name"
 msgstr "Nach Name"
 
-#: src/LYOptions.c:2327 src/LYOptions.c:2344
+#: src/LYOptions.c:2330 src/LYOptions.c:2347
 msgid "By Type"
 msgstr "Nach Typus"
 
-#: src/LYOptions.c:2328 src/LYOptions.c:2345
+#: src/LYOptions.c:2331 src/LYOptions.c:2348
 msgid "By Size"
 msgstr "Nach L瓣nge"
 
-#: src/LYOptions.c:2329 src/LYOptions.c:2346
+#: src/LYOptions.c:2332 src/LYOptions.c:2349
 msgid "By Date"
 msgstr "Nach Datum"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2333
 msgid "By Mode"
 msgstr "Nach Modus"
 
-#: src/LYOptions.c:2332
+#: src/LYOptions.c:2335
 msgid "By User"
 msgstr "Nach Benutzer"
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 msgid "By Group"
 msgstr "Nach Gruppe"
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2357
 msgid "Do not show rate"
 msgstr "Rate nicht anzeigen"
 
-#: src/LYOptions.c:2355 src/LYOptions.c:2356
+#: src/LYOptions.c:2358 src/LYOptions.c:2359
 #, c-format
 msgid "Show %s/sec rate"
 msgstr "%s/sec Rate anzeigen"
 
-#: src/LYOptions.c:2358 src/LYOptions.c:2359
+#: src/LYOptions.c:2361 src/LYOptions.c:2362
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr "%s/sec, ETA, anzeigen"
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2374
 msgid "Accept lynx's internal types"
 msgstr "lynx interne Typen akzeptieren"
 
-#: src/LYOptions.c:2372
+#: src/LYOptions.c:2375
 msgid "Also accept lynx.cfg's types"
 msgstr "Auch die Typen von lynx.cfg akzeptieren<"
 
-#: src/LYOptions.c:2373
+#: src/LYOptions.c:2376
 msgid "Also accept user's types"
 msgstr "Auch die Typen des Benutzers akzeptieren<"
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "Also accept system's types"
 msgstr "Auch die Typen des Systems akzeptieren<"
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 msgid "Accept all types"
 msgstr "Alle Typen akzeptieren"
 
-#: src/LYOptions.c:2384
+#: src/LYOptions.c:2387
 msgid "gzip"
 msgstr "gzip"
 
-#: src/LYOptions.c:2385
+#: src/LYOptions.c:2388
 msgid "deflate"
 msgstr ""
 
-#: src/LYOptions.c:2388
+#: src/LYOptions.c:2391
 msgid "compress"
 msgstr "compress"
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2394
 msgid "bzip2"
 msgstr "bzip2"
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2396
 msgid "All"
 msgstr "Alle"
 
-#: src/LYOptions.c:2658 src/LYOptions.c:2682
+#: src/LYOptions.c:2664 src/LYOptions.c:2688
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "%s benutzen, um das Options-Men羹 aufzurufen"
 
-#: src/LYOptions.c:3429
+#: src/LYOptions.c:3438
 msgid "(options marked with (!) will not be saved)"
 msgstr "(mit (!) markierte Optionen werden nicht gespeichert)"
 
-#: src/LYOptions.c:3437
+#: src/LYOptions.c:3446
 msgid "General Preferences"
 msgstr "Allgmeine Pr瓣ferenzen"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3450
 msgid "User mode"
 msgstr "User mode"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3447
+#: src/LYOptions.c:3456
 msgid "Editor"
 msgstr "Editor"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3461
 msgid "Type of Search"
 msgstr "Art der Suche"
 
-#: src/LYOptions.c:3457
+#: src/LYOptions.c:3466
 msgid "Security and Privacy"
 msgstr "Sicherheit und Datenschutz"
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3461
+#: src/LYOptions.c:3470
 msgid "Cookies"
 msgstr "Kekse (Cookies)"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3475
+#: src/LYOptions.c:3484
 msgid "Invalid-Cookie Prompting"
 msgstr "Bei Invalid-Cookie nachfragen"
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3482
+#: src/LYOptions.c:3491
 msgid "SSL Prompting"
 msgstr "Bei SSL nachfragen"
 
-#: src/LYOptions.c:3488
+#: src/LYOptions.c:3497
 msgid "Keyboard Input"
 msgstr "Tastatureingabe"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3492
+#: src/LYOptions.c:3501
 msgid "Keypad mode"
 msgstr "Tastaturmodus/Keypad mode"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3498
+#: src/LYOptions.c:3507
 msgid "Emacs keys"
 msgstr "Emacstasten"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3513
 msgid "VI keys"
 msgstr "VI-Tasten"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3511
+#: src/LYOptions.c:3520
 msgid "Line edit style"
 msgstr "Art f羹r das Editieren von Zeilen"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3532
 msgid "Keyboard layout"
 msgstr "Tastaturbelegung"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3537
+#: src/LYOptions.c:3546
 msgid "Display and Character Set"
 msgstr "Display und Zeichensatz"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3542
+#: src/LYOptions.c:3551
 msgid "Use locale-based character set"
 msgstr "Locale-basierenden Zeichensatz verwenden"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3551
+#: src/LYOptions.c:3560
 msgid "Display character set"
 msgstr "Zeichensatz des Displays"
 
-#: src/LYOptions.c:3582
+#: src/LYOptions.c:3591
 msgid "Assumed document character set"
 msgstr "Angenommene Zeichensatzkodierung"
 
@@ -4846,170 +4846,173 @@ msgstr "Angenommene Zeichensatzkodierung"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3602
+#: src/LYOptions.c:3611
 msgid "CJK mode"
 msgstr "CJK-Modus"
 
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3613
 msgid "Raw 8-bit"
 msgstr "Unkonvertiert (Raw 8-bit)"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3612
+#: src/LYOptions.c:3621
 msgid "X Display"
 msgstr "X DISPLAY"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3618
+#: src/LYOptions.c:3627
 msgid "Document Appearance"
 msgstr "Aussehen des Dokuments"
 
-#: src/LYOptions.c:3624
+#: src/LYOptions.c:3633
 msgid "Show color"
 msgstr "Farbe zeigen/Show color"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3648
+#: src/LYOptions.c:3657
 msgid "Show cursor"
 msgstr "Positionsmarke zeigen/Show cursor"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3663
 msgid "Underline links"
 msgstr "Links unterstreichen"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3670
 msgid "Show scrollbar"
 msgstr "Scrollbar zeigen"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3668
+#: src/LYOptions.c:3677
 msgid "Popups for select fields"
 msgstr "Popups f羹r Select-Felder"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3674
+#: src/LYOptions.c:3683
 msgid "HTML error recovery"
 msgstr "HTML-Fehlerbehandlung"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3680
+#: src/LYOptions.c:3689
 msgid "Show images"
 msgstr "Bilder zeigen"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3694
+#: src/LYOptions.c:3703
 msgid "Verbose images"
 msgstr "Detaillierte Bildinformation"
 
-#: src/LYOptions.c:3703
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3711
 msgid "Headers Transferred to Remote Servers"
 msgstr "Einige Headers f羹r Requests zu Remote Servern verschickt"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3715
 msgid "Personal mail address"
 msgstr "Pers繹nliche Mailadresse"
 
 #. Mail Address: INPUT
-#: src/LYOptions.c:3712
+#: src/LYOptions.c:3720
 #, fuzzy
 msgid "Password for anonymous ftp"
 msgstr "Password f羹r den News-Host '%s':"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3717
+#: src/LYOptions.c:3725
 msgid "Preferred media type"
 msgstr "Erw羹nschter Medientyp"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3723
+#: src/LYOptions.c:3731
 msgid "Preferred encoding"
 msgstr "Erw羹nschte Kodierung"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3729
+#: src/LYOptions.c:3737
 msgid "Preferred document character set"
 msgstr "Erw羹nschter Zeichensatz (Accept-Charset)"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3742
 msgid "Preferred document language"
 msgstr "Erw羹nschte Dokumentsprache (Accept-Language)"
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3748
 msgid "User-Agent header"
 msgstr "Browseridentifizierung (User-Agent)"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3748
+#: src/LYOptions.c:3756
 msgid "Listing and Accessing Files"
 msgstr "Dateiverzeichnisse anlegen und auf Dateien zugreifen"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3752
+#: src/LYOptions.c:3760
 msgid "FTP sort criteria"
 msgstr "Sortierung f羹r FTP-Verzeichnisse"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3759
+#: src/LYOptions.c:3767
 msgid "Local directory sort criteria"
 msgstr "Sortierkriterien f羹r lokale Verzeichnisse"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3773
 msgid "Local directory sort order"
 msgstr "Sortierreihenfolge f羹r lokale Verzeichnisse"
 
-#: src/LYOptions.c:3774
+#: src/LYOptions.c:3782
 msgid "Show dot files"
 msgstr "Dateien mit Punkt am Anfang sichtbar"
 
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3790
 msgid "Execution links"
 msgstr "Ausf羹hrbare Links/Execution links"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3810
 msgid "Show transfer rate"
 msgstr "bertragungsrate anzeigen"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3830
 msgid "Special Files and Screens"
 msgstr "Besondere Dateien und Bildschirme"
 
-#: src/LYOptions.c:3827
+#: src/LYOptions.c:3835
 msgid "Multi-bookmarks"
 msgstr "Multi-Datein-Lesezeichen"
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3843
 msgid "Review/edit Bookmarks files"
 msgstr "Lesezeichendateien ansehen/bearbeiten"
 
-#: src/LYOptions.c:3837
+#: src/LYOptions.c:3845
 msgid "Goto multi-bookmark menu"
 msgstr "Zum Multi-Lesezeichenmen羹"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3847
 msgid "Bookmarks file"
 msgstr "Lesezeichendatei"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3845
+#: src/LYOptions.c:3853
 msgid "Visited Pages"
 msgstr "Besuchte Seiten"
 
-#: src/LYOptions.c:3850
+#: src/LYOptions.c:3858
 msgid "View the file "
 msgstr "Die Datei ansehen "
 
@@ -5129,41 +5132,41 @@ msgstr "Lynx: Programmstart verweigert, Regeldatei %s (CERN rules file) nicht ve
 msgid "(no name)"
 msgstr "(ohne Namen)"
 
-#: src/LYReadCFG.c:1782
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Mehr als %d geschachtelte lynx.cfg-Includes -- wohl eine Schleife?!?\n"
 
-#: src/LYReadCFG.c:1784
+#: src/LYReadCFG.c:1786
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "letztes INCLUDE war f羹r '%s',\n"
 
-#: src/LYReadCFG.c:1785
+#: src/LYReadCFG.c:1787
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "enthalten in '%s'.\n"
 
-#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263
+#: src/LYReadCFG.c:2194 src/LYReadCFG.c:2207 src/LYReadCFG.c:2265
 msgid "The following is read from your lynx.cfg file."
 msgstr "Folgendes ist der aktuellen Konfigurationsdatei entnommen."
 
-#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206
+#: src/LYReadCFG.c:2195 src/LYReadCFG.c:2208
 msgid "Please read the distribution"
 msgstr "Bitte die installierte Konfigurationsdatei"
 
-#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209
+#: src/LYReadCFG.c:2201 src/LYReadCFG.c:2211
 msgid "for more comments."
 msgstr ""
 " \n"
 "f羹r weitere Erl瓣uterungen ansehen."
 
 # Looks dangerous to me, so I sneak in a warning. - kw
-#: src/LYReadCFG.c:2245
+#: src/LYReadCFG.c:2247
 msgid "RELOAD THE CHANGES"
 msgstr "NEULADEN NACH NDERUNG, AUF EIGENE GEFAHR!"
 
-#: src/LYReadCFG.c:2253
+#: src/LYReadCFG.c:2255
 msgid "Your primary configuration"
 msgstr "Ihre prim瓣re Konfiguration"
 
@@ -5434,33 +5437,33 @@ msgstr "Upload - wohin:"
 msgid "Upload options:"
 msgstr "Upload-Optionen:"
 
-#: src/LYUtils.c:1716
+#: src/LYUtils.c:1777
 msgid "Download document URL put to clipboard."
 msgstr "URL des Download-Dokuments in das Clipboard gespeichert."
 
-#: src/LYUtils.c:2493
+#: src/LYUtils.c:2554
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Unerwartetes Zugangsprotokoll f羹r dieses URL-Schema."
 
-#: src/LYUtils.c:3301
+#: src/LYUtils.c:3362
 msgid "Too many tempfiles"
 msgstr "Zu viele tempor瓣re Dateien"
 
-#: src/LYUtils.c:3605
+#: src/LYUtils.c:3666
 msgid "unknown restriction"
 msgstr "unbekannte Beschr瓣nkung"
 
-#: src/LYUtils.c:3635
+#: src/LYUtils.c:3696
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Keine Beschr瓣nkungen gesetzt.\n"
 
-#: src/LYUtils.c:3638
+#: src/LYUtils.c:3699
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Aktuelle Beschr瓣nkungen:\n"
 
-#: src/LYUtils.c:5022
+#: src/LYUtils.c:5077
 msgid "Cannot find HOME directory"
 msgstr "Das HOME-Verzeichnis ist nicht zu finden"
 
diff --git a/po/es.po b/po/es.po
deleted file mode 100644
index c8c5965d..00000000
--- a/po/es.po
+++ /dev/null
@@ -1,27 +0,0 @@
-msgid ""
-msgstr ""
-"Date: 1998-08-22 16:12:20-0400\n"
-"From: Webmaster Jim <jspath@bcpl.net>\n"
-"Content-Type: text/plain; charset=\n"
-"Xgettext-Options: --default-domain=po/es\n"
-"Files: src/LYMain.c\n"
-
-#: src/LYMain.c:2502
-msgid "%s Version %s %s"
-msgstr "%s Versi鏮 %s"
-
-#: src/LYMain.c:2504
-msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
-msgstr "El copyright sostuvo al lado de la universidad de Kansas, de la CERN, y de otros contribuidores.\n"
-
-#: src/LYMain.c:2506
-msgid "Distributed under the GNU General Public License.\n"
-msgstr "Distribuido bajo la licencia el pblico en general de GNU.\n"
-
-#: src/LYMain.c:2508
-msgid ""
-"See http://lynx.browser.org/ and the online help for more information.\n"
-"\n"
-msgstr ""
-"Vea http://lynx.browser.org/ y la ayuda en l璯ea para m嫳 informaci鏮.\n"
-"\n"
diff --git a/po/et.po b/po/et.po
index 448dc431..e15c5d42 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.6-dev8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-30 18:03-0400\n"
+"POT-Creation-Date: 2005-10-16 19:03-0400\n"
 "PO-Revision-Date: 2004-11-12 13:06+0200\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -2242,7 +2242,7 @@ msgstr "(Nimeta.)"
 msgid "(No value.)"
 msgstr "(V鳵rtuseta.)"
 
-#: LYMessages.c:713 src/LYOptions.c:2382
+#: LYMessages.c:713 src/LYOptions.c:2385
 msgid "None"
 msgstr "Puudub"
 
@@ -2788,7 +2788,7 @@ msgstr "POST sisuga dokument puudub puhvrist. Postitan uuesti?"
 msgid "Loading failed, use a previous copy."
 msgstr "laadimine eba鰒nestus, kasuta eelmist koopiat."
 
-#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8508
+#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8515
 msgid "Loading incomplete."
 msgstr "Mittet鄜elik laadimine."
 
@@ -2903,12 +2903,12 @@ msgstr "Parool uudiseserverile '%s':"
 msgid "Change password?"
 msgstr "Muudan parooli?"
 
-#: WWW/Library/Implementation/HTNews.c:1736
+#: WWW/Library/Implementation/HTNews.c:1706
 #, c-format
 msgid "No matches for: %s"
 msgstr "Ei leia: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1789
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2916,7 +2916,7 @@ msgstr ""
 "\n"
 "Selles grupis ei ole artikleid.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1801
+#: WWW/Library/Implementation/HTNews.c:1768
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2927,16 +2927,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1814
+#: WWW/Library/Implementation/HTNews.c:1781
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  Artiklid %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1837
+#: WWW/Library/Implementation/HTNews.c:1804
 msgid "Earlier articles"
 msgstr "Varasemad artiklid"
 
-#: WWW/Library/Implementation/HTNews.c:1850
+#: WWW/Library/Implementation/HTNews.c:1817
 #, c-format
 msgid ""
 "\n"
@@ -2947,41 +2947,41 @@ msgstr ""
 "Leidsin umbes %d artiklit grupis %s, j酺gnevad artiklite ID:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1912
+#: WWW/Library/Implementation/HTNews.c:1879
 msgid "All available articles in "
 msgstr "K鬑k kasutatavad artiklid grupis "
 
-#: WWW/Library/Implementation/HTNews.c:2133
+#: WWW/Library/Implementation/HTNews.c:2093
 msgid "Later articles"
 msgstr "Hilisemad artiklid"
 
-#: WWW/Library/Implementation/HTNews.c:2156
+#: WWW/Library/Implementation/HTNews.c:2116
 msgid "Post to "
 msgstr "Postita gruppi "
 
-#: WWW/Library/Implementation/HTNews.c:2377
+#: WWW/Library/Implementation/HTNews.c:2337
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "See klient ei toeta SNEWS URLe."
 
-#: WWW/Library/Implementation/HTNews.c:2585
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr "Toore teksti jaoks pole kohta!"
 
-#: WWW/Library/Implementation/HTNews.c:2616
+#: WWW/Library/Implementation/HTNews.c:2576
 msgid "Connecting to NewsHost ..."
 msgstr "Loon hendust uudisegruppide serveriga ..."
 
-#: WWW/Library/Implementation/HTNews.c:2668
+#: WWW/Library/Implementation/HTNews.c:2628
 #, c-format
 msgid "Could not access %s."
 msgstr "%s ei saa kasutada."
 
-#: WWW/Library/Implementation/HTNews.c:2774
+#: WWW/Library/Implementation/HTNews.c:2734
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "Ei 鰒nestu lugeda uudiste infot. Server %.20s vastas: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2778
+#: WWW/Library/Implementation/HTNews.c:2738
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Ei 鰒nestu lugeda uudiste infot, thi vastus serverilt %s"
@@ -2989,22 +2989,22 @@ msgstr "Ei 鰒nestu lugeda uudiste infot, thi vastus serverilt %s"
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2982
+#: WWW/Library/Implementation/HTNews.c:2942
 msgid "Reading list of available newsgroups."
 msgstr "Loen kasutatavate gruppide nimekirja."
 
-#: WWW/Library/Implementation/HTNews.c:3003
+#: WWW/Library/Implementation/HTNews.c:2963
 msgid "Reading list of articles in newsgroup."
 msgstr "Loen artiklite nimekirja grupis."
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:3009
+#: WWW/Library/Implementation/HTNews.c:2969
 msgid "Reading news article."
 msgstr "Loen artiklit."
 
-#: WWW/Library/Implementation/HTNews.c:3039
+#: WWW/Library/Implementation/HTNews.c:2999
 msgid "Sorry, could not load requested news."
 msgstr "Kahjuks ei 鰒nestunud soovitud uudiseid laadida."
 
@@ -3012,11 +3012,11 @@ msgstr "Kahjuks ei 鰒nestunud soovitud uudiseid laadida."
 msgid "Address has invalid port"
 msgstr "Aadressis on vigane port"
 
-#: WWW/Library/Implementation/HTTCP.c:1320
+#: WWW/Library/Implementation/HTTCP.c:1308
 msgid "Address length looks invalid"
 msgstr "Aadressi pikkus tundub vigane"
 
-#: WWW/Library/Implementation/HTTCP.c:1552 WWW/Library/Implementation/HTTCP.c:1570
+#: WWW/Library/Implementation/HTTCP.c:1539 WWW/Library/Implementation/HTTCP.c:1557
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Ei leia serverit %s."
@@ -3025,38 +3025,38 @@ msgstr "Ei leia serverit %s."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1567 WWW/Library/Implementation/HTTelnet.c:108
+#: WWW/Library/Implementation/HTTCP.c:1554 WWW/Library/Implementation/HTTelnet.c:108
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Vigane serveri nimi %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1568
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Loon %s hendust serveriga %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1579
 msgid "socket failed."
 msgstr "socket eba鰒nestus."
 
-#: WWW/Library/Implementation/HTTCP.c:1605
+#: WWW/Library/Implementation/HTTCP.c:1592
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "socket eba鰒nestus: perekond %d aadress %s port %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1629
+#: WWW/Library/Implementation/HTTCP.c:1616
 msgid "Could not make connection non-blocking."
 msgstr "Ei 鰒nestu muuta hendust mitte-blokeerivaks."
 
-#: WWW/Library/Implementation/HTTCP.c:1697
+#: WWW/Library/Implementation/HTTCP.c:1684
 msgid "Connection failed (too many retries)."
 msgstr "鈏endus eba鰒nestus (looga palju katseid)."
 
-#: WWW/Library/Implementation/HTTCP.c:1896
+#: WWW/Library/Implementation/HTTCP.c:1883
 msgid "Could not restore socket to blocking."
 msgstr "Pistikul ei 鰒nestu taastada blokeerivat moodi."
 
-#: WWW/Library/Implementation/HTTCP.c:1962
+#: WWW/Library/Implementation/HTTCP.c:1949
 msgid "Socket read failed for 180,000 tries."
 msgstr "Pistikust lugemine eba鰒nestus 180 000 katsel."
 
@@ -3360,98 +3360,98 @@ msgstr "M鄟u on otsas, esitus katkestati!"
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "M鄟u on otsas, katkestan lekande!"
 
-#: src/GridText.c:3594
+#: src/GridText.c:3601
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** M鶉U ON OTSAS ***"
 
-#: src/GridText.c:6013 src/GridText.c:6020 src/LYList.c:248
+#: src/GridText.c:6020 src/GridText.c:6027 src/LYList.c:248
 msgid "unknown field or link"
 msgstr "tundmatu v鄟i v鬑 viide"
 
-#: src/GridText.c:6029
+#: src/GridText.c:6036
 msgid "text entry field"
 msgstr "teksti v鄟i"
 
-#: src/GridText.c:6032
+#: src/GridText.c:6039
 msgid "password entry field"
 msgstr "parooli v鄟i"
 
-#: src/GridText.c:6035
+#: src/GridText.c:6042
 msgid "checkbox"
 msgstr "m酺keruut"
 
-#: src/GridText.c:6038
+#: src/GridText.c:6045
 msgid "radio button"
 msgstr "raadionupp"
 
-#: src/GridText.c:6041
+#: src/GridText.c:6048
 msgid "submit button"
 msgstr "postitamise nupp"
 
-#: src/GridText.c:6044
+#: src/GridText.c:6051
 msgid "reset button"
 msgstr "algv鳵rtustamise nupp"
 
-#: src/GridText.c:6047
+#: src/GridText.c:6054
 msgid "popup menu"
 msgstr "hpikmen"
 
-#: src/GridText.c:6050
+#: src/GridText.c:6057
 msgid "hidden form field"
 msgstr "peidetud vormi v鄟i"
 
-#: src/GridText.c:6053
+#: src/GridText.c:6060
 msgid "text entry area"
 msgstr "tekstiala"
 
-#: src/GridText.c:6056
+#: src/GridText.c:6063
 msgid "range entry field"
 msgstr "vahemiku v鄟i"
 
-#: src/GridText.c:6059
+#: src/GridText.c:6066
 msgid "file entry field"
 msgstr "faili v鄟i"
 
-#: src/GridText.c:6062
+#: src/GridText.c:6069
 msgid "text-submit field"
 msgstr "teksti postitamise v鄟i"
 
-#: src/GridText.c:6065
+#: src/GridText.c:6072
 msgid "image-submit button"
 msgstr "pildi postitamise nupp"
 
-#: src/GridText.c:6068
+#: src/GridText.c:6075
 msgid "keygen field"
 msgstr "v鰗me loomise v鄟i"
 
-#: src/GridText.c:6071
+#: src/GridText.c:6078
 msgid "unknown form field"
 msgstr "tundmatu vormi v鄟i"
 
-#: src/GridText.c:10231
+#: src/GridText.c:10244
 msgid "Can't open file for uploading"
 msgstr "Faili ei 鰒nestu leslaadimiseks avada"
 
-#: src/GridText.c:11384
+#: src/GridText.c:11397
 #, c-format
 msgid "Submitting %s"
 msgstr "Postitan %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12533
+#: src/GridText.c:12546
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Tuvastati hangumine: TextAnchor struktuur on vigane - soovitan katkestada!"
 
 #. don't show previous state
-#: src/GridText.c:12738
+#: src/GridText.c:12751
 msgid "Wrap lines to fit displayed area?"
 msgstr "Murran read et mahtuda ekraanile?"
 
-#: src/GridText.c:12790
+#: src/GridText.c:12803
 msgid "Very long lines have been wrapped!"
 msgstr "V輍a pikad read on murtud!"
 
-#: src/GridText.c:13232
+#: src/GridText.c:13245
 msgid "Very long lines have been truncated!"
 msgstr "V輍a pikad read on l鬑gatud!"
 
@@ -3557,15 +3557,15 @@ msgstr "Failitee:"
 msgid "(unknown)"
 msgstr "(tundmatu)"
 
-#: src/HTML.c:7374
+#: src/HTML.c:7375
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Dokumendis on ainult peidetud viited. Kasuta k酲klust 'l'ist."
 
-#: src/HTML.c:7873
+#: src/HTML.c:7874
 msgid "Source cache error - disk full?"
 msgstr "L鄣tefaili puhvri viga - ketas on t鄜s?"
 
-#: src/HTML.c:7886
+#: src/HTML.c:7887
 msgid "Source cache error - not enough memory!"
 msgstr "L鄣tefaili puhvri viga - m鄟u on otsas?"
 
@@ -3669,31 +3669,31 @@ msgstr "Sisemine"
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "cookie_domain_flag_set viga, katkestan programmi t礵"
 
-#: src/LYCurses.c:1017
+#: src/LYCurses.c:1034
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Terminali initsialiseerimine eba鰒nestus - tundmatu terminali tp?"
 
-#: src/LYCurses.c:1442
+#: src/LYCurses.c:1459
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1446
+#: src/LYCurses.c:1463
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Selle programmiga peate kasutama vt100, 200 vms terminali."
 
-#: src/LYCurses.c:1495
+#: src/LYCurses.c:1512
 msgid "Your Terminal type is unknown!"
 msgstr "Teie terminali tp on tundmatu!"
 
-#: src/LYCurses.c:1496
+#: src/LYCurses.c:1513
 msgid "Enter a terminal type:"
 msgstr "Sisestage terminali tp:"
 
-#: src/LYCurses.c:1510
+#: src/LYCurses.c:1527
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TERMINALI T嗈BIKS ON SEATUD"
 
-#: src/LYCurses.c:2007
+#: src/LYCurses.c:2031
 #, c-format
 msgid ""
 "\n"
@@ -3702,7 +3702,7 @@ msgstr ""
 "\n"
 "Fataalne viga tekkis programmis %s Ver. %s\n"
 
-#: src/LYCurses.c:2010
+#: src/LYCurses.c:2034
 #, c-format
 msgid ""
 "\n"
@@ -4236,52 +4236,52 @@ msgstr ""
 "Lynx fail %s ei ole kasutatav.\n"
 "\n"
 
-#: src/LYMain.c:1763
+#: src/LYMain.c:1750
 msgid "Warning:"
 msgstr "Hoiatus:"
 
-#: src/LYMain.c:2328
+#: src/LYMain.c:2315
 msgid "persistent cookies state will be changed in next session only."
 msgstr "psivate pr鳵nikute olekut muudetakse alles j酺gmise sessiooniga."
 
-#: src/LYMain.c:2565 src/LYMain.c:2610
+#: src/LYMain.c:2552 src/LYMain.c:2597
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: ignoreerin tundmatut kooditabelit %s\n"
 
-#: src/LYMain.c:3121
+#: src/LYMain.c:3108
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Versioon %s (%s)"
 
-#: src/LYMain.c:3156
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Ehitatud %s masinal %s %s\n"
 
-#: src/LYMain.c:3178
+#: src/LYMain.c:3165
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors."
 msgstr "Autori鬑guseid omavad University of Kansas, CERN ja teised."
 
-#: src/LYMain.c:3179
+#: src/LYMain.c:3166
 msgid "Distributed under the GNU General Public License."
 msgstr "Levitatakse GNU ldise avaliku litsensiga."
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3167
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Abi ja muud infot leiate aadressil http://lynx.isc.org/."
 
-#: src/LYMain.c:3952
+#: src/LYMain.c:3939
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "KASUTAMINE: %s [v鰗med] [fail]\n"
 
-#: src/LYMain.c:3953
+#: src/LYMain.c:3940
 #, c-format
 msgid "Options are:\n"
 msgstr "V鰗med on:\n"
 
-#: src/LYMain.c:4252
+#: src/LYMain.c:4239
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Vigane v鰗i: %s\n"
@@ -4355,7 +4355,7 @@ msgstr "TABELI tsentreerimine blokeeritud."
 msgid "Current URL is empty."
 msgstr "Jooksev URL on thi."
 
-#: src/LYMainLoop.c:6935 src/LYUtils.c:1714
+#: src/LYMainLoop.c:6935 src/LYUtils.c:1775
 msgid "Copy to clipboard failed."
 msgstr "L鬑kepuhvrisse kopeerimine eba鰒nestus."
 
@@ -4451,344 +4451,344 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "Teatel puudub algne tekst!"
 
-#: src/LYOptions.c:758
+#: src/LYOptions.c:761
 msgid "review/edit B)ookmarks files"
 msgstr "vaara/toimeta B=j酺gede faile"
 
-#: src/LYOptions.c:760
+#: src/LYOptions.c:763
 msgid "B)ookmark file: "
 msgstr "B=j酺gede fail: "
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2126 src/LYOptions.c:2133
 msgid "ON"
 msgstr "SEES"
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2277 src/LYOptions.c:2288
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280 src/LYOptions.c:2291
 msgid "OFF"
 msgstr "V鶉JAS"
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2128
 msgid "NEVER"
 msgstr "MITTE KUNAGI"
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2129
 msgid "ALWAYS"
 msgstr "ALATI"
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2269
+#: src/LYOptions.c:2145 src/LYOptions.c:2272
 msgid "ignore"
 msgstr "ignoreeri"
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2146
 msgid "ask user"
 msgstr "ksi kasutajalt"
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2147
 msgid "accept all"
 msgstr "luba k鬑k"
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS OFF"
 msgstr "ALATI V鶉JAS"
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2160
 msgid "FOR LOCAL FILES ONLY"
 msgstr "AINULT KOHALIKELE FAILIDELE"
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2162
 msgid "ALWAYS ON"
 msgstr "ALATI SEES"
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2174
 msgid "Numbers act as arrows"
 msgstr "numbrid k鄜tuvad nooltena"
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links are numbered"
 msgstr "Viited on nummerdatud"
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Links and form fields are numbered"
 msgstr "Viited ja vormide v鄟jad on nummerdatud"
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2182
 msgid "Form fields are numbered"
 msgstr "Vormide v鄟jad on nummerdatud"
 
-#: src/LYOptions.c:2189
+#: src/LYOptions.c:2192
 msgid "Case insensitive"
 msgstr "T鰆tutundetu"
 
-#: src/LYOptions.c:2190
+#: src/LYOptions.c:2193
 msgid "Case sensitive"
 msgstr "T鰆tutundlik"
 
-#: src/LYOptions.c:2214
+#: src/LYOptions.c:2217
 msgid "prompt normally"
 msgstr "ksi tavap酺aselt"
 
-#: src/LYOptions.c:2215
+#: src/LYOptions.c:2218
 msgid "force yes-response"
 msgstr "paku jah-vastus"
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2219
 msgid "force no-response"
 msgstr "paku ei-vastus"
 
-#: src/LYOptions.c:2234
+#: src/LYOptions.c:2237
 msgid "Novice"
 msgstr "Algaja"
 
-#: src/LYOptions.c:2235
+#: src/LYOptions.c:2238
 msgid "Intermediate"
 msgstr "Vahepealne"
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2239
 msgid "Advanced"
 msgstr "Edasij鰔dnud"
 
-#: src/LYOptions.c:2245
+#: src/LYOptions.c:2248
 msgid "By First Visit"
 msgstr "Esmase klastuse j酺gi"
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2250
 msgid "By First Visit Reversed"
 msgstr "P礵ratud esmase klastuse j酺gi"
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2251
 msgid "As Visit Tree"
 msgstr "Klastuste puu"
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2252
 msgid "By Last Visit"
 msgstr "Viimase klastuse j酺gi"
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2254
 msgid "By Last Visit Reversed"
 msgstr "P礵ratud viimase klastuse j酺gi"
 
 #. Old_DTD variable
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2265
 msgid "relaxed (TagSoup mode)"
 msgstr "l鰗v (TagSoup mood)"
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2266
 msgid "strict (SortaSGML mode)"
 msgstr "range (SortaSGML mood)"
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2273
 msgid "as labels"
 msgstr "kui m酺gendid"
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2274
 msgid "as links"
 msgstr "kui viited"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2281
 msgid "show filename"
 msgstr "n鄜ta failinime"
 
-#: src/LYOptions.c:2289
+#: src/LYOptions.c:2292
 msgid "STANDARD"
 msgstr "STANDARD"
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2293
 msgid "ADVANCED"
 msgstr "LAIENDATUD"
 
-#: src/LYOptions.c:2316
+#: src/LYOptions.c:2319
 msgid "Directories first"
 msgstr "Esmalt kataloogid"
 
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2320
 msgid "Files first"
 msgstr "Esimalt failid"
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2321
 msgid "Mixed style"
 msgstr "Segastiil"
 
-#: src/LYOptions.c:2326 src/LYOptions.c:2343
+#: src/LYOptions.c:2329 src/LYOptions.c:2346
 msgid "By Name"
 msgstr "Nime j酺gi"
 
-#: src/LYOptions.c:2327 src/LYOptions.c:2344
+#: src/LYOptions.c:2330 src/LYOptions.c:2347
 msgid "By Type"
 msgstr "Tbi j酺gi"
 
-#: src/LYOptions.c:2328 src/LYOptions.c:2345
+#: src/LYOptions.c:2331 src/LYOptions.c:2348
 msgid "By Size"
 msgstr "Mahu j酺gi"
 
-#: src/LYOptions.c:2329 src/LYOptions.c:2346
+#: src/LYOptions.c:2332 src/LYOptions.c:2349
 msgid "By Date"
 msgstr "Kuup輑va j酺gi"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2333
 msgid "By Mode"
 msgstr "moodi j酺gi"
 
-#: src/LYOptions.c:2332
+#: src/LYOptions.c:2335
 msgid "By User"
 msgstr "Kasutaja j酺gi"
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 msgid "By Group"
 msgstr "Grupi j酺gi"
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2357
 msgid "Do not show rate"
 msgstr "礪a n鄜ta kiirust"
 
-#: src/LYOptions.c:2355 src/LYOptions.c:2356
+#: src/LYOptions.c:2358 src/LYOptions.c:2359
 #, c-format
 msgid "Show %s/sec rate"
 msgstr "N鄜ta %s/sek kiirust"
 
-#: src/LYOptions.c:2358 src/LYOptions.c:2359
+#: src/LYOptions.c:2361 src/LYOptions.c:2362
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr "N鄜ta %s/sek, ETA"
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2374
 msgid "Accept lynx's internal types"
 msgstr "Luba lynxi sisemised tbid"
 
-#: src/LYOptions.c:2372
+#: src/LYOptions.c:2375
 msgid "Also accept lynx.cfg's types"
 msgstr "Luba ka lynx.cfg tbid"
 
-#: src/LYOptions.c:2373
+#: src/LYOptions.c:2376
 msgid "Also accept user's types"
 msgstr "Luba ka kasutaja tbid"
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "Also accept system's types"
 msgstr "Luba ka ssteemsed tbid"
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 msgid "Accept all types"
 msgstr "Luba k鬑k tbid"
 
-#: src/LYOptions.c:2384
+#: src/LYOptions.c:2387
 msgid "gzip"
 msgstr "gzip"
 
-#: src/LYOptions.c:2385
+#: src/LYOptions.c:2388
 msgid "deflate"
 msgstr "kahanda"
 
-#: src/LYOptions.c:2388
+#: src/LYOptions.c:2391
 msgid "compress"
 msgstr "compress"
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2394
 msgid "bzip2"
 msgstr "bzip2"
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2396
 msgid "All"
 msgstr "K鬑k"
 
-#: src/LYOptions.c:2658 src/LYOptions.c:2682
+#: src/LYOptions.c:2664 src/LYOptions.c:2688
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Seadete men saamiseks kasutage %s!"
 
-#: src/LYOptions.c:3429
+#: src/LYOptions.c:3438
 msgid "(options marked with (!) will not be saved)"
 msgstr "((!) m酺gitud seadeid ei salvestata)"
 
-#: src/LYOptions.c:3437
+#: src/LYOptions.c:3446
 msgid "General Preferences"
 msgstr "釿dised seaded"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3450
 msgid "User mode"
 msgstr "Kasutaja mood"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3447
+#: src/LYOptions.c:3456
 msgid "Editor"
 msgstr "Toimeti"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3461
 msgid "Type of Search"
 msgstr "Otsingutp"
 
-#: src/LYOptions.c:3457
+#: src/LYOptions.c:3466
 msgid "Security and Privacy"
 msgstr "Turvalisus ja privaatsus"
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3461
+#: src/LYOptions.c:3470
 msgid "Cookies"
 msgstr "Pr鳵nikud"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3475
+#: src/LYOptions.c:3484
 msgid "Invalid-Cookie Prompting"
 msgstr "Vigase pr鳵niku ksimine"
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3482
+#: src/LYOptions.c:3491
 msgid "SSL Prompting"
 msgstr "SSL ksimine"
 
-#: src/LYOptions.c:3488
+#: src/LYOptions.c:3497
 msgid "Keyboard Input"
 msgstr "Sisend klaviatuurilt"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3492
+#: src/LYOptions.c:3501
 msgid "Keypad mode"
 msgstr "Klahvistiku mood"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3498
+#: src/LYOptions.c:3507
 msgid "Emacs keys"
 msgstr "Emacs klahvid"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3513
 msgid "VI keys"
 msgstr "VI klahvid"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3511
+#: src/LYOptions.c:3520
 msgid "Line edit style"
 msgstr "Reatoimeti mood"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3532
 msgid "Keyboard layout"
 msgstr "Klaviatuuri asetus"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3537
+#: src/LYOptions.c:3546
 msgid "Display and Character Set"
 msgstr "Ekraan ja kooditabel"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3542
+#: src/LYOptions.c:3551
 msgid "Use locale-based character set"
 msgstr "Kasuta lokaadi p鬒ist kooditabelit"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3551
+#: src/LYOptions.c:3560
 msgid "Display character set"
 msgstr "Ekraani kooditabel"
 
-#: src/LYOptions.c:3582
+#: src/LYOptions.c:3591
 msgid "Assumed document character set"
 msgstr "Eeldatav dokumendi kooditabel"
 
@@ -4797,170 +4797,173 @@ msgstr "Eeldatav dokumendi kooditabel"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3602
+#: src/LYOptions.c:3611
 msgid "CJK mode"
 msgstr "CJK mood"
 
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3613
 msgid "Raw 8-bit"
 msgstr "Puhas 8-bitti"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3612
+#: src/LYOptions.c:3621
 msgid "X Display"
 msgstr "X Ekraan"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3618
+#: src/LYOptions.c:3627
 msgid "Document Appearance"
 msgstr "Dokumendi esitamine"
 
-#: src/LYOptions.c:3624
+#: src/LYOptions.c:3633
 msgid "Show color"
 msgstr "N鄜ta v酺ve"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3648
+#: src/LYOptions.c:3657
 msgid "Show cursor"
 msgstr "N鄜ta kursorit"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3663
 msgid "Underline links"
 msgstr "Jooni viited"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3670
 msgid "Show scrollbar"
 msgstr "N鄜ta kerimisriba"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3668
+#: src/LYOptions.c:3677
 msgid "Popups for select fields"
 msgstr "Hpikud valikuv鄟jadele"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3674
+#: src/LYOptions.c:3683
 msgid "HTML error recovery"
 msgstr "HTML veat礵tlus"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3680
+#: src/LYOptions.c:3689
 msgid "Show images"
 msgstr "N鄜ta pilte"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3694
+#: src/LYOptions.c:3703
 msgid "Verbose images"
 msgstr "Verbaalsed pildid"
 
-#: src/LYOptions.c:3703
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3711
 msgid "Headers Transferred to Remote Servers"
 msgstr "Serverile saadetavad p鄜sed"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3715
 msgid "Personal mail address"
 msgstr "Isiklik e-posti aadress"
 
 #. Mail Address: INPUT
-#: src/LYOptions.c:3712
+#: src/LYOptions.c:3720
 #, fuzzy
 msgid "Password for anonymous ftp"
 msgstr "Parool uudiseserverile '%s':"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3717
+#: src/LYOptions.c:3725
 msgid "Preferred media type"
 msgstr "Eelistatud meedia tp"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3723
+#: src/LYOptions.c:3731
 msgid "Preferred encoding"
 msgstr "Eelistatud kodeering"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3729
+#: src/LYOptions.c:3737
 msgid "Preferred document character set"
 msgstr "Eelistatuim dokumendi kooditabel"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3742
 msgid "Preferred document language"
 msgstr "Eelistatuim dokumendi keel"
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3748
 msgid "User-Agent header"
 msgstr "User-Agent p鄜s"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3748
+#: src/LYOptions.c:3756
 msgid "Listing and Accessing Files"
 msgstr "Failide n鄜tamine ja kasutamine"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3752
+#: src/LYOptions.c:3760
 msgid "FTP sort criteria"
 msgstr "FTP j酺jestamine"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3759
+#: src/LYOptions.c:3767
 msgid "Local directory sort criteria"
 msgstr "Lokaalse kataloogi j酺jestamine"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3773
 msgid "Local directory sort order"
 msgstr "Lokaalse kataloogi j酺jestamine"
 
-#: src/LYOptions.c:3774
+#: src/LYOptions.c:3782
 msgid "Show dot files"
 msgstr "N鄜ta punktiga faile"
 
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3790
 msgid "Execution links"
 msgstr "T鄜detavad viited"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3810
 msgid "Show transfer rate"
 msgstr "N鄜ta laadimise kiirust"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3830
 msgid "Special Files and Screens"
 msgstr "Spetsiaalfailid ja ekraanid"
 
-#: src/LYOptions.c:3827
+#: src/LYOptions.c:3835
 msgid "Multi-bookmarks"
 msgstr "J酺gede failid"
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3843
 msgid "Review/edit Bookmarks files"
 msgstr "vaata/toimeta j酺gede faile"
 
-#: src/LYOptions.c:3837
+#: src/LYOptions.c:3845
 msgid "Goto multi-bookmark menu"
 msgstr "Mine mitme-j酺je mensse"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3847
 msgid "Bookmarks file"
 msgstr "J酺gede fail"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3845
+#: src/LYOptions.c:3853
 msgid "Visited Pages"
 msgstr "Klastatud lehed"
 
-#: src/LYOptions.c:3850
+#: src/LYOptions.c:3858
 msgid "View the file "
 msgstr "Vaata faili"
 
@@ -5080,38 +5083,38 @@ msgstr "Lynx: ei saa startida, CERN reeglite fail %s ei ole kasutatav\n"
 msgid "(no name)"
 msgstr "(nimetu)"
 
-#: src/LYReadCFG.c:1782
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Rohkem kui %d lynx.cfg kaasamist -- vahest on tekkinud tskkel?!?\n"
 
-#: src/LYReadCFG.c:1784
+#: src/LYReadCFG.c:1786
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Viimane kaasata ritatud fail oli '%s',\n"
 
-#: src/LYReadCFG.c:1785
+#: src/LYReadCFG.c:1787
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "kaasatud failist '%s'.\n"
 
-#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263
+#: src/LYReadCFG.c:2194 src/LYReadCFG.c:2207 src/LYReadCFG.c:2265
 msgid "The following is read from your lynx.cfg file."
 msgstr "J酺gnev on loetud teie lynx.cfg failist."
 
-#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206
+#: src/LYReadCFG.c:2195 src/LYReadCFG.c:2208
 msgid "Please read the distribution"
 msgstr "Lisainfo jaoks lugege palun"
 
-#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209
+#: src/LYReadCFG.c:2201 src/LYReadCFG.c:2211
 msgid "for more comments."
 msgstr "paketis olevat faili."
 
-#: src/LYReadCFG.c:2245
+#: src/LYReadCFG.c:2247
 msgid "RELOAD THE CHANGES"
 msgstr "MUUTUSTE LAADIMINE"
 
-#: src/LYReadCFG.c:2253
+#: src/LYReadCFG.c:2255
 msgid "Your primary configuration"
 msgstr "Teie primaarsed seaded"
 
@@ -5380,33 +5383,33 @@ msgstr "Lae les:"
 msgid "Upload options:"
 msgstr "釿eslaadimise seaded:"
 
-#: src/LYUtils.c:1716
+#: src/LYUtils.c:1777
 msgid "Download document URL put to clipboard."
 msgstr "Panin dokumendi allalaadimise URLi l鬑kepuhvrisse."
 
-#: src/LYUtils.c:2493
+#: src/LYUtils.c:2554
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Selle URL skeemiga kasutatakse ootamatut kasutamise protokolli."
 
-#: src/LYUtils.c:3301
+#: src/LYUtils.c:3362
 msgid "Too many tempfiles"
 msgstr "Liiga palju ajutisi faile"
 
-#: src/LYUtils.c:3605
+#: src/LYUtils.c:3666
 msgid "unknown restriction"
 msgstr "tundmatu piirang"
 
-#: src/LYUtils.c:3635
+#: src/LYUtils.c:3696
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Piiranguid pole.\n"
 
-#: src/LYUtils.c:3638
+#: src/LYUtils.c:3699
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Seatud piirangud:\n"
 
-#: src/LYUtils.c:5022
+#: src/LYUtils.c:5077
 msgid "Cannot find HOME directory"
 msgstr "Ei leie HOME kataloogi"
 
diff --git a/po/fr.po b/po/fr.po
index d30d23e4..665a669e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-30 18:03-0400\n"
+"POT-Creation-Date: 2005-10-16 19:03-0400\n"
 "PO-Revision-Date: 1999-06-05 15:18-0400\n"
 "Last-Translator: Jim Spath <jspath@bcpl.net>\n"
 "Language-Team: (none yet, address for now:) French <lynx-dev@nongnu.org>\n"
@@ -2293,7 +2293,7 @@ msgstr "(Aucun nom)"
 msgid "(No value.)"
 msgstr "(Aucune valeur)"
 
-#: LYMessages.c:713 src/LYOptions.c:2382
+#: LYMessages.c:713 src/LYOptions.c:2385
 msgid "None"
 msgstr "Aucun(e)"
 
@@ -2852,7 +2852,7 @@ msgstr "Document avec contenu POST non trouv dans l'ant幦幦oire. Recommencer?"
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8508
+#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8515
 msgid "Loading incomplete."
 msgstr "Chargement incomplet."
 
@@ -2967,18 +2967,18 @@ msgstr "Mot de passe pour l'h矌e de forums '%s' :"
 msgid "Change password?"
 msgstr "Changer le mot de passe?"
 
-#: WWW/Library/Implementation/HTNews.c:1736
+#: WWW/Library/Implementation/HTNews.c:1706
 #, c-format
 msgid "No matches for: %s"
 msgstr "Pas de correspondances pour: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1789
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this group.\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1801
+#: WWW/Library/Implementation/HTNews.c:1768
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2989,16 +2989,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1814
+#: WWW/Library/Implementation/HTNews.c:1781
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1837
+#: WWW/Library/Implementation/HTNews.c:1804
 msgid "Earlier articles"
 msgstr "Articles anciens"
 
-#: WWW/Library/Implementation/HTNews.c:1850
+#: WWW/Library/Implementation/HTNews.c:1817
 #, c-format
 msgid ""
 "\n"
@@ -3009,41 +3009,41 @@ msgstr ""
 "Il y a  jusqu' %d articles accessibles dans %s, les ID suivent:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1912
+#: WWW/Library/Implementation/HTNews.c:1879
 msgid "All available articles in "
 msgstr "Tout les articles accessibles dans "
 
-#: WWW/Library/Implementation/HTNews.c:2133
+#: WWW/Library/Implementation/HTNews.c:2093
 msgid "Later articles"
 msgstr "Articles plus r嶰ents"
 
-#: WWW/Library/Implementation/HTNews.c:2156
+#: WWW/Library/Implementation/HTNews.c:2116
 msgid "Post to "
 msgstr "Postez vers "
 
-#: WWW/Library/Implementation/HTNews.c:2377
+#: WWW/Library/Implementation/HTNews.c:2337
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Ce client ne supporte pas les URLs SNEWS"
 
-#: WWW/Library/Implementation/HTNews.c:2585
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr "Aucune cible pour le texte brut!"
 
-#: WWW/Library/Implementation/HTNews.c:2616
+#: WWW/Library/Implementation/HTNews.c:2576
 msgid "Connecting to NewsHost ..."
 msgstr "Connection  l'h矌e de nouvelles ...."
 
-#: WWW/Library/Implementation/HTNews.c:2668
+#: WWW/Library/Implementation/HTNews.c:2628
 #, c-format
 msgid "Could not access %s."
 msgstr "Impossible d'acc嶮er  %s."
 
-#: WWW/Library/Implementation/HTNews.c:2774
+#: WWW/Library/Implementation/HTNews.c:2734
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "Impossible de lire les informations. Le serveur de nouvelles %.20s  r廧ondu: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2778
+#: WWW/Library/Implementation/HTNews.c:2738
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Impossible de lire les informations, r廧onse vide de l'h矌e %s"
@@ -3051,22 +3051,22 @@ msgstr "Impossible de lire les informations, r廧onse vide de l'h矌e %s"
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2982
+#: WWW/Library/Implementation/HTNews.c:2942
 msgid "Reading list of available newsgroups."
 msgstr "Lecture de la liste des forums disponibles."
 
-#: WWW/Library/Implementation/HTNews.c:3003
+#: WWW/Library/Implementation/HTNews.c:2963
 msgid "Reading list of articles in newsgroup."
 msgstr "Lecture de la liste des articles du forum."
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:3009
+#: WWW/Library/Implementation/HTNews.c:2969
 msgid "Reading news article."
 msgstr "Lecture d'articles de forums."
 
-#: WWW/Library/Implementation/HTNews.c:3039
+#: WWW/Library/Implementation/HTNews.c:2999
 msgid "Sorry, could not load requested news."
 msgstr "D廥ol, impossible de charger la nouvelles demand嶪."
 
@@ -3074,11 +3074,11 @@ msgstr "D廥ol, impossible de charger la nouvelles demand嶪."
 msgid "Address has invalid port"
 msgstr "L'adresse a un num廨o de port invalide"
 
-#: WWW/Library/Implementation/HTTCP.c:1320
+#: WWW/Library/Implementation/HTTCP.c:1308
 msgid "Address length looks invalid"
 msgstr "La longueur de l'adresse semble invalide"
 
-#: WWW/Library/Implementation/HTTCP.c:1552 WWW/Library/Implementation/HTTCP.c:1570
+#: WWW/Library/Implementation/HTTCP.c:1539 WWW/Library/Implementation/HTTCP.c:1557
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Impossible de localiser l'h矌e distant %s"
@@ -3087,39 +3087,39 @@ msgstr "Impossible de localiser l'h矌e distant %s"
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1567 WWW/Library/Implementation/HTTelnet.c:108
+#: WWW/Library/Implementation/HTTCP.c:1554 WWW/Library/Implementation/HTTelnet.c:108
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Nom d'h矌e invalide: %s"
 
 # First %s will be FTP, HTTP or other protocol and second %s will be hostname
-#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1568
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Connexion %s  %s "
 
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1579
 msgid "socket failed."
 msgstr "la socket a 嶰hou嶪"
 
-#: WWW/Library/Implementation/HTTCP.c:1605
+#: WWW/Library/Implementation/HTTCP.c:1592
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "La socket a 嶰hou嶪: famille %d adresse %s port %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1629
+#: WWW/Library/Implementation/HTTCP.c:1616
 msgid "Could not make connection non-blocking."
 msgstr "Impossible d'彋ablir une connection non bloquante"
 
-#: WWW/Library/Implementation/HTTCP.c:1697
+#: WWW/Library/Implementation/HTTCP.c:1684
 msgid "Connection failed (too many retries)."
 msgstr "Connection impossible (trop d'essais successifs)"
 
-#: WWW/Library/Implementation/HTTCP.c:1896
+#: WWW/Library/Implementation/HTTCP.c:1883
 msgid "Could not restore socket to blocking."
 msgstr "Impossible de r彋ablir le blocage sur la socket"
 
-#: WWW/Library/Implementation/HTTCP.c:1962
+#: WWW/Library/Implementation/HTTCP.c:1949
 msgid "Socket read failed for 180,000 tries."
 msgstr "La lecture de la socket a 嶰hou嶪 pour 180,000 essais"
 
@@ -3424,100 +3424,100 @@ msgstr "M幦oire insuffisante; interruption de l'affichage."
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "M幦oire satur嶪, interruption du transfert !"
 
-#: src/GridText.c:3594
+#: src/GridText.c:3601
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** M丏OIRE INSUFFISANTE ***"
 
-#: src/GridText.c:6013 src/GridText.c:6020 src/LYList.c:248
+#: src/GridText.c:6020 src/GridText.c:6027 src/LYList.c:248
 msgid "unknown field or link"
 msgstr "champ ou lien inconnu"
 
-#: src/GridText.c:6029
+#: src/GridText.c:6036
 msgid "text entry field"
 msgstr "champ de saisie de texte"
 
-#: src/GridText.c:6032
+#: src/GridText.c:6039
 msgid "password entry field"
 msgstr "champ d'entr嶪 du mot de passe"
 
-#: src/GridText.c:6035
+#: src/GridText.c:6042
 msgid "checkbox"
 msgstr "case d'option"
 
-#: src/GridText.c:6038
+#: src/GridText.c:6045
 msgid "radio button"
 msgstr "bouton d'option"
 
-#: src/GridText.c:6041
+#: src/GridText.c:6048
 msgid "submit button"
 msgstr "bouton Envoyer"
 
-#: src/GridText.c:6044
+#: src/GridText.c:6051
 msgid "reset button"
 msgstr "bouton Effacer"
 
-#: src/GridText.c:6047
+#: src/GridText.c:6054
 msgid "popup menu"
 msgstr "menu 嶰lair"
 
-#: src/GridText.c:6050
+#: src/GridText.c:6057
 msgid "hidden form field"
 msgstr "champ de formulaire cach"
 
-#: src/GridText.c:6053
+#: src/GridText.c:6060
 msgid "text entry area"
 msgstr "zone d'entr嶪 de texte"
 
-#: src/GridText.c:6056
+#: src/GridText.c:6063
 msgid "range entry field"
 msgstr "champ de saisie (range)"
 
-#: src/GridText.c:6059
+#: src/GridText.c:6066
 msgid "file entry field"
 msgstr "champ de saisie (file)"
 
-#: src/GridText.c:6062
+#: src/GridText.c:6069
 msgid "text-submit field"
 msgstr "champ d'envoi (texte)"
 
-#: src/GridText.c:6065
+#: src/GridText.c:6072
 msgid "image-submit button"
 msgstr "bouton d'envoi (image)"
 
-#: src/GridText.c:6068
+#: src/GridText.c:6075
 msgid "keygen field"
 msgstr "champ 勃eygen"
 
-#: src/GridText.c:6071
+#: src/GridText.c:6078
 msgid "unknown form field"
 msgstr "champ de formulaire inconnu"
 
 # WWW/Libary/Implementation/HTFile.c
-#: src/GridText.c:10231
+#: src/GridText.c:10244
 #, fuzzy
 msgid "Can't open file for uploading"
 msgstr "Impossible d'ouvrir le fichier pour d嶰ompression."
 
-#: src/GridText.c:11384
+#: src/GridText.c:11397
 #, c-format
 msgid "Submitting %s"
 msgstr "Envoi de %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12533
+#: src/GridText.c:12546
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12738
+#: src/GridText.c:12751
 msgid "Wrap lines to fit displayed area?"
 msgstr "Raccourcir les lignes pour correspondre  la zone d'affichage ?"
 
-#: src/GridText.c:12790
+#: src/GridText.c:12803
 msgid "Very long lines have been wrapped!"
 msgstr "Les tr鋊 longues lignes ont 彋 es tass嶪s"
 
-#: src/GridText.c:13232
+#: src/GridText.c:13245
 msgid "Very long lines have been truncated!"
 msgstr "Les tr鋊 longues lignes ont 彋 es tronqu嶪s"
 
@@ -3639,15 +3639,15 @@ msgstr "Chemin de fichier :"
 msgid "(unknown)"
 msgstr "(inconnu)"
 
-#: src/HTML.c:7374
+#: src/HTML.c:7375
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Le document ne contient que des liens cach廥. Utiliser L) R嶨廨ences."
 
-#: src/HTML.c:7873
+#: src/HTML.c:7874
 msgid "Source cache error - disk full?"
 msgstr "Erreur de cache - disque plein ?"
 
-#: src/HTML.c:7886
+#: src/HTML.c:7887
 msgid "Source cache error - not enough memory!"
 msgstr "Erreur de cache - pas assez de m幦oire"
 
@@ -3750,31 +3750,31 @@ msgstr "Interne"
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "erreur de mise en place de flag de domaine de cookie, fermeture du programme"
 
-#: src/LYCurses.c:1017
+#: src/LYCurses.c:1034
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "D嶨aut d'initialisation au terminal; type de terminal inconnu?"
 
-#: src/LYCurses.c:1442
+#: src/LYCurses.c:1459
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1446
+#: src/LYCurses.c:1463
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Il faut utiliser un terminal vt100, 200, etc. avec ce programme."
 
-#: src/LYCurses.c:1495
+#: src/LYCurses.c:1512
 msgid "Your Terminal type is unknown!"
 msgstr "Votre type de terminal n'est pas reconnu."
 
-#: src/LYCurses.c:1496
+#: src/LYCurses.c:1513
 msgid "Enter a terminal type:"
 msgstr "Entrez un type de terminal"
 
-#: src/LYCurses.c:1510
+#: src/LYCurses.c:1527
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TYPE DE TERMINAL R乇L "
 
-#: src/LYCurses.c:2007
+#: src/LYCurses.c:2031
 #, c-format
 msgid ""
 "\n"
@@ -3783,7 +3783,7 @@ msgstr ""
 "\n"
 "Une erreur fatale s'est produite dans %s Ver. %s\n"
 
-#: src/LYCurses.c:2010
+#: src/LYCurses.c:2034
 #, c-format
 msgid ""
 "\n"
@@ -4323,52 +4323,52 @@ msgstr ""
 "Le fichier Lynx %s n'est pas disponible.\n"
 "\n"
 
-#: src/LYMain.c:1763
+#: src/LYMain.c:1750
 msgid "Warning:"
 msgstr "Attention:"
 
-#: src/LYMain.c:2328
+#: src/LYMain.c:2315
 msgid "persistent cookies state will be changed in next session only."
 msgstr "L'彋at des cookies persistant ne seront chang廥 qu'au cours de la prochaine session."
 
-#: src/LYMain.c:2565 src/LYMain.c:2610
+#: src/LYMain.c:2552 src/LYMain.c:2597
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: ignorer le charset=%s inconnu\n"
 
-#: src/LYMain.c:3121
+#: src/LYMain.c:3108
 #, fuzzy, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Version %s (%s)\n"
 
-#: src/LYMain.c:3156
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Compil le %s %s %s\n"
 
-#: src/LYMain.c:3178
+#: src/LYMain.c:3165
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors."
 msgstr "Copyright tenu par l'universit du Kansas, du CERN, et d'autres contribuants"
 
-#: src/LYMain.c:3179
+#: src/LYMain.c:3166
 msgid "Distributed under the GNU General Public License."
 msgstr "Distribu sous le permis de grand public de GNU"
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3167
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Voyez http://lynx.isc.org/ et d'aide en ligne pour plus d'information."
 
-#: src/LYMain.c:3952
+#: src/LYMain.c:3939
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "USAGE : %s [options] [fichier]\n"
 
-#: src/LYMain.c:3953
+#: src/LYMain.c:3940
 #, c-format
 msgid "Options are:\n"
 msgstr "Les options sont :\n"
 
-#: src/LYMain.c:4252
+#: src/LYMain.c:4239
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s : Option non valide : %s\n"
@@ -4443,7 +4443,7 @@ msgstr ""
 msgid "Current URL is empty."
 msgstr "Le r廧ertoire courant:"
 
-#: src/LYMainLoop.c:6935 src/LYUtils.c:1714
+#: src/LYMainLoop.c:6935 src/LYUtils.c:1775
 msgid "Copy to clipboard failed."
 msgstr ""
 
@@ -4539,334 +4539,334 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "Le message n'a pas de texte original !"
 
-#: src/LYOptions.c:758
+#: src/LYOptions.c:761
 msgid "review/edit B)ookmarks files"
 msgstr "B) 丼iter fichiers signets "
 
-#: src/LYOptions.c:760
+#: src/LYOptions.c:763
 msgid "B)ookmark file: "
 msgstr "B) Fichier de signets : "
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2126 src/LYOptions.c:2133
 msgid "ON"
 msgstr ""
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2277 src/LYOptions.c:2288
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280 src/LYOptions.c:2291
 msgid "OFF"
 msgstr ""
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2128
 msgid "NEVER"
 msgstr ""
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2129
 msgid "ALWAYS"
 msgstr ""
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2269
+#: src/LYOptions.c:2145 src/LYOptions.c:2272
 msgid "ignore"
 msgstr ""
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2146
 msgid "ask user"
 msgstr ""
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2147
 msgid "accept all"
 msgstr ""
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS OFF"
 msgstr ""
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2160
 msgid "FOR LOCAL FILES ONLY"
 msgstr ""
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2162
 msgid "ALWAYS ON"
 msgstr ""
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2174
 msgid "Numbers act as arrows"
 msgstr ""
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Links and form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2182
 msgid "Form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2189
+#: src/LYOptions.c:2192
 msgid "Case insensitive"
 msgstr ""
 
-#: src/LYOptions.c:2190
+#: src/LYOptions.c:2193
 msgid "Case sensitive"
 msgstr ""
 
-#: src/LYOptions.c:2214
+#: src/LYOptions.c:2217
 msgid "prompt normally"
 msgstr ""
 
-#: src/LYOptions.c:2215
+#: src/LYOptions.c:2218
 msgid "force yes-response"
 msgstr ""
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2219
 msgid "force no-response"
 msgstr ""
 
-#: src/LYOptions.c:2234
+#: src/LYOptions.c:2237
 #, fuzzy
 msgid "Novice"
 msgstr "Aucun(e)"
 
-#: src/LYOptions.c:2235
+#: src/LYOptions.c:2238
 #, fuzzy
 msgid "Intermediate"
 msgstr "Interne"
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2239
 msgid "Advanced"
 msgstr ""
 
-#: src/LYOptions.c:2245
+#: src/LYOptions.c:2248
 msgid "By First Visit"
 msgstr ""
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2250
 msgid "By First Visit Reversed"
 msgstr ""
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2251
 msgid "As Visit Tree"
 msgstr ""
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2252
 msgid "By Last Visit"
 msgstr ""
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2254
 msgid "By Last Visit Reversed"
 msgstr ""
 
 #. Old_DTD variable
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2265
 msgid "relaxed (TagSoup mode)"
 msgstr ""
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2266
 msgid "strict (SortaSGML mode)"
 msgstr ""
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2273
 msgid "as labels"
 msgstr ""
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2274
 #, fuzzy
 msgid "as links"
 msgstr "ce lien"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2281
 #, fuzzy
 msgid "show filename"
 msgstr "(mauvais nom de fichier)"
 
-#: src/LYOptions.c:2289
+#: src/LYOptions.c:2292
 msgid "STANDARD"
 msgstr ""
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2293
 msgid "ADVANCED"
 msgstr ""
 
-#: src/LYOptions.c:2316
+#: src/LYOptions.c:2319
 #, fuzzy
 msgid "Directories first"
 msgstr "Sous-r廧ertoires :"
 
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2320
 #, fuzzy
 msgid "Files first"
 msgstr " premier"
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2321
 msgid "Mixed style"
 msgstr ""
 
-#: src/LYOptions.c:2326 src/LYOptions.c:2343
+#: src/LYOptions.c:2329 src/LYOptions.c:2346
 #, fuzzy
 msgid "By Name"
 msgstr "Nom :"
 
-#: src/LYOptions.c:2327 src/LYOptions.c:2344
+#: src/LYOptions.c:2330 src/LYOptions.c:2347
 msgid "By Type"
 msgstr ""
 
-#: src/LYOptions.c:2328 src/LYOptions.c:2345
+#: src/LYOptions.c:2331 src/LYOptions.c:2348
 #, fuzzy
 msgid "By Size"
 msgstr "Taille de byte"
 
-#: src/LYOptions.c:2329 src/LYOptions.c:2346
+#: src/LYOptions.c:2332 src/LYOptions.c:2349
 #, fuzzy
 msgid "By Date"
 msgstr "Date :"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2333
 msgid "By Mode"
 msgstr ""
 
-#: src/LYOptions.c:2332
+#: src/LYOptions.c:2335
 msgid "By User"
 msgstr ""
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 #, fuzzy
 msgid "By Group"
 msgstr "Groupe"
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2357
 msgid "Do not show rate"
 msgstr ""
 
-#: src/LYOptions.c:2355 src/LYOptions.c:2356
+#: src/LYOptions.c:2358 src/LYOptions.c:2359
 #, fuzzy, c-format
 msgid "Show %s/sec rate"
 msgstr "Transfert de donn嶪s termin"
 
-#: src/LYOptions.c:2358 src/LYOptions.c:2359
+#: src/LYOptions.c:2361 src/LYOptions.c:2362
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr ""
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2374
 msgid "Accept lynx's internal types"
 msgstr ""
 
-#: src/LYOptions.c:2372
+#: src/LYOptions.c:2375
 msgid "Also accept lynx.cfg's types"
 msgstr ""
 
-#: src/LYOptions.c:2373
+#: src/LYOptions.c:2376
 msgid "Also accept user's types"
 msgstr ""
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "Also accept system's types"
 msgstr ""
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 #, fuzzy
 msgid "Accept all types"
 msgstr "Accepter les changements"
 
-#: src/LYOptions.c:2384
+#: src/LYOptions.c:2387
 msgid "gzip"
 msgstr ""
 
-#: src/LYOptions.c:2385
+#: src/LYOptions.c:2388
 msgid "deflate"
 msgstr ""
 
-#: src/LYOptions.c:2388
+#: src/LYOptions.c:2391
 msgid "compress"
 msgstr ""
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2394
 msgid "bzip2"
 msgstr ""
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2396
 msgid "All"
 msgstr ""
 
-#: src/LYOptions.c:2658 src/LYOptions.c:2682
+#: src/LYOptions.c:2664 src/LYOptions.c:2688
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Utilisez %s pour invoquer le menu des Options."
 
-#: src/LYOptions.c:3429
+#: src/LYOptions.c:3438
 msgid "(options marked with (!) will not be saved)"
 msgstr ""
 
-#: src/LYOptions.c:3437
+#: src/LYOptions.c:3446
 msgid "General Preferences"
 msgstr "R嶨廨ences"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3450
 msgid "User mode"
 msgstr "Mode utilisateur"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3447
+#: src/LYOptions.c:3456
 msgid "Editor"
 msgstr "丼iteur"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3461
 msgid "Type of Search"
 msgstr "Pour la recherche"
 
-#: src/LYOptions.c:3457
+#: src/LYOptions.c:3466
 msgid "Security and Privacy"
 msgstr ""
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3461
+#: src/LYOptions.c:3470
 msgid "Cookies"
 msgstr "Cookies"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3475
+#: src/LYOptions.c:3484
 msgid "Invalid-Cookie Prompting"
 msgstr ""
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3482
+#: src/LYOptions.c:3491
 msgid "SSL Prompting"
 msgstr ""
 
-#: src/LYOptions.c:3488
+#: src/LYOptions.c:3497
 msgid "Keyboard Input"
 msgstr "Entr嶪 du clavier"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3492
+#: src/LYOptions.c:3501
 msgid "Keypad mode"
 msgstr "Pav num廨ique"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3498
+#: src/LYOptions.c:3507
 msgid "Emacs keys"
 msgstr "Touches emacs"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3513
 msgid "VI keys"
 msgstr "Touches vi"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3511
+#: src/LYOptions.c:3520
 msgid "Line edit style"
 msgstr ""
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3532
 #, fuzzy
 msgid "Keyboard layout"
 msgstr "Entr嶪 du clavier"
@@ -4874,22 +4874,22 @@ msgstr "Entr嶪 du clavier"
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3537
+#: src/LYOptions.c:3546
 msgid "Display and Character Set"
 msgstr "Variable d'affichage"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3542
+#: src/LYOptions.c:3551
 #, fuzzy
 msgid "Use locale-based character set"
 msgstr "charset pr廥um du document:"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3551
+#: src/LYOptions.c:3560
 msgid "Display character set"
 msgstr "Afficher le charset"
 
-#: src/LYOptions.c:3582
+#: src/LYOptions.c:3591
 msgid "Assumed document character set"
 msgstr "charset pr廥um du document:"
 
@@ -4898,175 +4898,178 @@ msgstr "charset pr廥um du document:"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3602
+#: src/LYOptions.c:3611
 msgid "CJK mode"
 msgstr ""
 
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3613
 msgid "Raw 8-bit"
 msgstr "Mode 8-bit"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3612
+#: src/LYOptions.c:3621
 msgid "X Display"
 msgstr "X Display"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3618
+#: src/LYOptions.c:3627
 msgid "Document Appearance"
 msgstr "Apparence du document"
 
-#: src/LYOptions.c:3624
+#: src/LYOptions.c:3633
 msgid "Show color"
 msgstr "Afficher les couleurs"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3648
+#: src/LYOptions.c:3657
 msgid "Show cursor"
 msgstr "Afficher le curseur"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3663
 #, fuzzy
 msgid "Underline links"
 msgstr "Liens cach廥 :"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3670
 #, fuzzy
 msgid "Show scrollbar"
 msgstr "Afficher les couleurs"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3668
+#: src/LYOptions.c:3677
 msgid "Popups for select fields"
 msgstr "Fen皻re popup pour les champs s幨ectionn廥."
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3674
+#: src/LYOptions.c:3683
 msgid "HTML error recovery"
 msgstr "Reprise d'une erreur HTML"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3680
+#: src/LYOptions.c:3689
 msgid "Show images"
 msgstr "Montrer les images"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3694
+#: src/LYOptions.c:3703
 msgid "Verbose images"
 msgstr "Images verbeuses"
 
-#: src/LYOptions.c:3703
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3711
 msgid "Headers Transferred to Remote Servers"
 msgstr "Les headers sont transf廨廥 aux serveurs distants"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3715
 msgid "Personal mail address"
 msgstr "Adresse email personnelle"
 
 #. Mail Address: INPUT
-#: src/LYOptions.c:3712
+#: src/LYOptions.c:3720
 #, fuzzy
 msgid "Password for anonymous ftp"
 msgstr "Mot de passe pour l'h矌e de forums '%s' :"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3717
+#: src/LYOptions.c:3725
 #, fuzzy
 msgid "Preferred media type"
 msgstr "%d bytes transf廨廥"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3723
+#: src/LYOptions.c:3731
 #, fuzzy
 msgid "Preferred encoding"
 msgstr "Langue pr嶨廨嶪"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3729
+#: src/LYOptions.c:3737
 msgid "Preferred document character set"
 msgstr "Jeu de caract鋨es pr嶨廨"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3742
 msgid "Preferred document language"
 msgstr "Langue pr嶨廨嶪"
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3748
 msgid "User-Agent header"
 msgstr "Header 'User-Agent'"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3748
+#: src/LYOptions.c:3756
 msgid "Listing and Accessing Files"
 msgstr "Listes et acces aux fichiers"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3752
+#: src/LYOptions.c:3760
 msgid "FTP sort criteria"
 msgstr "Crit鋨es de tri FTP"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3759
+#: src/LYOptions.c:3767
 msgid "Local directory sort criteria"
 msgstr "Crit鋨e de tri des r廧ertoires locaux."
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3773
 #, fuzzy
 msgid "Local directory sort order"
 msgstr "Crit鋨e de tri des r廧ertoires locaux."
 
-#: src/LYOptions.c:3774
+#: src/LYOptions.c:3782
 msgid "Show dot files"
 msgstr "Montrer les fichiers cach廥"
 
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3790
 msgid "Execution links"
 msgstr "Liens  憖嶰uter"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3810
 msgid "Show transfer rate"
 msgstr "Transfert de donn嶪s termin"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3830
 msgid "Special Files and Screens"
 msgstr "Fichiers et 嶰rans sp嶰iaux."
 
-#: src/LYOptions.c:3827
+#: src/LYOptions.c:3835
 msgid "Multi-bookmarks"
 msgstr "Bookmarks multiples"
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3843
 msgid "Review/edit Bookmarks files"
 msgstr "Revoir/丼iter les fichiers Bookmarks"
 
-#: src/LYOptions.c:3837
+#: src/LYOptions.c:3845
 msgid "Goto multi-bookmark menu"
 msgstr "Aller au menu multi-bookmarks"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3847
 msgid "Bookmarks file"
 msgstr "Fichier de Bookmarks"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3845
+#: src/LYOptions.c:3853
 msgid "Visited Pages"
 msgstr "la Page des liens activ廥"
 
-#: src/LYOptions.c:3850
+#: src/LYOptions.c:3858
 #, fuzzy
 msgid "View the file "
 msgstr "Envoyer le fichier par courrier"
@@ -5187,38 +5190,38 @@ msgstr "Lynx: impossible de d幦arrer. Le fichier de r銶les CERN %s n'est pas acc
 msgid "(no name)"
 msgstr "(pas de nom)"
 
-#: src/LYReadCFG.c:1782
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Plus de %d inclusions de lynx.cfg imbriqu嶪s. Peut 皻re y a t'il une boucle ?\n"
 
-#: src/LYReadCFG.c:1784
+#: src/LYReadCFG.c:1786
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Le dernier include tent 彋ait: '%s',\n"
 
-#: src/LYReadCFG.c:1785
+#: src/LYReadCFG.c:1787
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "include de '%s'.\n"
 
-#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263
+#: src/LYReadCFG.c:2194 src/LYReadCFG.c:2207 src/LYReadCFG.c:2265
 msgid "The following is read from your lynx.cfg file."
 msgstr "Les donn嶪s suivantes sont lues  partie de votre fichier lynx.cfg."
 
-#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206
+#: src/LYReadCFG.c:2195 src/LYReadCFG.c:2208
 msgid "Please read the distribution"
 msgstr "Merci de lire la distribution"
 
-#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209
+#: src/LYReadCFG.c:2201 src/LYReadCFG.c:2211
 msgid "for more comments."
 msgstr "pour plus de commentaires."
 
-#: src/LYReadCFG.c:2245
+#: src/LYReadCFG.c:2247
 msgid "RELOAD THE CHANGES"
 msgstr "RECHARGER LES MODIFICATIONS"
 
-#: src/LYReadCFG.c:2253
+#: src/LYReadCFG.c:2255
 msgid "Your primary configuration"
 msgstr "Votre configuration principale"
 
@@ -5492,34 +5495,34 @@ msgstr "T幨嶰hargement vers:"
 msgid "Upload options:"
 msgstr "Options de chargement de fichier :"
 
-#: src/LYUtils.c:1716
+#: src/LYUtils.c:1777
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2493
+#: src/LYUtils.c:2554
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Protocole d'acc鋊 inattendu pour ce sch幦a l'URL"
 
-#: src/LYUtils.c:3301
+#: src/LYUtils.c:3362
 msgid "Too many tempfiles"
 msgstr ""
 
-#: src/LYUtils.c:3605
+#: src/LYUtils.c:3666
 #, fuzzy
 msgid "unknown restriction"
 msgstr "Pas de restriction d嶨inies."
 
-#: src/LYUtils.c:3635
+#: src/LYUtils.c:3696
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Pas de restriction d嶨inies.\n"
 
-#: src/LYUtils.c:3638
+#: src/LYUtils.c:3699
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "D嶨inition de restriction:\n"
 
-#: src/LYUtils.c:5022
+#: src/LYUtils.c:5077
 msgid "Cannot find HOME directory"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index 4798776e..54dfac3b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.6-dev8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-30 18:03-0400\n"
+"POT-Creation-Date: 2005-10-16 19:03-0400\n"
 "PO-Revision-Date: 2004-11-14 19:52+0100\n"
 "Last-Translator: Mih嫮y Gyulai <gyulai@fbi.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -2243,7 +2243,7 @@ msgstr "(Nincs n憝.)"
 msgid "(No value.)"
 msgstr "(Nincs 廨t幧.)"
 
-#: LYMessages.c:713 src/LYOptions.c:2382
+#: LYMessages.c:713 src/LYOptions.c:2385
 msgid "None"
 msgstr "Nincs"
 
@@ -2789,7 +2789,7 @@ msgstr "POST tartalommal rendelkez dokumentum nem tal嫮hat a gyorst嫫ban. 犆ra
 msgid "Loading failed, use a previous copy."
 msgstr "A bet闤t廥 sikertelen, kor墎bi p幨d嫕y haszn嫮ata."
 
-#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8508
+#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8515
 msgid "Loading incomplete."
 msgstr "A bet闤t廥 nem teljes."
 
@@ -2904,12 +2904,12 @@ msgstr "Jelsz a(z) '%s' h甏szolg嫮tat鏌oz:"
 msgid "Change password?"
 msgstr "Jelsz m鏚os癃嫳a?"
 
-#: WWW/Library/Implementation/HTNews.c:1736
+#: WWW/Library/Implementation/HTNews.c:1706
 #, c-format
 msgid "No matches for: %s"
 msgstr "Nincs illeszked廥: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1789
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2917,7 +2917,7 @@ msgstr ""
 "\n"
 "Nincs cikk ebben csoportban.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1801
+#: WWW/Library/Implementation/HTNews.c:1768
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2928,16 +2928,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1814
+#: WWW/Library/Implementation/HTNews.c:1781
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s, Cikk: %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1837
+#: WWW/Library/Implementation/HTNews.c:1804
 msgid "Earlier articles"
 msgstr "Kor墎bi cikkek"
 
-#: WWW/Library/Implementation/HTNews.c:1850
+#: WWW/Library/Implementation/HTNews.c:1817
 #, c-format
 msgid ""
 "\n"
@@ -2948,41 +2948,41 @@ msgstr ""
 "K顤lbell %d cikk van itt: %s, a k饘etkez azonos癃鏦kal:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1912
+#: WWW/Library/Implementation/HTNews.c:1879
 msgid "All available articles in "
 msgstr "Minden rendelkez廥re 嫮l cikk "
 
-#: WWW/Library/Implementation/HTNews.c:2133
+#: WWW/Library/Implementation/HTNews.c:2093
 msgid "Later articles"
 msgstr "犆abb cikkek"
 
-#: WWW/Library/Implementation/HTNews.c:2156
+#: WWW/Library/Implementation/HTNews.c:2116
 msgid "Post to "
 msgstr "Cikk 甏嫳a "
 
-#: WWW/Library/Implementation/HTNews.c:2377
+#: WWW/Library/Implementation/HTNews.c:2337
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Ez az gyf幨 nem t嫥ogatja az SNEWS URL-eket."
 
-#: WWW/Library/Implementation/HTNews.c:2585
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr "Nincs c幨 a nyers sz饘eghez!"
 
-#: WWW/Library/Implementation/HTNews.c:2616
+#: WWW/Library/Implementation/HTNews.c:2576
 msgid "Connecting to NewsHost ..."
 msgstr "Kapcsol鏚嫳 NewsHost-hoz..."
 
-#: WWW/Library/Implementation/HTNews.c:2668
+#: WWW/Library/Implementation/HTNews.c:2628
 #, c-format
 msgid "Could not access %s."
 msgstr "Nem lehet el廨ni %s-t."
 
-#: WWW/Library/Implementation/HTNews.c:2774
+#: WWW/Library/Implementation/HTNews.c:2734
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "Nem lehet olvasni a h甏 inform塶i鏦at. A %.20s h甏szolg嫮tat v嫮asza: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2778
+#: WWW/Library/Implementation/HTNews.c:2738
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Nem lehet olvasni a h甏 inform塶i鏦at. A %s h甏szolg嫮tat res v嫮aszt adott"
@@ -2990,22 +2990,22 @@ msgstr "Nem lehet olvasni a h甏 inform塶i鏦at. A %s h甏szolg嫮tat res v嫮aszt
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2982
+#: WWW/Library/Implementation/HTNews.c:2942
 msgid "Reading list of available newsgroups."
 msgstr "A rendelkez廥re 嫮l h甏csoportok olvas嫳a."
 
-#: WWW/Library/Implementation/HTNews.c:3003
+#: WWW/Library/Implementation/HTNews.c:2963
 msgid "Reading list of articles in newsgroup."
 msgstr "A h甏lista olvas嫳a a h甏csoportb鏊."
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:3009
+#: WWW/Library/Implementation/HTNews.c:2969
 msgid "Reading news article."
 msgstr "Cikk olvas嫳a."
 
-#: WWW/Library/Implementation/HTNews.c:3039
+#: WWW/Library/Implementation/HTNews.c:2999
 msgid "Sorry, could not load requested news."
 msgstr "Sajn嫮om, nem tudom bet闤teni a h甏t."
 
@@ -3013,11 +3013,11 @@ msgstr "Sajn嫮om, nem tudom bet闤teni a h甏t."
 msgid "Address has invalid port"
 msgstr "A c璥ben 廨v幯ytelen a port"
 
-#: WWW/Library/Implementation/HTTCP.c:1320
+#: WWW/Library/Implementation/HTTCP.c:1308
 msgid "Address length looks invalid"
 msgstr "A c璥 hosszs墔a 廨v幯ytelen"
 
-#: WWW/Library/Implementation/HTTCP.c:1552 WWW/Library/Implementation/HTTCP.c:1570
+#: WWW/Library/Implementation/HTTCP.c:1539 WWW/Library/Implementation/HTTCP.c:1557
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Nem tal嫮om a %s t嫛oli sz嫥癃鏬廧et."
@@ -3026,38 +3026,38 @@ msgstr "Nem tal嫮om a %s t嫛oli sz嫥癃鏬廧et."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1567 WWW/Library/Implementation/HTTelnet.c:108
+#: WWW/Library/Implementation/HTTCP.c:1554 WWW/Library/Implementation/HTTelnet.c:108
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "A %s helytelen g廧n憝"
 
-#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1568
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "%s csatlakoz嫳 l彋rehoz嫳a ide: %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1579
 msgid "socket failed."
 msgstr "az illeszt鱀ont s廨lt."
 
-#: WWW/Library/Implementation/HTTCP.c:1605
+#: WWW/Library/Implementation/HTTCP.c:1592
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "az illeszt鱀ont s廨lt: csal墂: %d c璥: %s port: %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1629
+#: WWW/Library/Implementation/HTTCP.c:1616
 msgid "Could not make connection non-blocking."
 msgstr "Nem sikerlt a nem blokkolt csatlakoz嫳."
 
-#: WWW/Library/Implementation/HTTCP.c:1697
+#: WWW/Library/Implementation/HTTCP.c:1684
 msgid "Connection failed (too many retries)."
 msgstr "A kapcsolat sikertelen (tl sok pr鏏嫮koz嫳)."
 
-#: WWW/Library/Implementation/HTTCP.c:1896
+#: WWW/Library/Implementation/HTTCP.c:1883
 msgid "Could not restore socket to blocking."
 msgstr "Nem lehet vissza嫮l癃ani az illeszt鱀ontot blokkoltra."
 
-#: WWW/Library/Implementation/HTTCP.c:1962
+#: WWW/Library/Implementation/HTTCP.c:1949
 msgid "Socket read failed for 180,000 tries."
 msgstr "Az illeszt鱀ont 180.000 olvas嫳 ut嫕 is sikertelen."
 
@@ -3361,98 +3361,98 @@ msgstr "A mem鏎ia elfogyott, megjelen癃廥 megszak癃va!"
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "A mem鏎ia elfogyott, az 嫢vitel meg lesz szak癃va!"
 
-#: src/GridText.c:3594
+#: src/GridText.c:3601
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** A MEM紑IA ELFOGYOTT ***"
 
-#: src/GridText.c:6013 src/GridText.c:6020 src/LYList.c:248
+#: src/GridText.c:6020 src/GridText.c:6027 src/LYList.c:248
 msgid "unknown field or link"
 msgstr "ismeretlen mez vagy hivatkoz嫳"
 
-#: src/GridText.c:6029
+#: src/GridText.c:6036
 msgid "text entry field"
 msgstr "sz饘eg bejegyz廥 mez"
 
-#: src/GridText.c:6032
+#: src/GridText.c:6039
 msgid "password entry field"
 msgstr "jelsz bejegyz廥 mez"
 
-#: src/GridText.c:6035
+#: src/GridText.c:6042
 msgid "checkbox"
 msgstr "jel闤鰒嶲yzet"
 
-#: src/GridText.c:6038
+#: src/GridText.c:6045
 msgid "radio button"
 msgstr "v嫮aszt鏬omb"
 
-#: src/GridText.c:6041
+#: src/GridText.c:6048
 msgid "submit button"
 msgstr "kld gomb"
 
-#: src/GridText.c:6044
+#: src/GridText.c:6051
 msgid "reset button"
 msgstr "t顤l廥 gomb"
 
-#: src/GridText.c:6047
+#: src/GridText.c:6054
 msgid "popup menu"
 msgstr "felbukkan men"
 
-#: src/GridText.c:6050
+#: src/GridText.c:6057
 msgid "hidden form field"
 msgstr "rejtett rlap mez"
 
-#: src/GridText.c:6053
+#: src/GridText.c:6060
 msgid "text entry area"
 msgstr "sz饘eg bejegyz廥 terlet"
 
-#: src/GridText.c:6056
+#: src/GridText.c:6063
 msgid "range entry field"
 msgstr "tartom嫕y bejegyz廥 mez"
 
-#: src/GridText.c:6059
+#: src/GridText.c:6066
 msgid "file entry field"
 msgstr "f奫l bejegyz廥 mez"
 
-#: src/GridText.c:6062
+#: src/GridText.c:6069
 msgid "text-submit field"
 msgstr "sz饘eg-kld mez"
 
-#: src/GridText.c:6065
+#: src/GridText.c:6072
 msgid "image-submit button"
 msgstr "k廧-kld mez"
 
-#: src/GridText.c:6068
+#: src/GridText.c:6075
 msgid "keygen field"
 msgstr "kulcsgener嫮 mez"
 
-#: src/GridText.c:6071
+#: src/GridText.c:6078
 msgid "unknown form field"
 msgstr "ismeretlen rlap mez"
 
-#: src/GridText.c:10231
+#: src/GridText.c:10244
 msgid "Can't open file for uploading"
 msgstr "Nem lehet megnyitni a f奫lt a felt闤t廥hez"
 
-#: src/GridText.c:11384
+#: src/GridText.c:11397
 #, c-format
 msgid "Submitting %s"
 msgstr "%s tov墎b癃嫳a"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12533
+#: src/GridText.c:12546
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Akad嫳jelz廥: A TextAnchor szerkezete s廨lt - javaslom a megszak癃嫳t!"
 
 #. don't show previous state
-#: src/GridText.c:12738
+#: src/GridText.c:12751
 msgid "Wrap lines to fit displayed area?"
 msgstr "T顤deljem a sorokat, hogy kif廨jenek?"
 
-#: src/GridText.c:12790
+#: src/GridText.c:12803
 msgid "Very long lines have been wrapped!"
 msgstr "A hossz sorokat j sorba t顤deltem!"
 
-#: src/GridText.c:13232
+#: src/GridText.c:13245
 msgid "Very long lines have been truncated!"
 msgstr "A hossz sorok v嶲彋 lev墔tam!"
 
@@ -3558,15 +3558,15 @@ msgstr "猲vonal:"
 msgid "(unknown)"
 msgstr "(ismeretlen)"
 
-#: src/HTML.c:7374
+#: src/HTML.c:7375
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "(A dokumentum csak rejtett hivatkoz嫳okat tartalmaz. Haszn嫮ja az 'L' parancsot."
 
-#: src/HTML.c:7873
+#: src/HTML.c:7874
 msgid "Source cache error - disk full?"
 msgstr "Forr嫳 gyorst嫫az嫳i hiba - a lemez megtelt?"
 
-#: src/HTML.c:7886
+#: src/HTML.c:7887
 msgid "Source cache error - not enough memory!"
 msgstr "Forr嫳 gyorst嫫az嫳i hiba - nincs el嶲 mem鏎ia!"
 
@@ -3669,31 +3669,31 @@ msgstr "Bels"
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "cookie_domain_flag_set hiba, program megszak癃va"
 
-#: src/LYCurses.c:1017
+#: src/LYCurses.c:1034
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Termin嫮 megnyit嫳 sikertelen - ismeretlen termin嫮 t甑us?"
 
-#: src/LYCurses.c:1442
+#: src/LYCurses.c:1459
 msgid "Terminal ="
 msgstr "Termin嫮 ="
 
-#: src/LYCurses.c:1446
+#: src/LYCurses.c:1463
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "琄nek vt100, 200 stb.-t kell haszn嫮nia ehhez a programhoz."
 
-#: src/LYCurses.c:1495
+#: src/LYCurses.c:1512
 msgid "Your Terminal type is unknown!"
 msgstr "A termin嫮 t甑us ismeretlen!"
 
-#: src/LYCurses.c:1496
+#: src/LYCurses.c:1513
 msgid "Enter a terminal type:"
 msgstr "K廨em a termin嫮 t甑us嫢:"
 
-#: src/LYCurses.c:1510
+#: src/LYCurses.c:1527
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "A TERMIN簇 T炔US BE簇L炆VA:"
 
-#: src/LYCurses.c:2007
+#: src/LYCurses.c:2031
 #, c-format
 msgid ""
 "\n"
@@ -3702,7 +3702,7 @@ msgstr ""
 "\n"
 "V嶲zetes hiba l廧ett fel a %s %s verzi鏏an\n"
 
-#: src/LYCurses.c:2010
+#: src/LYCurses.c:2034
 #, c-format
 msgid ""
 "\n"
@@ -4236,52 +4236,52 @@ msgstr ""
 "A(z) %s Lynx-f奫l nem 嫮l rendelkez廥re.\n"
 "\n"
 
-#: src/LYMain.c:1763
+#: src/LYMain.c:1750
 msgid "Warning:"
 msgstr "Figyelem:"
 
-#: src/LYMain.c:2328
+#: src/LYMain.c:2315
 msgid "persistent cookies state will be changed in next session only."
 msgstr "az 嫮land sti 嫮lapot csak a k饘etkez folyamat sor嫕 fog megv嫮tozni."
 
-#: src/LYMain.c:2565 src/LYMain.c:2610
+#: src/LYMain.c:2552 src/LYMain.c:2597
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "A Lynx figyelmen k癉l hagyja a %s fel nem ismert karakterk廥zletet\n"
 
-#: src/LYMain.c:3121
+#: src/LYMain.c:3108
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Verzi %s (%s)"
 
-#: src/LYMain.c:3156
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "K廥z癃ve %s %s %s\n"
 
-#: src/LYMain.c:3178
+#: src/LYMain.c:3165
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors."
 msgstr "A szerz鬑 廥 kiad jogokat a Kansas Egyetem, a CERN 廥 az egy嶵 k驆remk鐰鰈 gyakorolj嫜."
 
-#: src/LYMain.c:3179
+#: src/LYMain.c:3166
 msgid "Distributed under the GNU General Public License."
 msgstr "A GNU 翼tal嫕os Nyilv嫕os Licensz szerint kiadva."
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3167
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "N憴ze meg a sg鏒 廥 a http://lynx.isc.org/-ot, ahol seg癃s嶲et kaphat."
 
-#: src/LYMain.c:3952
+#: src/LYMain.c:3939
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "HASZN簇AT: %s [opci鏦] [f奫l]\n"
 
-#: src/LYMain.c:3953
+#: src/LYMain.c:3940
 #, c-format
 msgid "Options are:\n"
 msgstr "Opci鏦:\n"
 
-#: src/LYMain.c:4252
+#: src/LYMain.c:4239
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: 宁v幯ytelen opci: %s \n"
@@ -4355,7 +4355,7 @@ msgstr "'T墎l嫙at k驆廧re' tiltva."
 msgid "Current URL is empty."
 msgstr "鈜es a pillanatnyi URL."
 
-#: src/LYMainLoop.c:6935 src/LYUtils.c:1714
+#: src/LYMainLoop.c:6935 src/LYUtils.c:1775
 msgid "Copy to clipboard failed."
 msgstr "Sikertelen a v墔鏊apra m嫳ol嫳."
 
@@ -4451,344 +4451,344 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "Az zenetben nincs eredeti sz饘eg!"
 
-#: src/LYOptions.c:758
+#: src/LYOptions.c:761
 msgid "review/edit B)ookmarks files"
 msgstr "(B): a k霵yvjelz f奫lok 嫢tekint廥e/szerkeszt廥e"
 
-#: src/LYOptions.c:760
+#: src/LYOptions.c:763
 msgid "B)ookmark file: "
 msgstr "(B): a k霵yvjelz f奫l: "
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2126 src/LYOptions.c:2133
 msgid "ON"
 msgstr "BE"
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2277 src/LYOptions.c:2288
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280 src/LYOptions.c:2291
 msgid "OFF"
 msgstr "KI"
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2128
 msgid "NEVER"
 msgstr "SOHA"
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2129
 msgid "ALWAYS"
 msgstr "MINDIG"
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2269
+#: src/LYOptions.c:2145 src/LYOptions.c:2272
 msgid "ignore"
 msgstr "hanyagol"
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2146
 msgid "ask user"
 msgstr "k廨dez"
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2147
 msgid "accept all"
 msgstr "mindent elfogad"
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS OFF"
 msgstr "Mindig: KI"
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2160
 msgid "FOR LOCAL FILES ONLY"
 msgstr "Csak helyi f奫lokra"
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2162
 msgid "ALWAYS ON"
 msgstr "Mindig: BE"
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2174
 msgid "Numbers act as arrows"
 msgstr "A sz嫥ok mint nyilak"
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links are numbered"
 msgstr "A linkek sz嫥ozottak"
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Links and form fields are numbered"
 msgstr "Linkek 廥 rlapok sz嫥ozottak"
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2182
 msgid "Form fields are numbered"
 msgstr "菡lap mez鰈 sz嫥ozottak"
 
-#: src/LYOptions.c:2189
+#: src/LYOptions.c:2192
 msgid "Case insensitive"
 msgstr "Kis/nagybetre 廨z幧etlen"
 
-#: src/LYOptions.c:2190
+#: src/LYOptions.c:2193
 msgid "Case sensitive"
 msgstr "Kis/nagybetre 廨z幧eny"
 
-#: src/LYOptions.c:2214
+#: src/LYOptions.c:2217
 msgid "prompt normally"
 msgstr "szok嫳os k廨d廥"
 
-#: src/LYOptions.c:2215
+#: src/LYOptions.c:2218
 msgid "force yes-response"
 msgstr "mindig IGEN-v嫮asz"
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2219
 msgid "force no-response"
 msgstr "mindig NEM-v嫮asz"
 
-#: src/LYOptions.c:2234
+#: src/LYOptions.c:2237
 msgid "Novice"
 msgstr "Kezd"
 
-#: src/LYOptions.c:2235
+#: src/LYOptions.c:2238
 msgid "Intermediate"
 msgstr "Halad"
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2239
 msgid "Advanced"
 msgstr "Profi"
 
-#: src/LYOptions.c:2245
+#: src/LYOptions.c:2248
 msgid "By First Visit"
 msgstr "Els alkalommal"
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2250
 msgid "By First Visit Reversed"
 msgstr "Els alkalommal, megford癃va"
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2251
 msgid "As Visit Tree"
 msgstr "L嫢ogat嫳i fa"
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2252
 msgid "By Last Visit"
 msgstr "Utols l嫢ogat嫳"
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2254
 msgid "By Last Visit Reversed"
 msgstr "Utols l嫢ogat嫳, megford癃va"
 
 #. Old_DTD variable
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2265
 msgid "relaxed (TagSoup mode)"
 msgstr "enyhe (TagSoup m鏚)"
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2266
 msgid "strict (SortaSGML mode)"
 msgstr "szigor (SortaSGML m鏚)"
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2273
 msgid "as labels"
 msgstr "c璥k幧"
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2274
 msgid "as links"
 msgstr "linkek"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2281
 msgid "show filename"
 msgstr "f奫ln憝 mutat嫳a"
 
-#: src/LYOptions.c:2289
+#: src/LYOptions.c:2292
 msgid "STANDARD"
 msgstr "SZOK糜OS"
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2293
 msgid "ADVANCED"
 msgstr "FEJLETT"
 
-#: src/LYOptions.c:2316
+#: src/LYOptions.c:2319
 msgid "Directories first"
 msgstr "El騸b k霵yvt嫫ak"
 
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2320
 msgid "Files first"
 msgstr "El騸b f奫lok"
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2321
 msgid "Mixed style"
 msgstr "Kevert st璱us"
 
-#: src/LYOptions.c:2326 src/LYOptions.c:2343
+#: src/LYOptions.c:2329 src/LYOptions.c:2346
 msgid "By Name"
 msgstr "N憝 szerint"
 
-#: src/LYOptions.c:2327 src/LYOptions.c:2344
+#: src/LYOptions.c:2330 src/LYOptions.c:2347
 msgid "By Type"
 msgstr "T甑us szerint"
 
-#: src/LYOptions.c:2328 src/LYOptions.c:2345
+#: src/LYOptions.c:2331 src/LYOptions.c:2348
 msgid "By Size"
 msgstr "M廨et szerint"
 
-#: src/LYOptions.c:2329 src/LYOptions.c:2346
+#: src/LYOptions.c:2332 src/LYOptions.c:2349
 msgid "By Date"
 msgstr "D嫢um szerint"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2333
 msgid "By Mode"
 msgstr "M鏚 szerint"
 
-#: src/LYOptions.c:2332
+#: src/LYOptions.c:2335
 msgid "By User"
 msgstr "Felh. szerint"
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 msgid "By Group"
 msgstr "Csoport szerint"
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2357
 msgid "Do not show rate"
 msgstr "Ne mutassa a sebess嶲et"
 
-#: src/LYOptions.c:2355 src/LYOptions.c:2356
+#: src/LYOptions.c:2358 src/LYOptions.c:2359
 #, c-format
 msgid "Show %s/sec rate"
 msgstr "Az 嫢viteli sebess嶲 megjelen癃廥e (%s/s)"
 
-#: src/LYOptions.c:2358 src/LYOptions.c:2359
+#: src/LYOptions.c:2361 src/LYOptions.c:2362
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr "%s/s mutat嫳a, ETA"
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2374
 msgid "Accept lynx's internal types"
 msgstr "Lynx bels t甑usainak elfogad嫳a"
 
-#: src/LYOptions.c:2372
+#: src/LYOptions.c:2375
 msgid "Also accept lynx.cfg's types"
 msgstr "lynx.cfg f奫l t甑usainak elfogad嫳a"
 
-#: src/LYOptions.c:2373
+#: src/LYOptions.c:2376
 msgid "Also accept user's types"
 msgstr "Felhaszn嫮鏙 t甑usok elfogad嫳a"
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "Also accept system's types"
 msgstr "Rendszer-t甑usok elfogad嫳a"
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 msgid "Accept all types"
 msgstr "minden t甑ust elfogad"
 
-#: src/LYOptions.c:2384
+#: src/LYOptions.c:2387
 msgid "gzip"
 msgstr "gzip"
 
-#: src/LYOptions.c:2385
+#: src/LYOptions.c:2388
 msgid "deflate"
 msgstr "kibont (deflate)"
 
-#: src/LYOptions.c:2388
+#: src/LYOptions.c:2391
 msgid "compress"
 msgstr "compress"
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2394
 msgid "bzip2"
 msgstr "bzip2"
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2396
 msgid "All"
 msgstr "mindegyik"
 
-#: src/LYOptions.c:2658 src/LYOptions.c:2682
+#: src/LYOptions.c:2664 src/LYOptions.c:2688
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Haszn嫮ja a(z) %s-t, hogy bej鐱j霵 a Be嫮l癃嫳ok men!"
 
-#: src/LYOptions.c:3429
+#: src/LYOptions.c:3438
 msgid "(options marked with (!) will not be saved)"
 msgstr "(a '!'-el jel闤t opci鏦 nem lesznek meg鰎izve!)"
 
-#: src/LYOptions.c:3437
+#: src/LYOptions.c:3446
 msgid "General Preferences"
 msgstr "翼tal嫕os be嫮l癃嫳ok"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3450
 msgid "User mode"
 msgstr "Felhaszn嫮鏙 m鏚"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3447
+#: src/LYOptions.c:3456
 msgid "Editor"
 msgstr "Szerkeszt"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3461
 msgid "Type of Search"
 msgstr "Keres廥 t甑usa"
 
-#: src/LYOptions.c:3457
+#: src/LYOptions.c:3466
 msgid "Security and Privacy"
 msgstr "Biztons墔 廥 mag嫕szf廨a"
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3461
+#: src/LYOptions.c:3470
 msgid "Cookies"
 msgstr "Stik"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3475
+#: src/LYOptions.c:3484
 msgid "Invalid-Cookie Prompting"
 msgstr "宁v幯ytelen sti"
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3482
+#: src/LYOptions.c:3491
 msgid "SSL Prompting"
 msgstr "SSL v嫮aszt嫳"
 
-#: src/LYOptions.c:3488
+#: src/LYOptions.c:3497
 msgid "Keyboard Input"
 msgstr "Billentyzet bevitel"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3492
+#: src/LYOptions.c:3501
 msgid "Keypad mode"
 msgstr "Numerikus pad m鏚ja"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3498
+#: src/LYOptions.c:3507
 msgid "Emacs keys"
 msgstr "Emacs billentyk"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3513
 msgid "VI keys"
 msgstr "vi billentyk"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3511
+#: src/LYOptions.c:3520
 msgid "Line edit style"
 msgstr "Sorszerkeszt鬑 st璱us"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3532
 msgid "Keyboard layout"
 msgstr "Billentyzet kioszt嫳"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3537
+#: src/LYOptions.c:3546
 msgid "Display and Character Set"
 msgstr "K廧erny 廥 karakterk廥zlet "
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3542
+#: src/LYOptions.c:3551
 msgid "Use locale-based character set"
 msgstr "Helyi karakterk廥zlet haszn嫮ata"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3551
+#: src/LYOptions.c:3560
 msgid "Display character set"
 msgstr "K廧erny karakterk廥zlet"
 
-#: src/LYOptions.c:3582
+#: src/LYOptions.c:3591
 msgid "Assumed document character set"
 msgstr "Felt彋elezett karakterk廥zlet"
 
@@ -4797,170 +4797,173 @@ msgstr "Felt彋elezett karakterk廥zlet"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3602
+#: src/LYOptions.c:3611
 msgid "CJK mode"
 msgstr "CJK m鏚"
 
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3613
 msgid "Raw 8-bit"
 msgstr "Nyers 8-bites m鏚"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3612
+#: src/LYOptions.c:3621
 msgid "X Display"
 msgstr "X k廧erny"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3618
+#: src/LYOptions.c:3627
 msgid "Document Appearance"
 msgstr "Dokumentum megjelen廥e"
 
-#: src/LYOptions.c:3624
+#: src/LYOptions.c:3633
 msgid "Show color"
 msgstr "Sz璯ek mutat嫳a"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3648
+#: src/LYOptions.c:3657
 msgid "Show cursor"
 msgstr "Kurzor mutat嫳a"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3663
 msgid "Underline links"
 msgstr "Rejtett hivatkoz嫳"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3670
 msgid "Show scrollbar"
 msgstr "Csszka mutat嫳a"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3668
+#: src/LYOptions.c:3677
 msgid "Popups for select fields"
 msgstr "Felbukkan ablakok haszn嫮ata"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3674
+#: src/LYOptions.c:3683
 msgid "HTML error recovery"
 msgstr "HTML hiba helyre嫮l癃嫳"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3680
+#: src/LYOptions.c:3689
 msgid "Show images"
 msgstr "K廧ek mutat嫳a"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3694
+#: src/LYOptions.c:3703
 msgid "Verbose images"
 msgstr "Tall霩嫳 a k廧ek k驆飆t"
 
-#: src/LYOptions.c:3703
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3711
 msgid "Headers Transferred to Remote Servers"
 msgstr "A t嫛oli g廧eknek 嫢kld飆t fejl嶰ek"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3715
 msgid "Personal mail address"
 msgstr "Szem幨yes email c璥"
 
 #. Mail Address: INPUT
-#: src/LYOptions.c:3712
+#: src/LYOptions.c:3720
 #, fuzzy
 msgid "Password for anonymous ftp"
 msgstr "Jelsz a(z) '%s' h甏szolg嫮tat鏌oz:"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3717
+#: src/LYOptions.c:3725
 msgid "Preferred media type"
 msgstr "Els髇leges m嶮ia-t甑us"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3723
+#: src/LYOptions.c:3731
 msgid "Preferred encoding"
 msgstr "Els髇leges k鏚ol嫳"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3729
+#: src/LYOptions.c:3737
 msgid "Preferred document character set"
 msgstr "Els髇leges karakterk廥zlet"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3742
 msgid "Preferred document language"
 msgstr "Els髇leges nyelv"
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3748
 msgid "User-Agent header"
 msgstr "B霵g廥z-azonos癃 fejl嶰"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3748
+#: src/LYOptions.c:3756
 msgid "Listing and Accessing Files"
 msgstr "F奫lok list嫙嫳a 廥 el廨廥e"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3752
+#: src/LYOptions.c:3760
 msgid "FTP sort criteria"
 msgstr "FTP-s rendez廥 m鏚ja"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3759
+#: src/LYOptions.c:3767
 msgid "Local directory sort criteria"
 msgstr "Helyi k霵yvt嫫rendez廥 m鏚ja"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3773
 msgid "Local directory sort order"
 msgstr "Helyi k霵yvt嫫rendez廥 sorrendje"
 
-#: src/LYOptions.c:3774
+#: src/LYOptions.c:3782
 msgid "Show dot files"
 msgstr "Rejtett f奫lok mutat嫳a"
 
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3790
 msgid "Execution links"
 msgstr "Futtathat hivatkoz嫳ok"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3810
 msgid "Show transfer rate"
 msgstr "Az 嫢viteli sebess嶲 megjelen癃廥e"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3830
 msgid "Special Files and Screens"
 msgstr "Speci嫮is f奫lok 廥 k廧erny鰈"
 
-#: src/LYOptions.c:3827
+#: src/LYOptions.c:3835
 msgid "Multi-bookmarks"
 msgstr "T鐽bsz顤飉 k霵yvjelz鰈"
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3843
 msgid "Review/edit Bookmarks files"
 msgstr "K霵yvjelz鰈 szerkeszt廥e, 嫢n憴廥e"
 
-#: src/LYOptions.c:3837
+#: src/LYOptions.c:3845
 msgid "Goto multi-bookmark menu"
 msgstr "Ugr嫳 a t鐽bsz顤飉 k霵yvjelz鬑 menbe"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3847
 msgid "Bookmarks file"
 msgstr "K霵yvjelz f奫l"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3845
+#: src/LYOptions.c:3853
 msgid "Visited Pages"
 msgstr "Megl嫢ogatott lapok"
 
-#: src/LYOptions.c:3850
+#: src/LYOptions.c:3858
 msgid "View the file "
 msgstr "A f奫l n憴廥e "
 
@@ -5080,38 +5083,38 @@ msgstr "Nem tud elindulni, a CERN szab嫮y f奫lja nem 嫮l rendelkez廥re (%s)\n"
 msgid "(no name)"
 msgstr "(n憝telen)"
 
-#: src/LYReadCFG.c:1782
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "T鐽b mint %d egym嫳ba-墔yaz嫳t tal嫮tam a lynx.cfg-ben -- hurok alakult ki???\n"
 
-#: src/LYReadCFG.c:1784
+#: src/LYReadCFG.c:1786
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Az utols beilleszt廥 %s volt,\n"
 
-#: src/LYReadCFG.c:1785
+#: src/LYReadCFG.c:1787
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "beszrva innen: %s.\n"
 
-#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263
+#: src/LYReadCFG.c:2194 src/LYReadCFG.c:2207 src/LYReadCFG.c:2265
 msgid "The following is read from your lynx.cfg file."
 msgstr "Az itt k饘etkez鰈 a lynx.cfg f奫lban olvashat鏦."
 
-#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206
+#: src/LYReadCFG.c:2195 src/LYReadCFG.c:2208
 msgid "Please read the distribution"
 msgstr "K廨em olvassa el az ide vonatkoz le甏嫳t ("
 
-#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209
+#: src/LYReadCFG.c:2201 src/LYReadCFG.c:2211
 msgid "for more comments."
 msgstr ") tov墎bi inform塶i鶅rt."
 
-#: src/LYReadCFG.c:2245
+#: src/LYReadCFG.c:2247
 msgid "RELOAD THE CHANGES"
 msgstr "V簇TOZ糜OK 渰RAT烴T仉E"
 
-#: src/LYReadCFG.c:2253
+#: src/LYReadCFG.c:2255
 msgid "Your primary configuration"
 msgstr "Az els髇leges be嫮l癃嫳:"
 
@@ -5380,33 +5383,33 @@ msgstr "Felt闤t廥:"
 msgid "Upload options:"
 msgstr "Felt闤t廥i be嫮l癃嫳ok:"
 
-#: src/LYUtils.c:1716
+#: src/LYUtils.c:1777
 msgid "Download document URL put to clipboard."
 msgstr "A let闤tend dokumentum URL-j彋 a v墔鏊apra tesszk."
 
-#: src/LYUtils.c:2493
+#: src/LYUtils.c:2554
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Nem t嫥ogatott el廨廥i protokoll ezen az URL s幦嫕."
 
-#: src/LYUtils.c:3301
+#: src/LYUtils.c:3362
 msgid "Too many tempfiles"
 msgstr "Tl sok 嫢meneti f奫l"
 
-#: src/LYUtils.c:3605
+#: src/LYUtils.c:3666
 msgid "unknown restriction"
 msgstr "ismeretlen szigor癃嫳"
 
-#: src/LYUtils.c:3635
+#: src/LYUtils.c:3696
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Nincs szigor癃嫳 be嫮l癃va.\n"
 
-#: src/LYUtils.c:3638
+#: src/LYUtils.c:3699
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Szigor癃嫳i be嫮l癃嫳:\n"
 
-#: src/LYUtils.c:5022
+#: src/LYUtils.c:5077
 msgid "Cannot find HOME directory"
 msgstr "Nem tal嫮om a HOME k霵yvt嫫at"
 
diff --git a/po/it.po b/po/it.po
index c4c12aaf..5cb47dd7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.4.pre2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-30 18:03-0400\n"
+"POT-Creation-Date: 2005-10-16 19:03-0400\n"
 "PO-Revision-Date: 2002-06-23 23:30 +02:00\n"
 "Last-Translator: Giuliano Artico <artico@math.unipd.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -2291,7 +2291,7 @@ msgstr "(Nessun nome.)"
 msgid "(No value.)"
 msgstr "(Nessun valore)"
 
-#: LYMessages.c:713 src/LYOptions.c:2382
+#: LYMessages.c:713 src/LYOptions.c:2385
 msgid "None"
 msgstr "Nessuno(a)"
 
@@ -2852,7 +2852,7 @@ msgstr "Documento con contenuto POST non trovato in memoria. Ritentare?"
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8508
+#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8515
 msgid "Loading incomplete."
 msgstr "Caricamento incompleto."
 
@@ -2967,12 +2967,12 @@ msgstr "Password per l'host news '%s':"
 msgid "Change password?"
 msgstr "Cambiare password?"
 
-#: WWW/Library/Implementation/HTNews.c:1736
+#: WWW/Library/Implementation/HTNews.c:1706
 #, c-format
 msgid "No matches for: %s"
 msgstr "Nessuna corrispondenza per: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1789
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2980,7 +2980,7 @@ msgstr ""
 "\n"
 "Questo gruppo non contiene alcun articolo.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1801
+#: WWW/Library/Implementation/HTNews.c:1768
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2991,16 +2991,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1814
+#: WWW/Library/Implementation/HTNews.c:1781
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  Articoli %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1837
+#: WWW/Library/Implementation/HTNews.c:1804
 msgid "Earlier articles"
 msgstr "Contributi precedenti"
 
-#: WWW/Library/Implementation/HTNews.c:1850
+#: WWW/Library/Implementation/HTNews.c:1817
 #, c-format
 msgid ""
 "\n"
@@ -3011,41 +3011,41 @@ msgstr ""
 "Ci sono circa %d contributi disponibili su %s, ID come segue:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1912
+#: WWW/Library/Implementation/HTNews.c:1879
 msgid "All available articles in "
 msgstr "Tutti i contributi disponibili in "
 
-#: WWW/Library/Implementation/HTNews.c:2133
+#: WWW/Library/Implementation/HTNews.c:2093
 msgid "Later articles"
 msgstr "Contributi successivi"
 
-#: WWW/Library/Implementation/HTNews.c:2156
+#: WWW/Library/Implementation/HTNews.c:2116
 msgid "Post to "
 msgstr "Invia a "
 
-#: WWW/Library/Implementation/HTNews.c:2377
+#: WWW/Library/Implementation/HTNews.c:2337
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Questo client non  predisposto per gestire gli URL SNEWS."
 
-#: WWW/Library/Implementation/HTNews.c:2585
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr "Nessuna destinazione per il testo grezzo!"
 
-#: WWW/Library/Implementation/HTNews.c:2616
+#: WWW/Library/Implementation/HTNews.c:2576
 msgid "Connecting to NewsHost ..."
 msgstr "Connessione all'host delle news..."
 
-#: WWW/Library/Implementation/HTNews.c:2668
+#: WWW/Library/Implementation/HTNews.c:2628
 #, c-format
 msgid "Could not access %s."
 msgstr "Impossibile accedere a %s."
 
-#: WWW/Library/Implementation/HTNews.c:2774
+#: WWW/Library/Implementation/HTNews.c:2734
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "Lettura info impossibile. L'host news %.20s risp.: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2778
+#: WWW/Library/Implementation/HTNews.c:2738
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Lettura info impossibile, risposta vuota dall'host %s"
@@ -3053,22 +3053,22 @@ msgstr "Lettura info impossibile, risposta vuota dall'host %s"
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2982
+#: WWW/Library/Implementation/HTNews.c:2942
 msgid "Reading list of available newsgroups."
 msgstr "Lettura dell'elenco dei forum disponibili."
 
-#: WWW/Library/Implementation/HTNews.c:3003
+#: WWW/Library/Implementation/HTNews.c:2963
 msgid "Reading list of articles in newsgroup."
 msgstr "Lettura dell'elenco dei contributi nel forum."
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:3009
+#: WWW/Library/Implementation/HTNews.c:2969
 msgid "Reading news article."
 msgstr "Lettura del contributo news."
 
-#: WWW/Library/Implementation/HTNews.c:3039
+#: WWW/Library/Implementation/HTNews.c:2999
 msgid "Sorry, could not load requested news."
 msgstr "Spiacente, impossibile prelevare la news richiesta."
 
@@ -3076,11 +3076,11 @@ msgstr "Spiacente, impossibile prelevare la news richiesta."
 msgid "Address has invalid port"
 msgstr "L'indirizzo ha un numero di porta non valido."
 
-#: WWW/Library/Implementation/HTTCP.c:1320
+#: WWW/Library/Implementation/HTTCP.c:1308
 msgid "Address length looks invalid"
 msgstr "La lunghezza dell'indirizzo sembra non valida"
 
-#: WWW/Library/Implementation/HTTCP.c:1552 WWW/Library/Implementation/HTTCP.c:1570
+#: WWW/Library/Implementation/HTTCP.c:1539 WWW/Library/Implementation/HTTCP.c:1557
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Impossibile individuare l'host remoto %s"
@@ -3089,39 +3089,39 @@ msgstr "Impossibile individuare l'host remoto %s"
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1567 WWW/Library/Implementation/HTTelnet.c:108
+#: WWW/Library/Implementation/HTTCP.c:1554 WWW/Library/Implementation/HTTelnet.c:108
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Nome di host non valido: %s"
 
 # First %s will be FTP, HTTP or other protocol and second %s will be hostname
-#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1568
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Connessione %s a %s "
 
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1579
 msgid "socket failed."
 msgstr "socket fallita."
 
-#: WWW/Library/Implementation/HTTCP.c:1605
+#: WWW/Library/Implementation/HTTCP.c:1592
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "errore socket: famiglia %d indir. %s porta %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1629
+#: WWW/Library/Implementation/HTTCP.c:1616
 msgid "Could not make connection non-blocking."
 msgstr "Impossibile stabilire connessione non bloccante."
 
-#: WWW/Library/Implementation/HTTCP.c:1697
+#: WWW/Library/Implementation/HTTCP.c:1684
 msgid "Connection failed (too many retries)."
 msgstr "Connessione fallita (troppi tentativi)."
 
-#: WWW/Library/Implementation/HTTCP.c:1896
+#: WWW/Library/Implementation/HTTCP.c:1883
 msgid "Could not restore socket to blocking."
 msgstr "Impossibile ripristinare socket bloccante."
 
-#: WWW/Library/Implementation/HTTCP.c:1962
+#: WWW/Library/Implementation/HTTCP.c:1949
 msgid "Socket read failed for 180,000 tries."
 msgstr "Falliti 180000 tentativi di lettura socket."
 
@@ -3431,100 +3431,100 @@ msgstr "Memoria insufficiente, visualizzazione interrotta!"
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Memoria insufficiente, il trasferimento sar interrotto!"
 
-#: src/GridText.c:3594
+#: src/GridText.c:3601
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** MEMORIA INSUFFICIENTE ***"
 
-#: src/GridText.c:6013 src/GridText.c:6020 src/LYList.c:248
+#: src/GridText.c:6020 src/GridText.c:6027 src/LYList.c:248
 msgid "unknown field or link"
 msgstr "campo o link sconosciuto"
 
-#: src/GridText.c:6029
+#: src/GridText.c:6036
 msgid "text entry field"
 msgstr "campo di immissione testo"
 
-#: src/GridText.c:6032
+#: src/GridText.c:6039
 msgid "password entry field"
 msgstr "campo di immissione password"
 
-#: src/GridText.c:6035
+#: src/GridText.c:6042
 msgid "checkbox"
 msgstr "casella di scelta"
 
-#: src/GridText.c:6038
+#: src/GridText.c:6045
 msgid "radio button"
 msgstr "bottone radio"
 
-#: src/GridText.c:6041
+#: src/GridText.c:6048
 msgid "submit button"
 msgstr "bottone Invio"
 
-#: src/GridText.c:6044
+#: src/GridText.c:6051
 msgid "reset button"
 msgstr "bottone Annulla"
 
-#: src/GridText.c:6047
+#: src/GridText.c:6054
 msgid "popup menu"
 msgstr "men a comparsa"
 
-#: src/GridText.c:6050
+#: src/GridText.c:6057
 msgid "hidden form field"
 msgstr "campo nascosto di modulo"
 
-#: src/GridText.c:6053
+#: src/GridText.c:6060
 msgid "text entry area"
 msgstr "area di immissione testo"
 
-#: src/GridText.c:6056
+#: src/GridText.c:6063
 msgid "range entry field"
 msgstr "campo di immissione (range)"
 
-#: src/GridText.c:6059
+#: src/GridText.c:6066
 msgid "file entry field"
 msgstr "campo di immissione file"
 
-#: src/GridText.c:6062
+#: src/GridText.c:6069
 msgid "text-submit field"
 msgstr "campo di invio testo"
 
-#: src/GridText.c:6065
+#: src/GridText.c:6072
 msgid "image-submit button"
 msgstr "bottone di invio immagine"
 
-#: src/GridText.c:6068
+#: src/GridText.c:6075
 msgid "keygen field"
 msgstr "campo 勃eygen"
 
-#: src/GridText.c:6071
+#: src/GridText.c:6078
 msgid "unknown form field"
 msgstr "campo di modulo sconosciuto"
 
 # WWW/Libary/Implementation/HTFile.c
 # #, fuzzy
-#: src/GridText.c:10231
+#: src/GridText.c:10244
 msgid "Can't open file for uploading"
 msgstr "Impossibile aprire il file per il caricamento"
 
-#: src/GridText.c:11384
+#: src/GridText.c:11397
 #, c-format
 msgid "Submitting %s"
 msgstr "Invio di %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12533
+#: src/GridText.c:12546
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Interruzione: struttura TextAnchorrovinata - si suggerisce di abbandonare!"
 
 #. don't show previous state
-#: src/GridText.c:12738
+#: src/GridText.c:12751
 msgid "Wrap lines to fit displayed area?"
 msgstr "Accorciare le righe per adattarle all'area di visualizzazione?"
 
-#: src/GridText.c:12790
+#: src/GridText.c:12803
 msgid "Very long lines have been wrapped!"
 msgstr "Le righe molto lunghe sono state spezzate!"
 
-#: src/GridText.c:13232
+#: src/GridText.c:13245
 msgid "Very long lines have been truncated!"
 msgstr "Le righe molto lunghe sono state troncate!"
 
@@ -3633,15 +3633,15 @@ msgstr "Percorso del file:"
 msgid "(unknown)"
 msgstr "(sconosciuto)"
 
-#: src/HTML.c:7374
+#: src/HTML.c:7375
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Il documento rinvia solo a link nascosti. Usare il comando 'l'ista."
 
-#: src/HTML.c:7873
+#: src/HTML.c:7874
 msgid "Source cache error - disk full?"
 msgstr "Errore di registrazione - disco pieno?"
 
-#: src/HTML.c:7886
+#: src/HTML.c:7887
 msgid "Source cache error - not enough memory!"
 msgstr "Errore di registrazione - memoria insufficiente!"
 
@@ -3744,31 +3744,31 @@ msgstr "Interno"
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "errore cookie_domain_flag_set: programma interrotto"
 
-#: src/LYCurses.c:1017
+#: src/LYCurses.c:1034
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Inizializzazione del terminale fallita - tipo di terminale sconosciuto?"
 
-#: src/LYCurses.c:1442
+#: src/LYCurses.c:1459
 msgid "Terminal ="
 msgstr "Terminale ="
 
-#: src/LYCurses.c:1446
+#: src/LYCurses.c:1463
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Con questo programma si deve usare un terminale vt100, 200, ecc."
 
-#: src/LYCurses.c:1495
+#: src/LYCurses.c:1512
 msgid "Your Terminal type is unknown!"
 msgstr "Il tipo di terminale  sconosciuto."
 
-#: src/LYCurses.c:1496
+#: src/LYCurses.c:1513
 msgid "Enter a terminal type:"
 msgstr "Indicare un tipo di terminale:"
 
-#: src/LYCurses.c:1510
+#: src/LYCurses.c:1527
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TIPO DI TERMINALE IMPOSTATO A"
 
-#: src/LYCurses.c:2007
+#: src/LYCurses.c:2031
 #, c-format
 msgid ""
 "\n"
@@ -3777,7 +3777,7 @@ msgstr ""
 "\n"
 "Un errore irreversibile si  verificato in %s Ver. %s\n"
 
-#: src/LYCurses.c:2010
+#: src/LYCurses.c:2034
 #, c-format
 msgid ""
 "\n"
@@ -4316,52 +4316,52 @@ msgstr ""
 "Il file Lynx %s non  disponibile.\n"
 "\n"
 
-#: src/LYMain.c:1763
+#: src/LYMain.c:1750
 msgid "Warning:"
 msgstr "Attenzione:"
 
-#: src/LYMain.c:2328
+#: src/LYMain.c:2315
 msgid "persistent cookies state will be changed in next session only."
 msgstr "Lo stato dei cookie persistenti sar cambiato solo nella prossima sessione."
 
-#: src/LYMain.c:2565 src/LYMain.c:2610
+#: src/LYMain.c:2552 src/LYMain.c:2597
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: ignorato charset=%s sconosciuto.\n"
 
-#: src/LYMain.c:3121
+#: src/LYMain.c:3108
 #, fuzzy, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s versione %s (%s)\n"
 
-#: src/LYMain.c:3156
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Compilato il %s %s %s\n"
 
-#: src/LYMain.c:3178
+#: src/LYMain.c:3165
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors."
 msgstr "Copyright dell'Universit del Kansas, del CERN e di altri collaboratori."
 
-#: src/LYMain.c:3179
+#: src/LYMain.c:3166
 msgid "Distributed under the GNU General Public License."
 msgstr "Distribuito nell'ambito della licenza pubblica GNU"
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3167
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Vedere http://lynx.isc.org/ e l'aiuto in linea per ulteriori informazioni."
 
-#: src/LYMain.c:3952
+#: src/LYMain.c:3939
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "USO: %s [opzioni] [file]\n"
 
-#: src/LYMain.c:3953
+#: src/LYMain.c:3940
 #, c-format
 msgid "Options are:\n"
 msgstr "Le opzioni sono:\n"
 
-#: src/LYMain.c:4252
+#: src/LYMain.c:4239
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: opzione non valida: %s\n"
@@ -4436,7 +4436,7 @@ msgstr ""
 msgid "Current URL is empty."
 msgstr "Directory attuale:"
 
-#: src/LYMainLoop.c:6935 src/LYUtils.c:1714
+#: src/LYMainLoop.c:6935 src/LYUtils.c:1775
 msgid "Copy to clipboard failed."
 msgstr ""
 
@@ -4532,358 +4532,358 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "Il messaggio non ha testo originale!"
 
-#: src/LYOptions.c:758
+#: src/LYOptions.c:761
 msgid "review/edit B)ookmarks files"
 msgstr "B) revisione dei file di segnalibri"
 
-#: src/LYOptions.c:760
+#: src/LYOptions.c:763
 msgid "B)ookmark file: "
 msgstr "B) File segnalibri : "
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2126 src/LYOptions.c:2133
 msgid "ON"
 msgstr ""
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2277 src/LYOptions.c:2288
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280 src/LYOptions.c:2291
 msgid "OFF"
 msgstr ""
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2128
 msgid "NEVER"
 msgstr ""
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2129
 msgid "ALWAYS"
 msgstr ""
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2269
+#: src/LYOptions.c:2145 src/LYOptions.c:2272
 msgid "ignore"
 msgstr ""
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2146
 msgid "ask user"
 msgstr ""
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2147
 msgid "accept all"
 msgstr ""
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS OFF"
 msgstr ""
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2160
 msgid "FOR LOCAL FILES ONLY"
 msgstr ""
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2162
 msgid "ALWAYS ON"
 msgstr ""
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2174
 msgid "Numbers act as arrows"
 msgstr ""
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Links and form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2182
 msgid "Form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2189
+#: src/LYOptions.c:2192
 msgid "Case insensitive"
 msgstr ""
 
-#: src/LYOptions.c:2190
+#: src/LYOptions.c:2193
 msgid "Case sensitive"
 msgstr ""
 
-#: src/LYOptions.c:2214
+#: src/LYOptions.c:2217
 msgid "prompt normally"
 msgstr ""
 
-#: src/LYOptions.c:2215
+#: src/LYOptions.c:2218
 msgid "force yes-response"
 msgstr ""
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2219
 msgid "force no-response"
 msgstr ""
 
-#: src/LYOptions.c:2234
+#: src/LYOptions.c:2237
 #, fuzzy
 msgid "Novice"
 msgstr "Nessuno(a)"
 
-#: src/LYOptions.c:2235
+#: src/LYOptions.c:2238
 #, fuzzy
 msgid "Intermediate"
 msgstr "Interno"
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2239
 msgid "Advanced"
 msgstr ""
 
-#: src/LYOptions.c:2245
+#: src/LYOptions.c:2248
 msgid "By First Visit"
 msgstr ""
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2250
 msgid "By First Visit Reversed"
 msgstr ""
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2251
 msgid "As Visit Tree"
 msgstr ""
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2252
 msgid "By Last Visit"
 msgstr ""
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2254
 msgid "By Last Visit Reversed"
 msgstr ""
 
 #. Old_DTD variable
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2265
 msgid "relaxed (TagSoup mode)"
 msgstr ""
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2266
 msgid "strict (SortaSGML mode)"
 msgstr ""
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2273
 msgid "as labels"
 msgstr ""
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2274
 #, fuzzy
 msgid "as links"
 msgstr "questo link"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2281
 #, fuzzy
 msgid "show filename"
 msgstr "(cattivo nome di file)"
 
-#: src/LYOptions.c:2289
+#: src/LYOptions.c:2292
 msgid "STANDARD"
 msgstr ""
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2293
 msgid "ADVANCED"
 msgstr ""
 
-#: src/LYOptions.c:2316
+#: src/LYOptions.c:2319
 #, fuzzy
 msgid "Directories first"
 msgstr "Sottodirectory:"
 
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2320
 #, fuzzy
 msgid "Files first"
 msgstr " per primo"
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2321
 #, fuzzy
 msgid "Mixed style"
 msgstr "Modo di elaborazione riga"
 
-#: src/LYOptions.c:2326 src/LYOptions.c:2343
+#: src/LYOptions.c:2329 src/LYOptions.c:2346
 #, fuzzy
 msgid "By Name"
 msgstr "Nome:"
 
-#: src/LYOptions.c:2327 src/LYOptions.c:2344
+#: src/LYOptions.c:2330 src/LYOptions.c:2347
 msgid "By Type"
 msgstr ""
 
-#: src/LYOptions.c:2328 src/LYOptions.c:2345
+#: src/LYOptions.c:2331 src/LYOptions.c:2348
 #, fuzzy
 msgid "By Size"
 msgstr "Dim. byte:"
 
-#: src/LYOptions.c:2329 src/LYOptions.c:2346
+#: src/LYOptions.c:2332 src/LYOptions.c:2349
 #, fuzzy
 msgid "By Date"
 msgstr "Data:"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2333
 msgid "By Mode"
 msgstr ""
 
-#: src/LYOptions.c:2332
+#: src/LYOptions.c:2335
 msgid "By User"
 msgstr ""
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 #, fuzzy
 msgid "By Group"
 msgstr "Gruppo"
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2357
 msgid "Do not show rate"
 msgstr ""
 
-#: src/LYOptions.c:2355 src/LYOptions.c:2356
+#: src/LYOptions.c:2358 src/LYOptions.c:2359
 #, fuzzy, c-format
 msgid "Show %s/sec rate"
 msgstr "Velocit di trasferimento"
 
-#: src/LYOptions.c:2358 src/LYOptions.c:2359
+#: src/LYOptions.c:2361 src/LYOptions.c:2362
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr ""
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2374
 msgid "Accept lynx's internal types"
 msgstr ""
 
-#: src/LYOptions.c:2372
+#: src/LYOptions.c:2375
 msgid "Also accept lynx.cfg's types"
 msgstr ""
 
-#: src/LYOptions.c:2373
+#: src/LYOptions.c:2376
 msgid "Also accept user's types"
 msgstr ""
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "Also accept system's types"
 msgstr ""
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 #, fuzzy
 msgid "Accept all types"
 msgstr "Accetta modifiche"
 
-#: src/LYOptions.c:2384
+#: src/LYOptions.c:2387
 msgid "gzip"
 msgstr ""
 
-#: src/LYOptions.c:2385
+#: src/LYOptions.c:2388
 msgid "deflate"
 msgstr ""
 
-#: src/LYOptions.c:2388
+#: src/LYOptions.c:2391
 msgid "compress"
 msgstr ""
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2394
 msgid "bzip2"
 msgstr ""
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2396
 msgid "All"
 msgstr ""
 
-#: src/LYOptions.c:2658 src/LYOptions.c:2682
+#: src/LYOptions.c:2664 src/LYOptions.c:2688
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Usare %s per richiamare il men opzioni."
 
-#: src/LYOptions.c:3429
+#: src/LYOptions.c:3438
 msgid "(options marked with (!) will not be saved)"
 msgstr ""
 
-#: src/LYOptions.c:3437
+#: src/LYOptions.c:3446
 msgid "General Preferences"
 msgstr "Preferenze generali"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3450
 msgid "User mode"
 msgstr "Modalit d'uso"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3447
+#: src/LYOptions.c:3456
 msgid "Editor"
 msgstr "Editor"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3461
 msgid "Type of Search"
 msgstr " Modalit di ricerca"
 
-#: src/LYOptions.c:3457
+#: src/LYOptions.c:3466
 msgid "Security and Privacy"
 msgstr ""
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3461
+#: src/LYOptions.c:3470
 msgid "Cookies"
 msgstr "Cookie"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3475
+#: src/LYOptions.c:3484
 msgid "Invalid-Cookie Prompting"
 msgstr ""
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3482
+#: src/LYOptions.c:3491
 msgid "SSL Prompting"
 msgstr ""
 
-#: src/LYOptions.c:3488
+#: src/LYOptions.c:3497
 msgid "Keyboard Input"
 msgstr "Immissione da tastiera"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3492
+#: src/LYOptions.c:3501
 msgid "Keypad mode"
 msgstr "Tastierino numerico"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3498
+#: src/LYOptions.c:3507
 msgid "Emacs keys"
 msgstr "Tasti emacs"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3513
 msgid "VI keys"
 msgstr "Tasti vi"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3511
+#: src/LYOptions.c:3520
 msgid "Line edit style"
 msgstr "Modo di elaborazione riga"
 
 # #, fuzzy
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3532
 msgid "Keyboard layout"
 msgstr "Tipo di tastiera"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3537
+#: src/LYOptions.c:3546
 msgid "Display and Character Set"
 msgstr "Visualizzazione e set di caratteri (charset)"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3542
+#: src/LYOptions.c:3551
 #, fuzzy
 msgid "Use locale-based character set"
 msgstr "Charset presunto del documento"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3551
+#: src/LYOptions.c:3560
 msgid "Display character set"
 msgstr "Set di caratteri per lo schermo"
 
-#: src/LYOptions.c:3582
+#: src/LYOptions.c:3591
 msgid "Assumed document character set"
 msgstr "Charset presunto del documento"
 
@@ -4892,177 +4892,180 @@ msgstr "Charset presunto del documento"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3602
+#: src/LYOptions.c:3611
 msgid "CJK mode"
 msgstr "Modo CJK (lingue asiatiche)"
 
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3613
 msgid "Raw 8-bit"
 msgstr "Non convertito (raw 8-bit)"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3612
+#: src/LYOptions.c:3621
 msgid "X Display"
 msgstr "X Display"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3618
+#: src/LYOptions.c:3627
 msgid "Document Appearance"
 msgstr "Aspetto del documento"
 
-#: src/LYOptions.c:3624
+#: src/LYOptions.c:3633
 msgid "Show color"
 msgstr "Mostrare i colori"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3648
+#: src/LYOptions.c:3657
 msgid "Show cursor"
 msgstr "Mostrare il cursore"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3663
 #, fuzzy
 msgid "Underline links"
 msgstr "Link nascosti:"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3670
 msgid "Show scrollbar"
 msgstr "Mostrare la barra di scorrimento"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3668
+#: src/LYOptions.c:3677
 msgid "Popups for select fields"
 msgstr "Men a comparsa per i campi 哀elect"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3674
+#: src/LYOptions.c:3683
 msgid "HTML error recovery"
 msgstr "Ripristino da errori HTML"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3680
+#: src/LYOptions.c:3689
 msgid "Show images"
 msgstr "Mostrare le immagini"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3694
+#: src/LYOptions.c:3703
 msgid "Verbose images"
 msgstr "Immagini prolisse"
 
-#: src/LYOptions.c:3703
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3711
 msgid "Headers Transferred to Remote Servers"
 msgstr "Le intestazioni sono trasmesse ai server remoti"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3715
 msgid "Personal mail address"
 msgstr "Indirizzo E-mail personale"
 
 #. Mail Address: INPUT
-#: src/LYOptions.c:3712
+#: src/LYOptions.c:3720
 #, fuzzy
 msgid "Password for anonymous ftp"
 msgstr "Password per l'host news '%s':"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3717
+#: src/LYOptions.c:3725
 #, fuzzy
 msgid "Preferred media type"
 msgstr "%d byte trasferiti"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3723
+#: src/LYOptions.c:3731
 #, fuzzy
 msgid "Preferred encoding"
 msgstr "Lingua preferita"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3729
+#: src/LYOptions.c:3737
 msgid "Preferred document character set"
 msgstr "Charset preferito per i documenti"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3742
 msgid "Preferred document language"
 msgstr "Lingua preferita"
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3748
 msgid "User-Agent header"
 msgstr "Header 'User-Agent'"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3748
+#: src/LYOptions.c:3756
 msgid "Listing and Accessing Files"
 msgstr "Elencazione ed accesso ai file"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3752
+#: src/LYOptions.c:3760
 msgid "FTP sort criteria"
 msgstr "Criterio disposizione liste FTP"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3759
+#: src/LYOptions.c:3767
 msgid "Local directory sort criteria"
 msgstr "Criterio disposizione file locali"
 
 # NdT: added "manually" -GA
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3773
 msgid "Local directory sort order"
 msgstr "Criterio ordinamento file locali"
 
 # NdT: options menu phrase missing in po files -GA
 # msgid "(options marked with (!) will not be saved)\n"
 # msgstr "(le opzioni affiancate da (!) non saranno registrate)\n"
-#: src/LYOptions.c:3774
+#: src/LYOptions.c:3782
 msgid "Show dot files"
 msgstr "Mostrare i file nascosti"
 
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3790
 msgid "Execution links"
 msgstr "Esecuzione link"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3810
 msgid "Show transfer rate"
 msgstr "Velocit di trasferimento"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3830
 msgid "Special Files and Screens"
 msgstr "File e schermate speciali"
 
-#: src/LYOptions.c:3827
+#: src/LYOptions.c:3835
 msgid "Multi-bookmarks"
 msgstr "Segnalibri multipli"
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3843
 msgid "Review/edit Bookmarks files"
 msgstr "Revisione file segnalibri"
 
-#: src/LYOptions.c:3837
+#: src/LYOptions.c:3845
 msgid "Goto multi-bookmark menu"
 msgstr "Andare al men multi-bookmark"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3847
 msgid "Bookmarks file"
 msgstr "File dei segnalibri (Bookmark)"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3845
+#: src/LYOptions.c:3853
 msgid "Visited Pages"
 msgstr "Pagine consultate"
 
-#: src/LYOptions.c:3850
+#: src/LYOptions.c:3858
 #, fuzzy
 msgid "View the file "
 msgstr "Spedire il file tramite mail"
@@ -5183,38 +5186,38 @@ msgstr "Lynx: impossibile iniziare. File di regole CERN %s non disponibile.\n"
 msgid "(no name)"
 msgstr "(nessun nome)"
 
-#: src/LYReadCFG.c:1782
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Oltre %d inclusioni annidate di lynx.cfg. Forse c' un circolo vizioso?\n"
 
-#: src/LYReadCFG.c:1784
+#: src/LYReadCFG.c:1786
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "L'ultima inclusione tentata era: '%s',\n"
 
-#: src/LYReadCFG.c:1785
+#: src/LYReadCFG.c:1787
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "incluso da '%s'.\n"
 
-#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263
+#: src/LYReadCFG.c:2194 src/LYReadCFG.c:2207 src/LYReadCFG.c:2265
 msgid "The following is read from your lynx.cfg file."
 msgstr "Quanto segue  tratto dal file lynx.cfg personale."
 
-#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206
+#: src/LYReadCFG.c:2195 src/LYReadCFG.c:2208
 msgid "Please read the distribution"
 msgstr "Consultare la distribuzione"
 
-#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209
+#: src/LYReadCFG.c:2201 src/LYReadCFG.c:2211
 msgid "for more comments."
 msgstr "per ulteriori commenti."
 
-#: src/LYReadCFG.c:2245
+#: src/LYReadCFG.c:2247
 msgid "RELOAD THE CHANGES"
 msgstr "RIACQUISIRE LE MODIFICHE"
 
-#: src/LYReadCFG.c:2253
+#: src/LYReadCFG.c:2255
 msgid "Your primary configuration"
 msgstr "La configurazione principale"
 
@@ -5489,34 +5492,34 @@ msgstr "Caricare su:"
 msgid "Upload options:"
 msgstr "Opzioni di caricamento file:"
 
-#: src/LYUtils.c:1716
+#: src/LYUtils.c:1777
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2493
+#: src/LYUtils.c:2554
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Protocollo di accesso inatteso per questo schema di URL."
 
-#: src/LYUtils.c:3301
+#: src/LYUtils.c:3362
 msgid "Too many tempfiles"
 msgstr "Troppi file temporanei"
 
 # #, fuzzy
-#: src/LYUtils.c:3605
+#: src/LYUtils.c:3666
 msgid "unknown restriction"
 msgstr "Restrizione ignota"
 
-#: src/LYUtils.c:3635
+#: src/LYUtils.c:3696
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Nessuna restrizione impostata.\n"
 
-#: src/LYUtils.c:3638
+#: src/LYUtils.c:3699
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Descrizione delle restrizioni:\n"
 
-#: src/LYUtils.c:5022
+#: src/LYUtils.c:5077
 msgid "Cannot find HOME directory"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 26d7e582..45988406 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.5pre9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-30 18:03-0400\n"
+"POT-Creation-Date: 2005-10-16 19:03-0400\n"
 "PO-Revision-Date: 2003-04-19 20:40+0900\n"
 "Last-Translator: Masayuki Hatta <mhatta@po.airs.net>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -2243,7 +2243,7 @@ msgstr "(抩蟆卅仄)"
 msgid "(No value.)"
 msgstr "(襖卅仄)"
 
-#: LYMessages.c:713 src/LYOptions.c:2382
+#: LYMessages.c:713 src/LYOptions.c:2385
 msgid "None"
 msgstr "卅仄"
 
@@ -2790,7 +2790,7 @@ msgstr "POST 戊件氾件汁毛殖戈玉平亙丟件玄反平乓永扑亙及醱卞丐曰引六氏匹仄凶﹝瘋
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8508
+#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8515
 msgid "Loading incomplete."
 msgstr "づ心慇心互醱蠅今木引仄凶﹝"
 
@@ -2905,12 +2905,12 @@ msgstr "瓦亙□旦石旦玄 '%s' 及由旦伐□玉:"
 msgid "Change password?"
 msgstr "由旦伐□玉毛庍凳仄引允井?"
 
-#: WWW/Library/Implementation/HTNews.c:1736
+#: WWW/Library/Implementation/HTNews.c:1706
 #, c-format
 msgid "No matches for: %s"
 msgstr "竟癲允月手及互丐曰引六氏: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1789
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2918,7 +2918,7 @@ msgstr ""
 "\n"
 "仇及弘伙□皿ま卞反筏儀互丐曰引六氏﹝\n"
 
-#: WWW/Library/Implementation/HTNews.c:1801
+#: WWW/Library/Implementation/HTNews.c:1768
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2929,16 +2929,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1814
+#: WWW/Library/Implementation/HTNews.c:1781
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s﹜筏儀 %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1837
+#: WWW/Library/Implementation/HTNews.c:1804
 msgid "Earlier articles"
 msgstr "動蟆及筏儀"
 
-#: WWW/Library/Implementation/HTNews.c:1850
+#: WWW/Library/Implementation/HTNews.c:1817
 #, c-format
 msgid ""
 "\n"
@@ -2949,41 +2949,41 @@ msgstr ""
 "蜇箕 %d 騷幻升及筏儀毛 %s 匹づ戈仇午互匹五引允﹝ID 反動票及騷曰:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1912
+#: WWW/Library/Implementation/HTNews.c:1879
 msgid "All available articles in "
 msgstr "動票匹づ戶月蟈筏儀: "
 
-#: WWW/Library/Implementation/HTNews.c:2133
+#: WWW/Library/Implementation/HTNews.c:2093
 msgid "Later articles"
 msgstr "公及詨及筏儀"
 
-#: WWW/Library/Implementation/HTNews.c:2156
+#: WWW/Library/Implementation/HTNews.c:2116
 msgid "Post to "
 msgstr "動票尺禾旦玄: "
 
-#: WWW/Library/Implementation/HTNews.c:2377
+#: WWW/Library/Implementation/HTNews.c:2337
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "仇及弁仿奶失件玄卞反 SNEWS URL 及扔禾□玄互殖引木化中引六氏﹝"
 
-#: WWW/Library/Implementation/HTNews.c:2585
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr "戲氾平旦玄輊仃及正□必永玄互丐曰引六氏!"
 
-#: WWW/Library/Implementation/HTNews.c:2616
+#: WWW/Library/Implementation/HTNews.c:2576
 msgid "Connecting to NewsHost ..."
 msgstr "瓦亙□旦石旦玄卞濤糧醱 ..."
 
-#: WWW/Library/Implementation/HTNews.c:2668
+#: WWW/Library/Implementation/HTNews.c:2628
 #, c-format
 msgid "Could not access %s."
 msgstr "%s 卞失弁本旦匹五引六氏﹝"
 
-#: WWW/Library/Implementation/HTNews.c:2774
+#: WWW/Library/Implementation/HTNews.c:2734
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "瓦亙□旦樹扷互づ戶引六氏﹝瓦亙□旦石旦玄 %.20s 及殺蠶: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2778
+#: WWW/Library/Implementation/HTNews.c:2738
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "瓦亙□旦樹扷互づ戶引六氏﹝石旦玄 %s 井日及殺蠶反塢匹允"
@@ -2991,22 +2991,22 @@ msgstr "瓦亙□旦樹扷互づ戶引六氏﹝石旦玄 %s 井日及殺蠶反塢匹允"
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2982
+#: WWW/Library/Implementation/HTNews.c:2942
 msgid "Reading list of available newsgroups."
 msgstr "厙迕第Х卅瓦亙□旦弘伙□皿及伉旦玄毛づ心慇心醱﹝"
 
-#: WWW/Library/Implementation/HTNews.c:3003
+#: WWW/Library/Implementation/HTNews.c:2963
 msgid "Reading list of articles in newsgroup."
 msgstr "瓦亙□旦弘伙□皿ま及筏儀及伉旦玄毛づ心慇心醱﹝"
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:3009
+#: WWW/Library/Implementation/HTNews.c:2969
 msgid "Reading news article."
 msgstr "瓦亙□旦筏儀毛づ心慇心醱﹝"
 
-#: WWW/Library/Implementation/HTNews.c:3039
+#: WWW/Library/Implementation/HTNews.c:2999
 msgid "Sorry, could not load requested news."
 msgstr "丹丹戈﹜邰菲今木凶瓦亙□旦毛づ心慇戶引六氏匹仄凶﹝"
 
@@ -3014,11 +3014,11 @@ msgstr "丹丹戈﹜邰菲今木凶瓦亙□旦毛づ心慇戶引六氏匹仄凶﹝"
 msgid "Address has invalid port"
 msgstr "失玉伊旦卞尕懇卅禾□玄互隙爛今木化中引允"
 
-#: WWW/Library/Implementation/HTTCP.c:1320
+#: WWW/Library/Implementation/HTTCP.c:1308
 msgid "Address length looks invalid"
 msgstr "失玉伊旦贏互尕懇及方丹匹允"
 
-#: WWW/Library/Implementation/HTTCP.c:1552 WWW/Library/Implementation/HTTCP.c:1570
+#: WWW/Library/Implementation/HTTCP.c:1539 WWW/Library/Implementation/HTTCP.c:1557
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "伉乒□玄石旦玄 %s 及匏譆毛た爛匹五引六氏﹝"
@@ -3027,38 +3027,38 @@ msgstr "伉乒□玄石旦玄 %s 及匏譆毛た爛匹五引六氏﹝"
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1567 WWW/Library/Implementation/HTTelnet.c:108
+#: WWW/Library/Implementation/HTTCP.c:1554 WWW/Library/Implementation/HTTelnet.c:108
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "%s 反尕懇卅石旦玄抩匹允"
 
-#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1568
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "%s 匹 %s 卞濤糧醱"
 
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1579
 msgid "socket failed."
 msgstr "末弗永玄互撩л仄引仄凶﹝"
 
-#: WWW/Library/Implementation/HTTCP.c:1605
+#: WWW/Library/Implementation/HTTCP.c:1592
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "末弗永玄互撩л仄引仄凶: 白央立伉 %d 失玉伊旦 %s 禾□玄 %s﹝"
 
-#: WWW/Library/Implementation/HTTCP.c:1629
+#: WWW/Library/Implementation/HTTCP.c:1616
 msgid "Could not make connection non-blocking."
 msgstr "濤糧毛韞皏磳疇郊韞陘豸リ迨牏誘韝リ楔縑"
 
-#: WWW/Library/Implementation/HTTCP.c:1697
+#: WWW/Library/Implementation/HTTCP.c:1684
 msgid "Connection failed (too many retries)."
 msgstr "濤糧卞撩л仄引仄凶 (瘋魂墊互聶允亢引允)"
 
-#: WWW/Library/Implementation/HTTCP.c:1896
+#: WWW/Library/Implementation/HTTCP.c:1883
 msgid "Could not restore socket to blocking."
 msgstr "皮伕永平件弘及凶戶及末弗永玄毛汊蛙匹五引六氏匹仄凶﹝"
 
-#: WWW/Library/Implementation/HTTCP.c:1962
+#: WWW/Library/Implementation/HTTCP.c:1949
 msgid "Socket read failed for 180,000 tries."
 msgstr "180,000 莢魂墊仄引仄凶互末弗永玄及づ心慇心卞撩л仄引仄凶﹝"
 
@@ -3362,98 +3362,98 @@ msgstr "丟乒伉毛銀中五曰引仄凶﹝刓憎毛醱蠅仄引允!"
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "丟乒伉毛銀中五曰引仄凶﹝鱉霜毛醱蠅仄引允!"
 
-#: src/GridText.c:3594
+#: src/GridText.c:3601
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr "*** 丟乒伉毛銀中五曰引仄凶 ***"
 
-#: src/GridText.c:6013 src/GridText.c:6020 src/LYList.c:248
+#: src/GridText.c:6020 src/GridText.c:6027 src/LYList.c:248
 msgid "unknown field or link"
 msgstr "怳襞及白奴□伙玉引凶反伉件弁匹允"
 
-#: src/GridText.c:6029
+#: src/GridText.c:6036
 msgid "text entry field"
 msgstr "氾平旦玄ェ恘白奴□伙玉"
 
-#: src/GridText.c:6032
+#: src/GridText.c:6039
 msgid "password entry field"
 msgstr "由旦伐□玉ェ恘白奴□伙玉"
 
-#: src/GridText.c:6035
+#: src/GridText.c:6042
 msgid "checkbox"
 msgstr "民尼永弁示永弁旦"
 
-#: src/GridText.c:6038
+#: src/GridText.c:6045
 msgid "radio button"
 msgstr "仿斥左示正件"
 
-#: src/GridText.c:6041
+#: src/GridText.c:6048
 msgid "submit button"
 msgstr "霜耨示正件"
 
-#: src/GridText.c:6044
+#: src/GridText.c:6051
 msgid "reset button"
 msgstr "伉本永玄示正件"
 
-#: src/GridText.c:6047
+#: src/GridText.c:6054
 msgid "popup menu"
 msgstr "禾永皿失永皿丟瓦亙□"
 
-#: src/GridText.c:6050
+#: src/GridText.c:6057
 msgid "hidden form field"
 msgstr "悵今木凶白巧□丞白奴□伙玉"
 
-#: src/GridText.c:6053
+#: src/GridText.c:6060
 msgid "text entry area"
 msgstr "氾平旦玄ェ恘巨伉失"
 
-#: src/GridText.c:6056
+#: src/GridText.c:6063
 msgid "range entry field"
 msgstr "炾玅恘白奴□伙玉"
 
-#: src/GridText.c:6059
+#: src/GridText.c:6066
 msgid "file entry field"
 msgstr "白央奶伙ェ恘白奴□伙玉"
 
-#: src/GridText.c:6062
+#: src/GridText.c:6069
 msgid "text-submit field"
 msgstr "氾平旦玄霜耨白奴□伙玉"
 
-#: src/GridText.c:6065
+#: src/GridText.c:6072
 msgid "image-submit button"
 msgstr "脰颶霜耨示正件"
 
-#: src/GridText.c:6068
+#: src/GridText.c:6075
 msgid "keygen field"
 msgstr "keygen 白奴□伙玉"
 
-#: src/GridText.c:6071
+#: src/GridText.c:6078
 msgid "unknown form field"
 msgstr "怳襞及白巧□丞白奴□伙玉"
 
-#: src/GridText.c:10231
+#: src/GridText.c:10244
 msgid "Can't open file for uploading"
 msgstr "失永皿伕□玉允月白央奶伙互釩仃引六氏﹝"
 
-#: src/GridText.c:11384
+#: src/GridText.c:11397
 #, c-format
 msgid "Submitting %s"
 msgstr "%s 毛霜耨醱"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12533
+#: src/GridText.c:12546
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "甩件弘腹請: TextAnchor 厭瞻蟲互莽木引仄凶 - 蔽弇毛云換戶仄引允!"
 
 #. don't show previous state
-#: src/GridText.c:12738
+#: src/GridText.c:12751
 msgid "Wrap lines to fit displayed area?"
 msgstr "刓憎恄啗卞璋引月方丹墊毛濯曰忒仄引允井?"
 
-#: src/GridText.c:12790
+#: src/GridText.c:12803
 msgid "Very long lines have been wrapped!"
 msgstr "贏允亢月墊反濯曰忒今木引允!"
 
-#: src/GridText.c:13232
+#: src/GridText.c:13245
 msgid "Very long lines have been truncated!"
 msgstr "贏允亢月墊反濠曰腴戶日木引允!"
 
@@ -3559,15 +3559,15 @@ msgstr "白央奶伙尺及由旦:"
 msgid "(unknown)"
 msgstr "(尕抸)"
 
-#: src/HTML.c:7374
+#: src/HTML.c:7375
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "妐踏卞反悵仄伉件弁仄井丐曰引六氏﹝[l]井日矇勻化仁分今中﹝"
 
-#: src/HTML.c:7873
+#: src/HTML.c:7874
 msgid "Source cache error - disk full?"
 msgstr "末□旦平乓永扑亙巨仿□匹允 - 犯奴旦弁互域м井手?"
 
-#: src/HTML.c:7886
+#: src/HTML.c:7887
 msgid "Source cache error - not enough memory!"
 msgstr "末□旦平乓永扑亙巨仿□匹允 - 丟乒伉互簫曰引六氏!"
 
@@ -3671,31 +3671,31 @@ msgstr "ま朿"
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "cookie_domain_flag_set 巨仿□﹜皿伕弘仿丞毛蔽弇仄引允"
 
-#: src/LYCurses.c:1017
+#: src/LYCurses.c:1034
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "羹坱及賡渝祭卞撩л仄引仄凶 - 羹坱及正奶皿互尕抸?"
 
-#: src/LYCurses.c:1442
+#: src/LYCurses.c:1459
 msgid "Terminal ="
 msgstr "羹坱 ="
 
-#: src/LYCurses.c:1446
+#: src/LYCurses.c:1463
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "仇及皿伕弘仿丞反 vt100﹜200 卅升及羹坱曉匹撢墊仄化仁分今中﹝"
 
-#: src/LYCurses.c:1495
+#: src/LYCurses.c:1512
 msgid "Your Terminal type is unknown!"
 msgstr "云銀中及羹坱正奶皿互坌井曰引六氏!"
 
-#: src/LYCurses.c:1496
+#: src/LYCurses.c:1513
 msgid "Enter a terminal type:"
 msgstr "羹坱正奶皿毛ェ恘:"
 
-#: src/LYCurses.c:1510
+#: src/LYCurses.c:1527
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "澀爛今木月羹坱正奶皿反"
 
-#: src/LYCurses.c:2007
+#: src/LYCurses.c:2031
 #, c-format
 msgid ""
 "\n"
@@ -3704,7 +3704,7 @@ msgstr ""
 "\n"
 "譙抰讀卅巨仿□互 %s 田□斥亦件 %s 匹素舅楔牏楔璞n"
 
-#: src/LYCurses.c:2010
+#: src/LYCurses.c:2034
 #, c-format
 msgid ""
 "\n"
@@ -4240,52 +4240,52 @@ msgstr ""
 "Lynx 白央奶伙 %s 反厙迕匹五引六氏﹝\n"
 "\n"
 
-#: src/LYMain.c:1763
+#: src/LYMain.c:1750
 msgid "Warning:"
 msgstr "鏜啦: "
 
-#: src/LYMain.c:2328
+#: src/LYMain.c:2315
 msgid "persistent cookies state will be changed in next session only."
 msgstr "捩糧讀弁永平□及橇謫反慼及本永扑亦件卞卅日卅中午庍凳今木引六氏﹝"
 
-#: src/LYMain.c:2565 src/LYMain.c:2610
+#: src/LYMain.c:2552 src/LYMain.c:2597
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: 尕抸卅平乓仿弁正本永玄 %s 毛拑骰仄引允﹝\n"
 
-#: src/LYMain.c:3121
+#: src/LYMain.c:3108
 #, fuzzy, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s 田□斥亦件 %s (%s)\n"
 
-#: src/LYMain.c:3156
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "%s 曉匹 %s %s 卞申伙玉今木引仄凶﹝\n"
 
-#: src/LYMain.c:3178
+#: src/LYMain.c:3165
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors."
 msgstr "市件扒旦釐喀﹜CERN 午公及職及塽艇樊互難綜腺毛忡肣仄﹜"
 
-#: src/LYMain.c:3179
+#: src/LYMain.c:3166
 msgid "Distributed under the GNU General Public License."
 msgstr "GNU 域抶雥香迕袱雛滅沶踏及票匹т幵今木化中引允﹝"
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3167
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "擇仄仁反 http://lynx.isc.org/ 午左件仿奶件目伙皿毛仍厖仁分今中﹝"
 
-#: src/LYMain.c:3952
+#: src/LYMain.c:3939
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "銀中杅: %s [左皿扑亦件] [白央奶伙]\n"
 
-#: src/LYMain.c:3953
+#: src/LYMain.c:3940
 #, c-format
 msgid "Options are:\n"
 msgstr "左皿扑亦件:\n"
 
-#: src/LYMain.c:4252
+#: src/LYMain.c:4239
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: 尕懇卅左皿扑亦件匹允: %s\n"
@@ -4360,7 +4360,7 @@ msgstr ""
 msgid "Current URL is empty."
 msgstr "蜇箕及犯奴伊弁玄伉:"
 
-#: src/LYMainLoop.c:6935 src/LYUtils.c:1714
+#: src/LYMainLoop.c:6935 src/LYUtils.c:1775
 msgid "Copy to clipboard failed."
 msgstr ""
 
@@ -4456,357 +4456,357 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "丟永本□斥卞反葭及氾平旦玄互殖引木化中引六氏!"
 
-#: src/LYOptions.c:758
+#: src/LYOptions.c:761
 msgid "review/edit B)ookmarks files"
 msgstr "[b]皮永弁穴□弁白央奶伙毛旌厖/彸螂"
 
-#: src/LYOptions.c:760
+#: src/LYOptions.c:763
 msgid "B)ookmark file: "
 msgstr "[b]皮永弁穴□弁白央奶伙"
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2126 src/LYOptions.c:2133
 msgid "ON"
 msgstr ""
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2277 src/LYOptions.c:2288
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280 src/LYOptions.c:2291
 msgid "OFF"
 msgstr ""
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2128
 msgid "NEVER"
 msgstr ""
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2129
 msgid "ALWAYS"
 msgstr ""
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2269
+#: src/LYOptions.c:2145 src/LYOptions.c:2272
 msgid "ignore"
 msgstr ""
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2146
 msgid "ask user"
 msgstr ""
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2147
 msgid "accept all"
 msgstr ""
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS OFF"
 msgstr ""
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2160
 msgid "FOR LOCAL FILES ONLY"
 msgstr ""
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2162
 msgid "ALWAYS ON"
 msgstr ""
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2174
 msgid "Numbers act as arrows"
 msgstr ""
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Links and form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2182
 msgid "Form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2189
+#: src/LYOptions.c:2192
 msgid "Case insensitive"
 msgstr ""
 
-#: src/LYOptions.c:2190
+#: src/LYOptions.c:2193
 msgid "Case sensitive"
 msgstr ""
 
-#: src/LYOptions.c:2214
+#: src/LYOptions.c:2217
 msgid "prompt normally"
 msgstr ""
 
-#: src/LYOptions.c:2215
+#: src/LYOptions.c:2218
 msgid "force yes-response"
 msgstr ""
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2219
 msgid "force no-response"
 msgstr ""
 
-#: src/LYOptions.c:2234
+#: src/LYOptions.c:2237
 #, fuzzy
 msgid "Novice"
 msgstr "卅仄"
 
-#: src/LYOptions.c:2235
+#: src/LYOptions.c:2238
 #, fuzzy
 msgid "Intermediate"
 msgstr "ま朿"
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2239
 msgid "Advanced"
 msgstr ""
 
-#: src/LYOptions.c:2245
+#: src/LYOptions.c:2248
 msgid "By First Visit"
 msgstr ""
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2250
 msgid "By First Visit Reversed"
 msgstr ""
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2251
 msgid "As Visit Tree"
 msgstr ""
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2252
 msgid "By Last Visit"
 msgstr ""
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2254
 msgid "By Last Visit Reversed"
 msgstr ""
 
 #. Old_DTD variable
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2265
 msgid "relaxed (TagSoup mode)"
 msgstr ""
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2266
 msgid "strict (SortaSGML mode)"
 msgstr ""
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2273
 msgid "as labels"
 msgstr ""
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2274
 #, fuzzy
 msgid "as links"
 msgstr "仇及伉件弁"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2281
 #, fuzzy
 msgid "show filename"
 msgstr " (尕懇卅白央奶伙抩)"
 
-#: src/LYOptions.c:2289
+#: src/LYOptions.c:2292
 msgid "STANDARD"
 msgstr ""
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2293
 msgid "ADVANCED"
 msgstr ""
 
-#: src/LYOptions.c:2316
+#: src/LYOptions.c:2319
 #, fuzzy
 msgid "Directories first"
 msgstr "扔皮犯奴伊弁玄伉:"
 
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2320
 #, fuzzy
 msgid "Files first"
 msgstr " 毛瘉賡卞繭仄引允"
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2321
 #, fuzzy
 msgid "Mixed style"
 msgstr "墊彸螂旦正奶伙"
 
-#: src/LYOptions.c:2326 src/LYOptions.c:2343
+#: src/LYOptions.c:2329 src/LYOptions.c:2346
 #, fuzzy
 msgid "By Name"
 msgstr "抩蟆:"
 
-#: src/LYOptions.c:2327 src/LYOptions.c:2344
+#: src/LYOptions.c:2330 src/LYOptions.c:2347
 msgid "By Type"
 msgstr ""
 
-#: src/LYOptions.c:2328 src/LYOptions.c:2345
+#: src/LYOptions.c:2331 src/LYOptions.c:2348
 #, fuzzy
 msgid "By Size"
 msgstr "田奶玄扔奶朮:"
 
-#: src/LYOptions.c:2329 src/LYOptions.c:2346
+#: src/LYOptions.c:2332 src/LYOptions.c:2349
 #, fuzzy
 msgid "By Date"
 msgstr "ゥ凜:"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2333
 msgid "By Mode"
 msgstr ""
 
-#: src/LYOptions.c:2332
+#: src/LYOptions.c:2335
 msgid "By User"
 msgstr ""
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 #, fuzzy
 msgid "By Group"
 msgstr "弘伙□皿"
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2357
 msgid "Do not show rate"
 msgstr ""
 
-#: src/LYOptions.c:2355 src/LYOptions.c:2356
+#: src/LYOptions.c:2358 src/LYOptions.c:2359
 #, fuzzy, c-format
 msgid "Show %s/sec rate"
 msgstr "鱉霜伊□玄毛刓憎"
 
-#: src/LYOptions.c:2358 src/LYOptions.c:2359
+#: src/LYOptions.c:2361 src/LYOptions.c:2362
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr ""
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2374
 msgid "Accept lynx's internal types"
 msgstr ""
 
-#: src/LYOptions.c:2372
+#: src/LYOptions.c:2375
 msgid "Also accept lynx.cfg's types"
 msgstr ""
 
-#: src/LYOptions.c:2373
+#: src/LYOptions.c:2376
 msgid "Also accept user's types"
 msgstr ""
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "Also accept system's types"
 msgstr ""
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 #, fuzzy
 msgid "Accept all types"
 msgstr "庍凳毛肣躲卞允月"
 
-#: src/LYOptions.c:2384
+#: src/LYOptions.c:2387
 msgid "gzip"
 msgstr ""
 
-#: src/LYOptions.c:2385
+#: src/LYOptions.c:2388
 msgid "deflate"
 msgstr ""
 
-#: src/LYOptions.c:2388
+#: src/LYOptions.c:2391
 msgid "compress"
 msgstr ""
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2394
 msgid "bzip2"
 msgstr ""
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2396
 msgid "All"
 msgstr ""
 
-#: src/LYOptions.c:2658 src/LYOptions.c:2682
+#: src/LYOptions.c:2664 src/LYOptions.c:2688
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "%s 匹澀爛丟瓦亙□毛粟が仄引允!"
 
-#: src/LYOptions.c:3429
+#: src/LYOptions.c:3438
 msgid "(options marked with (!) will not be saved)"
 msgstr "((!) 互勾中凶左皿扑亦件反忡繡今木引六氏)"
 
-#: src/LYOptions.c:3437
+#: src/LYOptions.c:3446
 msgid "General Preferences"
 msgstr "蟈旼炊岍葸"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3450
 msgid "User mode"
 msgstr "交□扒乒□玉"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3447
+#: src/LYOptions.c:3456
 msgid "Editor"
 msgstr "銀迕允月巨犯奴正"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3461
 msgid "Type of Search"
 msgstr "腹綢正奶皿"
 
-#: src/LYOptions.c:3457
+#: src/LYOptions.c:3466
 msgid "Security and Privacy"
 msgstr ""
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3461
+#: src/LYOptions.c:3470
 msgid "Cookies"
 msgstr "弁永平□"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3475
+#: src/LYOptions.c:3484
 msgid "Invalid-Cookie Prompting"
 msgstr ""
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3482
+#: src/LYOptions.c:3491
 msgid "SSL Prompting"
 msgstr ""
 
-#: src/LYOptions.c:3488
+#: src/LYOptions.c:3497
 msgid "Keyboard Input"
 msgstr "平□示□玉ェ恘"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3492
+#: src/LYOptions.c:3501
 msgid "Keypad mode"
 msgstr "平□由永玉及乒□玉"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3498
+#: src/LYOptions.c:3507
 msgid "Emacs keys"
 msgstr "Emacs 氘平□т昫"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3513
 msgid "VI keys"
 msgstr "VI 氘平□т昫"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3511
+#: src/LYOptions.c:3520
 msgid "Line edit style"
 msgstr "墊彸螂旦正奶伙"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3532
 msgid "Keyboard layout"
 msgstr "平□示□玉伊奶失它玄"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3537
+#: src/LYOptions.c:3546
 msgid "Display and Character Set"
 msgstr "刓憎午平乓仿弁正本永玄"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3542
+#: src/LYOptions.c:3551
 #, fuzzy
 msgid "Use locale-based character set"
 msgstr "移爛允月平乓仿弁正本永玄"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3551
+#: src/LYOptions.c:3560
 msgid "Display character set"
 msgstr "刓憎允月平乓仿弁正本永玄"
 
-#: src/LYOptions.c:3582
+#: src/LYOptions.c:3591
 msgid "Assumed document character set"
 msgstr "移爛允月平乓仿弁正本永玄"
 
@@ -4815,173 +4815,176 @@ msgstr "移爛允月平乓仿弁正本永玄"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3602
+#: src/LYOptions.c:3611
 msgid "CJK mode"
 msgstr "CJK 乒□玉"
 
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3613
 msgid "Raw 8-bit"
 msgstr "戲 8 申永玄"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3612
+#: src/LYOptions.c:3621
 msgid "X Display"
 msgstr "X 犯奴旦皿伊奶"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3618
+#: src/LYOptions.c:3627
 msgid "Document Appearance"
 msgstr "妐踏及陸葦"
 
-#: src/LYOptions.c:3624
+#: src/LYOptions.c:3633
 msgid "Show color"
 msgstr "縉毛尥仃月"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3648
+#: src/LYOptions.c:3657
 msgid "Show cursor"
 msgstr "市□末伙毛葦六月"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3663
 #, fuzzy
 msgid "Underline links"
 msgstr "悵今木凶伉件弁:"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3670
 msgid "Show scrollbar"
 msgstr "旦弁伕□伙田□毛刓憎"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3668
+#: src/LYOptions.c:3677
 msgid "Popups for select fields"
 msgstr "白奴□伙玉薊鎗凜卞禾永皿失永皿"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3674
+#: src/LYOptions.c:3683
 msgid "HTML error recovery"
 msgstr "HTML 巨仿□井日及莢汊"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3680
+#: src/LYOptions.c:3689
 msgid "Show images"
 msgstr "脰颶及刓憎"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3694
+#: src/LYOptions.c:3703
 msgid "Verbose images"
 msgstr "暸贏卅脰颶刓憎"
 
-#: src/LYOptions.c:3703
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3711
 msgid "Headers Transferred to Remote Servers"
 msgstr "伉乒□玄扔□田卞鱉霜今木月目永母"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3715
 msgid "Personal mail address"
 msgstr "蜊諦及丟□伙失玉伊旦"
 
 #. Mail Address: INPUT
-#: src/LYOptions.c:3712
+#: src/LYOptions.c:3720
 #, fuzzy
 msgid "Password for anonymous ftp"
 msgstr "瓦亙□旦石旦玄 '%s' 及由旦伐□玉:"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3717
+#: src/LYOptions.c:3725
 #, fuzzy
 msgid "Preferred media type"
 msgstr "%d 田奶玄鱉霜碧"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3723
+#: src/LYOptions.c:3731
 #, fuzzy
 msgid "Preferred encoding"
 msgstr "刓憎仄凶中蛻賄"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3729
+#: src/LYOptions.c:3737
 msgid "Preferred document character set"
 msgstr "刓憎仄凶中平乓仿弁正□本永玄"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3742
 msgid "Preferred document language"
 msgstr "刓憎仄凶中蛻賄"
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3748
 msgid "User-Agent header"
 msgstr "User-Agent 目永母"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3748
+#: src/LYOptions.c:3756
 msgid "Listing and Accessing Files"
 msgstr "伉旦玄刓憎午白央奶伙尺及失弁本旦"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3752
+#: src/LYOptions.c:3760
 msgid "FTP sort criteria"
 msgstr "FTP 犯奴伊弁玄伉及末□玄湘賞"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3759
+#: src/LYOptions.c:3767
 msgid "Local directory sort criteria"
 msgstr "伕□市伙犯奴伊弁玄伉及末□玄湘賞"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3773
 msgid "Local directory sort order"
 msgstr "伕□市伙犯奴伊弁玄伉及末□玄賜"
 
-#: src/LYOptions.c:3774
+#: src/LYOptions.c:3782
 msgid "Show dot files"
 msgstr "玉永玄白央奶伙毛刓憎"
 
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3790
 msgid "Execution links"
 msgstr "伉件弁毛撢墊"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3810
 msgid "Show transfer rate"
 msgstr "鱉霜伊□玄毛刓憎"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3830
 msgid "Special Files and Screens"
 msgstr "た帎白央奶伙午脰昍"
 
-#: src/LYOptions.c:3827
+#: src/LYOptions.c:3835
 msgid "Multi-bookmarks"
 msgstr "穴伙民皮永弁穴□弁毛銀丹"
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3843
 msgid "Review/edit Bookmarks files"
 msgstr "皮永弁穴□弁白央奶伙及旌厖/彸螂"
 
-#: src/LYOptions.c:3837
+#: src/LYOptions.c:3845
 msgid "Goto multi-bookmark menu"
 msgstr "穴伙民皮永弁穴□弁丟瓦亙□尺"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3847
 msgid "Bookmarks file"
 msgstr "皮永弁穴□弁白央奶伙"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3845
+#: src/LYOptions.c:3853
 msgid "Visited Pages"
 msgstr "邠木凶矢□斥"
 
-#: src/LYOptions.c:3850
+#: src/LYOptions.c:3858
 msgid "View the file "
 msgstr "白央奶伙毛旌厖"
 
@@ -5101,38 +5104,38 @@ msgstr "Lynx: 釩銨匹五引六氏﹝CERN 伙□伙白央奶伙 %s 互厙迕匹五引六氏\n"
 msgid "(no name)"
 msgstr "(抩蟆拑仄)"
 
-#: src/LYReadCFG.c:1782
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "lynx.cfg 奶件弁伙□玉互 %d 莢動曉及ェ木閡卞卅勻化中引允 -- 云公日仁伙□皿互丐月及匹反!?\n"
 
-#: src/LYReadCFG.c:1784
+#: src/LYReadCFG.c:1786
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "瘉詨卞魂心凶奶件弁伙□玉反 '%s' 匹﹜\n"
 
-#: src/LYReadCFG.c:1785
+#: src/LYReadCFG.c:1787
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "'%s' 井日奶件弁伙□玉今木化中引允﹝\n"
 
-#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263
+#: src/LYReadCFG.c:2194 src/LYReadCFG.c:2207 src/LYReadCFG.c:2265
 msgid "The following is read from your lynx.cfg file."
 msgstr "動票反丐卅凶及 lynx.cfg 白央奶伙井日づ心慇引木凶樹扷匹允﹝"
 
-#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206
+#: src/LYReadCFG.c:2195 src/LYReadCFG.c:2208
 msgid "Please read the distribution"
 msgstr "т幵及"
 
-#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209
+#: src/LYReadCFG.c:2201 src/LYReadCFG.c:2211
 msgid "for more comments."
 msgstr "卞反擇稱卅鏜互尥中化中引允及匹輔寰仄化仁分今中﹝"
 
-#: src/LYReadCFG.c:2245
+#: src/LYReadCFG.c:2247
 msgid "RELOAD THE CHANGES"
 msgstr "庍凳毛瘋づ心慇心"
 
-#: src/LYReadCFG.c:2253
+#: src/LYReadCFG.c:2255
 msgid "Your primary configuration"
 msgstr "瘉賡卞輔寰今木月澀爛白央奶伙反"
 
@@ -5406,33 +5409,33 @@ msgstr "動票卞失永皿伕□玉:"
 msgid "Upload options:"
 msgstr "失永皿伕□玉左皿扑亦件:"
 
-#: src/LYUtils.c:1716
+#: src/LYUtils.c:1777
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2493
+#: src/LYUtils.c:2554
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "仇及 URL 旦平□丞匹反邂爛今木化中卅中失弁本旦皿伕玄戊伙匹允﹝"
 
-#: src/LYUtils.c:3301
+#: src/LYUtils.c:3362
 msgid "Too many tempfiles"
 msgstr "域凜白央奶伙互聶允亢引允"
 
-#: src/LYUtils.c:3605
+#: src/LYUtils.c:3666
 msgid "unknown restriction"
 msgstr "尕抸卅孺蜃"
 
-#: src/LYUtils.c:3635
+#: src/LYUtils.c:3696
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "孺蜃反澀爛今木化中引六氏﹝\n"
 
-#: src/LYUtils.c:3638
+#: src/LYUtils.c:3699
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "孺蜃毛動票卞澀爛:\n"
 
-#: src/LYUtils.c:5022
+#: src/LYUtils.c:5077
 msgid "Cannot find HOME directory"
 msgstr "HOME 犯奴伊弁玄伉互葦勾井曰引六氏"
 
diff --git a/po/ko.po b/po/ko.po
deleted file mode 100644
index fbbed99e..00000000
--- a/po/ko.po
+++ /dev/null
@@ -1,11 +0,0 @@
-msgid ""
-msgstr ""
-"Date: 1998-08-22 16:12:20-0400\n"
-"From: Webmaster Jim <jspath@bcpl.net>\n"
-"Content-Type: text/plain; charset=\n"
-"Xgettext-Options: --default-domain=po/ko\n"
-"Files: src/LYMain.c\n"
-
-#: src/LYMain.c:2502
-msgid "%s Version %s %s"
-msgstr ""
diff --git a/po/lynx.pot b/po/lynx.pot
index ebde8f0f..fa2a25b5 100644
--- a/po/lynx.pot
+++ b/po/lynx.pot
@@ -1,9 +1,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx 2.8.6dev.11\n"
+"Project-Id-Version: lynx 2.8.6dev.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-30 18:03-0400\n"
+"POT-Creation-Date: 2005-10-16 19:03-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2243,7 +2243,7 @@ msgstr ""
 msgid "(No value.)"
 msgstr ""
 
-#: LYMessages.c:713 src/LYOptions.c:2382
+#: LYMessages.c:713 src/LYOptions.c:2385
 msgid "None"
 msgstr ""
 
@@ -2780,7 +2780,7 @@ msgstr ""
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8508
+#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8515
 msgid "Loading incomplete."
 msgstr ""
 
@@ -2898,18 +2898,18 @@ msgstr ""
 msgid "Change password?"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1736
+#: WWW/Library/Implementation/HTNews.c:1706
 #, c-format
 msgid "No matches for: %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1789
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this group.\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1801
+#: WWW/Library/Implementation/HTNews.c:1768
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2918,16 +2918,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1814
+#: WWW/Library/Implementation/HTNews.c:1781
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1837
+#: WWW/Library/Implementation/HTNews.c:1804
 msgid "Earlier articles"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1850
+#: WWW/Library/Implementation/HTNews.c:1817
 #, c-format
 msgid ""
 "\n"
@@ -2935,41 +2935,41 @@ msgid ""
 "\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1912
+#: WWW/Library/Implementation/HTNews.c:1879
 msgid "All available articles in "
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2133
+#: WWW/Library/Implementation/HTNews.c:2093
 msgid "Later articles"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2156
+#: WWW/Library/Implementation/HTNews.c:2116
 msgid "Post to "
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2377
+#: WWW/Library/Implementation/HTNews.c:2337
 msgid "This client does not contain support for SNEWS URLs."
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2585
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2616
+#: WWW/Library/Implementation/HTNews.c:2576
 msgid "Connecting to NewsHost ..."
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2668
+#: WWW/Library/Implementation/HTNews.c:2628
 #, c-format
 msgid "Could not access %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2774
+#: WWW/Library/Implementation/HTNews.c:2734
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2778
+#: WWW/Library/Implementation/HTNews.c:2738
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr ""
@@ -2977,22 +2977,22 @@ msgstr ""
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2982
+#: WWW/Library/Implementation/HTNews.c:2942
 msgid "Reading list of available newsgroups."
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:3003
+#: WWW/Library/Implementation/HTNews.c:2963
 msgid "Reading list of articles in newsgroup."
 msgstr ""
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:3009
+#: WWW/Library/Implementation/HTNews.c:2969
 msgid "Reading news article."
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:3039
+#: WWW/Library/Implementation/HTNews.c:2999
 msgid "Sorry, could not load requested news."
 msgstr ""
 
@@ -3000,12 +3000,12 @@ msgstr ""
 msgid "Address has invalid port"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1320
+#: WWW/Library/Implementation/HTTCP.c:1308
 msgid "Address length looks invalid"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1552
-#: WWW/Library/Implementation/HTTCP.c:1570
+#: WWW/Library/Implementation/HTTCP.c:1539
+#: WWW/Library/Implementation/HTTCP.c:1557
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr ""
@@ -3014,39 +3014,39 @@ msgstr ""
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1567
+#: WWW/Library/Implementation/HTTCP.c:1554
 #: WWW/Library/Implementation/HTTelnet.c:108
 #, c-format
 msgid "Invalid hostname %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1568
 #, c-format
 msgid "Making %s connection to %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1579
 msgid "socket failed."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1605
+#: WWW/Library/Implementation/HTTCP.c:1592
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1629
+#: WWW/Library/Implementation/HTTCP.c:1616
 msgid "Could not make connection non-blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1697
+#: WWW/Library/Implementation/HTTCP.c:1684
 msgid "Connection failed (too many retries)."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1896
+#: WWW/Library/Implementation/HTTCP.c:1883
 msgid "Could not restore socket to blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1962
+#: WWW/Library/Implementation/HTTCP.c:1949
 msgid "Socket read failed for 180,000 tries."
 msgstr ""
 
@@ -3340,98 +3340,98 @@ msgstr ""
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr ""
 
-#: src/GridText.c:3594
+#: src/GridText.c:3601
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr ""
 
-#: src/GridText.c:6013 src/GridText.c:6020 src/LYList.c:248
+#: src/GridText.c:6020 src/GridText.c:6027 src/LYList.c:248
 msgid "unknown field or link"
 msgstr ""
 
-#: src/GridText.c:6029
+#: src/GridText.c:6036
 msgid "text entry field"
 msgstr ""
 
-#: src/GridText.c:6032
+#: src/GridText.c:6039
 msgid "password entry field"
 msgstr ""
 
-#: src/GridText.c:6035
+#: src/GridText.c:6042
 msgid "checkbox"
 msgstr ""
 
-#: src/GridText.c:6038
+#: src/GridText.c:6045
 msgid "radio button"
 msgstr ""
 
-#: src/GridText.c:6041
+#: src/GridText.c:6048
 msgid "submit button"
 msgstr ""
 
-#: src/GridText.c:6044
+#: src/GridText.c:6051
 msgid "reset button"
 msgstr ""
 
-#: src/GridText.c:6047
+#: src/GridText.c:6054
 msgid "popup menu"
 msgstr ""
 
-#: src/GridText.c:6050
+#: src/GridText.c:6057
 msgid "hidden form field"
 msgstr ""
 
-#: src/GridText.c:6053
+#: src/GridText.c:6060
 msgid "text entry area"
 msgstr ""
 
-#: src/GridText.c:6056
+#: src/GridText.c:6063
 msgid "range entry field"
 msgstr ""
 
-#: src/GridText.c:6059
+#: src/GridText.c:6066
 msgid "file entry field"
 msgstr ""
 
-#: src/GridText.c:6062
+#: src/GridText.c:6069
 msgid "text-submit field"
 msgstr ""
 
-#: src/GridText.c:6065
+#: src/GridText.c:6072
 msgid "image-submit button"
 msgstr ""
 
-#: src/GridText.c:6068
+#: src/GridText.c:6075
 msgid "keygen field"
 msgstr ""
 
-#: src/GridText.c:6071
+#: src/GridText.c:6078
 msgid "unknown form field"
 msgstr ""
 
-#: src/GridText.c:10231
+#: src/GridText.c:10244
 msgid "Can't open file for uploading"
 msgstr ""
 
-#: src/GridText.c:11384
+#: src/GridText.c:11397
 #, c-format
 msgid "Submitting %s"
 msgstr ""
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12533
+#: src/GridText.c:12546
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12738
+#: src/GridText.c:12751
 msgid "Wrap lines to fit displayed area?"
 msgstr ""
 
-#: src/GridText.c:12790
+#: src/GridText.c:12803
 msgid "Very long lines have been wrapped!"
 msgstr ""
 
-#: src/GridText.c:13232
+#: src/GridText.c:13245
 msgid "Very long lines have been truncated!"
 msgstr ""
 
@@ -3537,15 +3537,15 @@ msgstr ""
 msgid "(unknown)"
 msgstr ""
 
-#: src/HTML.c:7374
+#: src/HTML.c:7375
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr ""
 
-#: src/HTML.c:7873
+#: src/HTML.c:7874
 msgid "Source cache error - disk full?"
 msgstr ""
 
-#: src/HTML.c:7886
+#: src/HTML.c:7887
 msgid "Source cache error - not enough memory!"
 msgstr ""
 
@@ -3634,38 +3634,38 @@ msgstr ""
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr ""
 
-#: src/LYCurses.c:1017
+#: src/LYCurses.c:1034
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr ""
 
-#: src/LYCurses.c:1442
+#: src/LYCurses.c:1459
 msgid "Terminal ="
 msgstr ""
 
-#: src/LYCurses.c:1446
+#: src/LYCurses.c:1463
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr ""
 
-#: src/LYCurses.c:1495
+#: src/LYCurses.c:1512
 msgid "Your Terminal type is unknown!"
 msgstr ""
 
-#: src/LYCurses.c:1496
+#: src/LYCurses.c:1513
 msgid "Enter a terminal type:"
 msgstr ""
 
-#: src/LYCurses.c:1510
+#: src/LYCurses.c:1527
 msgid "TERMINAL TYPE IS SET TO"
 msgstr ""
 
-#: src/LYCurses.c:2007
+#: src/LYCurses.c:2031
 #, c-format
 msgid ""
 "\n"
 "A Fatal error has occurred in %s Ver. %s\n"
 msgstr ""
 
-#: src/LYCurses.c:2010
+#: src/LYCurses.c:2034
 #, c-format
 msgid ""
 "\n"
@@ -4181,53 +4181,53 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1763
+#: src/LYMain.c:1750
 msgid "Warning:"
 msgstr ""
 
-#: src/LYMain.c:2328
+#: src/LYMain.c:2315
 msgid "persistent cookies state will be changed in next session only."
 msgstr ""
 
-#: src/LYMain.c:2565 src/LYMain.c:2610
+#: src/LYMain.c:2552 src/LYMain.c:2597
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr ""
 
-#: src/LYMain.c:3121
+#: src/LYMain.c:3108
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr ""
 
-#: src/LYMain.c:3156
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr ""
 
-#: src/LYMain.c:3178
+#: src/LYMain.c:3165
 msgid ""
 "Copyrights held by the University of Kansas, CERN, and other contributors."
 msgstr ""
 
-#: src/LYMain.c:3179
+#: src/LYMain.c:3166
 msgid "Distributed under the GNU General Public License."
 msgstr ""
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3167
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr ""
 
-#: src/LYMain.c:3952
+#: src/LYMain.c:3939
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr ""
 
-#: src/LYMain.c:3953
+#: src/LYMain.c:3940
 #, c-format
 msgid "Options are:\n"
 msgstr ""
 
-#: src/LYMain.c:4252
+#: src/LYMain.c:4239
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr ""
@@ -4301,7 +4301,7 @@ msgstr ""
 msgid "Current URL is empty."
 msgstr ""
 
-#: src/LYMainLoop.c:6935 src/LYUtils.c:1714
+#: src/LYMainLoop.c:6935 src/LYUtils.c:1775
 msgid "Copy to clipboard failed."
 msgstr ""
 
@@ -4385,345 +4385,345 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr ""
 
-#: src/LYOptions.c:758
+#: src/LYOptions.c:761
 msgid "review/edit B)ookmarks files"
 msgstr ""
 
-#: src/LYOptions.c:760
+#: src/LYOptions.c:763
 msgid "B)ookmark file: "
 msgstr ""
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2126 src/LYOptions.c:2133
 msgid "ON"
 msgstr ""
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2277
-#: src/LYOptions.c:2288
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280
+#: src/LYOptions.c:2291
 msgid "OFF"
 msgstr ""
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2128
 msgid "NEVER"
 msgstr ""
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2129
 msgid "ALWAYS"
 msgstr ""
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2269
+#: src/LYOptions.c:2145 src/LYOptions.c:2272
 msgid "ignore"
 msgstr ""
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2146
 msgid "ask user"
 msgstr ""
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2147
 msgid "accept all"
 msgstr ""
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS OFF"
 msgstr ""
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2160
 msgid "FOR LOCAL FILES ONLY"
 msgstr ""
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2162
 msgid "ALWAYS ON"
 msgstr ""
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2174
 msgid "Numbers act as arrows"
 msgstr ""
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Links and form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2182
 msgid "Form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2189
+#: src/LYOptions.c:2192
 msgid "Case insensitive"
 msgstr ""
 
-#: src/LYOptions.c:2190
+#: src/LYOptions.c:2193
 msgid "Case sensitive"
 msgstr ""
 
-#: src/LYOptions.c:2214
+#: src/LYOptions.c:2217
 msgid "prompt normally"
 msgstr ""
 
-#: src/LYOptions.c:2215
+#: src/LYOptions.c:2218
 msgid "force yes-response"
 msgstr ""
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2219
 msgid "force no-response"
 msgstr ""
 
-#: src/LYOptions.c:2234
+#: src/LYOptions.c:2237
 msgid "Novice"
 msgstr ""
 
-#: src/LYOptions.c:2235
+#: src/LYOptions.c:2238
 msgid "Intermediate"
 msgstr ""
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2239
 msgid "Advanced"
 msgstr ""
 
-#: src/LYOptions.c:2245
+#: src/LYOptions.c:2248
 msgid "By First Visit"
 msgstr ""
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2250
 msgid "By First Visit Reversed"
 msgstr ""
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2251
 msgid "As Visit Tree"
 msgstr ""
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2252
 msgid "By Last Visit"
 msgstr ""
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2254
 msgid "By Last Visit Reversed"
 msgstr ""
 
 #. Old_DTD variable
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2265
 msgid "relaxed (TagSoup mode)"
 msgstr ""
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2266
 msgid "strict (SortaSGML mode)"
 msgstr ""
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2273
 msgid "as labels"
 msgstr ""
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2274
 msgid "as links"
 msgstr ""
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2281
 msgid "show filename"
 msgstr ""
 
-#: src/LYOptions.c:2289
+#: src/LYOptions.c:2292
 msgid "STANDARD"
 msgstr ""
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2293
 msgid "ADVANCED"
 msgstr ""
 
-#: src/LYOptions.c:2316
+#: src/LYOptions.c:2319
 msgid "Directories first"
 msgstr ""
 
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2320
 msgid "Files first"
 msgstr ""
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2321
 msgid "Mixed style"
 msgstr ""
 
-#: src/LYOptions.c:2326 src/LYOptions.c:2343
+#: src/LYOptions.c:2329 src/LYOptions.c:2346
 msgid "By Name"
 msgstr ""
 
-#: src/LYOptions.c:2327 src/LYOptions.c:2344
+#: src/LYOptions.c:2330 src/LYOptions.c:2347
 msgid "By Type"
 msgstr ""
 
-#: src/LYOptions.c:2328 src/LYOptions.c:2345
+#: src/LYOptions.c:2331 src/LYOptions.c:2348
 msgid "By Size"
 msgstr ""
 
-#: src/LYOptions.c:2329 src/LYOptions.c:2346
+#: src/LYOptions.c:2332 src/LYOptions.c:2349
 msgid "By Date"
 msgstr ""
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2333
 msgid "By Mode"
 msgstr ""
 
-#: src/LYOptions.c:2332
+#: src/LYOptions.c:2335
 msgid "By User"
 msgstr ""
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 msgid "By Group"
 msgstr ""
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2357
 msgid "Do not show rate"
 msgstr ""
 
-#: src/LYOptions.c:2355 src/LYOptions.c:2356
+#: src/LYOptions.c:2358 src/LYOptions.c:2359
 #, c-format
 msgid "Show %s/sec rate"
 msgstr ""
 
-#: src/LYOptions.c:2358 src/LYOptions.c:2359
+#: src/LYOptions.c:2361 src/LYOptions.c:2362
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr ""
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2374
 msgid "Accept lynx's internal types"
 msgstr ""
 
-#: src/LYOptions.c:2372
+#: src/LYOptions.c:2375
 msgid "Also accept lynx.cfg's types"
 msgstr ""
 
-#: src/LYOptions.c:2373
+#: src/LYOptions.c:2376
 msgid "Also accept user's types"
 msgstr ""
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "Also accept system's types"
 msgstr ""
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 msgid "Accept all types"
 msgstr ""
 
-#: src/LYOptions.c:2384
+#: src/LYOptions.c:2387
 msgid "gzip"
 msgstr ""
 
-#: src/LYOptions.c:2385
+#: src/LYOptions.c:2388
 msgid "deflate"
 msgstr ""
 
-#: src/LYOptions.c:2388
+#: src/LYOptions.c:2391
 msgid "compress"
 msgstr ""
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2394
 msgid "bzip2"
 msgstr ""
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2396
 msgid "All"
 msgstr ""
 
-#: src/LYOptions.c:2658 src/LYOptions.c:2682
+#: src/LYOptions.c:2664 src/LYOptions.c:2688
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr ""
 
-#: src/LYOptions.c:3429
+#: src/LYOptions.c:3438
 msgid "(options marked with (!) will not be saved)"
 msgstr ""
 
-#: src/LYOptions.c:3437
+#: src/LYOptions.c:3446
 msgid "General Preferences"
 msgstr ""
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3450
 msgid "User mode"
 msgstr ""
 
 #. Editor: INPUT
-#: src/LYOptions.c:3447
+#: src/LYOptions.c:3456
 msgid "Editor"
 msgstr ""
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3461
 msgid "Type of Search"
 msgstr ""
 
-#: src/LYOptions.c:3457
+#: src/LYOptions.c:3466
 msgid "Security and Privacy"
 msgstr ""
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3461
+#: src/LYOptions.c:3470
 msgid "Cookies"
 msgstr ""
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3475
+#: src/LYOptions.c:3484
 msgid "Invalid-Cookie Prompting"
 msgstr ""
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3482
+#: src/LYOptions.c:3491
 msgid "SSL Prompting"
 msgstr ""
 
-#: src/LYOptions.c:3488
+#: src/LYOptions.c:3497
 msgid "Keyboard Input"
 msgstr ""
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3492
+#: src/LYOptions.c:3501
 msgid "Keypad mode"
 msgstr ""
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3498
+#: src/LYOptions.c:3507
 msgid "Emacs keys"
 msgstr ""
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3513
 msgid "VI keys"
 msgstr ""
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3511
+#: src/LYOptions.c:3520
 msgid "Line edit style"
 msgstr ""
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3532
 msgid "Keyboard layout"
 msgstr ""
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3537
+#: src/LYOptions.c:3546
 msgid "Display and Character Set"
 msgstr ""
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3542
+#: src/LYOptions.c:3551
 msgid "Use locale-based character set"
 msgstr ""
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3551
+#: src/LYOptions.c:3560
 msgid "Display character set"
 msgstr ""
 
-#: src/LYOptions.c:3582
+#: src/LYOptions.c:3591
 msgid "Assumed document character set"
 msgstr ""
 
@@ -4732,169 +4732,172 @@ msgstr ""
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3602
+#: src/LYOptions.c:3611
 msgid "CJK mode"
 msgstr ""
 
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3613
 msgid "Raw 8-bit"
 msgstr ""
 
 #. X Display: INPUT
-#: src/LYOptions.c:3612
+#: src/LYOptions.c:3621
 msgid "X Display"
 msgstr ""
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3618
+#: src/LYOptions.c:3627
 msgid "Document Appearance"
 msgstr ""
 
-#: src/LYOptions.c:3624
+#: src/LYOptions.c:3633
 msgid "Show color"
 msgstr ""
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3648
+#: src/LYOptions.c:3657
 msgid "Show cursor"
 msgstr ""
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3663
 msgid "Underline links"
 msgstr ""
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3670
 msgid "Show scrollbar"
 msgstr ""
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3668
+#: src/LYOptions.c:3677
 msgid "Popups for select fields"
 msgstr ""
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3674
+#: src/LYOptions.c:3683
 msgid "HTML error recovery"
 msgstr ""
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3680
+#: src/LYOptions.c:3689
 msgid "Show images"
 msgstr ""
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3694
+#: src/LYOptions.c:3703
 msgid "Verbose images"
 msgstr ""
 
-#: src/LYOptions.c:3703
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3711
 msgid "Headers Transferred to Remote Servers"
 msgstr ""
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3715
 msgid "Personal mail address"
 msgstr ""
 
 #. Mail Address: INPUT
-#: src/LYOptions.c:3712
+#: src/LYOptions.c:3720
 msgid "Password for anonymous ftp"
 msgstr ""
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3717
+#: src/LYOptions.c:3725
 msgid "Preferred media type"
 msgstr ""
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3723
+#: src/LYOptions.c:3731
 msgid "Preferred encoding"
 msgstr ""
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3729
+#: src/LYOptions.c:3737
 msgid "Preferred document character set"
 msgstr ""
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3742
 msgid "Preferred document language"
 msgstr ""
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3748
 msgid "User-Agent header"
 msgstr ""
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3748
+#: src/LYOptions.c:3756
 msgid "Listing and Accessing Files"
 msgstr ""
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3752
+#: src/LYOptions.c:3760
 msgid "FTP sort criteria"
 msgstr ""
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3759
+#: src/LYOptions.c:3767
 msgid "Local directory sort criteria"
 msgstr ""
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3773
 msgid "Local directory sort order"
 msgstr ""
 
-#: src/LYOptions.c:3774
+#: src/LYOptions.c:3782
 msgid "Show dot files"
 msgstr ""
 
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3790
 msgid "Execution links"
 msgstr ""
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3810
 msgid "Show transfer rate"
 msgstr ""
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3830
 msgid "Special Files and Screens"
 msgstr ""
 
-#: src/LYOptions.c:3827
+#: src/LYOptions.c:3835
 msgid "Multi-bookmarks"
 msgstr ""
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3843
 msgid "Review/edit Bookmarks files"
 msgstr ""
 
-#: src/LYOptions.c:3837
+#: src/LYOptions.c:3845
 msgid "Goto multi-bookmark menu"
 msgstr ""
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3847
 msgid "Bookmarks file"
 msgstr ""
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3845
+#: src/LYOptions.c:3853
 msgid "Visited Pages"
 msgstr ""
 
-#: src/LYOptions.c:3850
+#: src/LYOptions.c:3858
 msgid "View the file "
 msgstr ""
 
@@ -5009,38 +5012,38 @@ msgstr ""
 msgid "(no name)"
 msgstr ""
 
-#: src/LYReadCFG.c:1782
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1784
+#: src/LYReadCFG.c:1786
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1785
+#: src/LYReadCFG.c:1787
 #, c-format
 msgid "included from '%s'.\n"
 msgstr ""
 
-#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263
+#: src/LYReadCFG.c:2194 src/LYReadCFG.c:2207 src/LYReadCFG.c:2265
 msgid "The following is read from your lynx.cfg file."
 msgstr ""
 
-#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206
+#: src/LYReadCFG.c:2195 src/LYReadCFG.c:2208
 msgid "Please read the distribution"
 msgstr ""
 
-#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209
+#: src/LYReadCFG.c:2201 src/LYReadCFG.c:2211
 msgid "for more comments."
 msgstr ""
 
-#: src/LYReadCFG.c:2245
+#: src/LYReadCFG.c:2247
 msgid "RELOAD THE CHANGES"
 msgstr ""
 
-#: src/LYReadCFG.c:2253
+#: src/LYReadCFG.c:2255
 msgid "Your primary configuration"
 msgstr ""
 
@@ -5302,33 +5305,33 @@ msgstr ""
 msgid "Upload options:"
 msgstr ""
 
-#: src/LYUtils.c:1716
+#: src/LYUtils.c:1777
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2493
+#: src/LYUtils.c:2554
 msgid "Unexpected access protocol for this URL scheme."
 msgstr ""
 
-#: src/LYUtils.c:3301
+#: src/LYUtils.c:3362
 msgid "Too many tempfiles"
 msgstr ""
 
-#: src/LYUtils.c:3605
+#: src/LYUtils.c:3666
 msgid "unknown restriction"
 msgstr ""
 
-#: src/LYUtils.c:3635
+#: src/LYUtils.c:3696
 #, c-format
 msgid "No restrictions set.\n"
 msgstr ""
 
-#: src/LYUtils.c:3638
+#: src/LYUtils.c:3699
 #, c-format
 msgid "Restrictions set:\n"
 msgstr ""
 
-#: src/LYUtils.c:5022
+#: src/LYUtils.c:5077
 msgid "Cannot find HOME directory"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 090439f9..f4ff9c04 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.6-dev8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-30 18:03-0400\n"
+"POT-Creation-Date: 2005-10-16 19:03-0400\n"
 "PO-Revision-Date: 2004-11-15 08:49+0100\n"
 "Last-Translator: Luk Claes <luk.claes@ugent.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -2243,7 +2243,7 @@ msgstr "(Geen naam.)"
 msgid "(No value.)"
 msgstr "(Geen waarde.)"
 
-#: LYMessages.c:713 src/LYOptions.c:2382
+#: LYMessages.c:713 src/LYOptions.c:2385
 msgid "None"
 msgstr "Geen"
 
@@ -2790,7 +2790,7 @@ msgstr "Document met POST inhoud niet gevonden in cache.  Nog eens verzenden?"
 msgid "Loading failed, use a previous copy."
 msgstr "Het laden is mislukt, gebruik een vroegere kopie."
 
-#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8508
+#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8515
 msgid "Loading incomplete."
 msgstr "Laden niet voltooid."
 
@@ -2905,12 +2905,12 @@ msgstr "Wachtwoord voor nieuws host '%s':"
 msgid "Change password?"
 msgstr "Wijzig wachtwoord?"
 
-#: WWW/Library/Implementation/HTNews.c:1736
+#: WWW/Library/Implementation/HTNews.c:1706
 #, c-format
 msgid "No matches for: %s"
 msgstr "Geen overeenkomsten voor: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1789
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2918,7 +2918,7 @@ msgstr ""
 "\n"
 "Geen artikelen gevonden in deze groep.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1801
+#: WWW/Library/Implementation/HTNews.c:1768
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2929,16 +2929,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1814
+#: WWW/Library/Implementation/HTNews.c:1781
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  Artikelen %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1837
+#: WWW/Library/Implementation/HTNews.c:1804
 msgid "Earlier articles"
 msgstr "Vroegere artikelen"
 
-#: WWW/Library/Implementation/HTNews.c:1850
+#: WWW/Library/Implementation/HTNews.c:1817
 #, c-format
 msgid ""
 "\n"
@@ -2948,41 +2948,41 @@ msgstr ""
 "\n"
 "Er zijn momenteel ongeveer %d artikelen beschikbaar in %s, met volgende ID-nr's:\n"
 
-#: WWW/Library/Implementation/HTNews.c:1912
+#: WWW/Library/Implementation/HTNews.c:1879
 msgid "All available articles in "
 msgstr "Alle beschikbare artikelen in "
 
-#: WWW/Library/Implementation/HTNews.c:2133
+#: WWW/Library/Implementation/HTNews.c:2093
 msgid "Later articles"
 msgstr "Latere artikelen"
 
-#: WWW/Library/Implementation/HTNews.c:2156
+#: WWW/Library/Implementation/HTNews.c:2116
 msgid "Post to "
 msgstr "Posten naar "
 
-#: WWW/Library/Implementation/HTNews.c:2377
+#: WWW/Library/Implementation/HTNews.c:2337
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Dit programma ondersteunt geen SNEWS URL's."
 
-#: WWW/Library/Implementation/HTNews.c:2585
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr "Geen bestemming voor ruwe tekst!"
 
-#: WWW/Library/Implementation/HTNews.c:2616
+#: WWW/Library/Implementation/HTNews.c:2576
 msgid "Connecting to NewsHost ..."
 msgstr "Bezig met verbinden naar NieuwsHost ..."
 
-#: WWW/Library/Implementation/HTNews.c:2668
+#: WWW/Library/Implementation/HTNews.c:2628
 #, c-format
 msgid "Could not access %s."
 msgstr "Geen toegang tot %s."
 
-#: WWW/Library/Implementation/HTNews.c:2774
+#: WWW/Library/Implementation/HTNews.c:2734
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "Kan nieuws informatie niet lezen.  Nieuws host %.20s antwoordde: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2778
+#: WWW/Library/Implementation/HTNews.c:2738
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Kan nieuws informatie niet lezen, loos antwoord van host %s"
@@ -2990,22 +2990,22 @@ msgstr "Kan nieuws informatie niet lezen, loos antwoord van host %s"
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2982
+#: WWW/Library/Implementation/HTNews.c:2942
 msgid "Reading list of available newsgroups."
 msgstr "Bezig met lijst lezen van beschikbare nieuwsgroepen."
 
-#: WWW/Library/Implementation/HTNews.c:3003
+#: WWW/Library/Implementation/HTNews.c:2963
 msgid "Reading list of articles in newsgroup."
 msgstr "Bezig met lijst lezen van artikelen in nieuwsgroep."
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:3009
+#: WWW/Library/Implementation/HTNews.c:2969
 msgid "Reading news article."
 msgstr "Bezig met lezen van nieuws-artikel."
 
-#: WWW/Library/Implementation/HTNews.c:3039
+#: WWW/Library/Implementation/HTNews.c:2999
 msgid "Sorry, could not load requested news."
 msgstr "Sorry, kan het opgevraagde nieuws niet laden."
 
@@ -3013,11 +3013,11 @@ msgstr "Sorry, kan het opgevraagde nieuws niet laden."
 msgid "Address has invalid port"
 msgstr "Adres heeft ongeldige poort"
 
-#: WWW/Library/Implementation/HTTCP.c:1320
+#: WWW/Library/Implementation/HTTCP.c:1308
 msgid "Address length looks invalid"
 msgstr "Adres-lengte ziet er verkeerd uit"
 
-#: WWW/Library/Implementation/HTTCP.c:1552 WWW/Library/Implementation/HTTCP.c:1570
+#: WWW/Library/Implementation/HTTCP.c:1539 WWW/Library/Implementation/HTTCP.c:1557
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Niet in staat om computer %s te vinden."
@@ -3026,38 +3026,38 @@ msgstr "Niet in staat om computer %s te vinden."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1567 WWW/Library/Implementation/HTTelnet.c:108
+#: WWW/Library/Implementation/HTTCP.c:1554 WWW/Library/Implementation/HTTelnet.c:108
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Ongeldige computernaam %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1568
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "%s verbinding met %s wordt gemaakt."
 
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1579
 msgid "socket failed."
 msgstr "socket mislukt."
 
-#: WWW/Library/Implementation/HTTCP.c:1605
+#: WWW/Library/Implementation/HTTCP.c:1592
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "socket is mislukt: familie %d adres %s poort %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1629
+#: WWW/Library/Implementation/HTTCP.c:1616
 msgid "Could not make connection non-blocking."
 msgstr "Het is mislukt de verbinding niet-blokkerend maken."
 
-#: WWW/Library/Implementation/HTTCP.c:1697
+#: WWW/Library/Implementation/HTTCP.c:1684
 msgid "Connection failed (too many retries)."
 msgstr "Verbinden mislukt (te vaak opnieuw geprobeerd)."
 
-#: WWW/Library/Implementation/HTTCP.c:1896
+#: WWW/Library/Implementation/HTTCP.c:1883
 msgid "Could not restore socket to blocking."
 msgstr "Kon socket niet naar blokkerende modus herstellen."
 
-#: WWW/Library/Implementation/HTTCP.c:1962
+#: WWW/Library/Implementation/HTTCP.c:1949
 msgid "Socket read failed for 180,000 tries."
 msgstr "Lezen uit socket mislukt na 180,000 (!) pogingen."
 
@@ -3361,98 +3361,98 @@ msgstr "Geen geheugen meer beschikbar, beeldweergave onderbroken!"
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Geen geheugen meer beschikbaar, overdracht zal worden afgebroken!"
 
-#: src/GridText.c:3594
+#: src/GridText.c:3601
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** GEHEUGEN VERMOEID ***"
 
-#: src/GridText.c:6013 src/GridText.c:6020 src/LYList.c:248
+#: src/GridText.c:6020 src/GridText.c:6027 src/LYList.c:248
 msgid "unknown field or link"
 msgstr "onbekend veld of link"
 
-#: src/GridText.c:6029
+#: src/GridText.c:6036
 msgid "text entry field"
 msgstr "tekst invoerveld"
 
-#: src/GridText.c:6032
+#: src/GridText.c:6039
 msgid "password entry field"
 msgstr "wachtwoord invoerveld"
 
-#: src/GridText.c:6035
+#: src/GridText.c:6042
 msgid "checkbox"
 msgstr "aanvinkvakje"
 
-#: src/GridText.c:6038
+#: src/GridText.c:6045
 msgid "radio button"
 msgstr "drukknop"
 
-#: src/GridText.c:6041
+#: src/GridText.c:6048
 msgid "submit button"
 msgstr "verzendknop"
 
-#: src/GridText.c:6044
+#: src/GridText.c:6051
 msgid "reset button"
 msgstr "herstelknop"
 
-#: src/GridText.c:6047
+#: src/GridText.c:6054
 msgid "popup menu"
 msgstr "popup menu"
 
-#: src/GridText.c:6050
+#: src/GridText.c:6057
 msgid "hidden form field"
 msgstr "verborgen formulierveld"
 
-#: src/GridText.c:6053
+#: src/GridText.c:6060
 msgid "text entry area"
 msgstr "tekst invoergebied"
 
-#: src/GridText.c:6056
+#: src/GridText.c:6063
 msgid "range entry field"
 msgstr "bereik invoerveld"
 
-#: src/GridText.c:6059
+#: src/GridText.c:6066
 msgid "file entry field"
 msgstr "bestandsnaam invoerveld"
 
-#: src/GridText.c:6062
+#: src/GridText.c:6069
 msgid "text-submit field"
 msgstr "tekst-verzendveld"
 
-#: src/GridText.c:6065
+#: src/GridText.c:6072
 msgid "image-submit button"
 msgstr "afbeelding-verzendknop"
 
-#: src/GridText.c:6068
+#: src/GridText.c:6075
 msgid "keygen field"
 msgstr "sleutelaanmaak veld"
 
-#: src/GridText.c:6071
+#: src/GridText.c:6078
 msgid "unknown form field"
 msgstr "onbekend formulier veld"
 
-#: src/GridText.c:10231
+#: src/GridText.c:10244
 msgid "Can't open file for uploading"
 msgstr "Kan bestand niet openen voor upload"
 
-#: src/GridText.c:11384
+#: src/GridText.c:11397
 #, c-format
 msgid "Submitting %s"
 msgstr "Bezig met verzenden van %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12533
+#: src/GridText.c:12546
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Ophanging Gedetecteerd: TextAnchor-struct is corrupt - stel voor te onderbreken!"
 
 #. don't show previous state
-#: src/GridText.c:12738
+#: src/GridText.c:12751
 msgid "Wrap lines to fit displayed area?"
 msgstr "Regels omvouwen zodat alles zichtbaar is?"
 
-#: src/GridText.c:12790
+#: src/GridText.c:12803
 msgid "Very long lines have been wrapped!"
 msgstr "Erg lange regels zijn omgevouwen!"
 
-#: src/GridText.c:13232
+#: src/GridText.c:13245
 msgid "Very long lines have been truncated!"
 msgstr "Erg lange regels zijn afgekapt!"
 
@@ -3558,16 +3558,16 @@ msgstr "Bestandspad:"
 msgid "(unknown)"
 msgstr "(onbekend)"
 
-#: src/HTML.c:7374
+#: src/HTML.c:7375
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Document heeft slechts verborgen links.  Gebruik het 'l'ijst commando."
 
 # Source?
-#: src/HTML.c:7873
+#: src/HTML.c:7874
 msgid "Source cache error - disk full?"
 msgstr "Cache fout - schijf vol?"
 
-#: src/HTML.c:7886
+#: src/HTML.c:7887
 msgid "Source cache error - not enough memory!"
 msgstr "Cache fout - niet genoeg geheugen!"
 
@@ -3671,31 +3671,31 @@ msgstr "Intern"
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "cookie_domain_flag_set fout, programma wordt afgebroken"
 
-#: src/LYCurses.c:1017
+#: src/LYCurses.c:1034
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Terminal initialisatie mislukt - onbekend terminal type?"
 
-#: src/LYCurses.c:1442
+#: src/LYCurses.c:1459
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1446
+#: src/LYCurses.c:1463
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "U mout een vt100, 200, enz. terminal gebruiken met dit programma."
 
-#: src/LYCurses.c:1495
+#: src/LYCurses.c:1512
 msgid "Your Terminal type is unknown!"
 msgstr "Uw terminal type is onbekend!"
 
-#: src/LYCurses.c:1496
+#: src/LYCurses.c:1513
 msgid "Enter a terminal type:"
 msgstr "Voer een terminal type in:"
 
-#: src/LYCurses.c:1510
+#: src/LYCurses.c:1527
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TERMINAL TYPE IS GEZET OP"
 
-#: src/LYCurses.c:2007
+#: src/LYCurses.c:2031
 #, c-format
 msgid ""
 "\n"
@@ -3704,7 +3704,7 @@ msgstr ""
 "\n"
 "Een fatale fout is opgetreden in %s Ver. %s\n"
 
-#: src/LYCurses.c:2010
+#: src/LYCurses.c:2034
 #, c-format
 msgid ""
 "\n"
@@ -4240,52 +4240,52 @@ msgstr ""
 "Lynx bestand %s is niet beschikbaar.\n"
 "\n"
 
-#: src/LYMain.c:1763
+#: src/LYMain.c:1750
 msgid "Warning:"
 msgstr "Let op:"
 
-#: src/LYMain.c:2328
+#: src/LYMain.c:2315
 msgid "persistent cookies state will be changed in next session only."
 msgstr "Voortbestaande stand van koekjes wordt pas in volgende sessie gewijzigd."
 
-#: src/LYMain.c:2565 src/LYMain.c:2610
+#: src/LYMain.c:2552 src/LYMain.c:2597
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: ik negeer onbekende karakterset=%s\n"
 
-#: src/LYMain.c:3121
+#: src/LYMain.c:3108
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Versie %s (%s)"
 
-#: src/LYMain.c:3156
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Gebouwd op %s %s %s\n"
 
-#: src/LYMain.c:3178
+#: src/LYMain.c:3165
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors."
 msgstr "Copyrights in handen van `the University of Kansas', CERN, en andere medewerkers."
 
-#: src/LYMain.c:3179
+#: src/LYMain.c:3166
 msgid "Distributed under the GNU General Public License."
 msgstr "Gedistribueerd onder de GNU General Public License."
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3167
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Zie http://lynx.isc.org/ en de online help voor meer informatie."
 
-#: src/LYMain.c:3952
+#: src/LYMain.c:3939
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "GEBRUIK: %s [opties] [bestand]\n"
 
-#: src/LYMain.c:3953
+#: src/LYMain.c:3940
 #, c-format
 msgid "Options are:\n"
 msgstr "Opties zijn:\n"
 
-#: src/LYMain.c:4252
+#: src/LYMain.c:4239
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Ongeldige Optie: %s\n"
@@ -4359,7 +4359,7 @@ msgstr "TABLE centreren uitgeschakeld."
 msgid "Current URL is empty."
 msgstr "Huidige URL is leeg."
 
-#: src/LYMainLoop.c:6935 src/LYUtils.c:1714
+#: src/LYMainLoop.c:6935 src/LYUtils.c:1775
 msgid "Copy to clipboard failed."
 msgstr "Kopi禱ren naar klembord is mislukt."
 
@@ -4455,344 +4455,344 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "Bericht heeft geen oorspronkelijke tekst!"
 
-#: src/LYOptions.c:758
+#: src/LYOptions.c:761
 msgid "review/edit B)ookmarks files"
 msgstr "herzien/wijzig B)ladwijzer bestanden"
 
-#: src/LYOptions.c:760
+#: src/LYOptions.c:763
 msgid "B)ookmark file: "
 msgstr "B)ladwijzer bestand: "
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2126 src/LYOptions.c:2133
 msgid "ON"
 msgstr "AAN"
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2277 src/LYOptions.c:2288
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280 src/LYOptions.c:2291
 msgid "OFF"
 msgstr "UIT"
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2128
 msgid "NEVER"
 msgstr "NOOIT"
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2129
 msgid "ALWAYS"
 msgstr "ALTIJD"
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2269
+#: src/LYOptions.c:2145 src/LYOptions.c:2272
 msgid "ignore"
 msgstr "negeren"
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2146
 msgid "ask user"
 msgstr "vraag gebruiker"
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2147
 msgid "accept all"
 msgstr "alles aanvaarden"
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS OFF"
 msgstr "ALTIJD UIT"
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2160
 msgid "FOR LOCAL FILES ONLY"
 msgstr "ALLEEN VOOR LOKALE BESTANDEN"
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2162
 msgid "ALWAYS ON"
 msgstr "ALTIJD AAN"
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2174
 msgid "Numbers act as arrows"
 msgstr "Nummers staan voor pijlen"
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links are numbered"
 msgstr "Links zijn genummerd"
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Links and form fields are numbered"
 msgstr "Links en formuliervelden zijn genummerd"
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2182
 msgid "Form fields are numbered"
 msgstr "Velden in formulieren zijn genummerd"
 
-#: src/LYOptions.c:2189
+#: src/LYOptions.c:2192
 msgid "Case insensitive"
 msgstr "Hoofdletterongevoelig"
 
-#: src/LYOptions.c:2190
+#: src/LYOptions.c:2193
 msgid "Case sensitive"
 msgstr "Hoofdlettergevoelig"
 
-#: src/LYOptions.c:2214
+#: src/LYOptions.c:2217
 msgid "prompt normally"
 msgstr "prompt normaal"
 
-#: src/LYOptions.c:2215
+#: src/LYOptions.c:2218
 msgid "force yes-response"
 msgstr "ja-antwoord afdwingen"
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2219
 msgid "force no-response"
 msgstr "nee-antwoord afdwingen"
 
-#: src/LYOptions.c:2234
+#: src/LYOptions.c:2237
 msgid "Novice"
 msgstr "Beginner"
 
-#: src/LYOptions.c:2235
+#: src/LYOptions.c:2238
 msgid "Intermediate"
 msgstr "Gevorderde"
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2239
 msgid "Advanced"
 msgstr "Specialist"
 
-#: src/LYOptions.c:2245
+#: src/LYOptions.c:2248
 msgid "By First Visit"
 msgstr "Op het eerste bezoek"
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2250
 msgid "By First Visit Reversed"
 msgstr "Op Eerste Bezoek Omgekeerd"
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2251
 msgid "As Visit Tree"
 msgstr "Als bezoekboomstructuur"
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2252
 msgid "By Last Visit"
 msgstr "Op het laatste bezoek"
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2254
 msgid "By Last Visit Reversed"
 msgstr "Op Laatste Bezoek Omgekeerd"
 
 #. Old_DTD variable
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2265
 msgid "relaxed (TagSoup mode)"
 msgstr "versoepeld (TagSoup-modus)"
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2266
 msgid "strict (SortaSGML mode)"
 msgstr "strict (SortaSGML-modus)"
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2273
 msgid "as labels"
 msgstr "als labels"
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2274
 msgid "as links"
 msgstr "als links"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2281
 msgid "show filename"
 msgstr "toon bestandsnaam"
 
-#: src/LYOptions.c:2289
+#: src/LYOptions.c:2292
 msgid "STANDARD"
 msgstr "STANDAARD"
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2293
 msgid "ADVANCED"
 msgstr "GEAVANCEERD"
 
-#: src/LYOptions.c:2316
+#: src/LYOptions.c:2319
 msgid "Directories first"
 msgstr "Mappen eerst"
 
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2320
 msgid "Files first"
 msgstr "Bestanden eerst"
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2321
 msgid "Mixed style"
 msgstr "Gemengde stijl"
 
-#: src/LYOptions.c:2326 src/LYOptions.c:2343
+#: src/LYOptions.c:2329 src/LYOptions.c:2346
 msgid "By Name"
 msgstr "Op Naam"
 
-#: src/LYOptions.c:2327 src/LYOptions.c:2344
+#: src/LYOptions.c:2330 src/LYOptions.c:2347
 msgid "By Type"
 msgstr "Op Type"
 
-#: src/LYOptions.c:2328 src/LYOptions.c:2345
+#: src/LYOptions.c:2331 src/LYOptions.c:2348
 msgid "By Size"
 msgstr "Op Grootte"
 
-#: src/LYOptions.c:2329 src/LYOptions.c:2346
+#: src/LYOptions.c:2332 src/LYOptions.c:2349
 msgid "By Date"
 msgstr "Op Datum"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2333
 msgid "By Mode"
 msgstr "Op Modus"
 
-#: src/LYOptions.c:2332
+#: src/LYOptions.c:2335
 msgid "By User"
 msgstr "Op Gebruiker"
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 msgid "By Group"
 msgstr "Op Groep"
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2357
 msgid "Do not show rate"
 msgstr "Verhouding niet tonen"
 
-#: src/LYOptions.c:2355 src/LYOptions.c:2356
+#: src/LYOptions.c:2358 src/LYOptions.c:2359
 #, c-format
 msgid "Show %s/sec rate"
 msgstr "Toon verhouding %s/sec"
 
-#: src/LYOptions.c:2358 src/LYOptions.c:2359
+#: src/LYOptions.c:2361 src/LYOptions.c:2362
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr "Toon verhouding %s/sec, ETA"
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2374
 msgid "Accept lynx's internal types"
 msgstr "Aanvaard interne types van lynx"
 
-#: src/LYOptions.c:2372
+#: src/LYOptions.c:2375
 msgid "Also accept lynx.cfg's types"
 msgstr "Aanvaard ook types van lynx.cfg"
 
-#: src/LYOptions.c:2373
+#: src/LYOptions.c:2376
 msgid "Also accept user's types"
 msgstr "Aanvaard ook types van gebruiker"
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "Also accept system's types"
 msgstr "Aanvaard ook systeemtypes"
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 msgid "Accept all types"
 msgstr "Aanvaard alle types"
 
-#: src/LYOptions.c:2384
+#: src/LYOptions.c:2387
 msgid "gzip"
 msgstr "gzip"
 
-#: src/LYOptions.c:2385
+#: src/LYOptions.c:2388
 msgid "deflate"
 msgstr "deflatie"
 
-#: src/LYOptions.c:2388
+#: src/LYOptions.c:2391
 msgid "compress"
 msgstr "compress"
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2394
 msgid "bzip2"
 msgstr "bzip2"
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2396
 msgid "All"
 msgstr "Allemaal"
 
-#: src/LYOptions.c:2658 src/LYOptions.c:2682
+#: src/LYOptions.c:2664 src/LYOptions.c:2688
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Gebruik %s om naar het Opties-menu te gaan!"
 
-#: src/LYOptions.c:3429
+#: src/LYOptions.c:3438
 msgid "(options marked with (!) will not be saved)"
 msgstr "(opties gemerkt met (!) zullen niet worden bewaard)"
 
-#: src/LYOptions.c:3437
+#: src/LYOptions.c:3446
 msgid "General Preferences"
 msgstr "Algemene voorkeuren"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3450
 msgid "User mode"
 msgstr "Gebruiker-modus"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3447
+#: src/LYOptions.c:3456
 msgid "Editor"
 msgstr "Editor"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3461
 msgid "Type of Search"
 msgstr "Zoekmethode"
 
-#: src/LYOptions.c:3457
+#: src/LYOptions.c:3466
 msgid "Security and Privacy"
 msgstr "Veiligheid en Privacy"
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3461
+#: src/LYOptions.c:3470
 msgid "Cookies"
 msgstr "Koekjes"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3475
+#: src/LYOptions.c:3484
 msgid "Invalid-Cookie Prompting"
 msgstr "Ongeldige Koekjesprompt"
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3482
+#: src/LYOptions.c:3491
 msgid "SSL Prompting"
 msgstr "SSL-prompt"
 
-#: src/LYOptions.c:3488
+#: src/LYOptions.c:3497
 msgid "Keyboard Input"
 msgstr "Toetsenbordinvoer"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3492
+#: src/LYOptions.c:3501
 msgid "Keypad mode"
 msgstr "Gedrag van numeriek eiland"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3498
+#: src/LYOptions.c:3507
 msgid "Emacs keys"
 msgstr "Emacs toetsen"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3513
 msgid "VI keys"
 msgstr "VI toetsen"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3511
+#: src/LYOptions.c:3520
 msgid "Line edit style"
 msgstr "Regelbewerkingsstijl"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3532
 msgid "Keyboard layout"
 msgstr "Toetsenbordindeling"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3537
+#: src/LYOptions.c:3546
 msgid "Display and Character Set"
 msgstr "Weergave en Karakterset"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3542
+#: src/LYOptions.c:3551
 msgid "Use locale-based character set"
 msgstr "Gebruik op locale-gebaseerde karakterset"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3551
+#: src/LYOptions.c:3560
 msgid "Display character set"
 msgstr "Karakterset op beeldscherm"
 
-#: src/LYOptions.c:3582
+#: src/LYOptions.c:3591
 msgid "Assumed document character set"
 msgstr "Veronderstelde karakterset"
 
@@ -4801,170 +4801,173 @@ msgstr "Veronderstelde karakterset"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3602
+#: src/LYOptions.c:3611
 msgid "CJK mode"
 msgstr "CJK modus"
 
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3613
 msgid "Raw 8-bit"
 msgstr "Kale 8-bit"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3612
+#: src/LYOptions.c:3621
 msgid "X Display"
 msgstr "X Display"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3618
+#: src/LYOptions.c:3627
 msgid "Document Appearance"
 msgstr "Uitzicht Document"
 
-#: src/LYOptions.c:3624
+#: src/LYOptions.c:3633
 msgid "Show color"
 msgstr "Toon kleur"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3648
+#: src/LYOptions.c:3657
 msgid "Show cursor"
 msgstr "Toon cursor"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3663
 msgid "Underline links"
 msgstr "Onderlijn links"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3670
 msgid "Show scrollbar"
 msgstr "Toon schuifbalk"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3668
+#: src/LYOptions.c:3677
 msgid "Popups for select fields"
 msgstr "Menuutjes voor keuzevelden"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3674
+#: src/LYOptions.c:3683
 msgid "HTML error recovery"
 msgstr "HTML foutcorrectie"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3680
+#: src/LYOptions.c:3689
 msgid "Show images"
 msgstr "Afbeeldingen laten zien als"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3694
+#: src/LYOptions.c:3703
 msgid "Verbose images"
 msgstr "Naam van afbeeldingen vermelden"
 
-#: src/LYOptions.c:3703
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3711
 msgid "Headers Transferred to Remote Servers"
 msgstr "Headers Overgedragen naar andere Servers"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3715
 msgid "Personal mail address"
 msgstr "Persoonlijk e-mail adres"
 
 #. Mail Address: INPUT
-#: src/LYOptions.c:3712
+#: src/LYOptions.c:3720
 #, fuzzy
 msgid "Password for anonymous ftp"
 msgstr "Wachtwoord voor nieuws host '%s':"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3717
+#: src/LYOptions.c:3725
 msgid "Preferred media type"
 msgstr "Geprefereerd mediatype"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3723
+#: src/LYOptions.c:3731
 msgid "Preferred encoding"
 msgstr "Geprefereerde codering"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3729
+#: src/LYOptions.c:3737
 msgid "Preferred document character set"
 msgstr "Voorkeur voor karakterset"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3742
 msgid "Preferred document language"
 msgstr "Voorkeur voor taal van document"
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3748
 msgid "User-Agent header"
 msgstr "User-Agent header"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3748
+#: src/LYOptions.c:3756
 msgid "Listing and Accessing Files"
 msgstr "Lijsten van en Toegang tot Bestanden"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3752
+#: src/LYOptions.c:3760
 msgid "FTP sort criteria"
 msgstr "sorteercriteria voor FTP"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3759
+#: src/LYOptions.c:3767
 msgid "Local directory sort criteria"
 msgstr "Sorteercriteria lokale mappen"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3773
 msgid "Local directory sort order"
 msgstr "Lokale mappensorteervolgorde"
 
-#: src/LYOptions.c:3774
+#: src/LYOptions.c:3782
 msgid "Show dot files"
 msgstr "Toon .-bestanden"
 
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3790
 msgid "Execution links"
 msgstr "verwijzingen die programma's starten"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3810
 msgid "Show transfer rate"
 msgstr "Toon overdrachtverhouding"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3830
 msgid "Special Files and Screens"
 msgstr "Speciale Bestanden en Schermen"
 
-#: src/LYOptions.c:3827
+#: src/LYOptions.c:3835
 msgid "Multi-bookmarks"
 msgstr "Meervoudige boekenleggers"
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3843
 msgid "Review/edit Bookmarks files"
 msgstr "Bekijk/wijzig Boekenlegger bestanden"
 
-#: src/LYOptions.c:3837
+#: src/LYOptions.c:3845
 msgid "Goto multi-bookmark menu"
 msgstr "Ga naar multi-boekenlegger menu"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3847
 msgid "Bookmarks file"
 msgstr "Boekenlegger bestand"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3845
+#: src/LYOptions.c:3853
 msgid "Visited Pages"
 msgstr "Bezochte Pagina's"
 
-#: src/LYOptions.c:3850
+#: src/LYOptions.c:3858
 msgid "View the file "
 msgstr "Bestand bekijken"
 
@@ -5084,38 +5087,38 @@ msgstr "Lynx: kan niet starten, CERN reglement bestand %s is niet beschikbaar\n"
 msgid "(no name)"
 msgstr "(naamloos)"
 
-#: src/LYReadCFG.c:1782
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Meer dan %d geneste lynx.cfg insluitingen -- misschien een lus?!?\n"
 
-#: src/LYReadCFG.c:1784
+#: src/LYReadCFG.c:1786
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "De laatste insluiting die geprobeerd is, was '%s',\n"
 
-#: src/LYReadCFG.c:1785
+#: src/LYReadCFG.c:1787
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "ingevoegd vanuit '%s'.\n"
 
-#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263
+#: src/LYReadCFG.c:2194 src/LYReadCFG.c:2207 src/LYReadCFG.c:2265
 msgid "The following is read from your lynx.cfg file."
 msgstr "Het volgende wordt gelezen uit uw lynx.cfg bestand."
 
-#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206
+#: src/LYReadCFG.c:2195 src/LYReadCFG.c:2208
 msgid "Please read the distribution"
 msgstr "Lees a.u.b. de meegeleverde versie"
 
-#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209
+#: src/LYReadCFG.c:2201 src/LYReadCFG.c:2211
 msgid "for more comments."
 msgstr "voor meer opmerkingen."
 
-#: src/LYReadCFG.c:2245
+#: src/LYReadCFG.c:2247
 msgid "RELOAD THE CHANGES"
 msgstr "HERLAAD DE VERANDERINGEN"
 
-#: src/LYReadCFG.c:2253
+#: src/LYReadCFG.c:2255
 msgid "Your primary configuration"
 msgstr "Uw primaire configuratie"
 
@@ -5384,33 +5387,33 @@ msgstr "Zenden naar:"
 msgid "Upload options:"
 msgstr "Zend opties:"
 
-#: src/LYUtils.c:1716
+#: src/LYUtils.c:1777
 msgid "Download document URL put to clipboard."
 msgstr "Document afhalings-URL op klembord geplaatst."
 
-#: src/LYUtils.c:2493
+#: src/LYUtils.c:2554
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Onverwacht toegangsprotocol voor dit URL methode"
 
-#: src/LYUtils.c:3301
+#: src/LYUtils.c:3362
 msgid "Too many tempfiles"
 msgstr "Teveel tijdelijke bestanden"
 
-#: src/LYUtils.c:3605
+#: src/LYUtils.c:3666
 msgid "unknown restriction"
 msgstr "Onbekende beperking"
 
-#: src/LYUtils.c:3635
+#: src/LYUtils.c:3696
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Er zijn geen beperkingen gesteld.\n"
 
-#: src/LYUtils.c:3638
+#: src/LYUtils.c:3699
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Gestelde beperkingen:\n"
 
-#: src/LYUtils.c:5022
+#: src/LYUtils.c:5077
 msgid "Cannot find HOME directory"
 msgstr "Kan HOME-map niet vinden"
 
diff --git a/po/no.po b/po/no.po
deleted file mode 100644
index e8f57e59..00000000
--- a/po/no.po
+++ /dev/null
@@ -1,11 +0,0 @@
-msgid ""
-msgstr ""
-"Date: 1998-08-22 16:12:20-0400\n"
-"From: Webmaster Jim <jspath@bcpl.net>\n"
-"Content-Type: text/plain; charset=\n"
-"Xgettext-Options: --default-domain=po/no\n"
-"Files: src/LYMain.c\n"
-
-#: src/LYMain.c:2502
-msgid "%s Version %s %s"
-msgstr ""
diff --git a/po/pl.po b/po/pl.po
deleted file mode 100644
index a726ffd8..00000000
--- a/po/pl.po
+++ /dev/null
@@ -1,11 +0,0 @@
-msgid ""
-msgstr ""
-"Date: 1998-08-22 16:12:20-0400\n"
-"From: Webmaster Jim <jspath@bcpl.net>\n"
-"Content-Type: text/plain; charset=\n"
-"Xgettext-Options: --default-domain=po/pl\n"
-"Files: src/LYMain.c\n"
-
-#: src/LYMain.c:2502
-msgid "%s Version %s %s"
-msgstr ""
diff --git a/po/pt.po b/po/pt.po
deleted file mode 100644
index bc745513..00000000
--- a/po/pt.po
+++ /dev/null
@@ -1,27 +0,0 @@
-msgid ""
-msgstr ""
-"Date: 1998-08-22 16:12:20-0400\n"
-"From: Webmaster Jim <jspath@bcpl.net>\n"
-"Content-Type: text/plain; charset=\n"
-"Xgettext-Options: --default-domain=po/pt\n"
-"Files: src/LYMain.c\n"
-
-#: src/LYMain.c:2502
-msgid "%s Version %s %s"
-msgstr "%s Vers緌 %s %s"
-
-#: src/LYMain.c:2504
-msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
-msgstr "O copyright prendeu pela universidade de Kansas, de CERN, e de outros contribuinte.\n"
-
-#: src/LYMain.c:2506
-msgid "Distributed under the GNU General Public License.\n"
-msgstr "Distribu獮o sob a licen蓷 do general pblico de GNU.\n"
-
-#: src/LYMain.c:2508
-msgid ""
-"See http://lynx.browser.org/ and the online help for more information.\n"
-"\n"
-msgstr ""
-"Veja http://lynx.browser.org / e a ajuda em linha para mais informa誽o.\n"
-"\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f6e8f12c..9ef6012b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-30 18:03-0400\n"
+"POT-Creation-Date: 2005-10-16 19:03-0400\n"
 "PO-Revision-Date: 1999-07-30 09:47-03:00\n"
 "Last-Translator: Ricardo Soares Guimar綣s <ricardo@conectiva.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -2242,7 +2242,7 @@ msgstr "(Sem nome.)"
 msgid "(No value.)"
 msgstr "(Sem valor.)"
 
-#: LYMessages.c:713 src/LYOptions.c:2382
+#: LYMessages.c:713 src/LYOptions.c:2385
 msgid "None"
 msgstr "Vazio"
 
@@ -2794,7 +2794,7 @@ msgstr "Documento com a誽o de postagem n緌 encontrado no cache. Reenviar?"
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8508
+#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8515
 msgid "Loading incomplete."
 msgstr "Leitura incompleta"
 
@@ -2909,12 +2909,12 @@ msgstr "Senha para o servidor NEWS '%s':"
 msgid "Change password?"
 msgstr "Troca senha?"
 
-#: WWW/Library/Implementation/HTNews.c:1736
+#: WWW/Library/Implementation/HTNews.c:1706
 #, c-format
 msgid "No matches for: %s"
 msgstr "Sem combina踥es para: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1789
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2922,7 +2922,7 @@ msgstr ""
 "\n"
 "Sem objetos neste grupo.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1801
+#: WWW/Library/Implementation/HTNews.c:1768
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2933,16 +2933,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1814
+#: WWW/Library/Implementation/HTNews.c:1781
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s, Objetos %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1837
+#: WWW/Library/Implementation/HTNews.c:1804
 msgid "Earlier articles"
 msgstr "Primeiros objetos"
 
-#: WWW/Library/Implementation/HTNews.c:1850
+#: WWW/Library/Implementation/HTNews.c:1817
 #, c-format
 msgid ""
 "\n"
@@ -2953,41 +2953,41 @@ msgstr ""
 "Existem cerca de %d atualmente dispon癉eis em %s, Como segue:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1912
+#: WWW/Library/Implementation/HTNews.c:1879
 msgid "All available articles in "
 msgstr "Todos os objetos dispon癉eis em "
 
-#: WWW/Library/Implementation/HTNews.c:2133
+#: WWW/Library/Implementation/HTNews.c:2093
 msgid "Later articles"
 msgstr "Pr闛imos objetos"
 
-#: WWW/Library/Implementation/HTNews.c:2156
+#: WWW/Library/Implementation/HTNews.c:2116
 msgid "Post to "
 msgstr "Envoar pata "
 
-#: WWW/Library/Implementation/HTNews.c:2377
+#: WWW/Library/Implementation/HTNews.c:2337
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Este programa n緌 cont幦 suporte para SNEWS URLs."
 
-#: WWW/Library/Implementation/HTNews.c:2585
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr "Sem destino para texto prim嫫io!"
 
-#: WWW/Library/Implementation/HTNews.c:2616
+#: WWW/Library/Implementation/HTNews.c:2576
 msgid "Connecting to NewsHost ..."
 msgstr "Conectando ao servidor NEWS..."
 
-#: WWW/Library/Implementation/HTNews.c:2668
+#: WWW/Library/Implementation/HTNews.c:2628
 #, c-format
 msgid "Could not access %s."
 msgstr "N緌 foi poss癉el acessar %s."
 
-#: WWW/Library/Implementation/HTNews.c:2774
+#: WWW/Library/Implementation/HTNews.c:2734
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "N緌 foi poss癉el ler not獳ias. Sservidor NEWS %.20s respondeu: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2778
+#: WWW/Library/Implementation/HTNews.c:2738
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "N緌 foi poss癉el ler not獳ias. Sservidor NEWS respondeu: %s"
@@ -2995,22 +2995,22 @@ msgstr "N緌 foi poss癉el ler not獳ias. Sservidor NEWS respondeu: %s"
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2982
+#: WWW/Library/Implementation/HTNews.c:2942
 msgid "Reading list of available newsgroups."
 msgstr "Lendo lista de grupos de NEWS dispon癉eis."
 
-#: WWW/Library/Implementation/HTNews.c:3003
+#: WWW/Library/Implementation/HTNews.c:2963
 msgid "Reading list of articles in newsgroup."
 msgstr "Lendo lista de objetos no grupo de NEWS."
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:3009
+#: WWW/Library/Implementation/HTNews.c:2969
 msgid "Reading news article."
 msgstr "Lendo objetos de NEWS."
 
-#: WWW/Library/Implementation/HTNews.c:3039
+#: WWW/Library/Implementation/HTNews.c:2999
 msgid "Sorry, could not load requested news."
 msgstr ""
 
@@ -3018,11 +3018,11 @@ msgstr ""
 msgid "Address has invalid port"
 msgstr "Comprimento do endere蔞 parece estar errado"
 
-#: WWW/Library/Implementation/HTTCP.c:1320
+#: WWW/Library/Implementation/HTTCP.c:1308
 msgid "Address length looks invalid"
 msgstr "Comprimento do endere蔞 parece estar errado"
 
-#: WWW/Library/Implementation/HTTCP.c:1552 WWW/Library/Implementation/HTTCP.c:1570
+#: WWW/Library/Implementation/HTTCP.c:1539 WWW/Library/Implementation/HTTCP.c:1557
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Imposs;ivel localizar servidor remoto %s."
@@ -3031,38 +3031,38 @@ msgstr "Imposs;ivel localizar servidor remoto %s."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1567 WWW/Library/Implementation/HTTelnet.c:108
+#: WWW/Library/Implementation/HTTCP.c:1554 WWW/Library/Implementation/HTTelnet.c:108
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Servidor inv嫮ido %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1568
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Conectando com %s em %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1579
 msgid "socket failed."
 msgstr "Falha na conec誽o do socket."
 
-#: WWW/Library/Implementation/HTTCP.c:1605
+#: WWW/Library/Implementation/HTTCP.c:1592
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1629
+#: WWW/Library/Implementation/HTTCP.c:1616
 msgid "Could not make connection non-blocking."
 msgstr "N緌 foi poss癉el criar conec誽o."
 
-#: WWW/Library/Implementation/HTTCP.c:1697
+#: WWW/Library/Implementation/HTTCP.c:1684
 msgid "Connection failed (too many retries)."
 msgstr "Conec誽o falhou apos 180,000 tentativas."
 
-#: WWW/Library/Implementation/HTTCP.c:1896
+#: WWW/Library/Implementation/HTTCP.c:1883
 msgid "Could not restore socket to blocking."
 msgstr "Imposs癉el restaurar socket para blocagem."
 
-#: WWW/Library/Implementation/HTTCP.c:1962
+#: WWW/Library/Implementation/HTTCP.c:1949
 msgid "Socket read failed for 180,000 tries."
 msgstr "Leitura do socket falhou ap鏀 180,000 tentativas."
 
@@ -3367,99 +3367,99 @@ msgstr "Mem鏎ia exaurida, apresenta誽o interrompida!"
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Mem鏎ia exaurida, sr interrompida a transfer瘽cia!"
 
-#: src/GridText.c:3594
+#: src/GridText.c:3601
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr "*** MEM紑IA EXAURIDA ***"
 
-#: src/GridText.c:6013 src/GridText.c:6020 src/LYList.c:248
+#: src/GridText.c:6020 src/GridText.c:6027 src/LYList.c:248
 msgid "unknown field or link"
 msgstr "Campo ou ligac緌 desconhecidos."
 
-#: src/GridText.c:6029
+#: src/GridText.c:6036
 msgid "text entry field"
 msgstr "Campo de entrada de texto"
 
-#: src/GridText.c:6032
+#: src/GridText.c:6039
 msgid "password entry field"
 msgstr "Campo de entrada de senha"
 
-#: src/GridText.c:6035
+#: src/GridText.c:6042
 msgid "checkbox"
 msgstr "Caixa de checagem"
 
-#: src/GridText.c:6038
+#: src/GridText.c:6045
 msgid "radio button"
 msgstr "Bot緌 de r墂io"
 
-#: src/GridText.c:6041
+#: src/GridText.c:6048
 msgid "submit button"
 msgstr "Bot緌 de envio"
 
-#: src/GridText.c:6044
+#: src/GridText.c:6051
 msgid "reset button"
 msgstr "Bot緌 de limpar"
 
-#: src/GridText.c:6047
+#: src/GridText.c:6054
 msgid "popup menu"
 msgstr "Menu de pop-up"
 
-#: src/GridText.c:6050
+#: src/GridText.c:6057
 msgid "hidden form field"
 msgstr "Campo de formul嫫io escondido"
 
-#: src/GridText.c:6053
+#: src/GridText.c:6060
 msgid "text entry area"
 msgstr "臆ea de entrada de texto"
 
-#: src/GridText.c:6056
+#: src/GridText.c:6063
 msgid "range entry field"
 msgstr "Faixa de entrada de texto"
 
-#: src/GridText.c:6059
+#: src/GridText.c:6066
 msgid "file entry field"
 msgstr "Campo de entrada de arquivo"
 
-#: src/GridText.c:6062
+#: src/GridText.c:6069
 msgid "text-submit field"
 msgstr "Campo de envio de texto"
 
-#: src/GridText.c:6065
+#: src/GridText.c:6072
 msgid "image-submit button"
 msgstr "Bot緌 de imagem de envio de formul嫫io"
 
-#: src/GridText.c:6068
+#: src/GridText.c:6075
 msgid "keygen field"
 msgstr "Campo de 'chave'"
 
-#: src/GridText.c:6071
+#: src/GridText.c:6078
 msgid "unknown form field"
 msgstr "Campo desconhecido"
 
-#: src/GridText.c:10231
+#: src/GridText.c:10244
 #, fuzzy
 msgid "Can't open file for uploading"
 msgstr "Imposs镽el abrir arquivo para descompress緌!"
 
-#: src/GridText.c:11384
+#: src/GridText.c:11397
 #, c-format
 msgid "Submitting %s"
 msgstr "Enviando %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12533
+#: src/GridText.c:12546
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12738
+#: src/GridText.c:12751
 msgid "Wrap lines to fit displayed area?"
 msgstr ""
 
-#: src/GridText.c:12790
+#: src/GridText.c:12803
 msgid "Very long lines have been wrapped!"
 msgstr ""
 
-#: src/GridText.c:13232
+#: src/GridText.c:13245
 msgid "Very long lines have been truncated!"
 msgstr ""
 
@@ -3565,15 +3565,15 @@ msgstr "Caminho:"
 msgid "(unknown)"
 msgstr "(desconhecido)"
 
-#: src/HTML.c:7374
+#: src/HTML.c:7375
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Documento cont幦 somente liga踥es ocultas. Use 'l' para listar."
 
-#: src/HTML.c:7873
+#: src/HTML.c:7874
 msgid "Source cache error - disk full?"
 msgstr ""
 
-#: src/HTML.c:7886
+#: src/HTML.c:7887
 msgid "Source cache error - not enough memory!"
 msgstr ""
 
@@ -3674,31 +3674,31 @@ msgstr "(interno)"
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr ""
 
-#: src/LYCurses.c:1017
+#: src/LYCurses.c:1034
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Inicializa誽o do terminal falhou - Terminal de tipo desconhecido?"
 
-#: src/LYCurses.c:1442
+#: src/LYCurses.c:1459
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1446
+#: src/LYCurses.c:1463
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Voc deve usar um terminal vt100, 200, etc... com este programa."
 
-#: src/LYCurses.c:1495
+#: src/LYCurses.c:1512
 msgid "Your Terminal type is unknown!"
 msgstr "O tipo do seu terminal  desconhecido!"
 
-#: src/LYCurses.c:1496
+#: src/LYCurses.c:1513
 msgid "Enter a terminal type:"
 msgstr "Entre com o tipo do terminal:"
 
-#: src/LYCurses.c:1510
+#: src/LYCurses.c:1527
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TERMINAL EST CONFIGURADO PARA"
 
-#: src/LYCurses.c:2007
+#: src/LYCurses.c:2031
 #, c-format
 msgid ""
 "\n"
@@ -3707,7 +3707,7 @@ msgstr ""
 "\n"
 "Um erro fatal ocorreu em %s Ver. %s\n"
 
-#: src/LYCurses.c:2010
+#: src/LYCurses.c:2034
 #, c-format
 msgid ""
 "\n"
@@ -4244,52 +4244,52 @@ msgstr ""
 "Arquivo Lynx %s n緌 est dispon癉el.\n"
 "\n"
 
-#: src/LYMain.c:1763
+#: src/LYMain.c:1750
 msgid "Warning:"
 msgstr ""
 
-#: src/LYMain.c:2328
+#: src/LYMain.c:2315
 msgid "persistent cookies state will be changed in next session only."
 msgstr "O estado dos cookies permanentes ser alterado na pr闛ima se誽o."
 
-#: src/LYMain.c:2565 src/LYMain.c:2610
+#: src/LYMain.c:2552 src/LYMain.c:2597
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr ""
 
-#: src/LYMain.c:3121
+#: src/LYMain.c:3108
 #, fuzzy, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Vers緌 %s (%s)\n"
 
-#: src/LYMain.c:3156
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Criado em %s %s %s\n"
 
-#: src/LYMain.c:3178
+#: src/LYMain.c:3165
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors."
 msgstr "Copyrights mantidos pela University of Kansas, CERN, e outros colaboradores."
 
-#: src/LYMain.c:3179
+#: src/LYMain.c:3166
 msgid "Distributed under the GNU General Public License."
 msgstr "Distribuido pela GNU General Public License."
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3167
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Veja http://lynx.isc.org/ e o help on-line para mais informa踥es."
 
-#: src/LYMain.c:3952
+#: src/LYMain.c:3939
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "USO: %s [op踥es] [arquivo]\n"
 
-#: src/LYMain.c:3953
+#: src/LYMain.c:3940
 #, c-format
 msgid "Options are:\n"
 msgstr "Op踥es s緌:\n"
 
-#: src/LYMain.c:4252
+#: src/LYMain.c:4239
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Op誽o inv嫮ida: %s\n"
@@ -4364,7 +4364,7 @@ msgstr ""
 msgid "Current URL is empty."
 msgstr "Diret鏎io corrente:"
 
-#: src/LYMainLoop.c:6935 src/LYUtils.c:1714
+#: src/LYMainLoop.c:6935 src/LYUtils.c:1775
 msgid "Copy to clipboard failed."
 msgstr ""
 
@@ -4460,356 +4460,356 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "Mensagem n緌 tem texto original!"
 
-#: src/LYOptions.c:758
+#: src/LYOptions.c:761
 msgid "review/edit B)ookmarks files"
 msgstr "rever/editar B) Livro de Marca踥es"
 
-#: src/LYOptions.c:760
+#: src/LYOptions.c:763
 msgid "B)ookmark file: "
 msgstr "B) Livro de Marca踥es:"
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2126 src/LYOptions.c:2133
 msgid "ON"
 msgstr ""
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2277 src/LYOptions.c:2288
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280 src/LYOptions.c:2291
 msgid "OFF"
 msgstr ""
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2128
 msgid "NEVER"
 msgstr ""
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2129
 msgid "ALWAYS"
 msgstr ""
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2269
+#: src/LYOptions.c:2145 src/LYOptions.c:2272
 msgid "ignore"
 msgstr ""
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2146
 msgid "ask user"
 msgstr ""
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2147
 msgid "accept all"
 msgstr ""
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS OFF"
 msgstr ""
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2160
 msgid "FOR LOCAL FILES ONLY"
 msgstr ""
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2162
 msgid "ALWAYS ON"
 msgstr ""
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2174
 msgid "Numbers act as arrows"
 msgstr ""
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Links and form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2182
 msgid "Form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2189
+#: src/LYOptions.c:2192
 msgid "Case insensitive"
 msgstr ""
 
-#: src/LYOptions.c:2190
+#: src/LYOptions.c:2193
 msgid "Case sensitive"
 msgstr ""
 
-#: src/LYOptions.c:2214
+#: src/LYOptions.c:2217
 msgid "prompt normally"
 msgstr ""
 
-#: src/LYOptions.c:2215
+#: src/LYOptions.c:2218
 msgid "force yes-response"
 msgstr ""
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2219
 msgid "force no-response"
 msgstr ""
 
-#: src/LYOptions.c:2234
+#: src/LYOptions.c:2237
 #, fuzzy
 msgid "Novice"
 msgstr "Vazio"
 
-#: src/LYOptions.c:2235
+#: src/LYOptions.c:2238
 #, fuzzy
 msgid "Intermediate"
 msgstr "(interno)"
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2239
 msgid "Advanced"
 msgstr ""
 
-#: src/LYOptions.c:2245
+#: src/LYOptions.c:2248
 msgid "By First Visit"
 msgstr ""
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2250
 msgid "By First Visit Reversed"
 msgstr ""
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2251
 msgid "As Visit Tree"
 msgstr ""
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2252
 msgid "By Last Visit"
 msgstr ""
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2254
 msgid "By Last Visit Reversed"
 msgstr ""
 
 #. Old_DTD variable
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2265
 msgid "relaxed (TagSoup mode)"
 msgstr ""
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2266
 msgid "strict (SortaSGML mode)"
 msgstr ""
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2273
 msgid "as labels"
 msgstr ""
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2274
 #, fuzzy
 msgid "as links"
 msgstr "esta liga誽o"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2281
 #, fuzzy
 msgid "show filename"
 msgstr " (Nome incorreto de arquivo)"
 
-#: src/LYOptions.c:2289
+#: src/LYOptions.c:2292
 msgid "STANDARD"
 msgstr ""
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2293
 msgid "ADVANCED"
 msgstr ""
 
-#: src/LYOptions.c:2316
+#: src/LYOptions.c:2319
 #, fuzzy
 msgid "Directories first"
 msgstr "Subdiret鏎ios:"
 
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2320
 #, fuzzy
 msgid "Files first"
 msgstr " primeiro."
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2321
 msgid "Mixed style"
 msgstr ""
 
-#: src/LYOptions.c:2326 src/LYOptions.c:2343
+#: src/LYOptions.c:2329 src/LYOptions.c:2346
 #, fuzzy
 msgid "By Name"
 msgstr "Nome:"
 
-#: src/LYOptions.c:2327 src/LYOptions.c:2344
+#: src/LYOptions.c:2330 src/LYOptions.c:2347
 msgid "By Type"
 msgstr ""
 
-#: src/LYOptions.c:2328 src/LYOptions.c:2345
+#: src/LYOptions.c:2331 src/LYOptions.c:2348
 #, fuzzy
 msgid "By Size"
 msgstr "Tamanho em bytes:"
 
-#: src/LYOptions.c:2329 src/LYOptions.c:2346
+#: src/LYOptions.c:2332 src/LYOptions.c:2349
 #, fuzzy
 msgid "By Date"
 msgstr "Data:"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2333
 msgid "By Mode"
 msgstr ""
 
-#: src/LYOptions.c:2332
+#: src/LYOptions.c:2335
 msgid "By User"
 msgstr ""
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 #, fuzzy
 msgid "By Group"
 msgstr "Grupo"
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2357
 msgid "Do not show rate"
 msgstr ""
 
-#: src/LYOptions.c:2355 src/LYOptions.c:2356
+#: src/LYOptions.c:2358 src/LYOptions.c:2359
 #, fuzzy, c-format
 msgid "Show %s/sec rate"
 msgstr "Transfer瘽cia completada"
 
-#: src/LYOptions.c:2358 src/LYOptions.c:2359
+#: src/LYOptions.c:2361 src/LYOptions.c:2362
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr ""
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2374
 msgid "Accept lynx's internal types"
 msgstr ""
 
-#: src/LYOptions.c:2372
+#: src/LYOptions.c:2375
 msgid "Also accept lynx.cfg's types"
 msgstr ""
 
-#: src/LYOptions.c:2373
+#: src/LYOptions.c:2376
 msgid "Also accept user's types"
 msgstr ""
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "Also accept system's types"
 msgstr ""
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 #, fuzzy
 msgid "Accept all types"
 msgstr "Aceitar mudan蓷s"
 
-#: src/LYOptions.c:2384
+#: src/LYOptions.c:2387
 msgid "gzip"
 msgstr ""
 
-#: src/LYOptions.c:2385
+#: src/LYOptions.c:2388
 msgid "deflate"
 msgstr ""
 
-#: src/LYOptions.c:2388
+#: src/LYOptions.c:2391
 msgid "compress"
 msgstr ""
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2394
 msgid "bzip2"
 msgstr ""
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2396
 msgid "All"
 msgstr ""
 
-#: src/LYOptions.c:2658 src/LYOptions.c:2682
+#: src/LYOptions.c:2664 src/LYOptions.c:2688
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr ""
 
-#: src/LYOptions.c:3429
+#: src/LYOptions.c:3438
 msgid "(options marked with (!) will not be saved)"
 msgstr ""
 
-#: src/LYOptions.c:3437
+#: src/LYOptions.c:3446
 msgid "General Preferences"
 msgstr "Prefer瘽cias pessoais"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3450
 msgid "User mode"
 msgstr "Modo usu嫫io"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3447
+#: src/LYOptions.c:3456
 msgid "Editor"
 msgstr "Editor"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3461
 msgid "Type of Search"
 msgstr ""
 
-#: src/LYOptions.c:3457
+#: src/LYOptions.c:3466
 msgid "Security and Privacy"
 msgstr ""
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3461
+#: src/LYOptions.c:3470
 msgid "Cookies"
 msgstr "Cookies"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3475
+#: src/LYOptions.c:3484
 msgid "Invalid-Cookie Prompting"
 msgstr ""
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3482
+#: src/LYOptions.c:3491
 msgid "SSL Prompting"
 msgstr ""
 
-#: src/LYOptions.c:3488
+#: src/LYOptions.c:3497
 msgid "Keyboard Input"
 msgstr ""
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3492
+#: src/LYOptions.c:3501
 msgid "Keypad mode"
 msgstr "Modo Keypad"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3498
+#: src/LYOptions.c:3507
 msgid "Emacs keys"
 msgstr "Teclas Emacs"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3513
 msgid "VI keys"
 msgstr "Teclas VI"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3511
+#: src/LYOptions.c:3520
 msgid "Line edit style"
 msgstr ""
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3532
 msgid "Keyboard layout"
 msgstr ""
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3537
+#: src/LYOptions.c:3546
 msgid "Display and Character Set"
 msgstr "Mostra mapa de caracteres"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3542
+#: src/LYOptions.c:3551
 #, fuzzy
 msgid "Use locale-based character set"
 msgstr "Assumindo mapa de caracteres do documento"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3551
+#: src/LYOptions.c:3560
 msgid "Display character set"
 msgstr "Mostra mapa de caracteres"
 
-#: src/LYOptions.c:3582
+#: src/LYOptions.c:3591
 msgid "Assumed document character set"
 msgstr "Assumindo mapa de caracteres do documento"
 
@@ -4818,175 +4818,178 @@ msgstr "Assumindo mapa de caracteres do documento"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3602
+#: src/LYOptions.c:3611
 msgid "CJK mode"
 msgstr "Modo CJK"
 
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3613
 msgid "Raw 8-bit"
 msgstr "Raw 8-bit"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3612
+#: src/LYOptions.c:3621
 msgid "X Display"
 msgstr "Visual X"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3618
+#: src/LYOptions.c:3627
 msgid "Document Appearance"
 msgstr ""
 
-#: src/LYOptions.c:3624
+#: src/LYOptions.c:3633
 msgid "Show color"
 msgstr "Mostra cor"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3648
+#: src/LYOptions.c:3657
 msgid "Show cursor"
 msgstr "Mostra cursor"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3663
 #, fuzzy
 msgid "Underline links"
 msgstr "Liga踥es escondidas:"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3670
 #, fuzzy
 msgid "Show scrollbar"
 msgstr "Mostra cor"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3668
+#: src/LYOptions.c:3677
 msgid "Popups for select fields"
 msgstr "Pop-ups para os campos selecionados"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3674
+#: src/LYOptions.c:3683
 msgid "HTML error recovery"
 msgstr "Erro recuperando HTML"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3680
+#: src/LYOptions.c:3689
 msgid "Show images"
 msgstr "Mostra imagens"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3694
+#: src/LYOptions.c:3703
 msgid "Verbose images"
 msgstr "Imagens explicitadas"
 
-#: src/LYOptions.c:3703
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3711
 msgid "Headers Transferred to Remote Servers"
 msgstr "Cabe蓷lhos tranferidos ao servidor remoto"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3715
 msgid "Personal mail address"
 msgstr "Endere蔞 pessoal de email"
 
 #. Mail Address: INPUT
-#: src/LYOptions.c:3712
+#: src/LYOptions.c:3720
 #, fuzzy
 msgid "Password for anonymous ftp"
 msgstr "Senha para o servidor NEWS '%s':"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3717
+#: src/LYOptions.c:3725
 #, fuzzy
 msgid "Preferred media type"
 msgstr "Transferidos %d bytes."
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3723
+#: src/LYOptions.c:3731
 #, fuzzy
 msgid "Preferred encoding"
 msgstr "Prefer瘽cia de linguagem do documento."
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3729
+#: src/LYOptions.c:3737
 msgid "Preferred document character set"
 msgstr "Prefer瘽cias de mapa de caracteres do documento"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3742
 msgid "Preferred document language"
 msgstr "Prefer瘽cia de linguagem do documento."
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3748
 msgid "User-Agent header"
 msgstr "Cabe蓷lho de Agente de Usu嫫io"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3748
+#: src/LYOptions.c:3756
 msgid "Listing and Accessing Files"
 msgstr ""
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3752
+#: src/LYOptions.c:3760
 msgid "FTP sort criteria"
 msgstr "Crit廨ios de organiza誽o do FTP"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3759
+#: src/LYOptions.c:3767
 msgid "Local directory sort criteria"
 msgstr "Crit廨ios de organiza踥es dos diret鏎ios locais"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3773
 #, fuzzy
 msgid "Local directory sort order"
 msgstr "Crit廨ios de organiza踥es dos diret鏎ios locais"
 
-#: src/LYOptions.c:3774
+#: src/LYOptions.c:3782
 msgid "Show dot files"
 msgstr "Monstre arquivos de pontos"
 
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3790
 msgid "Execution links"
 msgstr "Liga踥es de execu誽o"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3810
 msgid "Show transfer rate"
 msgstr "Transfer瘽cia completada"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3830
 msgid "Special Files and Screens"
 msgstr ""
 
-#: src/LYOptions.c:3827
+#: src/LYOptions.c:3835
 msgid "Multi-bookmarks"
 msgstr "Multiplos Livros de Marca踥es"
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3843
 msgid "Review/edit Bookmarks files"
 msgstr "Rever/editar arquivos de Livro de Marca踥es"
 
-#: src/LYOptions.c:3837
+#: src/LYOptions.c:3845
 msgid "Goto multi-bookmark menu"
 msgstr "Ir para menu de multiplos livros de marca踥es"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3847
 msgid "Bookmarks file"
 msgstr "Arquivo de Livro de marca踥es"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3845
+#: src/LYOptions.c:3853
 msgid "Visited Pages"
 msgstr "P墔ina de liga踥es visitadas"
 
-#: src/LYOptions.c:3850
+#: src/LYOptions.c:3858
 #, fuzzy
 msgid "View the file "
 msgstr "Enviar arquivo por email"
@@ -5107,38 +5110,38 @@ msgstr "Lynx: Imposs癉el iniciar,CERN arquivo de regulamento %s n緌 est dispon
 msgid "(no name)"
 msgstr "(sem nome)"
 
-#: src/LYReadCFG.c:1782
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Mais de %d aninhados nos arquivos inclu獮os do lynx.cfg -- talvez seja um loop???\n"
 
-#: src/LYReadCFG.c:1784
+#: src/LYReadCFG.c:1786
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Ultimo arquivo incluso chamado foi '%s',\n"
 
-#: src/LYReadCFG.c:1785
+#: src/LYReadCFG.c:1787
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "inclu獮o a partir de '%s'\n"
 
-#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263
+#: src/LYReadCFG.c:2194 src/LYReadCFG.c:2207 src/LYReadCFG.c:2265
 msgid "The following is read from your lynx.cfg file."
 msgstr "O seguinte foi lido em seu arquivo lynx.cfg."
 
-#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206
+#: src/LYReadCFG.c:2195 src/LYReadCFG.c:2208
 msgid "Please read the distribution"
 msgstr "Por favor veja a distribui誽o"
 
-#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209
+#: src/LYReadCFG.c:2201 src/LYReadCFG.c:2211
 msgid "for more comments."
 msgstr "para mais coment嫫ios."
 
-#: src/LYReadCFG.c:2245
+#: src/LYReadCFG.c:2247
 msgid "RELOAD THE CHANGES"
 msgstr "RELER AS ALTERAмES"
 
-#: src/LYReadCFG.c:2253
+#: src/LYReadCFG.c:2255
 msgid "Your primary configuration"
 msgstr "Sua configura誽o inicial"
 
@@ -5412,34 +5415,34 @@ msgstr "Enviar para:"
 msgid "Upload options:"
 msgstr "Op踥es de envio de arquivos:"
 
-#: src/LYUtils.c:1716
+#: src/LYUtils.c:1777
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2493
+#: src/LYUtils.c:2554
 msgid "Unexpected access protocol for this URL scheme."
 msgstr ""
 
-#: src/LYUtils.c:3301
+#: src/LYUtils.c:3362
 msgid "Too many tempfiles"
 msgstr ""
 
-#: src/LYUtils.c:3605
+#: src/LYUtils.c:3666
 #, fuzzy
 msgid "unknown restriction"
 msgstr "Campo ou ligac緌 desconhecidos."
 
-#: src/LYUtils.c:3635
+#: src/LYUtils.c:3696
 #, c-format
 msgid "No restrictions set.\n"
 msgstr ""
 
-#: src/LYUtils.c:3638
+#: src/LYUtils.c:3699
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Descri誽o:\n"
 
-#: src/LYUtils.c:5022
+#: src/LYUtils.c:5077
 msgid "Cannot find HOME directory"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index a245c04f..0c76c987 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.5pre15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-30 18:03-0400\n"
+"POT-Creation-Date: 2005-10-16 19:03-0400\n"
 "PO-Revision-Date: 2003-06-03 17:40+0400\n"
 "Last-Translator: Dmitry S. Sivachenko <mitya@cavia.pp.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -2244,7 +2244,7 @@ msgstr "(醚 奼曬.)"
 msgid "(No value.)"
 msgstr "(醚 硩醣曬奷.)"
 
-#: LYMessages.c:713 src/LYOptions.c:2382
+#: LYMessages.c:713 src/LYOptions.c:2385
 msgid "None"
 msgstr "醚"
 
@@ -2791,7 +2791,7 @@ msgstr "餀劼芶拏  衃霰眚奼棎 POST 恓 恔岉曬  呿袹.  蟴蚝轂 蚔瓬?"
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8508
+#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8515
 msgid "Loading incomplete."
 msgstr "豳眙硪 睋覂砢曬 恓 俵旽珃婥."
 
@@ -2906,12 +2906,12 @@ msgstr "蟥眐杻 騷 殑攽 恘豜衲戀 '%s':"
 msgid "Change password?"
 msgstr "橕芶恌婥 釓眐杻?"
 
-#: WWW/Library/Implementation/HTNews.c:1736
+#: WWW/Library/Implementation/HTNews.c:1706
 #, c-format
 msgid "No matches for: %s"
 msgstr "醚 衃豝謐曬圴 騷: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1789
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2919,7 +2919,7 @@ msgstr ""
 "\n"
 " 嗩珅 й桸陓 恓 衲轂戀.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1801
+#: WWW/Library/Implementation/HTNews.c:1768
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2930,16 +2930,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1814
+#: WWW/Library/Implementation/HTNews.c:1781
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  鯥轂婻 %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1837
+#: WWW/Library/Implementation/HTNews.c:1804
 msgid "Earlier articles"
 msgstr "瑳旼 畛恄吇 衲轂婻"
 
-#: WWW/Library/Implementation/HTNews.c:1850
+#: WWW/Library/Implementation/HTNews.c:1817
 #, c-format
 msgid ""
 "\n"
@@ -2950,41 +2950,41 @@ msgstr ""
 "鬌忤輾 鰍衲桸恘 玹玶 %d 衲轂戀  %s 衃 蚝鼴梏楦虭 厊曬埩づ佹婘畛虭:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1912
+#: WWW/Library/Implementation/HTNews.c:1879
 msgid "All available articles in "
 msgstr "壧 鰍衲桸挃 衲轂婻  "
 
-#: WWW/Library/Implementation/HTNews.c:2133
+#: WWW/Library/Implementation/HTNews.c:2093
 msgid "Later articles"
 msgstr "瑳旼 俵矬恌 衲轂婻"
 
-#: WWW/Library/Implementation/HTNews.c:2156
+#: WWW/Library/Implementation/HTNews.c:2116
 msgid "Post to "
 msgstr "蟴蚝轂  "
 
-#: WWW/Library/Implementation/HTNews.c:2377
+#: WWW/Library/Implementation/HTNews.c:2337
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "婘 佮吇拏 恓 衃霰眚尕 俵闡籤笵 騷 URL SNEWS."
 
-#: WWW/Library/Implementation/HTNews.c:2585
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr "醚 藷旻 騷 狟殔恘ж 埧剆埡!"
 
-#: WWW/Library/Implementation/HTNews.c:2616
+#: WWW/Library/Implementation/HTNews.c:2576
 msgid "Connecting to NewsHost ..."
 msgstr "灃埡恘訞曬吇 衃鼴妅曬奷  爝昑侹瓬珃埧 ..."
 
-#: WWW/Library/Implementation/HTNews.c:2668
+#: WWW/Library/Implementation/HTNews.c:2628
 #, c-format
 msgid "Could not access %s."
 msgstr "醚 鰍衲桸  %s."
 
-#: WWW/Library/Implementation/HTNews.c:2774
+#: WWW/Library/Implementation/HTNews.c:2734
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "醚 桫豁娸 俵枎瘃婥 妅に眝謄劦  恘豜衲捑. 爝攫 恘豜衲戀 %.20s 珆覂埩: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2778
+#: WWW/Library/Implementation/HTNews.c:2738
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "鍜 桫豁娸 倷癹尕轂 妅に眝謄劦  恘豜衲捑, 俷衲珅 珆覂 珆 殑攽 %s"
@@ -2992,22 +2992,22 @@ msgstr "鍜 桫豁娸 倷癹尕轂 妅に眝謄劦  恘豜衲捑, 俷衲珅 珆覂 珆 殑攽 %s"
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2982
+#: WWW/Library/Implementation/HTNews.c:2942
 msgid "Reading list of available newsgroups."
 msgstr "埧恌 衄孖佹 鰍衲桸挃 й桸 恘豜衲戀."
 
-#: WWW/Library/Implementation/HTNews.c:3003
+#: WWW/Library/Implementation/HTNews.c:2963
 msgid "Reading list of articles in newsgroup."
 msgstr "埧恌 衄孖佹 衲轂戀  й桸陓 恘豜衲戀."
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:3009
+#: WWW/Library/Implementation/HTNews.c:2969
 msgid "Reading news article."
 msgstr "埧恌 衲轂婻 恘豜衲戀."
 
-#: WWW/Library/Implementation/HTNews.c:3039
+#: WWW/Library/Implementation/HTNews.c:2999
 msgid "Sorry, could not load requested news."
 msgstr "醚 桫豁娸 睋й殑尕 睋倷畈曬挃 恘豜衲, 巟訰恌埧."
 
@@ -3015,11 +3015,11 @@ msgstr "醚 桫豁娸 睋й殑尕 睋倷畈曬挃 恘豜衲, 巟訰恌埧."
 msgid "Address has invalid port"
 msgstr "醚覂眛椋 俵眕  謐疻蚆"
 
-#: WWW/Library/Implementation/HTTCP.c:1320
+#: WWW/Library/Implementation/HTTCP.c:1308
 msgid "Address length looks invalid"
 msgstr "颭妅 謐疻蚆 趿д挭尕 恓覂眛珅"
 
-#: WWW/Library/Implementation/HTTCP.c:1552 WWW/Library/Implementation/HTTCP.c:1570
+#: WWW/Library/Implementation/HTTCP.c:1539 WWW/Library/Implementation/HTTCP.c:1557
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "醚 桫豁娸 狟恔眙窔婥 桫賻曬挍 芩袶挍 %s."
@@ -3028,38 +3028,38 @@ msgstr "醚 桫豁娸 狟恔眙窔婥 桫賻曬挍 芩袶挍 %s."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1567 WWW/Library/Implementation/HTTelnet.c:108
+#: WWW/Library/Implementation/HTTCP.c:1554 WWW/Library/Implementation/HTTelnet.c:108
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "醚倷避妀媓狣 奼 芩袶挃 %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1568
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "灃埡恔訞屺豁娸 %s 衃鼴妅曬吇  %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1579
 msgid "socket failed."
 msgstr "畈匟佹 衃侜埡."
 
-#: WWW/Library/Implementation/HTTCP.c:1605
+#: WWW/Library/Implementation/HTTCP.c:1592
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "畈匟佹 衃侜埡: 蚥芶弝婟 %d 謐疻 %s 俵眕 %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1629
+#: WWW/Library/Implementation/HTTCP.c:1616
 msgid "Could not make connection non-blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1697
+#: WWW/Library/Implementation/HTTCP.c:1684
 msgid "Connection failed (too many retries)."
 msgstr "醚 桫豁娸 梌埡恘訰婥 衃鼴妅曬吇 (蚝幵冾 迓珌 俵倧婘)."
 
-#: WWW/Library/Implementation/HTTCP.c:1896
+#: WWW/Library/Implementation/HTTCP.c:1883
 msgid "Could not restore socket to blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1962
+#: WWW/Library/Implementation/HTTCP.c:1949
 msgid "Socket read failed for 180,000 tries."
 msgstr "曛匟佹 倷 痽曬圪 衃侜埡  埧畷恌 180,000 俵倧婘."
 
@@ -3363,98 +3363,98 @@ msgstr "蟥迕婥 孖畷眓蹉, 珆狟畛秸恌 倷籤袬恘!"
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "蟥迕婥 孖畷眓蹉, 陓疻鐘瓾 鐘恄棼 謬霰 倷籤袬恔!"
 
-#: src/GridText.c:3594
+#: src/GridText.c:3601
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** 謯艚鐖 澞殣謯鍕 ***"
 
-#: src/GridText.c:6013 src/GridText.c:6020 src/LYList.c:248
+#: src/GridText.c:6020 src/GridText.c:6027 src/LYList.c:248
 msgid "unknown field or link"
 msgstr "恓巟覂衲恘 俵旼 妀 衶椗佹"
 
-#: src/GridText.c:6029
+#: src/GridText.c:6036
 msgid "text entry field"
 msgstr "俵旼 跂狦 埧剆埡"
 
-#: src/GridText.c:6032
+#: src/GridText.c:6039
 msgid "password entry field"
 msgstr "俵旼 跂狦 釓眐曶"
 
-#: src/GridText.c:6035
+#: src/GridText.c:6042
 msgid "checkbox"
 msgstr "恓睋訰蚕芩 冼玿佹"
 
-#: src/GridText.c:6038
+#: src/GridText.c:6045
 msgid "radio button"
 msgstr "睋訰蚕芩 冼玿佹"
 
-#: src/GridText.c:6041
+#: src/GridText.c:6048
 msgid "submit button"
 msgstr "冼玿佹 俵袃昋"
 
-#: src/GridText.c:6044
+#: src/GridText.c:6051
 msgid "reset button"
 msgstr "冼玿佹 癹孖堍"
 
-#: src/GridText.c:6047
+#: src/GridText.c:6054
 msgid "popup menu"
 msgstr "赽倢椕謊暙 芶怹"
 
-#: src/GridText.c:6050
+#: src/GridText.c:6057
 msgid "hidden form field"
 msgstr "蚎砣婘 俵旼 に眝"
 
-#: src/GridText.c:6053
+#: src/GridText.c:6060
 msgid "text entry area"
 msgstr "狟攽衲 跂狦 埧剆埡"
 
-#: src/GridText.c:6056
+#: src/GridText.c:6063
 msgid "range entry field"
 msgstr "俵旼 跂狦 馨蹈邁玴"
 
-#: src/GridText.c:6059
+#: src/GridText.c:6066
 msgid "file entry field"
 msgstr "俵旼 跂狦 そ帎"
 
-#: src/GridText.c:6062
+#: src/GridText.c:6069
 msgid "text-submit field"
 msgstr "埧剆婘豜 俵旼 俵袃昋"
 
-#: src/GridText.c:6065
+#: src/GridText.c:6072
 msgid "image-submit button"
 msgstr "й谿弚籣佹 冼玿佹 俵袃昋"
 
-#: src/GridText.c:6068
+#: src/GridText.c:6075
 msgid "keygen field"
 msgstr "俵旼 keygen"
 
-#: src/GridText.c:6071
+#: src/GridText.c:6078
 msgid "unknown form field"
 msgstr "恓巟覂衲恘 俵旼 に眝"
 
-#: src/GridText.c:10231
+#: src/GridText.c:10244
 msgid "Can't open file for uploading"
 msgstr "醚 桫豁娸 珆刳椆 そ帎 騷 睋й殑侂!"
 
-#: src/GridText.c:11384
+#: src/GridText.c:11397
 #, c-format
 msgid "Submitting %s"
 msgstr "蟴袃昋 %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12533
+#: src/GridText.c:12546
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12738
+#: src/GridText.c:12751
 msgid "Wrap lines to fit displayed area?"
 msgstr "蟔疻恓衲 衲眐侂, 痽狟 俵釓衲  狟攽衲 珆狟畛秸恌?"
 
-#: src/GridText.c:12790
+#: src/GridText.c:12803
 msgid "Very long lines have been wrapped!"
 msgstr "檹曬 騷妅挃 衲眐侂 蹙旻 陓疻恓蚥挃!"
 
-#: src/GridText.c:13232
+#: src/GridText.c:13245
 msgid "Very long lines have been truncated!"
 msgstr "檹曬 騷妅挃 衲眐侂 蹙旻 梌邏曬!"
 
@@ -3560,15 +3560,15 @@ msgstr "襌婥  そ帎:"
 msgid "(unknown)"
 msgstr "(恓巟覂衲挃)"
 
-#: src/HTML.c:7374
+#: src/HTML.c:7375
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "餀劼芶拏 奼齬 婘杻冾 蚎砣婬 衶椗侂.  橔俵杻祰彸 冾芩恅 'l'ist."
 
-#: src/HTML.c:7873
+#: src/HTML.c:7874
 msgid "Source cache error - disk full?"
 msgstr "曛匟佹 呿袶眐袬恌 孖狦挃 そ帎瓬 - 陓疻俵旽曬吇 馨蚎?"
 
-#: src/HTML.c:7886
+#: src/HTML.c:7887
 msgid "Source cache error - not enough memory!"
 msgstr "曛匟佹 呿袶眐袬恌 孖狦挃 そ帎瓬 - 恓 袬埡籥 釓迕埩!"
 
@@ -3673,31 +3673,31 @@ msgstr "龕梊疻恄圴"
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "畈匟佹 cookie_domain_flag_set error, 倷龔畛迋 倷籤椕豁娸"
 
-#: src/LYCurses.c:1017
+#: src/LYCurses.c:1034
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "曛匟佹 倷 妅卍匢旻睋蟹 埧眝妅賻 - 恓巟覂衲挃 埩 埧眝妅賻?"
 
-#: src/LYCurses.c:1442
+#: src/LYCurses.c:1459
 msgid "Terminal ="
 msgstr "蠐眝妅賻 ="
 
-#: src/LYCurses.c:1446
+#: src/LYCurses.c:1463
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr " 嗩珅 倷珌畛迋珅 趿 鰍枒挃 孖俵杻硨袬婥 埧眝妅賻 vt100, 200,  .."
 
-#: src/LYCurses.c:1495
+#: src/LYCurses.c:1512
 msgid "Your Terminal type is unknown!"
 msgstr "蠖 袬袹ж 蠐眝妅賻 恓巟覂衲曬!"
 
-#: src/LYCurses.c:1496
+#: src/LYCurses.c:1513
 msgid "Enter a terminal type:"
 msgstr "蠯鼴尕 埩 埧眝妅賻:"
 
-#: src/LYCurses.c:1510
+#: src/LYCurses.c:1527
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "鏻 醲襡濎摐 蘦酃闀籧槴 "
 
-#: src/LYCurses.c:2007
+#: src/LYCurses.c:2031
 #, c-format
 msgid ""
 "\n"
@@ -3706,7 +3706,7 @@ msgstr ""
 "\n"
 "  %s 鷕. %s 倷珈硨袽 そ埡杻恔 畈匟佹.\n"
 
-#: src/LYCurses.c:2010
+#: src/LYCurses.c:2034
 #, c-format
 msgid ""
 "\n"
@@ -4240,52 +4240,52 @@ msgstr ""
 "碻帎 Lynx %s 恓 鰍衲桸曬.\n"
 "\n"
 
-#: src/LYMain.c:1763
+#: src/LYMain.c:1750
 msgid "Warning:"
 msgstr "襓鼴桸疻秺曬吇:"
 
-#: src/LYMain.c:2328
+#: src/LYMain.c:2315
 msgid "persistent cookies state will be changed in next session only."
 msgstr "衃衲珇恌 俵衲珇恄棼 cookie 謬霰 巟芶恓恘 婘杻冾  蚝鼴梏暙 蚥蹉蚥."
 
-#: src/LYMain.c:2565 src/LYMain.c:2610
+#: src/LYMain.c:2552 src/LYMain.c:2597
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: 恓畛衄畇恔恄蹊 冾馨眐訬=%s 囟恘疶眙籥衭\n"
 
-#: src/LYMain.c:3121
+#: src/LYMain.c:3108
 #, fuzzy, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s 鷕眑奷 %s (%s)\n"
 
-#: src/LYMain.c:3156
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "鯔觴蹉 %s %s %s\n"
 
-#: src/LYMain.c:3178
+#: src/LYMain.c:3165
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors."
 msgstr "戧婘眑侂 倷避 倷妅謐旼祫 梉屺籤蚕埧婭 蹅拫輾, CERN,  黨梀奼 殌輾婠夼趨."
 
-#: src/LYMain.c:3179
+#: src/LYMain.c:3166
 msgid "Distributed under the GNU General Public License."
 msgstr "臗衄眐衲畛恮籥衭  畛豖賺 欂屺籤蚆杻恘 屩暙衲覂恄珅 嚁藷拫圪 GNU."
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3167
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "鯢. http://lynx.isc.org/  俵迍楉 騷 鰍俵旽尕攫媓珅 妅に眝謄圪."
 
-#: src/LYMain.c:3952
+#: src/LYMain.c:3939
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "澞豵檟濷搿毇: %s [佮濯巿 [そ帎]\n"
 
-#: src/LYMain.c:3953
+#: src/LYMain.c:3940
 #, c-format
 msgid "Options are:\n"
 msgstr "輲濯:\n"
 
-#: src/LYMain.c:4252
+#: src/LYMain.c:4239
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: 醚覂眛蹊 玿蟹: %s\n"
@@ -4359,7 +4359,7 @@ msgstr ""
 msgid "Current URL is empty."
 msgstr "蠐劼楦 URL 俷衲."
 
-#: src/LYMainLoop.c:6935 src/LYUtils.c:1714
+#: src/LYMainLoop.c:6935 src/LYUtils.c:1775
 msgid "Copy to clipboard failed."
 msgstr "櫅匟佹 倷 冾倅眐袬恌  謬ち 狟芶恔."
 
@@ -4455,357 +4455,357 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "鯔狟暙恌 恓 奼齬 陓眢玴醣賻媓珌 埧剆埡!"
 
-#: src/LYOptions.c:758
+#: src/LYOptions.c:761
 msgid "review/edit B)ookmarks files"
 msgstr "倷珃迍婞籥/珆疻鐘刱奿瓬轂 そ帎 B)睋佮謐玹"
 
-#: src/LYOptions.c:760
+#: src/LYOptions.c:763
 msgid "B)ookmark file: "
 msgstr "碻帎 B)睋佮謐玹: "
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2126 src/LYOptions.c:2133
 msgid "ON"
 msgstr ""
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2277 src/LYOptions.c:2288
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280 src/LYOptions.c:2291
 msgid "OFF"
 msgstr ""
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2128
 msgid "NEVER"
 msgstr ""
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2129
 msgid "ALWAYS"
 msgstr ""
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2269
+#: src/LYOptions.c:2145 src/LYOptions.c:2272
 msgid "ignore"
 msgstr ""
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2146
 msgid "ask user"
 msgstr ""
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2147
 msgid "accept all"
 msgstr ""
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS OFF"
 msgstr ""
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2160
 msgid "FOR LOCAL FILES ONLY"
 msgstr ""
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2162
 msgid "ALWAYS ON"
 msgstr ""
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2174
 msgid "Numbers act as arrows"
 msgstr ""
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Links and form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2182
 msgid "Form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2189
+#: src/LYOptions.c:2192
 msgid "Case insensitive"
 msgstr ""
 
-#: src/LYOptions.c:2190
+#: src/LYOptions.c:2193
 msgid "Case sensitive"
 msgstr ""
 
-#: src/LYOptions.c:2214
+#: src/LYOptions.c:2217
 msgid "prompt normally"
 msgstr ""
 
-#: src/LYOptions.c:2215
+#: src/LYOptions.c:2218
 msgid "force yes-response"
 msgstr ""
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2219
 msgid "force no-response"
 msgstr ""
 
-#: src/LYOptions.c:2234
+#: src/LYOptions.c:2237
 #, fuzzy
 msgid "Novice"
 msgstr "醚"
 
-#: src/LYOptions.c:2235
+#: src/LYOptions.c:2238
 #, fuzzy
 msgid "Intermediate"
 msgstr "龕梊疻恄圴"
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2239
 msgid "Advanced"
 msgstr ""
 
-#: src/LYOptions.c:2245
+#: src/LYOptions.c:2248
 msgid "By First Visit"
 msgstr ""
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2250
 msgid "By First Visit Reversed"
 msgstr ""
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2251
 msgid "As Visit Tree"
 msgstr ""
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2252
 msgid "By Last Visit"
 msgstr ""
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2254
 msgid "By Last Visit Reversed"
 msgstr ""
 
 #. Old_DTD variable
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2265
 msgid "relaxed (TagSoup mode)"
 msgstr ""
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2266
 msgid "strict (SortaSGML mode)"
 msgstr ""
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2273
 msgid "as labels"
 msgstr ""
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2274
 #, fuzzy
 msgid "as links"
 msgstr "嗩 衶椗劼"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2281
 #, fuzzy
 msgid "show filename"
 msgstr " (恓覂眛狣 奼 そ帎)"
 
-#: src/LYOptions.c:2289
+#: src/LYOptions.c:2292
 msgid "STANDARD"
 msgstr ""
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2293
 msgid "ADVANCED"
 msgstr ""
 
-#: src/LYOptions.c:2316
+#: src/LYOptions.c:2319
 #, fuzzy
 msgid "Directories first"
 msgstr "蟴騰轂賻珌:"
 
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2320
 #, fuzzy
 msgid "Files first"
 msgstr " 蚔醣賻"
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2321
 #, fuzzy
 msgid "Mixed style"
 msgstr "鯥妀 疻鐘刱奿瓬蹉奷 衲眐"
 
-#: src/LYOptions.c:2326 src/LYOptions.c:2343
+#: src/LYOptions.c:2329 src/LYOptions.c:2346
 #, fuzzy
 msgid "By Name"
 msgstr "樿:"
 
-#: src/LYOptions.c:2327 src/LYOptions.c:2344
+#: src/LYOptions.c:2330 src/LYOptions.c:2347
 msgid "By Type"
 msgstr ""
 
-#: src/LYOptions.c:2328 src/LYOptions.c:2345
+#: src/LYOptions.c:2331 src/LYOptions.c:2348
 #, fuzzy
 msgid "By Size"
 msgstr "臗硰籤煻彸:"
 
-#: src/LYOptions.c:2329 src/LYOptions.c:2346
+#: src/LYOptions.c:2332 src/LYOptions.c:2349
 #, fuzzy
 msgid "By Date"
 msgstr "靾埡:"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2333
 msgid "By Mode"
 msgstr ""
 
-#: src/LYOptions.c:2332
+#: src/LYOptions.c:2335
 msgid "By User"
 msgstr ""
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 #, fuzzy
 msgid "By Group"
 msgstr "觰桸釓"
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2357
 msgid "Do not show rate"
 msgstr ""
 
-#: src/LYOptions.c:2355 src/LYOptions.c:2356
+#: src/LYOptions.c:2358 src/LYOptions.c:2359
 #, fuzzy, c-format
 msgid "Show %s/sec rate"
 msgstr "蟴佹稌袬婥 蚎玾珃婥 陓疻鐘瘃"
 
-#: src/LYOptions.c:2358 src/LYOptions.c:2359
+#: src/LYOptions.c:2361 src/LYOptions.c:2362
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr ""
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2374
 msgid "Accept lynx's internal types"
 msgstr ""
 
-#: src/LYOptions.c:2372
+#: src/LYOptions.c:2375
 msgid "Also accept lynx.cfg's types"
 msgstr ""
 
-#: src/LYOptions.c:2373
+#: src/LYOptions.c:2376
 msgid "Also accept user's types"
 msgstr ""
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "Also accept system's types"
 msgstr ""
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 #, fuzzy
 msgid "Accept all types"
 msgstr "襓妅晟 巟芶恓恌"
 
-#: src/LYOptions.c:2384
+#: src/LYOptions.c:2387
 msgid "gzip"
 msgstr ""
 
-#: src/LYOptions.c:2385
+#: src/LYOptions.c:2388
 msgid "deflate"
 msgstr ""
 
-#: src/LYOptions.c:2388
+#: src/LYOptions.c:2391
 msgid "compress"
 msgstr ""
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2394
 msgid "bzip2"
 msgstr ""
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2396
 msgid "All"
 msgstr ""
 
-#: src/LYOptions.c:2658 src/LYOptions.c:2682
+#: src/LYOptions.c:2664 src/LYOptions.c:2688
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "橔俵杻祰彸 %s 騷 趿硨袬 芶怹 蟥畛芶婞瓬!"
 
-#: src/LYOptions.c:3429
+#: src/LYOptions.c:3438
 msgid "(options marked with (!) will not be saved)"
 msgstr "(釓畛芶婞, 珆芶畷恄棸 (!) 衃畛恓挃 恓 謬齣)"
 
-#: src/LYOptions.c:3437
+#: src/LYOptions.c:3446
 msgid "General Preferences"
 msgstr "屩楦 襓鼴俵痽曬奷"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3450
 msgid "User mode"
 msgstr "艣窔 俵杻硨袬埧曶"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3447
+#: src/LYOptions.c:3456
 msgid "Editor"
 msgstr "艣鐘刱玾"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3461
 msgid "Type of Search"
 msgstr "蠖 俵孖佹"
 
-#: src/LYOptions.c:3457
+#: src/LYOptions.c:3466
 msgid "Security and Privacy"
 msgstr ""
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3461
+#: src/LYOptions.c:3470
 msgid "Cookies"
 msgstr "Cookie"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3475
+#: src/LYOptions.c:3484
 msgid "Invalid-Cookie Prompting"
 msgstr ""
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3482
+#: src/LYOptions.c:3491
 msgid "SSL Prompting"
 msgstr ""
 
-#: src/LYOptions.c:3488
+#: src/LYOptions.c:3497
 msgid "Keyboard Input"
 msgstr "蠯狦  佮避匢婭砣"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3492
+#: src/LYOptions.c:3501
 msgid "Keypad mode"
 msgstr "艣窔 鰍俵旽尕攫媓珅 佮避匢婭砣"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3498
+#: src/LYOptions.c:3507
 msgid "Emacs keys"
 msgstr "輲避幵 Emacs"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3513
 msgid "VI keys"
 msgstr "輲避幵 VI"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3511
+#: src/LYOptions.c:3520
 msgid "Line edit style"
 msgstr "鯥妀 疻鐘刱奿瓬蹉奷 衲眐"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3532
 msgid "Keyboard layout"
 msgstr "臗蚎攽騰 佮避匢婭砣"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3537
+#: src/LYOptions.c:3546
 msgid "Display and Character Set"
 msgstr "擸狟畛秸恌  轀蟠 鯠邰玶瓬"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3542
+#: src/LYOptions.c:3551
 #, fuzzy
 msgid "Use locale-based character set"
 msgstr "蟴黨邁梠纔豁芩 冾馨眐訬 鰍劼芶拏"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3551
+#: src/LYOptions.c:3560
 msgid "Display character set"
 msgstr "輴馨眐訬 珆狟畛秸恌"
 
-#: src/LYOptions.c:3582
+#: src/LYOptions.c:3591
 msgid "Assumed document character set"
 msgstr "蟴黨邁梠纔豁芩 冾馨眐訬 鰍劼芶拏"
 
@@ -4814,173 +4814,176 @@ msgstr "蟴黨邁梠纔豁芩 冾馨眐訬 鰍劼芶拏"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3602
+#: src/LYOptions.c:3611
 msgid "CJK mode"
 msgstr "艣窔 CJK"
 
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3613
 msgid "Raw 8-bit"
 msgstr "醚狟畛蟠埡恄椋 8-薺婠椋 疻窔"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3612
+#: src/LYOptions.c:3621
 msgid "X Display"
 msgstr "刳蹉 X"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3618
+#: src/LYOptions.c:3627
 msgid "Document Appearance"
 msgstr "龕蠱恌 訰 鰍劼芶拏"
 
-#: src/LYOptions.c:3624
+#: src/LYOptions.c:3633
 msgid "Show color"
 msgstr "蟴佹稌袬婥 譙籥"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3648
+#: src/LYOptions.c:3657
 msgid "Show cursor"
 msgstr "蟴佹稌袬婥 劼眑玾"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3663
 #, fuzzy
 msgid "Underline links"
 msgstr "鯤砣婬 衶椗玹:"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3670
 msgid "Show scrollbar"
 msgstr "蟴佹稌袬婥 俵昑袀 倷玹眙堍"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3668
+#: src/LYOptions.c:3677
 msgid "Popups for select fields"
 msgstr "壧倢椕謊楦 芶怹 騷 趿觴蹉挃 俵旼"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3674
+#: src/LYOptions.c:3683
 msgid "HTML error recovery"
 msgstr "龢衶埡恘訞曬吇 珆 畈匟玹  HTML"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3680
+#: src/LYOptions.c:3689
 msgid "Show images"
 msgstr "蟴佹睋婥 巟狟畛秸恌"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3694
+#: src/LYOptions.c:3703
 msgid "Verbose images"
 msgstr "趨曬晟 巟狟畛秸恌 恔 謐疻蚆"
 
-#: src/LYOptions.c:3703
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3711
 msgid "Headers Transferred to Remote Servers"
 msgstr "豳玶瓬侂, 陓疻鐘恄棸 恔 桫賻曬挃 蚥眢籤"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3715
 msgid "Personal mail address"
 msgstr "蟔眑玴賻媓椋 俵痽瓬椋 謐疻"
 
 #. Mail Address: INPUT
-#: src/LYOptions.c:3712
+#: src/LYOptions.c:3720
 #, fuzzy
 msgid "Password for anonymous ftp"
 msgstr "蟥眐杻 騷 殑攽 恘豜衲戀 '%s':"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3717
+#: src/LYOptions.c:3725
 #, fuzzy
 msgid "Preferred media type"
 msgstr "蟔疻鐘恘 %d 臏彸"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3723
+#: src/LYOptions.c:3731
 #, fuzzy
 msgid "Preferred encoding"
 msgstr "襓鼴俵瘃埡攪椋 栚椊 鰍劼芶拏"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3729
+#: src/LYOptions.c:3737
 msgid "Preferred document character set"
 msgstr "襓鼴俵瘃埡攪蹊 冾馨眐訬 鰍劼芶拏"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3742
 msgid "Preferred document language"
 msgstr "襓鼴俵瘃埡攪椋 栚椊 鰍劼芶拏"
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3748
 msgid "User-Agent header"
 msgstr "豳玶瓬玹 User-Agent"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3748
+#: src/LYOptions.c:3756
 msgid "Listing and Accessing Files"
 msgstr "戁豜 衄孖佹 そ帎瓬  鰍衲桸  恌"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3752
+#: src/LYOptions.c:3760
 msgid "FTP sort criteria"
 msgstr "遻尕籤圴 衃眕奿瓬侂 FTP"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3759
+#: src/LYOptions.c:3767
 msgid "Local directory sort criteria"
 msgstr "遻尕籤圴 衃眕奿瓬侂 昑佹杻恘ж 佹埡昑Щ"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3773
 msgid "Local directory sort order"
 msgstr "遻尕籤圴 衃眕奿瓬侂 昑佹杻恘ж 佹埡昑Щ"
 
-#: src/LYOptions.c:3774
+#: src/LYOptions.c:3782
 msgid "Show dot files"
 msgstr "蟴佹稌袬婥 dot-そ帎"
 
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3790
 msgid "Execution links"
 msgstr "戁俵旽曬吇 衶椗玹"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3810
 msgid "Show transfer rate"
 msgstr "蟴佹稌袬婥 蚎玾珃婥 陓疻鐘瘃"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3830
 msgid "Special Files and Screens"
 msgstr "鯗鷗匢杻挃 そ帎  嗛畛挃"
 
-#: src/LYOptions.c:3827
+#: src/LYOptions.c:3835
 msgid "Multi-bookmarks"
 msgstr "簊珋籣婟曬挃 睋佮謐侂"
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3843
 msgid "Review/edit Bookmarks files"
 msgstr "襓珃迍婞籥/珆疻鐘刱奿瓬轂 そ帎 睋佮謐玹"
 
-#: src/LYOptions.c:3837
+#: src/LYOptions.c:3845
 msgid "Goto multi-bookmark menu"
 msgstr "蟔疻狦  芶怹 迓珋籣婟曬挃 睋佮謐玹"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3847
 msgid "Bookmarks file"
 msgstr "碻帎 睋佮謐玹"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3845
+#: src/LYOptions.c:3853
 msgid "Visited Pages"
 msgstr "蟴蚥暙恄棸 衲畛恌贊"
 
-#: src/LYOptions.c:3850
+#: src/LYOptions.c:3858
 msgid "View the file "
 msgstr "襓珃迍婞籥 そ帎"
 
@@ -5100,38 +5103,38 @@ msgstr "Lynx: 畈匟佹 衲轄埡, そ帎  倷避妀趨 CERN %s 恓 鰍衲桸曬\n"
 msgid "(no name)"
 msgstr "(恓 奼曬)"
 
-#: src/LYReadCFG.c:1782
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "瑳杻袹 畷 %d 訞珋曬挃 訬抸畷恌 lynx.cfg -- 豜硰珋恘 蟹佮?!?\n"
 
-#: src/LYReadCFG.c:1784
+#: src/LYReadCFG.c:1786
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "蟴蚝鼴恮 俵倧堍 訬抸畷恌 蹙攽 '%s',\n"
 
-#: src/LYReadCFG.c:1785
+#: src/LYReadCFG.c:1787
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "訬抸畷恘 巟 '%s'.\n"
 
-#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263
+#: src/LYReadCFG.c:2194 src/LYReadCFG.c:2207 src/LYReadCFG.c:2265
 msgid "The following is read from your lynx.cfg file."
 msgstr "鯦鼴梏暙 瘃埡籥衭 巟 袬袹ж そ帎 lynx.cfg."
 
-#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206
+#: src/LYReadCFG.c:2195 src/LYReadCFG.c:2208
 msgid "Please read the distribution"
 msgstr "蟴祫枎弝埡, 倷癹尕購埧 孖狦挃"
 
-#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209
+#: src/LYReadCFG.c:2201 src/LYReadCFG.c:2211
 msgid "for more comments."
 msgstr "騷 俵枎畷恌 鰍俵旽尕攫媓棼 冾迋曬埡疶纔."
 
-#: src/LYReadCFG.c:2245
+#: src/LYReadCFG.c:2247
 msgid "RELOAD THE CHANGES"
 msgstr "檺闀玃鐖 澬翴鍷鍣"
 
-#: src/LYReadCFG.c:2253
+#: src/LYReadCFG.c:2255
 msgid "Your primary configuration"
 msgstr "鷙衖 珃恘谻蹊 冾恇囟梑謄奷"
 
@@ -5405,33 +5408,33 @@ msgstr "豳眙硭婥 :"
 msgid "Upload options:"
 msgstr "懩蟹 睋й殑侂:"
 
-#: src/LYUtils.c:1716
+#: src/LYUtils.c:1777
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2493
+#: src/LYUtils.c:2554
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "醚珋厊蹉挃 倷珆玹玶 鰍衲桸 騷 嗩珅 蚧攪 URL."
 
-#: src/LYUtils.c:3301
+#: src/LYUtils.c:3362
 msgid "Too many tempfiles"
 msgstr "鯦幵冾 迓珌 貥攪曬挃 そ帎瓬"
 
-#: src/LYUtils.c:3605
+#: src/LYUtils.c:3666
 msgid "unknown restriction"
 msgstr "恓巟覂衲恘 珌畛恌畷恌"
 
-#: src/LYUtils.c:3635
+#: src/LYUtils.c:3696
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "懘畛恌畷恌 恓 梌埡恘訞曬.\n"
 
-#: src/LYUtils.c:3638
+#: src/LYUtils.c:3699
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "灃埡恘訞曬挃 珌畛恌畷恌:\n"
 
-#: src/LYUtils.c:5022
+#: src/LYUtils.c:5077
 msgid "Cannot find HOME directory"
 msgstr "餀芩褁圴 佹埡昑 恓 恔岉曬"
 
diff --git a/po/rw.po b/po/rw.po
index 5d66f311..6000837e 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.5pre9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-30 18:03-0400\n"
+"POT-Creation-Date: 2005-10-16 19:03-0400\n"
 "PO-Revision-Date: 2005-04-04 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -2661,7 +2661,7 @@ msgstr "(Izina:"
 msgid "(No value.)"
 msgstr "(Agaciro"
 
-#: LYMessages.c:713 src/LYOptions.c:2382
+#: LYMessages.c:713 src/LYOptions.c:2385
 msgid "None"
 msgstr "Ntacyo"
 
@@ -3299,7 +3299,7 @@ msgstr "Na: Ibikubiyemo OYA Byabonetse in Ubwihisho"
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8508
+#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8515
 msgid "Loading incomplete."
 msgstr ""
 
@@ -3429,19 +3429,19 @@ msgstr "kugirango Amakuru Ubuturo"
 msgid "Change password?"
 msgstr "Guhindura Ijambobanga"
 
-#: WWW/Library/Implementation/HTNews.c:1736
+#: WWW/Library/Implementation/HTNews.c:1706
 #, fuzzy, c-format
 msgid "No matches for: %s"
 msgstr "kugirango"
 
-#: WWW/Library/Implementation/HTNews.c:1789
+#: WWW/Library/Implementation/HTNews.c:1756
 #, fuzzy
 msgid ""
 "\n"
 "No articles in this group.\n"
 msgstr "in iyi Itsinda"
 
-#: WWW/Library/Implementation/HTNews.c:1801
+#: WWW/Library/Implementation/HTNews.c:1768
 #, fuzzy
 msgid ""
 "\n"
@@ -3451,16 +3451,16 @@ msgstr "in iyi Urutonde"
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1814
+#: WWW/Library/Implementation/HTNews.c:1781
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1837
+#: WWW/Library/Implementation/HTNews.c:1804
 msgid "Earlier articles"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1850
+#: WWW/Library/Implementation/HTNews.c:1817
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3468,46 +3468,46 @@ msgid ""
 "\n"
 msgstr "Ibyerekeye Bihari in Nka"
 
-#: WWW/Library/Implementation/HTNews.c:1912
+#: WWW/Library/Implementation/HTNews.c:1879
 #, fuzzy
 msgid "All available articles in "
 msgstr "Bihari in"
 
-#: WWW/Library/Implementation/HTNews.c:2133
+#: WWW/Library/Implementation/HTNews.c:2093
 msgid "Later articles"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2156
+#: WWW/Library/Implementation/HTNews.c:2116
 #, fuzzy
 msgid "Post to "
 msgstr "Kuri"
 
-#: WWW/Library/Implementation/HTNews.c:2377
+#: WWW/Library/Implementation/HTNews.c:2337
 #, fuzzy
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Umukiriya OYA Gushigikira kugirango"
 
-#: WWW/Library/Implementation/HTNews.c:2585
+#: WWW/Library/Implementation/HTNews.c:2545
 #, fuzzy
 msgid "No target for raw text!"
 msgstr "Intego kugirango Umwandiko"
 
-#: WWW/Library/Implementation/HTNews.c:2616
+#: WWW/Library/Implementation/HTNews.c:2576
 #, fuzzy
 msgid "Connecting to NewsHost ..."
 msgstr "Kuri"
 
-#: WWW/Library/Implementation/HTNews.c:2668
+#: WWW/Library/Implementation/HTNews.c:2628
 #, fuzzy, c-format
 msgid "Could not access %s."
 msgstr "OYA"
 
-#: WWW/Library/Implementation/HTNews.c:2774
+#: WWW/Library/Implementation/HTNews.c:2734
 #, fuzzy, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "Gusoma Amakuru Ibisobanuro Ubuturo"
 
-#: WWW/Library/Implementation/HTNews.c:2778
+#: WWW/Library/Implementation/HTNews.c:2738
 #, fuzzy, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Gusoma Amakuru Ibisobanuro ubusa Bivuye Ubuturo"
@@ -3515,12 +3515,12 @@ msgstr "Gusoma Amakuru Ibisobanuro ubusa Bivuye Ubuturo"
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2982
+#: WWW/Library/Implementation/HTNews.c:2942
 #, fuzzy
 msgid "Reading list of available newsgroups."
 msgstr "Urutonde Bya Bihari Imbuga z'amakuru"
 
-#: WWW/Library/Implementation/HTNews.c:3003
+#: WWW/Library/Implementation/HTNews.c:2963
 #, fuzzy
 msgid "Reading list of articles in newsgroup."
 msgstr "Urutonde Bya in Urubuga rw'amakuru"
@@ -3528,12 +3528,12 @@ msgstr "Urutonde Bya in Urubuga rw'amakuru"
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:3009
+#: WWW/Library/Implementation/HTNews.c:2969
 #, fuzzy
 msgid "Reading news article."
 msgstr "Amakuru Ingingo"
 
-#: WWW/Library/Implementation/HTNews.c:3039
+#: WWW/Library/Implementation/HTNews.c:2999
 #, fuzzy
 msgid "Sorry, could not load requested news."
 msgstr "OYA Ibirimo Amakuru"
@@ -3543,12 +3543,12 @@ msgstr "OYA Ibirimo Amakuru"
 msgid "Address has invalid port"
 msgstr "Sibyo Umuyoboro"
 
-#: WWW/Library/Implementation/HTTCP.c:1320
+#: WWW/Library/Implementation/HTTCP.c:1308
 #, fuzzy
 msgid "Address length looks invalid"
 msgstr "Uburebure Sibyo"
 
-#: WWW/Library/Implementation/HTTCP.c:1552 WWW/Library/Implementation/HTTCP.c:1570
+#: WWW/Library/Implementation/HTTCP.c:1539 WWW/Library/Implementation/HTTCP.c:1557
 #, fuzzy, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Kuri Ubuturo"
@@ -3557,42 +3557,42 @@ msgstr "Kuri Ubuturo"
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1567 WWW/Library/Implementation/HTTelnet.c:108
+#: WWW/Library/Implementation/HTTCP.c:1554 WWW/Library/Implementation/HTTelnet.c:108
 #, fuzzy, c-format
 msgid "Invalid hostname %s"
 msgstr "Izina ry'inturo:"
 
-#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1568
 #, fuzzy, c-format
 msgid "Making %s connection to %s"
 msgstr "Ukwihuza Kuri"
 
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1579
 #, fuzzy
 msgid "socket failed."
 msgstr "Byanze"
 
-#: WWW/Library/Implementation/HTTCP.c:1605
+#: WWW/Library/Implementation/HTTCP.c:1592
 #, fuzzy, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "Byanze Aderesi Umuyoboro"
 
-#: WWW/Library/Implementation/HTTCP.c:1629
+#: WWW/Library/Implementation/HTTCP.c:1616
 #, fuzzy
 msgid "Could not make connection non-blocking."
 msgstr "OYA Ubwoko Ukwihuza"
 
-#: WWW/Library/Implementation/HTTCP.c:1697
+#: WWW/Library/Implementation/HTTCP.c:1684
 #, fuzzy
 msgid "Connection failed (too many retries)."
 msgstr "Byanze"
 
-#: WWW/Library/Implementation/HTTCP.c:1896
+#: WWW/Library/Implementation/HTTCP.c:1883
 #, fuzzy
 msgid "Could not restore socket to blocking."
 msgstr "OYA Kugarura Kuri"
 
-#: WWW/Library/Implementation/HTTCP.c:1962
+#: WWW/Library/Implementation/HTTCP.c:1949
 #, fuzzy
 msgid "Socket read failed for 180,000 tries."
 msgstr "Gusoma Byanze kugirango 000"
@@ -3932,117 +3932,117 @@ msgstr "Kugaragaza"
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Hagarikira aho"
 
-#: src/GridText.c:3594
+#: src/GridText.c:3601
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr ""
 
-#: src/GridText.c:6013 src/GridText.c:6020 src/LYList.c:248
+#: src/GridText.c:6020 src/GridText.c:6027 src/LYList.c:248
 #, fuzzy
 msgid "unknown field or link"
 msgstr "Kitazwi Umwanya Cyangwa Ihuza"
 
-#: src/GridText.c:6029
+#: src/GridText.c:6036
 #, fuzzy
 msgid "text entry field"
 msgstr "Umwandiko Icyinjijwe Umwanya"
 
-#: src/GridText.c:6032
+#: src/GridText.c:6039
 #, fuzzy
 msgid "password entry field"
 msgstr "Ijambobanga... Icyinjijwe Umwanya"
 
-#: src/GridText.c:6035
+#: src/GridText.c:6042
 msgid "checkbox"
 msgstr ""
 
 # svx/source\form\fmexpl.src:RID_FMSHELL_CONVERSIONMENU.SID_FM_CONVERTTO_RADIOBUTTON.text
-#: src/GridText.c:6038
+#: src/GridText.c:6045
 #, fuzzy
 msgid "radio button"
 msgstr "Buto Radiyo"
 
-#: src/GridText.c:6041
+#: src/GridText.c:6048
 #, fuzzy
 msgid "submit button"
 msgstr "akabuto ko gutanga"
 
-#: src/GridText.c:6044
+#: src/GridText.c:6051
 #, fuzzy
 msgid "reset button"
 msgstr "akabuto ko gutangira bushya"
 
-#: src/GridText.c:6047
+#: src/GridText.c:6054
 #, fuzzy
 msgid "popup menu"
 msgstr "Ibikubiyemo"
 
-#: src/GridText.c:6050
+#: src/GridText.c:6057
 #, fuzzy
 msgid "hidden form field"
 msgstr "gihishwe Ifishi Umwanya"
 
-#: src/GridText.c:6053
+#: src/GridText.c:6060
 #, fuzzy
 msgid "text entry area"
 msgstr "Umwandiko Icyinjijwe Ubuso"
 
-#: src/GridText.c:6056
+#: src/GridText.c:6063
 #, fuzzy
 msgid "range entry field"
 msgstr "Urutonde Icyinjijwe Umwanya"
 
-#: src/GridText.c:6059
+#: src/GridText.c:6066
 #, fuzzy
 msgid "file entry field"
 msgstr "IDOSIYE Icyinjijwe Umwanya"
 
-#: src/GridText.c:6062
+#: src/GridText.c:6069
 #, fuzzy
 msgid "text-submit field"
 msgstr "Umwandiko Tanga Umwanya"
 
-#: src/GridText.c:6065
+#: src/GridText.c:6072
 #, fuzzy
 msgid "image-submit button"
 msgstr "Ishusho Tanga Akabuto"
 
-#: src/GridText.c:6068
+#: src/GridText.c:6075
 #, fuzzy
 msgid "keygen field"
 msgstr "Umwanya"
 
-#: src/GridText.c:6071
+#: src/GridText.c:6078
 #, fuzzy
 msgid "unknown form field"
 msgstr "Kitazwi Ifishi Umwanya"
 
-#: src/GridText.c:10231
+#: src/GridText.c:10244
 #, fuzzy
 msgid "Can't open file for uploading"
 msgstr "Gufungura IDOSIYE kugirango"
 
-#: src/GridText.c:11384
+#: src/GridText.c:11397
 #, c-format
 msgid "Submitting %s"
 msgstr ""
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12533
+#: src/GridText.c:12546
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12738
+#: src/GridText.c:12751
 #, fuzzy
 msgid "Wrap lines to fit displayed area?"
 msgstr "Imirongo Kuri Ubuso"
 
-#: src/GridText.c:12790
+#: src/GridText.c:12803
 #, fuzzy
 msgid "Very long lines have been wrapped!"
 msgstr "Imirongo"
 
-#: src/GridText.c:13232
+#: src/GridText.c:13245
 #, fuzzy
 msgid "Very long lines have been truncated!"
 msgstr "Imirongo"
@@ -4154,17 +4154,17 @@ msgstr ""
 msgid "(unknown)"
 msgstr "(Itazwi>"
 
-#: src/HTML.c:7374
+#: src/HTML.c:7375
 #, fuzzy
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "gihishwe amahuza i Komandi:"
 
-#: src/HTML.c:7873
+#: src/HTML.c:7874
 #, fuzzy
 msgid "Source cache error - disk full?"
 msgstr "Ubwihisho Ikosa"
 
-#: src/HTML.c:7886
+#: src/HTML.c:7887
 #, fuzzy
 msgid "Source cache error - not enough memory!"
 msgstr "Ubwihisho Ikosa OYA Ububiko"
@@ -4268,42 +4268,42 @@ msgstr "By'imbere"
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "Ikosa Porogaramu"
 
-#: src/LYCurses.c:1017
+#: src/LYCurses.c:1034
 #, fuzzy
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Byanze Kitazwi Ubwoko"
 
-#: src/LYCurses.c:1442
+#: src/LYCurses.c:1459
 msgid "Terminal ="
 msgstr ""
 
-#: src/LYCurses.c:1446
+#: src/LYCurses.c:1463
 #, fuzzy
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Gukoresha a 200 Na: iyi Porogaramu"
 
-#: src/LYCurses.c:1495
+#: src/LYCurses.c:1512
 #, fuzzy
 msgid "Your Terminal type is unknown!"
 msgstr "Ubwoko ni Kitazwi"
 
-#: src/LYCurses.c:1496
+#: src/LYCurses.c:1513
 #, fuzzy
 msgid "Enter a terminal type:"
 msgstr "a Ubwoko"
 
-#: src/LYCurses.c:1510
+#: src/LYCurses.c:1527
 msgid "TERMINAL TYPE IS SET TO"
 msgstr ""
 
-#: src/LYCurses.c:2007
+#: src/LYCurses.c:2031
 #, fuzzy, c-format
 msgid ""
 "\n"
 "A Fatal error has occurred in %s Ver. %s\n"
 msgstr "A Ikosa in"
 
-#: src/LYCurses.c:2010
+#: src/LYCurses.c:2034
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4903,57 +4903,57 @@ msgid ""
 "\n"
 msgstr "IDOSIYE ni OYA Bihari"
 
-#: src/LYMain.c:1763
+#: src/LYMain.c:1750
 msgid "Warning:"
 msgstr "Iburira:"
 
-#: src/LYMain.c:2328
+#: src/LYMain.c:2315
 #, fuzzy
 msgid "persistent cookies state will be changed in next session only."
 msgstr "Inyandikonyakwirema Leta Byahinduwe in Komeza>> Umukoro"
 
-#: src/LYMain.c:2565 src/LYMain.c:2610
+#: src/LYMain.c:2552 src/LYMain.c:2597
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr ""
 
 # goodies/source\filter.vcl\eps\dlgeps.src:DLG_EXPORT_EPS.GRP_VERSION.text
-#: src/LYMain.c:3121
+#: src/LYMain.c:3108
 #, fuzzy, c-format
 msgid "%s Version %s (%s)"
 msgstr "Verisiyo"
 
-#: src/LYMain.c:3156
+#: src/LYMain.c:3143
 #, fuzzy, c-format
 msgid "Built on %s %s %s\n"
 msgstr "ku"
 
-#: src/LYMain.c:3178
+#: src/LYMain.c:3165
 #, fuzzy
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors."
 msgstr "ku i Bya Na Ikindi Abaterankunga"
 
-#: src/LYMain.c:3179
+#: src/LYMain.c:3166
 #, fuzzy
 msgid "Distributed under the GNU General Public License."
 msgstr "i"
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3167
 #, fuzzy
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Mucukumbuzi."
 
-#: src/LYMain.c:3952
+#: src/LYMain.c:3939
 #, fuzzy, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "Amahitamo IDOSIYE"
 
-#: src/LYMain.c:3953
+#: src/LYMain.c:3940
 #, c-format
 msgid "Options are:\n"
 msgstr ""
 
-#: src/LYMain.c:4252
+#: src/LYMain.c:4239
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr ""
@@ -5037,7 +5037,7 @@ msgstr ""
 msgid "Current URL is empty."
 msgstr "bushyinguro"
 
-#: src/LYMainLoop.c:6935 src/LYUtils.c:1714
+#: src/LYMainLoop.c:6935 src/LYUtils.c:1775
 msgid "Copy to clipboard failed."
 msgstr ""
 
@@ -5130,344 +5130,344 @@ msgstr "Injiza Ubutumwa munsi"
 msgid "Message has no original text!"
 msgstr "Oya Umwimerere Umwandiko"
 
-#: src/LYOptions.c:758
+#: src/LYOptions.c:761
 #, fuzzy
 msgid "review/edit B)ookmarks files"
 msgstr "Isubiramo Guhindura Idosiye"
 
-#: src/LYOptions.c:760
+#: src/LYOptions.c:763
 #, fuzzy
 msgid "B)ookmark file: "
 msgstr "IDOSIYE"
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2126 src/LYOptions.c:2133
 msgid "ON"
 msgstr ""
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2277 src/LYOptions.c:2288
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280 src/LYOptions.c:2291
 msgid "OFF"
 msgstr ""
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2128
 msgid "NEVER"
 msgstr ""
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2129
 msgid "ALWAYS"
 msgstr ""
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2269
+#: src/LYOptions.c:2145 src/LYOptions.c:2272
 msgid "ignore"
 msgstr ""
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2146
 msgid "ask user"
 msgstr ""
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2147
 msgid "accept all"
 msgstr ""
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS OFF"
 msgstr ""
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2160
 msgid "FOR LOCAL FILES ONLY"
 msgstr ""
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2162
 msgid "ALWAYS ON"
 msgstr ""
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2174
 msgid "Numbers act as arrows"
 msgstr ""
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Links and form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2182
 msgid "Form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2189
+#: src/LYOptions.c:2192
 msgid "Case insensitive"
 msgstr ""
 
-#: src/LYOptions.c:2190
+#: src/LYOptions.c:2193
 msgid "Case sensitive"
 msgstr ""
 
-#: src/LYOptions.c:2214
+#: src/LYOptions.c:2217
 msgid "prompt normally"
 msgstr ""
 
-#: src/LYOptions.c:2215
+#: src/LYOptions.c:2218
 msgid "force yes-response"
 msgstr ""
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2219
 msgid "force no-response"
 msgstr ""
 
-#: src/LYOptions.c:2234
+#: src/LYOptions.c:2237
 #, fuzzy
 msgid "Novice"
 msgstr "Ntacyo"
 
-#: src/LYOptions.c:2235
+#: src/LYOptions.c:2238
 #, fuzzy
 msgid "Intermediate"
 msgstr "By'imbere"
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2239
 msgid "Advanced"
 msgstr ""
 
-#: src/LYOptions.c:2245
+#: src/LYOptions.c:2248
 msgid "By First Visit"
 msgstr ""
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2250
 msgid "By First Visit Reversed"
 msgstr ""
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2251
 msgid "As Visit Tree"
 msgstr ""
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2252
 msgid "By Last Visit"
 msgstr ""
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2254
 msgid "By Last Visit Reversed"
 msgstr ""
 
 #. Old_DTD variable
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2265
 msgid "relaxed (TagSoup mode)"
 msgstr ""
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2266
 msgid "strict (SortaSGML mode)"
 msgstr ""
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2273
 msgid "as labels"
 msgstr ""
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2274
 #, fuzzy
 msgid "as links"
 msgstr "iyi Ihuza"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2281
 #, fuzzy
 msgid "show filename"
 msgstr "(IDOSIYE Izina:"
 
-#: src/LYOptions.c:2289
+#: src/LYOptions.c:2292
 msgid "STANDARD"
 msgstr ""
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2293
 msgid "ADVANCED"
 msgstr ""
 
 # svx/source\gallery2\gallery.src:RID_SVXDLG_GALLERY_CBX.text
-#: src/LYOptions.c:2316
+#: src/LYOptions.c:2319
 #, fuzzy
 msgid "Directories first"
 msgstr "Ububiko bwungirije"
 
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2320
 #, fuzzy
 msgid "Files first"
 msgstr "Itangira"
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2321
 #, fuzzy
 msgid "Mixed style"
 msgstr "Guhindura IMISUSIRE"
 
-#: src/LYOptions.c:2326 src/LYOptions.c:2343
+#: src/LYOptions.c:2329 src/LYOptions.c:2346
 #, fuzzy
 msgid "By Name"
 msgstr "Izina:"
 
-#: src/LYOptions.c:2327 src/LYOptions.c:2344
+#: src/LYOptions.c:2330 src/LYOptions.c:2347
 msgid "By Type"
 msgstr ""
 
-#: src/LYOptions.c:2328 src/LYOptions.c:2345
+#: src/LYOptions.c:2331 src/LYOptions.c:2348
 msgid "By Size"
 msgstr ""
 
-#: src/LYOptions.c:2329 src/LYOptions.c:2346
+#: src/LYOptions.c:2332 src/LYOptions.c:2349
 #, fuzzy
 msgid "By Date"
 msgstr "Itariki:"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2333
 msgid "By Mode"
 msgstr ""
 
-#: src/LYOptions.c:2332
+#: src/LYOptions.c:2335
 msgid "By User"
 msgstr ""
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 #, fuzzy
 msgid "By Group"
 msgstr "Itsinda"
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2357
 msgid "Do not show rate"
 msgstr ""
 
-#: src/LYOptions.c:2355 src/LYOptions.c:2356
+#: src/LYOptions.c:2358 src/LYOptions.c:2359
 #, fuzzy, c-format
 msgid "Show %s/sec rate"
 msgstr "Igipimo"
 
-#: src/LYOptions.c:2358 src/LYOptions.c:2359
+#: src/LYOptions.c:2361 src/LYOptions.c:2362
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr ""
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2374
 msgid "Accept lynx's internal types"
 msgstr ""
 
-#: src/LYOptions.c:2372
+#: src/LYOptions.c:2375
 msgid "Also accept lynx.cfg's types"
 msgstr ""
 
-#: src/LYOptions.c:2373
+#: src/LYOptions.c:2376
 msgid "Also accept user's types"
 msgstr ""
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "Also accept system's types"
 msgstr ""
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 #, fuzzy
 msgid "Accept all types"
 msgstr "emera ibihindutse/ibyahindutse"
 
-#: src/LYOptions.c:2384
+#: src/LYOptions.c:2387
 msgid "gzip"
 msgstr ""
 
-#: src/LYOptions.c:2385
+#: src/LYOptions.c:2388
 msgid "deflate"
 msgstr ""
 
-#: src/LYOptions.c:2388
+#: src/LYOptions.c:2391
 msgid "compress"
 msgstr ""
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2394
 msgid "bzip2"
 msgstr ""
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2396
 msgid "All"
 msgstr ""
 
-#: src/LYOptions.c:2658 src/LYOptions.c:2682
+#: src/LYOptions.c:2664 src/LYOptions.c:2688
 #, fuzzy, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Kuri i Ibikubiyemo"
 
-#: src/LYOptions.c:3429
+#: src/LYOptions.c:3438
 #, fuzzy
 msgid "(options marked with (!) will not be saved)"
 msgstr "(Amahitamo cy/ byagarajwe Na: OYA"
 
-#: src/LYOptions.c:3437
+#: src/LYOptions.c:3446
 msgid "General Preferences"
 msgstr ""
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3450
 #, fuzzy
 msgid "User mode"
 msgstr "Ubwoko"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3447
+#: src/LYOptions.c:3456
 msgid "Editor"
 msgstr "umwanditsi"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3461
 #, fuzzy
 msgid "Type of Search"
 msgstr "Bya"
 
-#: src/LYOptions.c:3457
+#: src/LYOptions.c:3466
 msgid "Security and Privacy"
 msgstr ""
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3461
+#: src/LYOptions.c:3470
 msgid "Cookies"
 msgstr "Cookie"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3475
+#: src/LYOptions.c:3484
 msgid "Invalid-Cookie Prompting"
 msgstr ""
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3482
+#: src/LYOptions.c:3491
 msgid "SSL Prompting"
 msgstr ""
 
-#: src/LYOptions.c:3488
+#: src/LYOptions.c:3497
 msgid "Keyboard Input"
 msgstr ""
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3492
+#: src/LYOptions.c:3501
 #, fuzzy
 msgid "Keypad mode"
 msgstr "Ubwoko"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3498
+#: src/LYOptions.c:3507
 #, fuzzy
 msgid "Emacs keys"
 msgstr "Utubuto"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3513
 #, fuzzy
 msgid "VI keys"
 msgstr "Utubuto"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3511
+#: src/LYOptions.c:3520
 #, fuzzy
 msgid "Line edit style"
 msgstr "Guhindura IMISUSIRE"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3532
 #, fuzzy
 msgid "Keyboard layout"
 msgstr "Imigaragarire"
@@ -5475,24 +5475,24 @@ msgstr "Imigaragarire"
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3537
+#: src/LYOptions.c:3546
 #, fuzzy
 msgid "Display and Character Set"
 msgstr "Na"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3542
+#: src/LYOptions.c:3551
 #, fuzzy
 msgid "Use locale-based character set"
 msgstr "Inyandiko Inyuguti Gushyiraho"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3551
+#: src/LYOptions.c:3560
 #, fuzzy
 msgid "Display character set"
 msgstr "Inyuguti Gushyiraho"
 
-#: src/LYOptions.c:3582
+#: src/LYOptions.c:3591
 #, fuzzy
 msgid "Assumed document character set"
 msgstr "Inyandiko Inyuguti Gushyiraho"
@@ -5502,118 +5502,121 @@ msgstr "Inyandiko Inyuguti Gushyiraho"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3602
+#: src/LYOptions.c:3611
 #, fuzzy
 msgid "CJK mode"
 msgstr "Ubwoko"
 
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3613
 #, fuzzy
 msgid "Raw 8-bit"
 msgstr "8"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3612
+#: src/LYOptions.c:3621
 msgid "X Display"
 msgstr ""
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3618
+#: src/LYOptions.c:3627
 msgid "Document Appearance"
 msgstr ""
 
-#: src/LYOptions.c:3624
+#: src/LYOptions.c:3633
 #, fuzzy
 msgid "Show color"
 msgstr "Ibara"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3648
+#: src/LYOptions.c:3657
 #, fuzzy
 msgid "Show cursor"
 msgstr "indanga"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3663
 #, fuzzy
 msgid "Underline links"
 msgstr "amahuza"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3670
 #, fuzzy
 msgid "Show scrollbar"
 msgstr "Agafashsagenda"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3668
+#: src/LYOptions.c:3677
 #, fuzzy
 msgid "Popups for select fields"
 msgstr "kugirango Guhitamo Imyanya"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3674
+#: src/LYOptions.c:3683
 #, fuzzy
 msgid "HTML error recovery"
 msgstr "Ikosa"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3680
+#: src/LYOptions.c:3689
 #, fuzzy
 msgid "Show images"
 msgstr "Ishusho"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3694
+#: src/LYOptions.c:3703
 #, fuzzy
 msgid "Verbose images"
 msgstr "Ishusho"
 
-#: src/LYOptions.c:3703
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3711
 #, fuzzy
 msgid "Headers Transferred to Remote Servers"
 msgstr "Kuri"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3715
 #, fuzzy
 msgid "Personal mail address"
 msgstr "Ubutumwa Aderesi"
 
 #. Mail Address: INPUT
-#: src/LYOptions.c:3712
+#: src/LYOptions.c:3720
 #, fuzzy
 msgid "Password for anonymous ftp"
 msgstr "kugirango Amakuru Ubuturo"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3717
+#: src/LYOptions.c:3725
 #, fuzzy
 msgid "Preferred media type"
 msgstr "Bayite"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3723
+#: src/LYOptions.c:3731
 #, fuzzy
 msgid "Preferred encoding"
 msgstr "Inyandiko Ururimi"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3729
+#: src/LYOptions.c:3737
 #, fuzzy
 msgid "Preferred document character set"
 msgstr "Inyandiko Inyuguti Gushyiraho"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3742
 #, fuzzy
 msgid "Preferred document language"
 msgstr "Inyandiko Ururimi"
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3748
 #, fuzzy
 msgid "User-Agent header"
 msgstr "Umutwempangano"
@@ -5621,42 +5624,42 @@ msgstr "Umutwempangano"
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3748
+#: src/LYOptions.c:3756
 #, fuzzy
 msgid "Listing and Accessing Files"
 msgstr "Na"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3752
+#: src/LYOptions.c:3760
 #, fuzzy
 msgid "FTP sort criteria"
 msgstr "Ishungura Ibigenderwaho"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3759
+#: src/LYOptions.c:3767
 #, fuzzy
 msgid "Local directory sort criteria"
 msgstr "bushyinguro Ishungura Ibigenderwaho"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3773
 #, fuzzy
 msgid "Local directory sort order"
 msgstr "bushyinguro Ishungura Itondekanya"
 
-#: src/LYOptions.c:3774
+#: src/LYOptions.c:3782
 #, fuzzy
 msgid "Show dot files"
 msgstr "Akadomo Idosiye"
 
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3790
 #, fuzzy
 msgid "Execution links"
 msgstr "amahuza"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3810
 #, fuzzy
 msgid "Show transfer rate"
 msgstr "Igipimo"
@@ -5664,37 +5667,37 @@ msgstr "Igipimo"
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3830
 #, fuzzy
 msgid "Special Files and Screens"
 msgstr "Na"
 
-#: src/LYOptions.c:3827
+#: src/LYOptions.c:3835
 #, fuzzy
 msgid "Multi-bookmarks"
 msgstr "Ibirango"
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3843
 #, fuzzy
 msgid "Review/edit Bookmarks files"
 msgstr "Guhindura Idosiye"
 
-#: src/LYOptions.c:3837
+#: src/LYOptions.c:3845
 #, fuzzy
 msgid "Goto multi-bookmark menu"
 msgstr "Akamenyetso Ibikubiyemo"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3847
 #, fuzzy
 msgid "Bookmarks file"
 msgstr "IDOSIYE"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3845
+#: src/LYOptions.c:3853
 msgid "Visited Pages"
 msgstr ""
 
-#: src/LYOptions.c:3850
+#: src/LYOptions.c:3858
 #, fuzzy
 msgid "View the file "
 msgstr "i IDOSIYE"
@@ -5826,7 +5829,7 @@ msgstr "Gutangira IDOSIYE ni OYA"
 msgid "(no name)"
 msgstr "(Oya Izina:"
 
-#: src/LYReadCFG.c:1782
+#: src/LYReadCFG.c:1784
 #, fuzzy, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr ""
@@ -5839,36 +5842,36 @@ msgstr ""
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/LYReadCFG.c:1784
+#: src/LYReadCFG.c:1786
 #, fuzzy, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Gushyiramo"
 
-#: src/LYReadCFG.c:1785
+#: src/LYReadCFG.c:1787
 #, fuzzy, c-format
 msgid "included from '%s'.\n"
 msgstr "Bivuye"
 
-#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263
+#: src/LYReadCFG.c:2194 src/LYReadCFG.c:2207 src/LYReadCFG.c:2265
 #, fuzzy
 msgid "The following is read from your lynx.cfg file."
 msgstr "ni Gusoma Bivuye IDOSIYE"
 
-#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206
+#: src/LYReadCFG.c:2195 src/LYReadCFG.c:2208
 #, fuzzy
 msgid "Please read the distribution"
 msgstr "Gusoma i Ikwirakwiza..."
 
-#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209
+#: src/LYReadCFG.c:2201 src/LYReadCFG.c:2211
 #, fuzzy
 msgid "for more comments."
 msgstr "kugirango Birenzeho Ibisobanuro"
 
-#: src/LYReadCFG.c:2245
+#: src/LYReadCFG.c:2247
 msgid "RELOAD THE CHANGES"
 msgstr ""
 
-#: src/LYReadCFG.c:2253
+#: src/LYReadCFG.c:2255
 #, fuzzy
 msgid "Your primary configuration"
 msgstr "Iboneza"
@@ -6190,35 +6193,35 @@ msgstr ""
 msgid "Upload options:"
 msgstr "Amahitamo"
 
-#: src/LYUtils.c:1716
+#: src/LYUtils.c:1777
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2493
+#: src/LYUtils.c:2554
 #, fuzzy
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Porotokole kugirango iyi Igishusho"
 
-#: src/LYUtils.c:3301
+#: src/LYUtils.c:3362
 msgid "Too many tempfiles"
 msgstr ""
 
-#: src/LYUtils.c:3605
+#: src/LYUtils.c:3666
 #, fuzzy
 msgid "unknown restriction"
 msgstr "Kitazwi"
 
-#: src/LYUtils.c:3635
+#: src/LYUtils.c:3696
 #, fuzzy, c-format
 msgid "No restrictions set.\n"
 msgstr "Amabwiriza Gushyiraho"
 
-#: src/LYUtils.c:3638
+#: src/LYUtils.c:3699
 #, fuzzy, c-format
 msgid "Restrictions set:\n"
 msgstr "Gushyiraho"
 
-#: src/LYUtils.c:5022
+#: src/LYUtils.c:5077
 #, fuzzy
 msgid "Cannot find HOME directory"
 msgstr "Gushaka bushyinguro"
diff --git a/po/sl.po b/po/sl.po
index 0c7cf5bf..8b990f66 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,14 +1,14 @@
 # Slovenian translation of Lynx WWW browser.
 # Copyright (C) 1999 Free Software Foundation, Inc.
 # Roman Maurer <roman.maurer@hermes.si>, 1999.
-# @Id: sl.po 1.21 Thu, 02 Jun 2005 15:36:59 -0700 dickey @
+# @Id: sl.po 1.22 Sun, 16 Oct 2005 17:17:20 -0700 dickey @
 # @Source: po/sl.po @
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-30 18:03-0400\n"
+"POT-Creation-Date: 2005-10-16 19:03-0400\n"
 "PO-Revision-Date: 1999-12-29 12:30 +0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -2244,7 +2244,7 @@ msgstr "(Brez imena.)"
 msgid "(No value.)"
 msgstr "(Brez vrednosti.)"
 
-#: LYMessages.c:713 src/LYOptions.c:2382
+#: LYMessages.c:713 src/LYOptions.c:2385
 msgid "None"
 msgstr "Ni"
 
@@ -2788,7 +2788,7 @@ msgstr ""
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8508
+#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8515
 msgid "Loading incomplete."
 msgstr "Nalaganje nepopolno."
 
@@ -2903,12 +2903,12 @@ msgstr "Geslo za novi醀rski stre駐ik ,%s`:"
 msgid "Change password?"
 msgstr "Sprememba gesla?"
 
-#: WWW/Library/Implementation/HTNews.c:1736
+#: WWW/Library/Implementation/HTNews.c:1706
 #, c-format
 msgid "No matches for: %s"
 msgstr "Ni ujemanja za: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1789
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2916,7 +2916,7 @@ msgstr ""
 "\n"
 "V tem obsegu ni 鋩ankov.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1801
+#: WWW/Library/Implementation/HTNews.c:1768
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2925,16 +2925,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1814
+#: WWW/Library/Implementation/HTNews.c:1781
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  lanki %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1837
+#: WWW/Library/Implementation/HTNews.c:1804
 msgid "Earlier articles"
 msgstr "Prej雉ji 鋩anki"
 
-#: WWW/Library/Implementation/HTNews.c:1850
+#: WWW/Library/Implementation/HTNews.c:1817
 #, c-format
 msgid ""
 "\n"
@@ -2942,41 +2942,41 @@ msgid ""
 "\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1912
+#: WWW/Library/Implementation/HTNews.c:1879
 msgid "All available articles in "
 msgstr "Vsi dostopni 鋩anki v "
 
-#: WWW/Library/Implementation/HTNews.c:2133
+#: WWW/Library/Implementation/HTNews.c:2093
 msgid "Later articles"
 msgstr "Poznej隘 鋩anki"
 
-#: WWW/Library/Implementation/HTNews.c:2156
+#: WWW/Library/Implementation/HTNews.c:2116
 msgid "Post to "
 msgstr "Razpo雍jemo v "
 
-#: WWW/Library/Implementation/HTNews.c:2377
+#: WWW/Library/Implementation/HTNews.c:2337
 msgid "This client does not contain support for SNEWS URLs."
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2585
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2616
+#: WWW/Library/Implementation/HTNews.c:2576
 msgid "Connecting to NewsHost ..."
 msgstr "Povezujemo se z novi醀rskim stre駐ikom ..."
 
-#: WWW/Library/Implementation/HTNews.c:2668
+#: WWW/Library/Implementation/HTNews.c:2628
 #, c-format
 msgid "Could not access %s."
 msgstr "Ne moremo dostopati do %s."
 
-#: WWW/Library/Implementation/HTNews.c:2774
+#: WWW/Library/Implementation/HTNews.c:2734
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2778
+#: WWW/Library/Implementation/HTNews.c:2738
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr ""
@@ -2984,22 +2984,22 @@ msgstr ""
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2982
+#: WWW/Library/Implementation/HTNews.c:2942
 msgid "Reading list of available newsgroups."
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:3003
+#: WWW/Library/Implementation/HTNews.c:2963
 msgid "Reading list of articles in newsgroup."
 msgstr ""
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:3009
+#: WWW/Library/Implementation/HTNews.c:2969
 msgid "Reading news article."
 msgstr "Beremo novi醀rski 鋩anek."
 
-#: WWW/Library/Implementation/HTNews.c:3039
+#: WWW/Library/Implementation/HTNews.c:2999
 msgid "Sorry, could not load requested news."
 msgstr ""
 
@@ -3007,11 +3007,11 @@ msgstr ""
 msgid "Address has invalid port"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1320
+#: WWW/Library/Implementation/HTTCP.c:1308
 msgid "Address length looks invalid"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1552 WWW/Library/Implementation/HTTCP.c:1570
+#: WWW/Library/Implementation/HTTCP.c:1539 WWW/Library/Implementation/HTTCP.c:1557
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr ""
@@ -3020,38 +3020,38 @@ msgstr ""
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1567 WWW/Library/Implementation/HTTelnet.c:108
+#: WWW/Library/Implementation/HTTCP.c:1554 WWW/Library/Implementation/HTTelnet.c:108
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Neveljavno ime gostitelja %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1568
 #, c-format
 msgid "Making %s connection to %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1579
 msgid "socket failed."
 msgstr "vti鋝ici je spodletelo."
 
-#: WWW/Library/Implementation/HTTCP.c:1605
+#: WWW/Library/Implementation/HTTCP.c:1592
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1629
+#: WWW/Library/Implementation/HTTCP.c:1616
 msgid "Could not make connection non-blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1697
+#: WWW/Library/Implementation/HTTCP.c:1684
 msgid "Connection failed (too many retries)."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1896
+#: WWW/Library/Implementation/HTTCP.c:1883
 msgid "Could not restore socket to blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1962
+#: WWW/Library/Implementation/HTTCP.c:1949
 msgid "Socket read failed for 180,000 tries."
 msgstr ""
 
@@ -3351,99 +3351,99 @@ msgstr "Pomnilnik iz鋨pan, prikaz prekinjen!"
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Pomnilnik iz鋨pan, prekinili bomo prenos!"
 
-#: src/GridText.c:3594
+#: src/GridText.c:3601
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr "*** POMNILNIK IZRPAN ***"
 
-#: src/GridText.c:6013 src/GridText.c:6020 src/LYList.c:248
+#: src/GridText.c:6020 src/GridText.c:6027 src/LYList.c:248
 msgid "unknown field or link"
 msgstr "neznano polje ali povezava"
 
-#: src/GridText.c:6029
+#: src/GridText.c:6036
 msgid "text entry field"
 msgstr "tekstovno vnosno polje"
 
-#: src/GridText.c:6032
+#: src/GridText.c:6039
 msgid "password entry field"
 msgstr "vnosno polje za geslo"
 
-#: src/GridText.c:6035
+#: src/GridText.c:6042
 msgid "checkbox"
 msgstr ""
 
-#: src/GridText.c:6038
+#: src/GridText.c:6045
 msgid "radio button"
 msgstr "radijski gumb"
 
-#: src/GridText.c:6041
+#: src/GridText.c:6048
 msgid "submit button"
 msgstr ""
 
-#: src/GridText.c:6044
+#: src/GridText.c:6051
 msgid "reset button"
 msgstr ""
 
-#: src/GridText.c:6047
+#: src/GridText.c:6054
 msgid "popup menu"
 msgstr ""
 
-#: src/GridText.c:6050
+#: src/GridText.c:6057
 msgid "hidden form field"
 msgstr ""
 
-#: src/GridText.c:6053
+#: src/GridText.c:6060
 msgid "text entry area"
 msgstr ""
 
-#: src/GridText.c:6056
+#: src/GridText.c:6063
 msgid "range entry field"
 msgstr ""
 
-#: src/GridText.c:6059
+#: src/GridText.c:6066
 msgid "file entry field"
 msgstr ""
 
-#: src/GridText.c:6062
+#: src/GridText.c:6069
 msgid "text-submit field"
 msgstr ""
 
-#: src/GridText.c:6065
+#: src/GridText.c:6072
 msgid "image-submit button"
 msgstr "gumb za po隘ljanje slike"
 
-#: src/GridText.c:6068
+#: src/GridText.c:6075
 msgid "keygen field"
 msgstr "polje za generiranje klju醀"
 
-#: src/GridText.c:6071
+#: src/GridText.c:6078
 msgid "unknown form field"
 msgstr ""
 
-#: src/GridText.c:10231
+#: src/GridText.c:10244
 #, fuzzy
 msgid "Can't open file for uploading"
 msgstr "Ne moremo odpreti izhodne datoteke!  Prekinitev!"
 
-#: src/GridText.c:11384
+#: src/GridText.c:11397
 #, c-format
 msgid "Submitting %s"
 msgstr ""
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12533
+#: src/GridText.c:12546
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12738
+#: src/GridText.c:12751
 msgid "Wrap lines to fit displayed area?"
 msgstr ""
 
-#: src/GridText.c:12790
+#: src/GridText.c:12803
 msgid "Very long lines have been wrapped!"
 msgstr ""
 
-#: src/GridText.c:13232
+#: src/GridText.c:13245
 msgid "Very long lines have been truncated!"
 msgstr ""
 
@@ -3549,15 +3549,15 @@ msgstr "Pot do datoteke:"
 msgid "(unknown)"
 msgstr "(neznana)"
 
-#: src/HTML.c:7374
+#: src/HTML.c:7375
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Dokument ima le skrite povezave.  Uporabite ukaz ,l` za izpis."
 
-#: src/HTML.c:7873
+#: src/HTML.c:7874
 msgid "Source cache error - disk full?"
 msgstr ""
 
-#: src/HTML.c:7886
+#: src/HTML.c:7887
 msgid "Source cache error - not enough memory!"
 msgstr ""
 
@@ -3646,31 +3646,31 @@ msgstr " (notranji)"
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr ""
 
-#: src/LYCurses.c:1017
+#: src/LYCurses.c:1034
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr ""
 
-#: src/LYCurses.c:1442
+#: src/LYCurses.c:1459
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1446
+#: src/LYCurses.c:1463
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "V tem programu morate uporabljati terminal vt100, 200, ipd."
 
-#: src/LYCurses.c:1495
+#: src/LYCurses.c:1512
 msgid "Your Terminal type is unknown!"
 msgstr "Vrsta va鈹ga terminala je neznana!"
 
-#: src/LYCurses.c:1496
+#: src/LYCurses.c:1513
 msgid "Enter a terminal type:"
 msgstr "Vnesite vrsto terminala:"
 
-#: src/LYCurses.c:1510
+#: src/LYCurses.c:1527
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "VRSTA TERMINALA JE NASTAVLJENA NA"
 
-#: src/LYCurses.c:2007
+#: src/LYCurses.c:2031
 #, c-format
 msgid ""
 "\n"
@@ -3679,7 +3679,7 @@ msgstr ""
 "\n"
 "Usodna napaka se je pojavila v %s Ver. %s\n"
 
-#: src/LYCurses.c:2010
+#: src/LYCurses.c:2034
 #, c-format
 msgid ""
 "\n"
@@ -4216,52 +4216,52 @@ msgstr ""
 "Datoteka %s za Lynx< ni dostopna.\n"
 "\n"
 
-#: src/LYMain.c:1763
+#: src/LYMain.c:1750
 msgid "Warning:"
 msgstr ""
 
-#: src/LYMain.c:2328
+#: src/LYMain.c:2315
 msgid "persistent cookies state will be changed in next session only."
 msgstr "stanje obstojnih pi隕otov bo spremenjeno le v naslednji seji."
 
-#: src/LYMain.c:2565 src/LYMain.c:2610
+#: src/LYMain.c:2552 src/LYMain.c:2597
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr ""
 
-#: src/LYMain.c:3121
+#: src/LYMain.c:3108
 #, fuzzy, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Razli鋱ca %s (%s)\n"
 
-#: src/LYMain.c:3156
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Zgrajena na %s %s %s\n"
 
-#: src/LYMain.c:3178
+#: src/LYMain.c:3165
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors."
 msgstr "Pravice raz隘rjanja imajo Univerza v Kansasu, CERN in drugi sodelavci."
 
-#: src/LYMain.c:3179
+#: src/LYMain.c:3166
 msgid "Distributed under the GNU General Public License."
 msgstr "Raz隘rjano pod Splo雉o licenco GNU."
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3167
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr ""
 
-#: src/LYMain.c:3952
+#: src/LYMain.c:3939
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr ""
 
-#: src/LYMain.c:3953
+#: src/LYMain.c:3940
 #, c-format
 msgid "Options are:\n"
 msgstr ""
 
-#: src/LYMain.c:4252
+#: src/LYMain.c:4239
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr ""
@@ -4336,7 +4336,7 @@ msgstr ""
 msgid "Current URL is empty."
 msgstr "Trenutni imenik:"
 
-#: src/LYMainLoop.c:6935 src/LYUtils.c:1714
+#: src/LYMainLoop.c:6935 src/LYUtils.c:1775
 msgid "Copy to clipboard failed."
 msgstr ""
 
@@ -4420,354 +4420,354 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr ""
 
-#: src/LYOptions.c:758
+#: src/LYOptions.c:761
 msgid "review/edit B)ookmarks files"
 msgstr ""
 
-#: src/LYOptions.c:760
+#: src/LYOptions.c:763
 msgid "B)ookmark file: "
 msgstr ""
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2126 src/LYOptions.c:2133
 msgid "ON"
 msgstr ""
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2277 src/LYOptions.c:2288
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280 src/LYOptions.c:2291
 msgid "OFF"
 msgstr ""
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2128
 msgid "NEVER"
 msgstr ""
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2129
 msgid "ALWAYS"
 msgstr ""
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2269
+#: src/LYOptions.c:2145 src/LYOptions.c:2272
 msgid "ignore"
 msgstr ""
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2146
 msgid "ask user"
 msgstr ""
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2147
 msgid "accept all"
 msgstr ""
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS OFF"
 msgstr ""
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2160
 msgid "FOR LOCAL FILES ONLY"
 msgstr ""
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2162
 msgid "ALWAYS ON"
 msgstr ""
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2174
 msgid "Numbers act as arrows"
 msgstr ""
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Links and form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2182
 msgid "Form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2189
+#: src/LYOptions.c:2192
 msgid "Case insensitive"
 msgstr ""
 
-#: src/LYOptions.c:2190
+#: src/LYOptions.c:2193
 msgid "Case sensitive"
 msgstr ""
 
-#: src/LYOptions.c:2214
+#: src/LYOptions.c:2217
 msgid "prompt normally"
 msgstr ""
 
-#: src/LYOptions.c:2215
+#: src/LYOptions.c:2218
 msgid "force yes-response"
 msgstr ""
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2219
 msgid "force no-response"
 msgstr ""
 
-#: src/LYOptions.c:2234
+#: src/LYOptions.c:2237
 #, fuzzy
 msgid "Novice"
 msgstr "Ni"
 
-#: src/LYOptions.c:2235
+#: src/LYOptions.c:2238
 #, fuzzy
 msgid "Intermediate"
 msgstr " (notranji)"
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2239
 msgid "Advanced"
 msgstr ""
 
-#: src/LYOptions.c:2245
+#: src/LYOptions.c:2248
 msgid "By First Visit"
 msgstr ""
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2250
 msgid "By First Visit Reversed"
 msgstr ""
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2251
 msgid "As Visit Tree"
 msgstr ""
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2252
 msgid "By Last Visit"
 msgstr ""
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2254
 msgid "By Last Visit Reversed"
 msgstr ""
 
 #. Old_DTD variable
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2265
 msgid "relaxed (TagSoup mode)"
 msgstr ""
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2266
 msgid "strict (SortaSGML mode)"
 msgstr ""
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2273
 msgid "as labels"
 msgstr ""
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2274
 #, fuzzy
 msgid "as links"
 msgstr "te povezave"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2281
 #, fuzzy
 msgid "show filename"
 msgstr " (slabo ime datoteke)"
 
-#: src/LYOptions.c:2289
+#: src/LYOptions.c:2292
 msgid "STANDARD"
 msgstr ""
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2293
 msgid "ADVANCED"
 msgstr ""
 
-#: src/LYOptions.c:2316
+#: src/LYOptions.c:2319
 #, fuzzy
 msgid "Directories first"
 msgstr "Podimeniki:"
 
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2320
 #, fuzzy
 msgid "Files first"
 msgstr " najprej."
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2321
 msgid "Mixed style"
 msgstr ""
 
-#: src/LYOptions.c:2326 src/LYOptions.c:2343
+#: src/LYOptions.c:2329 src/LYOptions.c:2346
 #, fuzzy
 msgid "By Name"
 msgstr "Ime:"
 
-#: src/LYOptions.c:2327 src/LYOptions.c:2344
+#: src/LYOptions.c:2330 src/LYOptions.c:2347
 msgid "By Type"
 msgstr ""
 
-#: src/LYOptions.c:2328 src/LYOptions.c:2345
+#: src/LYOptions.c:2331 src/LYOptions.c:2348
 #, fuzzy
 msgid "By Size"
 msgstr "Velikost zlogov:"
 
-#: src/LYOptions.c:2329 src/LYOptions.c:2346
+#: src/LYOptions.c:2332 src/LYOptions.c:2349
 msgid "By Date"
 msgstr ""
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2333
 msgid "By Mode"
 msgstr ""
 
-#: src/LYOptions.c:2332
+#: src/LYOptions.c:2335
 msgid "By User"
 msgstr ""
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 #, fuzzy
 msgid "By Group"
 msgstr "Skupina"
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2357
 msgid "Do not show rate"
 msgstr ""
 
-#: src/LYOptions.c:2355 src/LYOptions.c:2356
+#: src/LYOptions.c:2358 src/LYOptions.c:2359
 #, fuzzy, c-format
 msgid "Show %s/sec rate"
 msgstr "Prenos podatkov kon醀n"
 
-#: src/LYOptions.c:2358 src/LYOptions.c:2359
+#: src/LYOptions.c:2361 src/LYOptions.c:2362
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr ""
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2374
 msgid "Accept lynx's internal types"
 msgstr ""
 
-#: src/LYOptions.c:2372
+#: src/LYOptions.c:2375
 msgid "Also accept lynx.cfg's types"
 msgstr ""
 
-#: src/LYOptions.c:2373
+#: src/LYOptions.c:2376
 msgid "Also accept user's types"
 msgstr ""
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "Also accept system's types"
 msgstr ""
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 #, fuzzy
 msgid "Accept all types"
 msgstr "Sprejmimo spremembe"
 
-#: src/LYOptions.c:2384
+#: src/LYOptions.c:2387
 msgid "gzip"
 msgstr ""
 
-#: src/LYOptions.c:2385
+#: src/LYOptions.c:2388
 msgid "deflate"
 msgstr ""
 
-#: src/LYOptions.c:2388
+#: src/LYOptions.c:2391
 msgid "compress"
 msgstr ""
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2394
 msgid "bzip2"
 msgstr ""
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2396
 msgid "All"
 msgstr ""
 
-#: src/LYOptions.c:2658 src/LYOptions.c:2682
+#: src/LYOptions.c:2664 src/LYOptions.c:2688
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr ""
 
-#: src/LYOptions.c:3429
+#: src/LYOptions.c:3438
 msgid "(options marked with (!) will not be saved)"
 msgstr ""
 
-#: src/LYOptions.c:3437
+#: src/LYOptions.c:3446
 msgid "General Preferences"
 msgstr "Sklici"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3450
 msgid "User mode"
 msgstr ""
 
 #. Editor: INPUT
-#: src/LYOptions.c:3447
+#: src/LYOptions.c:3456
 msgid "Editor"
 msgstr ""
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3461
 msgid "Type of Search"
 msgstr ""
 
-#: src/LYOptions.c:3457
+#: src/LYOptions.c:3466
 msgid "Security and Privacy"
 msgstr ""
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3461
+#: src/LYOptions.c:3470
 msgid "Cookies"
 msgstr ""
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3475
+#: src/LYOptions.c:3484
 msgid "Invalid-Cookie Prompting"
 msgstr ""
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3482
+#: src/LYOptions.c:3491
 msgid "SSL Prompting"
 msgstr ""
 
-#: src/LYOptions.c:3488
+#: src/LYOptions.c:3497
 msgid "Keyboard Input"
 msgstr ""
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3492
+#: src/LYOptions.c:3501
 msgid "Keypad mode"
 msgstr ""
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3498
+#: src/LYOptions.c:3507
 msgid "Emacs keys"
 msgstr ""
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3513
 msgid "VI keys"
 msgstr ""
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3511
+#: src/LYOptions.c:3520
 msgid "Line edit style"
 msgstr ""
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3532
 msgid "Keyboard layout"
 msgstr ""
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3537
+#: src/LYOptions.c:3546
 msgid "Display and Character Set"
 msgstr ""
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3542
+#: src/LYOptions.c:3551
 msgid "Use locale-based character set"
 msgstr ""
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3551
+#: src/LYOptions.c:3560
 msgid "Display character set"
 msgstr ""
 
-#: src/LYOptions.c:3582
+#: src/LYOptions.c:3591
 msgid "Assumed document character set"
 msgstr ""
 
@@ -4776,173 +4776,176 @@ msgstr ""
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3602
+#: src/LYOptions.c:3611
 msgid "CJK mode"
 msgstr ""
 
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3613
 msgid "Raw 8-bit"
 msgstr ""
 
 #. X Display: INPUT
-#: src/LYOptions.c:3612
+#: src/LYOptions.c:3621
 msgid "X Display"
 msgstr ""
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3618
+#: src/LYOptions.c:3627
 msgid "Document Appearance"
 msgstr ""
 
-#: src/LYOptions.c:3624
+#: src/LYOptions.c:3633
 msgid "Show color"
 msgstr ""
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3648
+#: src/LYOptions.c:3657
 msgid "Show cursor"
 msgstr ""
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3663
 #, fuzzy
 msgid "Underline links"
 msgstr "Skrite povezave:"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3670
 msgid "Show scrollbar"
 msgstr ""
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3668
+#: src/LYOptions.c:3677
 msgid "Popups for select fields"
 msgstr ""
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3674
+#: src/LYOptions.c:3683
 msgid "HTML error recovery"
 msgstr ""
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3680
+#: src/LYOptions.c:3689
 msgid "Show images"
 msgstr ""
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3694
+#: src/LYOptions.c:3703
 msgid "Verbose images"
 msgstr ""
 
-#: src/LYOptions.c:3703
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3711
 msgid "Headers Transferred to Remote Servers"
 msgstr ""
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3715
 msgid "Personal mail address"
 msgstr ""
 
 #. Mail Address: INPUT
-#: src/LYOptions.c:3712
+#: src/LYOptions.c:3720
 #, fuzzy
 msgid "Password for anonymous ftp"
 msgstr "Geslo za novi醀rski stre駐ik ,%s`:"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3717
+#: src/LYOptions.c:3725
 #, fuzzy
 msgid "Preferred media type"
 msgstr "Preneseno %d zlogov"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3723
+#: src/LYOptions.c:3731
 msgid "Preferred encoding"
 msgstr ""
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3729
+#: src/LYOptions.c:3737
 msgid "Preferred document character set"
 msgstr ""
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3742
 msgid "Preferred document language"
 msgstr ""
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3748
 msgid "User-Agent header"
 msgstr ""
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3748
+#: src/LYOptions.c:3756
 msgid "Listing and Accessing Files"
 msgstr ""
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3752
+#: src/LYOptions.c:3760
 msgid "FTP sort criteria"
 msgstr ""
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3759
+#: src/LYOptions.c:3767
 msgid "Local directory sort criteria"
 msgstr ""
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3773
 #, fuzzy
 msgid "Local directory sort order"
 msgstr "Tega imenika ni mogo鋀 brati."
 
-#: src/LYOptions.c:3774
+#: src/LYOptions.c:3782
 msgid "Show dot files"
 msgstr ""
 
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3790
 msgid "Execution links"
 msgstr ""
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3810
 msgid "Show transfer rate"
 msgstr "Prenos podatkov kon醀n"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3830
 msgid "Special Files and Screens"
 msgstr ""
 
-#: src/LYOptions.c:3827
+#: src/LYOptions.c:3835
 msgid "Multi-bookmarks"
 msgstr ""
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3843
 msgid "Review/edit Bookmarks files"
 msgstr ""
 
-#: src/LYOptions.c:3837
+#: src/LYOptions.c:3845
 msgid "Goto multi-bookmark menu"
 msgstr ""
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3847
 msgid "Bookmarks file"
 msgstr ""
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3845
+#: src/LYOptions.c:3853
 msgid "Visited Pages"
 msgstr "Stran z obiskanimi povezavami"
 
-#: src/LYOptions.c:3850
+#: src/LYOptions.c:3858
 msgid "View the file "
 msgstr ""
 
@@ -5056,38 +5059,38 @@ msgstr ""
 msgid "(no name)"
 msgstr "(brez imena)"
 
-#: src/LYReadCFG.c:1782
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1784
+#: src/LYReadCFG.c:1786
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1785
+#: src/LYReadCFG.c:1787
 #, c-format
 msgid "included from '%s'.\n"
 msgstr ""
 
-#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263
+#: src/LYReadCFG.c:2194 src/LYReadCFG.c:2207 src/LYReadCFG.c:2265
 msgid "The following is read from your lynx.cfg file."
 msgstr ""
 
-#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206
+#: src/LYReadCFG.c:2195 src/LYReadCFG.c:2208
 msgid "Please read the distribution"
 msgstr "Prosim, preberite dokumentacijo v distribuciji"
 
-#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209
+#: src/LYReadCFG.c:2201 src/LYReadCFG.c:2211
 msgid "for more comments."
 msgstr "za ve pripomb."
 
-#: src/LYReadCFG.c:2245
+#: src/LYReadCFG.c:2247
 msgid "RELOAD THE CHANGES"
 msgstr ""
 
-#: src/LYReadCFG.c:2253
+#: src/LYReadCFG.c:2255
 msgid "Your primary configuration"
 msgstr ""
 
@@ -5352,34 +5355,34 @@ msgstr ""
 msgid "Upload options:"
 msgstr ""
 
-#: src/LYUtils.c:1716
+#: src/LYUtils.c:1777
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2493
+#: src/LYUtils.c:2554
 msgid "Unexpected access protocol for this URL scheme."
 msgstr ""
 
-#: src/LYUtils.c:3301
+#: src/LYUtils.c:3362
 msgid "Too many tempfiles"
 msgstr ""
 
-#: src/LYUtils.c:3605
+#: src/LYUtils.c:3666
 #, fuzzy
 msgid "unknown restriction"
 msgstr "neznano polje ali povezava"
 
-#: src/LYUtils.c:3635
+#: src/LYUtils.c:3696
 #, c-format
 msgid "No restrictions set.\n"
 msgstr ""
 
-#: src/LYUtils.c:3638
+#: src/LYUtils.c:3699
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Opis:\n"
 
-#: src/LYUtils.c:5022
+#: src/LYUtils.c:5077
 msgid "Cannot find HOME directory"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 6d9248be..a3fe0b3b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.6-dev8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-30 18:03-0400\n"
+"POT-Creation-Date: 2005-10-16 19:03-0400\n"
 "PO-Revision-Date: 2004-11-27 12:30+0100\n"
 "Last-Translator: Peter Karlsson <peter@softwolves.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -2242,7 +2242,7 @@ msgstr "(Inget namn)"
 msgid "(No value.)"
 msgstr "(Inget v酺de)"
 
-#: LYMessages.c:713 src/LYOptions.c:2382
+#: LYMessages.c:713 src/LYOptions.c:2385
 msgid "None"
 msgstr "Ingen"
 
@@ -2788,7 +2788,7 @@ msgstr "Dokument med POST-data hittades ej i cache. Skicka in igen?"
 msgid "Loading failed, use a previous copy."
 msgstr "H鄝tningen misslyckades, anv鄚der tidigare exemplar."
 
-#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8508
+#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8515
 msgid "Loading incomplete."
 msgstr "H鄝tning ej komplett."
 
@@ -2903,12 +2903,12 @@ msgstr "L飉enord f顤 diskussionsv酺d \"%s\":"
 msgid "Change password?"
 msgstr "瓏dra l飉enord?"
 
-#: WWW/Library/Implementation/HTNews.c:1736
+#: WWW/Library/Implementation/HTNews.c:1706
 #, c-format
 msgid "No matches for: %s"
 msgstr "Inga tr輎far f顤: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1789
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2916,7 +2916,7 @@ msgstr ""
 "\n"
 "Inga artiklar i denna grupp.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1801
+#: WWW/Library/Implementation/HTNews.c:1768
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2927,16 +2927,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1814
+#: WWW/Library/Implementation/HTNews.c:1781
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s, artiklar %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1837
+#: WWW/Library/Implementation/HTNews.c:1804
 msgid "Earlier articles"
 msgstr "Tidigare artiklar"
 
-#: WWW/Library/Implementation/HTNews.c:1850
+#: WWW/Library/Implementation/HTNews.c:1817
 #, c-format
 msgid ""
 "\n"
@@ -2947,41 +2947,41 @@ msgstr ""
 "Det finns ca %d artiklar tillg鄚gliga i %s nu med f闤jande identifierare:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1912
+#: WWW/Library/Implementation/HTNews.c:1879
 msgid "All available articles in "
 msgstr "Alla tillg鄚gliga artiklar i "
 
-#: WWW/Library/Implementation/HTNews.c:2133
+#: WWW/Library/Implementation/HTNews.c:2093
 msgid "Later articles"
 msgstr "Senare artiklar"
 
-#: WWW/Library/Implementation/HTNews.c:2156
+#: WWW/Library/Implementation/HTNews.c:2116
 msgid "Post to "
 msgstr "Skicka till "
 
-#: WWW/Library/Implementation/HTNews.c:2377
+#: WWW/Library/Implementation/HTNews.c:2337
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Denna klient inneh嶚ler inte st鐰 f顤 SNEWS-adresser."
 
-#: WWW/Library/Implementation/HTNews.c:2585
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr "Inget m嶚 f顤 r text!"
 
-#: WWW/Library/Implementation/HTNews.c:2616
+#: WWW/Library/Implementation/HTNews.c:2576
 msgid "Connecting to NewsHost ..."
 msgstr "Ansluter till diskussionsv酺d..."
 
-#: WWW/Library/Implementation/HTNews.c:2668
+#: WWW/Library/Implementation/HTNews.c:2628
 #, c-format
 msgid "Could not access %s."
 msgstr "Kunde inte komma 廞 %s."
 
-#: WWW/Library/Implementation/HTNews.c:2774
+#: WWW/Library/Implementation/HTNews.c:2734
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "Kan inte l酲a dikussionsinformation. V酺den %.20s svarade %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2778
+#: WWW/Library/Implementation/HTNews.c:2738
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Kan inte l酲a diskussionsinformation, tomt svar fr幩 v酺d %s"
@@ -2989,22 +2989,22 @@ msgstr "Kan inte l酲a diskussionsinformation, tomt svar fr幩 v酺d %s"
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2982
+#: WWW/Library/Implementation/HTNews.c:2942
 msgid "Reading list of available newsgroups."
 msgstr "L酲er lista 饘er tillg鄚gliga grupper."
 
-#: WWW/Library/Implementation/HTNews.c:3003
+#: WWW/Library/Implementation/HTNews.c:2963
 msgid "Reading list of articles in newsgroup."
 msgstr "L酲er lista 饘er artiklar i grupp."
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:3009
+#: WWW/Library/Implementation/HTNews.c:2969
 msgid "Reading news article."
 msgstr "L酲er artikel."
 
-#: WWW/Library/Implementation/HTNews.c:3039
+#: WWW/Library/Implementation/HTNews.c:2999
 msgid "Sorry, could not load requested news."
 msgstr "Kunde inte h鄝ta beg酺da artiklar."
 
@@ -3012,11 +3012,11 @@ msgstr "Kunde inte h鄝ta beg酺da artiklar."
 msgid "Address has invalid port"
 msgstr "Adressen har en ogiltig port"
 
-#: WWW/Library/Implementation/HTTCP.c:1320
+#: WWW/Library/Implementation/HTTCP.c:1308
 msgid "Address length looks invalid"
 msgstr "Adressl鄚gden verkar ogiltig"
 
-#: WWW/Library/Implementation/HTTCP.c:1552 WWW/Library/Implementation/HTTCP.c:1570
+#: WWW/Library/Implementation/HTTCP.c:1539 WWW/Library/Implementation/HTTCP.c:1557
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Kan inte hitta v酺d %s."
@@ -3025,38 +3025,38 @@ msgstr "Kan inte hitta v酺d %s."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1567 WWW/Library/Implementation/HTTelnet.c:108
+#: WWW/Library/Implementation/HTTCP.c:1554 WWW/Library/Implementation/HTTelnet.c:108
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Ogiltigt v酺dnamn %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1568
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Kopplar upp %s-anslutning till %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1579
 msgid "socket failed."
 msgstr "uttag misslyckades."
 
-#: WWW/Library/Implementation/HTTCP.c:1605
+#: WWW/Library/Implementation/HTTCP.c:1592
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "uttag misslyckades: familj %d adress %s port %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1629
+#: WWW/Library/Implementation/HTTCP.c:1616
 msgid "Could not make connection non-blocking."
 msgstr "Kunde inte koppla upp icke-blockerande anslutning."
 
-#: WWW/Library/Implementation/HTTCP.c:1697
+#: WWW/Library/Implementation/HTTCP.c:1684
 msgid "Connection failed (too many retries)."
 msgstr "Uppkoppling misslyckades (f顤 m幩ga f顤s闥)."
 
-#: WWW/Library/Implementation/HTTCP.c:1896
+#: WWW/Library/Implementation/HTTCP.c:1883
 msgid "Could not restore socket to blocking."
 msgstr "Kunde inte 廞erst鄟la blockering i uttag."
 
-#: WWW/Library/Implementation/HTTCP.c:1962
+#: WWW/Library/Implementation/HTTCP.c:1949
 msgid "Socket read failed for 180,000 tries."
 msgstr "L酲ning fr幩 uttag misslyckades 180.000 g幩ger."
 
@@ -3363,98 +3363,98 @@ msgstr "Minnet slut, visning avbruten!"
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Minnet slut, avbryter 饘erf顤ing!"
 
-#: src/GridText.c:3594
+#: src/GridText.c:3601
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** MINNET SLUT ***"
 
-#: src/GridText.c:6013 src/GridText.c:6020 src/LYList.c:248
+#: src/GridText.c:6020 src/GridText.c:6027 src/LYList.c:248
 msgid "unknown field or link"
 msgstr "ok鄚t f鄟t eller l鄚k"
 
-#: src/GridText.c:6029
+#: src/GridText.c:6036
 msgid "text entry field"
 msgstr "textinmatningsf鄟t"
 
-#: src/GridText.c:6032
+#: src/GridText.c:6039
 msgid "password entry field"
 msgstr "l飉enordsinmatningsf鄟t"
 
-#: src/GridText.c:6035
+#: src/GridText.c:6042
 msgid "checkbox"
 msgstr "kryssruta"
 
-#: src/GridText.c:6038
+#: src/GridText.c:6045
 msgid "radio button"
 msgstr "radioknapp"
 
-#: src/GridText.c:6041
+#: src/GridText.c:6048
 msgid "submit button"
 msgstr "s鄚dknapp"
 
-#: src/GridText.c:6044
+#: src/GridText.c:6051
 msgid "reset button"
 msgstr "nollst鄟lningsknapp"
 
-#: src/GridText.c:6047
+#: src/GridText.c:6054
 msgid "popup menu"
 msgstr "popup-meny"
 
-#: src/GridText.c:6050
+#: src/GridText.c:6057
 msgid "hidden form field"
 msgstr "dolt formul酺f鄟t"
 
-#: src/GridText.c:6053
+#: src/GridText.c:6060
 msgid "text entry area"
 msgstr "textinmatningsomr嶟e"
 
-#: src/GridText.c:6056
+#: src/GridText.c:6063
 msgid "range entry field"
 msgstr "omr嶟esinmatningsf鄟t"
 
-#: src/GridText.c:6059
+#: src/GridText.c:6066
 msgid "file entry field"
 msgstr "filinmatningsf鄟t"
 
-#: src/GridText.c:6062
+#: src/GridText.c:6069
 msgid "text-submit field"
 msgstr "texts鄚df鄟t"
 
-#: src/GridText.c:6065
+#: src/GridText.c:6072
 msgid "image-submit button"
 msgstr "bilds鄚df鄟t"
 
-#: src/GridText.c:6068
+#: src/GridText.c:6075
 msgid "keygen field"
 msgstr "nyckelgenerering misslyckades"
 
-#: src/GridText.c:6071
+#: src/GridText.c:6078
 msgid "unknown form field"
 msgstr "ok鄚t formul酺f鄟t"
 
-#: src/GridText.c:10231
+#: src/GridText.c:10244
 msgid "Can't open file for uploading"
 msgstr "Kan inte 鞿pna fil f顤 s鄚dning"
 
-#: src/GridText.c:11384
+#: src/GridText.c:11397
 #, c-format
 msgid "Submitting %s"
 msgstr "Skickar %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12533
+#: src/GridText.c:12546
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "H鄚gning uppt踄kt: TextAnchor-struktur f顤st顤d - f顤esl緳 avbrott!"
 
 #. don't show previous state
-#: src/GridText.c:12738
+#: src/GridText.c:12751
 msgid "Wrap lines to fit displayed area?"
 msgstr "Ombryt rader s att de passar i visat f鄟t?"
 
-#: src/GridText.c:12790
+#: src/GridText.c:12803
 msgid "Very long lines have been wrapped!"
 msgstr "Mycket l幩ga rader har ombrutits!"
 
-#: src/GridText.c:13232
+#: src/GridText.c:13245
 msgid "Very long lines have been truncated!"
 msgstr "mycket l幩ga rader har trunkerats!"
 
@@ -3560,15 +3560,15 @@ msgstr "S闥v輍:"
 msgid "(unknown)"
 msgstr "(ok鄚d)"
 
-#: src/HTML.c:7374
+#: src/HTML.c:7375
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Dokumentet inneh嶚ler endast dolda l鄚kar. Anv鄚d \"l\"istkommandot."
 
-#: src/HTML.c:7873
+#: src/HTML.c:7874
 msgid "Source cache error - disk full?"
 msgstr "K鄟lkodscachefel - disk full?"
 
-#: src/HTML.c:7886
+#: src/HTML.c:7887
 msgid "Source cache error - not enough memory!"
 msgstr "K鄟lkodscachefel - minnet slut!"
 
@@ -3673,31 +3673,31 @@ msgstr "Intern"
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "\"cookie_domain_flag_set\"-fel, avbryter programmet"
 
-#: src/LYCurses.c:1017
+#: src/LYCurses.c:1034
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Terminalinitiering misslyckades - ok鄚d terminaltyp?"
 
-#: src/LYCurses.c:1442
+#: src/LYCurses.c:1459
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1446
+#: src/LYCurses.c:1463
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Du m廛te anv鄚da en vt100-, -200-, etc. -terminal med detta program."
 
-#: src/LYCurses.c:1495
+#: src/LYCurses.c:1512
 msgid "Your Terminal type is unknown!"
 msgstr "Din terminaltyp 酺 ok鄚d!"
 
-#: src/LYCurses.c:1496
+#: src/LYCurses.c:1513
 msgid "Enter a terminal type:"
 msgstr "Ange en terminaltyp:"
 
-#: src/LYCurses.c:1510
+#: src/LYCurses.c:1527
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TERMINALTYP SATT TILL"
 
-#: src/LYCurses.c:2007
+#: src/LYCurses.c:2031
 #, c-format
 msgid ""
 "\n"
@@ -3706,7 +3706,7 @@ msgstr ""
 "\n"
 "Ett fatalt fel har uppst廞t i %s ver. %s\n"
 
-#: src/LYCurses.c:2010
+#: src/LYCurses.c:2034
 #, c-format
 msgid ""
 "\n"
@@ -4240,52 +4240,52 @@ msgstr ""
 "Lynxfil %s ej tillg鄚glig.\n"
 "\n"
 
-#: src/LYMain.c:1763
+#: src/LYMain.c:1750
 msgid "Warning:"
 msgstr "Varning:"
 
-#: src/LYMain.c:2328
+#: src/LYMain.c:2315
 msgid "persistent cookies state will be changed in next session only."
 msgstr "varaktiga kakinst鄟lningar 鄚dras endast i n酲ta session."
 
-#: src/LYMain.c:2565 src/LYMain.c:2610
+#: src/LYMain.c:2552 src/LYMain.c:2597
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: ignorerar ok鄚d teckenupps酹tning %s\n"
 
-#: src/LYMain.c:3121
+#: src/LYMain.c:3108
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s version %s (%s)"
 
-#: src/LYMain.c:3156
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Byggd %s %s %s\n"
 
-#: src/LYMain.c:3178
+#: src/LYMain.c:3165
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors."
 msgstr "Upphovsr酹ten 輍s av University of Kansas, CERN, och andra bidragsl鄝nare."
 
-#: src/LYMain.c:3179
+#: src/LYMain.c:3166
 msgid "Distributed under the GNU General Public License."
 msgstr "Distribuerad enligt GNU General Public License."
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3167
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Se http://lynx.isc.org/ och direkthj鄟pen f顤 ytterligare information."
 
-#: src/LYMain.c:3952
+#: src/LYMain.c:3939
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "ANV鵲DNING: %s [flaggor] [fil]\n"
 
-#: src/LYMain.c:3953
+#: src/LYMain.c:3940
 #, c-format
 msgid "Options are:\n"
 msgstr "Flaggorna 酺:\n"
 
-#: src/LYMain.c:4252
+#: src/LYMain.c:4239
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Ok鄚d flagga: %s\n"
@@ -4361,7 +4361,7 @@ msgstr "Tabellcentrering inaktiverad."
 msgid "Current URL is empty."
 msgstr "Nuvarande adress 酺 tom."
 
-#: src/LYMainLoop.c:6935 src/LYUtils.c:1714
+#: src/LYMainLoop.c:6935 src/LYUtils.c:1775
 msgid "Copy to clipboard failed."
 msgstr "Misslyckades kopiera till urklipp."
 
@@ -4457,345 +4457,345 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "Inl輍get har ingen ursprunglig text!"
 
-#: src/LYOptions.c:758
+#: src/LYOptions.c:761
 msgid "review/edit B)ookmarks files"
 msgstr "se/redigera B)okm酺kesfiler"
 
-#: src/LYOptions.c:760
+#: src/LYOptions.c:763
 msgid "B)ookmark file: "
 msgstr "B)okm酺kesfil: "
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2126 src/LYOptions.c:2133
 msgid "ON"
 msgstr "P"
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2277 src/LYOptions.c:2288
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280 src/LYOptions.c:2291
 msgid "OFF"
 msgstr "AV"
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2128
 msgid "NEVER"
 msgstr "ALDRIG"
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2129
 msgid "ALWAYS"
 msgstr "ALLTID"
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2269
+#: src/LYOptions.c:2145 src/LYOptions.c:2272
 msgid "ignore"
 msgstr "ignorera"
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2146
 msgid "ask user"
 msgstr "fr嶓a anv鄚daren"
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2147
 msgid "accept all"
 msgstr "ta emot alla"
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS OFF"
 msgstr "ALLTID AV"
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2160
 msgid "FOR LOCAL FILES ONLY"
 msgstr "ENDAST F烼 LOKALA FILER"
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2162
 msgid "ALWAYS ON"
 msgstr "ALLTID P"
 
 # Numeriskt tangentbord
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2174
 msgid "Numbers act as arrows"
 msgstr "Siffror som pilar"
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links are numbered"
 msgstr "Numrerade l鄚kar"
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Links and form fields are numbered"
 msgstr "Numrerade l鄚kar och formul酺f鄟t"
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2182
 msgid "Form fields are numbered"
 msgstr "Numrerade formul酺f鄟t"
 
-#: src/LYOptions.c:2189
+#: src/LYOptions.c:2192
 msgid "Case insensitive"
 msgstr "Skilj inte VERSALER och gemener"
 
-#: src/LYOptions.c:2190
+#: src/LYOptions.c:2193
 msgid "Case sensitive"
 msgstr "Skilj VERSALER och gemener"
 
-#: src/LYOptions.c:2214
+#: src/LYOptions.c:2217
 msgid "prompt normally"
 msgstr "fr嶓a som vanligt"
 
-#: src/LYOptions.c:2215
+#: src/LYOptions.c:2218
 msgid "force yes-response"
 msgstr "svara alltid ja"
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2219
 msgid "force no-response"
 msgstr "svara alltid nej"
 
-#: src/LYOptions.c:2234
+#: src/LYOptions.c:2237
 msgid "Novice"
 msgstr "Nyb顤jare"
 
-#: src/LYOptions.c:2235
+#: src/LYOptions.c:2238
 msgid "Intermediate"
 msgstr "Amat顤"
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2239
 msgid "Advanced"
 msgstr "Avancerad"
 
-#: src/LYOptions.c:2245
+#: src/LYOptions.c:2248
 msgid "By First Visit"
 msgstr "Efter f顤sta bes闥"
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2250
 msgid "By First Visit Reversed"
 msgstr "Efter f顤sta anv鄚dning, omv鄚t"
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2251
 msgid "As Visit Tree"
 msgstr "Som bes闥str輐"
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2252
 msgid "By Last Visit"
 msgstr "Efter senaste bes闥"
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2254
 msgid "By Last Visit Reversed"
 msgstr "Efter senaste bes闥, omv鄚t"
 
 #. Old_DTD variable
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2265
 msgid "relaxed (TagSoup mode)"
 msgstr "avslappnad (TagSoup-l輍e)"
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2266
 msgid "strict (SortaSGML mode)"
 msgstr "strikt (SortaSGML-l輍e)"
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2273
 msgid "as labels"
 msgstr "som etiketter"
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2274
 msgid "as links"
 msgstr "som l鄚kar"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2281
 msgid "show filename"
 msgstr "visa filnamn"
 
-#: src/LYOptions.c:2289
+#: src/LYOptions.c:2292
 msgid "STANDARD"
 msgstr "NORMAL"
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2293
 msgid "ADVANCED"
 msgstr "AVANCERAD"
 
-#: src/LYOptions.c:2316
+#: src/LYOptions.c:2319
 msgid "Directories first"
 msgstr "Kataloger f顤st"
 
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2320
 msgid "Files first"
 msgstr "Filer f顤st"
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2321
 msgid "Mixed style"
 msgstr "Blandad visning"
 
-#: src/LYOptions.c:2326 src/LYOptions.c:2343
+#: src/LYOptions.c:2329 src/LYOptions.c:2346
 msgid "By Name"
 msgstr "Efter namn"
 
-#: src/LYOptions.c:2327 src/LYOptions.c:2344
+#: src/LYOptions.c:2330 src/LYOptions.c:2347
 msgid "By Type"
 msgstr "Efter typ"
 
-#: src/LYOptions.c:2328 src/LYOptions.c:2345
+#: src/LYOptions.c:2331 src/LYOptions.c:2348
 msgid "By Size"
 msgstr "Efter storlek"
 
-#: src/LYOptions.c:2329 src/LYOptions.c:2346
+#: src/LYOptions.c:2332 src/LYOptions.c:2349
 msgid "By Date"
 msgstr "Efter datum"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2333
 msgid "By Mode"
 msgstr "Efter l輍e"
 
-#: src/LYOptions.c:2332
+#: src/LYOptions.c:2335
 msgid "By User"
 msgstr "Efter anv鄚dare"
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 msgid "By Group"
 msgstr "Efter grupp"
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2357
 msgid "Do not show rate"
 msgstr "Visa inte hastighe"
 
-#: src/LYOptions.c:2355 src/LYOptions.c:2356
+#: src/LYOptions.c:2358 src/LYOptions.c:2359
 #, c-format
 msgid "Show %s/sec rate"
 msgstr "Visa hastighet som %s/s"
 
-#: src/LYOptions.c:2358 src/LYOptions.c:2359
+#: src/LYOptions.c:2361 src/LYOptions.c:2362
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr "Visa %s/s, tid kvar"
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2374
 msgid "Accept lynx's internal types"
 msgstr "Godta lynx interna typer"
 
-#: src/LYOptions.c:2372
+#: src/LYOptions.c:2375
 msgid "Also accept lynx.cfg's types"
 msgstr "Godta 銥en typer fr幩 lynx.cfg"
 
-#: src/LYOptions.c:2373
+#: src/LYOptions.c:2376
 msgid "Also accept user's types"
 msgstr "Godta 銥en anv鄚darens typer"
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "Also accept system's types"
 msgstr "Godta 銥en systemets typer"
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 msgid "Accept all types"
 msgstr "Godta alla typer"
 
-#: src/LYOptions.c:2384
+#: src/LYOptions.c:2387
 msgid "gzip"
 msgstr "gzip"
 
-#: src/LYOptions.c:2385
+#: src/LYOptions.c:2388
 msgid "deflate"
 msgstr "deflate"
 
-#: src/LYOptions.c:2388
+#: src/LYOptions.c:2391
 msgid "compress"
 msgstr "compress"
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2394
 msgid "bzip2"
 msgstr "bzip2"
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2396
 msgid "All"
 msgstr "Alla"
 
-#: src/LYOptions.c:2658 src/LYOptions.c:2682
+#: src/LYOptions.c:2664 src/LYOptions.c:2688
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Anv鄚d %s f顤 att n alternativmenyn!"
 
-#: src/LYOptions.c:3429
+#: src/LYOptions.c:3438
 msgid "(options marked with (!) will not be saved)"
 msgstr "(inst鄟lningar markerade med (!) kommer ej att sparas)"
 
-#: src/LYOptions.c:3437
+#: src/LYOptions.c:3446
 msgid "General Preferences"
 msgstr "Allm鄚na inst鄟lningar"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3450
 msgid "User mode"
 msgstr "Anv鄚darl輍e"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3447
+#: src/LYOptions.c:3456
 msgid "Editor"
 msgstr "Redigeringsprogram"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3461
 msgid "Type of Search"
 msgstr "S闥typ"
 
-#: src/LYOptions.c:3457
+#: src/LYOptions.c:3466
 msgid "Security and Privacy"
 msgstr "S鄢erhet och personlig integritet"
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3461
+#: src/LYOptions.c:3470
 msgid "Cookies"
 msgstr "Kakor"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3475
+#: src/LYOptions.c:3484
 msgid "Invalid-Cookie Prompting"
 msgstr "Fr嶓a f顤 ogiltiga kakor"
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3482
+#: src/LYOptions.c:3491
 msgid "SSL Prompting"
 msgstr "Fr嶓a f顤 SSL"
 
-#: src/LYOptions.c:3488
+#: src/LYOptions.c:3497
 msgid "Keyboard Input"
 msgstr "Tangentbordsindata"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3492
+#: src/LYOptions.c:3501
 msgid "Keypad mode"
 msgstr "Numeriskt tangentbord"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3498
+#: src/LYOptions.c:3507
 msgid "Emacs keys"
 msgstr "Emacstangenter"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3513
 msgid "VI keys"
 msgstr "VI-tangenter"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3511
+#: src/LYOptions.c:3520
 msgid "Line edit style"
 msgstr "Radredigeringsstil"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3532
 msgid "Keyboard layout"
 msgstr "Tangentbordsmall"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3537
+#: src/LYOptions.c:3546
 msgid "Display and Character Set"
 msgstr "Visning och teckenupps酹tning"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3542
+#: src/LYOptions.c:3551
 msgid "Use locale-based character set"
 msgstr "Lokalbaserad teckenupps酹tning"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3551
+#: src/LYOptions.c:3560
 msgid "Display character set"
 msgstr "Teckenupps酹tning f顤 visning"
 
-#: src/LYOptions.c:3582
+#: src/LYOptions.c:3591
 msgid "Assumed document character set"
 msgstr "F顤vald dokumentteckenupps酹tning"
 
@@ -4804,170 +4804,173 @@ msgstr "F顤vald dokumentteckenupps酹tning"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3602
+#: src/LYOptions.c:3611
 msgid "CJK mode"
 msgstr "CJK-l輍e"
 
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3613
 msgid "Raw 8-bit"
 msgstr "R 8-bitars"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3612
+#: src/LYOptions.c:3621
 msgid "X Display"
 msgstr "X-display"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3618
+#: src/LYOptions.c:3627
 msgid "Document Appearance"
 msgstr "Dokumentutseende"
 
-#: src/LYOptions.c:3624
+#: src/LYOptions.c:3633
 msgid "Show color"
 msgstr "Visa f酺g"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3648
+#: src/LYOptions.c:3657
 msgid "Show cursor"
 msgstr "Visa mark顤"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3663
 msgid "Underline links"
 msgstr "Stryk under l鄚kar"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3670
 msgid "Show scrollbar"
 msgstr "Visa rullningslist"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3668
+#: src/LYOptions.c:3677
 msgid "Popups for select fields"
 msgstr "Popup f顤 valf鄟t"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3674
+#: src/LYOptions.c:3683
 msgid "HTML error recovery"
 msgstr "HTML-fel廞erh鄝tning"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3680
+#: src/LYOptions.c:3689
 msgid "Show images"
 msgstr "Visa bilder"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3694
+#: src/LYOptions.c:3703
 msgid "Verbose images"
 msgstr "Pratsamma bilder"
 
-#: src/LYOptions.c:3703
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3711
 msgid "Headers Transferred to Remote Servers"
 msgstr "Fr嶓ehuvud 饘erf顤t till fj酺rservrar"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3715
 msgid "Personal mail address"
 msgstr "Egen e-postadress"
 
 #. Mail Address: INPUT
-#: src/LYOptions.c:3712
+#: src/LYOptions.c:3720
 #, fuzzy
 msgid "Password for anonymous ftp"
 msgstr "L飉enord f顤 diskussionsv酺d \"%s\":"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3717
+#: src/LYOptions.c:3725
 msgid "Preferred media type"
 msgstr "琄skad mediatyp"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3723
+#: src/LYOptions.c:3731
 msgid "Preferred encoding"
 msgstr "琄skade kodningsform"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3729
+#: src/LYOptions.c:3737
 msgid "Preferred document character set"
 msgstr "琄skad dokumentteckenupps酹tning"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3742
 msgid "Preferred document language"
 msgstr "琄skade dokumentspr嶡"
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3748
 msgid "User-Agent header"
 msgstr "Webbl酲aridentifiering"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3748
+#: src/LYOptions.c:3756
 msgid "Listing and Accessing Files"
 msgstr "Visning av och 廞komst till filer"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3752
+#: src/LYOptions.c:3760
 msgid "FTP sort criteria"
 msgstr "Sortering f顤 ftp-kataloger"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3759
+#: src/LYOptions.c:3767
 msgid "Local directory sort criteria"
 msgstr "Sortering f顤 lokala kataloger"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3773
 msgid "Local directory sort order"
 msgstr "Sortering f顤 lokala kataloger"
 
-#: src/LYOptions.c:3774
+#: src/LYOptions.c:3782
 msgid "Show dot files"
 msgstr "Visa punktfiler"
 
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3790
 msgid "Execution links"
 msgstr "Exekveringsl鄚kar"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3810
 msgid "Show transfer rate"
 msgstr "Visa 饘erf顤ingshastighet"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3830
 msgid "Special Files and Screens"
 msgstr "Speciella filer och sk酺mar"
 
-#: src/LYOptions.c:3827
+#: src/LYOptions.c:3835
 msgid "Multi-bookmarks"
 msgstr "Multibokm酺ken"
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3843
 msgid "Review/edit Bookmarks files"
 msgstr "Se/鄚dra bokm酺kesfiler"
 
-#: src/LYOptions.c:3837
+#: src/LYOptions.c:3845
 msgid "Goto multi-bookmark menu"
 msgstr "G till multibokm酺kesmenyn"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3847
 msgid "Bookmarks file"
 msgstr "Bokm酺kesfil"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3845
+#: src/LYOptions.c:3853
 msgid "Visited Pages"
 msgstr "Bes闥ta sidor"
 
-#: src/LYOptions.c:3850
+#: src/LYOptions.c:3858
 msgid "View the file "
 msgstr "Visa filen "
 
@@ -5087,38 +5090,38 @@ msgstr "Lynx: kan inte b顤ja, CERN-regelfilen %s ej tillg鄚glig\n"
 msgid "(no name)"
 msgstr "(inget namn)"
 
-#: src/LYReadCFG.c:1782
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Mer 鄚 %d staplade lynx.cfg-inkluderingar -- kanske en slinga?!?\n"
 
-#: src/LYReadCFG.c:1784
+#: src/LYReadCFG.c:1786
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Sista f顤s闥ta inkludering var \"%s\",\n"
 
-#: src/LYReadCFG.c:1785
+#: src/LYReadCFG.c:1787
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "inkluderad fr幩 \"%s\".\n"
 
-#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263
+#: src/LYReadCFG.c:2194 src/LYReadCFG.c:2207 src/LYReadCFG.c:2265
 msgid "The following is read from your lynx.cfg file."
 msgstr "F闤jande l酲es fr幩 din lynx.cfg-fil."
 
-#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206
+#: src/LYReadCFG.c:2195 src/LYReadCFG.c:2208
 msgid "Please read the distribution"
 msgstr "Se distributionens"
 
-#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209
+#: src/LYReadCFG.c:2201 src/LYReadCFG.c:2211
 msgid "for more comments."
 msgstr "f顤 ytterligare kommentarer."
 
-#: src/LYReadCFG.c:2245
+#: src/LYReadCFG.c:2247
 msgid "RELOAD THE CHANGES"
 msgstr "H鵡TA OM 鵲DRINGARNA"
 
-#: src/LYReadCFG.c:2253
+#: src/LYReadCFG.c:2255
 msgid "Your primary configuration"
 msgstr "Din prim酺a konfiguration"
 
@@ -5387,33 +5390,33 @@ msgstr "Skicka till:"
 msgid "Upload options:"
 msgstr "Ins鄚dningsalternativ:"
 
-#: src/LYUtils.c:1716
+#: src/LYUtils.c:1777
 msgid "Download document URL put to clipboard."
 msgstr "Adress till h鄝tat dokument lagt i urklipp."
 
-#: src/LYUtils.c:2493
+#: src/LYUtils.c:2554
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Ov鄚tat 廞komstprotokoll f顤 denna adresstyp."
 
-#: src/LYUtils.c:3301
+#: src/LYUtils.c:3362
 msgid "Too many tempfiles"
 msgstr "F顤 m幩ga tempor酺filer"
 
-#: src/LYUtils.c:3605
+#: src/LYUtils.c:3666
 msgid "unknown restriction"
 msgstr "ok鄚d begr鄚sning"
 
-#: src/LYUtils.c:3635
+#: src/LYUtils.c:3696
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Inga begr鄚sningar satta.\n"
 
-#: src/LYUtils.c:3638
+#: src/LYUtils.c:3699
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Satta begr鄚sningar:\n"
 
-#: src/LYUtils.c:5022
+#: src/LYUtils.c:5077
 msgid "Cannot find HOME directory"
 msgstr "Hittar inte hemkatalogen (HOME)"
 
diff --git a/po/tr.po b/po/tr.po
index 1ae9d273..f460c167 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx-2.8.6-dev8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-30 18:03-0400\n"
+"POT-Creation-Date: 2005-10-16 19:03-0400\n"
 "PO-Revision-Date: 2004-11-19 22:25+0200\n"
 "Last-Translator: Eyp Hakan Duran <hakan_duran@hotmail.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -2244,7 +2244,7 @@ msgstr "(酨im yok.)"
 msgid "(No value.)"
 msgstr "(De簟r yok.)"
 
-#: LYMessages.c:713 src/LYOptions.c:2382
+#: LYMessages.c:713 src/LYOptions.c:2385
 msgid "None"
 msgstr "Hi蓫iri"
 
@@ -2790,7 +2790,7 @@ msgstr "琄bellekte POST i蔒rikli belge bulunmad.  Yeniden g霵derilsin mi?"
 msgid "Loading failed, use a previous copy."
 msgstr "Ykleme baarsz, 霵ceki bir kopyay kullann."
 
-#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8508
+#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8515
 msgid "Loading incomplete."
 msgstr "Ykleme tamamlanmad."
 
@@ -2905,12 +2905,12 @@ msgstr "'%s' adl haber makinas i蓾n parola:"
 msgid "Change password?"
 msgstr "Parola de簨tirilsin mi?"
 
-#: WWW/Library/Implementation/HTNews.c:1736
+#: WWW/Library/Implementation/HTNews.c:1706
 #, c-format
 msgid "No matches for: %s"
 msgstr "%s i蓾n eleme yok..."
 
-#: WWW/Library/Implementation/HTNews.c:1789
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2918,7 +2918,7 @@ msgstr ""
 "\n"
 "Bu grupta hi mesaj yok.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1801
+#: WWW/Library/Implementation/HTNews.c:1768
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2929,16 +2929,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1814
+#: WWW/Library/Implementation/HTNews.c:1781
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  %d-%d mesaj"
 
-#: WWW/Library/Implementation/HTNews.c:1837
+#: WWW/Library/Implementation/HTNews.c:1804
 msgid "Earlier articles"
 msgstr "琄ceki mesajlar"
 
-#: WWW/Library/Implementation/HTNews.c:1850
+#: WWW/Library/Implementation/HTNews.c:1817
 #, c-format
 msgid ""
 "\n"
@@ -2949,41 +2949,41 @@ msgstr ""
 "Halen %2$s'de yaklak %1$d mesaj mevcut, kimlikler u ekilde:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1912
+#: WWW/Library/Implementation/HTNews.c:1879
 msgid "All available articles in "
 msgstr "Tm mevcut mesajlar "
 
-#: WWW/Library/Implementation/HTNews.c:2133
+#: WWW/Library/Implementation/HTNews.c:2093
 msgid "Later articles"
 msgstr "Sonraki mesajlar"
 
-#: WWW/Library/Implementation/HTNews.c:2156
+#: WWW/Library/Implementation/HTNews.c:2116
 msgid "Post to "
 msgstr "Kime G霵derilecek "
 
-#: WWW/Library/Implementation/HTNews.c:2377
+#: WWW/Library/Implementation/HTNews.c:2337
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Bu istemci SNEWS URL'ler i蓾n destek i蔒rmiyor."
 
-#: WWW/Library/Implementation/HTNews.c:2585
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr "Ham metin i蓾n hi hedef yok!"
 
-#: WWW/Library/Implementation/HTNews.c:2616
+#: WWW/Library/Implementation/HTNews.c:2576
 msgid "Connecting to NewsHost ..."
 msgstr "Haber makinasna ba簰anlyor ..."
 
-#: WWW/Library/Implementation/HTNews.c:2668
+#: WWW/Library/Implementation/HTNews.c:2628
 #, c-format
 msgid "Could not access %s."
 msgstr "%s'e eriilemiyor."
 
-#: WWW/Library/Implementation/HTNews.c:2774
+#: WWW/Library/Implementation/HTNews.c:2734
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "Haber bilgisi okunamyor.  %.20s adl haber makinasnn yant: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2778
+#: WWW/Library/Implementation/HTNews.c:2738
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Haber bilgisi okunamyor, %s makinasndan bo yant"
@@ -2991,22 +2991,22 @@ msgstr "Haber bilgisi okunamyor, %s makinasndan bo yant"
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2982
+#: WWW/Library/Implementation/HTNews.c:2942
 msgid "Reading list of available newsgroups."
 msgstr "Mevcut haber gruplarnn listesi okunuyor."
 
-#: WWW/Library/Implementation/HTNews.c:3003
+#: WWW/Library/Implementation/HTNews.c:2963
 msgid "Reading list of articles in newsgroup."
 msgstr "Haber grubundaki mesaj listesi okunuyor."
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:3009
+#: WWW/Library/Implementation/HTNews.c:2969
 msgid "Reading news article."
 msgstr "Haber mesaj okunuyor."
 
-#: WWW/Library/Implementation/HTNews.c:3039
+#: WWW/Library/Implementation/HTNews.c:2999
 msgid "Sorry, could not load requested news."
 msgstr "閌gnm, istenen haber yklenemedi."
 
@@ -3014,11 +3014,11 @@ msgstr "閌gnm, istenen haber yklenemedi."
 msgid "Address has invalid port"
 msgstr "Adres portu ge蔒rsiz"
 
-#: WWW/Library/Implementation/HTTCP.c:1320
+#: WWW/Library/Implementation/HTTCP.c:1308
 msgid "Address length looks invalid"
 msgstr "Adres uzunlu繠 ge蔒rsiz g顤nyor"
 
-#: WWW/Library/Implementation/HTTCP.c:1552 WWW/Library/Implementation/HTTCP.c:1570
+#: WWW/Library/Implementation/HTTCP.c:1539 WWW/Library/Implementation/HTTCP.c:1557
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "%s adl kar makina konumlandrlamyor."
@@ -3027,38 +3027,38 @@ msgstr "%s adl kar makina konumlandrlamyor."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1567 WWW/Library/Implementation/HTTelnet.c:108
+#: WWW/Library/Implementation/HTTCP.c:1554 WWW/Library/Implementation/HTTelnet.c:108
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Ge蔒rsiz makina ad %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1568
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "%2$s'e %1$s ba簰ants kuruluyor"
 
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1579
 msgid "socket failed."
 msgstr "soket baarsz."
 
-#: WWW/Library/Implementation/HTTCP.c:1605
+#: WWW/Library/Implementation/HTTCP.c:1592
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "soket baarsz: aile %d adres %s port %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1629
+#: WWW/Library/Implementation/HTTCP.c:1616
 msgid "Could not make connection non-blocking."
 msgstr "Ba簰ant engelsizletirilemedi (non-blocking)."
 
-#: WWW/Library/Implementation/HTTCP.c:1697
+#: WWW/Library/Implementation/HTTCP.c:1684
 msgid "Connection failed (too many retries)."
 msgstr "Ba簰ant baarsz (蔞k sayda yeniden deneme)."
 
-#: WWW/Library/Implementation/HTTCP.c:1896
+#: WWW/Library/Implementation/HTTCP.c:1883
 msgid "Could not restore socket to blocking."
 msgstr "Soket engellemeye (blocking) geri yklenemedi."
 
-#: WWW/Library/Implementation/HTTCP.c:1962
+#: WWW/Library/Implementation/HTTCP.c:1949
 msgid "Socket read failed for 180,000 tries."
 msgstr "Soket okunmas 180,000 kez baarsz."
 
@@ -3362,98 +3362,98 @@ msgstr "Bellek tkendi, g顤nt kesildi!"
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Bellek tkendi, aktarm kesilecek!"
 
-#: src/GridText.c:3594
+#: src/GridText.c:3601
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** BELLEK T軴END ***"
 
-#: src/GridText.c:6013 src/GridText.c:6020 src/LYList.c:248
+#: src/GridText.c:6020 src/GridText.c:6027 src/LYList.c:248
 msgid "unknown field or link"
 msgstr "bilinmeyen alan ya da link"
 
-#: src/GridText.c:6029
+#: src/GridText.c:6036
 msgid "text entry field"
 msgstr "metin giri alan"
 
-#: src/GridText.c:6032
+#: src/GridText.c:6039
 msgid "password entry field"
 msgstr "parola giri alan"
 
-#: src/GridText.c:6035
+#: src/GridText.c:6042
 msgid "checkbox"
 msgstr "onay kutusu"
 
-#: src/GridText.c:6038
+#: src/GridText.c:6045
 msgid "radio button"
 msgstr "radyo d繜esi"
 
-#: src/GridText.c:6041
+#: src/GridText.c:6048
 msgid "submit button"
 msgstr "g霵derme d繜esi"
 
-#: src/GridText.c:6044
+#: src/GridText.c:6051
 msgid "reset button"
 msgstr "temizleme d繜esi"
 
-#: src/GridText.c:6047
+#: src/GridText.c:6054
 msgid "popup menu"
 msgstr "a踦lr men"
 
-#: src/GridText.c:6050
+#: src/GridText.c:6057
 msgid "hidden form field"
 msgstr "gizli form alan"
 
-#: src/GridText.c:6053
+#: src/GridText.c:6060
 msgid "text entry area"
 msgstr "metin giri alan"
 
-#: src/GridText.c:6056
+#: src/GridText.c:6063
 msgid "range entry field"
 msgstr "erim giri alan"
 
-#: src/GridText.c:6059
+#: src/GridText.c:6066
 msgid "file entry field"
 msgstr "dosya giri alan"
 
-#: src/GridText.c:6062
+#: src/GridText.c:6069
 msgid "text-submit field"
 msgstr "metin-g霵derme alan"
 
-#: src/GridText.c:6065
+#: src/GridText.c:6072
 msgid "image-submit button"
 msgstr "resim-g霵derme alan"
 
-#: src/GridText.c:6068
+#: src/GridText.c:6075
 msgid "keygen field"
 msgstr "keygen alan"
 
-#: src/GridText.c:6071
+#: src/GridText.c:6078
 msgid "unknown form field"
 msgstr "bilinmeyen form alan"
 
-#: src/GridText.c:10231
+#: src/GridText.c:10244
 msgid "Can't open file for uploading"
 msgstr "Yklemek i蓾n dosya a踦lamyor."
 
-#: src/GridText.c:11384
+#: src/GridText.c:11397
 #, c-format
 msgid "Submitting %s"
 msgstr "%s g霵deriliyor"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12533
+#: src/GridText.c:12546
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Taklma Saptand: TextAnchor struct bozuk - sonlandrmanz 霵erilir!"
 
 #. don't show previous state
-#: src/GridText.c:12738
+#: src/GridText.c:12751
 msgid "Wrap lines to fit displayed area?"
 msgstr "G顤ntlenen alana s繜ak zere satrlar sarmalansn m?"
 
-#: src/GridText.c:12790
+#: src/GridText.c:12803
 msgid "Very long lines have been wrapped!"
 msgstr "プk uzun satrlar sarmaland!"
 
-#: src/GridText.c:13232
+#: src/GridText.c:13245
 msgid "Very long lines have been truncated!"
 msgstr "プk uzun satrlarn sonundan krpld!"
 
@@ -3559,15 +3559,15 @@ msgstr "Dosya yolu:"
 msgid "(unknown)"
 msgstr "(bilinmiyor)"
 
-#: src/HTML.c:7374
+#: src/HTML.c:7375
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Belgede yalnzca gizli linkler var.  Listele(l) komutunu kullannz."
 
-#: src/HTML.c:7873
+#: src/HTML.c:7874
 msgid "Source cache error - disk full?"
 msgstr "Kaynak 霵bellek hatas - disk tamamen dolu mu?"
 
-#: src/HTML.c:7886
+#: src/HTML.c:7887
 msgid "Source cache error - not enough memory!"
 msgstr "Kaynak 霵bellek hatas - bellek yetersiz!"
 
@@ -3671,31 +3671,31 @@ msgstr "Dahili"
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "cookie_domain_flag_set hatas, program yarda kesiliyor"
 
-#: src/LYCurses.c:1017
+#: src/LYCurses.c:1034
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "U蓫irim 霵 de簟r atamas baarsz - bilinmeyen u蓫irim tr?"
 
-#: src/LYCurses.c:1442
+#: src/LYCurses.c:1459
 msgid "Terminal ="
 msgstr "U蓫irim ="
 
-#: src/LYCurses.c:1446
+#: src/LYCurses.c:1463
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Bu programla bir vt100, 200 vb. u蓫irim kullanmalsnz."
 
-#: src/LYCurses.c:1495
+#: src/LYCurses.c:1512
 msgid "Your Terminal type is unknown!"
 msgstr "U蓫irim trnz bilinmiyor!"
 
-#: src/LYCurses.c:1496
+#: src/LYCurses.c:1513
 msgid "Enter a terminal type:"
 msgstr "Bir u蓫irim tr giriniz:"
 
-#: src/LYCurses.c:1510
+#: src/LYCurses.c:1527
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "Uオ嵬嵱 T鄄 AYARI"
 
-#: src/LYCurses.c:2007
+#: src/LYCurses.c:2031
 #, c-format
 msgid ""
 "\n"
@@ -3704,7 +3704,7 @@ msgstr ""
 "\n"
 "%2$s Sr. %1$s'de 闤mcl bir hata olutu\n"
 
-#: src/LYCurses.c:2010
+#: src/LYCurses.c:2034
 #, c-format
 msgid ""
 "\n"
@@ -4238,52 +4238,52 @@ msgstr ""
 "Lynx dosyas %s temin edilemiyor.\n"
 "\n"
 
-#: src/LYMain.c:1763
+#: src/LYMain.c:1750
 msgid "Warning:"
 msgstr "Uyar:"
 
-#: src/LYMain.c:2328
+#: src/LYMain.c:2315
 msgid "persistent cookies state will be changed in next session only."
 msgstr "kalc 蔒rezler durumu, yalnzca gelecek oturumda de簨ecek."
 
-#: src/LYMain.c:2565 src/LYMain.c:2610
+#: src/LYMain.c:2552 src/LYMain.c:2597
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: tannmayan karakterkmesi=%s yoksaylyor\n"
 
-#: src/LYMain.c:3121
+#: src/LYMain.c:3108
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Srm %s (%s)"
 
-#: src/LYMain.c:3156
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "%s %s %s zerine yaplandrld\n"
 
-#: src/LYMain.c:3178
+#: src/LYMain.c:3165
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors."
 msgstr "Telif hakklar Kansas 鈆iversitesi, CERN ve di簟r katlmclar tarafndan (sakl) tutulmaktadr."
 
-#: src/LYMain.c:3179
+#: src/LYMain.c:3166
 msgid "Distributed under the GNU General Public License."
 msgstr "GNU Genel Kamu Lisans altnda da蹥tlmaktadr."
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3167
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Daha fazla bilgi i蓾n http://lynx.isc.org/ ve 蔒vrim i蓾 yardma baknz."
 
-#: src/LYMain.c:3952
+#: src/LYMain.c:3939
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "KULLANIM: %s [se蔒nekler] [dosya]\n"
 
-#: src/LYMain.c:3953
+#: src/LYMain.c:3940
 #, c-format
 msgid "Options are:\n"
 msgstr "Se蔒nekler:\n"
 
-#: src/LYMain.c:4252
+#: src/LYMain.c:4239
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Ge蔒rsiz Se蔒nek: %s\n"
@@ -4357,7 +4357,7 @@ msgstr "TABLO ortala(may) devre d brak."
 msgid "Current URL is empty."
 msgstr "Mevcut URL bo."
 
-#: src/LYMainLoop.c:6935 src/LYUtils.c:1714
+#: src/LYMainLoop.c:6935 src/LYUtils.c:1775
 msgid "Copy to clipboard failed."
 msgstr "Panoya kopyalama baarsz."
 
@@ -4453,344 +4453,344 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "Mesajda orijinal metin yok!"
 
-#: src/LYOptions.c:758
+#: src/LYOptions.c:761
 msgid "review/edit B)ookmarks files"
 msgstr "Yer imi(B) dosyalarn g驆den ge蓾r/dzenle"
 
-#: src/LYOptions.c:760
+#: src/LYOptions.c:763
 msgid "B)ookmark file: "
 msgstr "Yer imi(B) dosyas: "
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2126 src/LYOptions.c:2133
 msgid "ON"
 msgstr "AケK"
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2277 src/LYOptions.c:2288
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280 src/LYOptions.c:2291
 msgid "OFF"
 msgstr "KAPALI"
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2128
 msgid "NEVER"
 msgstr "ASLA"
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2129
 msgid "ALWAYS"
 msgstr "HER ZAMAN"
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2269
+#: src/LYOptions.c:2145 src/LYOptions.c:2272
 msgid "ignore"
 msgstr "yoksay"
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2146
 msgid "ask user"
 msgstr "kullancya sor"
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2147
 msgid "accept all"
 msgstr "tmn kabul et"
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS OFF"
 msgstr "HER ZAMAN KAPALI"
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2160
 msgid "FOR LOCAL FILES ONLY"
 msgstr "YALNIZCA YEREL DOSYALAR 晸嵣"
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2162
 msgid "ALWAYS ON"
 msgstr "HER ZAMAN AケK"
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2174
 msgid "Numbers act as arrows"
 msgstr "Rakamlar oklar gibi davranrlar"
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links are numbered"
 msgstr "Linkler numaraland"
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Links and form fields are numbered"
 msgstr "Linkler ve form alanlar numaraland"
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2182
 msgid "Form fields are numbered"
 msgstr "Form alanlar numaraland"
 
-#: src/LYOptions.c:2189
+#: src/LYOptions.c:2192
 msgid "Case insensitive"
 msgstr "Byk/k踙k harf duyarsz"
 
-#: src/LYOptions.c:2190
+#: src/LYOptions.c:2193
 msgid "Case sensitive"
 msgstr "Byk/k踙k harf duyarl"
 
-#: src/LYOptions.c:2214
+#: src/LYOptions.c:2217
 msgid "prompt normally"
 msgstr "normal bilgi istemi"
 
-#: src/LYOptions.c:2215
+#: src/LYOptions.c:2218
 msgid "force yes-response"
 msgstr "evet-yantna zorla"
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2219
 msgid "force no-response"
 msgstr "hayr-yantna zorla"
 
-#: src/LYOptions.c:2234
+#: src/LYOptions.c:2237
 msgid "Novice"
 msgstr "Acemi"
 
-#: src/LYOptions.c:2235
+#: src/LYOptions.c:2238
 msgid "Intermediate"
 msgstr "Orta dzey"
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2239
 msgid "Advanced"
 msgstr "愮eri dzey"
 
-#: src/LYOptions.c:2245
+#: src/LYOptions.c:2248
 msgid "By First Visit"
 msgstr "愮k Ziyaretle"
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2250
 msgid "By First Visit Reversed"
 msgstr "愮k Ziyaretle-Tersten"
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2251
 msgid "As Visit Tree"
 msgstr "Ziyaret A簜c Gibi"
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2252
 msgid "By Last Visit"
 msgstr "Son Ziyaretle"
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2254
 msgid "By Last Visit Reversed"
 msgstr "Son Ziyaretle-Tersten"
 
 #. Old_DTD variable
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2265
 msgid "relaxed (TagSoup mode)"
 msgstr "gevek (TagSoup kipi)"
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2266
 msgid "strict (SortaSGML mode)"
 msgstr "kat (SortaSGML kipi)"
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2273
 msgid "as labels"
 msgstr "etiket gibi"
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2274
 msgid "as links"
 msgstr "link gibi"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2281
 msgid "show filename"
 msgstr "dosya adn g飉ter"
 
-#: src/LYOptions.c:2289
+#: src/LYOptions.c:2292
 msgid "STANDARD"
 msgstr "STANDART"
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2293
 msgid "ADVANCED"
 msgstr "尳ER D鄇EY"
 
-#: src/LYOptions.c:2316
+#: src/LYOptions.c:2319
 msgid "Directories first"
 msgstr "琄ce dizinler"
 
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2320
 msgid "Files first"
 msgstr "琄ce dosyalar"
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2321
 msgid "Mixed style"
 msgstr "Kark stil"
 
-#: src/LYOptions.c:2326 src/LYOptions.c:2343
+#: src/LYOptions.c:2329 src/LYOptions.c:2346
 msgid "By Name"
 msgstr "酨imle"
 
-#: src/LYOptions.c:2327 src/LYOptions.c:2344
+#: src/LYOptions.c:2330 src/LYOptions.c:2347
 msgid "By Type"
 msgstr "Trle"
 
-#: src/LYOptions.c:2328 src/LYOptions.c:2345
+#: src/LYOptions.c:2331 src/LYOptions.c:2348
 msgid "By Size"
 msgstr "Boyutla"
 
-#: src/LYOptions.c:2329 src/LYOptions.c:2346
+#: src/LYOptions.c:2332 src/LYOptions.c:2349
 msgid "By Date"
 msgstr "Tarihle"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2333
 msgid "By Mode"
 msgstr "Kiple"
 
-#: src/LYOptions.c:2332
+#: src/LYOptions.c:2335
 msgid "By User"
 msgstr "Kullancyla"
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 msgid "By Group"
 msgstr "Grupla"
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2357
 msgid "Do not show rate"
 msgstr "Hz g飉terme"
 
-#: src/LYOptions.c:2355 src/LYOptions.c:2356
+#: src/LYOptions.c:2358 src/LYOptions.c:2359
 #, c-format
 msgid "Show %s/sec rate"
 msgstr "%s/sn hzn g飉ter"
 
-#: src/LYOptions.c:2358 src/LYOptions.c:2359
+#: src/LYOptions.c:2361 src/LYOptions.c:2362
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr "%s/sn'yi g飉ter, ETA"
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2374
 msgid "Accept lynx's internal types"
 msgstr "Lynx'in dahili trlerini kabul et"
 
-#: src/LYOptions.c:2372
+#: src/LYOptions.c:2375
 msgid "Also accept lynx.cfg's types"
 msgstr "Lynx cfg'nin trlerini de kabul et"
 
-#: src/LYOptions.c:2373
+#: src/LYOptions.c:2376
 msgid "Also accept user's types"
 msgstr "Kullancnn trlerini de kabul et"
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "Also accept system's types"
 msgstr "Sistemin trlerini de kabul et"
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 msgid "Accept all types"
 msgstr "Tm trleri kabul et"
 
-#: src/LYOptions.c:2384
+#: src/LYOptions.c:2387
 msgid "gzip"
 msgstr "gzip"
 
-#: src/LYOptions.c:2385
+#: src/LYOptions.c:2388
 msgid "deflate"
 msgstr "s霵dr"
 
-#: src/LYOptions.c:2388
+#: src/LYOptions.c:2391
 msgid "compress"
 msgstr "sktr"
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2394
 msgid "bzip2"
 msgstr "bzip2"
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2396
 msgid "All"
 msgstr "Tm"
 
-#: src/LYOptions.c:2658 src/LYOptions.c:2682
+#: src/LYOptions.c:2664 src/LYOptions.c:2688
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Se蔒nekler mensn 蓷蹥rmak i蓾n %s kullannz!"
 
-#: src/LYOptions.c:3429
+#: src/LYOptions.c:3438
 msgid "(options marked with (!) will not be saved)"
 msgstr "((!) ile iaretlenmi se蔒nekler kaydedilmeyecek)"
 
-#: src/LYOptions.c:3437
+#: src/LYOptions.c:3446
 msgid "General Preferences"
 msgstr "Genel Tercihler"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3450
 msgid "User mode"
 msgstr "Kullanc kipi"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3447
+#: src/LYOptions.c:3456
 msgid "Editor"
 msgstr "Dzenleyici"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3461
 msgid "Type of Search"
 msgstr "Arama Tipi"
 
-#: src/LYOptions.c:3457
+#: src/LYOptions.c:3466
 msgid "Security and Privacy"
 msgstr "Gvenlik ve Mahremiyet"
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3461
+#: src/LYOptions.c:3470
 msgid "Cookies"
 msgstr "ネrezler"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3475
+#: src/LYOptions.c:3484
 msgid "Invalid-Cookie Prompting"
 msgstr "Ge蔒rsiz ネrez Bilgi 酨temi"
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3482
+#: src/LYOptions.c:3491
 msgid "SSL Prompting"
 msgstr "SSL Bilgi 酨temi"
 
-#: src/LYOptions.c:3488
+#: src/LYOptions.c:3497
 msgid "Keyboard Input"
 msgstr "Klavye Girdisi"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3492
+#: src/LYOptions.c:3501
 msgid "Keypad mode"
 msgstr "Mini klavye(keypad) kipi"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3498
+#: src/LYOptions.c:3507
 msgid "Emacs keys"
 msgstr "Emacs tular"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3513
 msgid "VI keys"
 msgstr "VI tular"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3511
+#: src/LYOptions.c:3520
 msgid "Line edit style"
 msgstr "Satr dzenleme stili"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3532
 msgid "Keyboard layout"
 msgstr "Klavye yerleimi"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3537
+#: src/LYOptions.c:3546
 msgid "Display and Character Set"
 msgstr "G顤ntleme ve Karakter Kmesi"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3542
+#: src/LYOptions.c:3551
 msgid "Use locale-based character set"
 msgstr "Yerel tabanl karakter kmesini kullan"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3551
+#: src/LYOptions.c:3560
 msgid "Display character set"
 msgstr "Karakter kmesini g顤ntle"
 
-#: src/LYOptions.c:3582
+#: src/LYOptions.c:3591
 msgid "Assumed document character set"
 msgstr "Varsaylan belge karakter kmesi"
 
@@ -4799,170 +4799,173 @@ msgstr "Varsaylan belge karakter kmesi"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3602
+#: src/LYOptions.c:3611
 msgid "CJK mode"
 msgstr "CJK kipi"
 
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3613
 msgid "Raw 8-bit"
 msgstr "Ham 8-bit"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3612
+#: src/LYOptions.c:3621
 msgid "X Display"
 msgstr "X G顤ntleme"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3618
+#: src/LYOptions.c:3627
 msgid "Document Appearance"
 msgstr "Belge G顤nm"
 
-#: src/LYOptions.c:3624
+#: src/LYOptions.c:3633
 msgid "Show color"
 msgstr "Renkleri g飉ter"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3648
+#: src/LYOptions.c:3657
 msgid "Show cursor"
 msgstr "慆leci g飉ter"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3663
 msgid "Underline links"
 msgstr "Linklerin alt 蓾zili"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3670
 msgid "Show scrollbar"
 msgstr "Kaydrma 蓰bu繠nu g飉ter"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3668
+#: src/LYOptions.c:3677
 msgid "Popups for select fields"
 msgstr "Se蔂e alanlar i蓾n a踦lrlar(popups)"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3674
+#: src/LYOptions.c:3683
 msgid "HTML error recovery"
 msgstr "HTML hata kurtarma"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3680
+#: src/LYOptions.c:3689
 msgid "Show images"
 msgstr "Resimleri g飉ter"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3694
+#: src/LYOptions.c:3703
 msgid "Verbose images"
 msgstr "Resimleri dillendir"
 
-#: src/LYOptions.c:3703
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3711
 msgid "Headers Transferred to Remote Servers"
 msgstr "Balklar Kar Sunuculara Aktarld"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3715
 msgid "Personal mail address"
 msgstr "Kiisel mektup adresi"
 
 #. Mail Address: INPUT
-#: src/LYOptions.c:3712
+#: src/LYOptions.c:3720
 #, fuzzy
 msgid "Password for anonymous ftp"
 msgstr "'%s' adl haber makinas i蓾n parola:"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3717
+#: src/LYOptions.c:3725
 msgid "Preferred media type"
 msgstr "Tercih edilen ortam tr"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3723
+#: src/LYOptions.c:3731
 msgid "Preferred encoding"
 msgstr "Tercih edilen kodlama"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3729
+#: src/LYOptions.c:3737
 msgid "Preferred document character set"
 msgstr "Tercih edilen belge karakter kmesi"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3742
 msgid "Preferred document language"
 msgstr "Tercih edilen belge dili"
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3748
 msgid "User-Agent header"
 msgstr "Kullanc-Ajan bal蹥"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3748
+#: src/LYOptions.c:3756
 msgid "Listing and Accessing Files"
 msgstr "Dosya Listeleme ve Eriim"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3752
+#: src/LYOptions.c:3760
 msgid "FTP sort criteria"
 msgstr "FTP sralama 闤踙tleri"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3759
+#: src/LYOptions.c:3767
 msgid "Local directory sort criteria"
 msgstr "Yerel dizin sralama 闤踙tleri"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3773
 msgid "Local directory sort order"
 msgstr "Yerel dizin sralama 闤踙tleri"
 
-#: src/LYOptions.c:3774
+#: src/LYOptions.c:3782
 msgid "Show dot files"
 msgstr "Nokta dosyalar g飉ter"
 
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3790
 msgid "Execution links"
 msgstr "徯ra linkleri"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3810
 msgid "Show transfer rate"
 msgstr "Aktarm hzn g飉ter"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3830
 msgid "Special Files and Screens"
 msgstr "畤el Dosyalar ve Ekranlar"
 
-#: src/LYOptions.c:3827
+#: src/LYOptions.c:3835
 msgid "Multi-bookmarks"
 msgstr "プklu-yer imleri"
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3843
 msgid "Review/edit Bookmarks files"
 msgstr "Yer 慆i dosyalarn g驆den ge蓾r/dzenle"
 
-#: src/LYOptions.c:3837
+#: src/LYOptions.c:3845
 msgid "Goto multi-bookmark menu"
 msgstr "プklu-yer imi mensne git"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3847
 msgid "Bookmarks file"
 msgstr "Yer 慆leri dosyas"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3845
+#: src/LYOptions.c:3853
 msgid "Visited Pages"
 msgstr "U繢anan Sayfalar"
 
-#: src/LYOptions.c:3850
+#: src/LYOptions.c:3858
 msgid "View the file "
 msgstr "Dosyay g顤ntle"
 
@@ -5082,38 +5085,38 @@ msgstr "Lynx: balayamyor, CERN kurallar dosyas %s temin edilemiyor\n"
 msgid "(no name)"
 msgstr "(isimsiz)"
 
-#: src/LYReadCFG.c:1782
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "lynx.cfg i蔒rmeleri, %d'den 蔞k i蓾蔒 ge蔂i -- belki bir d霵g olmasn?\n"
 
-#: src/LYReadCFG.c:1784
+#: src/LYReadCFG.c:1786
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Son kalklan i蔒rme '%s' idi,\n"
 
-#: src/LYReadCFG.c:1785
+#: src/LYReadCFG.c:1787
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "'%s'den i蔒rilmiti.\n"
 
-#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263
+#: src/LYReadCFG.c:2194 src/LYReadCFG.c:2207 src/LYReadCFG.c:2265
 msgid "The following is read from your lynx.cfg file."
 msgstr "Aa蹥daki, lynx.cfg dosyanzdan okunmutur."
 
-#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206
+#: src/LYReadCFG.c:2195 src/LYReadCFG.c:2208
 msgid "Please read the distribution"
 msgstr "Ltfen daha fazla yorum i蓾n"
 
-#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209
+#: src/LYReadCFG.c:2201 src/LYReadCFG.c:2211
 msgid "for more comments."
 msgstr "da蹥tm okuyunuz."
 
-#: src/LYReadCFG.c:2245
+#: src/LYReadCFG.c:2247
 msgid "RELOAD THE CHANGES"
 msgstr "DE倎睚KL尟LER YEN媶EN Y軴LE"
 
-#: src/LYReadCFG.c:2253
+#: src/LYReadCFG.c:2255
 msgid "Your primary configuration"
 msgstr "Birincil ayarlarnz"
 
@@ -5382,33 +5385,33 @@ msgstr "Yklenecek yer:"
 msgid "Upload options:"
 msgstr "Ykleme se蔒nekleri:"
 
-#: src/LYUtils.c:1716
+#: src/LYUtils.c:1777
 msgid "Download document URL put to clipboard."
 msgstr "Belge indirme URL'sini panoya koy."
 
-#: src/LYUtils.c:2493
+#: src/LYUtils.c:2554
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Bu URL emas i蓾n umulmadk eriim protokol."
 
-#: src/LYUtils.c:3301
+#: src/LYUtils.c:3362
 msgid "Too many tempfiles"
 msgstr "プk sayda ge蓾ci dosya"
 
-#: src/LYUtils.c:3605
+#: src/LYUtils.c:3666
 msgid "unknown restriction"
 msgstr "bilinmeyen kstlama"
 
-#: src/LYUtils.c:3635
+#: src/LYUtils.c:3696
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Hi蓫ir kstlama kurulmam.\n"
 
-#: src/LYUtils.c:3638
+#: src/LYUtils.c:3699
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Kurulmu kstlamalar:\n"
 
-#: src/LYUtils.c:5022
+#: src/LYUtils.c:5077
 msgid "Cannot find HOME directory"
 msgstr "EV dizini bulunamyor"
 
diff --git a/po/uk.po b/po/uk.po
index 89c457f9..139ba9e6 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3,13 +3,13 @@
 # Volodymyr M. Lisivka <lvm@mystery.lviv.net>, 2003
 # Dmytro O. Redchuk <dor@kiev-online.net>, 2001-2002
 # Olexander Kunytsa <kunia@snark.ukma.kiev.ua>, 2000-2001
-# @Id: uk.po 1.14 Thu, 02 Jun 2005 15:36:59 -0700 dickey @
+# @Id: uk.po 1.15 Sun, 16 Oct 2005 17:17:20 -0700 dickey @
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.5pre9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-30 18:03-0400\n"
+"POT-Creation-Date: 2005-10-16 19:03-0400\n"
 "PO-Revision-Date: 2003-01-22 18:21EEST\n"
 "Last-Translator: Volodymyr M. Lisivka <lvm@mystery.lviv.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -2310,7 +2310,7 @@ msgstr "(牄 糸曬.)"
 msgid "(No value.)"
 msgstr "(牄 硩醣曬恮.)"
 
-#: LYMessages.c:713 src/LYOptions.c:2382
+#: LYMessages.c:713 src/LYOptions.c:2385
 msgid "None"
 msgstr "謢瘐ж"
 
@@ -2865,7 +2865,7 @@ msgstr ""
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8508
+#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8515
 msgid "Loading incomplete."
 msgstr "避蹉埡秸恄 恓 睋覂砢曬."
 
@@ -2984,12 +2984,12 @@ msgstr "蟥眐杻 冾疶衲欳醣 恔 蚥眢籤 恘訰 '%s':"
 msgid "Change password?"
 msgstr "穻恌埩 釓眐杻?"
 
-#: WWW/Library/Implementation/HTNews.c:1736
+#: WWW/Library/Implementation/HTNews.c:1706
 #, c-format
 msgid "No matches for: %s"
 msgstr "謢瘐ж 蚧珋珌 恔 %s"
 
-#: WWW/Library/Implementation/HTNews.c:1789
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2997,7 +2997,7 @@ msgstr ""
 "\n"
 "醚芩 衲轂戀  疆 й桸.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1801
+#: WWW/Library/Implementation/HTNews.c:1768
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -3008,16 +3008,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1814
+#: WWW/Library/Implementation/HTNews.c:1781
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  鯥轂啈 %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1837
+#: WWW/Library/Implementation/HTNews.c:1804
 msgid "Earlier articles"
 msgstr "潀杻 畛恄 衲轂啈"
 
-#: WWW/Library/Implementation/HTNews.c:1850
+#: WWW/Library/Implementation/HTNews.c:1817
 #, c-format
 msgid ""
 "\n"
@@ -3028,41 +3028,41 @@ msgstr ""
 " 鰍衲桸恌虭 礎曶 %d 衲轂戀  %s,  埡侂虭 ID:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1912
+#: WWW/Library/Implementation/HTNews.c:1879
 msgid "All available articles in "
 msgstr "灃 鰍衲桸峖 衲轂啈  "
 
-#: WWW/Library/Implementation/HTNews.c:2133
+#: WWW/Library/Implementation/HTNews.c:2093
 msgid "Later articles"
 msgstr "潀杻 虷硩 衲轂啈"
 
-#: WWW/Library/Implementation/HTNews.c:2156
+#: WWW/Library/Implementation/HTNews.c:2116
 msgid "Post to "
 msgstr "轀藻蚝轂 衲轂埬 鰍 "
 
-#: WWW/Library/Implementation/HTNews.c:2377
+#: WWW/Library/Implementation/HTNews.c:2337
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "蒛 佮忖拏 恓 芩 虷齟疶豖 SNEWS URL'肉."
 
-#: WWW/Library/Implementation/HTNews.c:2585
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2616
+#: WWW/Library/Implementation/HTNews.c:2576
 msgid "Connecting to NewsHost ..."
 msgstr "藀'勾挍友珃 鰍 鬌眢籤 鎯訰 ..."
 
-#: WWW/Library/Implementation/HTNews.c:2668
+#: WWW/Library/Implementation/HTNews.c:2628
 #, c-format
 msgid "Could not access %s."
 msgstr "醚迍筇屺 虷'勾恔埩衭 鰍 %s."
 
-#: WWW/Library/Implementation/HTNews.c:2774
+#: WWW/Library/Implementation/HTNews.c:2734
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "醚迍筇屺 珆疶芩埩 缶に眝謄池. 鬌眢籤 恘訰 %.20s 佹秸: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2778
+#: WWW/Library/Implementation/HTNews.c:2738
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "醚迍筇屺 珆疶芩埩 缶に眝謄池, 俵眐笥百 蛈饒梖 蛈 蚥眢籤 %s"
@@ -3070,22 +3070,22 @@ msgstr "醚迍筇屺 珆疶芩埩 缶に眝謄池, 俵眐笥百 蛈饒梖 蛈 蚥眢籤 %s"
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2982
+#: WWW/Library/Implementation/HTNews.c:2942
 msgid "Reading list of available newsgroups."
 msgstr "尕薑迍 衄孖玹 鰍衲桸恌 й桸 恘訰."
 
-#: WWW/Library/Implementation/HTNews.c:3003
+#: WWW/Library/Implementation/HTNews.c:2963
 msgid "Reading list of articles in newsgroup."
 msgstr "尕薑迍 衄孖玹 衲轂戀  冾恇籤曬疆."
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:3009
+#: WWW/Library/Implementation/HTNews.c:2969
 msgid "Reading news article."
 msgstr "擸疶邯友 衲轂埬."
 
-#: WWW/Library/Implementation/HTNews.c:3039
+#: WWW/Library/Implementation/HTNews.c:2999
 msgid "Sorry, could not load requested news."
 msgstr "鼵臏痽, 恓 袎賻珃 訰婧л 臏祫峖 恘訰恌."
 
@@ -3093,11 +3093,11 @@ msgstr "鼵臏痽, 恓 袎賻珃 訰婧л 臏祫峖 恘訰恌."
 msgid "Address has invalid port"
 msgstr "慁疻蚆 芩 恓蛈眛珌 俵眕"
 
-#: WWW/Library/Implementation/HTTCP.c:1320
+#: WWW/Library/Implementation/HTTCP.c:1308
 msgid "Address length looks invalid"
 msgstr "餀趼妅 謐疻蚕, 蚧珋, 恓蛈眛"
 
-#: WWW/Library/Implementation/HTTCP.c:1552 WWW/Library/Implementation/HTTCP.c:1570
+#: WWW/Library/Implementation/HTTCP.c:1539 WWW/Library/Implementation/HTTCP.c:1557
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "醚 迍笝 硩購埩 蛈闡賻曬圴 蚥眢籤 %s."
@@ -3106,38 +3106,38 @@ msgstr "醚 迍笝 硩購埩 蛈闡賻曬圴 蚥眢籤 %s."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1567 WWW/Library/Implementation/HTTelnet.c:108
+#: WWW/Library/Implementation/HTTCP.c:1554 WWW/Library/Implementation/HTTelnet.c:108
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "醚倷避妀媓 糸' 芩袶恌 %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1568
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "壧埡恘訞壑迍 %s '勾恔恄 鰍 %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1579
 msgid "socket failed."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1605
+#: WWW/Library/Implementation/HTTCP.c:1592
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1629
+#: WWW/Library/Implementation/HTTCP.c:1616
 msgid "Could not make connection non-blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1697
+#: WWW/Library/Implementation/HTTCP.c:1684
 msgid "Connection failed (too many retries)."
 msgstr "'勾恔埩衭 恓 袎賻珃 (睋臏Щ婘 衄眐)."
 
-#: WWW/Library/Implementation/HTTCP.c:1896
+#: WWW/Library/Implementation/HTTCP.c:1883
 msgid "Could not restore socket to blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1962
+#: WWW/Library/Implementation/HTTCP.c:1949
 msgid "Socket read failed for 180,000 tries."
 msgstr ""
 
@@ -3443,98 +3443,98 @@ msgstr ""
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr ""
 
-#: src/GridText.c:3594
+#: src/GridText.c:3601
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** 謯'嚪 玃殣謯闀 ***"
 
-#: src/GridText.c:6013 src/GridText.c:6020 src/LYList.c:248
+#: src/GridText.c:6020 src/GridText.c:6027 src/LYList.c:248
 msgid "unknown field or link"
 msgstr "恓蛈鰍芶 俵旼 瘃 俵蚕攽恄"
 
-#: src/GridText.c:6029
+#: src/GridText.c:6036
 msgid "text entry field"
 msgstr "埧剆婘覂 俵旼"
 
-#: src/GridText.c:6032
+#: src/GridText.c:6039
 msgid "password entry field"
 msgstr "俵旼 跂狦 釓眐曶"
 
-#: src/GridText.c:6035
+#: src/GridText.c:6042
 msgid "checkbox"
 msgstr "陓疻虭佹"
 
-#: src/GridText.c:6038
+#: src/GridText.c:6045
 msgid "radio button"
 msgstr "畛藻玹恘倓"
 
-#: src/GridText.c:6041
+#: src/GridText.c:6048
 msgid "submit button"
 msgstr "冼玿佹 睋婟籤齡曬恮"
 
-#: src/GridText.c:6044
+#: src/GridText.c:6051
 msgid "reset button"
 msgstr "佮避自 蛈騵缶 硰缶"
 
-#: src/GridText.c:6047
+#: src/GridText.c:6054
 msgid "popup menu"
 msgstr "赽倢屺謊畷 芶怹"
 
-#: src/GridText.c:6050
+#: src/GridText.c:6057
 msgid "hidden form field"
 msgstr "倷圮瓬蹉 俵旼 に眝"
 
-#: src/GridText.c:6053
+#: src/GridText.c:6060
 msgid "text entry area"
 msgstr "埧剆婘袬 狟攽衲"
 
-#: src/GridText.c:6056
+#: src/GridText.c:6063
 msgid "range entry field"
 msgstr ""
 
-#: src/GridText.c:6059
+#: src/GridText.c:6066
 msgid "file entry field"
 msgstr "俵旼 跂狦 そ帎"
 
-#: src/GridText.c:6062
+#: src/GridText.c:6069
 msgid "text-submit field"
 msgstr ""
 
-#: src/GridText.c:6065
+#: src/GridText.c:6072
 msgid "image-submit button"
 msgstr "硨觴輿曬恮-冼玿佹 騷 蛈鼯妀侂"
 
-#: src/GridText.c:6068
+#: src/GridText.c:6075
 msgid "keygen field"
 msgstr ""
 
-#: src/GridText.c:6071
+#: src/GridText.c:6078
 msgid "unknown form field"
 msgstr "恓蛈鰍芶 俵旼 に眝"
 
-#: src/GridText.c:10231
+#: src/GridText.c:10244
 msgid "Can't open file for uploading"
 msgstr "醚迍筇屺 蛈騰疶埩 そ帎 騷 瘃埡恄."
 
-#: src/GridText.c:11384
+#: src/GridText.c:11397
 #, c-format
 msgid "Submitting %s"
 msgstr "轂覂痁笝友 %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12533
+#: src/GridText.c:12546
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12738
+#: src/GridText.c:12751
 msgid "Wrap lines to fit displayed area?"
 msgstr ""
 
-#: src/GridText.c:12790
+#: src/GridText.c:12803
 msgid "Very long lines have been wrapped!"
 msgstr "馻秸 鰍觙 眒騰 謬旻 睋覂眛梊!"
 
-#: src/GridText.c:13232
+#: src/GridText.c:13245
 msgid "Very long lines have been truncated!"
 msgstr ""
 
@@ -3646,15 +3646,15 @@ msgstr ""
 msgid "(unknown)"
 msgstr "(恓蛈鰍虭)"
 
-#: src/HTML.c:7374
+#: src/HTML.c:7375
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "餀劼芶拏 穻衲尕 旻袹 倷圮瓬蹉 俵蚕攽恄. 鼵冾疶衲購埧 冾芩恅 'l'ist."
 
-#: src/HTML.c:7873
+#: src/HTML.c:7874
 msgid "Source cache error - disk full?"
 msgstr "蟴虭昋 侜觛袬恄 齡籤攫 - 睋俵谻曬圴 馨蚎?"
 
-#: src/HTML.c:7886
+#: src/HTML.c:7887
 msgid "Source cache error - not enough memory!"
 msgstr "蟴虭昋 侜觛袬恄 齡籤攫 - 恓鰍衲轂挎 釓'晟!"
 
@@ -3756,31 +3756,31 @@ msgstr "龕梊狾褁百"
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "俵虭昋  cookie_domain_flag_set, 梑屺薑迍 倷珌畛邯"
 
-#: src/LYCurses.c:1017
+#: src/LYCurses.c:1034
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "醚 袎賻珃 缶污汐怞祰袬埩 埧眝缶賻 - 恓蛈鰍虭 埩 埧眝缶賻?"
 
-#: src/LYCurses.c:1442
+#: src/LYCurses.c:1459
 msgid "Terminal ="
 msgstr "蠐眝缶賻 ="
 
-#: src/LYCurses.c:1446
+#: src/LYCurses.c:1463
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "鼵 芩夭 訰冾疶衲瓬欳轂  疆分 倷珌畛迍 埧眝缶賻 vt100, 200 婘椿."
 
-#: src/LYCurses.c:1495
+#: src/LYCurses.c:1512
 msgid "Your Terminal type is unknown!"
 msgstr "蠖 袬裉ж 埧眝缶賻 恓蛈鰍虭!"
 
-#: src/LYCurses.c:1496
+#: src/LYCurses.c:1513
 msgid "Enter a terminal type:"
 msgstr "蠯鼴耒 埩 埧眝缶賻:"
 
-#: src/LYCurses.c:1510
+#: src/LYCurses.c:1527
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "鏻 醲襡塗摐 蘼酃闀籧槴 "
 
-#: src/LYCurses.c:2007
+#: src/LYCurses.c:2031
 #, c-format
 msgid ""
 "\n"
@@ -3789,7 +3789,7 @@ msgstr ""
 "\n"
 "碻埡杻恔 俵虭昋  %s, 覂眑老 %s\n"
 
-#: src/LYCurses.c:2010
+#: src/LYCurses.c:2034
 #, c-format
 msgid ""
 "\n"
@@ -4344,52 +4344,52 @@ msgstr ""
 "碻帎 Lynx %s 恓鰍衲桸恌.\n"
 "\n"
 
-#: src/LYMain.c:1763
+#: src/LYMain.c:1750
 msgid "Warning:"
 msgstr "灉豳:"
 
-#: src/LYMain.c:2328
+#: src/LYMain.c:2315
 msgid "persistent cookies state will be changed in next session only."
 msgstr ""
 
-#: src/LYMain.c:2565 src/LYMain.c:2610
+#: src/LYMain.c:2552 src/LYMain.c:2597
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr ""
 
-#: src/LYMain.c:3121
+#: src/LYMain.c:3108
 #, fuzzy, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s 鷕眑老 %s (%s)\n"
 
-#: src/LYMain.c:3156
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "汕畛恘 恔 %s %s %s\n"
 
-#: src/LYMain.c:3178
+#: src/LYMain.c:3165
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors."
 msgstr ""
 
-#: src/LYMain.c:3179
+#: src/LYMain.c:3166
 msgid "Distributed under the GNU General Public License."
 msgstr "藲硞瓬蚗齡掑婥衭 硥汛恘  GNU General Public License."
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3167
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "韎 http://lynx.isc.org/ 埡 玴攽庉-鰍俵迍м, 椿 跁恔埩 礎杻袹."
 
-#: src/LYMain.c:3952
+#: src/LYMain.c:3939
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "玃錝襢黀搿闃: %s [釓畛芶婞巿 [そ帎]\n"
 
-#: src/LYMain.c:3953
+#: src/LYMain.c:3940
 #, c-format
 msgid "Options are:\n"
 msgstr "蟥畛芶婞:\n"
 
-#: src/LYMain.c:4252
+#: src/LYMain.c:4239
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: 醚蛈眛圴 釓畛芶婞: %s\n"
@@ -4466,7 +4466,7 @@ msgstr ""
 msgid "Current URL is empty."
 msgstr "蟴婘痸圴 佹埡昑:"
 
-#: src/LYMainLoop.c:6935 src/LYUtils.c:1714
+#: src/LYMainLoop.c:6935 src/LYUtils.c:1775
 msgid "Copy to clipboard failed."
 msgstr ""
 
@@ -4562,279 +4562,279 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr ""
 
-#: src/LYOptions.c:758
+#: src/LYOptions.c:761
 msgid "review/edit B)ookmarks files"
 msgstr "倷珌曶挍埩/硰缶尕 そ帎 賸攽馨恘 (B)"
 
-#: src/LYOptions.c:760
+#: src/LYOptions.c:763
 msgid "B)ookmark file: "
 msgstr "B) そ帎 睋佮謐妅玹: "
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2126 src/LYOptions.c:2133
 msgid "ON"
 msgstr ""
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2277 src/LYOptions.c:2288
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280 src/LYOptions.c:2291
 msgid "OFF"
 msgstr ""
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2128
 msgid "NEVER"
 msgstr ""
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2129
 msgid "ALWAYS"
 msgstr ""
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2269
+#: src/LYOptions.c:2145 src/LYOptions.c:2272
 msgid "ignore"
 msgstr ""
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2146
 msgid "ask user"
 msgstr ""
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2147
 msgid "accept all"
 msgstr ""
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS OFF"
 msgstr ""
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2160
 msgid "FOR LOCAL FILES ONLY"
 msgstr ""
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2162
 msgid "ALWAYS ON"
 msgstr ""
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2174
 msgid "Numbers act as arrows"
 msgstr ""
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Links and form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2182
 msgid "Form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2189
+#: src/LYOptions.c:2192
 msgid "Case insensitive"
 msgstr ""
 
-#: src/LYOptions.c:2190
+#: src/LYOptions.c:2193
 msgid "Case sensitive"
 msgstr ""
 
-#: src/LYOptions.c:2214
+#: src/LYOptions.c:2217
 msgid "prompt normally"
 msgstr ""
 
-#: src/LYOptions.c:2215
+#: src/LYOptions.c:2218
 msgid "force yes-response"
 msgstr ""
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2219
 msgid "force no-response"
 msgstr ""
 
-#: src/LYOptions.c:2234
+#: src/LYOptions.c:2237
 #, fuzzy
 msgid "Novice"
 msgstr "謢瘐ж"
 
-#: src/LYOptions.c:2235
+#: src/LYOptions.c:2238
 #, fuzzy
 msgid "Intermediate"
 msgstr "龕梊狾褁百"
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2239
 msgid "Advanced"
 msgstr ""
 
-#: src/LYOptions.c:2245
+#: src/LYOptions.c:2248
 msgid "By First Visit"
 msgstr ""
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2250
 msgid "By First Visit Reversed"
 msgstr ""
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2251
 msgid "As Visit Tree"
 msgstr ""
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2252
 msgid "By Last Visit"
 msgstr ""
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2254
 msgid "By Last Visit Reversed"
 msgstr ""
 
 #. Old_DTD variable
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2265
 msgid "relaxed (TagSoup mode)"
 msgstr ""
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2266
 msgid "strict (SortaSGML mode)"
 msgstr ""
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2273
 msgid "as labels"
 msgstr ""
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2274
 #, fuzzy
 msgid "as links"
 msgstr "藷 俵蚕攽恄"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2281
 #, fuzzy
 msgid "show filename"
 msgstr " (俵Щ恓 糸' そ帎)"
 
-#: src/LYOptions.c:2289
+#: src/LYOptions.c:2292
 msgid "STANDARD"
 msgstr ""
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2293
 msgid "ADVANCED"
 msgstr ""
 
 # 醲襡塗瀌檭填
 # 醲襡塗瀌檭填
-#: src/LYOptions.c:2316
+#: src/LYOptions.c:2319
 #, fuzzy
 msgid "Directories first"
 msgstr "藀騰轂賻珌:"
 
 # 譨ё攪 http://enigma.x-telecom.net/ 豝籤袹 (虭 埡 暙 恓 謬旻)
 # 譨ё攪 http://enigma.x-telecom.net/ 豝籤袹 (虭 埡 暙 恓 謬旻)
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2320
 #, fuzzy
 msgid "Files first"
 msgstr " 豝籤袹"
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2321
 msgid "Mixed style"
 msgstr ""
 
 # @ Dia GIMP Gabber Galeon- Ximian-setup-tools balsa control-center evolution gimp gimp-std-plugins- glade- gnome-core gnome-libs gnome-pim gnomeicu gphoto graphite guppi kandy kandy.po kateprojectmanager.po kcmemail kcmkio kde-i18n_4:2.2.2-2_kdeprintfax.po kdelibs kmail kmenuedit knode koffice korganizer ksysguard kword lynx pybliographer red-carpet rpmdrake screem userdrake xchat
 # * Yuriy Syrota <yuri@renome.rovno.ua>
-#: src/LYOptions.c:2326 src/LYOptions.c:2343
+#: src/LYOptions.c:2329 src/LYOptions.c:2346
 #, fuzzy
 msgid "By Name"
 msgstr "轀稊:"
 
-#: src/LYOptions.c:2327 src/LYOptions.c:2344
+#: src/LYOptions.c:2330 src/LYOptions.c:2347
 msgid "By Type"
 msgstr ""
 
-#: src/LYOptions.c:2328 src/LYOptions.c:2345
+#: src/LYOptions.c:2331 src/LYOptions.c:2348
 #, fuzzy
 msgid "By Size"
 msgstr "煻彸肉:"
 
-#: src/LYOptions.c:2329 src/LYOptions.c:2346
+#: src/LYOptions.c:2332 src/LYOptions.c:2349
 #, fuzzy
 msgid "By Date"
 msgstr "靾埡:"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2333
 msgid "By Mode"
 msgstr ""
 
-#: src/LYOptions.c:2332
+#: src/LYOptions.c:2335
 msgid "By User"
 msgstr ""
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 #, fuzzy
 msgid "By Group"
 msgstr "觰桸"
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2357
 msgid "Do not show rate"
 msgstr ""
 
 # 陓疻佹皙袬恄 - 蟠 恓 硩謊, 劼馨,  捀圴 礎.
 # (趼 刳鄹 "陓疻鐘袬恄", 蟠 陓疻鐘瓾 - 恓 硨赽糸 倷狪籣, 恔畷)
-#: src/LYOptions.c:2355 src/LYOptions.c:2356
+#: src/LYOptions.c:2358 src/LYOptions.c:2359
 #, fuzzy, c-format
 msgid "Show %s/sec rate"
 msgstr "蟔疻佹皙袬恄 鐘恌 睋覂砢曬."
 
-#: src/LYOptions.c:2358 src/LYOptions.c:2359
+#: src/LYOptions.c:2361 src/LYOptions.c:2362
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr ""
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2374
 msgid "Accept lynx's internal types"
 msgstr ""
 
-#: src/LYOptions.c:2372
+#: src/LYOptions.c:2375
 msgid "Also accept lynx.cfg's types"
 msgstr ""
 
-#: src/LYOptions.c:2373
+#: src/LYOptions.c:2376
 msgid "Also accept user's types"
 msgstr ""
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "Also accept system's types"
 msgstr ""
 
 # msgstr "襓圴恮埩"
 # 迋迋... 恓 硩謊. (冾拏)轄м芶拏?
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 #, fuzzy
 msgid "Accept all types"
 msgstr "蹈眐袬馨埩 硰缶"
 
-#: src/LYOptions.c:2384
+#: src/LYOptions.c:2387
 msgid "gzip"
 msgstr ""
 
-#: src/LYOptions.c:2385
+#: src/LYOptions.c:2388
 msgid "deflate"
 msgstr ""
 
-#: src/LYOptions.c:2388
+#: src/LYOptions.c:2391
 msgid "compress"
 msgstr ""
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2394
 msgid "bzip2"
 msgstr ""
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2396
 msgid "All"
 msgstr ""
 
-#: src/LYOptions.c:2658 src/LYOptions.c:2682
+#: src/LYOptions.c:2664 src/LYOptions.c:2688
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "%s 訰佮夼薑 簉怹 轀攽觚欳蹉!"
 
-#: src/LYOptions.c:3429
+#: src/LYOptions.c:3438
 msgid "(options marked with (!) will not be saved)"
 msgstr "(釓畛芶婞 蛈騵汍峖 (!) 恓 謬齣婥 睋倅蚆峖)"
 
 # @ GIMP lynx
 # * Yuri Syrota <rasta@renome.rovno.ua>
-#: src/LYOptions.c:3437
+#: src/LYOptions.c:3446
 msgid "General Preferences"
 msgstr "豳賻媓 恔攽觚欳蹉恮"
 
@@ -4842,82 +4842,82 @@ msgstr "豳賻媓 恔攽觚欳蹉恮"
 # 礎杻袹 俵鰍臏夭寔 "冾疶衲欳蹉恮"
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3450
 msgid "User mode"
 msgstr "艣窔 冾疶衲欳蹉恮"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3447
+#: src/LYOptions.c:3456
 msgid "Editor"
 msgstr "艣鐘刱玾"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3461
 msgid "Type of Search"
 msgstr "蠖 俵觛劼"
 
-#: src/LYOptions.c:3457
+#: src/LYOptions.c:3466
 msgid "Security and Privacy"
 msgstr ""
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3461
+#: src/LYOptions.c:3470
 msgid "Cookies"
 msgstr "輴眚夼"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3475
+#: src/LYOptions.c:3484
 msgid "Invalid-Cookie Prompting"
 msgstr ""
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3482
+#: src/LYOptions.c:3491
 msgid "SSL Prompting"
 msgstr ""
 
-#: src/LYOptions.c:3488
+#: src/LYOptions.c:3497
 msgid "Keyboard Input"
 msgstr "蠯汛  佮避汐婭疶"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3492
+#: src/LYOptions.c:3501
 msgid "Keypad mode"
 msgstr "蓖の瓬 佮避汐婭畛"
 
 # msgstr "輲避自 Emacs"
 # msgstr "輲避自 Emacs"
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3498
+#: src/LYOptions.c:3507
 msgid "Emacs keys"
 msgstr "輲濯 Emacs"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3513
 msgid "VI keys"
 msgstr "輲濯 VI"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3511
+#: src/LYOptions.c:3520
 msgid "Line edit style"
 msgstr ""
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3532
 msgid "Keyboard layout"
 msgstr "藲硪攽騰 佮避汐婭疶"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3537
+#: src/LYOptions.c:3546
 msgid "Display and Character Set"
 msgstr "韎衄旼 埡 恔礎 蚕邰玶肉"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3542
+#: src/LYOptions.c:3551
 #, fuzzy
 msgid "Use locale-based character set"
 msgstr "蠯輿轂 冾齣袬恄敊 鰍劼芶拏"
@@ -4927,11 +4927,11 @@ msgstr "蠯輿轂 冾齣袬恄敊 鰍劼芶拏"
 # ???
 # msgstr "轀礎 蚕邰玶肉 馨衄旼"
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3551
+#: src/LYOptions.c:3560
 msgid "Display character set"
 msgstr "轀礎 蚕邰玶肉 馨衄旼"
 
-#: src/LYOptions.c:3582
+#: src/LYOptions.c:3591
 msgid "Assumed document character set"
 msgstr "蠯輿轂 冾齣袬恄敊 鰍劼芶拏"
 
@@ -4940,69 +4940,72 @@ msgstr "蠯輿轂 冾齣袬恄敊 鰍劼芶拏"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3602
+#: src/LYOptions.c:3611
 msgid "CJK mode"
 msgstr "艣窔 CJK"
 
 # msgstr "鯗畛趼峖 8礎"
 # 迍秸 "8-bit - 捀 " ?-)
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3613
 msgid "Raw 8-bit"
 msgstr "艣窔 Raw 8-bit"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3612
+#: src/LYOptions.c:3621
 msgid "X Display"
 msgstr "X 韎衄旼"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3618
+#: src/LYOptions.c:3627
 msgid "Document Appearance"
 msgstr "鼵д挭 鰍劼芶拏"
 
-#: src/LYOptions.c:3624
+#: src/LYOptions.c:3633
 msgid "Show color"
 msgstr "蟴佹祰袬埩 冾杻玾"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3648
+#: src/LYOptions.c:3657
 msgid "Show cursor"
 msgstr "蟴佹祰袬埩 劼眑玾"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3663
 #, fuzzy
 msgid "Underline links"
 msgstr "襓圮瓬蹉 俵蚕攽恄:"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3670
 msgid "Show scrollbar"
 msgstr "蟴佹祰袬埩 冾杻玾"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3668
+#: src/LYOptions.c:3677
 msgid "Popups for select fields"
 msgstr "藲硪疶娵 俵怞 訰蟠眙"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3674
+#: src/LYOptions.c:3683
 msgid "HTML error recovery"
 msgstr "鼵倷避曶恄 俵虭昑 HTML"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3680
+#: src/LYOptions.c:3689
 msgid "Show images"
 msgstr "蟴佹祰袬埩 硨觴輿曬恮"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3694
+#: src/LYOptions.c:3703
 msgid "Verbose images"
 msgstr "餀鐘堍瓬 倷 硨觴輿曬恮"
 
-#: src/LYOptions.c:3703
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3711
 msgid "Headers Transferred to Remote Servers"
 msgstr "豳玶瓬侂 騷 轀鼯妀蹉恮 恔 鬌眢籤"
 
@@ -5012,12 +5015,12 @@ msgstr "豳玶瓬侂 騷 轀鼯妀蹉恮 恔 鬌眢籤"
 # msgstr "慁疻蚆 攫攣婞玴恘 俵觚"
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3715
 msgid "Personal mail address"
 msgstr "蟔眑玴賻媓 俵觚瓬 謐疻蚆"
 
 #. Mail Address: INPUT
-#: src/LYOptions.c:3712
+#: src/LYOptions.c:3720
 #, fuzzy
 msgid "Password for anonymous ftp"
 msgstr "蟥眐杻 冾疶衲欳醣 恔 蚥眢籤 恘訰 '%s':"
@@ -5025,28 +5028,28 @@ msgstr "蟥眐杻 冾疶衲欳醣 恔 蚥眢籤 恘訰 '%s':"
 # 陓疻佹瓾恘 - 蟠 恓 硩謊, 劼馨,  捀圴 礎.
 # 陓疻佹瓾恘 - 蟠 恓 硩謊, 劼馨,  捀圴 礎.
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3717
+#: src/LYOptions.c:3725
 #, fuzzy
 msgid "Preferred media type"
 msgstr "蟔疻佹瓾恘 %d 臏彸肉"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3723
+#: src/LYOptions.c:3731
 #, fuzzy
 msgid "Preferred encoding"
 msgstr "懽擢旼恔 迍袬 鰍劼芶拏"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3729
+#: src/LYOptions.c:3737
 msgid "Preferred document character set"
 msgstr "懽擢旼恌 恔礎 蚕邰玶肉"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3742
 msgid "Preferred document language"
 msgstr "懽擢旼恔 迍袬 鰍劼芶拏"
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3748
 msgid "User-Agent header"
 msgstr "豳玶瓬玹 User-Agent"
 
@@ -5057,70 +5060,70 @@ msgstr "豳玶瓬玹 User-Agent"
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3748
+#: src/LYOptions.c:3756
 msgid "Listing and Accessing Files"
 msgstr "鯗孖侂 埡 餀衲桸 鰍 碻帎肉"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3752
+#: src/LYOptions.c:3760
 msgid "FTP sort criteria"
 msgstr "遻尕籤百 衃眕欳蹉恮 佹埡昑レ FTP"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3759
+#: src/LYOptions.c:3767
 msgid "Local directory sort criteria"
 msgstr "遻尕籤百 衃眕欳蹉恮 昑佹杻恌 佹埡昑レ"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3773
 msgid "Local directory sort order"
 msgstr "蟴眒鰍 衃眕欳蹉恮 昑佹杻恌 佹埡昑レ"
 
-#: src/LYOptions.c:3774
+#: src/LYOptions.c:3782
 msgid "Show dot files"
 msgstr "蟴佹祰袬埩 倷圮瓬蹉 そ帎"
 
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3790
 msgid "Execution links"
 msgstr "蹈梌佹恄 倷珌畛 睋 俵蚕攽恄敊"
 
 # 陓疻佹皙袬恄 - 蟠 恓 硩謊, 劼馨,  捀圴 礎.
 # (趼 刳鄹 "陓疻鐘袬恄", 蟠 陓疻鐘瓾 - 恓 硨赽糸 倷狪籣, 恔畷)
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3810
 msgid "Show transfer rate"
 msgstr "蟔疻佹皙袬恄 鐘恌 睋覂砢曬."
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3830
 msgid "Special Files and Screens"
 msgstr "鯗鷗汐杻峖 碻帎 埡 樆畛恌"
 
-#: src/LYOptions.c:3827
+#: src/LYOptions.c:3835
 msgid "Multi-bookmarks"
 msgstr "孖攫媓 そ帎 睋佮謐妅玹"
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3843
 msgid "Review/edit Bookmarks files"
 msgstr "襓狦屺尕孖/艣鐘м袬埩 睋佮謐妅侂"
 
-#: src/LYOptions.c:3837
+#: src/LYOptions.c:3845
 msgid "Goto multi-bookmark menu"
 msgstr "蟔疻彸 鰍 芶怹 multi-bookmar"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3847
 msgid "Bookmarks file"
 msgstr "碻帎 睋佮謐妅玹"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3845
+#: src/LYOptions.c:3853
 msgid "Visited Pages"
 msgstr "襓珌曶挍啈 衲玾缶侂"
 
-#: src/LYOptions.c:3850
+#: src/LYOptions.c:3858
 msgid "View the file "
 msgstr "蟔疻д敆梊 そ帎 "
 
@@ -5234,38 +5237,38 @@ msgstr ""
 msgid "(no name)"
 msgstr "(恓芩 糸曬)"
 
-#: src/LYReadCFG.c:1782
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1784
+#: src/LYReadCFG.c:1786
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1785
+#: src/LYReadCFG.c:1787
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "訬抸畷恘邯  '%s'.\n"
 
-#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263
+#: src/LYReadCFG.c:2194 src/LYReadCFG.c:2207 src/LYReadCFG.c:2265
 msgid "The following is read from your lynx.cfg file."
 msgstr "擽 埡侜 謬昑 硩購霰恘  袬裉邯 そ帎 lynx.cfg."
 
-#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206
+#: src/LYReadCFG.c:2195 src/LYReadCFG.c:2208
 msgid "Please read the distribution"
 msgstr "覂眛耒寔 鰍 馨衲疶謬埩袬"
 
-#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209
+#: src/LYReadCFG.c:2201 src/LYReadCFG.c:2211
 msgid "for more comments."
 msgstr "俵 鰍鐘堍瓬 缶に眝謄池."
 
-#: src/LYReadCFG.c:2245
+#: src/LYReadCFG.c:2247
 msgid "RELOAD THE CHANGES"
 msgstr "謥蠈濊敳"
 
-#: src/LYReadCFG.c:2253
+#: src/LYReadCFG.c:2255
 msgid "Your primary configuration"
 msgstr "鷙衖 珃恘谻 冾恇灰梑謄老"
 
@@ -5546,33 +5549,33 @@ msgstr "鬫儷蹉埡窔埩 鰍:"
 msgid "Upload options:"
 msgstr "蟥畛芶婞 蛈儷蹉埡秸恄:"
 
-#: src/LYUtils.c:1716
+#: src/LYUtils.c:1777
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2493
+#: src/LYUtils.c:2554
 msgid "Unexpected access protocol for this URL scheme."
 msgstr ""
 
-#: src/LYUtils.c:3301
+#: src/LYUtils.c:3362
 msgid "Too many tempfiles"
 msgstr ""
 
-#: src/LYUtils.c:3605
+#: src/LYUtils.c:3666
 msgid "unknown restriction"
 msgstr "恓蛈鰍芶 狟芶秸恄"
 
-#: src/LYUtils.c:3635
+#: src/LYUtils.c:3696
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "屩芶秸恄 蛈鼯梊峖.\n"
 
-#: src/LYUtils.c:3638
+#: src/LYUtils.c:3699
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "轀礎 狟芶秸挎:\n"
 
-#: src/LYUtils.c:5022
+#: src/LYUtils.c:5077
 msgid "Cannot find HOME directory"
 msgstr "醚 迍笝 硩購埩 鰍芩褁百 佹埡昑"
 
diff --git a/po/vi.po b/po/vi.po
index 750cec08..915647ba 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx-2.8.6-dev8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-30 18:03-0400\n"
+"POT-Creation-Date: 2005-10-16 19:03-0400\n"
 "PO-Revision-Date: 2005-05-07 01:43+0400\n"
 "Last-Translator: Phan Vinh Thinh <teppi82@gmail.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -2244,7 +2244,7 @@ msgstr "(Kh繫ng t礙n.)"
 msgid "(No value.)"
 msgstr "(Kh繫ng gi獺 tr廙.)"
 
-#: LYMessages.c:713 src/LYOptions.c:2382
+#: LYMessages.c:713 src/LYOptions.c:2385
 msgid "None"
 msgstr "Kh繫ng"
 
@@ -2789,7 +2789,7 @@ msgstr "Kh繫ng t穫m th廕句 ti li廙u v廙i n廙i dung G廙施 trong cache.  G廙
 msgid "Loading failed, use a previous copy."
 msgstr "N廕︾ kh繫ng thnh c繫ng, h瓊y s廙 d廙叩g b廕τ sao trが廙c 璽y."
 
-#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8508
+#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8515
 msgid "Loading incomplete."
 msgstr "N廕︾ thnh c繫ng."
 
@@ -2904,12 +2904,12 @@ msgstr "M廕負 kh廕季 cho m獺y tin t廙妾 '%s':"
 msgid "Change password?"
 msgstr "Thay 廙i m廕負 kh廕季?"
 
-#: WWW/Library/Implementation/HTNews.c:1736
+#: WWW/Library/Implementation/HTNews.c:1706
 #, c-format
 msgid "No matches for: %s"
 msgstr "Kh繫ng c籀 tがヾng 廙姊g cho: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1789
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2917,7 +2917,7 @@ msgstr ""
 "\n"
 "Kh繫ng c籀 bi b獺o trong nh籀m ny.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1801
+#: WWW/Library/Implementation/HTNews.c:1768
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2928,16 +2928,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1814
+#: WWW/Library/Implementation/HTNews.c:1781
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  Bi b獺o %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1837
+#: WWW/Library/Implementation/HTNews.c:1804
 msgid "Earlier articles"
 msgstr "Bi b獺o trが廙c"
 
-#: WWW/Library/Implementation/HTNews.c:1850
+#: WWW/Library/Implementation/HTNews.c:1817
 #, c-format
 msgid ""
 "\n"
@@ -2948,41 +2948,41 @@ msgstr ""
 "C籀 kho廕τg %d bi b獺o trong %s, v廙i ID l:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1912
+#: WWW/Library/Implementation/HTNews.c:1879
 msgid "All available articles in "
 msgstr "T廕另 c廕 bi b獺o trong "
 
-#: WWW/Library/Implementation/HTNews.c:2133
+#: WWW/Library/Implementation/HTNews.c:2093
 msgid "Later articles"
 msgstr "Bi b獺o sau ny"
 
-#: WWW/Library/Implementation/HTNews.c:2156
+#: WWW/Library/Implementation/HTNews.c:2116
 msgid "Post to "
 msgstr "G廙虹 t廙i "
 
-#: WWW/Library/Implementation/HTNews.c:2377
+#: WWW/Library/Implementation/HTNews.c:2337
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Client ny kh繫ng h廙 tr廙 c獺c URL SNEWS."
 
-#: WWW/Library/Implementation/HTNews.c:2585
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr "Kh繫ng c籀 穩ch 廕積 cho vn b廕τ th繫!"
 
-#: WWW/Library/Implementation/HTNews.c:2616
+#: WWW/Library/Implementation/HTNews.c:2576
 msgid "Connecting to NewsHost ..."
 msgstr "ang k廕篙 n廙i t廙i NewsHost ..."
 
-#: WWW/Library/Implementation/HTNews.c:2668
+#: WWW/Library/Implementation/HTNews.c:2628
 #, c-format
 msgid "Could not access %s."
 msgstr "Kh繫ng truy c廕計 が廙θ %s."
 
-#: WWW/Library/Implementation/HTNews.c:2774
+#: WWW/Library/Implementation/HTNews.c:2734
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "Kh繫ng 廙c が廙θ th繫ng tin tin t廙妾.  M獺y tin t廙妾 %.20s 瓊 tr廕 l廙i: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2778
+#: WWW/Library/Implementation/HTNews.c:2738
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Kh繫ng 廙c が廙θ th繫ng tin tin t廙妾, c璽u tr廕 l廙i r廙ng t廙 m獺y %s"
@@ -2990,22 +2990,22 @@ msgstr "Kh繫ng 廙c が廙θ th繫ng tin tin t廙妾, c璽u tr廕 l廙i r廙ng t廙
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2982
+#: WWW/Library/Implementation/HTNews.c:2942
 msgid "Reading list of available newsgroups."
 msgstr "ang 廙c danh s獺ch c廙吧 nh廙疸g nh籀m tin c籀."
 
-#: WWW/Library/Implementation/HTNews.c:3003
+#: WWW/Library/Implementation/HTNews.c:2963
 msgid "Reading list of articles in newsgroup."
 msgstr "ang 廙c danh s獺ch bi b獺o c籀 trong nh籀m tin."
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:3009
+#: WWW/Library/Implementation/HTNews.c:2969
 msgid "Reading news article."
 msgstr "ang 廙c tin t廙妾."
 
-#: WWW/Library/Implementation/HTNews.c:3039
+#: WWW/Library/Implementation/HTNews.c:2999
 msgid "Sorry, could not load requested news."
 msgstr "R廕另 ti廕盧, kh繫ng n廕︾ が廙θ tin t廙妾 y礙u c廕吟."
 
@@ -3013,11 +3013,11 @@ msgstr "R廕另 ti廕盧, kh繫ng n廕︾ が廙θ tin t廙妾 y礙u c廕吟."
 msgid "Address has invalid port"
 msgstr "廙a ch廙 c籀 c廙ng sai"
 
-#: WWW/Library/Implementation/HTTCP.c:1320
+#: WWW/Library/Implementation/HTTCP.c:1308
 msgid "Address length looks invalid"
 msgstr "Chi廙u di 廙a ch廙 c籀 v廕 kh繫ng 繳ng"
 
-#: WWW/Library/Implementation/HTTCP.c:1552 WWW/Library/Implementation/HTTCP.c:1570
+#: WWW/Library/Implementation/HTTCP.c:1539 WWW/Library/Implementation/HTTCP.c:1557
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Kh繫ng 廙nh v廙 が廙θ m獺y 廙 xa %s."
@@ -3026,38 +3026,38 @@ msgstr "Kh繫ng 廙nh v廙 が廙θ m獺y 廙 xa %s."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1567 WWW/Library/Implementation/HTTelnet.c:108
+#: WWW/Library/Implementation/HTTCP.c:1554 WWW/Library/Implementation/HTTelnet.c:108
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "T礙n m獺y kh繫ng 繳ng %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1568
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "ang t廕︽ %s k廕篙 n廙i t廙i %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1579
 msgid "socket failed."
 msgstr "l廙i socket."
 
-#: WWW/Library/Implementation/HTTCP.c:1605
+#: WWW/Library/Implementation/HTTCP.c:1592
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "l廙i socket: family %d 廙a ch廙 %s c廙ng %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1629
+#: WWW/Library/Implementation/HTTCP.c:1616
 msgid "Could not make connection non-blocking."
 msgstr "Kh繫ng t廕︽ が廙θ k廕篙 n廙i kh繫ng ph廕ξ kh廙i."
 
-#: WWW/Library/Implementation/HTTCP.c:1697
+#: WWW/Library/Implementation/HTTCP.c:1684
 msgid "Connection failed (too many retries)."
 msgstr "K廕篙 n廙i kh繫ng thnh c繫ng (qu獺 nhi廙u l廕吵 th廙)."
 
-#: WWW/Library/Implementation/HTTCP.c:1896
+#: WWW/Library/Implementation/HTTCP.c:1883
 msgid "Could not restore socket to blocking."
 msgstr "Kh繫ng ph廙卉 h廙i が廙θ socket thnh kh廙i."
 
-#: WWW/Library/Implementation/HTTCP.c:1962
+#: WWW/Library/Implementation/HTTCP.c:1949
 msgid "Socket read failed for 180,000 tries."
 msgstr "廙c socket kh繫ng thnh c繫ng 180 000 l廕吵."
 
@@ -3361,98 +3361,98 @@ msgstr "C廕》 b廙 nh廙, 瓊 gi獺n o廕》 hi廙n th廙!"
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "C廕》 b廙 nh廙, s廕 gi獺n o廕》 truy廙n t廕ξ!"
 
-#: src/GridText.c:3594
+#: src/GridText.c:3601
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** C廕N B廙 NH廙 ***"
 
-#: src/GridText.c:6013 src/GridText.c:6020 src/LYList.c:248
+#: src/GridText.c:6020 src/GridText.c:6027 src/LYList.c:248
 msgid "unknown field or link"
 msgstr "kh繫ng r繭 v羅ng hay li礙n k廕篙"
 
-#: src/GridText.c:6029
+#: src/GridText.c:6036
 msgid "text entry field"
 msgstr "v羅ng m廙卉 vn b廕τ"
 
-#: src/GridText.c:6032
+#: src/GridText.c:6039
 msgid "password entry field"
 msgstr "v羅ng m廙卉 m廕負 kh廕季"
 
-#: src/GridText.c:6035
+#: src/GridText.c:6042
 msgid "checkbox"
 msgstr "h廙p ki廙m tra"
 
-#: src/GridText.c:6038
+#: src/GridText.c:6045
 msgid "radio button"
 msgstr "n繳t radio"
 
-#: src/GridText.c:6041
+#: src/GridText.c:6048
 msgid "submit button"
 msgstr "n繳t g廙虹 i"
 
-#: src/GridText.c:6044
+#: src/GridText.c:6051
 msgid "reset button"
 msgstr "n繳t 廕暗 l廕【"
 
-#: src/GridText.c:6047
+#: src/GridText.c:6054
 msgid "popup menu"
 msgstr "tr穫nh ヾn t廙 m廙 ra"
 
-#: src/GridText.c:6050
+#: src/GridText.c:6057
 msgid "hidden form field"
 msgstr "v羅ng bi廙u m廕哎 廕姊"
 
-#: src/GridText.c:6053
+#: src/GridText.c:6060
 msgid "text entry area"
 msgstr "ph廕《 vi m廙卉 vn b廕τ"
 
-#: src/GridText.c:6056
+#: src/GridText.c:6063
 msgid "range entry field"
 msgstr "v羅ng m廙卉 s廕皰 x廕穆"
 
-#: src/GridText.c:6059
+#: src/GridText.c:6066
 msgid "file entry field"
 msgstr "v羅ng m廙卉 t廕計 tin"
 
-#: src/GridText.c:6062
+#: src/GridText.c:6069
 msgid "text-submit field"
 msgstr "v羅ng g廙虹 i vn b廕τ"
 
-#: src/GridText.c:6065
+#: src/GridText.c:6072
 msgid "image-submit button"
 msgstr "n繳t g廙虹 i h穫nh 廕τh"
 
-#: src/GridText.c:6068
+#: src/GridText.c:6075
 msgid "keygen field"
 msgstr "v羅ng keygen"
 
-#: src/GridText.c:6071
+#: src/GridText.c:6078
 msgid "unknown form field"
 msgstr "v羅ng bi廙u m廕哎 kh繫ng r繭"
 
-#: src/GridText.c:10231
+#: src/GridText.c:10244
 msgid "Can't open file for uploading"
 msgstr "Kh繫ng m廙 が廙θ t廕計 tin 廙 t廕ξ l礙n"
 
-#: src/GridText.c:11384
+#: src/GridText.c:11397
 #, c-format
 msgid "Submitting %s"
 msgstr "ang g廙虹 i %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12533
+#: src/GridText.c:12546
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "T穫m ra Treo: c廕只 tr繳c TextAnchor b廙 l廙i - 廙 ngh廙 tho獺t!"
 
 #. don't show previous state
-#: src/GridText.c:12738
+#: src/GridText.c:12751
 msgid "Wrap lines to fit displayed area?"
 msgstr "Ng廕眩 d簷ng cho h廙φ v廙i v羅ng hi廙n th廙?"
 
-#: src/GridText.c:12790
+#: src/GridText.c:12803
 msgid "Very long lines have been wrapped!"
 msgstr "Nh廙疸g d簷ng r廕另 di 瓊 b廙 ng廕眩!"
 
-#: src/GridText.c:13232
+#: src/GridText.c:13245
 msgid "Very long lines have been truncated!"
 msgstr "Nh廙疸g d簷ng r廕另 di 瓊 b廙 x矇n b廙t!"
 
@@ -3558,15 +3558,15 @@ msgstr "が廙ng d廕南 t廕計 tin:"
 msgid "(unknown)"
 msgstr "(kh繫ng r繭)"
 
-#: src/HTML.c:7374
+#: src/HTML.c:7375
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Ti li廙u ch廙 c籀 c獺c li礙n k廕篙 廕姊.  H瓊y d羅ng c璽u l廙nh 'l'ist."
 
-#: src/HTML.c:7873
+#: src/HTML.c:7874
 msgid "Source cache error - disk full?"
 msgstr "L廙i ngu廙n cache - 藺a 廕囤?"
 
-#: src/HTML.c:7886
+#: src/HTML.c:7887
 msgid "Source cache error - not enough memory!"
 msgstr "L廙i ngu廙n cache - kh繫ng 廙 b廙 nh廙!"
 
@@ -3669,31 +3669,31 @@ msgstr "N廙i b廙"
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "l廙i cookie_domain_flag_set, ang tho獺t chがヾng tr穫nh"
 
-#: src/LYCurses.c:1017
+#: src/LYCurses.c:1034
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "C廕只 h穫nh terminal kh繫ng thnh c繫ng - kh繫ng r繭 d廕》g terminal?"
 
-#: src/LYCurses.c:1442
+#: src/LYCurses.c:1459
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1446
+#: src/LYCurses.c:1463
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "C廕吵 s廙 d廙叩g m廙t terminal vt100, 200, v.v... v廙i chがヾng tr穫nh ny."
 
-#: src/LYCurses.c:1495
+#: src/LYCurses.c:1512
 msgid "Your Terminal type is unknown!"
 msgstr "D廕》g Terminal kh繫ng bi廕篙 廕積!"
 
-#: src/LYCurses.c:1496
+#: src/LYCurses.c:1513
 msgid "Enter a terminal type:"
 msgstr "H瓊y nh廕計 m廙t d廕》g terminal:"
 
-#: src/LYCurses.c:1510
+#: src/LYCurses.c:1527
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "D廕NG TERMINAL 廕貿 THNH"
 
-#: src/LYCurses.c:2007
+#: src/LYCurses.c:2031
 #, c-format
 msgid ""
 "\n"
@@ -3702,7 +3702,7 @@ msgstr ""
 "\n"
 "M廙t l廙i N廕搖g xu廕另 hi廙n trong %s Phi礙n b廕τ %s\n"
 
-#: src/LYCurses.c:2010
+#: src/LYCurses.c:2034
 #, c-format
 msgid ""
 "\n"
@@ -4236,52 +4236,52 @@ msgstr ""
 "Kh繫ng c籀 t廕計 tin Lynx %s.\n"
 "\n"
 
-#: src/LYMain.c:1763
+#: src/LYMain.c:1750
 msgid "Warning:"
 msgstr "C廕τh b獺o:"
 
-#: src/LYMain.c:2328
+#: src/LYMain.c:2315
 msgid "persistent cookies state will be changed in next session only."
 msgstr "tr廕》g th獺i c廙吧 cookie c廙 廙nh ch廙 thay 廙i trong bu廙i lm vi廙c ti廕穆 theo."
 
-#: src/LYMain.c:2565 src/LYMain.c:2610
+#: src/LYMain.c:2552 src/LYMain.c:2597
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: l廙 i b廕τg m瓊 kh繫ng nh廕要 ra %s\n"
 
-#: src/LYMain.c:3121
+#: src/LYMain.c:3108
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Phi礙n b廕τ %s (%s)"
 
-#: src/LYMain.c:3156
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "X璽y d廙彫g tr礙n %s %s %s\n"
 
-#: src/LYMain.c:3178
+#: src/LYMain.c:3165
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors."
 msgstr "ng k羸 b廕τ quy廙n b廙i 廕【 h廙c Kansas, CERN, v nh廙疸g ngが廙i kh獺c."
 
-#: src/LYMain.c:3179
+#: src/LYMain.c:3166
 msgid "Distributed under the GNU General Public License."
 msgstr "Ph璽n ph廙i dが廙i GPL."
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3167
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "H瓊y xem http://lynx.isc.org/ v tr廙 gi繳p tr廙帷 tuy廕積 廙 bi廕篙 th礙m th繫ng tin."
 
-#: src/LYMain.c:3952
+#: src/LYMain.c:3939
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "S廙 D廙刁G: %s [t羅ych廙n] [t廕計tin]\n"
 
-#: src/LYMain.c:3953
+#: src/LYMain.c:3940
 #, c-format
 msgid "Options are:\n"
 msgstr "T羅y ch廙n l:\n"
 
-#: src/LYMain.c:4252
+#: src/LYMain.c:4239
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: T羅y ch廙n sai: %s\n"
@@ -4355,7 +4355,7 @@ msgstr "B廕﹫G 廙 gi廙畝 t廕眩."
 msgid "Current URL is empty."
 msgstr "URL hi廙n th廙i l r廙ng."
 
-#: src/LYMainLoop.c:6935 src/LYUtils.c:1714
+#: src/LYMainLoop.c:6935 src/LYUtils.c:1775
 msgid "Copy to clipboard failed."
 msgstr "Sao ch矇p t廙i clipboard kh繫ng thnh c繫ng."
 
@@ -4451,344 +4451,344 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "Thが kh繫ng c籀 vn b廕τ g廙c!"
 
-#: src/LYOptions.c:758
+#: src/LYOptions.c:761
 msgid "review/edit B)ookmarks files"
 msgstr "xem l廕【/s廙苔 B)T廕計 tin かa th穩ch"
 
-#: src/LYOptions.c:760
+#: src/LYOptions.c:763
 msgid "B)ookmark file: "
 msgstr "B)T廕計 tin がa th穩ch: "
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2126 src/LYOptions.c:2133
 msgid "ON"
 msgstr "B廕曷"
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2277 src/LYOptions.c:2288
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280 src/LYOptions.c:2291
 msgid "OFF"
 msgstr "T廕娛"
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2128
 msgid "NEVER"
 msgstr "KHNG BAO GI廙"
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2129
 msgid "ALWAYS"
 msgstr "LUN LUN"
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2269
+#: src/LYOptions.c:2145 src/LYOptions.c:2272
 msgid "ignore"
 msgstr "l廙 i"
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2146
 msgid "ask user"
 msgstr "h廙i ngが廙i d羅ng"
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2147
 msgid "accept all"
 msgstr "ch廕叼 nh廕要 h廕篙"
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS OFF"
 msgstr "LUN LUN T廕娛"
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2160
 msgid "FOR LOCAL FILES ONLY"
 msgstr "CH廙 CHO T廕星 TIN N廙I B廙"
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2162
 msgid "ALWAYS ON"
 msgstr "LUN LUN B廕曷"
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2174
 msgid "Numbers act as arrows"
 msgstr "C獺c s廙 lm vi廙c nhが m觼i t礙n"
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links are numbered"
 msgstr "獺nh s廙 li礙n k廕篙"
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Links and form fields are numbered"
 msgstr "獺nh s廙 li礙n k廕篙 v v羅ng bi廙u m廕哎"
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2182
 msgid "Form fields are numbered"
 msgstr "獺nh s廙 v羅ng bi廙u m廕哎"
 
-#: src/LYOptions.c:2189
+#: src/LYOptions.c:2192
 msgid "Case insensitive"
 msgstr "Kh繫ng t穩nh 廕積 ki廙u ch廙"
 
-#: src/LYOptions.c:2190
+#: src/LYOptions.c:2193
 msgid "Case sensitive"
 msgstr "T穩nh 廕積 ki廙u ch廙"
 
-#: src/LYOptions.c:2214
+#: src/LYOptions.c:2217
 msgid "prompt normally"
 msgstr "h廙i l廕【 nhが th繫ng thが廙ng"
 
-#: src/LYOptions.c:2215
+#: src/LYOptions.c:2218
 msgid "force yes-response"
 msgstr "b廕眩 bu廙c tr廕 l廙i yes (c籀)"
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2219
 msgid "force no-response"
 msgstr "b廕眩 bu廙c tr廕 l廙i no (kh繫ng)"
 
-#: src/LYOptions.c:2234
+#: src/LYOptions.c:2237
 msgid "Novice"
 msgstr "Ngが廙i m廙i"
 
-#: src/LYOptions.c:2235
+#: src/LYOptions.c:2238
 msgid "Intermediate"
 msgstr "Trung b穫nh"
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2239
 msgid "Advanced"
 msgstr "C籀 ngh廙"
 
-#: src/LYOptions.c:2245
+#: src/LYOptions.c:2248
 msgid "By First Visit"
 msgstr "Theo l廕吵 xem 廕吟 ti礙n"
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2250
 msgid "By First Visit Reversed"
 msgstr "Theo l廕吵 xem 廕吟 ti礙n nhがng 廕υ ngが廙θ"
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2251
 msgid "As Visit Tree"
 msgstr "Nhが c璽y xem"
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2252
 msgid "By Last Visit"
 msgstr "Theo l廕吵 xem cu廙i"
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2254
 msgid "By Last Visit Reversed"
 msgstr "Theo l廕吵 xem cu廙i nhがng 廕υ ngが廙θ"
 
 #. Old_DTD variable
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2265
 msgid "relaxed (TagSoup mode)"
 msgstr "bu繫ng l廙ng (ch廕 廙 TagSoup)"
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2266
 msgid "strict (SortaSGML mode)"
 msgstr "ch廕暗 ch廕 (ch廕 廙 SortaSGML)"
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2273
 msgid "as labels"
 msgstr "nhが c獺c nh瓊n"
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2274
 msgid "as links"
 msgstr "nhが li礙n k廕篙"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2281
 msgid "show filename"
 msgstr "hi廙n t礙n t廕計 tin"
 
-#: src/LYOptions.c:2289
+#: src/LYOptions.c:2292
 msgid "STANDARD"
 msgstr "C B廕﹫"
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2293
 msgid "ADVANCED"
 msgstr "NNG CAO"
 
-#: src/LYOptions.c:2316
+#: src/LYOptions.c:2319
 msgid "Directories first"
 msgstr "Thが m廙卉 trが廙c"
 
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2320
 msgid "Files first"
 msgstr "T廕計 tin trが廙c"
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2321
 msgid "Mixed style"
 msgstr "Ki廙u pha tr廙n"
 
-#: src/LYOptions.c:2326 src/LYOptions.c:2343
+#: src/LYOptions.c:2329 src/LYOptions.c:2346
 msgid "By Name"
 msgstr "Theo T礙n"
 
-#: src/LYOptions.c:2327 src/LYOptions.c:2344
+#: src/LYOptions.c:2330 src/LYOptions.c:2347
 msgid "By Type"
 msgstr "Theo D廕》g"
 
-#: src/LYOptions.c:2328 src/LYOptions.c:2345
+#: src/LYOptions.c:2331 src/LYOptions.c:2348
 msgid "By Size"
 msgstr "Theo K穩ch thが廙c"
 
-#: src/LYOptions.c:2329 src/LYOptions.c:2346
+#: src/LYOptions.c:2332 src/LYOptions.c:2349
 msgid "By Date"
 msgstr "Theo Ngy"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2333
 msgid "By Mode"
 msgstr "Theo Ch廕 廙"
 
-#: src/LYOptions.c:2332
+#: src/LYOptions.c:2335
 msgid "By User"
 msgstr "Theo ngが廙i d羅ng"
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 msgid "By Group"
 msgstr "Theo Nh籀m"
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2357
 msgid "Do not show rate"
 msgstr "Kh繫ng hi廙n th廙 t廙c 廙"
 
-#: src/LYOptions.c:2355 src/LYOptions.c:2356
+#: src/LYOptions.c:2358 src/LYOptions.c:2359
 #, c-format
 msgid "Show %s/sec rate"
 msgstr "Hi廙n th廙 t廙c 廙 %s/gi璽y"
 
-#: src/LYOptions.c:2358 src/LYOptions.c:2359
+#: src/LYOptions.c:2361 src/LYOptions.c:2362
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr "Hi廙n th廙 %s/gi璽y, CNL廕I"
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2374
 msgid "Accept lynx's internal types"
 msgstr "Ch廕叼 nh廕要 d廕》g n廙i b廙 c廙吧 lynx"
 
-#: src/LYOptions.c:2372
+#: src/LYOptions.c:2375
 msgid "Also accept lynx.cfg's types"
 msgstr "廙ng th廙i ch廕叼 nh廕要 d廕》g c廙吧 lynx.cfg"
 
-#: src/LYOptions.c:2373
+#: src/LYOptions.c:2376
 msgid "Also accept user's types"
 msgstr "廙ng th廙i ch廕叼 nh廕要 d廕》g c廙吧 ngが廙i d羅ng"
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "Also accept system's types"
 msgstr "廙ng th廙i ch廕叼 nh廕要 d廕》g c廙吧 h廙 th廙ng"
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 msgid "Accept all types"
 msgstr "Ch廕叼 nh廕要 t廕另 c廕 c獺c d廕》g"
 
-#: src/LYOptions.c:2384
+#: src/LYOptions.c:2387
 msgid "gzip"
 msgstr "n矇n gzip"
 
-#: src/LYOptions.c:2385
+#: src/LYOptions.c:2388
 msgid "deflate"
 msgstr "lm x廕雷"
 
-#: src/LYOptions.c:2388
+#: src/LYOptions.c:2391
 msgid "compress"
 msgstr "n矇n"
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2394
 msgid "bzip2"
 msgstr "n矇n bzip2"
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2396
 msgid "All"
 msgstr "T廕另 c廕"
 
-#: src/LYOptions.c:2658 src/LYOptions.c:2682
+#: src/LYOptions.c:2664 src/LYOptions.c:2688
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "H瓊y s廙 d廙叩g %s 廙 g廙i tr穫nh ヾn T羅y ch廙n!"
 
-#: src/LYOptions.c:3429
+#: src/LYOptions.c:3438
 msgid "(options marked with (!) will not be saved)"
 msgstr "(s廕 kh繫ng ghi nh廙 t羅y ch廙n c籀 d廕只 (!))"
 
-#: src/LYOptions.c:3437
+#: src/LYOptions.c:3446
 msgid "General Preferences"
 msgstr "C廕只 h穫nh chung"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3450
 msgid "User mode"
 msgstr "Ch廕 廙 ngが廙i d羅ng"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3447
+#: src/LYOptions.c:3456
 msgid "Editor"
 msgstr "Tr穫nh so廕》 th廕υ"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3461
 msgid "Type of Search"
 msgstr "D廕》g t穫m ki廕禦"
 
-#: src/LYOptions.c:3457
+#: src/LYOptions.c:3466
 msgid "Security and Privacy"
 msgstr "B廕υ m廕負 v An ton"
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3461
+#: src/LYOptions.c:3470
 msgid "Cookies"
 msgstr "Cookie"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3475
+#: src/LYOptions.c:3484
 msgid "Invalid-Cookie Prompting"
 msgstr "C璽u h廙i khi Cookie l廙i"
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3482
+#: src/LYOptions.c:3491
 msgid "SSL Prompting"
 msgstr "C璽u h廙i v廙 SSL"
 
-#: src/LYOptions.c:3488
+#: src/LYOptions.c:3497
 msgid "Keyboard Input"
 msgstr "Nh廕計 bn ph穩m"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3492
+#: src/LYOptions.c:3501
 msgid "Keypad mode"
 msgstr "Ch廕 廙 Keypad"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3498
+#: src/LYOptions.c:3507
 msgid "Emacs keys"
 msgstr "Ph穩m Emacs"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3513
 msgid "VI keys"
 msgstr "Ph穩m VI"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3511
+#: src/LYOptions.c:3520
 msgid "Line edit style"
 msgstr "Ki廙u so廕》 th廕υ theo d簷ng"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3532
 msgid "Keyboard layout"
 msgstr "Bn ph穩m"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3537
+#: src/LYOptions.c:3546
 msgid "Display and Character Set"
 msgstr "Hi廙n th廙 v B廕τg m瓊"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3542
+#: src/LYOptions.c:3551
 msgid "Use locale-based character set"
 msgstr "S廙 d廙叩g b廕τg m瓊 d廙帶 tr礙n locale"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3551
+#: src/LYOptions.c:3560
 msgid "Display character set"
 msgstr "B廕τg m瓊 hi廙n th廙"
 
-#: src/LYOptions.c:3582
+#: src/LYOptions.c:3591
 msgid "Assumed document character set"
 msgstr "B廕τg m瓊 廙 ngh廙 cho ti li廙u"
 
@@ -4797,170 +4797,173 @@ msgstr "B廕τg m瓊 廙 ngh廙 cho ti li廙u"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3602
+#: src/LYOptions.c:3611
 msgid "CJK mode"
 msgstr "Ch廕 廙 CJK"
 
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3613
 msgid "Raw 8-bit"
 msgstr "8-bit th繫"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3612
+#: src/LYOptions.c:3621
 msgid "X Display"
 msgstr "Mn h穫nh X"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3618
+#: src/LYOptions.c:3627
 msgid "Document Appearance"
 msgstr "Trang tr穩 ti li廙u"
 
-#: src/LYOptions.c:3624
+#: src/LYOptions.c:3633
 msgid "Show color"
 msgstr "Hi廙n th廙 mu"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3648
+#: src/LYOptions.c:3657
 msgid "Show cursor"
 msgstr "Hi廙n th廙 con tr廙"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3663
 msgid "Underline links"
 msgstr "G廕︷h dが廙i li礙n k廕篙"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3670
 msgid "Show scrollbar"
 msgstr "Hi廙n th廙 thanh cu廙n"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3668
+#: src/LYOptions.c:3677
 msgid "Popups for select fields"
 msgstr "M廙 c廙苔 s廙 kh獺c cho v羅ng ch廙n"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3674
+#: src/LYOptions.c:3683
 msgid "HTML error recovery"
 msgstr "Ph廙卉 h廙i l廙i HTML"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3680
+#: src/LYOptions.c:3689
 msgid "Show images"
 msgstr "Hi廙n th廙 h穫nh 廕τh"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3694
+#: src/LYOptions.c:3703
 msgid "Verbose images"
 msgstr "Chi ti廕篙 v廙 h穫nh 廕τh"
 
-#: src/LYOptions.c:3703
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3711
 msgid "Headers Transferred to Remote Servers"
 msgstr "Ph廕吵 廕吟 瓊 truy廙n t廕ξ t廙i m獺y ch廙 廙 xa"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3715
 msgid "Personal mail address"
 msgstr "廙a ch廙 thが c獺 nh璽n"
 
 #. Mail Address: INPUT
-#: src/LYOptions.c:3712
+#: src/LYOptions.c:3720
 #, fuzzy
 msgid "Password for anonymous ftp"
 msgstr "M廕負 kh廕季 cho m獺y tin t廙妾 '%s':"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3717
+#: src/LYOptions.c:3725
 msgid "Preferred media type"
 msgstr "Thi廕篙 b廙 ghi がa chu廙ng"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3723
+#: src/LYOptions.c:3731
 msgid "Preferred encoding"
 msgstr "B廕τg m瓊 がa chu廙ng"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3729
+#: src/LYOptions.c:3737
 msgid "Preferred document character set"
 msgstr "B廕τg m瓊 ti li廙u がa chu廙ng"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3742
 msgid "Preferred document language"
 msgstr "Ng繫n ng廙 ti li廙u がa chu廙ng"
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3748
 msgid "User-Agent header"
 msgstr "Ph璽n 廕吟 User-Agent"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3748
+#: src/LYOptions.c:3756
 msgid "Listing and Accessing Files"
 msgstr "T廕計 tin Danh s獺ch v Truy c廕計"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3752
+#: src/LYOptions.c:3760
 msgid "FTP sort criteria"
 msgstr "Ti礙u chu廕姊 s廕皰 x廕穆 FTP"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3759
+#: src/LYOptions.c:3767
 msgid "Local directory sort criteria"
 msgstr "Ti礙u chu廕姊 s廕皰 x廕穆 thが m廙卉 n廙i b廙"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3773
 msgid "Local directory sort order"
 msgstr "Th廙 t廙 s廕皰 x廕穆 thが m廙卉 n廙i b廙"
 
-#: src/LYOptions.c:3774
+#: src/LYOptions.c:3782
 msgid "Show dot files"
 msgstr "Hi廙n th廙 t廕計 tin 廕姊"
 
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3790
 msgid "Execution links"
 msgstr "Th廙帷 hi廙n Li礙n k廕篙"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3810
 msgid "Show transfer rate"
 msgstr "Hi廙n th廙 t廙c 廙 truy廙n t廕ξ"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3830
 msgid "Special Files and Screens"
 msgstr "Mn h穫nh v T廕計 tin 廕搾 bi廙t"
 
-#: src/LYOptions.c:3827
+#: src/LYOptions.c:3835
 msgid "Multi-bookmarks"
 msgstr "Nhi廙u かa th穩ch"
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3843
 msgid "Review/edit Bookmarks files"
 msgstr "Xem l廕【/s廙苔 t廕計 tin かa th穩ch"
 
-#: src/LYOptions.c:3837
+#: src/LYOptions.c:3845
 msgid "Goto multi-bookmark menu"
 msgstr "i t廙i tr穫nh ヾn nhi廙u がa th穩ch"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3847
 msgid "Bookmarks file"
 msgstr "T廕計 tin かa th穩ch"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3845
+#: src/LYOptions.c:3853
 msgid "Visited Pages"
 msgstr "Trang 瓊 xem"
 
-#: src/LYOptions.c:3850
+#: src/LYOptions.c:3858
 msgid "View the file "
 msgstr "Xem t廕計 tin"
 
@@ -5084,38 +5087,38 @@ msgstr "Lynx: kh繫ng ch廕『 が廙θ, kh繫ng c籀 t廕計 tin quy t廕畚 CERN %s\n"
 msgid "(no name)"
 msgstr "(kh繫ng t礙n)"
 
-#: src/LYReadCFG.c:1782
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "C籀 nhi廙u hヾn %d lynx.cfg l廙ng vo nhau -- c籀 th廙 l v簷ng l廕搆?!?\n"
 
-#: src/LYReadCFG.c:1784
+#: src/LYReadCFG.c:1786
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "L廕吵 th廙 th礙m vo cu廙i c羅ng l '%s',\n"
 
-#: src/LYReadCFG.c:1785
+#: src/LYReadCFG.c:1787
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "瓊 th礙m t廙 '%s'.\n"
 
-#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263
+#: src/LYReadCFG.c:2194 src/LYReadCFG.c:2207 src/LYReadCFG.c:2265
 msgid "The following is read from your lynx.cfg file."
 msgstr "Nh廙疸g c獺i sau 廙c t廙 t廕計 tin lynx.cfg."
 
-#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206
+#: src/LYReadCFG.c:2195 src/LYReadCFG.c:2208
 msgid "Please read the distribution"
 msgstr "Xin h瓊y 廙c ph璽n ph廙i"
 
-#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209
+#: src/LYReadCFG.c:2201 src/LYReadCFG.c:2211
 msgid "for more comments."
 msgstr "廙 bi廕篙 th礙m chi ti廕篙."
 
-#: src/LYReadCFG.c:2245
+#: src/LYReadCFG.c:2247
 msgid "RELOAD THE CHANGES"
 msgstr "N廕P L廕I THAY 廙I"
 
-#: src/LYReadCFG.c:2253
+#: src/LYReadCFG.c:2255
 msgid "Your primary configuration"
 msgstr "C廕只 h穫nh ch穩nh"
 
@@ -5384,33 +5387,33 @@ msgstr "T廕ξ l礙n:"
 msgid "Upload options:"
 msgstr "T羅y ch廙n t廕ξ l礙n:"
 
-#: src/LYUtils.c:1716
+#: src/LYUtils.c:1777
 msgid "Download document URL put to clipboard."
 msgstr "URL c廙吧 ti li廙u t廕ξ xu廙ng 廕暗 vo clipboard."
 
-#: src/LYUtils.c:2493
+#: src/LYUtils.c:2554
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Giao th廙妾 truy c廕計 kh繫ng mong 廙ξ cho sヾ 廙 URL ny."
 
-#: src/LYUtils.c:3301
+#: src/LYUtils.c:3362
 msgid "Too many tempfiles"
 msgstr "Qu獺 nhi廙u t廕計 tin t廕《 th廙i"
 
-#: src/LYUtils.c:3605
+#: src/LYUtils.c:3666
 msgid "unknown restriction"
 msgstr "gi廙i h廕》 kh繫ng r繭"
 
-#: src/LYUtils.c:3635
+#: src/LYUtils.c:3696
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Kh繫ng c籀 b廙 c獺c gi廙i h廕》.\n"
 
-#: src/LYUtils.c:3638
+#: src/LYUtils.c:3699
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "B廙 c獺c gi廙i h廕》:\n"
 
-#: src/LYUtils.c:5022
+#: src/LYUtils.c:5077
 msgid "Cannot find HOME directory"
 msgstr "Kh繫ng t穫m th廕句 thが m廙卉 HOME"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 85d4de9f..59fdb5cf 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx-2.8.5pre9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-30 18:03-0400\n"
+"POT-Creation-Date: 2005-10-16 19:03-0400\n"
 "PO-Revision-Date: 2002-10-15 15:13+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -2209,7 +2209,7 @@ msgstr ""
 msgid "(No value.)"
 msgstr ""
 
-#: LYMessages.c:713 src/LYOptions.c:2382
+#: LYMessages.c:713 src/LYOptions.c:2385
 msgid "None"
 msgstr ""
 
@@ -2740,7 +2740,7 @@ msgstr ""
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8508
+#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8515
 msgid "Loading incomplete."
 msgstr ""
 
@@ -2855,18 +2855,18 @@ msgstr ""
 msgid "Change password?"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1736
+#: WWW/Library/Implementation/HTNews.c:1706
 #, c-format
 msgid "No matches for: %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1789
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this group.\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1801
+#: WWW/Library/Implementation/HTNews.c:1768
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2875,16 +2875,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1814
+#: WWW/Library/Implementation/HTNews.c:1781
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1837
+#: WWW/Library/Implementation/HTNews.c:1804
 msgid "Earlier articles"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1850
+#: WWW/Library/Implementation/HTNews.c:1817
 #, c-format
 msgid ""
 "\n"
@@ -2892,41 +2892,41 @@ msgid ""
 "\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1912
+#: WWW/Library/Implementation/HTNews.c:1879
 msgid "All available articles in "
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2133
+#: WWW/Library/Implementation/HTNews.c:2093
 msgid "Later articles"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2156
+#: WWW/Library/Implementation/HTNews.c:2116
 msgid "Post to "
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2377
+#: WWW/Library/Implementation/HTNews.c:2337
 msgid "This client does not contain support for SNEWS URLs."
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2585
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2616
+#: WWW/Library/Implementation/HTNews.c:2576
 msgid "Connecting to NewsHost ..."
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2668
+#: WWW/Library/Implementation/HTNews.c:2628
 #, c-format
 msgid "Could not access %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2774
+#: WWW/Library/Implementation/HTNews.c:2734
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2778
+#: WWW/Library/Implementation/HTNews.c:2738
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr ""
@@ -2934,22 +2934,22 @@ msgstr ""
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2982
+#: WWW/Library/Implementation/HTNews.c:2942
 msgid "Reading list of available newsgroups."
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:3003
+#: WWW/Library/Implementation/HTNews.c:2963
 msgid "Reading list of articles in newsgroup."
 msgstr ""
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:3009
+#: WWW/Library/Implementation/HTNews.c:2969
 msgid "Reading news article."
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:3039
+#: WWW/Library/Implementation/HTNews.c:2999
 msgid "Sorry, could not load requested news."
 msgstr ""
 
@@ -2957,11 +2957,11 @@ msgstr ""
 msgid "Address has invalid port"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1320
+#: WWW/Library/Implementation/HTTCP.c:1308
 msgid "Address length looks invalid"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1552 WWW/Library/Implementation/HTTCP.c:1570
+#: WWW/Library/Implementation/HTTCP.c:1539 WWW/Library/Implementation/HTTCP.c:1557
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr ""
@@ -2970,38 +2970,38 @@ msgstr ""
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1567 WWW/Library/Implementation/HTTelnet.c:108
+#: WWW/Library/Implementation/HTTCP.c:1554 WWW/Library/Implementation/HTTelnet.c:108
 #, c-format
 msgid "Invalid hostname %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1568
 #, c-format
 msgid "Making %s connection to %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1579
 msgid "socket failed."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1605
+#: WWW/Library/Implementation/HTTCP.c:1592
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1629
+#: WWW/Library/Implementation/HTTCP.c:1616
 msgid "Could not make connection non-blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1697
+#: WWW/Library/Implementation/HTTCP.c:1684
 msgid "Connection failed (too many retries)."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1896
+#: WWW/Library/Implementation/HTTCP.c:1883
 msgid "Could not restore socket to blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1962
+#: WWW/Library/Implementation/HTTCP.c:1949
 msgid "Socket read failed for 180,000 tries."
 msgstr ""
 
@@ -3295,98 +3295,98 @@ msgstr ""
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr ""
 
-#: src/GridText.c:3594
+#: src/GridText.c:3601
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr ""
 
-#: src/GridText.c:6013 src/GridText.c:6020 src/LYList.c:248
+#: src/GridText.c:6020 src/GridText.c:6027 src/LYList.c:248
 msgid "unknown field or link"
 msgstr ""
 
-#: src/GridText.c:6029
+#: src/GridText.c:6036
 msgid "text entry field"
 msgstr ""
 
-#: src/GridText.c:6032
+#: src/GridText.c:6039
 msgid "password entry field"
 msgstr ""
 
-#: src/GridText.c:6035
+#: src/GridText.c:6042
 msgid "checkbox"
 msgstr ""
 
-#: src/GridText.c:6038
+#: src/GridText.c:6045
 msgid "radio button"
 msgstr ""
 
-#: src/GridText.c:6041
+#: src/GridText.c:6048
 msgid "submit button"
 msgstr ""
 
-#: src/GridText.c:6044
+#: src/GridText.c:6051
 msgid "reset button"
 msgstr ""
 
-#: src/GridText.c:6047
+#: src/GridText.c:6054
 msgid "popup menu"
 msgstr ""
 
-#: src/GridText.c:6050
+#: src/GridText.c:6057
 msgid "hidden form field"
 msgstr ""
 
-#: src/GridText.c:6053
+#: src/GridText.c:6060
 msgid "text entry area"
 msgstr ""
 
-#: src/GridText.c:6056
+#: src/GridText.c:6063
 msgid "range entry field"
 msgstr ""
 
-#: src/GridText.c:6059
+#: src/GridText.c:6066
 msgid "file entry field"
 msgstr ""
 
-#: src/GridText.c:6062
+#: src/GridText.c:6069
 msgid "text-submit field"
 msgstr ""
 
-#: src/GridText.c:6065
+#: src/GridText.c:6072
 msgid "image-submit button"
 msgstr ""
 
-#: src/GridText.c:6068
+#: src/GridText.c:6075
 msgid "keygen field"
 msgstr ""
 
-#: src/GridText.c:6071
+#: src/GridText.c:6078
 msgid "unknown form field"
 msgstr ""
 
-#: src/GridText.c:10231
+#: src/GridText.c:10244
 msgid "Can't open file for uploading"
 msgstr ""
 
-#: src/GridText.c:11384
+#: src/GridText.c:11397
 #, c-format
 msgid "Submitting %s"
 msgstr ""
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12533
+#: src/GridText.c:12546
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12738
+#: src/GridText.c:12751
 msgid "Wrap lines to fit displayed area?"
 msgstr ""
 
-#: src/GridText.c:12790
+#: src/GridText.c:12803
 msgid "Very long lines have been wrapped!"
 msgstr ""
 
-#: src/GridText.c:13232
+#: src/GridText.c:13245
 msgid "Very long lines have been truncated!"
 msgstr ""
 
@@ -3492,15 +3492,15 @@ msgstr ""
 msgid "(unknown)"
 msgstr ""
 
-#: src/HTML.c:7374
+#: src/HTML.c:7375
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr ""
 
-#: src/HTML.c:7873
+#: src/HTML.c:7874
 msgid "Source cache error - disk full?"
 msgstr ""
 
-#: src/HTML.c:7886
+#: src/HTML.c:7887
 msgid "Source cache error - not enough memory!"
 msgstr ""
 
@@ -3589,38 +3589,38 @@ msgstr ""
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr ""
 
-#: src/LYCurses.c:1017
+#: src/LYCurses.c:1034
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr ""
 
-#: src/LYCurses.c:1442
+#: src/LYCurses.c:1459
 msgid "Terminal ="
 msgstr ""
 
-#: src/LYCurses.c:1446
+#: src/LYCurses.c:1463
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr ""
 
-#: src/LYCurses.c:1495
+#: src/LYCurses.c:1512
 msgid "Your Terminal type is unknown!"
 msgstr ""
 
-#: src/LYCurses.c:1496
+#: src/LYCurses.c:1513
 msgid "Enter a terminal type:"
 msgstr ""
 
-#: src/LYCurses.c:1510
+#: src/LYCurses.c:1527
 msgid "TERMINAL TYPE IS SET TO"
 msgstr ""
 
-#: src/LYCurses.c:2007
+#: src/LYCurses.c:2031
 #, c-format
 msgid ""
 "\n"
 "A Fatal error has occurred in %s Ver. %s\n"
 msgstr ""
 
-#: src/LYCurses.c:2010
+#: src/LYCurses.c:2034
 #, c-format
 msgid ""
 "\n"
@@ -4138,52 +4138,52 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1763
+#: src/LYMain.c:1750
 msgid "Warning:"
 msgstr ""
 
-#: src/LYMain.c:2328
+#: src/LYMain.c:2315
 msgid "persistent cookies state will be changed in next session only."
 msgstr ""
 
-#: src/LYMain.c:2565 src/LYMain.c:2610
+#: src/LYMain.c:2552 src/LYMain.c:2597
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr ""
 
-#: src/LYMain.c:3121
+#: src/LYMain.c:3108
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr ""
 
-#: src/LYMain.c:3156
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr ""
 
-#: src/LYMain.c:3178
+#: src/LYMain.c:3165
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors."
 msgstr ""
 
-#: src/LYMain.c:3179
+#: src/LYMain.c:3166
 msgid "Distributed under the GNU General Public License."
 msgstr ""
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3167
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr ""
 
-#: src/LYMain.c:3952
+#: src/LYMain.c:3939
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr ""
 
-#: src/LYMain.c:3953
+#: src/LYMain.c:3940
 #, c-format
 msgid "Options are:\n"
 msgstr ""
 
-#: src/LYMain.c:4252
+#: src/LYMain.c:4239
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr ""
@@ -4257,7 +4257,7 @@ msgstr ""
 msgid "Current URL is empty."
 msgstr ""
 
-#: src/LYMainLoop.c:6935 src/LYUtils.c:1714
+#: src/LYMainLoop.c:6935 src/LYUtils.c:1775
 msgid "Copy to clipboard failed."
 msgstr ""
 
@@ -4341,344 +4341,344 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr ""
 
-#: src/LYOptions.c:758
+#: src/LYOptions.c:761
 msgid "review/edit B)ookmarks files"
 msgstr ""
 
-#: src/LYOptions.c:760
+#: src/LYOptions.c:763
 msgid "B)ookmark file: "
 msgstr ""
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2126 src/LYOptions.c:2133
 msgid "ON"
 msgstr ""
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2277 src/LYOptions.c:2288
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280 src/LYOptions.c:2291
 msgid "OFF"
 msgstr ""
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2128
 msgid "NEVER"
 msgstr ""
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2129
 msgid "ALWAYS"
 msgstr ""
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2269
+#: src/LYOptions.c:2145 src/LYOptions.c:2272
 msgid "ignore"
 msgstr ""
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2146
 msgid "ask user"
 msgstr ""
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2147
 msgid "accept all"
 msgstr ""
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS OFF"
 msgstr ""
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2160
 msgid "FOR LOCAL FILES ONLY"
 msgstr ""
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2162
 msgid "ALWAYS ON"
 msgstr ""
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2174
 msgid "Numbers act as arrows"
 msgstr ""
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Links and form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2182
 msgid "Form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2189
+#: src/LYOptions.c:2192
 msgid "Case insensitive"
 msgstr ""
 
-#: src/LYOptions.c:2190
+#: src/LYOptions.c:2193
 msgid "Case sensitive"
 msgstr ""
 
-#: src/LYOptions.c:2214
+#: src/LYOptions.c:2217
 msgid "prompt normally"
 msgstr ""
 
-#: src/LYOptions.c:2215
+#: src/LYOptions.c:2218
 msgid "force yes-response"
 msgstr ""
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2219
 msgid "force no-response"
 msgstr ""
 
-#: src/LYOptions.c:2234
+#: src/LYOptions.c:2237
 msgid "Novice"
 msgstr ""
 
-#: src/LYOptions.c:2235
+#: src/LYOptions.c:2238
 msgid "Intermediate"
 msgstr ""
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2239
 msgid "Advanced"
 msgstr ""
 
-#: src/LYOptions.c:2245
+#: src/LYOptions.c:2248
 msgid "By First Visit"
 msgstr ""
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2250
 msgid "By First Visit Reversed"
 msgstr ""
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2251
 msgid "As Visit Tree"
 msgstr ""
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2252
 msgid "By Last Visit"
 msgstr ""
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2254
 msgid "By Last Visit Reversed"
 msgstr ""
 
 #. Old_DTD variable
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2265
 msgid "relaxed (TagSoup mode)"
 msgstr ""
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2266
 msgid "strict (SortaSGML mode)"
 msgstr ""
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2273
 msgid "as labels"
 msgstr ""
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2274
 msgid "as links"
 msgstr ""
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2281
 msgid "show filename"
 msgstr ""
 
-#: src/LYOptions.c:2289
+#: src/LYOptions.c:2292
 msgid "STANDARD"
 msgstr ""
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2293
 msgid "ADVANCED"
 msgstr ""
 
-#: src/LYOptions.c:2316
+#: src/LYOptions.c:2319
 msgid "Directories first"
 msgstr ""
 
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2320
 msgid "Files first"
 msgstr ""
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2321
 msgid "Mixed style"
 msgstr ""
 
-#: src/LYOptions.c:2326 src/LYOptions.c:2343
+#: src/LYOptions.c:2329 src/LYOptions.c:2346
 msgid "By Name"
 msgstr ""
 
-#: src/LYOptions.c:2327 src/LYOptions.c:2344
+#: src/LYOptions.c:2330 src/LYOptions.c:2347
 msgid "By Type"
 msgstr ""
 
-#: src/LYOptions.c:2328 src/LYOptions.c:2345
+#: src/LYOptions.c:2331 src/LYOptions.c:2348
 msgid "By Size"
 msgstr ""
 
-#: src/LYOptions.c:2329 src/LYOptions.c:2346
+#: src/LYOptions.c:2332 src/LYOptions.c:2349
 msgid "By Date"
 msgstr ""
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2333
 msgid "By Mode"
 msgstr ""
 
-#: src/LYOptions.c:2332
+#: src/LYOptions.c:2335
 msgid "By User"
 msgstr ""
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 msgid "By Group"
 msgstr ""
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2357
 msgid "Do not show rate"
 msgstr ""
 
-#: src/LYOptions.c:2355 src/LYOptions.c:2356
+#: src/LYOptions.c:2358 src/LYOptions.c:2359
 #, c-format
 msgid "Show %s/sec rate"
 msgstr ""
 
-#: src/LYOptions.c:2358 src/LYOptions.c:2359
+#: src/LYOptions.c:2361 src/LYOptions.c:2362
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr ""
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2374
 msgid "Accept lynx's internal types"
 msgstr ""
 
-#: src/LYOptions.c:2372
+#: src/LYOptions.c:2375
 msgid "Also accept lynx.cfg's types"
 msgstr ""
 
-#: src/LYOptions.c:2373
+#: src/LYOptions.c:2376
 msgid "Also accept user's types"
 msgstr ""
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "Also accept system's types"
 msgstr ""
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 msgid "Accept all types"
 msgstr ""
 
-#: src/LYOptions.c:2384
+#: src/LYOptions.c:2387
 msgid "gzip"
 msgstr ""
 
-#: src/LYOptions.c:2385
+#: src/LYOptions.c:2388
 msgid "deflate"
 msgstr ""
 
-#: src/LYOptions.c:2388
+#: src/LYOptions.c:2391
 msgid "compress"
 msgstr ""
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2394
 msgid "bzip2"
 msgstr ""
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2396
 msgid "All"
 msgstr ""
 
-#: src/LYOptions.c:2658 src/LYOptions.c:2682
+#: src/LYOptions.c:2664 src/LYOptions.c:2688
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr ""
 
-#: src/LYOptions.c:3429
+#: src/LYOptions.c:3438
 msgid "(options marked with (!) will not be saved)"
 msgstr ""
 
-#: src/LYOptions.c:3437
+#: src/LYOptions.c:3446
 msgid "General Preferences"
 msgstr ""
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3450
 msgid "User mode"
 msgstr ""
 
 #. Editor: INPUT
-#: src/LYOptions.c:3447
+#: src/LYOptions.c:3456
 msgid "Editor"
 msgstr ""
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3461
 msgid "Type of Search"
 msgstr ""
 
-#: src/LYOptions.c:3457
+#: src/LYOptions.c:3466
 msgid "Security and Privacy"
 msgstr ""
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3461
+#: src/LYOptions.c:3470
 msgid "Cookies"
 msgstr ""
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3475
+#: src/LYOptions.c:3484
 msgid "Invalid-Cookie Prompting"
 msgstr ""
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3482
+#: src/LYOptions.c:3491
 msgid "SSL Prompting"
 msgstr ""
 
-#: src/LYOptions.c:3488
+#: src/LYOptions.c:3497
 msgid "Keyboard Input"
 msgstr ""
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3492
+#: src/LYOptions.c:3501
 msgid "Keypad mode"
 msgstr ""
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3498
+#: src/LYOptions.c:3507
 msgid "Emacs keys"
 msgstr ""
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3513
 msgid "VI keys"
 msgstr ""
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3511
+#: src/LYOptions.c:3520
 msgid "Line edit style"
 msgstr ""
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3532
 msgid "Keyboard layout"
 msgstr ""
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3537
+#: src/LYOptions.c:3546
 msgid "Display and Character Set"
 msgstr ""
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3542
+#: src/LYOptions.c:3551
 msgid "Use locale-based character set"
 msgstr ""
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3551
+#: src/LYOptions.c:3560
 msgid "Display character set"
 msgstr ""
 
-#: src/LYOptions.c:3582
+#: src/LYOptions.c:3591
 msgid "Assumed document character set"
 msgstr ""
 
@@ -4687,169 +4687,172 @@ msgstr ""
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3602
+#: src/LYOptions.c:3611
 msgid "CJK mode"
 msgstr ""
 
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3613
 msgid "Raw 8-bit"
 msgstr ""
 
 #. X Display: INPUT
-#: src/LYOptions.c:3612
+#: src/LYOptions.c:3621
 msgid "X Display"
 msgstr ""
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3618
+#: src/LYOptions.c:3627
 msgid "Document Appearance"
 msgstr ""
 
-#: src/LYOptions.c:3624
+#: src/LYOptions.c:3633
 msgid "Show color"
 msgstr ""
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3648
+#: src/LYOptions.c:3657
 msgid "Show cursor"
 msgstr ""
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3663
 msgid "Underline links"
 msgstr ""
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3670
 msgid "Show scrollbar"
 msgstr ""
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3668
+#: src/LYOptions.c:3677
 msgid "Popups for select fields"
 msgstr ""
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3674
+#: src/LYOptions.c:3683
 msgid "HTML error recovery"
 msgstr ""
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3680
+#: src/LYOptions.c:3689
 msgid "Show images"
 msgstr ""
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3694
+#: src/LYOptions.c:3703
 msgid "Verbose images"
 msgstr ""
 
-#: src/LYOptions.c:3703
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3711
 msgid "Headers Transferred to Remote Servers"
 msgstr ""
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3715
 msgid "Personal mail address"
 msgstr ""
 
 #. Mail Address: INPUT
-#: src/LYOptions.c:3712
+#: src/LYOptions.c:3720
 msgid "Password for anonymous ftp"
 msgstr ""
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3717
+#: src/LYOptions.c:3725
 msgid "Preferred media type"
 msgstr ""
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3723
+#: src/LYOptions.c:3731
 msgid "Preferred encoding"
 msgstr ""
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3729
+#: src/LYOptions.c:3737
 msgid "Preferred document character set"
 msgstr ""
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3742
 msgid "Preferred document language"
 msgstr ""
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3748
 msgid "User-Agent header"
 msgstr ""
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3748
+#: src/LYOptions.c:3756
 msgid "Listing and Accessing Files"
 msgstr ""
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3752
+#: src/LYOptions.c:3760
 msgid "FTP sort criteria"
 msgstr ""
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3759
+#: src/LYOptions.c:3767
 msgid "Local directory sort criteria"
 msgstr ""
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3773
 msgid "Local directory sort order"
 msgstr ""
 
-#: src/LYOptions.c:3774
+#: src/LYOptions.c:3782
 msgid "Show dot files"
 msgstr ""
 
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3790
 msgid "Execution links"
 msgstr ""
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3810
 msgid "Show transfer rate"
 msgstr ""
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3830
 msgid "Special Files and Screens"
 msgstr ""
 
-#: src/LYOptions.c:3827
+#: src/LYOptions.c:3835
 msgid "Multi-bookmarks"
 msgstr ""
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3843
 msgid "Review/edit Bookmarks files"
 msgstr ""
 
-#: src/LYOptions.c:3837
+#: src/LYOptions.c:3845
 msgid "Goto multi-bookmark menu"
 msgstr ""
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3847
 msgid "Bookmarks file"
 msgstr ""
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3845
+#: src/LYOptions.c:3853
 msgid "Visited Pages"
 msgstr ""
 
-#: src/LYOptions.c:3850
+#: src/LYOptions.c:3858
 msgid "View the file "
 msgstr ""
 
@@ -4963,38 +4966,38 @@ msgstr ""
 msgid "(no name)"
 msgstr ""
 
-#: src/LYReadCFG.c:1782
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1784
+#: src/LYReadCFG.c:1786
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1785
+#: src/LYReadCFG.c:1787
 #, c-format
 msgid "included from '%s'.\n"
 msgstr ""
 
-#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263
+#: src/LYReadCFG.c:2194 src/LYReadCFG.c:2207 src/LYReadCFG.c:2265
 msgid "The following is read from your lynx.cfg file."
 msgstr ""
 
-#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206
+#: src/LYReadCFG.c:2195 src/LYReadCFG.c:2208
 msgid "Please read the distribution"
 msgstr ""
 
-#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209
+#: src/LYReadCFG.c:2201 src/LYReadCFG.c:2211
 msgid "for more comments."
 msgstr ""
 
-#: src/LYReadCFG.c:2245
+#: src/LYReadCFG.c:2247
 msgid "RELOAD THE CHANGES"
 msgstr ""
 
-#: src/LYReadCFG.c:2253
+#: src/LYReadCFG.c:2255
 msgid "Your primary configuration"
 msgstr ""
 
@@ -5256,33 +5259,33 @@ msgstr ""
 msgid "Upload options:"
 msgstr ""
 
-#: src/LYUtils.c:1716
+#: src/LYUtils.c:1777
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2493
+#: src/LYUtils.c:2554
 msgid "Unexpected access protocol for this URL scheme."
 msgstr ""
 
-#: src/LYUtils.c:3301
+#: src/LYUtils.c:3362
 msgid "Too many tempfiles"
 msgstr ""
 
-#: src/LYUtils.c:3605
+#: src/LYUtils.c:3666
 msgid "unknown restriction"
 msgstr ""
 
-#: src/LYUtils.c:3635
+#: src/LYUtils.c:3696
 #, c-format
 msgid "No restrictions set.\n"
 msgstr ""
 
-#: src/LYUtils.c:3638
+#: src/LYUtils.c:3699
 #, c-format
 msgid "Restrictions set:\n"
 msgstr ""
 
-#: src/LYUtils.c:5022
+#: src/LYUtils.c:5077
 msgid "Cannot find HOME directory"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d5ea7aff..a1e5ba7e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.5pre9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-30 18:03-0400\n"
+"POT-Creation-Date: 2005-10-16 19:03-0400\n"
 "PO-Revision-Date: 2003-02-11 19:44+0800\n"
 "Last-Translator: Abel Cheung <maddog@linux.org.hk>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -2228,7 +2228,7 @@ msgstr ""
 msgid "(No value.)"
 msgstr ""
 
-#: LYMessages.c:713 src/LYOptions.c:2382
+#: LYMessages.c:713 src/LYOptions.c:2385
 msgid "None"
 msgstr ""
 
@@ -2766,7 +2766,7 @@ msgstr ""
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8508
+#: WWW/Library/Implementation/HTAccess.c:1044 src/GridText.c:8515
 msgid "Loading incomplete."
 msgstr "未完成載入內容。"
 
@@ -2881,12 +2881,12 @@ msgstr "新聞組主機‘%s’的密碼:"
 msgid "Change password?"
 msgstr "是否更改密碼?"
 
-#: WWW/Library/Implementation/HTNews.c:1736
+#: WWW/Library/Implementation/HTNews.c:1706
 #, c-format
 msgid "No matches for: %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1789
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2894,7 +2894,7 @@ msgstr ""
 "\n"
 "此新聞組沒有任何文章。\n"
 
-#: WWW/Library/Implementation/HTNews.c:1801
+#: WWW/Library/Implementation/HTNews.c:1768
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2903,16 +2903,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1814
+#: WWW/Library/Implementation/HTNews.c:1781
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1837
+#: WWW/Library/Implementation/HTNews.c:1804
 msgid "Earlier articles"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1850
+#: WWW/Library/Implementation/HTNews.c:1817
 #, c-format
 msgid ""
 "\n"
@@ -2920,41 +2920,41 @@ msgid ""
 "\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1912
+#: WWW/Library/Implementation/HTNews.c:1879
 msgid "All available articles in "
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2133
+#: WWW/Library/Implementation/HTNews.c:2093
 msgid "Later articles"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2156
+#: WWW/Library/Implementation/HTNews.c:2116
 msgid "Post to "
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2377
+#: WWW/Library/Implementation/HTNews.c:2337
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "此版本的程式不支援 SNEWS URL。"
 
-#: WWW/Library/Implementation/HTNews.c:2585
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2616
+#: WWW/Library/Implementation/HTNews.c:2576
 msgid "Connecting to NewsHost ..."
 msgstr "正在聯絡新聞組主機 ..."
 
-#: WWW/Library/Implementation/HTNews.c:2668
+#: WWW/Library/Implementation/HTNews.c:2628
 #, c-format
 msgid "Could not access %s."
 msgstr "無法存取 %s。"
 
-#: WWW/Library/Implementation/HTNews.c:2774
+#: WWW/Library/Implementation/HTNews.c:2734
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "無法讀取新聞組資訊。新聞組伺服器 %.20s 回應:%.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2778
+#: WWW/Library/Implementation/HTNews.c:2738
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr ""
@@ -2962,22 +2962,22 @@ msgstr ""
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2982
+#: WWW/Library/Implementation/HTNews.c:2942
 msgid "Reading list of available newsgroups."
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:3003
+#: WWW/Library/Implementation/HTNews.c:2963
 msgid "Reading list of articles in newsgroup."
 msgstr "正在讀取新聞組中的文章清單。"
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:3009
+#: WWW/Library/Implementation/HTNews.c:2969
 msgid "Reading news article."
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:3039
+#: WWW/Library/Implementation/HTNews.c:2999
 msgid "Sorry, could not load requested news."
 msgstr ""
 
@@ -2985,11 +2985,11 @@ msgstr ""
 msgid "Address has invalid port"
 msgstr "地址中的連接埠無效"
 
-#: WWW/Library/Implementation/HTTCP.c:1320
+#: WWW/Library/Implementation/HTTCP.c:1308
 msgid "Address length looks invalid"
 msgstr "地址長度似乎無效"
 
-#: WWW/Library/Implementation/HTTCP.c:1552 WWW/Library/Implementation/HTTCP.c:1570
+#: WWW/Library/Implementation/HTTCP.c:1539 WWW/Library/Implementation/HTTCP.c:1557
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "找不到遠端主機 %s。"
@@ -2998,38 +2998,38 @@ msgstr "找不到遠端主機 %s。"
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1567 WWW/Library/Implementation/HTTelnet.c:108
+#: WWW/Library/Implementation/HTTCP.c:1554 WWW/Library/Implementation/HTTelnet.c:108
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "無效的主機名稱 %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1568
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "正在建立 %s 連線,連至 %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1579
 msgid "socket failed."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1605
+#: WWW/Library/Implementation/HTTCP.c:1592
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1629
+#: WWW/Library/Implementation/HTTCP.c:1616
 msgid "Could not make connection non-blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1697
+#: WWW/Library/Implementation/HTTCP.c:1684
 msgid "Connection failed (too many retries)."
 msgstr "連線失敗 (重試次數太多)。"
 
-#: WWW/Library/Implementation/HTTCP.c:1896
+#: WWW/Library/Implementation/HTTCP.c:1883
 msgid "Could not restore socket to blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1962
+#: WWW/Library/Implementation/HTTCP.c:1949
 msgid "Socket read failed for 180,000 tries."
 msgstr ""
 
@@ -3323,98 +3323,98 @@ msgstr "記憶體耗盡,必須中斷顯示!"
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "記憶體耗盡,必須中斷傳輸!"
 
-#: src/GridText.c:3594
+#: src/GridText.c:3601
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr "*** 記憶體耗盡 ***"
 
-#: src/GridText.c:6013 src/GridText.c:6020 src/LYList.c:248
+#: src/GridText.c:6020 src/GridText.c:6027 src/LYList.c:248
 msgid "unknown field or link"
 msgstr "不明的欄位或鏈結"
 
-#: src/GridText.c:6029
+#: src/GridText.c:6036
 msgid "text entry field"
 msgstr "文字輸入欄位"
 
-#: src/GridText.c:6032
+#: src/GridText.c:6039
 msgid "password entry field"
 msgstr "密碼輸入欄位"
 
-#: src/GridText.c:6035
+#: src/GridText.c:6042
 msgid "checkbox"
 msgstr ""
 
-#: src/GridText.c:6038
+#: src/GridText.c:6045
 msgid "radio button"
 msgstr ""
 
-#: src/GridText.c:6041
+#: src/GridText.c:6048
 msgid "submit button"
 msgstr ""
 
-#: src/GridText.c:6044
+#: src/GridText.c:6051
 msgid "reset button"
 msgstr ""
 
-#: src/GridText.c:6047
+#: src/GridText.c:6054
 msgid "popup menu"
 msgstr ""
 
-#: src/GridText.c:6050
+#: src/GridText.c:6057
 msgid "hidden form field"
 msgstr ""
 
-#: src/GridText.c:6053
+#: src/GridText.c:6060
 msgid "text entry area"
 msgstr "文字輸入區域"
 
-#: src/GridText.c:6056
+#: src/GridText.c:6063
 msgid "range entry field"
 msgstr ""
 
-#: src/GridText.c:6059
+#: src/GridText.c:6066
 msgid "file entry field"
 msgstr "檔案名稱輸入欄位"
 
-#: src/GridText.c:6062
+#: src/GridText.c:6069
 msgid "text-submit field"
 msgstr ""
 
-#: src/GridText.c:6065
+#: src/GridText.c:6072
 msgid "image-submit button"
 msgstr ""
 
-#: src/GridText.c:6068
+#: src/GridText.c:6075
 msgid "keygen field"
 msgstr ""
 
-#: src/GridText.c:6071
+#: src/GridText.c:6078
 msgid "unknown form field"
 msgstr ""
 
-#: src/GridText.c:10231
+#: src/GridText.c:10244
 msgid "Can't open file for uploading"
 msgstr "無法開啟準備上傳的檔案"
 
-#: src/GridText.c:11384
+#: src/GridText.c:11397
 #, c-format
 msgid "Submitting %s"
 msgstr ""
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12533
+#: src/GridText.c:12546
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12738
+#: src/GridText.c:12751
 msgid "Wrap lines to fit displayed area?"
 msgstr "是否進行自動換行來符合畫面尺寸?"
 
-#: src/GridText.c:12790
+#: src/GridText.c:12803
 msgid "Very long lines have been wrapped!"
 msgstr ""
 
-#: src/GridText.c:13232
+#: src/GridText.c:13245
 msgid "Very long lines have been truncated!"
 msgstr ""
 
@@ -3521,15 +3521,15 @@ msgstr "檔案路徑:"
 msgid "(unknown)"
 msgstr "(不明)"
 
-#: src/HTML.c:7374
+#: src/HTML.c:7375
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr ""
 
-#: src/HTML.c:7873
+#: src/HTML.c:7874
 msgid "Source cache error - disk full?"
 msgstr ""
 
-#: src/HTML.c:7886
+#: src/HTML.c:7887
 msgid "Source cache error - not enough memory!"
 msgstr ""
 
@@ -3624,31 +3624,31 @@ msgstr "內部"
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "cookie_domain_flag_set 錯誤,中止程式"
 
-#: src/LYCurses.c:1017
+#: src/LYCurses.c:1034
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "無法初始化終端機 ─ 終端機類型不詳?"
 
-#: src/LYCurses.c:1442
+#: src/LYCurses.c:1459
 msgid "Terminal ="
 msgstr "終端機類型 ="
 
-#: src/LYCurses.c:1446
+#: src/LYCurses.c:1463
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "使用本程式時終端機的類型必須是 vt100、200 等等。"
 
-#: src/LYCurses.c:1495
+#: src/LYCurses.c:1512
 msgid "Your Terminal type is unknown!"
 msgstr "終端機類型不明!"
 
-#: src/LYCurses.c:1496
+#: src/LYCurses.c:1513
 msgid "Enter a terminal type:"
 msgstr "請輸入終端機類型:"
 
-#: src/LYCurses.c:1510
+#: src/LYCurses.c:1527
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "終端機類型已設定為"
 
-#: src/LYCurses.c:2007
+#: src/LYCurses.c:2031
 #, c-format
 msgid ""
 "\n"
@@ -3657,7 +3657,7 @@ msgstr ""
 "\n"
 "在 %s 版本 %s 出現嚴重錯誤\n"
 
-#: src/LYCurses.c:2010
+#: src/LYCurses.c:2034
 #, c-format
 msgid ""
 "\n"
@@ -4189,52 +4189,52 @@ msgstr ""
 "Lynx 檔案 %s 不存在。\n"
 "\n"
 
-#: src/LYMain.c:1763
+#: src/LYMain.c:1750
 msgid "Warning:"
 msgstr "警告:"
 
-#: src/LYMain.c:2328
+#: src/LYMain.c:2315
 msgid "persistent cookies state will be changed in next session only."
 msgstr ""
 
-#: src/LYMain.c:2565 src/LYMain.c:2610
+#: src/LYMain.c:2552 src/LYMain.c:2597
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx:忽略無法識別的字元集 %s\n"
 
-#: src/LYMain.c:3121
+#: src/LYMain.c:3108
 #, fuzzy, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s 版本 %s (%s)\n"
 
-#: src/LYMain.c:3156
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "編譯於 %s %s %s\n"
 
-#: src/LYMain.c:3178
+#: src/LYMain.c:3165
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors."
 msgstr "版權所有:University of Kansas、CERN 及其它有貢獻者。"
 
-#: src/LYMain.c:3179
+#: src/LYMain.c:3166
 msgid "Distributed under the GNU General Public License."
 msgstr "使用 GNU General Public License 發佈。"
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3167
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "若需要更多資料,請瀏覽 http://lynx.isc.org/ 及網上的說明文件。"
 
-#: src/LYMain.c:3952
+#: src/LYMain.c:3939
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "用法:%s [選項] [檔案]\n"
 
-#: src/LYMain.c:3953
+#: src/LYMain.c:3940
 #, c-format
 msgid "Options are:\n"
 msgstr "選項包括:\n"
 
-#: src/LYMain.c:4252
+#: src/LYMain.c:4239
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s:無效的選項:%s\n"
@@ -4309,7 +4309,7 @@ msgstr ""
 msgid "Current URL is empty."
 msgstr "目前的目錄:"
 
-#: src/LYMainLoop.c:6935 src/LYUtils.c:1714
+#: src/LYMainLoop.c:6935 src/LYUtils.c:1775
 msgid "Copy to clipboard failed."
 msgstr ""
 
@@ -4405,355 +4405,355 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr ""
 
-#: src/LYOptions.c:758
+#: src/LYOptions.c:761
 msgid "review/edit B)ookmarks files"
 msgstr ""
 
-#: src/LYOptions.c:760
+#: src/LYOptions.c:763
 msgid "B)ookmark file: "
 msgstr "B)書籤檔:"
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2126 src/LYOptions.c:2133
 msgid "ON"
 msgstr ""
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2277 src/LYOptions.c:2288
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280 src/LYOptions.c:2291
 msgid "OFF"
 msgstr ""
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2128
 msgid "NEVER"
 msgstr ""
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2129
 msgid "ALWAYS"
 msgstr ""
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2269
+#: src/LYOptions.c:2145 src/LYOptions.c:2272
 msgid "ignore"
 msgstr ""
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2146
 msgid "ask user"
 msgstr ""
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2147
 msgid "accept all"
 msgstr ""
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS OFF"
 msgstr ""
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2160
 msgid "FOR LOCAL FILES ONLY"
 msgstr ""
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2162
 msgid "ALWAYS ON"
 msgstr ""
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2174
 msgid "Numbers act as arrows"
 msgstr ""
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Links and form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2182
 msgid "Form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2189
+#: src/LYOptions.c:2192
 msgid "Case insensitive"
 msgstr ""
 
-#: src/LYOptions.c:2190
+#: src/LYOptions.c:2193
 msgid "Case sensitive"
 msgstr ""
 
-#: src/LYOptions.c:2214
+#: src/LYOptions.c:2217
 msgid "prompt normally"
 msgstr ""
 
-#: src/LYOptions.c:2215
+#: src/LYOptions.c:2218
 msgid "force yes-response"
 msgstr ""
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2219
 msgid "force no-response"
 msgstr ""
 
-#: src/LYOptions.c:2234
+#: src/LYOptions.c:2237
 msgid "Novice"
 msgstr ""
 
-#: src/LYOptions.c:2235
+#: src/LYOptions.c:2238
 #, fuzzy
 msgid "Intermediate"
 msgstr "內部"
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2239
 msgid "Advanced"
 msgstr ""
 
-#: src/LYOptions.c:2245
+#: src/LYOptions.c:2248
 msgid "By First Visit"
 msgstr ""
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2250
 msgid "By First Visit Reversed"
 msgstr ""
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2251
 msgid "As Visit Tree"
 msgstr ""
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2252
 msgid "By Last Visit"
 msgstr ""
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2254
 msgid "By Last Visit Reversed"
 msgstr ""
 
 #. Old_DTD variable
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2265
 msgid "relaxed (TagSoup mode)"
 msgstr ""
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2266
 msgid "strict (SortaSGML mode)"
 msgstr ""
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2273
 msgid "as labels"
 msgstr ""
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2274
 #, fuzzy
 msgid "as links"
 msgstr "不隱藏的鏈結"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2281
 #, fuzzy
 msgid "show filename"
 msgstr "建議的檔案名稱:"
 
-#: src/LYOptions.c:2289
+#: src/LYOptions.c:2292
 msgid "STANDARD"
 msgstr ""
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2293
 msgid "ADVANCED"
 msgstr ""
 
-#: src/LYOptions.c:2316
+#: src/LYOptions.c:2319
 #, fuzzy
 msgid "Directories first"
 msgstr "副目錄:"
 
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2320
 #, fuzzy
 msgid "Files first"
 msgstr " (首先測試)"
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2321
 #, fuzzy
 msgid "Mixed style"
 msgstr "文字編輯模式"
 
-#: src/LYOptions.c:2326 src/LYOptions.c:2343
+#: src/LYOptions.c:2329 src/LYOptions.c:2346
 #, fuzzy
 msgid "By Name"
 msgstr "名稱:"
 
-#: src/LYOptions.c:2327 src/LYOptions.c:2344
+#: src/LYOptions.c:2330 src/LYOptions.c:2347
 msgid "By Type"
 msgstr ""
 
-#: src/LYOptions.c:2328 src/LYOptions.c:2345
+#: src/LYOptions.c:2331 src/LYOptions.c:2348
 msgid "By Size"
 msgstr ""
 
-#: src/LYOptions.c:2329 src/LYOptions.c:2346
+#: src/LYOptions.c:2332 src/LYOptions.c:2349
 #, fuzzy
 msgid "By Date"
 msgstr "日期:"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2333
 msgid "By Mode"
 msgstr ""
 
-#: src/LYOptions.c:2332
+#: src/LYOptions.c:2335
 msgid "By User"
 msgstr ""
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 #, fuzzy
 msgid "By Group"
 msgstr "所屬群組"
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2357
 msgid "Do not show rate"
 msgstr ""
 
-#: src/LYOptions.c:2355 src/LYOptions.c:2356
+#: src/LYOptions.c:2358 src/LYOptions.c:2359
 #, fuzzy, c-format
 msgid "Show %s/sec rate"
 msgstr "顯示傳輸速率"
 
-#: src/LYOptions.c:2358 src/LYOptions.c:2359
+#: src/LYOptions.c:2361 src/LYOptions.c:2362
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr ""
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2374
 msgid "Accept lynx's internal types"
 msgstr ""
 
-#: src/LYOptions.c:2372
+#: src/LYOptions.c:2375
 msgid "Also accept lynx.cfg's types"
 msgstr ""
 
-#: src/LYOptions.c:2373
+#: src/LYOptions.c:2376
 msgid "Also accept user's types"
 msgstr ""
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "Also accept system's types"
 msgstr ""
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 #, fuzzy
 msgid "Accept all types"
 msgstr "接受更改"
 
-#: src/LYOptions.c:2384
+#: src/LYOptions.c:2387
 msgid "gzip"
 msgstr ""
 
-#: src/LYOptions.c:2385
+#: src/LYOptions.c:2388
 msgid "deflate"
 msgstr ""
 
-#: src/LYOptions.c:2388
+#: src/LYOptions.c:2391
 msgid "compress"
 msgstr ""
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2394
 msgid "bzip2"
 msgstr ""
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2396
 msgid "All"
 msgstr ""
 
-#: src/LYOptions.c:2658 src/LYOptions.c:2682
+#: src/LYOptions.c:2664 src/LYOptions.c:2688
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr ""
 
-#: src/LYOptions.c:3429
+#: src/LYOptions.c:3438
 msgid "(options marked with (!) will not be saved)"
 msgstr ""
 
-#: src/LYOptions.c:3437
+#: src/LYOptions.c:3446
 msgid "General Preferences"
 msgstr "一般偏好設定"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3450
 msgid "User mode"
 msgstr "使用者模式"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3447
+#: src/LYOptions.c:3456
 msgid "Editor"
 msgstr "編輯器"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3461
 msgid "Type of Search"
 msgstr "搜尋方式"
 
-#: src/LYOptions.c:3457
+#: src/LYOptions.c:3466
 msgid "Security and Privacy"
 msgstr ""
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3461
+#: src/LYOptions.c:3470
 msgid "Cookies"
 msgstr "Cookie"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3475
+#: src/LYOptions.c:3484
 msgid "Invalid-Cookie Prompting"
 msgstr ""
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3482
+#: src/LYOptions.c:3491
 msgid "SSL Prompting"
 msgstr ""
 
-#: src/LYOptions.c:3488
+#: src/LYOptions.c:3497
 msgid "Keyboard Input"
 msgstr "鍵盤輸入"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3492
+#: src/LYOptions.c:3501
 msgid "Keypad mode"
 msgstr "數字鍵盤模式"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3498
+#: src/LYOptions.c:3507
 msgid "Emacs keys"
 msgstr "Emacs 組合鍵"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3513
 msgid "VI keys"
 msgstr "VI 組合鍵"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3511
+#: src/LYOptions.c:3520
 msgid "Line edit style"
 msgstr "文字編輯模式"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3532
 msgid "Keyboard layout"
 msgstr "鍵盤配置"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3537
+#: src/LYOptions.c:3546
 msgid "Display and Character Set"
 msgstr "顯示及字元集"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3542
+#: src/LYOptions.c:3551
 #, fuzzy
 msgid "Use locale-based character set"
 msgstr "後備的字元集"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3551
+#: src/LYOptions.c:3560
 msgid "Display character set"
 msgstr "預設顯示的字元集"
 
-#: src/LYOptions.c:3582
+#: src/LYOptions.c:3591
 msgid "Assumed document character set"
 msgstr "後備的字元集"
 
@@ -4762,173 +4762,176 @@ msgstr "後備的字元集"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3602
+#: src/LYOptions.c:3611
 msgid "CJK mode"
 msgstr "CJK 模式"
 
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3613
 msgid "Raw 8-bit"
 msgstr "8-bit 原始模式"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3612
+#: src/LYOptions.c:3621
 msgid "X Display"
 msgstr "X 畫面"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3618
+#: src/LYOptions.c:3627
 msgid "Document Appearance"
 msgstr "文件外觀"
 
-#: src/LYOptions.c:3624
+#: src/LYOptions.c:3633
 msgid "Show color"
 msgstr "顯示色彩"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3648
+#: src/LYOptions.c:3657
 msgid "Show cursor"
 msgstr "顯示游標"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3663
 #, fuzzy
 msgid "Underline links"
 msgstr "隱藏的鏈結:"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3670
 msgid "Show scrollbar"
 msgstr "顯示捲動列"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3668
+#: src/LYOptions.c:3677
 msgid "Popups for select fields"
 msgstr ""
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3674
+#: src/LYOptions.c:3683
 msgid "HTML error recovery"
 msgstr ""
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3680
+#: src/LYOptions.c:3689
 msgid "Show images"
 msgstr "顯示圖像"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3694
+#: src/LYOptions.c:3703
 msgid "Verbose images"
 msgstr "圖像詳細資料"
 
-#: src/LYOptions.c:3703
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3711
 msgid "Headers Transferred to Remote Servers"
 msgstr "傳送至遠端伺服器的標頭資料"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3715
 msgid "Personal mail address"
 msgstr "個人電郵地址"
 
 #. Mail Address: INPUT
-#: src/LYOptions.c:3712
+#: src/LYOptions.c:3720
 #, fuzzy
 msgid "Password for anonymous ftp"
 msgstr "新聞組主機‘%s’的密碼:"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3717
+#: src/LYOptions.c:3725
 #, fuzzy
 msgid "Preferred media type"
 msgstr "已傳輸 %d 位元組"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3723
+#: src/LYOptions.c:3731
 #, fuzzy
 msgid "Preferred encoding"
 msgstr "優先使用的語言"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3729
+#: src/LYOptions.c:3737
 msgid "Preferred document character set"
 msgstr "優先使用的字元集"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3742
 msgid "Preferred document language"
 msgstr "優先使用的語言"
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3748
 msgid "User-Agent header"
 msgstr "User-Agent 標頭"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3748
+#: src/LYOptions.c:3756
 msgid "Listing and Accessing Files"
 msgstr "列出及存取檔案"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3752
+#: src/LYOptions.c:3760
 msgid "FTP sort criteria"
 msgstr "FTP 項目排序條件"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3759
+#: src/LYOptions.c:3767
 msgid "Local directory sort criteria"
 msgstr "本地端目錄排序條件"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3773
 msgid "Local directory sort order"
 msgstr "本地端目錄排列次序"
 
-#: src/LYOptions.c:3774
+#: src/LYOptions.c:3782
 msgid "Show dot files"
 msgstr "顯示隱藏檔"
 
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3790
 msgid "Execution links"
 msgstr ""
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3810
 msgid "Show transfer rate"
 msgstr "顯示傳輸速率"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3830
 msgid "Special Files and Screens"
 msgstr "特殊檔案及畫面"
 
-#: src/LYOptions.c:3827
+#: src/LYOptions.c:3835
 msgid "Multi-bookmarks"
 msgstr "多書籤檔模式"
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3843
 msgid "Review/edit Bookmarks files"
 msgstr "可瀏覽或編輯書籤檔"
 
-#: src/LYOptions.c:3837
+#: src/LYOptions.c:3845
 msgid "Goto multi-bookmark menu"
 msgstr "進入多書籤檔模式選單"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3847
 msgid "Bookmarks file"
 msgstr "書籤檔"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3845
+#: src/LYOptions.c:3853
 msgid "Visited Pages"
 msgstr "曾經瀏覽的網頁"
 
-#: src/LYOptions.c:3850
+#: src/LYOptions.c:3858
 msgid "View the file "
 msgstr ""
 
@@ -5042,38 +5045,38 @@ msgstr ""
 msgid "(no name)"
 msgstr ""
 
-#: src/LYReadCFG.c:1782
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1784
+#: src/LYReadCFG.c:1786
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1785
+#: src/LYReadCFG.c:1787
 #, c-format
 msgid "included from '%s'.\n"
 msgstr ""
 
-#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263
+#: src/LYReadCFG.c:2194 src/LYReadCFG.c:2207 src/LYReadCFG.c:2265
 msgid "The following is read from your lynx.cfg file."
 msgstr "以下是從閣下的 lynx.cfg 檔案讀取的設定。"
 
-#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206
+#: src/LYReadCFG.c:2195 src/LYReadCFG.c:2208
 msgid "Please read the distribution"
 msgstr ""
 
-#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209
+#: src/LYReadCFG.c:2201 src/LYReadCFG.c:2211
 msgid "for more comments."
 msgstr ""
 
-#: src/LYReadCFG.c:2245
+#: src/LYReadCFG.c:2247
 msgid "RELOAD THE CHANGES"
 msgstr "重新載入更改後的設定"
 
-#: src/LYReadCFG.c:2253
+#: src/LYReadCFG.c:2255
 msgid "Your primary configuration"
 msgstr "主要組態"
 
@@ -5339,33 +5342,33 @@ msgstr "上傳至:"
 msgid "Upload options:"
 msgstr "上傳選項:"
 
-#: src/LYUtils.c:1716
+#: src/LYUtils.c:1777
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2493
+#: src/LYUtils.c:2554
 msgid "Unexpected access protocol for this URL scheme."
 msgstr ""
 
-#: src/LYUtils.c:3301
+#: src/LYUtils.c:3362
 msgid "Too many tempfiles"
 msgstr "太多暫存檔"
 
-#: src/LYUtils.c:3605
+#: src/LYUtils.c:3666
 msgid "unknown restriction"
 msgstr ""
 
-#: src/LYUtils.c:3635
+#: src/LYUtils.c:3696
 #, c-format
 msgid "No restrictions set.\n"
 msgstr ""
 
-#: src/LYUtils.c:3638
+#: src/LYUtils.c:3699
 #, c-format
 msgid "Restrictions set:\n"
 msgstr ""
 
-#: src/LYUtils.c:5022
+#: src/LYUtils.c:5077
 msgid "Cannot find HOME directory"
 msgstr "找不到個人目錄"
 
diff --git a/src/GridText.c b/src/GridText.c
index e1d2c335..c2175b02 100644
--- a/src/GridText.c
+++ b/src/GridText.c
@@ -2809,14 +2809,14 @@ static void split_line(HText *text, unsigned split)
     }
     if (split > previous->size) {
 	CTRACE((tfp,
-		"*** split_line: split==%d greater than last_line->size==%d !\n",
+		"*** split_line: split==%u greater than last_line->size==%d !\n",
 		split, previous->size));
 	if (split > MAX_LINE) {
 	    split = previous->size;
 	    if ((cp = strrchr(previous->data, ' ')) &&
 		cp - previous->data > 1)
 		split = cp - previous->data;
-	    CTRACE((tfp, "                split adjusted to %d.\n", split));
+	    CTRACE((tfp, "                split adjusted to %u.\n", split));
 	}
     }
 
@@ -2965,7 +2965,7 @@ static void split_line(HText *text, unsigned split)
 #ifdef DEBUG_APPCH
     if (s != (int) split)
 #endif
-	CTRACE((tfp, "GridText: split_line(%d [now:%d]) called\n", split, s));
+	CTRACE((tfp, "GridText: split_line(%u [now:%d]) called\n", split, s));
 #endif
 
 #if defined(USE_COLOR_STYLE)
@@ -4253,7 +4253,7 @@ void HText_appendCharacter(HText *text, int ch)
 	 + (int) style->rightIndent
 	 - ctrl_chars_on_this_line
 	 + (((HTCJK != NOCJK) && text->kanji_buf) ? 1 : 0)
-	) >= (WRAP_COLS(text) - 1)
+	) >= WRAP_COLS(text)
 	|| (text->T.output_utf8
 	    && ((actual
 		 + UTFXTRA_ON_THIS_LINE
@@ -9696,7 +9696,7 @@ int HText_beginInput(HText *text, BOOL underline,
 
     f->select_list = 0;
     f->number = HTFormNumber;
-    f->disabled = (HTFormDisabled ? TRUE : I->disabled);
+    f->disabled = HTFormDisabled;
     f->no_cache = NO;
 
     HTFormFields++;
@@ -9983,14 +9983,13 @@ int HText_beginInput(HText *text, BOOL underline,
     }
     if (fields_are_numbered() && (a->number > 0)) {
 	sprintf(marker, "[%d]", a->number);
+	adjust_marker = strlen(marker);
 	if (number_fields_on_left) {
 	    BOOL had_bracket = (f->type == F_OPTION_LIST_TYPE);
 
 	    HText_appendText(text, had_bracket ? (marker + 1) : marker);
 	    if (had_bracket)
 		HText_appendCharacter(text, '[');
-	} else {
-	    adjust_marker = strlen(marker);
 	}
 	a->line_num = text->Lines;
 	a->line_pos = text->last_line->size;
@@ -10049,6 +10048,10 @@ int HText_beginInput(HText *text, BOOL underline,
 	MaximumSize -= 10;
 	break;
     }
+
+    if (MaximumSize < 1)
+	MaximumSize = 1;
+
     if (f->size > MaximumSize)
 	f->size = MaximumSize;
 
@@ -10099,6 +10102,9 @@ int HText_beginInput(HText *text, BOOL underline,
     /*
      * Return the SIZE of the input field.
      */
+    if (I->size && f->size > adjust_marker) {
+	f->size -= adjust_marker;
+    }
     return (f->size);
 }
 
@@ -10654,9 +10660,9 @@ int HText_SubmitForm(FormInfo * submit_item, DocInfo *doc, char *link_name,
 	    !anchor_ptr->input_field->disabled) {
 
 	    FormInfo *form_ptr = anchor_ptr->input_field;
-	    char *val = form_ptr->cp_submit_value != NULL
-	    ? form_ptr->cp_submit_value
-	    : form_ptr->value;
+	    char *val = (form_ptr->cp_submit_value != NULL
+			 ? form_ptr->cp_submit_value
+			 : form_ptr->value);
 
 	    unsigned field_is_special = check_form_specialchars(val);
 	    unsigned name_is_special = check_form_specialchars(form_ptr->name);
@@ -10897,9 +10903,9 @@ int HText_SubmitForm(FormInfo * submit_item, DocInfo *doc, char *link_name,
 		    CTRACE((tfp, "field \"%s\" %d %s -> %d %s %s\n",
 			    NonNull(form_ptr->name),
 			    form_ptr->value_cs,
-			    form_ptr->value_cs >= 0
-			    ? LYCharSet_UC[form_ptr->value_cs].MIMEname
-			    : "???",
+			    ((form_ptr->value_cs >= 0)
+			     ? LYCharSet_UC[form_ptr->value_cs].MIMEname
+			     : "???"),
 			    target_cs,
 			    target_csname ? target_csname : "???",
 			    success ? "OK" : "FAILED"));
@@ -10960,9 +10966,9 @@ int HText_SubmitForm(FormInfo * submit_item, DocInfo *doc, char *link_name,
 		    CTRACE((tfp, "name \"%s\" %d %s -> %d %s %s\n",
 			    NonNull(form_ptr->name),
 			    form_ptr->name_cs,
-			    form_ptr->name_cs >= 0
-			    ? LYCharSet_UC[form_ptr->name_cs].MIMEname
-			    : "???",
+			    ((form_ptr->name_cs >= 0)
+			     ? LYCharSet_UC[form_ptr->name_cs].MIMEname
+			     : "???"),
 			    target_cs,
 			    target_csname ? target_csname : "???",
 			    success ? "OK" : "FAILED"));
diff --git a/src/HTML.c b/src/HTML.c
index b0c1d47f..03efce72 100644
--- a/src/HTML.c
+++ b/src/HTML.c
@@ -3037,9 +3037,10 @@ static int HTML_start_element(HTStructured * me, int element_number,
 	     * set, we'll use the current document's URL for resolving. 
 	     * Otherwise use the BASE.  - kw
 	     */
-	    Base = (me->inBASE &&
-		    !(*map_href == '#' && LYSeekFragMAPinCur == TRUE)) ?
-		me->base_href : me->node_anchor->address;
+	    Base = ((me->inBASE &&
+		     !(*map_href == '#' && LYSeekFragMAPinCur == TRUE))
+		    ? me->base_href
+		    : me->node_anchor->address);
 	    HTParseALL(&map_href, Base);
 
 	    /*
@@ -3511,9 +3512,10 @@ static int HTML_start_element(HTStructured * me, int element_number,
 	     * itself, unless the HREF is a lone fragment and
 	     * LYSeekFragAREAinCur is set.  - FM
 	     */
-	    Base = ((me->inBASE && *href != '\0') &&
-		    !(*href == '#' && LYSeekFragAREAinCur == TRUE)) ?
-		me->base_href : me->node_anchor->address;
+	    Base = (((me->inBASE && *href != '\0') &&
+		     !(*href == '#' && LYSeekFragAREAinCur == TRUE))
+		    ? me->base_href
+		    : me->node_anchor->address);
 	    HTParseALL(&href, Base);
 
 	    /*
@@ -4442,8 +4444,9 @@ static int HTML_start_element(HTStructured * me, int element_number,
 		 */
 		for (i = 0; I.value[i]; i++) {
 		    HTML_put_character(me,
-				       (char) (I.value[i] == ' ' ?
-					       HT_NON_BREAK_SPACE : I.value[i]));
+				       (I.value[i] == ' ')
+				       ? HT_NON_BREAK_SPACE
+				       : I.value[i]);
 		}
 		while (i++ < chars) {
 		    HTML_put_character(me, HT_NON_BREAK_SPACE);
@@ -4628,6 +4631,7 @@ static int HTML_start_element(HTStructured * me, int element_number,
 		UNESCAPE_FIELDNAME_TO_STD(&I_name);
 		I.name = I_name;
 	    }
+
 	    if ((present && present[HTML_INPUT_ALT] &&
 		 non_empty(value[HTML_INPUT_ALT]) &&
 		 I.type && !strcasecomp(I.type, "image")) &&
@@ -4815,12 +4819,10 @@ static int HTML_start_element(HTStructured * me, int element_number,
 		I.md = value[HTML_INPUT_MD];
 
 	    chars = HText_beginInput(me->text, me->inUnderline, &I);
-#ifndef USE_FILE_UPLOAD
 	    CTRACE((tfp,
 		    "I.%s have %d chars, or something\n",
 		    NONNULL(I.type),
 		    chars));
-#endif
 	    /*
 	     * Submit and reset buttons have values which don't change, so
 	     * HText_beginInput() sets I.value to the string which should be
@@ -4890,9 +4892,7 @@ static int HTML_start_element(HTStructured * me, int element_number,
 		}
 		HText_setIgnoreExcess(me->text, TRUE);
 	    }
-#ifndef USE_FILE_UPLOAD
 	    CTRACE((tfp, "I.%s, %d\n", NONNULL(I.type), IsSubmitOrReset));
-#endif
 	    if (IsSubmitOrReset == FALSE) {
 		/*
 		 * This is not a submit or reset button, so output the rest of
@@ -6163,6 +6163,7 @@ static int HTML_end_element(HTStructured * me, int element_number,
 	/*
 	 * Set to know that we are no longer in a PRE block.
 	 */
+	HText_appendCharacter(me->text, '\n');
 	me->inPRE = FALSE;
 	/* FALLTHRU */
     case HTML_LISTING:		/* Literal text */
diff --git a/src/LYCharUtils.c b/src/LYCharUtils.c
index e3c42602..defd13e3 100644
--- a/src/LYCharUtils.c
+++ b/src/LYCharUtils.c
@@ -1145,6 +1145,7 @@ char **LYUCFullyTranslateString(char **str,
     if ((HTCJK != NOCJK)
 #ifdef EXP_JAPANESEUTF8_SUPPORT
 	&& (strcmp(LYCharSet_UC[cs_from].MIMEname, "utf-8") != 0)
+	&& (strcmp(LYCharSet_UC[cs_to].MIMEname, "utf-8") != 0)
 #endif
 	) {
 	no_bytetrans = TRUE;
@@ -1392,6 +1393,20 @@ char **LYUCFullyTranslateString(char **str,
 		    } else {
 			*(unsigned char *) p = UCH(173);
 		    }
+#ifdef EXP_JAPANESEUTF8_SUPPORT
+		} else if (output_utf8) {
+		    if ((!strcmp(LYCharSet_UC[cs_from].MIMEname, "euc-jp") &&
+			 (IS_EUC((unsigned char) (*p),
+				 (unsigned char) (*(p + 1))))) ||
+			(!strcmp(LYCharSet_UC[cs_from].MIMEname, "shift_jis") &&
+			 (IS_SJIS_2BYTE((unsigned char) (*p),
+					(unsigned char) (*(p + 1)))))) {
+			code = UCTransJPToUni(p, 2, cs_from);
+			p++;
+			state = S_check_uni;
+			break;
+		    }
+#endif
 		} else if (code < 127 || T.transp) {
 		    state = S_got_outchar;
 		    break;
diff --git a/src/LYCookie.c b/src/LYCookie.c
index f54f7db0..561f3676 100644
--- a/src/LYCookie.c
+++ b/src/LYCookie.c
@@ -305,7 +305,7 @@ static domain_entry *find_domain_entry(const char *name)
 	    if (de != NULL && de->domain != NULL) {
 		CTRACE2(TRACE_CFG,
 			(tfp,
-			 "...test_domain_entry(%s) bv:%d, invcheck_bv:%d\n",
+			 "...test_domain_entry(%s) bv:%u, invcheck_bv:%u\n",
 			 de->domain,
 			 de->bv,
 			 de->invcheck_bv));
@@ -2643,7 +2643,7 @@ static void cookie_domain_flag_set(char *domainstr,
 	    break;
 	}
 	CTRACE((tfp,
-		"cookie_domain_flag_set (%s, bv=%d, invcheck_bv=%d)\n",
+		"cookie_domain_flag_set (%s, bv=%u, invcheck_bv=%u)\n",
 		strsmall, de->bv, de->invcheck_bv));
     }
 
diff --git a/src/LYCurses.c b/src/LYCurses.c
index e608520b..7b68dbda 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -570,6 +570,10 @@ int lynx_default_colors(void)
 	    default_fg = DEFAULT_COLOR;
 	    default_bg = DEFAULT_COLOR;
 	    code = 1;
+	} else {
+	    default_fg = COLOR_WHITE;
+	    default_bg = COLOR_BLACK;
+	    default_color_reset = TRUE;
 	}
     }
     return code;
@@ -859,6 +863,12 @@ void start_curses(void)
     }
 
     if (slinit == 0) {
+#if defined(HAVE_TTYNAME)
+	if (isatty(fileno(stdout)) && LYReopenInput() < 0) {
+	    fprintf(stderr, "Cannot open tty input\n");
+	    exit_immediately(EXIT_FAILURE);
+	}
+#endif
 #if defined(USE_KEYMAPS)
 	if (-1 == lynx_initialize_keymaps())
 	    exit_immediately(EXIT_FAILURE);
@@ -967,6 +977,13 @@ void start_curses(void)
     initscr();			/* start curses */
 #else /* Unix: */
 
+#if defined(HAVE_TTYNAME)
+    if (isatty(fileno(stdout)) && LYReopenInput() < 0) {
+	fprintf(stderr, "Cannot open tty input\n");
+	exit_immediately(EXIT_FAILURE);
+    }
+#endif
+
 #ifdef __CYGWIN__
     /*
      * Workaround for buggy Cygwin, which breaks subprocesses of a
@@ -1110,7 +1127,7 @@ void start_curses(void)
 			lynx_color_cfg[n].fg = default_fg;
 		    if (default_bg >= 0 && lynx_color_cfg[n].bg < 0)
 			lynx_color_cfg[n].bg = default_bg;
-		    CTRACE((tfp, "color_cfg[%d] = %d/%d\n", n,
+		    CTRACE((tfp, "color_cfg[%u] = %d/%d\n", n,
 			    lynx_color_cfg[n].fg,
 			    lynx_color_cfg[n].bg));
 		}
@@ -1673,8 +1690,13 @@ WINDOW *LYstartPopup(int *top_y,
     if (*left_x > 0 && (*left_x + *width + 4) < LYcolLimit)
 	form_window = newwin(*height, *width + 4, *top_y, *left_x - 1);
     if (form_window == 0) {
-	*width = LYcolLimit - 4;
-	form_window = newwin(*height, LYcolLimit, *top_y, 0);
+	if (*width > LYcolLimit - 4) {
+	    *width = LYcolLimit - 4;
+	    *left_x = 1;
+	} else {
+	    *left_x = LYcolLimit - 4 - *width;
+	}
+	form_window = newwin(*height, *width + 4, *top_y, *left_x - 1);
     }
     if (form_window == 0) {
 	HTAlert(POPUP_FAILED);
@@ -1772,9 +1794,9 @@ void LYwaddnstr(WINDOW * w GCC_UNUSED,
 	int start = 0;
 	int piece = (LYcolLimit - x0);
 
-	CTRACE((tfp, "LYwaddnstr wrapping src:%s, len:%d:%d\n", src, len, LYcolLimit));
+	CTRACE((tfp, "LYwaddnstr wrapping src:%s, len:%u:%d\n", src, len, LYcolLimit));
 	LYwideLines = TRUE;	/* prevent recursion */
-	for (;;) {
+	while (piece > 0) {
 	    int y, x;
 
 	    getyx(LYwin, y, x);
@@ -1801,15 +1823,15 @@ void LYwaddnstr(WINDOW * w GCC_UNUSED,
 	int y, x;
 
 	LYGetYX(y, x);
-	CTRACE2(TRACE_STYLE, (tfp, "[%2d,%2d] LYwaddnstr(%.*s)\n",
-			      y, x, (int) len, src));
+	CTRACE2(TRACE_STYLE, (tfp, "[%2d,%2d] LYwaddnstr(%.*s, %u)\n",
+			      y, x, (int) len, src, (unsigned) len));
     }
 #endif
     /*
      * There's no guarantee that a library won't temporarily write on its input.
      * Be safe and copy it when we have const-data.
      */
-    while (len > 0) {
+    while ((int) len > 0) {
 	char temp[MAX_LINE];
 	size_t use = (len >= MAX_LINE) ? MAX_LINE - 1 : len;
 
diff --git a/src/LYForms.c b/src/LYForms.c
index e5695db6..80fafbc5 100644
--- a/src/LYForms.c
+++ b/src/LYForms.c
@@ -69,6 +69,7 @@ int change_form_link_ex(int cur,
     int newdoc_changed = 0;
     int c = DO_NOTHING;
     int OrigNumValue;
+    int title_adjust = (no_title ? -TITLE_LINES : 0);
     char **my_data = 0;
 
     /*
@@ -82,7 +83,7 @@ int change_form_link_ex(int cur,
     /*
      * Move to the link position.
      */
-    LYmove(links[cur].ly, links[cur].lx);
+    LYmove(links[cur].ly + title_adjust, links[cur].lx);
 
     switch (form->type) {
     case F_CHECKBOX_TYPE:
diff --git a/src/LYJump.c b/src/LYJump.c
index 903c2ee2..f3af593f 100644
--- a/src/LYJump.c
+++ b/src/LYJump.c
@@ -475,7 +475,7 @@ static unsigned LYRead_Jumpfile(struct JumpTable *jtp)
 	if (cp == NULL)
 	    break;
 	cp++;
-	CTRACE((tfp, "Read jumpfile[%d] key='%s', url='%s'\n",
+	CTRACE((tfp, "Read jumpfile[%u] key='%s', url='%s'\n",
 		i, jtp->table[i].key, jtp->table[i].url));
 	i++;
 	if (!cp)
diff --git a/src/LYMain.c b/src/LYMain.c
index f5e8b353..0aa29e71 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -1620,19 +1620,13 @@ int main(int argc,
     /*
      * If we are told to read the startfile from standard input, do it now,
      * after we have read all of the option data from standard input.
+     * Later we'll use LYReopenInput().
      */
     if (startfile_stdin) {
 	char result[LY_MAXPATH];
 	char *buf = NULL;
-	const char *tty = NULL;
 
-# ifdef HAVE_TTYNAME
-	tty = ttyname(fileno(stderr));
-# endif
-	if (tty == NULL)
-	    tty = isatty(fileno(stdin)) ? TTY_DEVICE : NUL_DEVICE;
-
-	CTRACE((tfp, "processing stdin startfile, tty=%s\n", tty));
+	CTRACE((tfp, "processing stdin startfile\n"));
 	if ((fp = LYOpenTemp(result, HTML_SUFFIX, "w")) != 0) {
 	    StrAllocCopy(startfile, result);
 	    while (GetStdin(&buf, FALSE)) {
@@ -1643,13 +1637,6 @@ int main(int argc,
 	    LYCloseTempFP(fp);
 	}
 	CTRACE((tfp, "...done stdin startfile\n"));
-	if ((freopen(tty, "r", stdin)) == 0) {
-	    CTRACE((tfp, "cannot open a terminal (%s)\n", tty));
-	    if (!dump_output_immediately) {
-		fprintf(stderr, "cannot open a terminal (%s)\n", tty);
-		exit_immediately(1);
-	    }
-	}
     }
 #endif
 
@@ -4080,7 +4067,7 @@ static BOOL parse_arg(char **argv,
 #endif
 
     arg_name = argv[0];
-    CTRACE((tfp, "parse_arg(arg_name=%s, mask=%d, count=%d)\n",
+    CTRACE((tfp, "parse_arg(arg_name=%s, mask=%u, count=%d)\n",
 	    arg_name, mask, countp ? *countp : -1));
 
 #if EXTENDED_STARTFILE_RECALL
@@ -4178,7 +4165,7 @@ static BOOL parse_arg(char **argv,
 
 	/* ignore option if it's not our turn */
 	if ((p->type & mask) == 0) {
-	    CTRACE((tfp, "...skip (mask %d/%d)\n", mask, p->type & 7));
+	    CTRACE((tfp, "...skip (mask %u/%d)\n", mask, p->type & 7));
 	    return FALSE;
 	}
 
diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c
index 38eedf3c..1de98d5b 100644
--- a/src/LYMainLoop.c
+++ b/src/LYMainLoop.c
@@ -5235,9 +5235,9 @@ int mainloop(void)
     char cfile[128];
     FILE *cfp;
     char *cp;
-    int ch;
-    RecallType recall;
-    int URLTotal;
+    int ch = 0;
+    RecallType recall = NORECALL;
+    int URLTotal = 0;
     int URLNum;
     BOOLEAN FirstURLRecall = TRUE;
     char *temp = NULL;
diff --git a/src/LYOptions.c b/src/LYOptions.c
index dd5b5c07..fffa9011 100644
--- a/src/LYOptions.c
+++ b/src/LYOptions.c
@@ -2589,7 +2589,7 @@ int postoptions(DocInfo *newdoc)
     PostPair *data = 0;
     DocAddress WWWDoc;		/* need on exit */
     int i;
-    int code;
+    int code = 0;
     BOOLEAN save_all = FALSE;
     int display_char_set_old = current_char_set;
     int old_media_value = LYAcceptMedia;
@@ -2748,7 +2748,7 @@ int postoptions(DocInfo *newdoc)
 
 	/* Keypad Mode: SELECT */
 	if (!strcmp(data[i].tag, keypad_mode_string)) {
-	    int newval;
+	    int newval = 0;
 
 	    if (GetOptValues(keypad_mode_values, data[i].value, &newval)
 		&& keypad_mode != newval) {
diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c
index a6a8f384..e8e21d55 100644
--- a/src/LYReadCFG.c
+++ b/src/LYReadCFG.c
@@ -1272,7 +1272,7 @@ static Config_Type Config_Table [] =
      PARSE_STR(RC_COOKIE_SAVE_FILE,     LYCookieSaveFile),
 #endif /* USE_PERSISTENT_COOKIES */
      PARSE_STR(RC_COOKIE_STRICT_INVALID_DOMAIN, LYCookieSStrictCheckDomains),
-     PARSE_Env(RC_CSO_PROXY,		0),
+     PARSE_Env(RC_CSO_PROXY,            0),
 #ifdef VMS
      PARSE_PRG(RC_CSWING_PATH,          ppCSWING),
 #endif
@@ -1406,9 +1406,11 @@ static Config_Type Config_Table [] =
 #endif
      PARSE_SET(RC_NO_FROM_HEADER,       LYNoFromHeader),
      PARSE_SET(RC_NO_ISMAP_IF_USEMAP,   LYNoISMAPifUSEMAP),
+     PARSE_SET(RC_NO_MARGINS,           no_margins),
      PARSE_Env(RC_NO_PROXY,             0),
      PARSE_SET(RC_NO_REFERER_HEADER,    LYNoRefererHeader),
      PARSE_SET(RC_NO_TABLE_CENTER,      no_table_center),
+     PARSE_SET(RC_NO_TITLE,             no_title),
      PARSE_FUN(RC_NONRESTARTING_SIGWINCH, nonrest_sigwinch_fun),
      PARSE_FUN(RC_OUTGOING_MAIL_CHARSET, outgoing_mail_charset_fun),
 #ifdef DISP_PARTIAL
@@ -1474,7 +1476,7 @@ static Config_Type Config_Table [] =
      PARSE_FUN(RC_SUFFIX_ORDER,         suffix_order_fun),
 #ifdef SYSLOG_REQUESTED_URLS
      PARSE_SET(RC_SYSLOG_REQUESTED_URLS, syslog_requested_urls),
-     PARSE_SET(RC_SYSLOG_TEXT,		syslog_txt),
+     PARSE_SET(RC_SYSLOG_TEXT,          syslog_txt),
 #endif
      PARSE_FUN(RC_SYSTEM_EDITOR,        system_editor_fun),
      PARSE_STR(RC_SYSTEM_MAIL,          system_mail),
diff --git a/src/LYStrings.c b/src/LYStrings.c
index 4fe7be02..92eaf1bd 100644
--- a/src/LYStrings.c
+++ b/src/LYStrings.c
@@ -1062,7 +1062,7 @@ static BOOLEAN unescape_string(char *src, char *dst, char *final)
     BOOLEAN ok = FALSE;
 
     if (*src == SQUOTE) {
-	int keysym;
+	int keysym = -1;
 
 	unescaped_char(src, &keysym);
 	if (keysym >= 0) {
@@ -1677,42 +1677,18 @@ static int LYgetch_for(int code)
 	 || (c == 0xFFFF)
 #endif
 	)) {
-	int fd, kbd_fd;
 
 	CTRACE((tfp,
 		"nozap: Got EOF, curses %s, stdin is %p, LYNoZapKey reduced from %d to 0.\n",
 		LYCursesON ? "on" : "off", stdin, LYNoZapKey));
 	LYNoZapKey = 0;		/* 2 -> 0 */
-	if ((fd = fileno(stdin)) == 0 && !isatty(fd) &&
-	    (kbd_fd = LYConsoleInputFD(FALSE)) == fd) {
-	    char *term_name;
-	    int new_fd = INVSOC;
-
-	    if ((term_name = ttyname(fileno(stdout))) != NULL)
-		new_fd = open(term_name, O_RDONLY);
-	    if (new_fd == INVSOC &&
-		(term_name = ttyname(fileno(stderr))) != NULL)
-		new_fd = open(term_name, O_RDONLY);
-	    if (new_fd == INVSOC) {
-		term_name = ctermid(NULL);
-		new_fd = open(term_name, O_RDONLY);
-	    }
-	    CTRACE((tfp, "nozap: open(%s) returned %d.\n", term_name, new_fd));
-	    if (new_fd >= 0) {
-		FILE *frp;
-
-		close(new_fd);
-		frp = freopen(term_name, "r", stdin);
-		CTRACE((tfp,
-			"nozap: freopen(%s,\"r\",stdin) returned %p, stdin is now %p with fd %d.\n",
-			term_name, frp, stdin, fileno(stdin)));
-		if (LYCursesON) {
-		    stop_curses();
-		    start_curses();
-		    LYrefresh();
-		}
-		goto re_read;
+	if (LYReopenInput() > 0) {
+	    if (LYCursesON) {
+		stop_curses();
+		start_curses();
+		LYrefresh();
 	    }
+	    goto re_read;
 	}
     }
 #endif /* MISC_EXP */
@@ -2864,7 +2840,7 @@ static int map_active = 0;
 
 int LYEditInsert(EDREC * edit, unsigned const char *s,
 		 int len,
-		 int map,
+		 int map GCC_UNUSED,
 		 BOOL maxMessage)
 {
     int length = strlen(Buf);
diff --git a/src/LYUtils.c b/src/LYUtils.c
index 4fde7d96..ca4a3741 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -970,7 +970,7 @@ static int find_cached_style(int cur,
 			    s = cached_styles[LYP][x];
 			    cached_styles[LYP][LXP] = s;
 			}
-			CTRACE((tfp, "found %d, x_offset=%d.\n",
+			CTRACE((tfp, "found %u, x_offset=%d.\n",
 				cached_styles[LYP][x], (int) x - LXP));
 			break;
 		    }
@@ -1496,7 +1496,68 @@ void noviceline(int more_flag GCC_UNUSED)
     return;
 }
 
-#if defined(NSL_FORK) || defined(MISC_EXP)
+#if defined(MISC_EXP) || defined(TTY_DEVICE) || defined(HAVE_TTYNAME)
+/*
+ * If the standard input is not a tty, and Lynx is really reading from the
+ * standard input, attempt to reopen it, pointing to a real tty.  Normally
+ * this would happen if the user pipes data to Lynx and wants to run
+ * interactively after that.
+ *
+ * Returns:
+ *     1  if successfully reopened
+ *    -1  if we cannot reopen
+ *     0  if we do not have to reopen
+ */
+int LYReopenInput(void)
+{
+    int result = 0;
+    int fd;
+
+    if ((fd = fileno(stdin)) == 0
+	&& !isatty(fd)
+	&& LYConsoleInputFD(FALSE) == fd) {
+	char *term_name = NULL;
+	int new_fd = -1;
+
+#ifdef HAVE_TTYNAME
+	if (isatty(fileno(stdout)) &&
+	    (term_name = ttyname(fileno(stdout))) != NULL)
+	    new_fd = open(term_name, O_RDONLY);
+
+	if (new_fd == -1 &&
+	    isatty(fileno(stderr)) &&
+	    (term_name = ttyname(fileno(stderr))) != NULL)
+	    new_fd = open(term_name, O_RDONLY);
+
+	if (new_fd == -1 &&
+	    (term_name = ctermid(NULL)) != NULL)
+	    new_fd = open(term_name, O_RDONLY);
+#endif
+
+#ifdef TTY_DEVICE
+	if (new_fd == -1)
+	    new_fd = open(term_name = TTY_DEVICE, O_RDONLY);
+#endif
+
+	CTRACE((tfp, "LYReopenInput open(%s) returned %d.\n", term_name, new_fd));
+	if (new_fd >= 0) {
+	    FILE *frp;
+
+	    close(new_fd);
+	    frp = freopen(term_name, "r", stdin);
+	    CTRACE((tfp,
+		    "LYReopenInput freopen(%s,\"r\",stdin) returned %p, stdin is now %p with fd %d.\n",
+		    term_name, frp, stdin, fileno(stdin)));
+	    result = 1;
+	} else {
+	    result = -1;
+	}
+    }
+    return result;
+}
+#endif
+
+#if defined(NSL_FORK) || defined(MISC_EXP) || defined (TTY_DEVICE) || defined(HAVE_TTYNAME)
 /*
  * Returns the file descriptor from which keyboard input is expected, or INVSOC
  * (-1) if not available.  If need_selectable is true, returns non-INVSOC fd
@@ -4365,9 +4426,9 @@ BOOLEAN LYExpandHostForURL(char **AllocatedString,
 			   char *prefix_list,
 			   char *suffix_list)
 {
-    char DomainPrefix[80];
+    char *DomainPrefix = NULL;
     const char *StartP, *EndP;
-    char DomainSuffix[80];
+    char *DomainSuffix = NULL;
     const char *StartS, *EndS;
     char *Str = NULL, *StrColon = NULL, *MsgStr = NULL;
     char *Host = NULL, *HostColon = NULL, *host = NULL;
@@ -4425,8 +4486,7 @@ BOOLEAN LYExpandHostForURL(char **AllocatedString,
     if ((StrColon = strrchr(Str, ':')) != NULL &&
 	isdigit(UCH(StrColon[1]))) {
 	if (StrColon == Str) {
-	    FREE(Str);
-	    return GotHost;
+	    goto cleanup;
 	}
 	*StrColon = '\0';
     }
@@ -4468,10 +4528,7 @@ BOOLEAN LYExpandHostForURL(char **AllocatedString,
 	 * Return success.  - FM
 	 */
 	GotHost = TRUE;
-	FREE(host);
-	FREE(Str);
-	FREE(MsgStr);
-	return GotHost;
+	goto cleanup;
     } else if (LYCursesON && (lynx_nsl_status == HT_INTERRUPTED)) {
 	/*
 	 * Give the user chance to interrupt lookup cycles.  - KW & FM
@@ -4483,10 +4540,7 @@ BOOLEAN LYExpandHostForURL(char **AllocatedString,
 	/*
 	 * Return failure.  - FM
 	 */
-	FREE(host);
-	FREE(Str);
-	FREE(MsgStr);
-	return FALSE;
+	goto cleanup;
     }
 
     /*
@@ -4521,7 +4575,8 @@ BOOLEAN LYExpandHostForURL(char **AllocatedString,
     while (*EndP && !WHITE(*EndP) && *EndP != ',') {
 	EndP++;			/* Find separator */
     }
-    LYstrncpy(DomainPrefix, StartP, (EndP - StartP));
+    StrAllocCopy(DomainPrefix, StartP);
+    DomainPrefix[EndP - StartP] = '\0';
 
     /*
      * Test each prefix with each suffix.  - FM
@@ -4541,7 +4596,8 @@ BOOLEAN LYExpandHostForURL(char **AllocatedString,
 	while (*EndS && !WHITE(*EndS) && *EndS != ',') {
 	    EndS++;		/* Find separator */
 	}
-	LYstrncpy(DomainSuffix, StartS, (EndS - StartS));
+	StrAllocCopy(DomainSuffix, StartS);
+	DomainSuffix[EndS - StartS] = '\0';
 
 	/*
 	 * Create domain names and do DNS tests.  - FM
@@ -4579,11 +4635,7 @@ BOOLEAN LYExpandHostForURL(char **AllocatedString,
 		    CTRACE((tfp,
 			    "LYExpandHostForURL: Interrupted while '%s' failed to resolve.\n",
 			    host));
-		    FREE(Str);
-		    FREE(MsgStr);
-		    FREE(Host);
-		    FREE(host);
-		    return FALSE;	/* We didn't find a valid name. */
+		    goto cleanup;	/* We didn't find a valid name. */
 		}
 
 		/*
@@ -4651,6 +4703,9 @@ BOOLEAN LYExpandHostForURL(char **AllocatedString,
     /*
      * Clean up and return the last test result.  - FM
      */
+  cleanup:
+    FREE(DomainPrefix);
+    FREE(DomainSuffix);
     FREE(Str);
     FREE(MsgStr);
     FREE(Host);
diff --git a/src/LYUtils.h b/src/LYUtils.h
index d9e26567..9844d728 100644
--- a/src/LYUtils.h
+++ b/src/LYUtils.h
@@ -144,6 +144,7 @@ extern "C" {
     extern int LYCopyFile(char *src, char *dst);
     extern int LYGetHilitePos(int cur, int count);
     extern int LYRemoveTemp(char *name);
+    extern int LYReopenInput(void);
     extern int LYSystem(char *command);
     extern int LYValidateOutput(char *filename);
     extern int find_restriction(const char *name, int len);
diff --git a/src/LYrcFile.h b/src/LYrcFile.h
index 7c6f28ee..16db1647 100644
--- a/src/LYrcFile.h
+++ b/src/LYrcFile.h
@@ -146,9 +146,11 @@
 #define RC_NO_FORCED_CORE_DUMP          "no_forced_core_dump"
 #define RC_NO_FROM_HEADER               "no_from_header"
 #define RC_NO_ISMAP_IF_USEMAP           "no_ismap_if_usemap"
+#define RC_NO_MARGINS                   "no_margins"
 #define RC_NO_PROXY                     "no_proxy"
 #define RC_NO_REFERER_HEADER            "no_referer_header"
 #define RC_NO_TABLE_CENTER              "no_table_center"
+#define RC_NO_TITLE                     "no_title"
 #define RC_NUMBER_FIELDS_ON_LEFT        "number_fields_on_left"
 #define RC_NUMBER_LINKS_ON_LEFT         "number_links_on_left"
 #define RC_OUTGOING_MAIL_CHARSET        "outgoing_mail_charset"
diff --git a/src/TRSTable.c b/src/TRSTable.c
index aedb56a7..f8ec81b8 100644
--- a/src/TRSTable.c
+++ b/src/TRSTable.c
@@ -1755,7 +1755,7 @@ int Stbl_finishTABLE(STable_info *me)
 	    continue;		/* Not a continuation line */
 	minoffset = nextrow[-1].offset;		/* Line before first continuation */
 	CTRACE2(TRACE_TRST, (tfp,
-			     "TRST:Stbl_finishTABLE, l=%d, offset=%d, ended=%d.\n",
+			     "TRST:Stbl_finishTABLE, l=%d, offset=%d, ended=%u.\n",
 			     i, nextrow[-1].offset, nextrow[-1].ended));
 
 	/* Find the common part of the requested offsets */
@@ -1769,7 +1769,7 @@ int Stbl_finishTABLE(STable_info *me)
 		minoffset = nextrow->offset;
 	    CTRACE2(TRACE_TRST,
 		    (tfp,
-		     "TRST:Stbl_finishTABLE, l=%d, offset=%d, ended=%d.\n",
+		     "TRST:Stbl_finishTABLE, l=%d, offset=%d, ended=%u.\n",
 		     j, nextrow->offset, nextrow[-1].ended));
 	    nextrow++;
 	    j++;
diff --git a/src/UCAux.c b/src/UCAux.c
index 24976426..e5d01147 100644
--- a/src/UCAux.c
+++ b/src/UCAux.c
@@ -11,8 +11,10 @@ BOOL UCCanUniTranslateFrom(int from)
 {
     if (from < 0)
 	return NO;
+#ifndef EXP_JAPANESEUTF8_SUPPORT
     if (LYCharSet_UC[from].enc == UCT_ENC_CJK)
 	return NO;
+#endif
     if (!strcmp(LYCharSet_UC[from].MIMEname, "x-transparent"))
 	return NO;
 
@@ -313,7 +315,7 @@ void UCTransParams_clear(UCTransParams * pT)
  *  chars to displayable ASCII chars if '0' was requested.  They'll
  *  stay as they are otherwise. - kw
  */
-void UCSetBoxChars(int cset,
+void UCSetBoxChars(int cset GCC_UNUSED,
 		   int *pvert_out,
 		   int *phori_out,
 		   int vert_in,
diff --git a/src/UCdomap.c b/src/UCdomap.c
index 11ec31bd..a03a4b92 100644
--- a/src/UCdomap.c
+++ b/src/UCdomap.c
@@ -1098,6 +1098,30 @@ int UCTransChar(char ch_in,
     return rc;
 }
 
+#ifdef EXP_JAPANESEUTF8_SUPPORT
+long int UCTransJPToUni(char *inbuf,
+			int buflen,
+			int charset_in)
+{
+    char outbuf[3], *pin, *pout;
+    size_t rc, ilen, olen;
+    iconv_t cd;
+
+    pin = inbuf;
+    pout = outbuf;
+    ilen = 2;
+    olen = buflen;
+
+    cd = iconv_open("UTF-16BE", LYCharSet_UC[charset_in].MIMEname);
+    rc = iconv(cd, &pin, &ilen, &pout, &olen);
+    iconv_close(cd);
+    if ((ilen == 0) && (olen == 0)) {
+	return (((unsigned char) outbuf[0]) << 8) + (unsigned char) outbuf[1];
+    }
+    return -11;
+}
+#endif
+
 long int UCTransToUni(char ch_in,
 		      int charset_in)
 {
@@ -1109,6 +1133,68 @@ long int UCTransToUni(char ch_in,
 #ifndef UC_NO_SHORTCUTS
     if (charset_in == LATIN1)
 	return ch_iu;
+#ifdef EXP_JAPANESEUTF8_SUPPORT
+    if ((strcmp(LYCharSet_UC[charset_in].MIMEname, "shift_jis") == 0) ||
+	(strcmp(LYCharSet_UC[charset_in].MIMEname, "euc-jp") == 0)) {
+	static char buffer[3];
+	char obuffer[3], *pin, *pout;
+	static int inx = 0;
+	size_t rc, ilen, olen;
+	iconv_t cd;
+
+	pin = buffer;
+	pout = obuffer;
+	ilen = olen = 2;
+	if (strcmp(LYCharSet_UC[charset_in].MIMEname, "shift_jis") == 0) {
+	    if (inx == 0) {
+		if (IS_SJIS_HI1((unsigned char) ch_in) ||
+		    IS_SJIS_HI2((unsigned char) ch_in)) {
+		    buffer[0] = ch_in;
+		    inx = 1;
+		    return -11;
+		}
+	    } else {
+		if (IS_SJIS_LO((unsigned char) ch_in)) {
+		    buffer[1] = ch_in;
+		    buffer[2] = 0;
+
+		    cd = iconv_open("UTF-16BE", "Shift_JIS");
+		    rc = iconv(cd, &pin, &ilen, &pout, &olen);
+		    iconv_close(cd);
+		    inx = 0;
+		    if ((ilen == 0) && (olen == 0)) {
+			return (((unsigned char) obuffer[0]) << 8)
+			    + (unsigned char) obuffer[1];
+		    }
+		}
+	    }
+	}
+	if (strcmp(LYCharSet_UC[charset_in].MIMEname, "euc-jp") == 0) {
+	    if (inx == 0) {
+		if (IS_EUC_HI((unsigned char) ch_in)) {
+		    buffer[0] = ch_in;
+		    inx = 1;
+		    return -11;
+		}
+	    } else {
+		if (IS_EUC_LOX((unsigned char) ch_in)) {
+		    buffer[1] = ch_in;
+		    buffer[2] = 0;
+
+		    cd = iconv_open("UTF-16BE", "EUC-JP");
+		    rc = iconv(cd, &pin, &ilen, &pout, &olen);
+		    iconv_close(cd);
+		    inx = 0;
+		    if ((ilen == 0) && (olen == 0)) {
+			return (((unsigned char) obuffer[0]) << 8)
+			    + (unsigned char) obuffer[1];
+		    }
+		}
+	    }
+	}
+	inx = 0;
+    }
+#endif
     if (UCH(ch_in) < 128 && UCH(ch_in) >= 32)
 	return ch_iu;
 #endif /* UC_NO_SHORTCUTS */
diff --git a/userdefs.h b/userdefs.h
index 4169fbea..96d0a22b 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1360,11 +1360,11 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.6dev.13"
+#define LYNX_VERSION "2.8.6dev.14"
 #define LYNX_WWW_HOME "http://lynx.isc.org/"
 #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Tue, 07 Jun 2005 03:45:24 -0700"
+#define LYNX_DATE "Sun, 16 Oct 2005 17:17:20 -0700"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */